diff --git a/Project64.sln b/Project64.sln new file mode 100644 index 000000000..03fd2c8f2 Binary files /dev/null and b/Project64.sln differ diff --git a/Project64.vs2013.sln b/Project64.vs2013.sln deleted file mode 100644 index 97b61170e..000000000 --- a/Project64.vs2013.sln +++ /dev/null @@ -1,192 +0,0 @@ - -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 -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 -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 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/Win32.Debug.props b/PropertySheets/Platform.Debug.props similarity index 51% rename from PropertySheets/Win32.Debug.props rename to PropertySheets/Platform.Debug.props index 03537792f..9db2d28c1 100644 --- a/PropertySheets/Win32.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/Win32.Release.props b/PropertySheets/Platform.Release.props similarity index 51% rename from PropertySheets/Win32.Release.props rename to PropertySheets/Platform.Release.props index 5d8a2c9fa..73e73ad66 100644 --- a/PropertySheets/Win32.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/Win32.props b/PropertySheets/Platform.props similarity index 83% rename from PropertySheets/Win32.props rename to PropertySheets/Platform.props index b4c206b87..a5ae131a8 100644 --- a/PropertySheets/Win32.props +++ b/PropertySheets/Platform.props @@ -1,34 +1,39 @@  + + + v140_xp + + + + + + + $(SolutionDir)bin\$(Configuration)\ - $(SolutionDir)bin\$(Configuration)64\ $(SolutionDir)build\$(Configuration)\$(ProjectName)\ - $(SolutionDir)build\$(Configuration)64\$(ProjectName)\ *.obj;*.ilk;*.tlb;*.tli;*.tlh;*.tmp;*.rsp;*.pgc;*.pgd;*.meta;$(TargetPath);$(ExtensionsToDeleteOnClean) false false - false true + $(SolutionDir)bin\$(Configuration)\lib\ - $(SolutionDir)bin\$(Configuration)64\lib\ + WIN32;_WIN32;_WINDOWS;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions) - - Windows - MachineX86 - MachineX64 - + $(SolutionDir) $(ROOT)Source\ + $(ROOT) @@ -37,7 +42,7 @@ $(SRC) - + $(IntDir)BuildLog.htm @@ -62,10 +67,10 @@ false true NoExtensions - Precise + NotSet + Precise false false - true true false @@ -74,13 +79,11 @@ StdAfx.h $(IntDir)$(TargetName).pch false - $(IntDir) $(IntDir) - $(IntDir)vc90.pdb + $(IntDir)vc$(VisualStudioVersion).pdb false $(IntDir) - $(IntDir) Level4 false @@ -118,7 +121,6 @@ false 1 true - $(TargetDir)pdb/$(TargetName).pdb true $(TargetDir)map/$(TargetName).map @@ -127,18 +129,14 @@ 0 0 0 - - false false true true - false false false false - false false $(TargetDir)lib/$(TargetName).lib @@ -147,8 +145,6 @@ Default PromptImmediately false - Windows - .;$(SRC);$(SRC)\3rd Party;%(AdditionalIncludeDirectories) @@ -162,7 +158,6 @@ true $(IntDir)%(Filename).tlb %(Filename)_h.h - %(Filename)_i.c %(Filename)_p.c All @@ -196,5 +191,31 @@ $(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/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/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..1c48b52dc 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 @@ -373,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) @@ -435,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) @@ -620,7 +594,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..902bc07b9 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 @@ -51,10 +45,6 @@ $(Root)Source\3rd Party\wx\lib\vc_lib;%(AdditionalLibraryDirectories) - Windows - Windows - Windows - Windows @@ -175,7 +165,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/Installer/Installer.vcxproj b/Source/Installer/Installer.vcxproj index 635c17c5f..e1db49060 100644 --- a/Source/Installer/Installer.vcxproj +++ b/Source/Installer/Installer.vcxproj @@ -15,45 +15,25 @@ {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 +45,4 @@ false - - - \ No newline at end of file diff --git a/Source/Project64/Project64.vcxproj b/Source/Project64/Project64.vcxproj index c6df20064..046f95300 100644 --- a/Source/Project64/Project64.vcxproj +++ b/Source/Project64/Project64.vcxproj @@ -22,21 +22,22 @@ {7E534C8E-1ACE-4A88-8807-39A11ED4DA18} Project64 - Application - v120_xp - - - + - - + - - <_ProjectFileVersion>12.0.21005.1 - + + + + + Windows + 5.01 + 1 + + @@ -169,10 +170,7 @@ - User Interface;%(AdditionalIncludeDirectories) - User Interface;%(AdditionalIncludeDirectories) - User Interface;%(AdditionalIncludeDirectories) - User Interface;%(AdditionalIncludeDirectories) + User Interface;%(AdditionalIncludeDirectories) @@ -315,7 +313,4 @@ false - - - \ No newline at end of file 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()) 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