diff options
| author | 2013-09-26 22:48:31 -0400 | |
|---|---|---|
| committer | 2013-09-26 22:48:31 -0400 | |
| commit | a79fb90d624dceca25635a207cf3ae9c47c531f9 (patch) | |
| tree | 1f9eb1fdcd6919c13171551b145967b744cfd852 /src | |
| parent | added system.h to project (diff) | |
| download | yuzu-a79fb90d624dceca25635a207cf3ae9c47c531f9.tar.gz yuzu-a79fb90d624dceca25635a207cf3ae9c47c531f9.tar.xz yuzu-a79fb90d624dceca25635a207cf3ae9c47c531f9.zip | |
upgraded proj files to vs 2013
Diffstat (limited to 'src')
| -rw-r--r-- | src/citra/citra.vcxproj | 7 | ||||
| -rw-r--r-- | src/citra/citra.vcxproj.filters | 3 | ||||
| -rw-r--r-- | src/common/common.vcxproj | 6 | ||||
| -rw-r--r-- | src/common/scm_rev_gen.vcxproj | 12 | ||||
| -rw-r--r-- | src/core/core.vcxproj | 6 |
5 files changed, 29 insertions, 5 deletions
diff --git a/src/citra/citra.vcxproj b/src/citra/citra.vcxproj index 2645d3c3c..8f29e3e63 100644 --- a/src/citra/citra.vcxproj +++ b/src/citra/citra.vcxproj | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
| 2 | <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | 2 | <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
| 3 | <ItemGroup Label="ProjectConfigurations"> | 3 | <ItemGroup Label="ProjectConfigurations"> |
| 4 | <ProjectConfiguration Include="Debug|Win32"> | 4 | <ProjectConfiguration Include="Debug|Win32"> |
| 5 | <Configuration>Debug</Configuration> | 5 | <Configuration>Debug</Configuration> |
| @@ -28,18 +28,22 @@ | |||
| 28 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> | 28 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> |
| 29 | <ConfigurationType>Application</ConfigurationType> | 29 | <ConfigurationType>Application</ConfigurationType> |
| 30 | <UseDebugLibraries>true</UseDebugLibraries> | 30 | <UseDebugLibraries>true</UseDebugLibraries> |
| 31 | <PlatformToolset>v120</PlatformToolset> | ||
| 31 | </PropertyGroup> | 32 | </PropertyGroup> |
| 32 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> | 33 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> |
| 33 | <ConfigurationType>Application</ConfigurationType> | 34 | <ConfigurationType>Application</ConfigurationType> |
| 34 | <UseDebugLibraries>true</UseDebugLibraries> | 35 | <UseDebugLibraries>true</UseDebugLibraries> |
| 36 | <PlatformToolset>v120</PlatformToolset> | ||
| 35 | </PropertyGroup> | 37 | </PropertyGroup> |
| 36 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> | 38 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> |
| 37 | <ConfigurationType>Application</ConfigurationType> | 39 | <ConfigurationType>Application</ConfigurationType> |
| 38 | <UseDebugLibraries>false</UseDebugLibraries> | 40 | <UseDebugLibraries>false</UseDebugLibraries> |
| 41 | <PlatformToolset>v120</PlatformToolset> | ||
| 39 | </PropertyGroup> | 42 | </PropertyGroup> |
| 40 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> | 43 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> |
| 41 | <ConfigurationType>Application</ConfigurationType> | 44 | <ConfigurationType>Application</ConfigurationType> |
| 42 | <UseDebugLibraries>false</UseDebugLibraries> | 45 | <UseDebugLibraries>false</UseDebugLibraries> |
| 46 | <PlatformToolset>v120</PlatformToolset> | ||
| 43 | </PropertyGroup> | 47 | </PropertyGroup> |
| 44 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> | 48 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> |
| 45 | <ImportGroup Label="ExtensionSettings"> | 49 | <ImportGroup Label="ExtensionSettings"> |
| @@ -51,7 +55,6 @@ | |||
| 51 | <Import Project="..\..\vsprops\code_generation_debug.props" /> | 55 | <Import Project="..\..\vsprops\code_generation_debug.props" /> |
| 52 | <Import Project="..\..\vsprops\app.props" /> | 56 | <Import Project="..\..\vsprops\app.props" /> |
| 53 | <Import Project="..\..\vsprops\optimization_debug.props" /> | 57 | <Import Project="..\..\vsprops\optimization_debug.props" /> |
| 54 | |||
| 55 | </ImportGroup> | 58 | </ImportGroup> |
| 56 | <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> | 59 | <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> |
| 57 | <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | 60 | <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> |
diff --git a/src/citra/citra.vcxproj.filters b/src/citra/citra.vcxproj.filters index 510e07b53..f0b6906de 100644 --- a/src/citra/citra.vcxproj.filters +++ b/src/citra/citra.vcxproj.filters | |||
| @@ -22,4 +22,7 @@ | |||
| 22 | <UniqueIdentifier>{e3161526-9f53-4670-8dae-2be81ff01bc2}</UniqueIdentifier> | 22 | <UniqueIdentifier>{e3161526-9f53-4670-8dae-2be81ff01bc2}</UniqueIdentifier> |
| 23 | </Filter> | 23 | </Filter> |
| 24 | </ItemGroup> | 24 | </ItemGroup> |
| 25 | <ItemGroup> | ||
| 26 | <None Include="CMakeLists.txt" /> | ||
| 27 | </ItemGroup> | ||
| 25 | </Project> \ No newline at end of file | 28 | </Project> \ No newline at end of file |
diff --git a/src/common/common.vcxproj b/src/common/common.vcxproj index 9cf382c29..f9033fa57 100644 --- a/src/common/common.vcxproj +++ b/src/common/common.vcxproj | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
| 2 | <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | 2 | <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
| 3 | <ItemGroup Label="ProjectConfigurations"> | 3 | <ItemGroup Label="ProjectConfigurations"> |
| 4 | <ProjectConfiguration Include="Debug|Win32"> | 4 | <ProjectConfiguration Include="Debug|Win32"> |
| 5 | <Configuration>Debug</Configuration> | 5 | <Configuration>Debug</Configuration> |
| @@ -27,16 +27,19 @@ | |||
| 27 | <UseDebugLibraries>true</UseDebugLibraries> | 27 | <UseDebugLibraries>true</UseDebugLibraries> |
| 28 | <ConfigurationType>StaticLibrary</ConfigurationType> | 28 | <ConfigurationType>StaticLibrary</ConfigurationType> |
| 29 | <CharacterSet>MultiByte</CharacterSet> | 29 | <CharacterSet>MultiByte</CharacterSet> |
| 30 | <PlatformToolset>v120</PlatformToolset> | ||
| 30 | </PropertyGroup> | 31 | </PropertyGroup> |
| 31 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> | 32 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> |
| 32 | <UseDebugLibraries>true</UseDebugLibraries> | 33 | <UseDebugLibraries>true</UseDebugLibraries> |
| 33 | <ConfigurationType>StaticLibrary</ConfigurationType> | 34 | <ConfigurationType>StaticLibrary</ConfigurationType> |
| 34 | <CharacterSet>MultiByte</CharacterSet> | 35 | <CharacterSet>MultiByte</CharacterSet> |
| 36 | <PlatformToolset>v120</PlatformToolset> | ||
| 35 | </PropertyGroup> | 37 | </PropertyGroup> |
| 36 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> | 38 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> |
| 37 | <UseDebugLibraries>false</UseDebugLibraries> | 39 | <UseDebugLibraries>false</UseDebugLibraries> |
| 38 | <ConfigurationType>StaticLibrary</ConfigurationType> | 40 | <ConfigurationType>StaticLibrary</ConfigurationType> |
| 39 | <CharacterSet>Unicode</CharacterSet> | 41 | <CharacterSet>Unicode</CharacterSet> |
| 42 | <PlatformToolset>v120</PlatformToolset> | ||
| 40 | </PropertyGroup> | 43 | </PropertyGroup> |
| 41 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'" Label="Configuration"> | 44 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'" Label="Configuration"> |
| 42 | <ConfigurationType>StaticLibrary</ConfigurationType> | 45 | <ConfigurationType>StaticLibrary</ConfigurationType> |
| @@ -47,6 +50,7 @@ | |||
| 47 | <UseDebugLibraries>false</UseDebugLibraries> | 50 | <UseDebugLibraries>false</UseDebugLibraries> |
| 48 | <ConfigurationType>StaticLibrary</ConfigurationType> | 51 | <ConfigurationType>StaticLibrary</ConfigurationType> |
| 49 | <CharacterSet>Unicode</CharacterSet> | 52 | <CharacterSet>Unicode</CharacterSet> |
| 53 | <PlatformToolset>v120</PlatformToolset> | ||
| 50 | </PropertyGroup> | 54 | </PropertyGroup> |
| 51 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'" Label="Configuration"> | 55 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'" Label="Configuration"> |
| 52 | <ConfigurationType>StaticLibrary</ConfigurationType> | 56 | <ConfigurationType>StaticLibrary</ConfigurationType> |
diff --git a/src/common/scm_rev_gen.vcxproj b/src/common/scm_rev_gen.vcxproj index e1b413c56..d2d9b7fbb 100644 --- a/src/common/scm_rev_gen.vcxproj +++ b/src/common/scm_rev_gen.vcxproj | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
| 2 | <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | 2 | <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
| 3 | <ItemGroup Label="ProjectConfigurations"> | 3 | <ItemGroup Label="ProjectConfigurations"> |
| 4 | <ProjectConfiguration Include="Debug|Win32"> | 4 | <ProjectConfiguration Include="Debug|Win32"> |
| 5 | <Configuration>Debug</Configuration> | 5 | <Configuration>Debug</Configuration> |
| @@ -36,6 +36,16 @@ | |||
| 36 | <ConfigurationType>Utility</ConfigurationType> | 36 | <ConfigurationType>Utility</ConfigurationType> |
| 37 | <UseDebugLibraries>false</UseDebugLibraries> | 37 | <UseDebugLibraries>false</UseDebugLibraries> |
| 38 | <CharacterSet>Unicode</CharacterSet> | 38 | <CharacterSet>Unicode</CharacterSet> |
| 39 | <PlatformToolset>v120</PlatformToolset> | ||
| 40 | </PropertyGroup> | ||
| 41 | <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> | ||
| 42 | <PlatformToolset>v120</PlatformToolset> | ||
| 43 | </PropertyGroup> | ||
| 44 | <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> | ||
| 45 | <PlatformToolset>v120</PlatformToolset> | ||
| 46 | </PropertyGroup> | ||
| 47 | <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> | ||
| 48 | <PlatformToolset>v120</PlatformToolset> | ||
| 39 | </PropertyGroup> | 49 | </PropertyGroup> |
| 40 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> | 50 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> |
| 41 | <ImportGroup Label="ExtensionSettings"> | 51 | <ImportGroup Label="ExtensionSettings"> |
diff --git a/src/core/core.vcxproj b/src/core/core.vcxproj index 90d0628f2..d707a566c 100644 --- a/src/core/core.vcxproj +++ b/src/core/core.vcxproj | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
| 2 | <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | 2 | <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
| 3 | <ItemGroup Label="ProjectConfigurations"> | 3 | <ItemGroup Label="ProjectConfigurations"> |
| 4 | <ProjectConfiguration Include="Debug|Win32"> | 4 | <ProjectConfiguration Include="Debug|Win32"> |
| 5 | <Configuration>Debug</Configuration> | 5 | <Configuration>Debug</Configuration> |
| @@ -26,18 +26,22 @@ | |||
| 26 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> | 26 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> |
| 27 | <ConfigurationType>StaticLibrary</ConfigurationType> | 27 | <ConfigurationType>StaticLibrary</ConfigurationType> |
| 28 | <UseDebugLibraries>true</UseDebugLibraries> | 28 | <UseDebugLibraries>true</UseDebugLibraries> |
| 29 | <PlatformToolset>v120</PlatformToolset> | ||
| 29 | </PropertyGroup> | 30 | </PropertyGroup> |
| 30 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> | 31 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> |
| 31 | <ConfigurationType>StaticLibrary</ConfigurationType> | 32 | <ConfigurationType>StaticLibrary</ConfigurationType> |
| 32 | <UseDebugLibraries>true</UseDebugLibraries> | 33 | <UseDebugLibraries>true</UseDebugLibraries> |
| 34 | <PlatformToolset>v120</PlatformToolset> | ||
| 33 | </PropertyGroup> | 35 | </PropertyGroup> |
| 34 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> | 36 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> |
| 35 | <ConfigurationType>StaticLibrary</ConfigurationType> | 37 | <ConfigurationType>StaticLibrary</ConfigurationType> |
| 36 | <UseDebugLibraries>false</UseDebugLibraries> | 38 | <UseDebugLibraries>false</UseDebugLibraries> |
| 39 | <PlatformToolset>v120</PlatformToolset> | ||
| 37 | </PropertyGroup> | 40 | </PropertyGroup> |
| 38 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> | 41 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> |
| 39 | <ConfigurationType>StaticLibrary</ConfigurationType> | 42 | <ConfigurationType>StaticLibrary</ConfigurationType> |
| 40 | <UseDebugLibraries>false</UseDebugLibraries> | 43 | <UseDebugLibraries>false</UseDebugLibraries> |
| 44 | <PlatformToolset>v120</PlatformToolset> | ||
| 41 | </PropertyGroup> | 45 | </PropertyGroup> |
| 42 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> | 46 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> |
| 43 | <ImportGroup Label="ExtensionSettings"> | 47 | <ImportGroup Label="ExtensionSettings"> |