diff --git a/.gitignore b/.gitignore index e809948e..41709c13 100644 --- a/.gitignore +++ b/.gitignore @@ -41,10 +41,10 @@ perf.data* .*.swp *~ # Visual Studio cruft +*.vcxproj.user win32/ipch win32/*Debug win32/*Release -win32/*.vcxproj.user win32/*.opensdf win32/*.sdf win32/*.suo diff --git a/win32/01_triangle.vcxproj b/win32/01_triangle.vcxproj index af3f7dc4..f8a99b97 100644 --- a/win32/01_triangle.vcxproj +++ b/win32/01_triangle.vcxproj @@ -33,7 +33,7 @@ - + {9e62f2fe-3408-4eae-8238-fd84238ceeda} @@ -42,19 +42,19 @@ Application Win32Proj - + - + - + - + - + diff --git a/win32/02_cube.vcxproj b/win32/02_cube.vcxproj index 522f2425..9a9385c3 100644 --- a/win32/02_cube.vcxproj +++ b/win32/02_cube.vcxproj @@ -33,7 +33,7 @@ - + {9e62f2fe-3408-4eae-8238-fd84238ceeda} @@ -42,19 +42,19 @@ Application Win32Proj - + - + - + - + - + diff --git a/win32/03_fractal.vcxproj b/win32/03_fractal.vcxproj index bdc1ec3f..77ffa521 100644 --- a/win32/03_fractal.vcxproj +++ b/win32/03_fractal.vcxproj @@ -33,7 +33,7 @@ - + {9e62f2fe-3408-4eae-8238-fd84238ceeda} @@ -42,19 +42,19 @@ Application Win32Proj - + - + - + - + - + diff --git a/win32/Lol.Core.Vars.props b/win32/Lol.Core.Vars.props index 4d4eccde..dfad59d8 100644 --- a/win32/Lol.Core.Vars.props +++ b/win32/Lol.Core.Vars.props @@ -75,7 +75,7 @@ $(XboxDefines) - $(Platform) $(Configuration)\ - $(Platform) $(Configuration)\$(ProjectName)\ + $(SolutionDir)\$(Platform) $(Configuration)\ + $(SolutionDir)\$(Platform) $(Configuration)\$(ProjectName)\ diff --git a/win32/benchsuite.vcxproj b/win32/benchsuite.vcxproj index a1155bc7..adc3e7e0 100644 --- a/win32/benchsuite.vcxproj +++ b/win32/benchsuite.vcxproj @@ -34,7 +34,7 @@ - + {9e62f2fe-3408-4eae-8238-fd84238ceeda} @@ -43,19 +43,19 @@ Application Win32Proj - + - + - + - + - + diff --git a/win32/deushax.vcxproj b/win32/deushax.vcxproj deleted file mode 100644 index ec8dbbac..00000000 --- a/win32/deushax.vcxproj +++ /dev/null @@ -1,63 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Debug - Xbox 360 - - - Release - Win32 - - - Release - x64 - - - Release - Xbox 360 - - - - - - - - - - - - - - {9e62f2fe-3408-4eae-8238-fd84238ceeda} - - - - {EF1A4E80-63FA-4EB0-B834-12B6C500F31C} - Application - Win32Proj - - - - - - - - - - - - - - - - - diff --git a/win32/deushax.vcxproj.filters b/win32/deushax.vcxproj.filters deleted file mode 100644 index 5be58283..00000000 --- a/win32/deushax.vcxproj.filters +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/win32/editor.vcxproj b/win32/editor.vcxproj deleted file mode 100644 index e1ffd3f0..00000000 --- a/win32/editor.vcxproj +++ /dev/null @@ -1,112 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Debug - Xbox 360 - - - Release - Win32 - - - Release - x64 - - - Release - Xbox 360 - - - - - - - - - - - - - - {9e62f2fe-3408-4eae-8238-fd84238ceeda} - - - - {9C66B179-0737-4BDA-AB42-2ADE478A9008} - Application - Win32Proj - - - - - - - - - - - - - - $(SolutionDir)\..\deushax;$(GtkIncludes);%(AdditionalIncludeDirectories) - - - $(GtkDeps);%(AdditionalDependencies) - $(GtkLibs);%(AdditionalLibraryDirectories) - - - - - $(SolutionDir)\..\deushax;$(GtkIncludes);%(AdditionalIncludeDirectories) - - - $(GtkDeps);%(AdditionalDependencies) - $(GtkLibs);%(AdditionalLibraryDirectories) - - - - - $(SolutionDir)\..\deushax;%(AdditionalIncludeDirectories) - - - - - - - $(SolutionDir)\..\deushax;$(GtkIncludes);%(AdditionalIncludeDirectories) - - - $(GtkDeps);%(AdditionalDependencies) - $(GtkLibs);%(AdditionalLibraryDirectories) - - - - - $(SolutionDir)\..\deushax;$(GtkIncludes);%(AdditionalIncludeDirectories) - - - $(GtkDeps);%(AdditionalDependencies) - $(GtkLibs);%(AdditionalLibraryDirectories) - - - - - $(SolutionDir)\..\deushax;%(AdditionalIncludeDirectories) - - - - - - - - - diff --git a/win32/editor.vcxproj.filters b/win32/editor.vcxproj.filters deleted file mode 100644 index 09186313..00000000 --- a/win32/editor.vcxproj.filters +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/win32/lolcore.vcxproj b/win32/lolcore.vcxproj index 12dae902..ea8b7b81 100644 --- a/win32/lolcore.vcxproj +++ b/win32/lolcore.vcxproj @@ -31,7 +31,7 @@ StaticLibrary Win32Proj - + true MultiByte @@ -58,14 +58,14 @@ MultiByte - + - + - + _LIB;%(PreprocessorDefinitions) @@ -197,6 +197,6 @@ - + diff --git a/win32/lolengine.sln b/win32/lolengine.sln index baceb73c..32a54373 100644 --- a/win32/lolengine.sln +++ b/win32/lolengine.sln @@ -1,17 +1,17 @@  Microsoft Visual Studio Solution File, Format Version 11.00 # Visual Studio 2010 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "deushax", "deushax.vcxproj", "{EF1A4E80-63FA-4EB0-B834-12B6C500F31C}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "deushax", "..\deushax\deushax.vcxproj", "{EF1A4E80-63FA-4EB0-B834-12B6C500F31C}" ProjectSection(ProjectDependencies) = postProject {9E62F2FE-3408-4EAE-8238-FD84238CEEDA} = {9E62F2FE-3408-4EAE-8238-FD84238CEEDA} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "monsterz", "monsterz.vcxproj", "{17F0F184-4436-4D08-B8AA-16572EA238DB}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "monsterz", "..\monsterz\monsterz.vcxproj", "{17F0F184-4436-4D08-B8AA-16572EA238DB}" ProjectSection(ProjectDependencies) = postProject {9E62F2FE-3408-4EAE-8238-FD84238CEEDA} = {9E62F2FE-3408-4EAE-8238-FD84238CEEDA} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "editor", "editor.vcxproj", "{9C66B179-0737-4BDA-AB42-2ADE478A9008}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "editor", "..\deushax\editor.vcxproj", "{9C66B179-0737-4BDA-AB42-2ADE478A9008}" ProjectSection(ProjectDependencies) = postProject {9E62F2FE-3408-4EAE-8238-FD84238CEEDA} = {9E62F2FE-3408-4EAE-8238-FD84238CEEDA} EndProjectSection @@ -58,7 +58,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "03_fractal", "03_fractal.vc EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MrPigeon", "MrPigeon", "{33704AA4-F2B5-4138-A40D-E3E77F89ED46}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrpigeon", "mrpigeon.vcxproj", "{32F3F8CF-D22E-45E4-BEB8-AD909E8C5515}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrpigeon", "..\mrpigeon\mrpigeon.vcxproj", "{32F3F8CF-D22E-45E4-BEB8-AD909E8C5515}" ProjectSection(ProjectDependencies) = postProject {9E62F2FE-3408-4EAE-8238-FD84238CEEDA} = {9E62F2FE-3408-4EAE-8238-FD84238CEEDA} EndProjectSection @@ -67,7 +67,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Games", "Games", "{1DFE1729 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Orbital", "Orbital", "{8C77EAA8-1077-4EF7-AE53-97C6C60A3601}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "orbital", "orbital.vcxproj", "{EE203B88-44CF-4859-9D42-7A5F40FECB52}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "orbital", "..\orbital\orbital.vcxproj", "{EE203B88-44CF-4859-9D42-7A5F40FECB52}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Engine", "Engine", "{1AFD580B-98B8-4689-B661-38C41132C60E}" ProjectSection(SolutionItems) = preProject @@ -78,7 +78,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{3D341D8A EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Neercs", "Neercs", "{B357514A-7881-422D-8358-161B689E7620}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "neercs", "neercs.vcxproj", "{587FCCE9-1D8D-4398-B8B6-E8F4E9A92233}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "neercs", "..\neercs\neercs.vcxproj", "{587FCCE9-1D8D-4398-B8B6-E8F4E9A92233}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -119,14 +119,10 @@ Global {17F0F184-4436-4D08-B8AA-16572EA238DB}.Release|Xbox 360.Build.0 = Release|Xbox 360 {17F0F184-4436-4D08-B8AA-16572EA238DB}.Release|Xbox 360.Deploy.0 = Release|Xbox 360 {9C66B179-0737-4BDA-AB42-2ADE478A9008}.Debug|Win32.ActiveCfg = Debug|Win32 - {9C66B179-0737-4BDA-AB42-2ADE478A9008}.Debug|Win32.Build.0 = Debug|Win32 {9C66B179-0737-4BDA-AB42-2ADE478A9008}.Debug|x64.ActiveCfg = Debug|x64 - {9C66B179-0737-4BDA-AB42-2ADE478A9008}.Debug|x64.Build.0 = Debug|x64 {9C66B179-0737-4BDA-AB42-2ADE478A9008}.Debug|Xbox 360.ActiveCfg = Debug|Xbox 360 {9C66B179-0737-4BDA-AB42-2ADE478A9008}.Release|Win32.ActiveCfg = Release|Win32 - {9C66B179-0737-4BDA-AB42-2ADE478A9008}.Release|Win32.Build.0 = Release|Win32 {9C66B179-0737-4BDA-AB42-2ADE478A9008}.Release|x64.ActiveCfg = Release|x64 - {9C66B179-0737-4BDA-AB42-2ADE478A9008}.Release|x64.Build.0 = Release|x64 {9C66B179-0737-4BDA-AB42-2ADE478A9008}.Release|Xbox 360.ActiveCfg = Release|Xbox 360 {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}.Debug|Win32.ActiveCfg = Debug|Win32 {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}.Debug|Win32.Build.0 = Debug|Win32 diff --git a/win32/monsterz.vcxproj b/win32/monsterz.vcxproj deleted file mode 100644 index 7427c80d..00000000 --- a/win32/monsterz.vcxproj +++ /dev/null @@ -1,74 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Debug - Xbox 360 - - - Release - Win32 - - - Release - x64 - - - Release - Xbox 360 - - - - - - - - - - - - - - - - - - - - - - - - - {9e62f2fe-3408-4eae-8238-fd84238ceeda} - - - - {17f0f184-4436-4d08-b8aa-16572ea238db} - Application - Win32Proj - - - - - - - - - - - - - - - - - diff --git a/win32/monsterz.vcxproj.filters b/win32/monsterz.vcxproj.filters deleted file mode 100644 index e4bc43f4..00000000 --- a/win32/monsterz.vcxproj.filters +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/win32/mrpigeon.vcxproj b/win32/mrpigeon.vcxproj deleted file mode 100644 index e4dd318f..00000000 --- a/win32/mrpigeon.vcxproj +++ /dev/null @@ -1,76 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Debug - Xbox 360 - - - Release - Win32 - - - Release - x64 - - - Release - Xbox 360 - - - - - - - - - - - - - - - - - - - - - - - - - - - {9e62f2fe-3408-4eae-8238-fd84238ceeda} - - - - {32f3f8cf-d22e-45e4-beb8-ad909e8c5515} - Application - Win32Proj - - - - - - - - - - - - - - - - - diff --git a/win32/mrpigeon.vcxproj.filters b/win32/mrpigeon.vcxproj.filters deleted file mode 100644 index 856f4b1b..00000000 --- a/win32/mrpigeon.vcxproj.filters +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/win32/neercs.vcxproj b/win32/neercs.vcxproj deleted file mode 100644 index cd553a8d..00000000 --- a/win32/neercs.vcxproj +++ /dev/null @@ -1,65 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Debug - Xbox 360 - - - Release - Win32 - - - Release - x64 - - - Release - Xbox 360 - - - - - - - - - - - - - - - - {9e62f2fe-3408-4eae-8238-fd84238ceeda} - - - - {587FCCE9-1D8D-4398-B8B6-E8F4E9A92233} - Application - Win32Proj - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/win32/neercs.vcxproj.filters b/win32/neercs.vcxproj.filters deleted file mode 100644 index 3d0205fd..00000000 --- a/win32/neercs.vcxproj.filters +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - video - - - - - - video - - - - - {8598edd6-ce35-4250-b16e-4237b34ebd2a} - - - - - video - - - \ No newline at end of file diff --git a/win32/orbital.vcxproj b/win32/orbital.vcxproj deleted file mode 100644 index eca25d22..00000000 --- a/win32/orbital.vcxproj +++ /dev/null @@ -1,91 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Debug - Xbox 360 - - - Release - Win32 - - - Release - x64 - - - Release - Xbox 360 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {9e62f2fe-3408-4eae-8238-fd84238ceeda} - - - - - - - - - - - - - {ee203b88-44cf-4859-9d42-7a5f40fecb52} - Application - Win32Proj - - - - - - - - - - - - - - - - - diff --git a/win32/orbital.vcxproj.filters b/win32/orbital.vcxproj.filters deleted file mode 100644 index d0db8832..00000000 --- a/win32/orbital.vcxproj.filters +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - - - - - - - - generated - - - generated - - - - - - - - - - - - - - - - generated - - - generated - - - generated - - - generated - - - - - - - - - - - - generated - - - generated - - - generated - - - - - {4fc7662b-b17a-49b9-acd1-0cf767183b06} - - - diff --git a/win32/quad.vcxproj b/win32/quad.vcxproj index edcb1e99..69c08d82 100644 --- a/win32/quad.vcxproj +++ b/win32/quad.vcxproj @@ -30,7 +30,7 @@ - + {9e62f2fe-3408-4eae-8238-fd84238ceeda} @@ -39,19 +39,19 @@ Application Win32Proj - + - + - + - + - + diff --git a/win32/testsuite.vcxproj b/win32/testsuite.vcxproj index f7032099..15ad9e69 100644 --- a/win32/testsuite.vcxproj +++ b/win32/testsuite.vcxproj @@ -41,7 +41,7 @@ - + {9e62f2fe-3408-4eae-8238-fd84238ceeda} @@ -50,19 +50,19 @@ Application Win32Proj - + - + - + - + - +