diff options
| author | Aki <please@ignore.pl> | 2021-10-02 00:22:30 +0200 |
|---|---|---|
| committer | Aki <please@ignore.pl> | 2021-10-02 00:22:59 +0200 |
| commit | 7a0ecea108c41c85af1ce8e3f4a98089bff9aa86 (patch) | |
| tree | ee9fa37e7beb7477065c07c9560ae75347e9814a | |
| parent | 83073c9522536c32117234c573960b64a9bf13f8 (diff) | |
| download | starshatter-7a0ecea108c41c85af1ce8e3f4a98089bff9aa86.zip starshatter-7a0ecea108c41c85af1ce8e3f4a98089bff9aa86.tar.gz starshatter-7a0ecea108c41c85af1ce8e3f4a98089bff9aa86.tar.bz2 | |
Increased control over win sdk paths
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | Magic2/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | NetEx/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | Stars45/CMakeLists.txt | 13 |
4 files changed, 12 insertions, 11 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 1387ab6..e4ddfcb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.20) project(Starshatter) -set(WINDOWSSDK_LIBPATH "C:/Program Files (x86)/Windows Kits/10/Lib/10.0.19041.0/um/x86" CACHE FILEPATH "Path to Windows SDK libraries") -set(WINDOWSSDK_PATH "C:/Program Files (x86)/Windows Kits/10/Include/10.0.19041.0/um" CACHE FILEPATH "Path to Windows SDK header files") +set(WINDOWSSDK_LIBPATH "C:/Program Files (x86)/Windows Kits/10/Lib/10.0.19041.0" CACHE FILEPATH "Path to a versioned lib directory of selected Windows SDK") +set(WINDOWSSDK_PATH "C:/Program Files (x86)/Windows Kits/10/Include/10.0.19041.0" CACHE FILEPATH "Path to a versioned include directory of selected Windows SDK") add_subdirectory(Datafile) # /Doc contains various documentation and pre-generated Doxygen docs. add_subdirectory(FoundationEx) diff --git a/Magic2/CMakeLists.txt b/Magic2/CMakeLists.txt index 4753252..3bf0404 100644 --- a/Magic2/CMakeLists.txt +++ b/Magic2/CMakeLists.txt @@ -36,7 +36,7 @@ target_include_directories( Magic2 PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} PUBLIC $ENV{DXSDK_DIR}/Include - PUBLIC ${WINDOWSSDK_PATH} # FIXME + PUBLIC ${WINDOWSSDK_PATH}/um # FIXME ) target_precompile_headers( Magic2 diff --git a/NetEx/CMakeLists.txt b/NetEx/CMakeLists.txt index ccb0f01..c3c6652 100644 --- a/NetEx/CMakeLists.txt +++ b/NetEx/CMakeLists.txt @@ -17,11 +17,11 @@ add_library( NetServer.cpp NetSock.cpp ) -set(WINDOWSSDK_PATH "C:/Program Files (x86)/Windows Kits/10/Include/10.0.19041.0/um") target_include_directories( NetEx PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} - PUBLIC ${WINDOWSSDK_PATH} # FIXME + PUBLIC ${WINDOWSSDK_PATH}/um # FIXME + PUBLIC ${WINDOWSSDK_PATH}/shared ) target_link_libraries( NetEx diff --git a/Stars45/CMakeLists.txt b/Stars45/CMakeLists.txt index f7271ce..fd0f182 100644 --- a/Stars45/CMakeLists.txt +++ b/Stars45/CMakeLists.txt @@ -281,7 +281,8 @@ target_include_directories( PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../Opcode # FIXME: Opcode is badly injured. PUBLIC $ENV{DXSDK_DIR}/Include - PUBLIC ${WINDOWSSDK_PATH} # FIXME: Resolve this with a Find module or even find out why is going wrong - most sources say that it should be guaranteed. + PUBLIC ${WINDOWSSDK_PATH}/um # FIXME: Resolve this with a Find module or even find out why is going wrong - most sources say that it should be guaranteed. + PUBLIC ${WINDOWSSDK_PATH}/shared ) target_precompile_headers( Stars45 @@ -297,11 +298,11 @@ target_link_libraries( PUBLIC Ogg::ogg PUBLIC Png::png PUBLIC Opcode # FIXME: Add opcode to a namespace. - PUBLIC ${WINDOWSSDK_LIBPATH}/Ws2_32.lib - PUBLIC ${WINDOWSSDK_LIBPATH}/Vfw32.lib - PUBLIC ${WINDOWSSDK_LIBPATH}/wsock32.lib - PUBLIC ${WINDOWSSDK_LIBPATH}/winmm.lib - PUBLIC ${WINDOWSSDK_LIBPATH}/version.lib + PUBLIC ${WINDOWSSDK_LIBPATH}/um/x86/Ws2_32.lib + PUBLIC ${WINDOWSSDK_LIBPATH}/um/x86/Vfw32.lib + PUBLIC ${WINDOWSSDK_LIBPATH}/um/x86/wsock32.lib + PUBLIC ${WINDOWSSDK_LIBPATH}/um/x86/winmm.lib + PUBLIC ${WINDOWSSDK_LIBPATH}/um/x86/version.lib PUBLIC $ENV{DXSDK_DIR}/Lib/x86/dinput8.lib PUBLIC $ENV{DXSDK_DIR}/Lib/x86/dsound.lib PUBLIC $ENV{DXSDK_DIR}/Lib/x86/d3d9.lib |