Merge remote-tracking branch 'origin/master' into wip/android

CMakeLists.txt

@@ -19,8 +19,8 @@ if (APPLE)
     set (OSX_SDK_VERSION 10.9)
     set (CMAKE_OSX_SYSROOT "/Developer/SDKs/MacOSX${OSX_SDK_VERSION}.sdk/")
     set (CMAKE_OSX_DEPLOYMENT_TARGET ${OSX_SDK_VERSION})
-    set (CMD_CXXFLAGS "--sysroot ${CMAKE_OSX_SYSROOT} -mmacosx-version-min=${OSX_SDK_VERSION} ${CMAKE_CXX_FLAGS}")
-    set (CMD_CFLAGS "--sysroot ${CMAKE_OSX_SYSROOT} -mmacosx-version-min=${OSX_SDK_VERSION} ${CMAKE_C_FLAGS}")
+    set (CMD_CXXFLAGS "-isysroot ${CMAKE_OSX_SYSROOT} -mmacosx-version-min=${OSX_SDK_VERSION} ${CMAKE_CXX_FLAGS}")
+    set (CMD_CFLAGS "-isysroot ${CMAKE_OSX_SYSROOT} -mmacosx-version-min=${OSX_SDK_VERSION} ${CMAKE_C_FLAGS}")
   endif ()
   set (CMD_CPPFLAGS "-I${CMAKE_BINARY_DIR}/include")
 endif ()
@@ -499,7 +499,9 @@ ExternalProject_Add (SDL_kitchensink_Project
   SOURCE_DIR ${CMAKE_SOURCE_DIR}/SDL_kitchensink
   PREFIX ${CMAKE_BINARY_DIR}
   CMAKE_COMMAND ${CMD} ${CMAKE_COMMAND}
-  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> ${ADDITIONAL_CMAKE_OPTIONS}
+  CMAKE_ARGS -DDISABLE_SHARED=true
+             -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
+             ${ADDITIONAL_CMAKE_OPTIONS}
   INSTALL_DIR ${CMAKE_BINARY_DIR}
   BUILD_ALWAYS 1
   DEPENDS SDL2_Project FFmpeg_Project
@@ -554,6 +556,7 @@ ExternalProject_Add (planetblupi_Project
              -DAPPIMAGE_APPRUN_PROGRAM=${APPIMAGE_APPRUN_PROGRAM}
              -DAPPIMAGE_ASSISTANT_PROGRAM=${APPIMAGE_TOOL_PROGRAM}
              -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
+             -DPB_HTTP_VERSION_CHECK=yes
              -DSTATIC_BUILD=${STATIC_BUILD}
              -DSIGN_APP=${SIGN_APP}
              -DANDROID=${ANDROID}
@@ -580,4 +583,4 @@ add_custom_target (dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source)
 set (CPACK_SOURCE_GENERATOR "TBZ2")
 set (CPACK_SOURCE_PACKAGE_FILE_NAME "planetblupi-dev")
 set (CPACK_SOURCE_IGNORE_FILES "/build/;/Debug/;/Release/;/.git/;~$;${CPACK_SOURCE_IGNORE_FILES}")
-include (CPack)
+include (CPack)

README.md

@@ -11,7 +11,7 @@ The game is built with static linking as much as possible. The goal is to
 limit the linking of dynamic libraries which are not available natively on
 the host operating system of most users. There is only one exception on Windows
 about the use of the dynamic `libwinpthread-1.dll` library. Most dependencies
-are built via the `CMakeLists.txt` file provided here (linpng, FFmpeg, SDL2,
+are built via the `CMakeLists.txt` file provided here (libpng, FFmpeg, SDL2,
 and more with the appropriate flags). For example, FFmpeg is built only with
 the necessary codecs.
 

SDL_kitchensink

@@ -1 +1 @@
-Subproject commit 3f2c95367d91e5d51b7dc97c554025224a721438
+Subproject commit cbbdd688c11e25ef9d6e70c1369d1ddcd0299b4e

planetblupi

@@ -1 +1 @@
-Subproject commit a87676f7f3067199e342487ade743e566155c4e9
+Subproject commit 4fdaf201e7a767a55285e8969dab0704267832e6

planetblupi-data

@@ -1 +1 @@
-Subproject commit d4626949008bfd275d0f500112dfbecac81b45c7
+Subproject commit 14b16f0ee1891824e600f7b858b04afccac7dad4

planetblupi-www

@@ -1 +1 @@
-Subproject commit da184286dea80a2652cf81fb1e0a86a4bc6f1926
+Subproject commit 9a50f9c5ffa3056a9d3828b970403861ff35cc28