equal
deleted
inserted
replaced
150 set(LUA_FOUND TRUE) |
150 set(LUA_FOUND TRUE) |
151 else() |
151 else() |
152 message(FATAL_ERROR "Missing Lua! Rerun cmake with -DLUA_SYSTEM=off to build the internal version") |
152 message(FATAL_ERROR "Missing Lua! Rerun cmake with -DLUA_SYSTEM=off to build the internal version") |
153 endif() |
153 endif() |
154 else() |
154 else() |
155 message(STATUS "LUA will be provided by the bundled sources") |
155 if (NOT LUA_LIBRARY OR NOT LUA_INCLUDE_DIR) |
|
156 message(STATUS "LUA will be provided by the bundled sources") |
|
157 endif() |
156 set(lua_output_name "hwlua") |
158 set(lua_output_name "hwlua") |
157 add_subdirectory(misc/liblua) |
159 add_subdirectory(misc/liblua) |
158 list(APPEND pascal_flags "-XLAlua=${lua_output_name}" "-dLUA_INTERNAL") |
160 list(APPEND pascal_flags "-XLAlua=${lua_output_name}" "-dLUA_INTERNAL") |
159 endif() |
161 endif() |
160 |
162 |
183 |
185 |
184 if (NOT PHYSFS_LIBRARY OR NOT PHYSFS_INCLUDE_DIR) |
186 if (NOT PHYSFS_LIBRARY OR NOT PHYSFS_INCLUDE_DIR) |
185 message(FATAL_ERROR "Missing PhysFS! Rerun cmake with -DPHYSFS_SYSTEM=off to build the internal version") |
187 message(FATAL_ERROR "Missing PhysFS! Rerun cmake with -DPHYSFS_SYSTEM=off to build the internal version") |
186 endif() |
188 endif() |
187 else() |
189 else() |
188 message(STATUS "PhysFS will be provided by the bundled sources") |
190 if (NOT PHYSFS_LIBRARY OR NOT PHYSFS_INCLUDE_DIR) |
|
191 message(STATUS "PhysFS will be provided by the bundled sources") |
|
192 endif() |
189 set(physfs_output_name "hwphysfs") |
193 set(physfs_output_name "hwphysfs") |
190 add_subdirectory(misc/libphysfs) |
194 add_subdirectory(misc/libphysfs) |
191 #-XLA is a beta fpc flag that renames libraries before passing them to the linker |
195 #-XLA is a beta fpc flag that renames libraries before passing them to the linker |
192 #we also have to pass PHYSFS_INTERNAL to satisfy windows runtime requirements |
196 #we also have to pass PHYSFS_INTERNAL to satisfy windows runtime requirements |
193 #(should be harmless on other platforms) |
197 #(should be harmless on other platforms) |