Possible android build fixes (after fuzzylite changes);

Author: Fayth

build.py

@@ -55,6 +55,7 @@ def fixLibsFiles():
 	import fix_boost_files
 	import fix_sdl_makefiles
 	import fix_ffmpeg_confs
+	import fix_fuzzylite_dirs
 
 def moveSDLIncludes():
 	vcmiutil.flatCopyWithExt("ext/SDL2/core/code/include/", "ext/SDL2/core/include/", ".h")

fix_fuzzylite_dirs.py

@@ -0,0 +1,15 @@
+import os
+import vcmiutil
+
+# changes fuzzylite hardcoded output dirs (FL/out/bin) to conditional set, so it doesn't override our arch-based output folder
+
+def fixFuzzyliteHardcodedOutputDirs():
+	replacements = [ 
+	vcmiutil.ReplacementEntry("set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY bin)", "if (NOT CMAKE_ARCHIVE_OUTPUT_DIRECTORY)\n\tset(CMAKE_ARCHIVE_OUTPUT_DIRECTORY bin) #fixed via vcmi python\nendif()"),
+	vcmiutil.ReplacementEntry("set(CMAKE_LIBRARY_OUTPUT_DIRECTORY bin)", "if (NOT CMAKE_LIBRARY_OUTPUT_DIRECTORY)\n\tset(CMAKE_LIBRARY_OUTPUT_DIRECTORY bin) #fixed via vcmi python\nendif()"),
+	vcmiutil.ReplacementEntry("set(CMAKE_RUNTIME_OUTPUT_DIRECTORY bin)", "if (NOT CMAKE_RUNTIME_OUTPUT_DIRECTORY)\n\tset(CMAKE_RUNTIME_OUTPUT_DIRECTORY bin) #fixed via vcmi python\nendif()")
+	]
+	
+	vcmiutil.fixFile("./ext/vcmi/AI/Fuzzylite/fuzzylite/CMakeLists.txt", replacements)
+	
+fixFuzzyliteHardcodedOutputDirs()

project/vcmi-app/cmake-scripts/CMakeLists.txt

@@ -1,6 +1,7 @@
 cmake_minimum_required(VERSION 3.4.1)
 
-set(CMAKE_MODULE_PATH ${VCMI_ROOT}/project/vcmi-app/cmake-scripts) 
+set(CMAKE_MODULE_PATH "${VCMI_ROOT}/project/vcmi-app/cmake-scripts;${VCMI_ROOT}/ext/vcmi/cmake_modules")
+include(VCMIUtils)
 
 set(ANDROID ON)
 

project/vcmi-app/cmake-scripts/ext-libs.cmake

@@ -20,9 +20,10 @@ function(build_fuzzylite)
 	set(FL_BUILD_BINARY OFF CACHE BOOL "Build fuzzylite binary")
 	set(FL_CPP11 ON CACHE BOOL "Builds utilizing C++11, i.e., passing -std=c++11")
 	set(FL_INSTALL_LIBDIR ${CMAKE_LIBRARY_OUTPUT_DIRECTORY})
-	set(FL_INSTALL_BINDIR ${CMAKE_LIBRARY_OUTPUT_DIRECTORY})
+	set(FL_INSTALL_BINDIR ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}) 
+	set(FL_BACKTRACE OFF CACHE BOOL "Provide backtrace information in case of errors" FORCE) # backtrace requires execinfo.h, which ndk doesn't have
 	add_subdirectory(${VCMI_PATH_VCMI}/AI/FuzzyLite/fuzzylite ${VCMI_PATH_VCMI}/AI/FuzzyLite/OUT)
-	set_target_properties(fl-shared PROPERTIES OUTPUT_NAME vcmi-fuzzylite)
+	set_target_properties(fl-shared PROPERTIES OUTPUT_NAME vcmi-fuzzylite) 
 	set_target_properties(fl-shared PROPERTIES DEBUG_POSTFIX "")
 endfunction(build_fuzzylite)
 
@@ -62,7 +63,7 @@ function(build_libs)
 	set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${VCMI_PATH_EXT_LIBS})
 	set(CMAKE_INSTALL_LIBDIR ${VCMI_PATH_EXT_LIBS})
 
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated")
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated -Wno-varargs")
 	set(CMAKE_BUILD_TYPE Release)
 
 	add_definitions(

project/vcmi-app/cmake-scripts/fuzzylite.pc.in

@@ -0,0 +1,10 @@
+prefix=@CMAKE_INSTALL_PREFIX@
+exec_prefix=${prefix}blah
+includedir=${exec_prefix}/include
+libdir=${exec_prefix}/lib
+
+Name: fuzzylite
+Description: A fuzzy logic control library in C++
+Version: @FL_VERSION@
+Libs: -L${libdir} -lfuzzylite
+Cflags: -I${includedir}