equal
deleted
inserted
replaced
111 math(EXPR fpc_ver "${fpc_vers_major}*10000 + ${fpc_vers_minor}*100 + ${fpc_vers_patch}") |
111 math(EXPR fpc_ver "${fpc_vers_major}*10000 + ${fpc_vers_minor}*100 + ${fpc_vers_patch}") |
112 if (fpc_ver LESS "020200") |
112 if (fpc_ver LESS "020200") |
113 message("Minimum required version of FreePascal is 2.2.0") |
113 message("Minimum required version of FreePascal is 2.2.0") |
114 else (fpc_ver LESS "020200") |
114 else (fpc_ver LESS "020200") |
115 set(pascal_compiler ${fpc_executable}) |
115 set(pascal_compiler ${fpc_executable}) |
116 set(pascal_compiler_flags ${noexecstack_flags} "-B" "-FE../bin" "-Fl../bin" "-Cs2000000" "-vwi" "-O2" ${hwengine_project}) |
116 set(pascal_compiler_flags ${noexecstack_flags} "-B" "-FE../bin" "-Fl../bin/" "-Fl../openalbridge/" "-Cs2000000" "-vwi" "-O2" ${hwengine_project}) |
117 endif (fpc_ver LESS "020200") |
117 endif (fpc_ver LESS "020200") |
118 endif (fpc_version) |
118 endif (fpc_version) |
119 |
119 |
120 if (NOT pascal_compiler) |
120 if (NOT pascal_compiler) |
121 message(FATAL_ERROR "No Pascal compiler found!") |
121 message(FATAL_ERROR "No Pascal compiler found!") |
152 |
152 |
153 #this is the command that bundles the two executables into one |
153 #this is the command that bundles the two executables into one |
154 add_custom_command(OUTPUT "${EXECUTABLE_OUTPUT_PATH}/hwengine${CMAKE_EXECUTABLE_SUFFIX}" |
154 add_custom_command(OUTPUT "${EXECUTABLE_OUTPUT_PATH}/hwengine${CMAKE_EXECUTABLE_SUFFIX}" |
155 COMMAND "lipo" |
155 COMMAND "lipo" |
156 ARGS ${EXECUTABLE_OUTPUT_PATH}/hwengine${CMAKE_EXECUTABLE_SUFFIX}.386 ${EXECUTABLE_OUTPUT_PATH}/hwengine${CMAKE_EXECUTABLE_SUFFIX}.ppc -create -output ${EXECUTABLE_OUTPUT_PATH}/hwengine${CMAKE_EXECUTABLE_SUFFIX} |
156 ARGS ${EXECUTABLE_OUTPUT_PATH}/hwengine${CMAKE_EXECUTABLE_SUFFIX}.386 ${EXECUTABLE_OUTPUT_PATH}/hwengine${CMAKE_EXECUTABLE_SUFFIX}.ppc -create -output ${EXECUTABLE_OUTPUT_PATH}/hwengine${CMAKE_EXECUTABLE_SUFFIX} |
157 DEPENDS "${EXECUTABLE_OUTPUT_PATH}/hwengine${CMAKE_EXECUTABLE_SUFFIX}.386" "${EXECUTABLE_OUTPUT_PATH}/hwengine${CMAKE_EXECUTABLE_SUFFIX}.ppc" |
157 DEPENDS "${EXECUTABLE_OUTPUT_PATH}/hwengine${CMAKE_EXECUTABLE_SUFFIX}.386" "${EXECUTABLE_OUTPUT_PATH}/hwengine${CMAKE_EXECUTABLE_SUFFIX}.ppc" |
158 ) |
158 ) |
159 ENDIF(NOT APPLE OR NOT universal_build MATCHES "1") |
159 ENDIF(NOT APPLE OR NOT universal_build MATCHES "1") |
160 |
160 |
161 |
161 |
162 add_custom_target(hwengine ALL DEPENDS "${EXECUTABLE_OUTPUT_PATH}/hwengine${CMAKE_EXECUTABLE_SUFFIX}") |
162 add_custom_target(hwengine ALL DEPENDS "${EXECUTABLE_OUTPUT_PATH}/hwengine${CMAKE_EXECUTABLE_SUFFIX}") |