From 962b143dd5daafbc8b8fa79d87665284d2d9caab Mon Sep 17 00:00:00 2001 From: Mathieu Schroeter Date: Thu, 14 Sep 2017 19:31:02 +0200 Subject: [PATCH 1/5] USMR --- planetblupi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/planetblupi b/planetblupi index 9b052fa..92d96d6 160000 --- a/planetblupi +++ b/planetblupi @@ -1 +1 @@ -Subproject commit 9b052fa8a2877ef150e1c7f28fcc4802900fcb49 +Subproject commit 92d96d6ce2a7d52a0f6599fb87be5277df735b76 From 5c969f0cd68d4bc4eac4458af909e3936a287b90 Mon Sep 17 00:00:00 2001 From: Mathieu Schroeter Date: Fri, 15 Sep 2017 00:23:16 +0200 Subject: [PATCH 2/5] WIP: fix regression with windows build --- CMakeLists.txt | 9 +++++---- cmd.sh.in | 11 +++++++---- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 547fe4d..92a5fbb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,16 +10,17 @@ set (STATIC_BUILD true) # It's an hack in order to be able to link statically planetblupi on darwin. if (APPLE) - set (CMAKE_LDFLAGS "-L${CMAKE_BINARY_DIR}/lib -framework AudioToolBox -framework AudioUnit -framework CoreAudio -framework CoreFoundation -framework Cocoa -framework OpenGL -framework IOKit -framework CoreVideo -framework Carbon") + set (ISAPPLE 1) + set (CMD_LDFLAGS "-L${CMAKE_BINARY_DIR}/lib -framework AudioToolBox -framework AudioUnit -framework CoreAudio -framework CoreFoundation -framework Cocoa -framework OpenGL -framework IOKit -framework CoreVideo -framework Carbon") if (OLD_SDK) 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 (CMAKE_CXX_FLAGS "--sysroot ${CMAKE_OSX_SYSROOT} -mmacosx-version-min=${OSX_SDK_VERSION} ${CMAKE_CXX_FLAGS}") - set (CMAKE_C_FLAGS "--sysroot ${CMAKE_OSX_SYSROOT} -mmacosx-version-min=${OSX_SDK_VERSION} ${CMAKE_C_FLAGS}") + 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}") endif () - set (CMAKE_CPP_FLAGS "-I${CMAKE_BINARY_DIR}/include") + set (CMD_CPPFLAGS "-I${CMAKE_BINARY_DIR}/include") endif () configure_file (cmd.sh.in cmd.sh @ONLY) diff --git a/cmd.sh.in b/cmd.sh.in index 078d923..211fbda 100755 --- a/cmd.sh.in +++ b/cmd.sh.in @@ -4,10 +4,13 @@ export PKG_CONFIG_PATH="@CMAKE_BINARY_DIR@/lib/pkgconfig" export INCLUDE_PATH="@CMAKE_BINARY_DIR@/include" export LIBRARY_PATH="@CMAKE_BINARY_DIR@/lib" export BINARY_PATH="@CMAKE_BINARY_DIR@/bin" -export LDFLAGS="@CMAKE_LDFLAGS@" -export CXXFLAGS="@CMAKE_CXX_FLAGS@" -export CFLAGS="@CMAKE_C_FLAGS@" -export CPPFLAGS="@CMAKE_CPP_FLAGS@" + +if [ "@ISAPPLE@" = "1" ]; then + export LDFLAGS="$LDFLAGS @CMD_LDFLAGS@" + export CXXFLAGS="$CXXFLAGS @CMD_CXXFLAGS@" + export CFLAGS="$CFLAGS @CMD_CFLAGS@" + export CPPFLAGS="$CPPFLAGS @CMD_CPPFLAGS@" +fi cmd=$1 shift From 8db71bd8b49341f2f5dbf11a4d05bbe027686c3f Mon Sep 17 00:00:00 2001 From: Mathieu Schroeter Date: Fri, 15 Sep 2017 11:09:27 +0200 Subject: [PATCH 3/5] Update libpng url, fix issue #2 Thanks to krzys-h. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 92a5fbb..1cdc737 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -164,7 +164,7 @@ ExternalProject_Add (gettext_Project ######### ExternalProject_Add (libpng_Project - URL http://prdownloads.sourceforge.net/libpng/libpng-1.6.28.tar.xz?download + URL http://prdownloads.sourceforge.net/libpng/libpng-1.6.28.tar.xz PREFIX ${CMAKE_BINARY_DIR} CONFIGURE_COMMAND ${CMD} ./configure --prefix=${CMAKE_BINARY_DIR} From bc5b6b81cd212d4dd62b3ba1955738c499e64f4a Mon Sep 17 00:00:00 2001 From: Mathieu Schroeter Date: Fri, 15 Sep 2017 19:20:23 +0200 Subject: [PATCH 4/5] USMR --- planetblupi | 2 +- planetblupi-www | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/planetblupi b/planetblupi index 92d96d6..2b73637 160000 --- a/planetblupi +++ b/planetblupi @@ -1 +1 @@ -Subproject commit 92d96d6ce2a7d52a0f6599fb87be5277df735b76 +Subproject commit 2b73637748f8b4e872483ff2813cc000a4a57a6b diff --git a/planetblupi-www b/planetblupi-www index da18428..63e1b7d 160000 --- a/planetblupi-www +++ b/planetblupi-www @@ -1 +1 @@ -Subproject commit da184286dea80a2652cf81fb1e0a86a4bc6f1926 +Subproject commit 63e1b7d01d4c3b4dadf7593de4b57d938d513923 From e82cfe6a4a708b2609832b56da964cebcd09e7b2 Mon Sep 17 00:00:00 2001 From: Mathieu Schroeter Date: Fri, 15 Sep 2017 19:54:28 +0200 Subject: [PATCH 5/5] USMR --- planetblupi-www | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/planetblupi-www b/planetblupi-www index 63e1b7d..3d9e341 160000 --- a/planetblupi-www +++ b/planetblupi-www @@ -1 +1 @@ -Subproject commit 63e1b7d01d4c3b4dadf7593de4b57d938d513923 +Subproject commit 3d9e3419bc2dcf091714f1a86bac763d2b23cedb