From 470fbbc5503dffaeb463588f28138b4dc4f242b7 Mon Sep 17 00:00:00 2001 From: Sam Hocevar Date: Thu, 10 Oct 2013 15:42:29 +0000 Subject: [PATCH] build: add Abuse to the Visual Studio solution and exclude NaCl files from all platform builds. --- build/vs2010/Lol.sln | 42 +++++++++++++++++++++--- src/lolcore.vcxproj | 64 +++++++++++++++++++++++++++++++++++++ src/lolcore.vcxproj.filters | 18 +++++------ 3 files changed, 110 insertions(+), 14 deletions(-) diff --git a/build/vs2010/Lol.sln b/build/vs2010/Lol.sln index 72673bef..cb841320 100644 --- a/build/vs2010/Lol.sln +++ b/build/vs2010/Lol.sln @@ -143,7 +143,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "benlitzTest1", "..\..\peopl EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "meshviewer", "..\..\test\meshviewer.vcxproj", "{7CE9FE12-E4AB-4A22-90D4-2C15F0C30D4E}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tactics", "..\..\people\touky\private\tactics\tactics.vcxproj", "{25493FC8-75AC-4703-AD58-AB0C4A0FB79C}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tactics", "..\..\people\touky\private\Tactics\tactics.vcxproj", "{25493FC8-75AC-4703-AD58-AB0C4A0FB79C}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "12_Voronoi", "..\..\demos\tutorial\12_Voronoi.vcxproj", "{6BF81B39-EDC2-4227-9982-C2D8ABEA95AF}" EndProject @@ -163,6 +163,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "voxel", "..\..\people\benli EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nacl_phystest", "..\..\test\nacl_phystest.vcxproj", "{EE203B88-44CF-4859-9D42-7A1F43FECB53}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Abuse", "Abuse", "{C76959F5-5A49-47BE-9AD8-32CE5FFE3A09}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "abuse", "..\..\games\abuse\abuse.vcxproj", "{4DDB3586-82BE-478E-AED2-F1E2D4D3C420}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -1018,9 +1022,7 @@ Global {EE203B88-44CF-4859-9D42-7A1F43FECB53}.Debug|ORBIS.ActiveCfg = Debug|x64 {EE203B88-44CF-4859-9D42-7A1F43FECB53}.Debug|PS3.ActiveCfg = Debug|x64 {EE203B88-44CF-4859-9D42-7A1F43FECB53}.Debug|Win32.ActiveCfg = Debug|Win32 - {EE203B88-44CF-4859-9D42-7A1F43FECB53}.Debug|Win32.Build.0 = Debug|Win32 {EE203B88-44CF-4859-9D42-7A1F43FECB53}.Debug|x64.ActiveCfg = Debug|x64 - {EE203B88-44CF-4859-9D42-7A1F43FECB53}.Debug|x64.Build.0 = Debug|x64 {EE203B88-44CF-4859-9D42-7A1F43FECB53}.Debug|Xbox 360.ActiveCfg = Debug|x64 {EE203B88-44CF-4859-9D42-7A1F43FECB53}.Release|Any CPU.ActiveCfg = Release|x64 {EE203B88-44CF-4859-9D42-7A1F43FECB53}.Release|Mixed Platforms.ActiveCfg = Release|x64 @@ -1028,10 +1030,38 @@ Global {EE203B88-44CF-4859-9D42-7A1F43FECB53}.Release|ORBIS.ActiveCfg = Release|x64 {EE203B88-44CF-4859-9D42-7A1F43FECB53}.Release|PS3.ActiveCfg = Release|x64 {EE203B88-44CF-4859-9D42-7A1F43FECB53}.Release|Win32.ActiveCfg = Release|Win32 - {EE203B88-44CF-4859-9D42-7A1F43FECB53}.Release|Win32.Build.0 = Release|Win32 {EE203B88-44CF-4859-9D42-7A1F43FECB53}.Release|x64.ActiveCfg = Release|x64 - {EE203B88-44CF-4859-9D42-7A1F43FECB53}.Release|x64.Build.0 = Release|x64 {EE203B88-44CF-4859-9D42-7A1F43FECB53}.Release|Xbox 360.ActiveCfg = Release|x64 + {4DDB3586-82BE-478E-AED2-F1E2D4D3C420}.Debug|Any CPU.ActiveCfg = Debug|Xbox 360 + {4DDB3586-82BE-478E-AED2-F1E2D4D3C420}.Debug|Mixed Platforms.ActiveCfg = Debug|Xbox 360 + {4DDB3586-82BE-478E-AED2-F1E2D4D3C420}.Debug|Mixed Platforms.Build.0 = Debug|Xbox 360 + {4DDB3586-82BE-478E-AED2-F1E2D4D3C420}.Debug|Mixed Platforms.Deploy.0 = Debug|Xbox 360 + {4DDB3586-82BE-478E-AED2-F1E2D4D3C420}.Debug|ORBIS.ActiveCfg = Debug|ORBIS + {4DDB3586-82BE-478E-AED2-F1E2D4D3C420}.Debug|ORBIS.Build.0 = Debug|ORBIS + {4DDB3586-82BE-478E-AED2-F1E2D4D3C420}.Debug|PS3.ActiveCfg = Debug|PS3 + {4DDB3586-82BE-478E-AED2-F1E2D4D3C420}.Debug|PS3.Build.0 = Debug|PS3 + {4DDB3586-82BE-478E-AED2-F1E2D4D3C420}.Debug|Win32.ActiveCfg = Debug|Win32 + {4DDB3586-82BE-478E-AED2-F1E2D4D3C420}.Debug|Win32.Build.0 = Debug|Win32 + {4DDB3586-82BE-478E-AED2-F1E2D4D3C420}.Debug|x64.ActiveCfg = Debug|x64 + {4DDB3586-82BE-478E-AED2-F1E2D4D3C420}.Debug|x64.Build.0 = Debug|x64 + {4DDB3586-82BE-478E-AED2-F1E2D4D3C420}.Debug|Xbox 360.ActiveCfg = Debug|Xbox 360 + {4DDB3586-82BE-478E-AED2-F1E2D4D3C420}.Debug|Xbox 360.Build.0 = Debug|Xbox 360 + {4DDB3586-82BE-478E-AED2-F1E2D4D3C420}.Debug|Xbox 360.Deploy.0 = Debug|Xbox 360 + {4DDB3586-82BE-478E-AED2-F1E2D4D3C420}.Release|Any CPU.ActiveCfg = Release|Xbox 360 + {4DDB3586-82BE-478E-AED2-F1E2D4D3C420}.Release|Mixed Platforms.ActiveCfg = Release|Xbox 360 + {4DDB3586-82BE-478E-AED2-F1E2D4D3C420}.Release|Mixed Platforms.Build.0 = Release|Xbox 360 + {4DDB3586-82BE-478E-AED2-F1E2D4D3C420}.Release|Mixed Platforms.Deploy.0 = Release|Xbox 360 + {4DDB3586-82BE-478E-AED2-F1E2D4D3C420}.Release|ORBIS.ActiveCfg = Release|ORBIS + {4DDB3586-82BE-478E-AED2-F1E2D4D3C420}.Release|ORBIS.Build.0 = Release|ORBIS + {4DDB3586-82BE-478E-AED2-F1E2D4D3C420}.Release|PS3.ActiveCfg = Release|PS3 + {4DDB3586-82BE-478E-AED2-F1E2D4D3C420}.Release|PS3.Build.0 = Release|PS3 + {4DDB3586-82BE-478E-AED2-F1E2D4D3C420}.Release|Win32.ActiveCfg = Release|Win32 + {4DDB3586-82BE-478E-AED2-F1E2D4D3C420}.Release|Win32.Build.0 = Release|Win32 + {4DDB3586-82BE-478E-AED2-F1E2D4D3C420}.Release|x64.ActiveCfg = Release|x64 + {4DDB3586-82BE-478E-AED2-F1E2D4D3C420}.Release|x64.Build.0 = Release|x64 + {4DDB3586-82BE-478E-AED2-F1E2D4D3C420}.Release|Xbox 360.ActiveCfg = Release|Xbox 360 + {4DDB3586-82BE-478E-AED2-F1E2D4D3C420}.Release|Xbox 360.Build.0 = Release|Xbox 360 + {4DDB3586-82BE-478E-AED2-F1E2D4D3C420}.Release|Xbox 360.Deploy.0 = Release|Xbox 360 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -1045,6 +1075,7 @@ Global {2F87CEAB-4818-443C-A5E3-6C34E7D967EC} = {1DFE1729-4F1B-47CA-9819-72431FE14E25} {33704AA4-F2B5-4138-A40D-E3E77F89ED46} = {1DFE1729-4F1B-47CA-9819-72431FE14E25} {8C77EAA8-1077-4EF7-AE53-97C6C60A3601} = {1DFE1729-4F1B-47CA-9819-72431FE14E25} + {C76959F5-5A49-47BE-9AD8-32CE5FFE3A09} = {1DFE1729-4F1B-47CA-9819-72431FE14E25} {08C6A854-533D-4A1E-924E-C4A62281869F} = {928A359C-9C41-400A-8D2D-A054B33A79F5} {9C66B179-0737-4BDA-AB42-2ADE478A9008} = {08C6A854-533D-4A1E-924E-C4A62281869F} {EF1A4E80-63FA-4EB0-B834-12B6C500F31C} = {08C6A854-533D-4A1E-924E-C4A62281869F} @@ -1084,5 +1115,6 @@ Global {FAF82AD2-D9F4-4694-9A01-103BC5B771B4} = {B583BBFF-BE97-4F4E-BA1E-1F978A31EAB0} {52493826-AC00-470B-A745-4F602529B3B0} = {B583BBFF-BE97-4F4E-BA1E-1F978A31EAB0} {AA376B9B-484B-4DC4-982F-6CFA645E441E} = {F7D4A671-612F-4FF4-883F-2097697694B7} + {4DDB3586-82BE-478E-AED2-F1E2D4D3C420} = {C76959F5-5A49-47BE-9AD8-32CE5FFE3A09} EndGlobalSection EndGlobal diff --git a/src/lolcore.vcxproj b/src/lolcore.vcxproj index 6ba4b932..313471e8 100644 --- a/src/lolcore.vcxproj +++ b/src/lolcore.vcxproj @@ -162,18 +162,50 @@ true true + true + true + true + true + true + true + true + true true true + true + true + true + true + true + true + true + true true true + true + true + true + true + true + true + true + true true true + true + true + true + true + true + true + true + true @@ -278,18 +310,50 @@ true true + true + true + true + true + true + true + true + true true true + true + true + true + true + true + true + true + true true true + true + true + true + true + true + true + true + true true true + true + true + true + true + true + true + true + true diff --git a/src/lolcore.vcxproj.filters b/src/lolcore.vcxproj.filters index ae229dfd..49bfb640 100644 --- a/src/lolcore.vcxproj.filters +++ b/src/lolcore.vcxproj.filters @@ -79,7 +79,7 @@ {c6c6b597-ed6c-4d82-a166-964beeeeb525} - + {f6cc3470-c841-4581-969b-e60cea841c27} @@ -317,16 +317,16 @@ - platform\NaCl + platform\nacl - platform\NaCl + platform\nacl - platform\NaCl + platform\nacl - platform\NaCl + platform\nacl @@ -634,16 +634,16 @@ ... - platform\NaCl + platform\nacl - platform\NaCl + platform\nacl - platform\NaCl + platform\nacl - platform\NaCl + platform\nacl