From c7aac9d8d749d02d87821272d7b1cc5097f39d1d Mon Sep 17 00:00:00 2001 From: "Julio C. Rocha" Date: Wed, 15 Jul 2015 01:43:53 -0700 Subject: [PATCH 01/13] Renamed Win32.props to Platform.props --- PropertySheets/{Win32.props => Platform.props} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename PropertySheets/{Win32.props => Platform.props} (100%) diff --git a/PropertySheets/Win32.props b/PropertySheets/Platform.props similarity index 100% rename from PropertySheets/Win32.props rename to PropertySheets/Platform.props From ba5e75751e971fbaf59320e2bbc49b2911e854d4 Mon Sep 17 00:00:00 2001 From: "Julio C. Rocha" Date: Wed, 15 Jul 2015 03:13:37 -0700 Subject: [PATCH 02/13] Renamed Win32.*.props to Platform.*.props --- PropertySheets/{Win32.Debug.props => Platform.Debug.props} | 0 PropertySheets/{Win32.Release.props => Platform.Release.props} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename PropertySheets/{Win32.Debug.props => Platform.Debug.props} (100%) rename PropertySheets/{Win32.Release.props => Platform.Release.props} (100%) diff --git a/PropertySheets/Win32.Debug.props b/PropertySheets/Platform.Debug.props similarity index 100% rename from PropertySheets/Win32.Debug.props rename to PropertySheets/Platform.Debug.props diff --git a/PropertySheets/Win32.Release.props b/PropertySheets/Platform.Release.props similarity index 100% rename from PropertySheets/Win32.Release.props rename to PropertySheets/Platform.Release.props From d617d0352a1990fb570a274b026a38523fad0a0d Mon Sep 17 00:00:00 2001 From: "Julio C. Rocha" Date: Wed, 15 Jul 2015 03:37:49 -0700 Subject: [PATCH 03/13] 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 From 19f006e6f5c43b32f4911a91fcbb8e8f6148aad7 Mon Sep 17 00:00:00 2001 From: "Julio C. Rocha" Date: Wed, 15 Jul 2015 03:42:01 -0700 Subject: [PATCH 04/13] Re-applied changes to Installer.vcxproj Installer failure is unrelated to this branch. --- Source/Installer/Installer.vcxproj | 42 +++++++----------------------- 1 file changed, 10 insertions(+), 32 deletions(-) diff --git a/Source/Installer/Installer.vcxproj b/Source/Installer/Installer.vcxproj index 635c17c5f..69eb3c02f 100644 --- a/Source/Installer/Installer.vcxproj +++ b/Source/Installer/Installer.vcxproj @@ -15,45 +15,26 @@ {360A34F3-3172-4B09-8BC9-B3FBEE677863} Project64Setup + + StaticLibrary + - - StaticLibrary - v120_xp - - - StaticLibrary - v120_xp - - - - - - + + + - - <_ProjectFileVersion>12.0.21005.1 - - - - - - - + - "$(Root)bin\Inno Setup\ISCC.exe" /dConfiguration="$(Configuration)" "%(Filename).iss" - - $(OutDir)Project64.exe;%(AdditionalInputs) - $(OutDir)Setup Project64 2.2.exe;%(Outputs) - "$(Root)bin\Inno Setup\ISCC.exe" /dConfiguration="$(Configuration)" "%(Filename).iss" - $(OutDir)Project64.exe;%(AdditionalInputs) - $(OutDir)Setup Project64 2.2.exe;%(Outputs) + "$(Root)bin\Inno Setup\ISCC.exe" /dConfiguration="$(Configuration)" "%(Filename).iss" + $(OutDir)Project64.exe;%(AdditionalInputs) + $(OutDir)Setup Project64 2.2.exe;%(Outputs) @@ -65,7 +46,4 @@ false - - - \ No newline at end of file From 02e6cf2697a39c0cd50fe717f636e68fb3340f23 Mon Sep 17 00:00:00 2001 From: "Julio C. Rocha" Date: Wed, 15 Jul 2015 04:47:41 -0700 Subject: [PATCH 05/13] Added PropertySheets folder to project. --- Project64.vs2013.sln | 9 ++ PropertySheets/Debug.props | 8 -- PropertySheets/Platform.props | 223 ++--------------------------- PropertySheets/Release.props | 7 - Source/Glide64/Glide64.vcxproj | 4 - Source/Installer/Installer.vcxproj | 1 - Source/Project64/Project64.vcxproj | 6 + 7 files changed, 24 insertions(+), 234 deletions(-) diff --git a/Project64.vs2013.sln b/Project64.vs2013.sln index 97b61170e..99a02e0fe 100644 --- a/Project64.vs2013.sln +++ b/Project64.vs2013.sln @@ -51,6 +51,15 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GlideHQ", "Source\GlideHQ\G EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PJ64 NRage", "Source\nragev20\NRage_Input_V2.vcxproj", "{FD617E80-9E40-4138-85DA-B94633972E6A}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "PropertySheets", "PropertySheets", "{181AA451-63A7-4E3B-BE0C-F92BE3F3D2F2}" + ProjectSection(SolutionItems) = preProject + PropertySheets\Debug.props = PropertySheets\Debug.props + PropertySheets\Platform.Debug.props = PropertySheets\Platform.Debug.props + PropertySheets\Platform.props = PropertySheets\Platform.props + PropertySheets\Platform.Release.props = PropertySheets\Platform.Release.props + PropertySheets\Release.props = PropertySheets\Release.props + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 diff --git a/PropertySheets/Debug.props b/PropertySheets/Debug.props index cefd72359..ed3d9416f 100644 --- a/PropertySheets/Debug.props +++ b/PropertySheets/Debug.props @@ -1,9 +1,5 @@  - - - <_ProjectFileVersion>12.0.21005.1 - _DEBUG;DEBUG;%(PreprocessorDefinitions) @@ -18,9 +14,6 @@ true MultiThreadedDebug - - - _DEBUG;DEBUG;%(PreprocessorDefinitions) @@ -28,5 +21,4 @@ _DEBUG;DEBUG;%(PreprocessorDefinitions) - \ No newline at end of file diff --git a/PropertySheets/Platform.props b/PropertySheets/Platform.props index 4c799bde2..9a9d41039 100644 --- a/PropertySheets/Platform.props +++ b/PropertySheets/Platform.props @@ -28,9 +28,6 @@ WIN32;_WIN32;_WINDOWS;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions) - - Windows - @@ -74,7 +71,7 @@ Precise false false - + true true false @@ -83,13 +80,13 @@ StdAfx.h $(IntDir)$(TargetName).pch false - + $(IntDir) $(IntDir) $(IntDir)vc90.pdb false $(IntDir) - + $(IntDir) Level4 false @@ -127,7 +124,7 @@ false 1 true - + $(TargetDir)pdb/$(TargetName).pdb true $(TargetDir)map/$(TargetName).map @@ -136,18 +133,17 @@ 0 0 0 - - + false false true true - false false false false - + false false $(TargetDir)lib/$(TargetName).lib @@ -156,8 +152,6 @@ Default PromptImmediately false - Windows - .;$(SRC);$(SRC)\3rd Party;%(AdditionalIncludeDirectories) @@ -171,7 +165,7 @@ true $(IntDir)%(Filename).tlb %(Filename)_h.h - + %(Filename)_i.c %(Filename)_p.c All @@ -231,204 +225,5 @@ - - + \ No newline at end of file diff --git a/PropertySheets/Release.props b/PropertySheets/Release.props index d01d5ab3b..b2f7c5eac 100644 --- a/PropertySheets/Release.props +++ b/PropertySheets/Release.props @@ -1,8 +1,5 @@  - - <_ProjectFileVersion>12.0.21005.1 - MinSpace @@ -16,9 +13,6 @@ false MultiThreaded - - - NDEBUG;%(PreprocessorDefinitions) @@ -26,5 +20,4 @@ NDEBUG;%(PreprocessorDefinitions) - \ No newline at end of file diff --git a/Source/Glide64/Glide64.vcxproj b/Source/Glide64/Glide64.vcxproj index de0b0204d..902bc07b9 100644 --- a/Source/Glide64/Glide64.vcxproj +++ b/Source/Glide64/Glide64.vcxproj @@ -45,10 +45,6 @@ $(Root)Source\3rd Party\wx\lib\vc_lib;%(AdditionalLibraryDirectories) - Windows - Windows - Windows - Windows diff --git a/Source/Installer/Installer.vcxproj b/Source/Installer/Installer.vcxproj index 69eb3c02f..e1db49060 100644 --- a/Source/Installer/Installer.vcxproj +++ b/Source/Installer/Installer.vcxproj @@ -24,7 +24,6 @@ - diff --git a/Source/Project64/Project64.vcxproj b/Source/Project64/Project64.vcxproj index 3c1b61224..dd21777da 100644 --- a/Source/Project64/Project64.vcxproj +++ b/Source/Project64/Project64.vcxproj @@ -31,6 +31,12 @@ + + + Windows + 5.01 + + From ca6c3a74de85df11c5d81d5a12ede4497eaa8df8 Mon Sep 17 00:00:00 2001 From: "Julio C. Rocha" Date: Wed, 15 Jul 2015 22:52:53 -0700 Subject: [PATCH 06/13] Fixed vc versin for generated .PDB --- PropertySheets/Platform.props | 12 ++------ Source/3rd Party/wx/wx_core.vcxproj | 44 ++++++++--------------------- 2 files changed, 14 insertions(+), 42 deletions(-) diff --git a/PropertySheets/Platform.props b/PropertySheets/Platform.props index 9a9d41039..4dda062cb 100644 --- a/PropertySheets/Platform.props +++ b/PropertySheets/Platform.props @@ -68,10 +68,9 @@ false true NoExtensions - Precise + Precise false false - true true false @@ -80,13 +79,11 @@ StdAfx.h $(IntDir)$(TargetName).pch false - $(IntDir) $(IntDir) - $(IntDir)vc90.pdb + $(IntDir)vc$(VisualStudioVersion).pdb false $(IntDir) - $(IntDir) Level4 false @@ -124,7 +121,6 @@ false 1 true - $(TargetDir)pdb/$(TargetName).pdb true $(TargetDir)map/$(TargetName).map @@ -133,8 +129,6 @@ 0 0 0 - false false true @@ -143,7 +137,6 @@ false false false - false false $(TargetDir)lib/$(TargetName).lib @@ -165,7 +158,6 @@ true $(IntDir)%(Filename).tlb %(Filename)_h.h - %(Filename)_i.c %(Filename)_p.c All diff --git a/Source/3rd Party/wx/wx_core.vcxproj b/Source/3rd Party/wx/wx_core.vcxproj index 7e2052061..1c48b52dc 100644 --- a/Source/3rd Party/wx/wx_core.vcxproj +++ b/Source/3rd Party/wx/wx_core.vcxproj @@ -367,22 +367,12 @@ - Creating lib\vc_lib\mswd\wx\setup.h - Creating lib\vc_lib\mswd\wx\setup.h - copy "%(FullPath)" lib\vc_lib\mswd\wx\setup.h - - copy "%(FullPath)" lib\vc_lib\mswd\wx\setup.h - - lib\vc_lib\mswd\wx\setup.h;%(Outputs) - lib\vc_lib\mswd\wx\setup.h;%(Outputs) - Creating lib\vc_lib\mswu\wx\setup.h - Creating lib\vc_lib\mswu\wx\setup.h - copy "%(FullPath)" lib\vc_lib\mswu\wx\setup.h - - copy "%(FullPath)" lib\vc_lib\mswu\wx\setup.h - - lib\vc_lib\mswu\wx\setup.h;%(Outputs) - lib\vc_lib\mswu\wx\setup.h;%(Outputs) + Creating lib\vc_lib\mswd\wx\setup.h + copy "%(FullPath)" lib\vc_lib\mswd\wx\setup.h + lib\vc_lib\mswd\wx\setup.h;%(Outputs) + Creating lib\vc_lib\mswu\wx\setup.h + copy "%(FullPath)" lib\vc_lib\mswu\wx\setup.h + lib\vc_lib\mswu\wx\setup.h;%(Outputs) @@ -429,22 +419,12 @@ - Creating lib\vc_lib\mswud\wx\msw\rcdefs.h - Creating lib\vc_lib\mswud\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "lib\vc_lib\mswud\wx\msw\rcdefs.h" - - cl /EP /nologo "%(FullPath)" > "lib\vc_lib\mswud\wx\msw\rcdefs.h" - - lib\vc_lib\mswud\wx\msw\rcdefs.h;%(Outputs) - lib\vc_lib\mswud\wx\msw\rcdefs.h;%(Outputs) - Creating lib\vc_lib\mswu\wx\msw\rcdefs.h - Creating lib\vc_lib\mswu\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "lib\vc_lib\mswu\wx\msw\rcdefs.h" - - cl /EP /nologo "%(FullPath)" > "lib\vc_lib\mswu\wx\msw\rcdefs.h" - - lib\vc_lib\mswu\wx\msw\rcdefs.h;%(Outputs) - lib\vc_lib\mswu\wx\msw\rcdefs.h;%(Outputs) + Creating lib\vc_lib\mswud\wx\msw\rcdefs.h + cl /EP /nologo "%(FullPath)" > "lib\vc_lib\mswud\wx\msw\rcdefs.h" + lib\vc_lib\mswud\wx\msw\rcdefs.h;%(Outputs) + Creating lib\vc_lib\mswu\wx\msw\rcdefs.h + cl /EP /nologo "%(FullPath)" > "lib\vc_lib\mswu\wx\msw\rcdefs.h" + lib\vc_lib\mswu\wx\msw\rcdefs.h;%(Outputs) From 3b1b51396b49e6af21ae5cb72eefc9137a5e308e Mon Sep 17 00:00:00 2001 From: "Julio C. Rocha" Date: Tue, 28 Jul 2015 02:04:46 -0700 Subject: [PATCH 07/13] Don't force .sln to Visual Studio 2013 --- Project64.vs2013.sln | 1 - 1 file changed, 1 deletion(-) diff --git a/Project64.vs2013.sln b/Project64.vs2013.sln index 99a02e0fe..d1b23703d 100644 --- a/Project64.vs2013.sln +++ b/Project64.vs2013.sln @@ -1,7 +1,6 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2013 -VisualStudioVersion = 12.0.31101.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "3rd Party", "3rd Party", "{AA8F7F8E-5377-4911-859D-8A8817B0DB26}" EndProject From c90f34337dd08e64069722e1ee34d6bf68626737 Mon Sep 17 00:00:00 2001 From: "Julio C. Rocha" Date: Wed, 23 Sep 2015 20:22:45 -0700 Subject: [PATCH 08/13] Add Project64.vs2015.sln --- Project64.vs2015.sln | 200 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 200 insertions(+) create mode 100644 Project64.vs2015.sln diff --git a/Project64.vs2015.sln b/Project64.vs2015.sln new file mode 100644 index 000000000..533471596 --- /dev/null +++ b/Project64.vs2015.sln @@ -0,0 +1,200 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2015 +MinimumVisualStudioVersion = 14.0.23107.0 +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "3rd Party", "3rd Party", "{AA8F7F8E-5377-4911-859D-8A8817B0DB26}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "wxWidgets", "wxWidgets", "{1379F817-7E3D-4F58-9C22-7E364E46E842}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Glide", "Glide", "{9FE699A5-41C3-4441-92AB-639B3D77DE26}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Common", "Source\Common\Common.vcxproj", "{B4A4B994-9111-42B1-93C2-6F1CA8BC4421}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Project64", "Source\Project64\Project64.vcxproj", "{7E534C8E-1ACE-4A88-8807-39A11ED4DA18}" + ProjectSection(ProjectDependencies) = postProject + {FD617E80-9E40-4138-85DA-B94633972E6A} = {FD617E80-9E40-4138-85DA-B94633972E6A} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RSP", "Source\RSP\RSP.vcxproj", "{A7ED562C-63F3-4B7E-B6B3-2CF7848752E1}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Settings", "Source\Settings\Settings.vcxproj", "{8B9961B1-88D9-4EA3-A752-507A00DD9F3D}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "7zip", "Source\3rd Party\7zip\7zip.vcxproj", "{3326E128-33AF-422C-BB7C-67CC6B915610}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WTL", "Source\3rd Party\WTL\WTL.vcxproj", "{4BC6906B-213E-40D7-9FC7-1A93E228393D}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "Source\3rd Party\zlib\zlib.vcxproj", "{731BD205-2826-4631-B7AF-117658E88DBC}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Project64Setup", "Source\Installer\Installer.vcxproj", "{360A34F3-3172-4B09-8BC9-B3FBEE677863}" + ProjectSection(ProjectDependencies) = postProject + {A4D13408-A794-4199-8FC7-4A9A32505005} = {A4D13408-A794-4199-8FC7-4A9A32505005} + {A7ED562C-63F3-4B7E-B6B3-2CF7848752E1} = {A7ED562C-63F3-4B7E-B6B3-2CF7848752E1} + {FD617E80-9E40-4138-85DA-B94633972E6A} = {FD617E80-9E40-4138-85DA-B94633972E6A} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Glide64", "Source\Glide64\Glide64.vcxproj", "{A4D13408-A794-4199-8FC7-4A9A32505005}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core", "Source\3rd Party\wx\wx_core.vcxproj", "{93447136-FACD-4740-8F35-FC46FB4A9E82}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "base", "Source\3rd Party\wx\wx_base.vcxproj", "{427F1DCD-3BED-4010-9322-077A4C06D871}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxjpeg", "Source\3rd Party\wx\wx_wxjpeg.vcxproj", "{93CFEDF3-9A75-4484-B169-D9D8074F5AC2}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxpng", "Source\3rd Party\wx\wx_wxpng.vcxproj", "{05B9CB11-12D1-47CD-8E4A-88E12162119B}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxzlib", "Source\3rd Party\wx\wx_wxzlib.vcxproj", "{25A25249-C284-4C5A-8DC2-26FC3EB13703}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Glitch64", "Source\Glitch64\Glitch64.vcxproj", "{462C2608-182F-452C-944F-AF201E19300B}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GlideHQ", "Source\GlideHQ\GlideHQ.vcxproj", "{2DADDAA5-0F57-46ED-A974-747908DDC7F3}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PJ64 NRage", "Source\nragev20\NRage_Input_V2.vcxproj", "{FD617E80-9E40-4138-85DA-B94633972E6A}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "PropertySheets", "PropertySheets", "{181AA451-63A7-4E3B-BE0C-F92BE3F3D2F2}" + ProjectSection(SolutionItems) = preProject + PropertySheets\Debug.props = PropertySheets\Debug.props + PropertySheets\Platform.Debug.props = PropertySheets\Platform.Debug.props + PropertySheets\Platform.props = PropertySheets\Platform.props + PropertySheets\Platform.Release.props = PropertySheets\Platform.Release.props + PropertySheets\Release.props = PropertySheets\Release.props + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {B4A4B994-9111-42B1-93C2-6F1CA8BC4421}.Debug|Win32.ActiveCfg = Debug|Win32 + {B4A4B994-9111-42B1-93C2-6F1CA8BC4421}.Debug|Win32.Build.0 = Debug|Win32 + {B4A4B994-9111-42B1-93C2-6F1CA8BC4421}.Debug|x64.ActiveCfg = Debug|x64 + {B4A4B994-9111-42B1-93C2-6F1CA8BC4421}.Debug|x64.Build.0 = Debug|x64 + {B4A4B994-9111-42B1-93C2-6F1CA8BC4421}.Release|Win32.ActiveCfg = Release|Win32 + {B4A4B994-9111-42B1-93C2-6F1CA8BC4421}.Release|Win32.Build.0 = Release|Win32 + {B4A4B994-9111-42B1-93C2-6F1CA8BC4421}.Release|x64.ActiveCfg = Release|x64 + {B4A4B994-9111-42B1-93C2-6F1CA8BC4421}.Release|x64.Build.0 = Release|x64 + {7E534C8E-1ACE-4A88-8807-39A11ED4DA18}.Debug|Win32.ActiveCfg = Debug|Win32 + {7E534C8E-1ACE-4A88-8807-39A11ED4DA18}.Debug|Win32.Build.0 = Debug|Win32 + {7E534C8E-1ACE-4A88-8807-39A11ED4DA18}.Debug|x64.ActiveCfg = Debug|x64 + {7E534C8E-1ACE-4A88-8807-39A11ED4DA18}.Debug|x64.Build.0 = Debug|x64 + {7E534C8E-1ACE-4A88-8807-39A11ED4DA18}.Release|Win32.ActiveCfg = Release|Win32 + {7E534C8E-1ACE-4A88-8807-39A11ED4DA18}.Release|Win32.Build.0 = Release|Win32 + {7E534C8E-1ACE-4A88-8807-39A11ED4DA18}.Release|x64.ActiveCfg = Release|x64 + {7E534C8E-1ACE-4A88-8807-39A11ED4DA18}.Release|x64.Build.0 = Release|x64 + {A7ED562C-63F3-4B7E-B6B3-2CF7848752E1}.Debug|Win32.ActiveCfg = Debug|Win32 + {A7ED562C-63F3-4B7E-B6B3-2CF7848752E1}.Debug|Win32.Build.0 = Debug|Win32 + {A7ED562C-63F3-4B7E-B6B3-2CF7848752E1}.Debug|x64.ActiveCfg = Debug|x64 + {A7ED562C-63F3-4B7E-B6B3-2CF7848752E1}.Debug|x64.Build.0 = Debug|x64 + {A7ED562C-63F3-4B7E-B6B3-2CF7848752E1}.Release|Win32.ActiveCfg = Release|Win32 + {A7ED562C-63F3-4B7E-B6B3-2CF7848752E1}.Release|Win32.Build.0 = Release|Win32 + {A7ED562C-63F3-4B7E-B6B3-2CF7848752E1}.Release|x64.ActiveCfg = Release|Win32 + {8B9961B1-88D9-4EA3-A752-507A00DD9F3D}.Debug|Win32.ActiveCfg = Debug|Win32 + {8B9961B1-88D9-4EA3-A752-507A00DD9F3D}.Debug|Win32.Build.0 = Debug|Win32 + {8B9961B1-88D9-4EA3-A752-507A00DD9F3D}.Debug|x64.ActiveCfg = Debug|x64 + {8B9961B1-88D9-4EA3-A752-507A00DD9F3D}.Debug|x64.Build.0 = Debug|x64 + {8B9961B1-88D9-4EA3-A752-507A00DD9F3D}.Release|Win32.ActiveCfg = Release|Win32 + {8B9961B1-88D9-4EA3-A752-507A00DD9F3D}.Release|Win32.Build.0 = Release|Win32 + {8B9961B1-88D9-4EA3-A752-507A00DD9F3D}.Release|x64.ActiveCfg = Release|Win32 + {3326E128-33AF-422C-BB7C-67CC6B915610}.Debug|Win32.ActiveCfg = Debug|Win32 + {3326E128-33AF-422C-BB7C-67CC6B915610}.Debug|Win32.Build.0 = Debug|Win32 + {3326E128-33AF-422C-BB7C-67CC6B915610}.Debug|x64.ActiveCfg = Debug|x64 + {3326E128-33AF-422C-BB7C-67CC6B915610}.Debug|x64.Build.0 = Debug|x64 + {3326E128-33AF-422C-BB7C-67CC6B915610}.Release|Win32.ActiveCfg = Release|Win32 + {3326E128-33AF-422C-BB7C-67CC6B915610}.Release|Win32.Build.0 = Release|Win32 + {3326E128-33AF-422C-BB7C-67CC6B915610}.Release|x64.ActiveCfg = Release|x64 + {3326E128-33AF-422C-BB7C-67CC6B915610}.Release|x64.Build.0 = Release|x64 + {4BC6906B-213E-40D7-9FC7-1A93E228393D}.Debug|Win32.ActiveCfg = Debug|Win32 + {4BC6906B-213E-40D7-9FC7-1A93E228393D}.Debug|Win32.Build.0 = Debug|Win32 + {4BC6906B-213E-40D7-9FC7-1A93E228393D}.Debug|x64.ActiveCfg = Debug|Win32 + {4BC6906B-213E-40D7-9FC7-1A93E228393D}.Release|Win32.ActiveCfg = Release|Win32 + {4BC6906B-213E-40D7-9FC7-1A93E228393D}.Release|Win32.Build.0 = Release|Win32 + {4BC6906B-213E-40D7-9FC7-1A93E228393D}.Release|x64.ActiveCfg = Release|Win32 + {731BD205-2826-4631-B7AF-117658E88DBC}.Debug|Win32.ActiveCfg = Debug|Win32 + {731BD205-2826-4631-B7AF-117658E88DBC}.Debug|Win32.Build.0 = Debug|Win32 + {731BD205-2826-4631-B7AF-117658E88DBC}.Debug|x64.ActiveCfg = Debug|x64 + {731BD205-2826-4631-B7AF-117658E88DBC}.Debug|x64.Build.0 = Debug|x64 + {731BD205-2826-4631-B7AF-117658E88DBC}.Release|Win32.ActiveCfg = Release|Win32 + {731BD205-2826-4631-B7AF-117658E88DBC}.Release|Win32.Build.0 = Release|Win32 + {731BD205-2826-4631-B7AF-117658E88DBC}.Release|x64.ActiveCfg = Release|x64 + {731BD205-2826-4631-B7AF-117658E88DBC}.Release|x64.Build.0 = Release|x64 + {360A34F3-3172-4B09-8BC9-B3FBEE677863}.Debug|Win32.ActiveCfg = Debug|Win32 + {360A34F3-3172-4B09-8BC9-B3FBEE677863}.Debug|x64.ActiveCfg = Debug|Win32 + {360A34F3-3172-4B09-8BC9-B3FBEE677863}.Release|Win32.ActiveCfg = Release|Win32 + {360A34F3-3172-4B09-8BC9-B3FBEE677863}.Release|Win32.Build.0 = Release|Win32 + {360A34F3-3172-4B09-8BC9-B3FBEE677863}.Release|x64.ActiveCfg = Release|Win32 + {A4D13408-A794-4199-8FC7-4A9A32505005}.Debug|Win32.ActiveCfg = Debug|Win32 + {A4D13408-A794-4199-8FC7-4A9A32505005}.Debug|Win32.Build.0 = Debug|Win32 + {A4D13408-A794-4199-8FC7-4A9A32505005}.Debug|x64.ActiveCfg = Debug|Win32 + {A4D13408-A794-4199-8FC7-4A9A32505005}.Release|Win32.ActiveCfg = Release|Win32 + {A4D13408-A794-4199-8FC7-4A9A32505005}.Release|Win32.Build.0 = Release|Win32 + {A4D13408-A794-4199-8FC7-4A9A32505005}.Release|x64.ActiveCfg = Release|Win32 + {93447136-FACD-4740-8F35-FC46FB4A9E82}.Debug|Win32.ActiveCfg = Debug|Win32 + {93447136-FACD-4740-8F35-FC46FB4A9E82}.Debug|Win32.Build.0 = Debug|Win32 + {93447136-FACD-4740-8F35-FC46FB4A9E82}.Debug|x64.ActiveCfg = Debug|Win32 + {93447136-FACD-4740-8F35-FC46FB4A9E82}.Release|Win32.ActiveCfg = Release|Win32 + {93447136-FACD-4740-8F35-FC46FB4A9E82}.Release|Win32.Build.0 = Release|Win32 + {93447136-FACD-4740-8F35-FC46FB4A9E82}.Release|x64.ActiveCfg = Release|Win32 + {427F1DCD-3BED-4010-9322-077A4C06D871}.Debug|Win32.ActiveCfg = Debug|Win32 + {427F1DCD-3BED-4010-9322-077A4C06D871}.Debug|Win32.Build.0 = Debug|Win32 + {427F1DCD-3BED-4010-9322-077A4C06D871}.Debug|x64.ActiveCfg = Debug|Win32 + {427F1DCD-3BED-4010-9322-077A4C06D871}.Release|Win32.ActiveCfg = Release|Win32 + {427F1DCD-3BED-4010-9322-077A4C06D871}.Release|Win32.Build.0 = Release|Win32 + {427F1DCD-3BED-4010-9322-077A4C06D871}.Release|x64.ActiveCfg = Release|Win32 + {93CFEDF3-9A75-4484-B169-D9D8074F5AC2}.Debug|Win32.ActiveCfg = Debug|Win32 + {93CFEDF3-9A75-4484-B169-D9D8074F5AC2}.Debug|Win32.Build.0 = Debug|Win32 + {93CFEDF3-9A75-4484-B169-D9D8074F5AC2}.Debug|x64.ActiveCfg = Debug|Win32 + {93CFEDF3-9A75-4484-B169-D9D8074F5AC2}.Release|Win32.ActiveCfg = Release|Win32 + {93CFEDF3-9A75-4484-B169-D9D8074F5AC2}.Release|Win32.Build.0 = Release|Win32 + {93CFEDF3-9A75-4484-B169-D9D8074F5AC2}.Release|x64.ActiveCfg = Release|Win32 + {05B9CB11-12D1-47CD-8E4A-88E12162119B}.Debug|Win32.ActiveCfg = Debug|Win32 + {05B9CB11-12D1-47CD-8E4A-88E12162119B}.Debug|Win32.Build.0 = Debug|Win32 + {05B9CB11-12D1-47CD-8E4A-88E12162119B}.Debug|x64.ActiveCfg = Debug|Win32 + {05B9CB11-12D1-47CD-8E4A-88E12162119B}.Release|Win32.ActiveCfg = Release|Win32 + {05B9CB11-12D1-47CD-8E4A-88E12162119B}.Release|Win32.Build.0 = Release|Win32 + {05B9CB11-12D1-47CD-8E4A-88E12162119B}.Release|x64.ActiveCfg = Release|Win32 + {25A25249-C284-4C5A-8DC2-26FC3EB13703}.Debug|Win32.ActiveCfg = Debug|Win32 + {25A25249-C284-4C5A-8DC2-26FC3EB13703}.Debug|Win32.Build.0 = Debug|Win32 + {25A25249-C284-4C5A-8DC2-26FC3EB13703}.Debug|x64.ActiveCfg = Debug|Win32 + {25A25249-C284-4C5A-8DC2-26FC3EB13703}.Release|Win32.ActiveCfg = Release|Win32 + {25A25249-C284-4C5A-8DC2-26FC3EB13703}.Release|Win32.Build.0 = Release|Win32 + {25A25249-C284-4C5A-8DC2-26FC3EB13703}.Release|x64.ActiveCfg = Release|Win32 + {462C2608-182F-452C-944F-AF201E19300B}.Debug|Win32.ActiveCfg = Debug|Win32 + {462C2608-182F-452C-944F-AF201E19300B}.Debug|Win32.Build.0 = Debug|Win32 + {462C2608-182F-452C-944F-AF201E19300B}.Debug|x64.ActiveCfg = Debug|Win32 + {462C2608-182F-452C-944F-AF201E19300B}.Release|Win32.ActiveCfg = Release|Win32 + {462C2608-182F-452C-944F-AF201E19300B}.Release|Win32.Build.0 = Release|Win32 + {462C2608-182F-452C-944F-AF201E19300B}.Release|x64.ActiveCfg = Release|Win32 + {2DADDAA5-0F57-46ED-A974-747908DDC7F3}.Debug|Win32.ActiveCfg = Debug|Win32 + {2DADDAA5-0F57-46ED-A974-747908DDC7F3}.Debug|Win32.Build.0 = Debug|Win32 + {2DADDAA5-0F57-46ED-A974-747908DDC7F3}.Debug|x64.ActiveCfg = Debug|Win32 + {2DADDAA5-0F57-46ED-A974-747908DDC7F3}.Release|Win32.ActiveCfg = Release|Win32 + {2DADDAA5-0F57-46ED-A974-747908DDC7F3}.Release|Win32.Build.0 = Release|Win32 + {2DADDAA5-0F57-46ED-A974-747908DDC7F3}.Release|x64.ActiveCfg = Release|Win32 + {FD617E80-9E40-4138-85DA-B94633972E6A}.Debug|Win32.ActiveCfg = Debug|Win32 + {FD617E80-9E40-4138-85DA-B94633972E6A}.Debug|Win32.Build.0 = Debug|Win32 + {FD617E80-9E40-4138-85DA-B94633972E6A}.Debug|x64.ActiveCfg = Debug|x64 + {FD617E80-9E40-4138-85DA-B94633972E6A}.Debug|x64.Build.0 = Debug|x64 + {FD617E80-9E40-4138-85DA-B94633972E6A}.Release|Win32.ActiveCfg = Release|Win32 + {FD617E80-9E40-4138-85DA-B94633972E6A}.Release|Win32.Build.0 = Release|Win32 + {FD617E80-9E40-4138-85DA-B94633972E6A}.Release|x64.ActiveCfg = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {1379F817-7E3D-4F58-9C22-7E364E46E842} = {AA8F7F8E-5377-4911-859D-8A8817B0DB26} + {3326E128-33AF-422C-BB7C-67CC6B915610} = {AA8F7F8E-5377-4911-859D-8A8817B0DB26} + {4BC6906B-213E-40D7-9FC7-1A93E228393D} = {AA8F7F8E-5377-4911-859D-8A8817B0DB26} + {731BD205-2826-4631-B7AF-117658E88DBC} = {AA8F7F8E-5377-4911-859D-8A8817B0DB26} + {A4D13408-A794-4199-8FC7-4A9A32505005} = {9FE699A5-41C3-4441-92AB-639B3D77DE26} + {93447136-FACD-4740-8F35-FC46FB4A9E82} = {1379F817-7E3D-4F58-9C22-7E364E46E842} + {427F1DCD-3BED-4010-9322-077A4C06D871} = {1379F817-7E3D-4F58-9C22-7E364E46E842} + {93CFEDF3-9A75-4484-B169-D9D8074F5AC2} = {1379F817-7E3D-4F58-9C22-7E364E46E842} + {05B9CB11-12D1-47CD-8E4A-88E12162119B} = {1379F817-7E3D-4F58-9C22-7E364E46E842} + {25A25249-C284-4C5A-8DC2-26FC3EB13703} = {1379F817-7E3D-4F58-9C22-7E364E46E842} + {462C2608-182F-452C-944F-AF201E19300B} = {9FE699A5-41C3-4441-92AB-639B3D77DE26} + {2DADDAA5-0F57-46ED-A974-747908DDC7F3} = {9FE699A5-41C3-4441-92AB-639B3D77DE26} + EndGlobalSection +EndGlobal From 836f9ea4b710ad41c1dfc4caa9e62fd18cc2cfa4 Mon Sep 17 00:00:00 2001 From: "Julio C. Rocha" Date: Wed, 23 Sep 2015 20:25:51 -0700 Subject: [PATCH 09/13] Set required version vor 2013,2015 SLN files --- Project64.vs2013.sln | 1 + Project64.vs2015.sln | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Project64.vs2013.sln b/Project64.vs2013.sln index d1b23703d..99a02e0fe 100644 --- a/Project64.vs2013.sln +++ b/Project64.vs2013.sln @@ -1,6 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2013 +VisualStudioVersion = 12.0.31101.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "3rd Party", "3rd Party", "{AA8F7F8E-5377-4911-859D-8A8817B0DB26}" EndProject diff --git a/Project64.vs2015.sln b/Project64.vs2015.sln index 533471596..5c6237bc7 100644 --- a/Project64.vs2015.sln +++ b/Project64.vs2015.sln @@ -1,7 +1,8 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2015 -MinimumVisualStudioVersion = 14.0.23107.0 +VisualStudioVersion = 14.0.23107.0 +MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "3rd Party", "3rd Party", "{AA8F7F8E-5377-4911-859D-8A8817B0DB26}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "wxWidgets", "wxWidgets", "{1379F817-7E3D-4F58-9C22-7E364E46E842}" From c183cba8f69d6112fc32437bb2ccf85fbf08643c Mon Sep 17 00:00:00 2001 From: "Julio C. Rocha" Date: Fri, 25 Sep 2015 22:54:55 -0700 Subject: [PATCH 10/13] Consolidated Project64.sln to handle VS versions from 2010 to 2015. --- Project64.vs2013.sln => Project64.sln | 0 Project64.vs2015.sln | 201 -------------------------- 2 files changed, 201 deletions(-) rename Project64.vs2013.sln => Project64.sln (100%) delete mode 100644 Project64.vs2015.sln diff --git a/Project64.vs2013.sln b/Project64.sln similarity index 100% rename from Project64.vs2013.sln rename to Project64.sln diff --git a/Project64.vs2015.sln b/Project64.vs2015.sln deleted file mode 100644 index 5c6237bc7..000000000 --- a/Project64.vs2015.sln +++ /dev/null @@ -1,201 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2015 -VisualStudioVersion = 14.0.23107.0 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "3rd Party", "3rd Party", "{AA8F7F8E-5377-4911-859D-8A8817B0DB26}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "wxWidgets", "wxWidgets", "{1379F817-7E3D-4F58-9C22-7E364E46E842}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Glide", "Glide", "{9FE699A5-41C3-4441-92AB-639B3D77DE26}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Common", "Source\Common\Common.vcxproj", "{B4A4B994-9111-42B1-93C2-6F1CA8BC4421}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Project64", "Source\Project64\Project64.vcxproj", "{7E534C8E-1ACE-4A88-8807-39A11ED4DA18}" - ProjectSection(ProjectDependencies) = postProject - {FD617E80-9E40-4138-85DA-B94633972E6A} = {FD617E80-9E40-4138-85DA-B94633972E6A} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RSP", "Source\RSP\RSP.vcxproj", "{A7ED562C-63F3-4B7E-B6B3-2CF7848752E1}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Settings", "Source\Settings\Settings.vcxproj", "{8B9961B1-88D9-4EA3-A752-507A00DD9F3D}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "7zip", "Source\3rd Party\7zip\7zip.vcxproj", "{3326E128-33AF-422C-BB7C-67CC6B915610}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WTL", "Source\3rd Party\WTL\WTL.vcxproj", "{4BC6906B-213E-40D7-9FC7-1A93E228393D}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "Source\3rd Party\zlib\zlib.vcxproj", "{731BD205-2826-4631-B7AF-117658E88DBC}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Project64Setup", "Source\Installer\Installer.vcxproj", "{360A34F3-3172-4B09-8BC9-B3FBEE677863}" - ProjectSection(ProjectDependencies) = postProject - {A4D13408-A794-4199-8FC7-4A9A32505005} = {A4D13408-A794-4199-8FC7-4A9A32505005} - {A7ED562C-63F3-4B7E-B6B3-2CF7848752E1} = {A7ED562C-63F3-4B7E-B6B3-2CF7848752E1} - {FD617E80-9E40-4138-85DA-B94633972E6A} = {FD617E80-9E40-4138-85DA-B94633972E6A} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Glide64", "Source\Glide64\Glide64.vcxproj", "{A4D13408-A794-4199-8FC7-4A9A32505005}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core", "Source\3rd Party\wx\wx_core.vcxproj", "{93447136-FACD-4740-8F35-FC46FB4A9E82}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "base", "Source\3rd Party\wx\wx_base.vcxproj", "{427F1DCD-3BED-4010-9322-077A4C06D871}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxjpeg", "Source\3rd Party\wx\wx_wxjpeg.vcxproj", "{93CFEDF3-9A75-4484-B169-D9D8074F5AC2}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxpng", "Source\3rd Party\wx\wx_wxpng.vcxproj", "{05B9CB11-12D1-47CD-8E4A-88E12162119B}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxzlib", "Source\3rd Party\wx\wx_wxzlib.vcxproj", "{25A25249-C284-4C5A-8DC2-26FC3EB13703}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Glitch64", "Source\Glitch64\Glitch64.vcxproj", "{462C2608-182F-452C-944F-AF201E19300B}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GlideHQ", "Source\GlideHQ\GlideHQ.vcxproj", "{2DADDAA5-0F57-46ED-A974-747908DDC7F3}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PJ64 NRage", "Source\nragev20\NRage_Input_V2.vcxproj", "{FD617E80-9E40-4138-85DA-B94633972E6A}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "PropertySheets", "PropertySheets", "{181AA451-63A7-4E3B-BE0C-F92BE3F3D2F2}" - ProjectSection(SolutionItems) = preProject - PropertySheets\Debug.props = PropertySheets\Debug.props - PropertySheets\Platform.Debug.props = PropertySheets\Platform.Debug.props - PropertySheets\Platform.props = PropertySheets\Platform.props - PropertySheets\Platform.Release.props = PropertySheets\Platform.Release.props - PropertySheets\Release.props = PropertySheets\Release.props - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B4A4B994-9111-42B1-93C2-6F1CA8BC4421}.Debug|Win32.ActiveCfg = Debug|Win32 - {B4A4B994-9111-42B1-93C2-6F1CA8BC4421}.Debug|Win32.Build.0 = Debug|Win32 - {B4A4B994-9111-42B1-93C2-6F1CA8BC4421}.Debug|x64.ActiveCfg = Debug|x64 - {B4A4B994-9111-42B1-93C2-6F1CA8BC4421}.Debug|x64.Build.0 = Debug|x64 - {B4A4B994-9111-42B1-93C2-6F1CA8BC4421}.Release|Win32.ActiveCfg = Release|Win32 - {B4A4B994-9111-42B1-93C2-6F1CA8BC4421}.Release|Win32.Build.0 = Release|Win32 - {B4A4B994-9111-42B1-93C2-6F1CA8BC4421}.Release|x64.ActiveCfg = Release|x64 - {B4A4B994-9111-42B1-93C2-6F1CA8BC4421}.Release|x64.Build.0 = Release|x64 - {7E534C8E-1ACE-4A88-8807-39A11ED4DA18}.Debug|Win32.ActiveCfg = Debug|Win32 - {7E534C8E-1ACE-4A88-8807-39A11ED4DA18}.Debug|Win32.Build.0 = Debug|Win32 - {7E534C8E-1ACE-4A88-8807-39A11ED4DA18}.Debug|x64.ActiveCfg = Debug|x64 - {7E534C8E-1ACE-4A88-8807-39A11ED4DA18}.Debug|x64.Build.0 = Debug|x64 - {7E534C8E-1ACE-4A88-8807-39A11ED4DA18}.Release|Win32.ActiveCfg = Release|Win32 - {7E534C8E-1ACE-4A88-8807-39A11ED4DA18}.Release|Win32.Build.0 = Release|Win32 - {7E534C8E-1ACE-4A88-8807-39A11ED4DA18}.Release|x64.ActiveCfg = Release|x64 - {7E534C8E-1ACE-4A88-8807-39A11ED4DA18}.Release|x64.Build.0 = Release|x64 - {A7ED562C-63F3-4B7E-B6B3-2CF7848752E1}.Debug|Win32.ActiveCfg = Debug|Win32 - {A7ED562C-63F3-4B7E-B6B3-2CF7848752E1}.Debug|Win32.Build.0 = Debug|Win32 - {A7ED562C-63F3-4B7E-B6B3-2CF7848752E1}.Debug|x64.ActiveCfg = Debug|x64 - {A7ED562C-63F3-4B7E-B6B3-2CF7848752E1}.Debug|x64.Build.0 = Debug|x64 - {A7ED562C-63F3-4B7E-B6B3-2CF7848752E1}.Release|Win32.ActiveCfg = Release|Win32 - {A7ED562C-63F3-4B7E-B6B3-2CF7848752E1}.Release|Win32.Build.0 = Release|Win32 - {A7ED562C-63F3-4B7E-B6B3-2CF7848752E1}.Release|x64.ActiveCfg = Release|Win32 - {8B9961B1-88D9-4EA3-A752-507A00DD9F3D}.Debug|Win32.ActiveCfg = Debug|Win32 - {8B9961B1-88D9-4EA3-A752-507A00DD9F3D}.Debug|Win32.Build.0 = Debug|Win32 - {8B9961B1-88D9-4EA3-A752-507A00DD9F3D}.Debug|x64.ActiveCfg = Debug|x64 - {8B9961B1-88D9-4EA3-A752-507A00DD9F3D}.Debug|x64.Build.0 = Debug|x64 - {8B9961B1-88D9-4EA3-A752-507A00DD9F3D}.Release|Win32.ActiveCfg = Release|Win32 - {8B9961B1-88D9-4EA3-A752-507A00DD9F3D}.Release|Win32.Build.0 = Release|Win32 - {8B9961B1-88D9-4EA3-A752-507A00DD9F3D}.Release|x64.ActiveCfg = Release|Win32 - {3326E128-33AF-422C-BB7C-67CC6B915610}.Debug|Win32.ActiveCfg = Debug|Win32 - {3326E128-33AF-422C-BB7C-67CC6B915610}.Debug|Win32.Build.0 = Debug|Win32 - {3326E128-33AF-422C-BB7C-67CC6B915610}.Debug|x64.ActiveCfg = Debug|x64 - {3326E128-33AF-422C-BB7C-67CC6B915610}.Debug|x64.Build.0 = Debug|x64 - {3326E128-33AF-422C-BB7C-67CC6B915610}.Release|Win32.ActiveCfg = Release|Win32 - {3326E128-33AF-422C-BB7C-67CC6B915610}.Release|Win32.Build.0 = Release|Win32 - {3326E128-33AF-422C-BB7C-67CC6B915610}.Release|x64.ActiveCfg = Release|x64 - {3326E128-33AF-422C-BB7C-67CC6B915610}.Release|x64.Build.0 = Release|x64 - {4BC6906B-213E-40D7-9FC7-1A93E228393D}.Debug|Win32.ActiveCfg = Debug|Win32 - {4BC6906B-213E-40D7-9FC7-1A93E228393D}.Debug|Win32.Build.0 = Debug|Win32 - {4BC6906B-213E-40D7-9FC7-1A93E228393D}.Debug|x64.ActiveCfg = Debug|Win32 - {4BC6906B-213E-40D7-9FC7-1A93E228393D}.Release|Win32.ActiveCfg = Release|Win32 - {4BC6906B-213E-40D7-9FC7-1A93E228393D}.Release|Win32.Build.0 = Release|Win32 - {4BC6906B-213E-40D7-9FC7-1A93E228393D}.Release|x64.ActiveCfg = Release|Win32 - {731BD205-2826-4631-B7AF-117658E88DBC}.Debug|Win32.ActiveCfg = Debug|Win32 - {731BD205-2826-4631-B7AF-117658E88DBC}.Debug|Win32.Build.0 = Debug|Win32 - {731BD205-2826-4631-B7AF-117658E88DBC}.Debug|x64.ActiveCfg = Debug|x64 - {731BD205-2826-4631-B7AF-117658E88DBC}.Debug|x64.Build.0 = Debug|x64 - {731BD205-2826-4631-B7AF-117658E88DBC}.Release|Win32.ActiveCfg = Release|Win32 - {731BD205-2826-4631-B7AF-117658E88DBC}.Release|Win32.Build.0 = Release|Win32 - {731BD205-2826-4631-B7AF-117658E88DBC}.Release|x64.ActiveCfg = Release|x64 - {731BD205-2826-4631-B7AF-117658E88DBC}.Release|x64.Build.0 = Release|x64 - {360A34F3-3172-4B09-8BC9-B3FBEE677863}.Debug|Win32.ActiveCfg = Debug|Win32 - {360A34F3-3172-4B09-8BC9-B3FBEE677863}.Debug|x64.ActiveCfg = Debug|Win32 - {360A34F3-3172-4B09-8BC9-B3FBEE677863}.Release|Win32.ActiveCfg = Release|Win32 - {360A34F3-3172-4B09-8BC9-B3FBEE677863}.Release|Win32.Build.0 = Release|Win32 - {360A34F3-3172-4B09-8BC9-B3FBEE677863}.Release|x64.ActiveCfg = Release|Win32 - {A4D13408-A794-4199-8FC7-4A9A32505005}.Debug|Win32.ActiveCfg = Debug|Win32 - {A4D13408-A794-4199-8FC7-4A9A32505005}.Debug|Win32.Build.0 = Debug|Win32 - {A4D13408-A794-4199-8FC7-4A9A32505005}.Debug|x64.ActiveCfg = Debug|Win32 - {A4D13408-A794-4199-8FC7-4A9A32505005}.Release|Win32.ActiveCfg = Release|Win32 - {A4D13408-A794-4199-8FC7-4A9A32505005}.Release|Win32.Build.0 = Release|Win32 - {A4D13408-A794-4199-8FC7-4A9A32505005}.Release|x64.ActiveCfg = Release|Win32 - {93447136-FACD-4740-8F35-FC46FB4A9E82}.Debug|Win32.ActiveCfg = Debug|Win32 - {93447136-FACD-4740-8F35-FC46FB4A9E82}.Debug|Win32.Build.0 = Debug|Win32 - {93447136-FACD-4740-8F35-FC46FB4A9E82}.Debug|x64.ActiveCfg = Debug|Win32 - {93447136-FACD-4740-8F35-FC46FB4A9E82}.Release|Win32.ActiveCfg = Release|Win32 - {93447136-FACD-4740-8F35-FC46FB4A9E82}.Release|Win32.Build.0 = Release|Win32 - {93447136-FACD-4740-8F35-FC46FB4A9E82}.Release|x64.ActiveCfg = Release|Win32 - {427F1DCD-3BED-4010-9322-077A4C06D871}.Debug|Win32.ActiveCfg = Debug|Win32 - {427F1DCD-3BED-4010-9322-077A4C06D871}.Debug|Win32.Build.0 = Debug|Win32 - {427F1DCD-3BED-4010-9322-077A4C06D871}.Debug|x64.ActiveCfg = Debug|Win32 - {427F1DCD-3BED-4010-9322-077A4C06D871}.Release|Win32.ActiveCfg = Release|Win32 - {427F1DCD-3BED-4010-9322-077A4C06D871}.Release|Win32.Build.0 = Release|Win32 - {427F1DCD-3BED-4010-9322-077A4C06D871}.Release|x64.ActiveCfg = Release|Win32 - {93CFEDF3-9A75-4484-B169-D9D8074F5AC2}.Debug|Win32.ActiveCfg = Debug|Win32 - {93CFEDF3-9A75-4484-B169-D9D8074F5AC2}.Debug|Win32.Build.0 = Debug|Win32 - {93CFEDF3-9A75-4484-B169-D9D8074F5AC2}.Debug|x64.ActiveCfg = Debug|Win32 - {93CFEDF3-9A75-4484-B169-D9D8074F5AC2}.Release|Win32.ActiveCfg = Release|Win32 - {93CFEDF3-9A75-4484-B169-D9D8074F5AC2}.Release|Win32.Build.0 = Release|Win32 - {93CFEDF3-9A75-4484-B169-D9D8074F5AC2}.Release|x64.ActiveCfg = Release|Win32 - {05B9CB11-12D1-47CD-8E4A-88E12162119B}.Debug|Win32.ActiveCfg = Debug|Win32 - {05B9CB11-12D1-47CD-8E4A-88E12162119B}.Debug|Win32.Build.0 = Debug|Win32 - {05B9CB11-12D1-47CD-8E4A-88E12162119B}.Debug|x64.ActiveCfg = Debug|Win32 - {05B9CB11-12D1-47CD-8E4A-88E12162119B}.Release|Win32.ActiveCfg = Release|Win32 - {05B9CB11-12D1-47CD-8E4A-88E12162119B}.Release|Win32.Build.0 = Release|Win32 - {05B9CB11-12D1-47CD-8E4A-88E12162119B}.Release|x64.ActiveCfg = Release|Win32 - {25A25249-C284-4C5A-8DC2-26FC3EB13703}.Debug|Win32.ActiveCfg = Debug|Win32 - {25A25249-C284-4C5A-8DC2-26FC3EB13703}.Debug|Win32.Build.0 = Debug|Win32 - {25A25249-C284-4C5A-8DC2-26FC3EB13703}.Debug|x64.ActiveCfg = Debug|Win32 - {25A25249-C284-4C5A-8DC2-26FC3EB13703}.Release|Win32.ActiveCfg = Release|Win32 - {25A25249-C284-4C5A-8DC2-26FC3EB13703}.Release|Win32.Build.0 = Release|Win32 - {25A25249-C284-4C5A-8DC2-26FC3EB13703}.Release|x64.ActiveCfg = Release|Win32 - {462C2608-182F-452C-944F-AF201E19300B}.Debug|Win32.ActiveCfg = Debug|Win32 - {462C2608-182F-452C-944F-AF201E19300B}.Debug|Win32.Build.0 = Debug|Win32 - {462C2608-182F-452C-944F-AF201E19300B}.Debug|x64.ActiveCfg = Debug|Win32 - {462C2608-182F-452C-944F-AF201E19300B}.Release|Win32.ActiveCfg = Release|Win32 - {462C2608-182F-452C-944F-AF201E19300B}.Release|Win32.Build.0 = Release|Win32 - {462C2608-182F-452C-944F-AF201E19300B}.Release|x64.ActiveCfg = Release|Win32 - {2DADDAA5-0F57-46ED-A974-747908DDC7F3}.Debug|Win32.ActiveCfg = Debug|Win32 - {2DADDAA5-0F57-46ED-A974-747908DDC7F3}.Debug|Win32.Build.0 = Debug|Win32 - {2DADDAA5-0F57-46ED-A974-747908DDC7F3}.Debug|x64.ActiveCfg = Debug|Win32 - {2DADDAA5-0F57-46ED-A974-747908DDC7F3}.Release|Win32.ActiveCfg = Release|Win32 - {2DADDAA5-0F57-46ED-A974-747908DDC7F3}.Release|Win32.Build.0 = Release|Win32 - {2DADDAA5-0F57-46ED-A974-747908DDC7F3}.Release|x64.ActiveCfg = Release|Win32 - {FD617E80-9E40-4138-85DA-B94633972E6A}.Debug|Win32.ActiveCfg = Debug|Win32 - {FD617E80-9E40-4138-85DA-B94633972E6A}.Debug|Win32.Build.0 = Debug|Win32 - {FD617E80-9E40-4138-85DA-B94633972E6A}.Debug|x64.ActiveCfg = Debug|x64 - {FD617E80-9E40-4138-85DA-B94633972E6A}.Debug|x64.Build.0 = Debug|x64 - {FD617E80-9E40-4138-85DA-B94633972E6A}.Release|Win32.ActiveCfg = Release|Win32 - {FD617E80-9E40-4138-85DA-B94633972E6A}.Release|Win32.Build.0 = Release|Win32 - {FD617E80-9E40-4138-85DA-B94633972E6A}.Release|x64.ActiveCfg = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {1379F817-7E3D-4F58-9C22-7E364E46E842} = {AA8F7F8E-5377-4911-859D-8A8817B0DB26} - {3326E128-33AF-422C-BB7C-67CC6B915610} = {AA8F7F8E-5377-4911-859D-8A8817B0DB26} - {4BC6906B-213E-40D7-9FC7-1A93E228393D} = {AA8F7F8E-5377-4911-859D-8A8817B0DB26} - {731BD205-2826-4631-B7AF-117658E88DBC} = {AA8F7F8E-5377-4911-859D-8A8817B0DB26} - {A4D13408-A794-4199-8FC7-4A9A32505005} = {9FE699A5-41C3-4441-92AB-639B3D77DE26} - {93447136-FACD-4740-8F35-FC46FB4A9E82} = {1379F817-7E3D-4F58-9C22-7E364E46E842} - {427F1DCD-3BED-4010-9322-077A4C06D871} = {1379F817-7E3D-4F58-9C22-7E364E46E842} - {93CFEDF3-9A75-4484-B169-D9D8074F5AC2} = {1379F817-7E3D-4F58-9C22-7E364E46E842} - {05B9CB11-12D1-47CD-8E4A-88E12162119B} = {1379F817-7E3D-4F58-9C22-7E364E46E842} - {25A25249-C284-4C5A-8DC2-26FC3EB13703} = {1379F817-7E3D-4F58-9C22-7E364E46E842} - {462C2608-182F-452C-944F-AF201E19300B} = {9FE699A5-41C3-4441-92AB-639B3D77DE26} - {2DADDAA5-0F57-46ED-A974-747908DDC7F3} = {9FE699A5-41C3-4441-92AB-639B3D77DE26} - EndGlobalSection -EndGlobal From a2746d4785741e222902c794196e73fbba528abe Mon Sep 17 00:00:00 2001 From: "Julio C. Rocha" Date: Fri, 25 Sep 2015 22:56:42 -0700 Subject: [PATCH 11/13] Consolidated Project64.sln to handle VS versions from 2010 to 2015. --- Project64.sln | Bin 14378 -> 28702 bytes PropertySheets/Platform.props | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Project64.sln b/Project64.sln index 99a02e0fe03a879854c192e015a0bb90089c63b0..03fd2c8f2205300a2fc62ad275210b4197a019d4 100644 GIT binary patch literal 28702 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 diff --git a/PropertySheets/Platform.props b/PropertySheets/Platform.props index 4dda062cb..c28fea2bc 100644 --- a/PropertySheets/Platform.props +++ b/PropertySheets/Platform.props @@ -2,7 +2,7 @@ - v120_xp + v140_xp @@ -16,7 +16,6 @@ *.obj;*.ilk;*.tlb;*.tli;*.tlh;*.tmp;*.rsp;*.pgc;*.pgd;*.meta;$(TargetPath);$(ExtensionsToDeleteOnClean) false false - false true @@ -68,6 +67,7 @@ false true NoExtensions + NotSet Precise false false From f5ef8d3359f176b3e7402dc4a856ec38aa752222 Mon Sep 17 00:00:00 2001 From: "Julio C. Rocha" Date: Sat, 26 Sep 2015 05:29:48 -0700 Subject: [PATCH 12/13] Fix ROM Browser issue on Windows XP. --- Source/Project64/Project64.vcxproj | 1 + Source/Project64/User Interface/Rom Browser Class.cpp | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Source/Project64/Project64.vcxproj b/Source/Project64/Project64.vcxproj index dd21777da..046f95300 100644 --- a/Source/Project64/Project64.vcxproj +++ b/Source/Project64/Project64.vcxproj @@ -35,6 +35,7 @@ Windows 5.01 + 1 diff --git a/Source/Project64/User Interface/Rom Browser Class.cpp b/Source/Project64/User Interface/Rom Browser Class.cpp index 748f6c1e4..6342e8a7a 100644 --- a/Source/Project64/User Interface/Rom Browser Class.cpp +++ b/Source/Project64/User Interface/Rom Browser Class.cpp @@ -617,7 +617,8 @@ void CRomBrowser::FillRomList ( strlist & FileList, const CPath & BaseDirectory, CPath SearchPath(BaseDirectory,"*.*"); SearchPath.AppendDirectory(Directory.c_str()); - WriteTraceF(TraceDebug,__FUNCTION__ ": 1 %s",(LPCSTR)SearchPath); + //TODO: Fix exception on Windows XP (Visual Studio 2010+) + //WriteTraceF(TraceDebug,__FUNCTION__ ": 1 %s",(LPCSTR)SearchPath); if (!SearchPath.FindFirst(CPath::_A_ALLFILES)) { return; @@ -625,7 +626,8 @@ void CRomBrowser::FillRomList ( strlist & FileList, const CPath & BaseDirectory, do { - WriteTraceF(TraceDebug,__FUNCTION__ ": 2 %s m_StopRefresh = %d",(LPCSTR)SearchPath,m_StopRefresh); + //TODO: Fix exception on Windows XP (Visual Studio 2010+) + //WriteTraceF(TraceDebug,__FUNCTION__ ": 2 %s m_StopRefresh = %d",(LPCSTR)SearchPath,m_StopRefresh); if (m_StopRefresh) { break; } if (SearchPath.IsDirectory()) From 012a16910f21cbeeba507543aa7e0ab5b309fd79 Mon Sep 17 00:00:00 2001 From: "Julio C. Rocha" Date: Sun, 27 Sep 2015 01:44:44 -0700 Subject: [PATCH 13/13] Add support for VS2008 toolset on modern VS versions. --- PropertySheets/Platform.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PropertySheets/Platform.props b/PropertySheets/Platform.props index c28fea2bc..a5ae131a8 100644 --- a/PropertySheets/Platform.props +++ b/PropertySheets/Platform.props @@ -67,7 +67,7 @@ false true NoExtensions - NotSet + NotSet Precise false false