diff --git a/Makefile b/Makefile index d7893d0eb3..8eed9249e5 100644 --- a/Makefile +++ b/Makefile @@ -38,10 +38,18 @@ ############################## TOOLCHAIN ############################### # CSC = dmcs -CSFLAGS = -nologo -warn:4 -debug:full -optimize- -codepage:utf8 -unsafe -warnaserror -DEFINE = DEBUG;TRACE +CSFLAGS = -nologo -warn:4 -codepage:utf8 -unsafe -warnaserror +DEFINE = TRACE COMMON_LIBS = System.dll System.Core.dll System.Data.dll System.Data.DataSetExtensions.dll System.Drawing.dll System.Xml.dll thirdparty/download/ICSharpCode.SharpZipLib.dll thirdparty/download/FuzzyLogicLibrary.dll thirdparty/download/Mono.Nat.dll thirdparty/download/MaxMind.Db.dll thirdparty/download/MaxMind.GeoIP2.dll thirdparty/download/Eluant.dll +DEBUG = true +ifeq ($(DEBUG), $(filter $(DEBUG),false no n off 0)) +CSCFLAGS += -debug:pdbonly -optimize+ +else +CSCFLAGS += -debug:full -optimize- +DEFINE := DEBUG;$(DEFINE) +endif + ######################### UTILITIES/SETTINGS ########################### diff --git a/OpenRA.Editor/OpenRA.Editor.csproj b/OpenRA.Editor/OpenRA.Editor.csproj index dc3433b873..9a17de2a74 100644 --- a/OpenRA.Editor/OpenRA.Editor.csproj +++ b/OpenRA.Editor/OpenRA.Editor.csproj @@ -43,6 +43,18 @@ false AllRules.ruleset + + true + ..\ + TRACE + true + pdbonly + x86 + false + prompt + AllRules.ruleset + true + diff --git a/OpenRA.Game/OpenRA.Game.csproj b/OpenRA.Game/OpenRA.Game.csproj index ce5e99d6b1..e986b98116 100644 --- a/OpenRA.Game/OpenRA.Game.csproj +++ b/OpenRA.Game/OpenRA.Game.csproj @@ -1,4 +1,4 @@ - + Debug @@ -42,6 +42,17 @@ x86 false + + true + ..\ + TRACE + true + pdbonly + x86 + false + AllRules.ruleset + true + @@ -353,4 +364,4 @@ --> - + \ No newline at end of file diff --git a/OpenRA.GameMonitor/OpenRA.GameMonitor.csproj b/OpenRA.GameMonitor/OpenRA.GameMonitor.csproj index beab60fade..82acbe5ad4 100644 --- a/OpenRA.GameMonitor/OpenRA.GameMonitor.csproj +++ b/OpenRA.GameMonitor/OpenRA.GameMonitor.csproj @@ -22,6 +22,18 @@ ..\OpenRA.Game\OpenRA.ico + + true + ..\ + TRACE + true + pdbonly + x86 + false + prompt + AllRules.ruleset + true + diff --git a/OpenRA.Mods.Cnc/OpenRA.Mods.Cnc.csproj b/OpenRA.Mods.Cnc/OpenRA.Mods.Cnc.csproj index 63e1d1e8d8..9b3cc55813 100644 --- a/OpenRA.Mods.Cnc/OpenRA.Mods.Cnc.csproj +++ b/OpenRA.Mods.Cnc/OpenRA.Mods.Cnc.csproj @@ -47,6 +47,23 @@ AllRules.ruleset true + + true + bin\Release\ + TRACE + true + pdbonly + x86 + prompt + AllRules.ruleset + true + + + + + + + diff --git a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj index 1b6be932f6..8cf83a2dda 100644 --- a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj +++ b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj @@ -23,6 +23,24 @@ 4 x86 true + AllRules.ruleset + + + + + + + + + true + bin\Release\ + TRACE + true + pdbonly + x86 + prompt + AllRules.ruleset + true diff --git a/OpenRA.Mods.D2k/OpenRA.Mods.D2k.csproj b/OpenRA.Mods.D2k/OpenRA.Mods.D2k.csproj index a951482a96..16fd7b25d3 100644 --- a/OpenRA.Mods.D2k/OpenRA.Mods.D2k.csproj +++ b/OpenRA.Mods.D2k/OpenRA.Mods.D2k.csproj @@ -48,6 +48,23 @@ AllRules.ruleset true + + true + bin\Release\ + TRACE + true + pdbonly + x86 + prompt + AllRules.ruleset + true + + + + + + + diff --git a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj index d4c2fb794c..ac265e91b1 100644 --- a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj +++ b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj @@ -47,6 +47,23 @@ AllRules.ruleset true + + true + bin\Release\ + TRACE + true + pdbonly + x86 + prompt + AllRules.ruleset + true + + + + + + + diff --git a/OpenRA.Mods.TS/OpenRA.Mods.TS.csproj b/OpenRA.Mods.TS/OpenRA.Mods.TS.csproj index 486bb7324f..0e35f2499b 100644 --- a/OpenRA.Mods.TS/OpenRA.Mods.TS.csproj +++ b/OpenRA.Mods.TS/OpenRA.Mods.TS.csproj @@ -13,7 +13,7 @@ true bin\Debug\ - TRACE;DEBUG; + TRACE;DEBUG x86 prompt @@ -26,6 +26,23 @@ full true + + true + bin\Release\ + TRACE + true + pdbonly + x86 + prompt + AllRules.ruleset + true + + + + + + + @@ -59,12 +76,12 @@ - mkdir "$(SolutionDir)mods/ts/" diff --git a/OpenRA.Renderer.Null/OpenRA.Renderer.Null.csproj b/OpenRA.Renderer.Null/OpenRA.Renderer.Null.csproj index 122d71232e..19d970f218 100644 --- a/OpenRA.Renderer.Null/OpenRA.Renderer.Null.csproj +++ b/OpenRA.Renderer.Null/OpenRA.Renderer.Null.csproj @@ -41,6 +41,17 @@ AllRules.ruleset true + + true + ..\ + TRACE + true + pdbonly + x86 + prompt + AllRules.ruleset + true + diff --git a/OpenRA.Renderer.Sdl2/OpenRA.Renderer.Sdl2.csproj b/OpenRA.Renderer.Sdl2/OpenRA.Renderer.Sdl2.csproj index aa4d73ff17..bf9f44a3b1 100644 --- a/OpenRA.Renderer.Sdl2/OpenRA.Renderer.Sdl2.csproj +++ b/OpenRA.Renderer.Sdl2/OpenRA.Renderer.Sdl2.csproj @@ -1,4 +1,4 @@ - + Debug @@ -14,12 +14,23 @@ true full ..\ - TRACE;DEBUG; + TRACE;DEBUG x86 prompt true AllRules.ruleset + + true + ..\ + TRACE + true + pdbonly + x86 + prompt + AllRules.ruleset + true + diff --git a/OpenRA.Test/OpenRA.Test.csproj b/OpenRA.Test/OpenRA.Test.csproj index c5dda90a98..6c080bd939 100644 --- a/OpenRA.Test/OpenRA.Test.csproj +++ b/OpenRA.Test/OpenRA.Test.csproj @@ -19,7 +19,17 @@ full x86 prompt - ManagedMinimumRules.ruleset + AllRules.ruleset + + + true + ..\ + TRACE + pdbonly + x86 + prompt + AllRules.ruleset + true diff --git a/OpenRA.Utility/OpenRA.Utility.csproj b/OpenRA.Utility/OpenRA.Utility.csproj index 54fbc7b0fc..d380f222f5 100644 --- a/OpenRA.Utility/OpenRA.Utility.csproj +++ b/OpenRA.Utility/OpenRA.Utility.csproj @@ -42,6 +42,18 @@ x86 true + + true + ..\ + TRACE + true + pdbonly + x86 + false + prompt + AllRules.ruleset + true + diff --git a/OpenRA.sln b/OpenRA.sln index 5815fbea1f..af35229a91 100644 --- a/OpenRA.sln +++ b/OpenRA.sln @@ -1,6 +1,8 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 +# Visual Studio 2013 +VisualStudioVersion = 12.0.31101.0 +MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenRA.Game", "OpenRA.Game\OpenRA.Game.csproj", "{0DFB103F-2962-400F-8C6D-E2C28CCBA633}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenRA.Mods.RA", "OpenRA.Mods.RA\OpenRA.Mods.RA.csproj", "{4A8A43B5-A9EF-4ED0-99DD-4BAB10A0DB6E}" @@ -48,17 +50,17 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tiberian Dawn Lua scripts", EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Red Alert Lua scripts", "Red Alert Lua scripts", "{B35D533F-BEB6-4674-A466-324EEFD97259}" ProjectSection(SolutionItems) = preProject + mods\ra\maps\allies-05a\AI.lua = mods\ra\maps\allies-05a\AI.lua mods\ra\maps\allies-01\allies01.lua = mods\ra\maps\allies-01\allies01.lua mods\ra\maps\allies-02\allies02.lua = mods\ra\maps\allies-02\allies02.lua mods\ra\maps\allies-03a\allies03a.lua = mods\ra\maps\allies-03a\allies03a.lua mods\ra\maps\allies-03b\allies03b.lua = mods\ra\maps\allies-03b\allies03b.lua - mods\ra\maps\allies-05a\AI.lua = mods\ra\maps\allies-05a\AI.lua mods\ra\maps\allies-05a\allies05a.lua = mods\ra\maps\allies-05a\allies05a.lua - mods\ra\maps\soviet-01\soviet01.lua = mods\ra\maps\soviet-01\soviet01.lua mods\ra\maps\desert-shellmap\desert-shellmap.lua = mods\ra\maps\desert-shellmap\desert-shellmap.lua - mods\ra\maps\intervention\intervention.lua = mods\ra\maps\intervention\intervention.lua mods\ra\maps\fort-lonestar\fort-lonestar.lua = mods\ra\maps\fort-lonestar\fort-lonestar.lua + mods\ra\maps\intervention\intervention.lua = mods\ra\maps\intervention\intervention.lua mods\ra\maps\monster-tank-madness\monster-tank-madness.lua = mods\ra\maps\monster-tank-madness\monster-tank-madness.lua + mods\ra\maps\soviet-01\soviet01.lua = mods\ra\maps\soviet-01\soviet01.lua mods\ra\maps\survival01\survival01.lua = mods\ra\maps\survival01\survival01.lua mods\ra\maps\survival02\survival02.lua = mods\ra\maps\survival02\survival02.lua EndProjectSection @@ -83,32 +85,57 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|x86 = Debug|x86 + Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {0DFB103F-2962-400F-8C6D-E2C28CCBA633}.Debug|x86.ActiveCfg = Debug|x86 {0DFB103F-2962-400F-8C6D-E2C28CCBA633}.Debug|x86.Build.0 = Debug|x86 - {FE6C8CC0-2F07-442A-B29F-17617B3B7FC6}.Debug|x86.ActiveCfg = Debug|x86 - {FE6C8CC0-2F07-442A-B29F-17617B3B7FC6}.Debug|x86.Build.0 = Debug|x86 + {0DFB103F-2962-400F-8C6D-E2C28CCBA633}.Release|x86.ActiveCfg = Release|x86 + {0DFB103F-2962-400F-8C6D-E2C28CCBA633}.Release|x86.Build.0 = Release|x86 {4A8A43B5-A9EF-4ED0-99DD-4BAB10A0DB6E}.Debug|x86.ActiveCfg = Debug|x86 {4A8A43B5-A9EF-4ED0-99DD-4BAB10A0DB6E}.Debug|x86.Build.0 = Debug|x86 + {4A8A43B5-A9EF-4ED0-99DD-4BAB10A0DB6E}.Release|x86.ActiveCfg = Release|x86 + {4A8A43B5-A9EF-4ED0-99DD-4BAB10A0DB6E}.Release|x86.Build.0 = Release|x86 {2881135D-4D62-493E-8F83-5EEE92CCC6BE}.Debug|x86.ActiveCfg = Debug|x86 {2881135D-4D62-493E-8F83-5EEE92CCC6BE}.Debug|x86.Build.0 = Debug|x86 + {2881135D-4D62-493E-8F83-5EEE92CCC6BE}.Release|x86.ActiveCfg = Release|x86 + {2881135D-4D62-493E-8F83-5EEE92CCC6BE}.Release|x86.Build.0 = Release|x86 {00038B75-405B-44F5-8691-BD2546DBE224}.Debug|x86.ActiveCfg = Debug|x86 {00038B75-405B-44F5-8691-BD2546DBE224}.Debug|x86.Build.0 = Debug|x86 + {00038B75-405B-44F5-8691-BD2546DBE224}.Release|x86.ActiveCfg = Release|x86 + {00038B75-405B-44F5-8691-BD2546DBE224}.Release|x86.Build.0 = Release|x86 {F33337BE-CB69-4B24-850F-07D23E408DDF}.Debug|x86.ActiveCfg = Debug|x86 {F33337BE-CB69-4B24-850F-07D23E408DDF}.Debug|x86.Build.0 = Debug|x86 + {F33337BE-CB69-4B24-850F-07D23E408DDF}.Release|x86.ActiveCfg = Release|x86 + {F33337BE-CB69-4B24-850F-07D23E408DDF}.Release|x86.Build.0 = Release|x86 {0C4AEC1A-E7D5-4114-8CCD-3EEC82872981}.Debug|x86.ActiveCfg = Debug|x86 {0C4AEC1A-E7D5-4114-8CCD-3EEC82872981}.Debug|x86.Build.0 = Debug|x86 + {0C4AEC1A-E7D5-4114-8CCD-3EEC82872981}.Release|x86.ActiveCfg = Release|x86 + {0C4AEC1A-E7D5-4114-8CCD-3EEC82872981}.Release|x86.Build.0 = Release|x86 {C0B0465C-6BE2-409C-8770-3A9BF64C4344}.Debug|x86.ActiveCfg = Debug|x86 {C0B0465C-6BE2-409C-8770-3A9BF64C4344}.Debug|x86.Build.0 = Debug|x86 + {C0B0465C-6BE2-409C-8770-3A9BF64C4344}.Release|x86.ActiveCfg = Release|x86 + {C0B0465C-6BE2-409C-8770-3A9BF64C4344}.Release|x86.Build.0 = Release|x86 {5457CBF5-4CE4-421E-A8BF-9FD6C9732E1D}.Debug|x86.ActiveCfg = Debug|x86 {5457CBF5-4CE4-421E-A8BF-9FD6C9732E1D}.Debug|x86.Build.0 = Debug|x86 + {5457CBF5-4CE4-421E-A8BF-9FD6C9732E1D}.Release|x86.ActiveCfg = Release|x86 + {5457CBF5-4CE4-421E-A8BF-9FD6C9732E1D}.Release|x86.Build.0 = Release|x86 {33D03738-C154-4028-8EA8-63A3C488A651}.Debug|x86.ActiveCfg = Debug|x86 {33D03738-C154-4028-8EA8-63A3C488A651}.Debug|x86.Build.0 = Debug|x86 + {33D03738-C154-4028-8EA8-63A3C488A651}.Release|x86.ActiveCfg = Release|x86 + {33D03738-C154-4028-8EA8-63A3C488A651}.Release|x86.Build.0 = Release|x86 + {FE6C8CC0-2F07-442A-B29F-17617B3B7FC6}.Debug|x86.ActiveCfg = Debug|x86 + {FE6C8CC0-2F07-442A-B29F-17617B3B7FC6}.Debug|x86.Build.0 = Debug|x86 + {FE6C8CC0-2F07-442A-B29F-17617B3B7FC6}.Release|x86.ActiveCfg = Release|x86 + {FE6C8CC0-2F07-442A-B29F-17617B3B7FC6}.Release|x86.Build.0 = Release|x86 {68295755-7902-4602-AC2C-9A8AC36D5EF7}.Debug|x86.ActiveCfg = Debug|x86 {68295755-7902-4602-AC2C-9A8AC36D5EF7}.Debug|x86.Build.0 = Debug|x86 + {68295755-7902-4602-AC2C-9A8AC36D5EF7}.Release|x86.ActiveCfg = Release|x86 + {68295755-7902-4602-AC2C-9A8AC36D5EF7}.Release|x86.Build.0 = Release|x86 {6CB8E1B7-6B36-4D93-8633-7C573E194AC4}.Debug|x86.ActiveCfg = Debug|x86 {6CB8E1B7-6B36-4D93-8633-7C573E194AC4}.Debug|x86.Build.0 = Debug|x86 + {6CB8E1B7-6B36-4D93-8633-7C573E194AC4}.Release|x86.ActiveCfg = Release|x86 + {6CB8E1B7-6B36-4D93-8633-7C573E194AC4}.Release|x86.Build.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -119,7 +146,7 @@ Global $0.DotNetNamingPolicy = $1 $1.DirectoryNamespaceAssociation = None $1.ResourceNamePolicy = FileFormatDefault - $0.TextStylePolicy = $2 + $0.TextStylePolicy = $7 $2.TabsToSpaces = False $2.NoTabsAfterNonTabs = True $2.inheritsSet = VisualStudio @@ -144,27 +171,23 @@ Global $3.inheritsSet = Mono $3.inheritsScope = text/x-csharp $3.scope = text/x-csharp - $0.TextStylePolicy = $4 $4.TabsToSpaces = False $4.NoTabsAfterNonTabs = True $4.inheritsSet = VisualStudio $4.inheritsScope = text/plain $4.scope = text/plain - $0.TextStylePolicy = $5 $5.NoTabsAfterNonTabs = True $5.inheritsSet = Mono $5.inheritsScope = text/plain $5.scope = text/microsoft-resx - $0.XmlFormattingPolicy = $6 + $0.XmlFormattingPolicy = $8 $6.inheritsSet = Mono $6.inheritsScope = application/xml $6.scope = text/microsoft-resx - $0.TextStylePolicy = $7 $7.NoTabsAfterNonTabs = True $7.inheritsSet = Mono $7.inheritsScope = text/plain $7.scope = application/xml - $0.XmlFormattingPolicy = $8 $8.inheritsSet = Mono $8.inheritsScope = application/xml $8.scope = application/xml @@ -173,21 +196,19 @@ Global $9.IncludeInNewFiles = True $0.NameConventionPolicy = $10 $10.Rules = $11 - $11.NamingRule = $12 + $11.NamingRule = $31 $12.Name = Namespaces $12.AffectedEntity = Namespace $12.VisibilityMask = VisibilityMask $12.NamingStyle = PascalCase $12.IncludeInstanceMembers = True $12.IncludeStaticEntities = True - $11.NamingRule = $13 $13.Name = Types $13.AffectedEntity = Class, Struct, Enum, Delegate $13.VisibilityMask = Public $13.NamingStyle = PascalCase $13.IncludeInstanceMembers = True $13.IncludeStaticEntities = True - $11.NamingRule = $14 $14.Name = Interfaces $14.RequiredPrefixes = $15 $15.String = I @@ -196,7 +217,6 @@ Global $14.NamingStyle = PascalCase $14.IncludeInstanceMembers = True $14.IncludeStaticEntities = True - $11.NamingRule = $16 $16.Name = Attributes $16.RequiredSuffixes = $17 $17.String = Attribute @@ -205,7 +225,6 @@ Global $16.NamingStyle = PascalCase $16.IncludeInstanceMembers = True $16.IncludeStaticEntities = True - $11.NamingRule = $18 $18.Name = Event Arguments $18.RequiredSuffixes = $19 $19.String = EventArgs @@ -214,7 +233,6 @@ Global $18.NamingStyle = PascalCase $18.IncludeInstanceMembers = True $18.IncludeStaticEntities = True - $11.NamingRule = $20 $20.Name = Exceptions $20.RequiredSuffixes = $21 $21.String = Exception @@ -223,70 +241,60 @@ Global $20.NamingStyle = PascalCase $20.IncludeInstanceMembers = True $20.IncludeStaticEntities = True - $11.NamingRule = $22 $22.Name = Methods $22.AffectedEntity = Methods $22.VisibilityMask = Protected, Public $22.NamingStyle = PascalCase $22.IncludeInstanceMembers = True $22.IncludeStaticEntities = True - $11.NamingRule = $23 $23.Name = Static Readonly Fields $23.AffectedEntity = ReadonlyField $23.VisibilityMask = Protected, Public $23.NamingStyle = PascalCase $23.IncludeInstanceMembers = False $23.IncludeStaticEntities = True - $11.NamingRule = $24 $24.Name = Fields $24.AffectedEntity = Field $24.VisibilityMask = Protected, Public $24.NamingStyle = PascalCase $24.IncludeInstanceMembers = True $24.IncludeStaticEntities = True - $11.NamingRule = $25 $25.Name = ReadOnly Fields $25.AffectedEntity = ReadonlyField $25.VisibilityMask = Protected, Public $25.NamingStyle = PascalCase $25.IncludeInstanceMembers = True $25.IncludeStaticEntities = False - $11.NamingRule = $26 $26.Name = Constant Fields $26.AffectedEntity = ConstantField $26.VisibilityMask = Protected, Public $26.NamingStyle = PascalCase $26.IncludeInstanceMembers = True $26.IncludeStaticEntities = True - $11.NamingRule = $27 $27.Name = Properties $27.AffectedEntity = Property $27.VisibilityMask = Protected, Public $27.NamingStyle = PascalCase $27.IncludeInstanceMembers = True $27.IncludeStaticEntities = True - $11.NamingRule = $28 $28.Name = Events $28.AffectedEntity = Event $28.VisibilityMask = Protected, Public $28.NamingStyle = PascalCase $28.IncludeInstanceMembers = True $28.IncludeStaticEntities = True - $11.NamingRule = $29 $29.Name = Enum Members $29.AffectedEntity = EnumMember $29.VisibilityMask = VisibilityMask $29.NamingStyle = PascalCase $29.IncludeInstanceMembers = True $29.IncludeStaticEntities = True - $11.NamingRule = $30 $30.Name = Parameters $30.AffectedEntity = Parameter $30.VisibilityMask = VisibilityMask $30.NamingStyle = CamelCase $30.IncludeInstanceMembers = True $30.IncludeStaticEntities = True - $11.NamingRule = $31 $31.Name = Type Parameters $31.RequiredPrefixes = $32 $32.String = T