Skip to content

CMake build options improvements #593

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

Merged
walbourn merged 3 commits into from
Nov 5, 2025
Merged

CMake build options improvements #593

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3a7f434
CMake build options improvements
walbourn Nov 4, 2025
bf904b9
Code review feedback
walbourn Nov 4, 2025
96277e5
Code review
walbourn Nov 5, 2025
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
45 changes: 25 additions & 20 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,25 @@ if(XBOX_CONSOLE_TARGET STREQUAL "durango")
set(BUILD_XBOXONE_SHADERS ON)
set(BUILD_XAUDIO_WIN10 OFF)
set(BUILD_XAUDIO_WIN8 ON)
set(BUILD_XAUDIO_REDIST OFF)
set(BUILD_TOOLS OFF)
elseif(WINDOWS_STORE)
set(BUILD_GAMEINPUT OFF)
set(BUILD_WGI ON)
set(BUILD_XINPUT OFF)
set(BUILD_TOOLS OFF)
set(BUILD_XAUDIO_WIN10 ON)
set(BUILD_XAUDIO_WIN8 OFF)
set(BUILD_XAUDIO_REDIST OFF)
elseif(MINGW)
set(BUILD_WGI OFF)
set(BUILD_XAUDIO_WIN10 OFF)
set(BUILD_XAUDIO_WIN8 OFF)
if (NOT BUILD_GAMEINPUT)
set(BUILD_XINPUT ON)
endif()
elseif(WIN32 AND (NOT BUILD_GAMEINPUT) AND (NOT BUILD_WGI))
set(BUILD_XINPUT ON)
endif()

include(GNUInstallDirs)
Expand Down Expand Up @@ -145,15 +159,6 @@ set(SHADER_SOURCES
Src/Shaders/SpriteEffect.fx
Src/Shaders/ToneMap.fx)

# Xbox-specific extensions
if(DEFINED XBOX_CONSOLE_TARGET)
set(LIBRARY_HEADERS ${LIBRARY_HEADERS}
Inc/XboxDDSTextureLoader.h)

set(LIBRARY_SOURCES ${LIBRARY_SOURCES}
Src/XboxDDSTextureLoader.cpp)
endif()

# These source files are identical in both DX11 and DX12 version.
set(LIBRARY_HEADERS ${LIBRARY_HEADERS}
Inc/GamePad.h
Expand Down Expand Up @@ -193,14 +198,16 @@ set(SHADER_SOURCES ${SHADER_SOURCES}
Src/Shaders/Structures.fxh
Src/Shaders/Utilities.fxh)

if(MINGW)
set(BUILD_XAUDIO_WIN10 OFF)
set(BUILD_XAUDIO_WIN8 OFF)
# Xbox-specific extensions
if(DEFINED XBOX_CONSOLE_TARGET)
set(LIBRARY_HEADERS ${LIBRARY_HEADERS}
Inc/XboxDDSTextureLoader.h)

set(LIBRARY_SOURCES ${LIBRARY_SOURCES}
Src/XboxDDSTextureLoader.cpp)
endif()

if(WINDOWS_STORE
OR BUILD_XAUDIO_WIN10 OR BUILD_XAUDIO_WIN8
OR BUILD_XAUDIO_REDIST)
if(BUILD_XAUDIO_WIN10 OR BUILD_XAUDIO_WIN8 OR BUILD_XAUDIO_REDIST)
set(LIBRARY_HEADERS ${LIBRARY_HEADERS}
Inc/Audio.h)

Expand Down Expand Up @@ -274,7 +281,7 @@ if(WIN32 AND BUILD_SHARED_LIBS)
target_link_libraries(${PROJECT_NAME} PRIVATE kernelx.lib combase.lib d3d12_x.lib xi.lib)
endif()

if(MINGW)
if(MINGW AND BUILD_XINPUT)
target_link_libraries(${PROJECT_NAME} PRIVATE xinput1_4.lib)
endif()
else()
Expand All @@ -297,9 +304,7 @@ target_include_directories(${PROJECT_NAME} PUBLIC

target_compile_features(${PROJECT_NAME} PUBLIC cxx_std_11)

if(WINDOWS_STORE
OR BUILD_XAUDIO_WIN10 OR BUILD_XAUDIO_WIN8
OR BUILD_XAUDIO_REDIST)
if(BUILD_XAUDIO_WIN10 OR BUILD_XAUDIO_WIN8 OR BUILD_XAUDIO_REDIST)
target_include_directories(${PROJECT_NAME} PRIVATE Audio)
endif()

Expand All @@ -316,7 +321,7 @@ if(directxmath_FOUND)
endif()

if(BUILD_XAUDIO_REDIST
AND (NOT BUILD_XAUDIO_WIN10) AND (NOT BUILD_XAUDIO_WIN8) AND (NOT WINDOWS_STORE))
AND (NOT BUILD_XAUDIO_WIN10) AND (NOT BUILD_XAUDIO_WIN8))
message(STATUS "Using XAudio2Redist for DirectX Tool Kit for Audio.")
find_package(xaudio2redist CONFIG REQUIRED)
target_link_libraries(${PROJECT_NAME} PUBLIC Microsoft::XAudio2Redist)
Expand Down
6 changes: 4 additions & 2 deletions CMakePresets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,8 +122,7 @@
"cacheVariables": {
"BUILD_XAUDIO_WIN10": false,
"BUILD_XAUDIO_WIN8": false,
"BUILD_XAUDIO_REDIST": true,
"BUILD_XINPUT": true
"BUILD_XAUDIO_REDIST": true
},
"hidden": true
},
Expand Down Expand Up @@ -324,6 +323,9 @@
{ "name": "x86-Debug-MinGW" , "description": "MinG-W32 (Debug)", "inherits": [ "base", "x86", "Debug", "GNUC", "VCPKG", "XAudio2Redist", "MinGW32" ] },
{ "name": "x86-Release-MinGW", "description": "MinG-W32 (Release)", "inherits": [ "base", "x86", "Release", "GNUC", "VCPKG", "XAudio2Redist", "MinGW32" ] },

{ "name": "x64-Debug-MinGW-GI" , "description": "MinG-W64 (Debug) using GameInput", "inherits": [ "base", "x64", "Debug", "GNUC", "VCPKG", "XAudio2Redist", "MinGW64" ], "cacheVariables": { "BUILD_GAMEINPUT": "true" } },
{ "name": "x64-Release-MinGW-GI", "description": "MinG-W64 (Release) using GameInput", "inherits": [ "base", "x64", "Release", "GNUC", "VCPKG", "XAudio2Redist", "MinGW64" ], "cacheVariables": { "BUILD_GAMEINPUT": "true" } },

{ "name": "x64-Debug-ICC" , "description": "Intel Classic Compiler (Debug) for Windows 8", "inherits": [ "base", "x64", "Debug", "Intel" ] },
{ "name": "x64-Release-ICC" , "description": "Intel Classic Compiler (Release) for Windows 8", "inherits": [ "base", "x64", "Release", "Intel" ] },

Expand Down
Loading