diff options
author | ShizZy <shizzy@6bit.net> | 2013-09-09 03:56:54 +0200 |
---|---|---|
committer | ShizZy <shizzy@6bit.net> | 2013-09-09 03:56:54 +0200 |
commit | 21613642583e8a10041ef52983db4fde14e18fbc (patch) | |
tree | 809cad870430bb32c27b61f256437ebd7a76674d | |
parent | fixed some code warnings (diff) | |
download | yuzu-21613642583e8a10041ef52983db4fde14e18fbc.tar yuzu-21613642583e8a10041ef52983db4fde14e18fbc.tar.gz yuzu-21613642583e8a10041ef52983db4fde14e18fbc.tar.bz2 yuzu-21613642583e8a10041ef52983db4fde14e18fbc.tar.lz yuzu-21613642583e8a10041ef52983db4fde14e18fbc.tar.xz yuzu-21613642583e8a10041ef52983db4fde14e18fbc.tar.zst yuzu-21613642583e8a10041ef52983db4fde14e18fbc.zip |
-rw-r--r-- | src/akiru/akiru.vcxproj | 12 | ||||
-rw-r--r-- | src/common/common.vcxproj | 20 | ||||
-rw-r--r-- | src/core/core.vcxproj | 59 |
3 files changed, 24 insertions, 67 deletions
diff --git a/src/akiru/akiru.vcxproj b/src/akiru/akiru.vcxproj index 901155e98..513e3412b 100644 --- a/src/akiru/akiru.vcxproj +++ b/src/akiru/akiru.vcxproj @@ -47,34 +47,35 @@ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="..\..\vsprops\base.props" /> + <Import Project="..\..\vsprops\externals.props" /> <Import Project="..\..\vsprops\code_generation_debug.props" /> <Import Project="..\..\vsprops\app.props" /> <Import Project="..\..\vsprops\optimization_debug.props" /> - <Import Project="..\..\vsprops\externals.props" /> + </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="..\..\vsprops\base.props" /> + <Import Project="..\..\vsprops\externals.props" /> <Import Project="..\..\vsprops\code_generation_debug.props" /> <Import Project="..\..\vsprops\app.props" /> <Import Project="..\..\vsprops\optimization_debug.props" /> - <Import Project="..\..\vsprops\externals.props" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="..\..\vsprops\base.props" /> + <Import Project="..\..\vsprops\externals.props" /> <Import Project="..\..\vsprops\code_generation_release.props" /> <Import Project="..\..\vsprops\app.props" /> <Import Project="..\..\vsprops\optimization_release.props" /> - <Import Project="..\..\vsprops\externals.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="..\..\vsprops\base.props" /> + <Import Project="..\..\vsprops\externals.props" /> <Import Project="..\..\vsprops\code_generation_release.props" /> <Import Project="..\..\vsprops\app.props" /> <Import Project="..\..\vsprops\optimization_release.props" /> - <Import Project="..\..\vsprops\externals.props" /> </ImportGroup> <PropertyGroup Label="UserMacros" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> @@ -204,6 +205,9 @@ <ItemGroup> <ResourceCompile Include="akiru.rc" /> </ItemGroup> + <ItemGroup> + <None Include="CMakeLists.txt" /> + </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> diff --git a/src/common/common.vcxproj b/src/common/common.vcxproj index 8190f0e31..1e149d32b 100644 --- a/src/common/common.vcxproj +++ b/src/common/common.vcxproj @@ -1,14 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="DebugFast|Win32"> - <Configuration>DebugFast</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="DebugFast|x64"> - <Configuration>DebugFast</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> <ProjectConfiguration Include="Debug|Win32"> <Configuration>Debug</Configuration> <Platform>Win32</Platform> @@ -28,7 +20,7 @@ </ItemGroup> <PropertyGroup Label="Globals"> <ProjectGuid>{DFE335FC-755D-4BAA-8452-94434F8A1EDB}</ProjectGuid> - <RootNamespace>Common</RootNamespace> + <RootNamespace>common</RootNamespace> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> @@ -67,30 +59,36 @@ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="..\..\vsprops\base.props" /> + <Import Project="..\..\vsprops\externals.props" /> <Import Project="..\..\vsprops\code_generation_debug.props" /> + <Import Project="..\..\vsprops\optimization_debug.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="..\..\vsprops\base.props" /> + <Import Project="..\..\vsprops\externals.props" /> <Import Project="..\..\vsprops\code_generation_debug.props" /> + <Import Project="..\..\vsprops\optimization_debug.props" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="..\..\vsprops\base.props" /> + <Import Project="..\..\vsprops\externals.props" /> <Import Project="..\..\vsprops\code_generation_release.props" /> + <Import Project="..\..\vsprops\optimization_release.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="..\..\vsprops\base.props" /> + <Import Project="..\..\vsprops\externals.props" /> <Import Project="..\..\vsprops\code_generation_release.props" /> + <Import Project="..\..\vsprops\optimization_release.props" /> </ImportGroup> <PropertyGroup Label="UserMacros" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'" /> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile /> <Link> diff --git a/src/core/core.vcxproj b/src/core/core.vcxproj index cd167af47..b457cc6e9 100644 --- a/src/core/core.vcxproj +++ b/src/core/core.vcxproj @@ -45,30 +45,30 @@ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="..\..\vsprops\base.props" /> + <Import Project="..\..\vsprops\externals.props" /> <Import Project="..\..\vsprops\code_generation_debug.props" /> <Import Project="..\..\vsprops\optimization_debug.props" /> - <Import Project="..\..\vsprops\externals.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="..\..\vsprops\base.props" /> + <Import Project="..\..\vsprops\externals.props" /> <Import Project="..\..\vsprops\code_generation_debug.props" /> <Import Project="..\..\vsprops\optimization_debug.props" /> - <Import Project="..\..\vsprops\externals.props" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="..\..\vsprops\base.props" /> + <Import Project="..\..\vsprops\externals.props" /> <Import Project="..\..\vsprops\code_generation_release.props" /> <Import Project="..\..\vsprops\optimization_release.props" /> - <Import Project="..\..\vsprops\externals.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="..\..\vsprops\base.props" /> + <Import Project="..\..\vsprops\externals.props" /> <Import Project="..\..\vsprops\code_generation_release.props" /> <Import Project="..\..\vsprops\optimization_release.props" /> - <Import Project="..\..\vsprops\externals.props" /> </ImportGroup> <PropertyGroup Label="UserMacros" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> @@ -94,18 +94,6 @@ <Link> <GenerateDebugInformation>true</GenerateDebugInformation> </Link> - <CustomBuildStep> - <Command> - </Command> - </CustomBuildStep> - <CustomBuildStep> - <Message> - </Message> - </CustomBuildStep> - <CustomBuildStep> - <Outputs> - </Outputs> - </CustomBuildStep> <ClCompile /> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> @@ -113,18 +101,6 @@ <Link> <GenerateDebugInformation>true</GenerateDebugInformation> </Link> - <CustomBuildStep> - <Command> - </Command> - </CustomBuildStep> - <CustomBuildStep> - <Message> - </Message> - </CustomBuildStep> - <CustomBuildStep> - <Outputs> - </Outputs> - </CustomBuildStep> <ClCompile /> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> @@ -134,18 +110,6 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> </Link> - <CustomBuildStep> - <Command> - </Command> - </CustomBuildStep> - <CustomBuildStep> - <Message> - </Message> - </CustomBuildStep> - <CustomBuildStep> - <Outputs> - </Outputs> - </CustomBuildStep> <ClCompile /> <ClCompile /> <ClCompile> @@ -161,18 +125,6 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> </Link> - <CustomBuildStep> - <Command> - </Command> - </CustomBuildStep> - <CustomBuildStep> - <Message> - </Message> - </CustomBuildStep> - <CustomBuildStep> - <Outputs> - </Outputs> - </CustomBuildStep> <ClCompile /> </ItemDefinitionGroup> <ItemGroup> @@ -190,6 +142,9 @@ <ClInclude Include="src\core.h" /> <ClInclude Include="src\mem_map.h" /> </ItemGroup> + <ItemGroup> + <None Include="CMakeLists.txt" /> + </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> |