diff options
| author | manuel <manuel@mausz.at> | 2017-08-15 17:40:26 +0200 |
|---|---|---|
| committer | manuel <manuel@mausz.at> | 2017-08-15 17:40:26 +0200 |
| commit | 86b22151f0758311fd146ff508e7254337414bc1 (patch) | |
| tree | fdd6ca46ba57b7f063740541c034ce60c7cdd0c5 /cmake/scripts/windows | |
| parent | 4c3251ec645c8b71820dab7e51e612e5919d4e75 (diff) | |
| download | kodi-pvr-build-86b22151f0758311fd146ff508e7254337414bc1.tar.gz kodi-pvr-build-86b22151f0758311fd146ff508e7254337414bc1.tar.bz2 kodi-pvr-build-86b22151f0758311fd146ff508e7254337414bc1.zip | |
sync with upstream
Diffstat (limited to 'cmake/scripts/windows')
| -rw-r--r-- | cmake/scripts/windows/ArchSetup.cmake | 2 | ||||
| -rw-r--r-- | cmake/scripts/windows/tools/patch.cmake | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/cmake/scripts/windows/ArchSetup.cmake b/cmake/scripts/windows/ArchSetup.cmake index 9634b3a..d438b05 100644 --- a/cmake/scripts/windows/ArchSetup.cmake +++ b/cmake/scripts/windows/ArchSetup.cmake | |||
| @@ -29,7 +29,7 @@ set(PYTHON_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/project/BuildDependencies/${ARCH}/inc | |||
| 29 | # -------- Compiler options --------- | 29 | # -------- Compiler options --------- |
| 30 | 30 | ||
| 31 | add_options(CXX ALL_BUILDS "/wd\"4996\"") | 31 | add_options(CXX ALL_BUILDS "/wd\"4996\"") |
| 32 | set(ARCH_DEFINES -D_WINDOWS -DTARGET_WINDOWS -D__SSE__ -D__SSE2__) | 32 | set(ARCH_DEFINES -D_WINDOWS -DTARGET_WINDOWS -DTARGET_WINDOWS_DESKTOP -D__SSE__ -D__SSE2__) |
| 33 | set(SYSTEM_DEFINES -DNOMINMAX -DHAS_DX -D__STDC_CONSTANT_MACROS | 33 | set(SYSTEM_DEFINES -DNOMINMAX -DHAS_DX -D__STDC_CONSTANT_MACROS |
| 34 | -DTAGLIB_STATIC -DNPT_CONFIG_ENABLE_LOGGING | 34 | -DTAGLIB_STATIC -DNPT_CONFIG_ENABLE_LOGGING |
| 35 | -DPLT_HTTP_DEFAULT_USER_AGENT="UPnP/1.0 DLNADOC/1.50 Kodi" | 35 | -DPLT_HTTP_DEFAULT_USER_AGENT="UPnP/1.0 DLNADOC/1.50 Kodi" |
diff --git a/cmake/scripts/windows/tools/patch.cmake b/cmake/scripts/windows/tools/patch.cmake index 0ef2952..0a342fa 100644 --- a/cmake/scripts/windows/tools/patch.cmake +++ b/cmake/scripts/windows/tools/patch.cmake | |||
| @@ -2,7 +2,7 @@ find_program(PATCH_FOUND NAMES patch patch.exe) | |||
| 2 | if(PATCH_FOUND) | 2 | if(PATCH_FOUND) |
| 3 | message(STATUS "patch utility found at ${PATCH_FOUND}") | 3 | message(STATUS "patch utility found at ${PATCH_FOUND}") |
| 4 | else() | 4 | else() |
| 5 | set(PATCH_ARCHIVE_NAME "patch-2.5.9-7-bin-1") | 5 | set(PATCH_ARCHIVE_NAME "patch-2.5.9-7-bin-3") |
| 6 | set(PATCH_ARCHIVE "${PATCH_ARCHIVE_NAME}.zip") | 6 | set(PATCH_ARCHIVE "${PATCH_ARCHIVE_NAME}.zip") |
| 7 | set(PATCH_URL "${KODI_MIRROR}/build-deps/win32/${PATCH_ARCHIVE}") | 7 | set(PATCH_URL "${KODI_MIRROR}/build-deps/win32/${PATCH_ARCHIVE}") |
| 8 | set(PATCH_DOWNLOAD ${BUILD_DIR}/download/${PATCH_ARCHIVE}) | 8 | set(PATCH_DOWNLOAD ${BUILD_DIR}/download/${PATCH_ARCHIVE}) |
