ShuriZma
/
project64
mirror of https://github.com/project64/project64.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #387 from JunielKatarn/master 

Make PropertySheets imports non-conditional
This commit is contained in:
zilmar 2015-04-16 10:15:39 +10:00
parent 36726147f4 33023bc81f
commit 301818511a
15 changed files with 16 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Source/3rd Party/7zip/7zip.vcxproj
View File

@ -95,8 +95,7 @@
</ImportGroup> </ImportGroup>
<ImportGroup Label="PropertySheets"> <ImportGroup Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Project="$(SolutionDir)PropertySheets/Win32.Release.props" /> <Import Project="$(SolutionDir)PropertySheets\$(Platform).$(Configuration).props" />
<Import Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Project="$(SolutionDir)PropertySheets/Win32.Debug.props" />
</ImportGroup> </ImportGroup>
<PropertyGroup> <PropertyGroup>
<_ProjectFileVersion>12.0.21005.1</_ProjectFileVersion> <_ProjectFileVersion>12.0.21005.1</_ProjectFileVersion>

3
Source/3rd Party/WTL/WTL.vcxproj
View File

@ -24,8 +24,7 @@
</ImportGroup> </ImportGroup>
<ImportGroup Label="PropertySheets"> <ImportGroup Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Project="$(SolutionDir)PropertySheets/Win32.Release.props" /> <Import Project="$(SolutionDir)PropertySheets\$(Platform).$(Configuration).props" />
<Import Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Project="$(SolutionDir)PropertySheets/Win32.Debug.props" />
</ImportGroup> </ImportGroup>
<PropertyGroup> <PropertyGroup>
<_ProjectFileVersion>12.0.21005.1</_ProjectFileVersion> <_ProjectFileVersion>12.0.21005.1</_ProjectFileVersion>

3
Source/3rd Party/wx/wx_base.vcxproj
View File

@ -25,8 +25,7 @@
</ImportGroup> </ImportGroup>
<ImportGroup Label="PropertySheets"> <ImportGroup Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Project="$(SolutionDir)PropertySheets/Win32.Release.props" /> <Import Project="$(SolutionDir)PropertySheets\$(Platform).$(Configuration).props" />
<Import Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Project="$(SolutionDir)PropertySheets/Win32.Debug.props" />
</ImportGroup> </ImportGroup>
<PropertyGroup> <PropertyGroup>
<_ProjectFileVersion>12.0.21005.1</_ProjectFileVersion> <_ProjectFileVersion>12.0.21005.1</_ProjectFileVersion>

3
Source/3rd Party/wx/wx_core.vcxproj
View File

@ -25,8 +25,7 @@
</ImportGroup> </ImportGroup>
<ImportGroup Label="PropertySheets"> <ImportGroup Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Project="$(SolutionDir)PropertySheets/Win32.Release.props" /> <Import Project="$(SolutionDir)PropertySheets\$(Platform).$(Configuration).props" />
<Import Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Project="$(SolutionDir)PropertySheets/Win32.Debug.props" />
</ImportGroup> </ImportGroup>
<PropertyGroup> <PropertyGroup>
<_ProjectFileVersion>12.0.21005.1</_ProjectFileVersion> <_ProjectFileVersion>12.0.21005.1</_ProjectFileVersion>

3
Source/3rd Party/wx/wx_wxjpeg.vcxproj
View File

@ -25,8 +25,7 @@
</ImportGroup> </ImportGroup>
<ImportGroup Label="PropertySheets"> <ImportGroup Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Project="$(SolutionDir)PropertySheets/Win32.Release.props" /> <Import Project="$(SolutionDir)PropertySheets\$(Platform).$(Configuration).props" />
<Import Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Project="$(SolutionDir)PropertySheets/Win32.Debug.props" />
</ImportGroup> </ImportGroup>
<PropertyGroup> <PropertyGroup>
<_ProjectFileVersion>12.0.21005.1</_ProjectFileVersion> <_ProjectFileVersion>12.0.21005.1</_ProjectFileVersion>

3
Source/3rd Party/wx/wx_wxpng.vcxproj
View File

@ -25,8 +25,7 @@
</ImportGroup> </ImportGroup>
<ImportGroup Label="PropertySheets"> <ImportGroup Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Project="$(SolutionDir)PropertySheets/Win32.Release.props" /> <Import Project="$(SolutionDir)PropertySheets\$(Platform).$(Configuration).props" />
<Import Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Project="$(SolutionDir)PropertySheets/Win32.Debug.props" />
</ImportGroup> </ImportGroup>
<PropertyGroup> <PropertyGroup>
<_ProjectFileVersion>12.0.21005.1</_ProjectFileVersion> <_ProjectFileVersion>12.0.21005.1</_ProjectFileVersion>

3
Source/3rd Party/wx/wx_wxzlib.vcxproj
View File

@ -25,8 +25,7 @@
</ImportGroup> </ImportGroup>
<ImportGroup Label="PropertySheets"> <ImportGroup Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Project="$(SolutionDir)PropertySheets/Win32.Release.props" /> <Import Project="$(SolutionDir)PropertySheets\$(Platform).$(Configuration).props" />
<Import Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Project="$(SolutionDir)PropertySheets/Win32.Debug.props" />
</ImportGroup> </ImportGroup>
<PropertyGroup> <PropertyGroup>
<_ProjectFileVersion>12.0.21005.1</_ProjectFileVersion> <_ProjectFileVersion>12.0.21005.1</_ProjectFileVersion>

3
Source/3rd Party/zlib/zlib.vcxproj
View File

