diff options
Diffstat (limited to 'cmake/scripts/windows/ArchSetup.cmake')
| -rw-r--r-- | cmake/scripts/windows/ArchSetup.cmake | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/cmake/scripts/windows/ArchSetup.cmake b/cmake/scripts/windows/ArchSetup.cmake index 032632c..f3628f2 100644 --- a/cmake/scripts/windows/ArchSetup.cmake +++ b/cmake/scripts/windows/ArchSetup.cmake | |||
| @@ -35,7 +35,6 @@ set(MINGW_LIBS_DIR ${CMAKE_SOURCE_DIR}/${DEPS_FOLDER_RELATIVE}/mingwlibs/${ARCH} | |||
| 35 | list(APPEND CMAKE_PREFIX_PATH ${MINGW_LIBS_DIR}) | 35 | list(APPEND CMAKE_PREFIX_PATH ${MINGW_LIBS_DIR}) |
| 36 | list(APPEND CMAKE_LIBRARY_PATH ${MINGW_LIBS_DIR}/bin) | 36 | list(APPEND CMAKE_LIBRARY_PATH ${MINGW_LIBS_DIR}/bin) |
| 37 | list(APPEND CMAKE_PREFIX_PATH ${DEPENDENCIES_DIR}) | 37 | list(APPEND CMAKE_PREFIX_PATH ${DEPENDENCIES_DIR}) |
| 38 | set(PYTHON_INCLUDE_DIR ${DEPENDENCIES_DIR}/include/python) | ||
| 39 | 38 | ||
| 40 | # -------- Compiler options --------- | 39 | # -------- Compiler options --------- |
| 41 | 40 | ||
| @@ -46,12 +45,9 @@ set(SYSTEM_DEFINES -DWIN32_LEAN_AND_MEAN -DNOMINMAX -DHAS_DX -D__STDC_CONSTANT_M | |||
| 46 | -DPLT_HTTP_DEFAULT_USER_AGENT="UPnP/1.0 DLNADOC/1.50 Kodi" | 45 | -DPLT_HTTP_DEFAULT_USER_AGENT="UPnP/1.0 DLNADOC/1.50 Kodi" |
| 47 | -DPLT_HTTP_DEFAULT_SERVER="UPnP/1.0 DLNADOC/1.50 Kodi" | 46 | -DPLT_HTTP_DEFAULT_SERVER="UPnP/1.0 DLNADOC/1.50 Kodi" |
| 48 | -DUNICODE -D_UNICODE | 47 | -DUNICODE -D_UNICODE |
| 48 | -DFRIBIDI_STATIC | ||
| 49 | $<$<CONFIG:Debug>:-DD3D_DEBUG_INFO>) | 49 | $<$<CONFIG:Debug>:-DD3D_DEBUG_INFO>) |
| 50 | 50 | ||
| 51 | if(${ARCH} STREQUAL win32) | ||
| 52 | list(APPEND SYSTEM_DEFINES $<$<CONFIG:Debug>:-D_ITERATOR_DEBUG_LEVEL=0>) | ||
| 53 | endif() | ||
| 54 | |||
| 55 | # Additional SYSTEM_DEFINES | 51 | # Additional SYSTEM_DEFINES |
| 56 | list(APPEND SYSTEM_DEFINES -DHAS_WIN32_NETWORK -DHAS_FILESYSTEM_SMB) | 52 | list(APPEND SYSTEM_DEFINES -DHAS_WIN32_NETWORK -DHAS_FILESYSTEM_SMB) |
| 57 | 53 | ||
| @@ -74,7 +70,8 @@ link_directories(${DEPENDENCIES_DIR}/lib) | |||
| 74 | 70 | ||
| 75 | # Additional libraries | 71 | # Additional libraries |
| 76 | list(APPEND DEPLIBS bcrypt.lib d3d11.lib DInput8.lib DSound.lib winmm.lib Mpr.lib Iphlpapi.lib WS2_32.lib | 72 | 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 Shlwapi.lib dwmapi.lib dxguid.lib DelayImp.lib) | 73 | PowrProf.lib setupapi.lib Shlwapi.lib dwmapi.lib dxguid.lib DelayImp.lib version.lib |
| 74 | crypt32.lib Mfplat.lib Mfuuid.lib Strmiids.lib) | ||
| 78 | 75 | ||
| 79 | # NODEFAULTLIB option | 76 | # NODEFAULTLIB option |
| 80 | set(_nodefaultlibs_RELEASE libcmt) | 77 | set(_nodefaultlibs_RELEASE libcmt) |
| @@ -87,7 +84,7 @@ foreach(_lib ${_nodefaultlibs_DEBUG}) | |||
| 87 | endforeach() | 84 | endforeach() |
| 88 | 85 | ||
| 89 | # DELAYLOAD option | 86 | # DELAYLOAD option |
| 90 | set(_delayloadlibs zlib.dll libmysql.dll libxslt.dll dnssd.dll dwmapi.dll sqlite3.dll | 87 | set(_delayloadlibs zlib.dll libmariadb.dll libxslt.dll dnssd.dll dwmapi.dll sqlite3.dll |
| 91 | d3dcompiler_47.dll) | 88 | d3dcompiler_47.dll) |
| 92 | foreach(_lib ${_delayloadlibs}) | 89 | foreach(_lib ${_delayloadlibs}) |
| 93 | set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /DELAYLOAD:\"${_lib}\"") | 90 | set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /DELAYLOAD:\"${_lib}\"") |
