equal
deleted
inserted
replaced
93 # due to compiler/linker issues on Max OS X 10.6 -k-no_order_inits is needed to avoid linking fail |
93 # due to compiler/linker issues on Max OS X 10.6 -k-no_order_inits is needed to avoid linking fail |
94 if(APPLE AND current_macosx_version GREATER "10.5") |
94 if(APPLE AND current_macosx_version GREATER "10.5") |
95 set(pascal_flags "-k-no_order_inits" ${pascal_flags}) |
95 set(pascal_flags "-k-no_order_inits" ${pascal_flags}) |
96 endif() |
96 endif() |
97 |
97 |
98 if (APPLE) |
98 if(APPLE) |
99 set(engine_output_name "hwengine.dylib") |
99 set(engine_output_name "libhwengine.dylib") |
100 endif (APPLE) |
100 endif (APPLE) |
101 endif(BUILD_ENGINE_LIBRARY) |
101 endif(BUILD_ENGINE_LIBRARY) |
102 |
102 |
103 |
103 |
104 IF(FPC) |
104 IF(FPC) |
149 #add a dependency to the hwengine target |
149 #add a dependency to the hwengine target |
150 set(engine_sources ${engine_sources} SDLmain) |
150 set(engine_sources ${engine_sources} SDLmain) |
151 set(SDLMAIN_LIB "${LIBRARY_OUTPUT_PATH}/libSDLmain.a") |
151 set(SDLMAIN_LIB "${LIBRARY_OUTPUT_PATH}/libSDLmain.a") |
152 endif() |
152 endif() |
153 |
153 |
154 set(pascal_flags "-k${SDLMAIN_LIB}" "-k${LIBRARY_OUTPUT_PATH}/libphysfs.a" ${pascal_flags}) |
154 set(pascal_flags "-k${SDLMAIN_LIB}" ${pascal_flags}) |
155 endif() |
155 endif() |
|
156 set(pascal_flags "-k${LIBRARY_OUTPUT_PATH}/libphysfs.a" ${pascal_flags}) |
156 endif(APPLE) |
157 endif(APPLE) |
157 |
158 |
158 |
159 |
159 #PASCAL DETECTION SECTION |
160 #PASCAL DETECTION SECTION |
160 string(REGEX MATCH "[0-9]+\\.[0-9]+\\.[0-9]+" fpc_version "${fpc_output}") |
161 string(REGEX MATCH "[0-9]+\\.[0-9]+\\.[0-9]+" fpc_version "${fpc_output}") |