@ -24,8 +24,7 @@
</ImportGroup> </ImportGroup>
<ImportGroup Label="PropertySheets"> <ImportGroup Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Project="$(SolutionDir)PropertySheets/Win32.Release.props" /> <Import Project="$(SolutionDir)PropertySheets\$(Platform).$(Configuration).props" />
<Import Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Project="$(SolutionDir)PropertySheets/Win32.Debug.props" />
</ImportGroup> </ImportGroup>
<PropertyGroup> <PropertyGroup>
<_ProjectFileVersion>12.0.21005.1</_ProjectFileVersion> <_ProjectFileVersion>12.0.21005.1</_ProjectFileVersion>

3
Source/Common/Common.vcxproj
View File

@ -24,8 +24,7 @@
</ImportGroup> </ImportGroup>
<ImportGroup Label="PropertySheets"> <ImportGroup Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Project="$(SolutionDir)PropertySheets/Win32.Release.props" /> <Import Project="$(SolutionDir)PropertySheets\$(Platform).$(Configuration).props" />
<Import Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Project="$(SolutionDir)PropertySheets/Win32.Debug.props" />
</ImportGroup> </ImportGroup>
<PropertyGroup> <PropertyGroup>
<_ProjectFileVersion>12.0.21005.1</_ProjectFileVersion> <_ProjectFileVersion>12.0.21005.1</_ProjectFileVersion>

3
Source/Glide64/Glide64.vcxproj
View File

@ -24,8 +24,7 @@
</ImportGroup> </ImportGroup>
<ImportGroup Label="PropertySheets"> <ImportGroup Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Project="$(SolutionDir)PropertySheets/Win32.Release.props" /> <Import Project="$(SolutionDir)PropertySheets\$(Platform).$(Configuration).props" />
<Import Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Project="$(SolutionDir)PropertySheets/Win32.Debug.props" />
</ImportGroup> </ImportGroup>
<PropertyGroup> <PropertyGroup>
<_ProjectFileVersion>12.0.21005.1</_ProjectFileVersion> <_ProjectFileVersion>12.0.21005.1</_ProjectFileVersion>

3
Source/GlideHQ/GlideHQ.vcxproj
View File

@ -24,8 +24,7 @@
</ImportGroup> </ImportGroup>
<ImportGroup Label="PropertySheets"> <ImportGroup Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Project="$(SolutionDir)PropertySheets/Win32.Release.props" /> <Import Project="$(SolutionDir)PropertySheets\$(Platform).$(Configuration).props" />
<Import Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Project="$(SolutionDir)PropertySheets/Win32.Debug.props" />
</ImportGroup> </ImportGroup>
<PropertyGroup> <PropertyGroup>
<_ProjectFileVersion>12.0.21005.1</_ProjectFileVersion> <_ProjectFileVersion>12.0.21005.1</_ProjectFileVersion>

3
Source/Glitch64/Glitch64.vcxproj
View File

@ -24,8 +24,7 @@
</ImportGroup> </ImportGroup>
<ImportGroup Label="PropertySheets"> <ImportGroup Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Project="$(SolutionDir)PropertySheets/Win32.Release.props" /> <Import Project="$(SolutionDir)PropertySheets\$(Platform).$(Configuration).props" />
<Import Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Project="$(SolutionDir)PropertySheets/Win32.Debug.props" />
</ImportGroup> </ImportGroup>
<PropertyGroup> <PropertyGroup>
<_ProjectFileVersion>12.0.21005.1</_ProjectFileVersion> <_ProjectFileVersion>12.0.21005.1</_ProjectFileVersion>

8
Source/Installer/Installer.vcxproj
View File

@ -27,13 +27,9 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings"> <ImportGroup Label="ExtensionSettings">
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> <ImportGroup>
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(SolutionDir)PropertySheets/Win32.Release.props" /> <Import Project="$(SolutionDir)PropertySheets\$(Platform).$(Configuration).props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(SolutionDir)PropertySheets/Win32.Debug.props" />
</ImportGroup> </ImportGroup>
<PropertyGroup Label="UserMacros" /> <PropertyGroup Label="UserMacros" />
<PropertyGroup> <PropertyGroup>

3
Source/Project64/Project64.vcxproj
View File

@ -24,8 +24,7 @@
</ImportGroup> </ImportGroup>
<ImportGroup Label="PropertySheets"> <ImportGroup Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Project="$(SolutionDir)PropertySheets/Win32.Release.props" /> <Import Project="$(SolutionDir)PropertySheets\$(Platform).$(Configuration).props" />
<Import Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Project="$(SolutionDir)PropertySheets/Win32.Debug.props" />
</ImportGroup> </ImportGroup>
<PropertyGroup> <PropertyGroup>
<_ProjectFileVersion>12.0.21005.1</_ProjectFileVersion> <_ProjectFileVersion>12.0.21005.1</_ProjectFileVersion>

3
Source/nragev20/NRage_Input_V2.vcxproj
View File

@ -25,8 +25,7 @@
</ImportGroup> </ImportGroup>
<ImportGroup Label="PropertySheets"> <ImportGroup Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Project="$(SolutionDir)PropertySheets/Win32.Release.props" /> <Import Project="$(SolutionDir)PropertySheets\$(Platform).$(Configuration).props" />
<Import Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Project="$(SolutionDir)PropertySheets/Win32.Debug.props" />
</ImportGroup> </ImportGroup>
<PropertyGroup> <PropertyGroup>
<_ProjectFileVersion>12.0.21005.1</_ProjectFileVersion> <_ProjectFileVersion>12.0.21005.1</_ProjectFileVersion>