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

Merge with develop

Browse source 
--HG--
branch : compatibility-develop
This commit is contained in:
kervala 2015-12-15 18:46:51 +01:00
commit 9135ed66cf
1 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
code/CMakeModules/FindWindowsSDK.cmake
View file

@ -57,7 +57,7 @@ ELSEIF(TARGET_X64)
SET(WINSDK8_SUFFIX "x64") SET(WINSDK8_SUFFIX "x64")
SET(WINSDK_SUFFIXES "x64" "amd64") SET(WINSDK_SUFFIXES "x64" "amd64")
ELSEIF(TARGET_X86) ELSEIF(TARGET_X86)
SET(WINSDK8_SUFFIXES "x86") SET(WINSDK8_SUFFIX "x86")
ENDIF() ENDIF()
SET(WINSDKCURRENT_VERSION_INCLUDE $ENV{INCLUDE}) SET(WINSDKCURRENT_VERSION_INCLUDE $ENV{INCLUDE})
@ -310,9 +310,13 @@ SET(WINSDK_LIBRARY_DIRS
${WINSDK_DIR}/Lib/winv6.3/um/${WINSDK8_SUFFIX} ${WINSDK_DIR}/Lib/winv6.3/um/${WINSDK8_SUFFIX}
${WINSDK_DIR}/Lib/win8/um/${WINSDK8_SUFFIX}) ${WINSDK_DIR}/Lib/win8/um/${WINSDK8_SUFFIX})
FOREACH(_SUFFIX ${WINSDK_SUFFIXES}) IF(WINSDK_SUFFIXES)
FOREACH(_SUFFIX ${WINSDK_SUFFIXES})
SET(WINSDK_LIBRARY_DIRS ${WINSDK_LIBRARY_DIRS} ${WINSDK_DIR}/Lib/${_SUFFIX}) SET(WINSDK_LIBRARY_DIRS ${WINSDK_LIBRARY_DIRS} ${WINSDK_DIR}/Lib/${_SUFFIX})
ENDFOREACH() ENDFOREACH()
ELSE()
SET(WINSDK_LIBRARY_DIRS ${WINSDK_LIBRARY_DIRS} ${WINSDK_DIR}/Lib)
ENDIF()
# directory where all libraries are found # directory where all libraries are found
FIND_PATH(WINSDK_LIBRARY_DIR ComCtl32.lib FIND_PATH(WINSDK_LIBRARY_DIR ComCtl32.lib