From f4ce2fd5a4ef4fa75ac6080cdb2e5218cdcbac30 Mon Sep 17 00:00:00 2001 From: Mathieu Schroeter Date: Sun, 30 Jul 2017 00:18:23 +0200 Subject: [PATCH 01/11] USMR --- planetblupi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/planetblupi b/planetblupi index 6788ff9..512bf0d 160000 --- a/planetblupi +++ b/planetblupi @@ -1 +1 @@ -Subproject commit 6788ff99bd7286eeaf9c73baff04877520c634c3 +Subproject commit 512bf0d6f6d5e329d14daa05870020adc0785fa2 From ff974bf255eb60a42f5940dbe9026691b965f6b4 Mon Sep 17 00:00:00 2001 From: Mathieu Schroeter Date: Sun, 30 Jul 2017 00:18:53 +0200 Subject: [PATCH 02/11] Add frameworks for static linking --- CMakeLists.txt | 2 ++ cmd.sh.in | 1 + 2 files changed, 3 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index c730190..8d5ded7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,6 +6,8 @@ include (${CMAKE_ROOT}/Modules/ExternalProject.cmake) include_directories (${CMAKE_BINARY_DIR}/include) link_directories (${CMAKE_BINARY_DIR}/lib) +set (CMAKE_LDFLAGS "-liconv -framework AudioToolBox -framework CoreAudio -framework CoreFoundation -framework Cocoa -framework OpenGL -framework IOKit -framework CoreVideo -framework Carbon") + configure_file (cmd.sh.in cmd.sh @ONLY) set (CMD ${CMAKE_BINARY_DIR}/cmd.sh) diff --git a/cmd.sh.in b/cmd.sh.in index b60000a..269cc26 100755 --- a/cmd.sh.in +++ b/cmd.sh.in @@ -4,6 +4,7 @@ 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@ -L$LIBRARY_PATH" cmd=$1 shift From 40388af562a5dc2d5551ee72dcc07612336fa029 Mon Sep 17 00:00:00 2001 From: Mathieu Schroeter Date: Sun, 30 Jul 2017 00:19:18 +0200 Subject: [PATCH 03/11] Remove the build of libiconv; use the one provided by OSX It seems a bit difficult to use our own libiconv because some base libs are linking against the system one. --- CMakeLists.txt | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8d5ded7..84e1999 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -43,18 +43,20 @@ endif () ## libiconv ########### -ExternalProject_Add (libiconv_Project - URL https://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.15.tar.gz - PREFIX ${CMAKE_BINARY_DIR} - CONFIGURE_COMMAND ${CMD} ./configure - --prefix=${CMAKE_BINARY_DIR} - --disable-shared - --enable-static - BUILD_COMMAND ${CMD} make - INSTALL_COMMAND ${CMD} make install - BUILD_IN_SOURCE 1 - INSTALL_DIR ${CMAKE_BINARY_DIR} -) +if (NOT APPLE) + ExternalProject_Add (libiconv_Project + URL https://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.15.tar.gz + PREFIX ${CMAKE_BINARY_DIR} + CONFIGURE_COMMAND ${CMD} ./configure + --prefix=${CMAKE_BINARY_DIR} + --disable-shared + --enable-static + BUILD_COMMAND ${CMD} make + INSTALL_COMMAND ${CMD} make install + BUILD_IN_SOURCE 1 + INSTALL_DIR ${CMAKE_BINARY_DIR} + ) +endif () ########## ## gettext @@ -71,7 +73,7 @@ ExternalProject_Add (gettext_Project INSTALL_COMMAND ${CMD} make -C gettext-runtime install BUILD_IN_SOURCE 1 INSTALL_DIR ${CMAKE_BINARY_DIR} - DEPENDS libiconv_Project +# DEPENDS libiconv_Project ) ######### @@ -255,7 +257,7 @@ ExternalProject_Add (SDL2_mixer_Project INSTALL_COMMAND ${CMD} make install BUILD_IN_SOURCE 1 INSTALL_DIR ${CMAKE_BINARY_DIR} - DEPENDS SDL2_Project + DEPENDS SDL2_Project # libiconv_Project ) ################## From 4adf7cb948a32036cbacb6430b22805ddfab64c0 Mon Sep 17 00:00:00 2001 From: Mathieu Schroeter Date: Sun, 30 Jul 2017 22:08:56 +0200 Subject: [PATCH 04/11] Remove useless explicit link to libiconv --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 84e1999..e6c8911 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,7 +6,7 @@ include (${CMAKE_ROOT}/Modules/ExternalProject.cmake) include_directories (${CMAKE_BINARY_DIR}/include) link_directories (${CMAKE_BINARY_DIR}/lib) -set (CMAKE_LDFLAGS "-liconv -framework AudioToolBox -framework CoreAudio -framework CoreFoundation -framework Cocoa -framework OpenGL -framework IOKit -framework CoreVideo -framework Carbon") +set (CMAKE_LDFLAGS "-framework AudioToolBox -framework CoreAudio -framework CoreFoundation -framework Cocoa -framework OpenGL -framework IOKit -framework CoreVideo -framework Carbon") configure_file (cmd.sh.in cmd.sh @ONLY) set (CMD ${CMAKE_BINARY_DIR}/cmd.sh) From 404f4d31ef856ff7ef52f02cdd9c80a51fa1bec1 Mon Sep 17 00:00:00 2001 From: Mathieu Schroeter Date: Sun, 30 Jul 2017 22:09:11 +0200 Subject: [PATCH 05/11] USMR --- planetblupi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/planetblupi b/planetblupi index 512bf0d..9b72cc0 160000 --- a/planetblupi +++ b/planetblupi @@ -1 +1 @@ -Subproject commit 512bf0d6f6d5e329d14daa05870020adc0785fa2 +Subproject commit 9b72cc0810e5f0ba61a1f3ae03c402f590f252cb From 16032fc13fd3a6bf40a97c8ac4498a2d915ae22a Mon Sep 17 00:00:00 2001 From: Mathieu Schroeter Date: Sun, 30 Jul 2017 22:22:15 +0200 Subject: [PATCH 06/11] USMR --- planetblupi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/planetblupi b/planetblupi index 9b72cc0..1fe84fc 160000 --- a/planetblupi +++ b/planetblupi @@ -1 +1 @@ -Subproject commit 9b72cc0810e5f0ba61a1f3ae03c402f590f252cb +Subproject commit 1fe84fcdf71a34ef6fab5236bcb43b7e7bfd20d9 From 26b516adf67cececf03e4a6862ca854790222c9f Mon Sep 17 00:00:00 2001 From: Mathieu Schroeter Date: Sun, 30 Jul 2017 23:15:56 +0200 Subject: [PATCH 07/11] USMR --- planetblupi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/planetblupi b/planetblupi index 1fe84fc..4caa692 160000 --- a/planetblupi +++ b/planetblupi @@ -1 +1 @@ -Subproject commit 1fe84fcdf71a34ef6fab5236bcb43b7e7bfd20d9 +Subproject commit 4caa6922b3dc38c623d96a911ddf3eb53ecc7be9 From 23eec44111cecaa83754eedf69c5116eb4e49e6d Mon Sep 17 00:00:00 2001 From: Mathieu Schroeter Date: Mon, 31 Jul 2017 16:32:06 +0200 Subject: [PATCH 08/11] Pass the library path only if APPLE --- CMakeLists.txt | 4 +++- cmd.sh.in | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e6c8911..e79420b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,7 +6,9 @@ include (${CMAKE_ROOT}/Modules/ExternalProject.cmake) include_directories (${CMAKE_BINARY_DIR}/include) link_directories (${CMAKE_BINARY_DIR}/lib) -set (CMAKE_LDFLAGS "-framework AudioToolBox -framework CoreAudio -framework CoreFoundation -framework Cocoa -framework OpenGL -framework IOKit -framework CoreVideo -framework Carbon") +if (APPLE) + set (CMAKE_LDFLAGS "-L${CMAKE_BINARY_DIR}/lib -framework AudioToolBox -framework CoreAudio -framework CoreFoundation -framework Cocoa -framework OpenGL -framework IOKit -framework CoreVideo -framework Carbon") +endif () configure_file (cmd.sh.in cmd.sh @ONLY) set (CMD ${CMAKE_BINARY_DIR}/cmd.sh) diff --git a/cmd.sh.in b/cmd.sh.in index 269cc26..e0b620b 100755 --- a/cmd.sh.in +++ b/cmd.sh.in @@ -4,7 +4,7 @@ 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@ -L$LIBRARY_PATH" +export LDFLAGS="@CMAKE_LDFLAGS@" cmd=$1 shift From 391ce9331204a6996d4fa1a2205765754b0e03e8 Mon Sep 17 00:00:00 2001 From: Mathieu Schroeter Date: Mon, 31 Jul 2017 16:32:59 +0200 Subject: [PATCH 09/11] Fix depends for gettext in a more portable way --- CMakeLists.txt | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e79420b..d4f52c7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -64,6 +64,11 @@ endif () ## gettext ########## +set (gettext_DEPENDS) +if (APPLE) + set (gettext_DEPENDS "${gettext_DEPENDS} libiconv_Project") +endif () + ExternalProject_Add (gettext_Project URL http://mirror.switch.ch/ftp/mirror/gnu/gettext/gettext-0.19.8.1.tar.xz PREFIX ${CMAKE_BINARY_DIR} @@ -75,7 +80,7 @@ ExternalProject_Add (gettext_Project INSTALL_COMMAND ${CMD} make -C gettext-runtime install BUILD_IN_SOURCE 1 INSTALL_DIR ${CMAKE_BINARY_DIR} -# DEPENDS libiconv_Project + DEPENDS ${gettext_DEPENDS} ) ######### @@ -225,6 +230,11 @@ ExternalProject_Add (SDL2_image_Project ## SDL2_mixer ############# +set (SDL2_mixer_DEPENDS SDL2_Project) +if (APPLE) + set (SDL2_mixer_DEPENDS "${SDL2_mixer_DEPENDS} libiconv_Project") +endif () + ExternalProject_Add (SDL2_mixer_Project URL https://www.libsdl.org/projects/SDL_mixer/release/SDL2_mixer-2.0.1.tar.gz PREFIX ${CMAKE_BINARY_DIR} @@ -259,7 +269,7 @@ ExternalProject_Add (SDL2_mixer_Project INSTALL_COMMAND ${CMD} make install BUILD_IN_SOURCE 1 INSTALL_DIR ${CMAKE_BINARY_DIR} - DEPENDS SDL2_Project # libiconv_Project + DEPENDS ${SDL2_mixer_DEPENDS} ) ################## From ef781cf756f221d21585183d62e5cba702992db6 Mon Sep 17 00:00:00 2001 From: Mathieu Schroeter Date: Mon, 31 Jul 2017 16:34:24 +0200 Subject: [PATCH 10/11] Add comment --- CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index d4f52c7..397a1e3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,6 +6,7 @@ include (${CMAKE_ROOT}/Modules/ExternalProject.cmake) include_directories (${CMAKE_BINARY_DIR}/include) link_directories (${CMAKE_BINARY_DIR}/lib) +# 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 CoreAudio -framework CoreFoundation -framework Cocoa -framework OpenGL -framework IOKit -framework CoreVideo -framework Carbon") endif () From aca7176fc88feb4b23a07cbd36c5d33411327442 Mon Sep 17 00:00:00 2001 From: Mathieu Schroeter Date: Mon, 31 Jul 2017 16:35:53 +0200 Subject: [PATCH 11/11] USMR --- planetblupi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/planetblupi b/planetblupi index 4caa692..4bcfba7 160000 --- a/planetblupi +++ b/planetblupi @@ -1 +1 @@ -Subproject commit 4caa6922b3dc38c623d96a911ddf3eb53ecc7be9 +Subproject commit 4bcfba75fd837da7ef30e8b74596ee7023d9e291