fix linking on osx by hardcoding the default library output path sdl2transition
authorkoda
Fri, 06 Dec 2013 00:28:55 +0100
branchsdl2transition
changeset 9705 322fe1736347
parent 9703 966d180184b4
child 9707 c433e74da79b
fix linking on osx by hardcoding the default library output path
CMakeLists.txt
cmake_modules/platform.cmake
--- a/CMakeLists.txt	Fri Dec 06 00:02:10 2013 +0100
+++ b/CMakeLists.txt	Fri Dec 06 00:28:55 2013 +0100
@@ -50,11 +50,12 @@
 
 message(STATUS "Building ${HEDGEWARS_VERSION}-r${HEDGEWARS_REVISION} (${HEDGEWARS_HASH})")
 
+#io library paths
+include(${CMAKE_MODULE_PATH}/paths.cmake)
 #general utilities
 include(${CMAKE_MODULE_PATH}/utils.cmake)
 #platform specific init code
 include(${CMAKE_MODULE_PATH}/platform.cmake)
-include(${CMAKE_MODULE_PATH}/paths.cmake)
 
 
 #when build type is not specified, assume Debug/Release according to build version information
--- a/cmake_modules/platform.cmake	Fri Dec 06 00:02:10 2013 +0100
+++ b/cmake_modules/platform.cmake	Fri Dec 06 00:28:55 2013 +0100
@@ -97,6 +97,9 @@
 
     #add user framework directory
     add_flag_append(CMAKE_Pascal_FLAGS "-Ff~/Library/Frameworks")
+
+    #workaround most of the -Fl settings getting lost
+    add_flag_append(CMAKE_Pascal_FLAGS "-k-L${LIBRARY_OUTPUT_PATH}")
 endif(APPLE)
 
 if(MINGW)