diff options
Diffstat (limited to 'cmake/scripts/windows/ArchSetup.cmake')
| -rw-r--r-- | cmake/scripts/windows/ArchSetup.cmake | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/cmake/scripts/windows/ArchSetup.cmake b/cmake/scripts/windows/ArchSetup.cmake index b94842f..032632c 100644 --- a/cmake/scripts/windows/ArchSetup.cmake +++ b/cmake/scripts/windows/ArchSetup.cmake | |||
| @@ -32,9 +32,9 @@ set(DEPS_FOLDER_RELATIVE project/BuildDependencies) | |||
| 32 | set(DEPENDENCIES_DIR ${CMAKE_SOURCE_DIR}/${DEPS_FOLDER_RELATIVE}/${ARCH}) | 32 | set(DEPENDENCIES_DIR ${CMAKE_SOURCE_DIR}/${DEPS_FOLDER_RELATIVE}/${ARCH}) |
| 33 | set(MINGW_LIBS_DIR ${CMAKE_SOURCE_DIR}/${DEPS_FOLDER_RELATIVE}/mingwlibs/${ARCH}) | 33 | set(MINGW_LIBS_DIR ${CMAKE_SOURCE_DIR}/${DEPS_FOLDER_RELATIVE}/mingwlibs/${ARCH}) |
| 34 | 34 | ||
| 35 | list(APPEND CMAKE_SYSTEM_PREFIX_PATH ${MINGW_LIBS_DIR}) | 35 | list(APPEND CMAKE_PREFIX_PATH ${MINGW_LIBS_DIR}) |
| 36 | list(APPEND CMAKE_SYSTEM_LIBRARY_PATH ${MINGW_LIBS_DIR}/bin) | 36 | list(APPEND CMAKE_LIBRARY_PATH ${MINGW_LIBS_DIR}/bin) |
| 37 | list(APPEND CMAKE_SYSTEM_PREFIX_PATH ${DEPENDENCIES_DIR}) | 37 | list(APPEND CMAKE_PREFIX_PATH ${DEPENDENCIES_DIR}) |
| 38 | set(PYTHON_INCLUDE_DIR ${DEPENDENCIES_DIR}/include/python) | 38 | set(PYTHON_INCLUDE_DIR ${DEPENDENCIES_DIR}/include/python) |
| 39 | 39 | ||
| 40 | # -------- Compiler options --------- | 40 | # -------- Compiler options --------- |
| @@ -73,8 +73,8 @@ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SAFESEH:NO") | |||
| 73 | link_directories(${DEPENDENCIES_DIR}/lib) | 73 | link_directories(${DEPENDENCIES_DIR}/lib) |
| 74 | 74 | ||
| 75 | # Additional libraries | 75 | # Additional libraries |
| 76 | list(APPEND DEPLIBS d3d11.lib DInput8.lib DSound.lib winmm.lib Mpr.lib Iphlpapi.lib WS2_32.lib | 76 | list(APPEND DEPLIBS bcrypt.lib d3d11.lib DInput8.lib DSound.lib winmm.lib Mpr.lib Iphlpapi.lib WS2_32.lib |
| 77 | PowrProf.lib setupapi.lib dwmapi.lib dxguid.lib DelayImp.lib) | 77 | PowrProf.lib setupapi.lib Shlwapi.lib dwmapi.lib dxguid.lib DelayImp.lib) |
| 78 | 78 | ||
| 79 | # NODEFAULTLIB option | 79 | # NODEFAULTLIB option |
| 80 | set(_nodefaultlibs_RELEASE libcmt) | 80 | set(_nodefaultlibs_RELEASE libcmt) |
| @@ -88,8 +88,7 @@ endforeach() | |||
| 88 | 88 | ||
| 89 | # DELAYLOAD option | 89 | # DELAYLOAD option |
| 90 | set(_delayloadlibs zlib.dll libmysql.dll libxslt.dll dnssd.dll dwmapi.dll sqlite3.dll | 90 | set(_delayloadlibs zlib.dll libmysql.dll libxslt.dll dnssd.dll dwmapi.dll sqlite3.dll |
| 91 | avcodec-58.dll avfilter-7.dll avformat-58.dll avutil-56.dll | 91 | d3dcompiler_47.dll) |
| 92 | postproc-55.dll swresample-3.dll swscale-5.dll d3dcompiler_47.dll) | ||
| 93 | foreach(_lib ${_delayloadlibs}) | 92 | foreach(_lib ${_delayloadlibs}) |
| 94 | set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /DELAYLOAD:\"${_lib}\"") | 93 | set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /DELAYLOAD:\"${_lib}\"") |
| 95 | endforeach() | 94 | endforeach() |
