equal
deleted
inserted
replaced
118 |
118 |
119 #add user framework directory |
119 #add user framework directory |
120 set(pascal_compiler_flags_cmn "-Ff~/Library/Frameworks" ${pascal_compiler_flags_cmn}) |
120 set(pascal_compiler_flags_cmn "-Ff~/Library/Frameworks" ${pascal_compiler_flags_cmn}) |
121 #set deployment target |
121 #set deployment target |
122 set(pascal_compiler_flags_cmn "-k-macosx_version_min" "-k${minimum_macosx_version}" "-XR${CMAKE_OSX_SYSROOT}" ${pascal_compiler_flags_cmn}) |
122 set(pascal_compiler_flags_cmn "-k-macosx_version_min" "-k${minimum_macosx_version}" "-XR${CMAKE_OSX_SYSROOT}" ${pascal_compiler_flags_cmn}) |
123 #link with liblua.a (which requires readline) |
|
124 set(pascal_compiler_flags_cmn "-k${CMAKE_BINARY_DIR}/bin/liblua.a" "-k-lreadline" ${pascal_compiler_flags_cmn}) |
|
125 #link with libsdlmain.a (when building an executable) |
123 #link with libsdlmain.a (when building an executable) |
126 if(NOT BUILD_ENGINE_LIBRARY) |
124 if(NOT BUILD_ENGINE_LIBRARY) |
127 set(pascal_compiler_flags_cmn "-k${CMAKE_BINARY_DIR}/bin/libSDLmain.a" ${pascal_compiler_flags_cmn}) |
125 set(pascal_compiler_flags_cmn "-k${CMAKE_BINARY_DIR}/bin/libSDLmain.a" ${pascal_compiler_flags_cmn}) |
128 endif() |
126 endif() |
129 |
127 |
188 endif() |
186 endif() |
189 else(WITH_SERVER) |
187 else(WITH_SERVER) |
190 set(HAVE_NETSERVER false) |
188 set(HAVE_NETSERVER false) |
191 endif(WITH_SERVER) |
189 endif(WITH_SERVER) |
192 |
190 |
193 add_subdirectory(misc/liblua) |
191 find_package(Lua) |
|
192 if(NOT ${LUA_FOUND}) |
|
193 add_subdirectory(misc/liblua) |
|
194 #link with liblua.a (which requires readline) |
|
195 set(pascal_compiler_flags_cmn "-k${CMAKE_BINARY_DIR}/bin/liblua.a" "-k-lreadline" ${pascal_compiler_flags_cmn}) |
|
196 endif() |
194 add_subdirectory(hedgewars) |
197 add_subdirectory(hedgewars) |
195 |
198 |
196 #run cmake -DBUILD_ANDROID_PORT=1 to enable this |
199 #run cmake -DBUILD_ANDROID_PORT=1 to enable this |
197 if(ANDROID) |
200 if(ANDROID) |
198 add_subdirectory(project_files/Android-build) |
201 add_subdirectory(project_files/Android-build) |