Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CMake refactoring #1535

Merged
merged 4 commits into from
Dec 1, 2023
Merged

CMake refactoring #1535

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0916535
CMake refactoring
Masterkatze Oct 19, 2023
1e12904
Update 1
Masterkatze Nov 24, 2023
85ed9ee
Fix PURE_DYNAMIC_CAST-related build issue
Masterkatze Nov 27, 2023
f042e08
Fix Alpine build
Masterkatze Nov 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
292 changes: 104 additions & 188 deletions CMakeLists.txt
View file
Open in desktop

Large diffs are not rendered by default.

16 changes: 15 additions & 1 deletion Externals/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,25 @@
add_subdirectory(LuaJIT-proj)
if (XRAY_USE_LUAJIT)
add_subdirectory(LuaJIT-proj)
else()
find_package(Lua51 REQUIRED)
endif()

add_subdirectory(xrLuaFix)
add_subdirectory(luabind)

if (USE_CXIMAGE)
add_subdirectory(cximage)
endif()

add_subdirectory(GameSpy)
add_subdirectory(OPCODE)
add_subdirectory(ode)
#add_subdirectory(NVTT)
add_subdirectory(imgui-proj)

if (NOT TARGET xrLuabind)
message(FATAL_ERROR
"You probably have downloaded OpenXRay sources as ZIP archive, you can't do that. Use git to clone the repository.\n"
"Read the build instructions: https://github.com/OpenXRay/xray-16/wiki"
)
endif()
2 changes: 1 addition & 1 deletion Externals/GameSpy
Open in desktop
Submodule GameSpy updated 1 files
+175 −176 src/GameSpy/CMakeLists.txt
Loading