From 7a0ecea108c41c85af1ce8e3f4a98089bff9aa86 Mon Sep 17 00:00:00 2001 From: Aki Date: Sat, 2 Oct 2021 00:22:30 +0200 Subject: Increased control over win sdk paths --- Stars45/CMakeLists.txt | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'Stars45') 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 -- cgit v1.1