Fix boost link error (#230)

* fix boost link error

android/CMakeLists.txt

@@ -7,6 +7,7 @@ set_target_properties(crypto PROPERTIES
 add_library(freetype STATIC IMPORTED GLOBAL)
 set_target_properties(freetype PROPERTIES
   IMPORTED_LOCATION ${platform_spec_path}/libfreetype.a
+  INTERFACE_INCLUDE_DIRECTORIES ${platform_spec_path}/include/freetype
 )
 
 add_library(jpeg STATIC IMPORTED GLOBAL)

ios-m1-simulator/CMakeLists.txt

@@ -7,6 +7,7 @@ set_target_properties(crypto PROPERTIES
 add_library(freetype STATIC IMPORTED GLOBAL)
 set_target_properties(freetype PROPERTIES
   IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/libfreetype.a
+  INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_CURRENT_LIST_DIR}/include/freetype
 )
 
 add_library(jpeg STATIC IMPORTED GLOBAL)

ios/CMakeLists.txt

@@ -7,6 +7,7 @@ set_target_properties(crypto PROPERTIES
 add_library(freetype STATIC IMPORTED GLOBAL)
 set_target_properties(freetype PROPERTIES
   IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/libfreetype.a
+  INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_CURRENT_LIST_DIR}/include/freetype
 )
 
 add_library(jpeg STATIC IMPORTED GLOBAL)

linux/CMakeLists.txt

@@ -9,9 +9,9 @@ set_target_properties(uv PROPERTIES
   INTERFACE_INCLUDE_DIRECTORIES ${platform_spec_path}/include/libuv
 )
 
-add_library(mpg123 SHARED IMPORTED GLOBAL)
+add_library(mpg123 STATIC IMPORTED GLOBAL)
 set_target_properties(mpg123 PROPERTIES
-  IMPORTED_LOCATION ${linux_lib_dir}/mpg123/libmpg123.so
+  IMPORTED_LOCATION ${linux_lib_dir}/mpg123/libmpg123.a
   INTERFACE_INCLUDE_DIRECTORIES ${platform_spec_path}/include/mpg123
 )
 
@@ -32,15 +32,15 @@ set_target_properties(vorbis PROPERTIES
   INTERFACE_INCLUDE_DIRECTORIES ${platform_spec_path}/include/vorbis
 )
 
-add_library(libz SHARED IMPORTED GLOBAL)
+add_library(libz STATIC IMPORTED GLOBAL)
 set_target_properties(libz PROPERTIES
-  IMPORTED_LOCATION ${linux_lib_dir}/libz/libz.so.1.2.11
+  IMPORTED_LOCATION ${linux_lib_dir}/libz/libz.a
   INTERFACE_INCLUDE_DIRECTORIES ${platform_spec_path}/include/libz
 )
 
-add_library(sqlite3 SHARED IMPORTED GLOBAL)
+add_library(sqlite3 STATIC IMPORTED GLOBAL)
 set_target_properties(sqlite3 PROPERTIES
-  IMPORTED_LOCATION ${linux_lib_dir}/sqlite/libsqlite3.so.0.8.6
+  IMPORTED_LOCATION ${linux_lib_dir}/sqlite/libsqlite3.a
   INTERFACE_INCLUDE_DIRECTORIES ${platform_spec_path}/include/sqlite
 )
 
@@ -49,9 +49,9 @@ set_target_properties(v8 PROPERTIES
   IMPORTED_LOCATION ${linux_lib_dir}/v8/libv8_monolith.a
 )
 
-add_library(openal SHARED IMPORTED GLOBAL)
+add_library(openal STATIC IMPORTED GLOBAL)
 set_target_properties(openal PROPERTIES
-  IMPORTED_LOCATION ${linux_lib_dir}/openal-soft/libopenal.so.1.21.1
+  IMPORTED_LOCATION ${linux_lib_dir}/openal-soft/libopenal.a
   INTERFACE_INCLUDE_DIRECTORIES ${platform_spec_path}/include/openal-soft
 )
 
@@ -118,9 +118,9 @@ set_target_properties(tbb PROPERTIES
 set(optional_libs_name ${optional_libs_name} tbb)
 endif()
 
-add_library(sdl2 SHARED IMPORTED GLOBAL)
+add_library(sdl2 STATIC IMPORTED GLOBAL)
 set_target_properties(sdl2 PROPERTIES
-  IMPORTED_LOCATION ${linux_lib_dir}/sdl2/libSDL2.so
+  IMPORTED_LOCATION ${linux_lib_dir}/sdl2/libSDL2.a
   INTERFACE_INCLUDE_DIRECTORIES ${platform_spec_path}/include/sdl2
 )
 
@@ -177,8 +177,11 @@ list(APPEND CC_EXTERNAL_LIBS
     png
     websockets
     webp
-    sdl2
     curl
     ${optional_libs_name}
     ${glslang_libs_name}
 )
+
+if(NOT USE_SERVER_MODE)
+  list(APPEND CC_EXTERNAL_LIBS sdl2)
+endif()

mac/CMakeLists.txt

@@ -12,6 +12,7 @@ set_target_properties(curl PROPERTIES
 add_library(freetype STATIC IMPORTED GLOBAL)
 set_target_properties(freetype PROPERTIES
   IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/libfreetype.a
+  INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_CURRENT_LIST_DIR}/include/freetype
 )
 
 add_library(glfw3 STATIC IMPORTED GLOBAL)

sources/boost-source/boost.cmake

@@ -1,5 +1,6 @@
 
-list(APPEND CC_EXTERNAL_PRIVATE_DEFINITIONS BOOST_ALL_NO_LIB)
+#list(APPEND CC_EXTERNAL_PRIVATE_DEFINITIONS BOOST_ALL_NO_LIB)
+add_definitions(-DBOOST_ALL_NO_LIB=1)
 
 set(BOOST_LIB_NAMES
     container
@@ -7,10 +8,8 @@ set(BOOST_LIB_NAMES
 
 foreach(lib ${BOOST_LIB_NAMES})
     add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/${lib} boost/${lib})
+    target_compile_definitions(boost_${lib} PUBLIC BOOST_UUID_FORCE_AUTO_LINK)
     set_target_properties(boost_${lib} PROPERTIES FOLDER Utils)
-    target_compile_definitions(boost_${lib} PUBLIC
-        BOOST_UUID_FORCE_AUTO_LINK
-    )
     list(APPEND CC_EXTERNAL_LIBS boost_${lib})
 endforeach()
 

sources/tremolo/Tremolo/os_types.h

@@ -18,10 +18,10 @@
 #define _OS_TYPES_H
 
 #ifdef _LOW_ACCURACY_
-#  define X(n) (((((n)>>22)+1)>>1) - ((((n)>>22)+1)>>9))
+#  define TREMOLO_X(n) (((((n)>>22)+1)>>1) - ((((n)>>22)+1)>>9))
 #  define LOOKUP_T const unsigned char
 #else
-#  define X(n) (n)
+#  define TREMOLO_X(n) (n)
 #  define LOOKUP_T const ogg_int32_t
 #endif
 

win32/CMakeLists.txt

@@ -20,6 +20,7 @@ add_library(freetype STATIC IMPORTED GLOBAL)
 
 set_target_properties(freetype PROPERTIES
   IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/freetype.lib
+  INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_CURRENT_LIST_DIR}/include/freetype
 )
 
 add_library(glew32 SHARED IMPORTED GLOBAL)

win64/CMakeLists.txt

@@ -20,6 +20,7 @@ add_library(freetype STATIC IMPORTED GLOBAL)
 
 set_target_properties(freetype PROPERTIES
   IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/freetype.lib
+  INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_CURRENT_LIST_DIR}/include/freetype
 )
 
 add_library(glew32 SHARED IMPORTED GLOBAL)