From e04e69c7313f875e957107ffd0602bbaa9b7f655 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A4r=20Bj=C3=B6rklund?= Date: Wed, 29 Jul 2015 14:49:20 +0200 Subject: Visual studio 2015 fixes --- project/BuildDependencies/scripts/0_package.list | 20 ++++++++++---------- project/VS2010Express/UnrarXLib.vcxproj | 4 +++- project/VS2010Express/XBMC.defaults.props | 10 ++++------ project/VS2010Express/XBMC.vcxproj | 7 ++++++- project/VS2010Express/XbmcCommons.vcxproj | 4 +++- project/VS2010Express/XbmcThreads.vcxproj | 4 +++- project/VS2010Express/libPlatinum.vcxproj | 4 +++- project/Win32BuildSetup/BuildSetup.bat | 10 +++++----- 8 files changed, 37 insertions(+), 26 deletions(-) (limited to 'project') diff --git a/project/BuildDependencies/scripts/0_package.list b/project/BuildDependencies/scripts/0_package.list index 52a89187dd..58a4fb78ca 100644 --- a/project/BuildDependencies/scripts/0_package.list +++ b/project/BuildDependencies/scripts/0_package.list @@ -7,8 +7,8 @@ ; -> ... ;PLEASE KEEP THIS LIST IN ALPHABETICAL ORDER! bzip2-1.0.5-win32.7z -crossguid-8f399e8bd4-win32.7z -curl-7.42.1-win32.7z +crossguid-8f399e-win32-vc140.7z +curl-7.46.0-win32-vc140.7z dnssd-541-win32.zip doxygen-1.8.2-win32.7z fontconfig-2.8.0-win32.7z @@ -22,17 +22,15 @@ libcec-3.0.0-win32-2.7z libexpat_2.0.1-win32.7z libflac-1.2.1-win32.7z libfribidi-0.19.2-win32.7z -libiconv-1.14-win32-vc120.7z +libiconv-1.14-win32-vc140.7z libjpeg-turbo-1.2.0-win32.7z liblzo-2.04-win32.7z -libmicrohttpd-svn-35533-win32-vc120.7z +libmicrohttpd-0.9.48-win32-vc140.7z libnfs-1.10.0-win32.7z libogg-vc100-1.2.0-win32.7z libplist-1.7-win32-3.7z libpng-1.5.13-win32.7z librtmp-20150114-git-a107ce-win32.7z -libsdl-1.2.10-win32.7z -libsdl_image-1.2.14-win32.7z libshairplay-52fd9db-win32.7z libssh-0.5.0-1-win32.zip libvorbis-vc100-1.3.1-win32.7z @@ -40,12 +38,14 @@ libxml2-2.7.8_1-win32.7z libxslt-1.1.26_1-win32.7z libyajl-2.0.1-win32.7z libzlib-vc100-1.2.5-win32.7z -mysqlclient-6.1.3-win32-vc120.7z -pcre-8.34-win32-vc120.7z -PIL-1.1.7p-win32.7z -python-2.7.10-win32.7z +mysql-connector-c-6.1.6-win32-vc140.7z +openssl-1.0.2e-win32-vc140.7z +pcre-8.37-win32-vc140.7z +pillow-3.1.0-win32-vc140.7z +python-2.7.11-win32-vc140.7z sqlite-3.10.2-win32-vc140.7z swig-2.0.7-win32-1.7z taglib-1.10-win32-vc120.7z texturepacker-1.1.0-win32.7z tinyxml-2.6.2_3-win32-vc120.7z +zlib-1.2.8-win32-vc140.7z \ No newline at end of file diff --git a/project/VS2010Express/UnrarXLib.vcxproj b/project/VS2010Express/UnrarXLib.vcxproj index 2f8d090a9c..35f7dde56e 100644 --- a/project/VS2010Express/UnrarXLib.vcxproj +++ b/project/VS2010Express/UnrarXLib.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -21,11 +21,13 @@ StaticLibrary false MultiByte + v140 StaticLibrary true MultiByte + v140 diff --git a/project/VS2010Express/XBMC.defaults.props b/project/VS2010Express/XBMC.defaults.props index 6ba8a27a42..80f42a034c 100644 --- a/project/VS2010Express/XBMC.defaults.props +++ b/project/VS2010Express/XBMC.defaults.props @@ -2,12 +2,12 @@ - $(SolutionDir)\..\BuildDependencies\include;$(SolutionDir)\..\BuildDependencies\include\python;$(IncludePath) $(SolutionDir)\..\..\tools\win32buildtools;$(ExecutablePath) - KODI_HOME=$(SolutionDir)..\.. PATH=$(SolutionDir)..\Win32BuildSetup\dependencies;%PATH% + KODI_HOME=$(SolutionDir)..\.. +PATH=$(SolutionDir)..\Win32BuildSetup\dependencies;%PATH% @@ -27,7 +27,6 @@ QueueForNextLogin - $(SolutionDir)\..\BuildDependencies\lib\Debug-vc120;$(SolutionDir)\..\BuildDependencies\lib;$(LibraryPath) @@ -37,7 +36,7 @@ Disabled false - _DEBUG;TARGET_WINDOWS;_WINDOWS;WIN32;_XBMC;_WIN32_WINNT=0x0600;NTDDI_VERSION=0x06000000;_HAS_ITERATOR_DEBUGGING=0;%(PreprocessorDefinitions) + _DEBUG;TARGET_WINDOWS;_WINDOWS;WIN32;_XBMC;_WIN32_WINNT=0x0600;NTDDI_VERSION=0x06000000;%(PreprocessorDefinitions) MultiThreadedDebug MultiThreadedDebug MultiThreadedDebugDLL @@ -48,7 +47,6 @@ true - $(SolutionDir)\..\BuildDependencies\lib\Release-vc120;$(SolutionDir)\..\BuildDependencies\lib;$(LibraryPath) @@ -79,4 +77,4 @@ - + \ No newline at end of file diff --git a/project/VS2010Express/XBMC.vcxproj b/project/VS2010Express/XBMC.vcxproj index 1cfe059387..43598268f9 100644 --- a/project/VS2010Express/XBMC.vcxproj +++ b/project/VS2010Express/XBMC.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -19,6 +19,7 @@ XBMC_PC Win32Proj Kodi + 8.1 @@ -26,18 +27,22 @@ Application false MultiByte + v140 + true Application true MultiByte false + v140 Application true MultiByte false + v140 diff --git a/project/VS2010Express/XbmcCommons.vcxproj b/project/VS2010Express/XbmcCommons.vcxproj index 18af62a925..0643b36669 100644 --- a/project/VS2010Express/XbmcCommons.vcxproj +++ b/project/VS2010Express/XbmcCommons.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -29,10 +29,12 @@ StaticLibrary false + v140 StaticLibrary true + v140 StaticLibrary diff --git a/project/VS2010Express/XbmcThreads.vcxproj b/project/VS2010Express/XbmcThreads.vcxproj index a5cecd8f6e..0db38a0cb9 100644 --- a/project/VS2010Express/XbmcThreads.vcxproj +++ b/project/VS2010Express/XbmcThreads.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -60,10 +60,12 @@ StaticLibrary false + v140 StaticLibrary true + v140 StaticLibrary diff --git a/project/VS2010Express/libPlatinum.vcxproj b/project/VS2010Express/libPlatinum.vcxproj index 9f94507395..c49784a859 100644 --- a/project/VS2010Express/libPlatinum.vcxproj +++ b/project/VS2010Express/libPlatinum.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -21,11 +21,13 @@ StaticLibrary false MultiByte + v140 StaticLibrary true MultiByte + v140 diff --git a/project/Win32BuildSetup/BuildSetup.bat b/project/Win32BuildSetup/BuildSetup.bat index 3364d24403..f3e1d8e392 100644 --- a/project/Win32BuildSetup/BuildSetup.bat +++ b/project/Win32BuildSetup/BuildSetup.bat @@ -49,14 +49,14 @@ SET buildconfig=Release set WORKSPACE=%CD%\..\.. - REM look for MSBuild.exe delivered with Visual Studio 2013 - FOR /F "tokens=2,* delims= " %%A IN ('REG QUERY HKLM\SOFTWARE\Microsoft\MSBuild\ToolsVersions\12.0 /v MSBuildToolsRoot') DO SET MSBUILDROOT=%%B - SET NET="%MSBUILDROOT%12.0\bin\MSBuild.exe" + REM look for MSBuild.exe delivered with Visual Studio 2015 + FOR /F "tokens=2,* delims= " %%A IN ('REG QUERY HKLM\SOFTWARE\Microsoft\MSBuild\ToolsVersions\14.0 /v MSBuildToolsRoot') DO SET MSBUILDROOT=%%B + SET NET="%MSBUILDROOT%14.0\bin\MSBuild.exe" IF EXIST "!NET!" ( set msbuildemitsolution=1 - set OPTS_EXE="..\VS2010Express\XBMC for Windows.sln" /t:Build /p:Configuration="%buildconfig%" /property:VCTargetsPath="%MSBUILDROOT%Microsoft.Cpp\v4.0\V120" /m - set CLEAN_EXE="..\VS2010Express\XBMC for Windows.sln" /t:Clean /p:Configuration="%buildconfig%" /property:VCTargetsPath="%MSBUILDROOT%Microsoft.Cpp\v4.0\V120" + set OPTS_EXE="..\VS2010Express\XBMC for Windows.sln" /t:Build /p:Configuration="%buildconfig%" /property:VCTargetsPath="%MSBUILDROOT%Microsoft.Cpp\v4.0\V140" /m + set CLEAN_EXE="..\VS2010Express\XBMC for Windows.sln" /t:Clean /p:Configuration="%buildconfig%" /property:VCTargetsPath="%MSBUILDROOT%Microsoft.Cpp\v4.0\V140" ) IF NOT EXIST %NET% ( -- cgit v1.2.3