aleajactaest/khanat-opennel-code
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-opennel-code.git synced 2024-09-21 12:10:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge with develop

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

18
code/CMakeModules/FindWindowsSDK.cmake
View file

@ -49,15 +49,15 @@ FOREACH(_VERSION ${WINSDK_VERSIONS})
ENDIF() ENDIF()
ENDFOREACH() ENDFOREACH()
SET(WINSDK_SUFFIX) SET(WINSDK_SUFFIXES)
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") SET(WINSDK_SUFFIXES "x64" "amd64")
ELSEIF(TARGET_X86) ELSEIF(TARGET_X86)
SET(WINSDK8_SUFFIX "x86") SET(WINSDK8_SUFFIXES "x86")
ENDIF() ENDIF()
SET(WINSDKCURRENT_VERSION_INCLUDE $ENV{INCLUDE}) SET(WINSDKCURRENT_VERSION_INCLUDE $ENV{INCLUDE})
@ -306,12 +306,18 @@ FIND_PATH(WINSDK_OPENGL_INCLUDE_DIR GL.h
${WINSDK_DIR}/Include ${WINSDK_DIR}/Include
) )
SET(WINSDK_LIBRARY_DIRS
${WINSDK_DIR}/Lib/winv6.3/um/${WINSDK8_SUFFIX}
${WINSDK_DIR}/Lib/win8/um/${WINSDK8_SUFFIX})
FOREACH(_SUFFIX ${WINSDK_SUFFIXES})
SET(WINSDK_LIBRARY_DIRS ${WINSDK_LIBRARY_DIRS} ${WINSDK_DIR}/Lib/${_SUFFIX})
ENDFOREACH()
# 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
HINTS HINTS
${WINSDK_DIR}/Lib/winv6.3/um/${WINSDK8_SUFFIX} ${WINSDK_LIBRARY_DIRS}
${WINSDK_DIR}/Lib/win8/um/${WINSDK8_SUFFIX}
${WINSDK_DIR}/Lib/${WINSDK_SUFFIX}
) )
# signtool is used to sign executables # signtool is used to sign executables