From d617d0352a1990fb570a274b026a38523fad0a0d Mon Sep 17 00:00:00 2001 From: "Julio C. Rocha" Date: Wed, 15 Jul 2015 03:37:49 -0700 Subject: [PATCH] Used centralized config for VCXPROJ files. TODO: Fix Installer. It's no longer being generated. --- PropertySheets/Platform.Debug.props | 8 +- PropertySheets/Platform.Release.props | 8 +- PropertySheets/Platform.props | 234 +++++++++++++++++++++++++ Source/3rd Party/7zip/7zip.vcxproj | 17 +- Source/3rd Party/WTL/WTL.vcxproj | 19 +- Source/3rd Party/wx/wx_base.vcxproj | 17 +- Source/3rd Party/wx/wx_core.vcxproj | 17 +- Source/3rd Party/wx/wx_wxjpeg.vcxproj | 17 +- Source/3rd Party/wx/wx_wxpng.vcxproj | 17 +- Source/3rd Party/wx/wx_wxzlib.vcxproj | 17 +- Source/3rd Party/zlib/zlib.vcxproj | 17 +- Source/Common/Common.vcxproj | 19 +- Source/Glide64/Glide64.vcxproj | 17 +- Source/GlideHQ/GlideHQ.vcxproj | 17 +- Source/Glitch64/Glitch64.vcxproj | 17 +- Source/Project64/Project64.vcxproj | 22 +-- Source/RSP/RSP.vcxproj | 17 +- Source/Settings/Settings.vcxproj | 20 +-- Source/nragev20/NRage_Input_V2.vcxproj | 17 +- 19 files changed, 301 insertions(+), 233 deletions(-) diff --git a/PropertySheets/Platform.Debug.props b/PropertySheets/Platform.Debug.props index 03537792f..9db2d28c1 100644 --- a/PropertySheets/Platform.Debug.props +++ b/PropertySheets/Platform.Debug.props @@ -1,13 +1,7 @@  - + - - - <_ProjectFileVersion>12.0.21005.1 - - - \ No newline at end of file diff --git a/PropertySheets/Platform.Release.props b/PropertySheets/Platform.Release.props index 5d8a2c9fa..73e73ad66 100644 --- a/PropertySheets/Platform.Release.props +++ b/PropertySheets/Platform.Release.props @@ -1,13 +1,7 @@  - + - - - <_ProjectFileVersion>12.0.21005.1 - - - \ No newline at end of file diff --git a/PropertySheets/Platform.props b/PropertySheets/Platform.props index b4c206b87..4c799bde2 100644 --- a/PropertySheets/Platform.props +++ b/PropertySheets/Platform.props @@ -1,5 +1,238 @@  + + + v120_xp + + + + + + + + + $(SolutionDir)bin\$(Configuration)\ + $(SolutionDir)build\$(Configuration)\$(ProjectName)\ + *.obj;*.ilk;*.tlb;*.tli;*.tlh;*.tmp;*.rsp;*.pgc;*.pgd;*.meta;$(TargetPath);$(ExtensionsToDeleteOnClean) + false + false + false + true + + + + $(SolutionDir)bin\$(Configuration)\lib\ + + + + + WIN32;_WIN32;_WINDOWS;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions) + + + Windows + + + + + $(SolutionDir) + $(ROOT)Source\ + + + + + $(ROOT) + + + $(SRC) + + + + + + $(IntDir)BuildLog.htm + + + true + $(OutDir)$(ProjectName).bsc + + + .\;..\;..\3rd Party;%(AdditionalIncludeDirectories) + _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + false + false + false + false + true + true + Async + Default + false + Default + false + true + NoExtensions + Precise + false + false + + true + true + false + false + Use + StdAfx.h + $(IntDir)$(TargetName).pch + false + + $(IntDir) + $(IntDir) + $(IntDir)vc90.pdb + false + $(IntDir) + + $(IntDir) + Level4 + false + true + ProgramDatabase + Cdecl + Default + false + false + false + false + false + Prompt + + + $(OutDir)$(ProjectName).lib + true + true + false + + + true + false + + + false + false + /IGNORE:4199 /OPT:ICF=3 %(AdditionalOptions) + NotSet + true + $(IntDir)$(TargetFileName).intermediate.manifest + false + + advapi32.dll;userenv.dll;shell32.dll;shlwapi.dll;ws2_32.dll;version.dll;wtsapi32.dll;%(DelayLoadDLLs) + false + 1 + true + + $(TargetDir)pdb/$(TargetName).pdb + true + $(TargetDir)map/$(TargetName).map + false + 0 + 0 + 0 + 0 + + + false + false + true + true + + false + false + false + false + + false + false + $(TargetDir)lib/$(TargetName).lib + false + DefaultThreadingAttribute + Default + PromptImmediately + false + Windows + + + + .;$(SRC);$(SRC)\3rd Party;%(AdditionalIncludeDirectories) + false + false + 3 + false + true + Unsigned + true + true + $(IntDir)%(Filename).tlb + %(Filename)_h.h + + %(Filename)_i.c + %(Filename)_p.c + All + false + false + false + false + false + true + NotSet + + + 0x0000 + false + false + $(IntDir)%(Filename).res + + + $(IntDir)$(TargetFileName).embed.manifest + true + false + false + false + + + $(IntDir)$(TargetFileName).embed.manifest.res + + + true + true + $(TargetDir)$(TargetName).xml + + + + + + + + MachineX86 + + + + + + + $(SolutionDir)bin\$(Configuration)64\ + $(SolutionDir)build\$(Configuration)64\$(ProjectName)\ + + + + $(SolutionDir)bin\$(Configuration)64\lib\ + + + + + MachineX64 + + + + + \ No newline at end of file diff --git a/Source/3rd Party/7zip/7zip.vcxproj b/Source/3rd Party/7zip/7zip.vcxproj index 18c959071..00f1752ae 100644 --- a/Source/3rd Party/7zip/7zip.vcxproj +++ b/Source/3rd Party/7zip/7zip.vcxproj @@ -22,21 +22,15 @@ {3326E128-33AF-422C-BB7C-67CC6B915610} 7zip - StaticLibrary - v120_xp - - - + - - + - - <_ProjectFileVersion>12.0.21005.1 - + + @@ -114,7 +108,4 @@ - - - \ No newline at end of file diff --git a/Source/3rd Party/WTL/WTL.vcxproj b/Source/3rd Party/WTL/WTL.vcxproj index ef384899e..5ffb4ebde 100644 --- a/Source/3rd Party/WTL/WTL.vcxproj +++ b/Source/3rd Party/WTL/WTL.vcxproj @@ -14,23 +14,15 @@ {4BC6906B-213E-40D7-9FC7-1A93E228393D} WTL - StaticLibrary - v120_xp - - - + - - + - - <_ProjectFileVersion>12.0.21005.1 - - - + + @@ -53,7 +45,4 @@ - - - \ No newline at end of file diff --git a/Source/3rd Party/wx/wx_base.vcxproj b/Source/3rd Party/wx/wx_base.vcxproj index 32dc39dec..7d8ae51b3 100644 --- a/Source/3rd Party/wx/wx_base.vcxproj +++ b/Source/3rd Party/wx/wx_base.vcxproj @@ -23,21 +23,15 @@ {427F1DCD-3BED-4010-9322-077A4C06D871} base - StaticLibrary - v120_xp - - - + - - + - - <_ProjectFileVersion>12.0.21005.1 - + + wxbase29 wxbase29d @@ -377,7 +371,4 @@ false - - - \ No newline at end of file diff --git a/Source/3rd Party/wx/wx_core.vcxproj b/Source/3rd Party/wx/wx_core.vcxproj index 23ac5e1e2..7e2052061 100644 --- a/Source/3rd Party/wx/wx_core.vcxproj +++ b/Source/3rd Party/wx/wx_core.vcxproj @@ -23,21 +23,15 @@ {93447136-FACD-4740-8F35-FC46FB4A9E82} core - StaticLibrary - v120_xp - - - + - - + - - <_ProjectFileVersion>12.0.21005.1 - + + wxmsw29_core wxmsw29d_core @@ -620,7 +614,4 @@ - - - \ No newline at end of file diff --git a/Source/3rd Party/wx/wx_wxjpeg.vcxproj b/Source/3rd Party/wx/wx_wxjpeg.vcxproj index 40b5c9a17..365e7cf4c 100644 --- a/Source/3rd Party/wx/wx_wxjpeg.vcxproj +++ b/Source/3rd Party/wx/wx_wxjpeg.vcxproj @@ -15,21 +15,15 @@ {93CFEDF3-9A75-4484-B169-D9D8074F5AC2} wxjpeg - StaticLibrary - v120_xp - - - + - - + - - <_ProjectFileVersion>12.0.21005.1 - + + wxjpeg wxjpegd @@ -94,7 +88,4 @@ - - - \ No newline at end of file diff --git a/Source/3rd Party/wx/wx_wxpng.vcxproj b/Source/3rd Party/wx/wx_wxpng.vcxproj index 5787108a3..d73151d48 100644 --- a/Source/3rd Party/wx/wx_wxpng.vcxproj +++ b/Source/3rd Party/wx/wx_wxpng.vcxproj @@ -15,21 +15,15 @@ {05B9CB11-12D1-47CD-8E4A-88E12162119B} wxpng - StaticLibrary - v120_xp - - - + - - + - - <_ProjectFileVersion>12.0.21005.1 - + + wxpng wxpngd @@ -63,7 +57,4 @@ - - - \ No newline at end of file diff --git a/Source/3rd Party/wx/wx_wxzlib.vcxproj b/Source/3rd Party/wx/wx_wxzlib.vcxproj index 06c324b49..6572845d7 100644 --- a/Source/3rd Party/wx/wx_wxzlib.vcxproj +++ b/Source/3rd Party/wx/wx_wxzlib.vcxproj @@ -15,21 +15,15 @@ {25A25249-C284-4C5A-8DC2-26FC3EB13703} wxzlib - StaticLibrary - v120_xp - - - + - - + - - <_ProjectFileVersion>12.0.21005.1 - + + wxzlib wxzlibd @@ -59,7 +53,4 @@ - - - \ No newline at end of file diff --git a/Source/3rd Party/zlib/zlib.vcxproj b/Source/3rd Party/zlib/zlib.vcxproj index 6163a13c1..2774e1d26 100644 --- a/Source/3rd Party/zlib/zlib.vcxproj +++ b/Source/3rd Party/zlib/zlib.vcxproj @@ -22,21 +22,15 @@ {731BD205-2826-4631-B7AF-117658E88DBC} zlib - StaticLibrary - v120_xp - - - + - - + - - <_ProjectFileVersion>12.0.21005.1 - + + @@ -86,7 +80,4 @@ - - - \ No newline at end of file diff --git a/Source/Common/Common.vcxproj b/Source/Common/Common.vcxproj index 51829e4b0..34227364a 100644 --- a/Source/Common/Common.vcxproj +++ b/Source/Common/Common.vcxproj @@ -22,23 +22,15 @@ {B4A4B994-9111-42B1-93C2-6F1CA8BC4421} Common - StaticLibrary - v120_xp - - - + - - + - - <_ProjectFileVersion>12.0.21005.1 - - - + + @@ -66,7 +58,4 @@ - - - \ No newline at end of file diff --git a/Source/Glide64/Glide64.vcxproj b/Source/Glide64/Glide64.vcxproj index 681b13fc3..de0b0204d 100644 --- a/Source/Glide64/Glide64.vcxproj +++ b/Source/Glide64/Glide64.vcxproj @@ -22,21 +22,15 @@ {A4D13408-A794-4199-8FC7-4A9A32505005} n64Glide - DynamicLibrary - v120_xp - - - + - - + - - <_ProjectFileVersion>12.0.21005.1 - + + PJ64Glide64 PJ64Glide64_d @@ -175,7 +169,4 @@ false - - - \ No newline at end of file diff --git a/Source/GlideHQ/GlideHQ.vcxproj b/Source/GlideHQ/GlideHQ.vcxproj index 977410ca9..31620abf6 100644 --- a/Source/GlideHQ/GlideHQ.vcxproj +++ b/Source/GlideHQ/GlideHQ.vcxproj @@ -22,21 +22,15 @@ {2DADDAA5-0F57-46ED-A974-747908DDC7F3} GlideHQ - StaticLibrary - v120_xp - - - + - - + - - <_ProjectFileVersion>12.0.21005.1 - + + $(Root)Source/3rd Party/wx/src;%(AdditionalIncludeDirectories) @@ -89,7 +83,4 @@ false - - - \ No newline at end of file diff --git a/Source/Glitch64/Glitch64.vcxproj b/Source/Glitch64/Glitch64.vcxproj index 5a9d59718..abab01241 100644 --- a/Source/Glitch64/Glitch64.vcxproj +++ b/Source/Glitch64/Glitch64.vcxproj @@ -22,21 +22,15 @@ {462C2608-182F-452C-944F-AF201E19300B} glide3x - StaticLibrary - v120_xp - - - + - - + - - <_ProjectFileVersion>12.0.21005.1 - + + inc;%(AdditionalIncludeDirectories) @@ -57,7 +51,4 @@ - - - \ No newline at end of file diff --git a/Source/Project64/Project64.vcxproj b/Source/Project64/Project64.vcxproj index c6df20064..3c1b61224 100644 --- a/Source/Project64/Project64.vcxproj +++ b/Source/Project64/Project64.vcxproj @@ -22,21 +22,15 @@ {7E534C8E-1ACE-4A88-8807-39A11ED4DA18} Project64 - Application - v120_xp - - - + - - + - - <_ProjectFileVersion>12.0.21005.1 - + + @@ -169,10 +163,7 @@ - User Interface;%(AdditionalIncludeDirectories) - User Interface;%(AdditionalIncludeDirectories) - User Interface;%(AdditionalIncludeDirectories) - User Interface;%(AdditionalIncludeDirectories) + User Interface;%(AdditionalIncludeDirectories) @@ -315,7 +306,4 @@ false - - - \ No newline at end of file diff --git a/Source/RSP/RSP.vcxproj b/Source/RSP/RSP.vcxproj index 4bf163c69..7f1721105 100644 --- a/Source/RSP/RSP.vcxproj +++ b/Source/RSP/RSP.vcxproj @@ -22,21 +22,15 @@ {A7ED562C-63F3-4B7E-B6B3-2CF7848752E1} RSP - DynamicLibrary - v120_xp - - - + - - + - - <_ProjectFileVersion>12.0.21005.1 - + + RSP 1.7 RSP_d 1.7 @@ -105,7 +99,4 @@ false - - - \ No newline at end of file diff --git a/Source/Settings/Settings.vcxproj b/Source/Settings/Settings.vcxproj index 3c0782484..b6fc47e64 100644 --- a/Source/Settings/Settings.vcxproj +++ b/Source/Settings/Settings.vcxproj @@ -22,24 +22,15 @@ {8B9961B1-88D9-4EA3-A752-507A00DD9F3D} Settings - StaticLibrary - v120_xp - - - + - - - - - + - - <_ProjectFileVersion>12.0.21005.1 - + + @@ -51,7 +42,4 @@ - - - \ No newline at end of file diff --git a/Source/nragev20/NRage_Input_V2.vcxproj b/Source/nragev20/NRage_Input_V2.vcxproj index 2e7ca7030..1a99b0f0d 100644 --- a/Source/nragev20/NRage_Input_V2.vcxproj +++ b/Source/nragev20/NRage_Input_V2.vcxproj @@ -23,21 +23,15 @@ NRage_Input_V2 PJ64 NRage - DynamicLibrary - v120_xp - - - + - - + - - <_ProjectFileVersion>12.0.21005.1 - + + PJ64_NRage PJ64_NRage_d @@ -93,7 +87,4 @@ - - - \ No newline at end of file