diff --git a/build/Lol (vs2013).sln b/build/Lol (vs2013).sln index 01c83083..917da9bc 100644 --- a/build/Lol (vs2013).sln +++ b/build/Lol (vs2013).sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2013 -VisualStudioVersion = 12.0.30723.0 +VisualStudioVersion = 12.0.31101.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "deushax", "..\games\deushax\deushax.vcxproj", "{EF1A4E80-63FA-4EB0-B834-12B6C500F31C}" EndProject @@ -142,6 +142,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "top_shooter", "..\people\to EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "13_shader_builder", "..\demos\tutorial\13_shader_builder.vcxproj", "{F59FA82C-DDB9-4EE2-80AE-CB0E4C6567A4}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "LolRemez", "LolRemez", "{4C4BD478-3767-4C27-BD91-DAAFE7CD03A2}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lolremez", "..\tools\lolremez\lolremez.vcxproj", "{73F1A804-1116-46C3-922A-9C0ADEB33F52}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|ORBIS = Debug|ORBIS @@ -795,6 +799,28 @@ Global {F59FA82C-DDB9-4EE2-80AE-CB0E4C6567A4}.Release|x64.ActiveCfg = Release|x64 {F59FA82C-DDB9-4EE2-80AE-CB0E4C6567A4}.Release|x64.Build.0 = Release|x64 {F59FA82C-DDB9-4EE2-80AE-CB0E4C6567A4}.Release|Xbox 360.ActiveCfg = Release|Win32 + {73F1A804-1116-46C3-922A-9C0ADEB33F52}.Debug|ORBIS.ActiveCfg = Debug|ORBIS + {73F1A804-1116-46C3-922A-9C0ADEB33F52}.Debug|ORBIS.Build.0 = Debug|ORBIS + {73F1A804-1116-46C3-922A-9C0ADEB33F52}.Debug|PS3.ActiveCfg = Debug|PS3 + {73F1A804-1116-46C3-922A-9C0ADEB33F52}.Debug|PS3.Build.0 = Debug|PS3 + {73F1A804-1116-46C3-922A-9C0ADEB33F52}.Debug|Win32.ActiveCfg = Debug|Win32 + {73F1A804-1116-46C3-922A-9C0ADEB33F52}.Debug|Win32.Build.0 = Debug|Win32 + {73F1A804-1116-46C3-922A-9C0ADEB33F52}.Debug|x64.ActiveCfg = Debug|x64 + {73F1A804-1116-46C3-922A-9C0ADEB33F52}.Debug|x64.Build.0 = Debug|x64 + {73F1A804-1116-46C3-922A-9C0ADEB33F52}.Debug|Xbox 360.ActiveCfg = Debug|Xbox 360 + {73F1A804-1116-46C3-922A-9C0ADEB33F52}.Debug|Xbox 360.Build.0 = Debug|Xbox 360 + {73F1A804-1116-46C3-922A-9C0ADEB33F52}.Debug|Xbox 360.Deploy.0 = Debug|Xbox 360 + {73F1A804-1116-46C3-922A-9C0ADEB33F52}.Release|ORBIS.ActiveCfg = Release|ORBIS + {73F1A804-1116-46C3-922A-9C0ADEB33F52}.Release|ORBIS.Build.0 = Release|ORBIS + {73F1A804-1116-46C3-922A-9C0ADEB33F52}.Release|PS3.ActiveCfg = Release|PS3 + {73F1A804-1116-46C3-922A-9C0ADEB33F52}.Release|PS3.Build.0 = Release|PS3 + {73F1A804-1116-46C3-922A-9C0ADEB33F52}.Release|Win32.ActiveCfg = Release|Win32 + {73F1A804-1116-46C3-922A-9C0ADEB33F52}.Release|Win32.Build.0 = Release|Win32 + {73F1A804-1116-46C3-922A-9C0ADEB33F52}.Release|x64.ActiveCfg = Release|x64 + {73F1A804-1116-46C3-922A-9C0ADEB33F52}.Release|x64.Build.0 = Release|x64 + {73F1A804-1116-46C3-922A-9C0ADEB33F52}.Release|Xbox 360.ActiveCfg = Release|Xbox 360 + {73F1A804-1116-46C3-922A-9C0ADEB33F52}.Release|Xbox 360.Build.0 = Release|Xbox 360 + {73F1A804-1116-46C3-922A-9C0ADEB33F52}.Release|Xbox 360.Deploy.0 = Release|Xbox 360 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -863,5 +889,7 @@ Global {E4DFEBF9-C310-462F-9876-7EB59C1E4D4E} = {1AFD580B-98B8-4689-B661-38C41132C60E} {EE203B88-44CF-4859-9D42-7A5F45FEDB52} = {9EA99B18-D352-47F6-BC04-A0B49CAA2772} {F59FA82C-DDB9-4EE2-80AE-CB0E4C6567A4} = {E74CF679-CA2A-47E9-B1F4-3779D6AC6B04} + {4C4BD478-3767-4C27-BD91-DAAFE7CD03A2} = {3D341D8A-E400-4B1D-BC05-B5C35487D9B5} + {73F1A804-1116-46C3-922A-9C0ADEB33F52} = {4C4BD478-3767-4C27-BD91-DAAFE7CD03A2} EndGlobalSection EndGlobal diff --git a/tools/lolremez/lolremez.vcxproj b/tools/lolremez/lolremez.vcxproj index 4b03fba9..074e7416 100644 --- a/tools/lolremez/lolremez.vcxproj +++ b/tools/lolremez/lolremez.vcxproj @@ -1,151 +1,85 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {A2767731-6FBF-442C-900F-301D095516E7} - Win32Proj - lolremez - - - - Application - true - Unicode - - - Application - true - Unicode - - - Application - false - true - Unicode - - - Application - false - true - Unicode - - - - - - - - - - - - - - - - - - - true - - - true - - - false - - - false - - - - - - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - - - Console - true - - - - - - - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - - - Console - true - - - - - Level3 - - - MaxSpeed - true - true - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - - - Console - true - true - true - true - - - - - Level3 - - - MaxSpeed - true - true - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - - - Console - true - true - true - true - - - - - - - - - - - - - - - + + + + + Debug + ORBIS + + + Debug + PS3 + + + Debug + Win32 + + + Debug + x64 + + + Debug + Xbox 360 + + + Release + ORBIS + + + Release + PS3 + + + Release + Win32 + + + Release + x64 + + + Release + Xbox 360 + + + + + + + + + + + + + + {9e62f2fe-3408-4eae-8238-fd84238ceeda} + + + {83d3b207-c601-4025-8f41-01dedc354661} + + + {d84021ca-b233-4e0f-8a52-071b83bbccc4} + + + + {73F1A804-1116-46C3-922A-9C0ADEB33F52} + Application + Win32Proj + + + + + + + + + + + + + + + + + diff --git a/tools/lolremez/lolremez.vcxproj.filters b/tools/lolremez/lolremez.vcxproj.filters index 1fcabda8..a3c70a93 100644 --- a/tools/lolremez/lolremez.vcxproj.filters +++ b/tools/lolremez/lolremez.vcxproj.filters @@ -1,26 +1,12 @@  - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - - + - - lol\math - - - lol\math - - + + + - + \ No newline at end of file