From 8fec0f52c09eb1d42e9a5cde0e1bb698f9cf7e5a Mon Sep 17 00:00:00 2001 From: Matthew Bowra-Dean Date: Mon, 5 Oct 2009 19:35:03 +1300 Subject: [PATCH] Changed .NET projects to target x86 Compiling the .NET projects as x64 on 64bit machines was causing problems with the unmanaged code. --- .gitignore | 4 + MixDecrypt/MixDecrypt.vcproj | 1 + .../OpenRa.DataStructures.csproj | 21 +++-- OpenRa.FileFormats/OpenRa.FileFormats.csproj | 33 ++++---- OpenRa.Game/MainWindow.cs | 2 +- OpenRa.Game/OpenRa.Game.csproj | 31 ++++---- OpenRa.Game/TechTree/TechTree.cs | 2 +- OpenRa.sln | 78 ++++++------------- PaletteUsage/PaletteUsage.csproj | 21 +++-- 9 files changed, 80 insertions(+), 113 deletions(-) diff --git a/.gitignore b/.gitignore index 0d8722721d..a8f2c75090 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,7 @@ obj *.ncb *.vcproj* *.suo + +# Red Alert binary files +*.[mM][iI][xX] + diff --git a/MixDecrypt/MixDecrypt.vcproj b/MixDecrypt/MixDecrypt.vcproj index c0c5c09f48..32c0e614e6 100644 --- a/MixDecrypt/MixDecrypt.vcproj +++ b/MixDecrypt/MixDecrypt.vcproj @@ -119,6 +119,7 @@ RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="3" + Detect64BitPortabilityProblems="false" DebugInformationFormat="3" /> Debug AnyCPU - 8.0.50727 + 9.0.30729 2.0 {2F9E7A23-56C0-4286-9C8E-1060A9B2F073} Library @@ -15,22 +15,21 @@ - + true - full - false - bin\Debug\ + bin\x86\Debug\ DEBUG;TRACE + full + x86 prompt - 4 - - pdbonly - true - bin\Release\ + + bin\x86\Release\ TRACE + true + pdbonly + x86 prompt - 4 diff --git a/OpenRa.FileFormats/OpenRa.FileFormats.csproj b/OpenRa.FileFormats/OpenRa.FileFormats.csproj index ebf9aefc2e..7979afdc1a 100644 --- a/OpenRa.FileFormats/OpenRa.FileFormats.csproj +++ b/OpenRa.FileFormats/OpenRa.FileFormats.csproj @@ -2,7 +2,7 @@ Debug AnyCPU - 9.0.21022 + 9.0.30729 2.0 {BDAEAB25-991E-46A7-AF1E-4F0E03358DAA} Library @@ -16,30 +16,25 @@ v2.0 - + true - full - false - bin\Debug\ + bin\x86\Debug\ DEBUG;TRACE - prompt - 4 true + full + x86 + prompt - - pdbonly - true - bin\Release\ + + bin\x86\Release\ TRACE - prompt - 4 true + true + pdbonly + x86 + prompt - - False - ..\release\MixDecrypt.dll - @@ -67,6 +62,10 @@ + + {6F5D4280-3D23-41FF-AE2A-511B5553E377} + MixDecrypt + {2F9E7A23-56C0-4286-9C8E-1060A9B2F073} OpenRa.DataStructures diff --git a/OpenRa.Game/MainWindow.cs b/OpenRa.Game/MainWindow.cs index 10f1c22715..8b3c163eb0 100644 --- a/OpenRa.Game/MainWindow.cs +++ b/OpenRa.Game/MainWindow.cs @@ -25,7 +25,7 @@ namespace OpenRa.Game public MainWindow(Settings settings) { - FileSystem.Mount(new Folder("../../../")); + FileSystem.Mount(new Folder("../../../../")); FileSystem.Mount(new Package("redalert.mix")); FileSystem.Mount(new Package("conquer.mix")); FileSystem.Mount(new Package("hires.mix")); diff --git a/OpenRa.Game/OpenRa.Game.csproj b/OpenRa.Game/OpenRa.Game.csproj index d201237196..a2318f6f1a 100644 --- a/OpenRa.Game/OpenRa.Game.csproj +++ b/OpenRa.Game/OpenRa.Game.csproj @@ -1,8 +1,8 @@ - + Debug AnyCPU - 9.0.21022 + 9.0.30729 2.0 {0DFB103F-2962-400F-8C6D-E2C28CCBA633} WinExe @@ -31,26 +31,25 @@ true v3.5 - + true - full - false - bin\Debug\ + bin\x86\Debug\ DEBUG;TRACE - prompt - 4 - false true + full + x86 + false + prompt - - pdbonly - true - bin\Release\ + + bin\x86\Release\ TRACE - prompt - 4 true + true + pdbonly + x86 false + prompt @@ -162,4 +161,4 @@ --> - + \ No newline at end of file diff --git a/OpenRa.Game/TechTree/TechTree.cs b/OpenRa.Game/TechTree/TechTree.cs index 535b387c32..df51478937 100644 --- a/OpenRa.Game/TechTree/TechTree.cs +++ b/OpenRa.Game/TechTree/TechTree.cs @@ -42,7 +42,7 @@ namespace OpenRa.TechTree IEnumerable> Lines(string filename, bool param) { Regex pattern = new Regex(@"^(\w+),([\w ]+)$"); - foreach (string s in File.ReadAllLines("../../../" + filename)) + foreach (string s in File.ReadAllLines("../../../../" + filename)) { Match m = pattern.Match(s); if (m == null || !m.Success) diff --git a/OpenRa.sln b/OpenRa.sln index f0006f696f..721be94a1d 100644 --- a/OpenRa.sln +++ b/OpenRa.sln @@ -16,64 +16,30 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PaletteUsage", "PaletteUsag EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Debug|Mixed Platforms = Debug|Mixed Platforms - Debug|Win32 = Debug|Win32 - Release|Any CPU = Release|Any CPU - Release|Mixed Platforms = Release|Mixed Platforms - Release|Win32 = Release|Win32 + Debug (x86)|Win32 = Debug (x86)|Win32 + Release (x86)|Win32 = Release (x86)|Win32 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {6F5D4280-3D23-41FF-AE2A-511B5553E377}.Debug|Any CPU.ActiveCfg = Debug|Win32 - {6F5D4280-3D23-41FF-AE2A-511B5553E377}.Debug|Mixed Platforms.ActiveCfg = Release|Win32 - {6F5D4280-3D23-41FF-AE2A-511B5553E377}.Debug|Mixed Platforms.Build.0 = Release|Win32 - {6F5D4280-3D23-41FF-AE2A-511B5553E377}.Debug|Win32.ActiveCfg = Debug|Win32 - {6F5D4280-3D23-41FF-AE2A-511B5553E377}.Debug|Win32.Build.0 = Debug|Win32 - {6F5D4280-3D23-41FF-AE2A-511B5553E377}.Release|Any CPU.ActiveCfg = Release|Win32 - {6F5D4280-3D23-41FF-AE2A-511B5553E377}.Release|Mixed Platforms.ActiveCfg = Release|Win32 - {6F5D4280-3D23-41FF-AE2A-511B5553E377}.Release|Mixed Platforms.Build.0 = Release|Win32 - {6F5D4280-3D23-41FF-AE2A-511B5553E377}.Release|Win32.ActiveCfg = Release|Win32 - {6F5D4280-3D23-41FF-AE2A-511B5553E377}.Release|Win32.Build.0 = Release|Win32 - {BDAEAB25-991E-46A7-AF1E-4F0E03358DAA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BDAEAB25-991E-46A7-AF1E-4F0E03358DAA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BDAEAB25-991E-46A7-AF1E-4F0E03358DAA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {BDAEAB25-991E-46A7-AF1E-4F0E03358DAA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {BDAEAB25-991E-46A7-AF1E-4F0E03358DAA}.Debug|Win32.ActiveCfg = Debug|Any CPU - {BDAEAB25-991E-46A7-AF1E-4F0E03358DAA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BDAEAB25-991E-46A7-AF1E-4F0E03358DAA}.Release|Any CPU.Build.0 = Release|Any CPU - {BDAEAB25-991E-46A7-AF1E-4F0E03358DAA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {BDAEAB25-991E-46A7-AF1E-4F0E03358DAA}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {BDAEAB25-991E-46A7-AF1E-4F0E03358DAA}.Release|Win32.ActiveCfg = Release|Any CPU - {0DFB103F-2962-400F-8C6D-E2C28CCBA633}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0DFB103F-2962-400F-8C6D-E2C28CCBA633}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0DFB103F-2962-400F-8C6D-E2C28CCBA633}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {0DFB103F-2962-400F-8C6D-E2C28CCBA633}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {0DFB103F-2962-400F-8C6D-E2C28CCBA633}.Debug|Win32.ActiveCfg = Debug|Any CPU - {0DFB103F-2962-400F-8C6D-E2C28CCBA633}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0DFB103F-2962-400F-8C6D-E2C28CCBA633}.Release|Any CPU.Build.0 = Release|Any CPU - {0DFB103F-2962-400F-8C6D-E2C28CCBA633}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {0DFB103F-2962-400F-8C6D-E2C28CCBA633}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {0DFB103F-2962-400F-8C6D-E2C28CCBA633}.Release|Win32.ActiveCfg = Release|Any CPU - {2F9E7A23-56C0-4286-9C8E-1060A9B2F073}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2F9E7A23-56C0-4286-9C8E-1060A9B2F073}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2F9E7A23-56C0-4286-9C8E-1060A9B2F073}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {2F9E7A23-56C0-4286-9C8E-1060A9B2F073}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {2F9E7A23-56C0-4286-9C8E-1060A9B2F073}.Debug|Win32.ActiveCfg = Debug|Any CPU - {2F9E7A23-56C0-4286-9C8E-1060A9B2F073}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2F9E7A23-56C0-4286-9C8E-1060A9B2F073}.Release|Any CPU.Build.0 = Release|Any CPU - {2F9E7A23-56C0-4286-9C8E-1060A9B2F073}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {2F9E7A23-56C0-4286-9C8E-1060A9B2F073}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {2F9E7A23-56C0-4286-9C8E-1060A9B2F073}.Release|Win32.ActiveCfg = Release|Any CPU - {54577061-E2D2-4336-90A2-A9A7106A30CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {54577061-E2D2-4336-90A2-A9A7106A30CD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {54577061-E2D2-4336-90A2-A9A7106A30CD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {54577061-E2D2-4336-90A2-A9A7106A30CD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {54577061-E2D2-4336-90A2-A9A7106A30CD}.Debug|Win32.ActiveCfg = Debug|Any CPU - {54577061-E2D2-4336-90A2-A9A7106A30CD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {54577061-E2D2-4336-90A2-A9A7106A30CD}.Release|Any CPU.Build.0 = Release|Any CPU - {54577061-E2D2-4336-90A2-A9A7106A30CD}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {54577061-E2D2-4336-90A2-A9A7106A30CD}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {54577061-E2D2-4336-90A2-A9A7106A30CD}.Release|Win32.ActiveCfg = Release|Any CPU + {6F5D4280-3D23-41FF-AE2A-511B5553E377}.Debug (x86)|Win32.ActiveCfg = Release|Win32 + {6F5D4280-3D23-41FF-AE2A-511B5553E377}.Debug (x86)|Win32.Build.0 = Release|Win32 + {6F5D4280-3D23-41FF-AE2A-511B5553E377}.Release (x86)|Win32.ActiveCfg = Release|Win32 + {6F5D4280-3D23-41FF-AE2A-511B5553E377}.Release (x86)|Win32.Build.0 = Release|Win32 + {BDAEAB25-991E-46A7-AF1E-4F0E03358DAA}.Debug (x86)|Win32.ActiveCfg = Debug|x86 + {BDAEAB25-991E-46A7-AF1E-4F0E03358DAA}.Debug (x86)|Win32.Build.0 = Debug|x86 + {BDAEAB25-991E-46A7-AF1E-4F0E03358DAA}.Release (x86)|Win32.ActiveCfg = Release|x86 + {BDAEAB25-991E-46A7-AF1E-4F0E03358DAA}.Release (x86)|Win32.Build.0 = Release|x86 + {0DFB103F-2962-400F-8C6D-E2C28CCBA633}.Debug (x86)|Win32.ActiveCfg = Debug|x86 + {0DFB103F-2962-400F-8C6D-E2C28CCBA633}.Debug (x86)|Win32.Build.0 = Debug|x86 + {0DFB103F-2962-400F-8C6D-E2C28CCBA633}.Release (x86)|Win32.ActiveCfg = Release|x86 + {0DFB103F-2962-400F-8C6D-E2C28CCBA633}.Release (x86)|Win32.Build.0 = Release|x86 + {2F9E7A23-56C0-4286-9C8E-1060A9B2F073}.Debug (x86)|Win32.ActiveCfg = Debug|x86 + {2F9E7A23-56C0-4286-9C8E-1060A9B2F073}.Debug (x86)|Win32.Build.0 = Debug|x86 + {2F9E7A23-56C0-4286-9C8E-1060A9B2F073}.Release (x86)|Win32.ActiveCfg = Release|x86 + {2F9E7A23-56C0-4286-9C8E-1060A9B2F073}.Release (x86)|Win32.Build.0 = Release|x86 + {54577061-E2D2-4336-90A2-A9A7106A30CD}.Debug (x86)|Win32.ActiveCfg = Debug|x86 + {54577061-E2D2-4336-90A2-A9A7106A30CD}.Debug (x86)|Win32.Build.0 = Debug|x86 + {54577061-E2D2-4336-90A2-A9A7106A30CD}.Release (x86)|Win32.ActiveCfg = Release|x86 + {54577061-E2D2-4336-90A2-A9A7106A30CD}.Release (x86)|Win32.Build.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/PaletteUsage/PaletteUsage.csproj b/PaletteUsage/PaletteUsage.csproj index 84c566d3fa..e636cf24cb 100644 --- a/PaletteUsage/PaletteUsage.csproj +++ b/PaletteUsage/PaletteUsage.csproj @@ -2,7 +2,7 @@ Debug AnyCPU - 8.0.50727 + 9.0.30729 2.0 {54577061-E2D2-4336-90A2-A9A7106A30CD} Exe @@ -15,22 +15,21 @@ - + true - full - false - bin\Debug\ + bin\x86\Debug\ DEBUG;TRACE + full + x86 prompt - 4 - - pdbonly - true - bin\Release\ + + bin\x86\Release\ TRACE + true + pdbonly + x86 prompt - 4