diff options
author | Pär Björklund <per.bjorklund@gmail.com> | 2016-04-09 18:54:00 +0200 |
---|---|---|
committer | Pär Björklund <per.bjorklund@gmail.com> | 2016-04-09 18:54:00 +0200 |
commit | 8029f7c6cdfc7012c67eb63300ba6e22605e4d23 (patch) | |
tree | 688a444621957d99a7cfd940831523004cb0c51c /project | |
parent | 68f26a41443e8af8cb11c5059a673f3b30cc7343 (diff) |
Remove commented stuff, update cmake builds as well and ofc, packaging crossguid failed so bump it to v3
Diffstat (limited to 'project')
4 files changed, 9 insertions, 15 deletions
diff --git a/project/BuildDependencies/scripts/0_package.list b/project/BuildDependencies/scripts/0_package.list index 86b6020d85..0eb21e73c1 100644 --- a/project/BuildDependencies/scripts/0_package.list +++ b/project/BuildDependencies/scripts/0_package.list @@ -7,7 +7,7 @@ ; -> ... ;PLEASE KEEP THIS LIST IN ALPHABETICAL ORDER! bzip2-1.0.5-win32.7z -crossguid-8f399e-win32-vc140-v2.7z +crossguid-8f399e-win32-vc140-v3.7z curl-7.48-win32-vc140.7z dnssd-541-win32.zip doxygen-1.8.2-win32.7z diff --git a/project/cmake/scripts/windows/archsetup.cmake b/project/cmake/scripts/windows/archsetup.cmake index 0b86b05223..a54ab65578 100644 --- a/project/cmake/scripts/windows/archsetup.cmake +++ b/project/cmake/scripts/windows/archsetup.cmake @@ -29,13 +29,7 @@ set(SYSTEM_DEFINES -DNOMINMAX -D_USE_32BIT_TIME_T -DHAS_DX -D__STDC_CONSTANT_MAC -DPLT_HTTP_DEFAULT_USER_AGENT="UPnP/1.0 DLNADOC/1.50 Kodi" -DPLT_HTTP_DEFAULT_SERVER="UPnP/1.0 DLNADOC/1.50 Kodi" -DBUILDING_WITH_CMAKE - $<$<CONFIG:Debug>:-DD3D_DEBUG_INFO -D_SECURE_SCL=0>) - -# Compile with /MT (to be compatible with the dependent libraries) -foreach(CompilerFlag CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE - CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO) - string(REPLACE "/MD" "/MT" ${CompilerFlag} "${${CompilerFlag}}") -endforeach() + $<$<CONFIG:Debug>:-DD3D_DEBUG_INFO -D_ITERATOR_DEBUG_LEVEL=0>) # Make sure /FS is set for Visual Studio in order to prevent simultanious access to pdb files. if(CMAKE_GENERATOR MATCHES "Visual Studio") @@ -57,8 +51,8 @@ list(APPEND DEPLIBS d3d11.lib DInput8.lib DSound.lib winmm.lib Mpr.lib Iphlpapi. PowrProf.lib setupapi.lib dwmapi.lib yajl.lib dxguid.lib DelayImp.lib) # NODEFAULTLIB option -set(_nodefaultlibs_RELEASE libc msvcrt libci msvcprt) -set(_nodefaultlibs_DEBUG libcpmt libc msvcrt libcmt msvcrtd msvcprtd) +set(_nodefaultlibs_RELEASE libcmt) +set(_nodefaultlibs_DEBUG libcmt msvcrt) foreach(_lib ${_nodefaultlibs_RELEASE}) set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /NODEFAULTLIB:\"${_lib}\"") endforeach() @@ -67,7 +61,7 @@ foreach(_lib ${_nodefaultlibs_DEBUG}) endforeach() # DELAYLOAD option -set(_delayloadlibs libxslt.dll dnssd.dll dwmapi.dll ssh.dll sqlite3.dll +set(_delayloadlibs zlib.dll libmysql.dll libxslt.dll dnssd.dll dwmapi.dll ssh.dll sqlite3.dll avcodec-57.dll avfilter-6.dll avformat-57.dll avutil-55.dll postproc-54.dll swresample-2.dll swscale-4.dll d3dcompiler_47.dll) foreach(_lib ${_delayloadlibs}) diff --git a/project/cmake/scripts/windows/c-flag-overrides.cmake b/project/cmake/scripts/windows/c-flag-overrides.cmake index ab19701707..1d3c13b9ef 100644 --- a/project/cmake/scripts/windows/c-flag-overrides.cmake +++ b/project/cmake/scripts/windows/c-flag-overrides.cmake @@ -1,5 +1,5 @@ if(MSVC) set(CMAKE_C_FLAGS "/MP /DWIN32 /D_WINDOWS /W3 /Zi /arch:SSE2") - set(CMAKE_C_FLAGS_DEBUG "/D_DEBUG /MDd /Ob0 /Od /RTC1 /D_HAS_ITERATOR_DEBUGGING=0 /D_SECURE_SCL=0") + set(CMAKE_C_FLAGS_DEBUG "/D_DEBUG /MDd /Ob0 /Od /RTC1 /D_ITERATOR_DEBUG_LEVEL=0") set(CMAKE_C_FLAGS_RELEASE "/MD /Ox /Ob2 /Oi /Ot /Oy /GL /DNDEBUG") -endif(MSVC)
\ No newline at end of file +endif(MSVC) diff --git a/project/cmake/scripts/windows/cxx-flag-overrides.cmake b/project/cmake/scripts/windows/cxx-flag-overrides.cmake index ad3a0908ef..31295a7350 100644 --- a/project/cmake/scripts/windows/cxx-flag-overrides.cmake +++ b/project/cmake/scripts/windows/cxx-flag-overrides.cmake @@ -1,5 +1,5 @@ if(MSVC) set(CMAKE_CXX_FLAGS "/MP /DWIN32 /D_WINDOWS /W3 /GR /Zi /EHsc /arch:SSE2") - set(CMAKE_CXX_FLAGS_DEBUG "/D_DEBUG /MDd /Ob0 /Od /RTC1 /D_HAS_ITERATOR_DEBUGGING=0 /D_SECURE_SCL=0") + set(CMAKE_CXX_FLAGS_DEBUG "/D_DEBUG /MDd /Ob0 /Od /RTC1 /D_ITERATOR_DEBUG_LEVEL=0") set(CMAKE_CXX_FLAGS_RELEASE "/MD /Ox /Ob2 /Oi /Ot /Oy /GL /DNDEBUG") -endif(MSVC)
\ No newline at end of file +endif(MSVC) |