Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Fixed: Use 32 bits libraries from Windows SDK in 64 bits

Browse source
This commit is contained in:
kervala 2013-09-06 14:48:21 +02:00
parent 18e583f33b
commit 071f943610
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
code/CMakeModules/FindWindowsSDK.cmake
View file

@ -43,10 +43,13 @@ FOREACH(_VERSION ${WINSDK_VERSIONS})
DETECT_WINSDK_VERSION(${_VERSION}) DETECT_WINSDK_VERSION(${_VERSION})
ENDFOREACH(_VERSION) ENDFOREACH(_VERSION)
SET(WINSDK_SUFFIX)
IF(TARGET_ARM) IF(TARGET_ARM)
SET(WINSDK8_SUFFIX "arm") SET(WINSDK8_SUFFIX "arm")
ELSEIF(TARGET_X64) ELSEIF(TARGET_X64)
SET(WINSDK8_SUFFIX "x64") SET(WINSDK8_SUFFIX "x64")
SET(WINSDK_SUFFIX "x64")
ELSEIF(TARGET_X86) ELSEIF(TARGET_X86)
SET(WINSDK8_SUFFIX "x86") SET(WINSDK8_SUFFIX "x86")
ENDIF(TARGET_ARM) ENDIF(TARGET_ARM)
@ -133,7 +136,7 @@ FIND_PATH(WINSDK_SHARED_INCLUDE_DIR d3d9.h
FIND_PATH(WINSDK_LIBRARY_DIR ComCtl32.lib FIND_PATH(WINSDK_LIBRARY_DIR ComCtl32.lib
HINTS HINTS
${WINSDK_DIR}/Lib/win8/um/${WINSDK8_SUFFIX} ${WINSDK_DIR}/Lib/win8/um/${WINSDK8_SUFFIX}
${WINSDK_DIR}/Lib ${WINSDK_DIR}/Lib/${WINSDK_SUFFIX}
) )
# signtool is used to sign executables # signtool is used to sign executables