backup/planetblupi-dev
1
0
Fork 0
mirror of https://github.com/blupi-games/planetblupi-dev synced 2024-12-30 13:55:36 +01:00
Code Issues Projects Releases Activity

Merge branch 'master' of github.com:blupi-games/planetblupi-dev

Browse Source
This commit is contained in:
Mathieu Schroeter 2017-09-16 22:33:49 +02:00
commit 96da85afbc
3 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
CMakeLists.txt
View File

@ -10,16 +10,17 @@ set (STATIC_BUILD true)
# It's an hack in order to be able to link statically planetblupi on darwin. # It's an hack in order to be able to link statically planetblupi on darwin.
if (APPLE) 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) if (OLD_SDK)
set (OSX_SDK_VERSION 10.9) set (OSX_SDK_VERSION 10.9)
set (CMAKE_OSX_SYSROOT "/Developer/SDKs/MacOSX${OSX_SDK_VERSION}.sdk/") set (CMAKE_OSX_SYSROOT "/Developer/SDKs/MacOSX${OSX_SDK_VERSION}.sdk/")
set (CMAKE_OSX_DEPLOYMENT_TARGET ${OSX_SDK_VERSION}) 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 (CMD_CXXFLAGS "--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_CFLAGS "--sysroot ${CMAKE_OSX_SYSROOT} -mmacosx-version-min=${OSX_SDK_VERSION} ${CMAKE_C_FLAGS}")
endif () endif ()
set (CMAKE_CPP_FLAGS "-I${CMAKE_BINARY_DIR}/include") set (CMD_CPPFLAGS "-I${CMAKE_BINARY_DIR}/include")
endif () endif ()
configure_file (cmd.sh.in cmd.sh @ONLY) configure_file (cmd.sh.in cmd.sh @ONLY)
@ -163,7 +164,7 @@ ExternalProject_Add (gettext_Project
######### #########
ExternalProject_Add (libpng_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} PREFIX ${CMAKE_BINARY_DIR}
CONFIGURE_COMMAND ${CMD} ./configure CONFIGURE_COMMAND ${CMD} ./configure
--prefix=${CMAKE_BINARY_DIR} --prefix=${CMAKE_BINARY_DIR}

11
cmd.sh.in
View File

@ -4,10 +4,13 @@ export PKG_CONFIG_PATH="@CMAKE_BINARY_DIR@/lib/pkgconfig"
export INCLUDE_PATH="@CMAKE_BINARY_DIR@/include" export INCLUDE_PATH="@CMAKE_BINARY_DIR@/include"
export LIBRARY_PATH="@CMAKE_BINARY_DIR@/lib" export LIBRARY_PATH="@CMAKE_BINARY_DIR@/lib"
export BINARY_PATH="@CMAKE_BINARY_DIR@/bin" export BINARY_PATH="@CMAKE_BINARY_DIR@/bin"
export LDFLAGS="@CMAKE_LDFLAGS@"
export CXXFLAGS="@CMAKE_CXX_FLAGS@" if [ "@ISAPPLE@" = "1" ]; then
export CFLAGS="@CMAKE_C_FLAGS@" export LDFLAGS="$LDFLAGS @CMD_LDFLAGS@"
export CPPFLAGS="@CMAKE_CPP_FLAGS@" export CXXFLAGS="$CXXFLAGS @CMD_CXXFLAGS@"
export CFLAGS="$CFLAGS @CMD_CFLAGS@"
export CPPFLAGS="$CPPFLAGS @CMD_CPPFLAGS@"
fi
cmd=$1 cmd=$1
shift shift

2
planetblupi

@ -1 +1 @@
Subproject commit 9b052fa8a2877ef150e1c7f28fcc4802900fcb49 Subproject commit 2b73637748f8b4e872483ff2813cc000a4a57a6b