diff options
author | wsoltys <wiso@no.way> | 2014-05-10 11:11:46 +0200 |
---|---|---|
committer | wsoltys <wiso@no.way> | 2014-05-27 21:07:42 +0200 |
commit | ea9f863f18a89e1b1f5b951f55e54fa2cf24be7c (patch) | |
tree | 49a7a3213a69c5f099b500b3e60605e871121e17 | |
parent | b9553a4ab2948b71ad8ec0190ee0034024152895 (diff) |
[WIN32] compile XBMC with vs2013
-rw-r--r-- | lib/cmyth/Win32/libcmyth.vcxproj | 2 | ||||
-rw-r--r-- | project/VS2010Express/XBMC for Windows.sln | 6 | ||||
-rw-r--r-- | project/VS2010Express/XBMC.core-defaults.props | 2 | ||||
-rw-r--r-- | project/VS2010Express/XBMC.vcxproj | 4 | ||||
-rw-r--r-- | xbmc/win32/PlatformDefs.h | 2 |
5 files changed, 10 insertions, 6 deletions
diff --git a/lib/cmyth/Win32/libcmyth.vcxproj b/lib/cmyth/Win32/libcmyth.vcxproj index 0f9615ebc7..d075528131 100644 --- a/lib/cmyth/Win32/libcmyth.vcxproj +++ b/lib/cmyth/Win32/libcmyth.vcxproj @@ -61,7 +61,7 @@ <Link> <AdditionalDependencies>ws2_32.lib;mysqlclient.lib;%(AdditionalDependencies)</AdditionalDependencies> <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile> - <IgnoreSpecificDefaultLibraries>LIBCMT;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries> + <IgnoreSpecificDefaultLibraries>LIBCMTD;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries> <ModuleDefinitionFile>libcmyth.def</ModuleDefinitionFile> <RandomizedBaseAddress>false</RandomizedBaseAddress> <DataExecutionPrevention> diff --git a/project/VS2010Express/XBMC for Windows.sln b/project/VS2010Express/XBMC for Windows.sln index b664223e0e..3c57f615dc 100644 --- a/project/VS2010Express/XBMC for Windows.sln +++ b/project/VS2010Express/XBMC for Windows.sln @@ -1,5 +1,7 @@ -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual C++ Express 2010 +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2013 +VisualStudioVersion = 12.0.30110.0 +MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XBMC", "XBMC.vcxproj", "{3A68081D-E8F9-4523-9436-530DE9E5530A}" ProjectSection(ProjectDependencies) = postProject {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7} = {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7} diff --git a/project/VS2010Express/XBMC.core-defaults.props b/project/VS2010Express/XBMC.core-defaults.props index 4b49fb0b20..eb154cf786 100644 --- a/project/VS2010Express/XBMC.core-defaults.props +++ b/project/VS2010Express/XBMC.core-defaults.props @@ -5,6 +5,6 @@ <PropertyGroup Label="Configuration"> <UseOfMfc>false</UseOfMfc> <UseOfAtl>false</UseOfAtl> - <PlatformToolset>v100</PlatformToolset> + <PlatformToolset>v120</PlatformToolset> </PropertyGroup> </Project> diff --git a/project/VS2010Express/XBMC.vcxproj b/project/VS2010Express/XBMC.vcxproj index dd3abd13a5..bf3544277b 100644 --- a/project/VS2010Express/XBMC.vcxproj +++ b/project/VS2010Express/XBMC.vcxproj @@ -156,7 +156,7 @@ <AdditionalOptions>/IGNORE:4089 /ignore:4254 %(AdditionalOptions)</AdditionalOptions> <AdditionalDependencies>D3dx9.lib;DInput8.lib;DSound.lib;winmm.lib;Mpr.lib;Iphlpapi.lib;PowrProf.lib;setupapi.lib;dwmapi.lib;yajl.lib;dxguid.lib;%(AdditionalDependencies)</AdditionalDependencies> <OutputFile>$(OutDir)XBMC.exe</OutputFile> - <IgnoreSpecificDefaultLibraries>libc;msvcrt;libcmt;msvcrtd;msvcprtd;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries> + <IgnoreSpecificDefaultLibraries>libcpmt;libc;msvcrt;libcmt;msvcrtd;msvcprtd;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries> <ModuleDefinitionFile> </ModuleDefinitionFile> <DelayLoadDLLs>libxslt.dll;dnssd.dll;dwmapi.dll;libmicrohttpd-5.dll;ssh.dll;sqlite3.dll;avcodec-55.dll;avfilter-4.dll;avformat-55.dll;avutil-52.dll;postproc-52.dll;swresample-0.dll;swscale-2.dll;%(DelayLoadDLLs)</DelayLoadDLLs> @@ -166,6 +166,7 @@ <RandomizedBaseAddress>true</RandomizedBaseAddress> <DataExecutionPrevention>true</DataExecutionPrevention> <AdditionalLibraryDirectories>..\..\lib\win32\ffmpeg\.libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers> </Link> <Manifest> <AdditionalManifestFiles>VC90.CRT.x86.manifest;win81.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles> @@ -229,6 +230,7 @@ <RandomizedBaseAddress>true</RandomizedBaseAddress> <DataExecutionPrevention>true</DataExecutionPrevention> <AdditionalLibraryDirectories>..\..\lib\win32\ffmpeg\.libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers> </Link> <Manifest> <AdditionalManifestFiles>VC90.CRT.x86.manifest;win81.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles> diff --git a/xbmc/win32/PlatformDefs.h b/xbmc/win32/PlatformDefs.h index 95c028d435..3cb4cdf150 100644 --- a/xbmc/win32/PlatformDefs.h +++ b/xbmc/win32/PlatformDefs.h @@ -26,7 +26,7 @@ #define LINE_ENDING "\r\n" #define __STDC_FORMAT_MACROS -#include "inttypes.h" +#include <inttypes.h> typedef __int64 off64_t; typedef __int64 fpos64_t; |