From f3c5985495ede30466eeb279d6b9d68722f3d7b1 Mon Sep 17 00:00:00 2001 From: Sam Hocevar <sam@hocevar.net> Date: Sat, 9 Jun 2012 17:36:31 +0000 Subject: [PATCH] build: move major .vcxproj files to their respective project directories. --- .gitignore | 2 +- win32/01_triangle.vcxproj | 12 ++-- win32/02_cube.vcxproj | 12 ++-- win32/03_fractal.vcxproj | 12 ++-- win32/Lol.Core.Vars.props | 4 +- win32/benchsuite.vcxproj | 12 ++-- win32/deushax.vcxproj | 63 ------------------- win32/deushax.vcxproj.filters | 12 ---- win32/editor.vcxproj | 112 --------------------------------- win32/editor.vcxproj.filters | 12 ---- win32/lolcore.vcxproj | 10 +-- win32/lolengine.sln | 16 ++--- win32/monsterz.vcxproj | 74 ---------------------- win32/monsterz.vcxproj.filters | 23 ------- win32/mrpigeon.vcxproj | 76 ---------------------- win32/mrpigeon.vcxproj.filters | 17 ----- win32/neercs.vcxproj | 65 ------------------- win32/neercs.vcxproj.filters | 25 -------- win32/orbital.vcxproj | 91 --------------------------- win32/orbital.vcxproj.filters | 67 -------------------- win32/quad.vcxproj | 12 ++-- win32/testsuite.vcxproj | 12 ++-- 22 files changed, 50 insertions(+), 691 deletions(-) delete mode 100644 win32/deushax.vcxproj delete mode 100644 win32/deushax.vcxproj.filters delete mode 100644 win32/editor.vcxproj delete mode 100644 win32/editor.vcxproj.filters delete mode 100644 win32/monsterz.vcxproj delete mode 100644 win32/monsterz.vcxproj.filters delete mode 100644 win32/mrpigeon.vcxproj delete mode 100644 win32/mrpigeon.vcxproj.filters delete mode 100644 win32/neercs.vcxproj delete mode 100644 win32/neercs.vcxproj.filters delete mode 100644 win32/orbital.vcxproj delete mode 100644 win32/orbital.vcxproj.filters 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 @@ <LolFxCompile Include="..\test\tutorial\01_triangle.lolfx" /> </ItemGroup> <ItemGroup> - <ProjectReference Include="lolcore.vcxproj"> + <ProjectReference Include="$(SolutionDir)\lolcore.vcxproj"> <Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project> </ProjectReference> </ItemGroup> @@ -42,19 +42,19 @@ <ConfigurationType>Application</ConfigurationType> <Keyword>Win32Proj</Keyword> </PropertyGroup> - <Import Project="Lol.Core.Config.props" /> + <Import Project="$(SolutionDir)\Lol.Core.Config.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="Lol.Fx.props" /> + <Import Project="$(SolutionDir)\Lol.Fx.props" /> </ImportGroup> <ImportGroup Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="Lol.Core.Vars.props" /> + <Import Project="$(SolutionDir)\Lol.Core.Vars.props" /> </ImportGroup> <PropertyGroup Label="UserMacros" /> - <Import Project="Lol.Core.Rules.props" /> + <Import Project="$(SolutionDir)\Lol.Core.Rules.props" /> <ItemDefinitionGroup /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> - <Import Project="Lol.Fx.targets" /> + <Import Project="$(SolutionDir)\Lol.Fx.targets" /> </ImportGroup> </Project> 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 @@ <LolFxCompile Include="..\test\tutorial\02_cube.lolfx" /> </ItemGroup> <ItemGroup> - <ProjectReference Include="lolcore.vcxproj"> + <ProjectReference Include="$(SolutionDir)\lolcore.vcxproj"> <Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project> </ProjectReference> </ItemGroup> @@ -42,19 +42,19 @@ <ConfigurationType>Application</ConfigurationType> <Keyword>Win32Proj</Keyword> </PropertyGroup> - <Import Project="Lol.Core.Config.props" /> + <Import Project="$(SolutionDir)\Lol.Core.Config.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="Lol.Fx.props" /> + <Import Project="$(SolutionDir)\Lol.Fx.props" /> </ImportGroup> <ImportGroup Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="Lol.Core.Vars.props" /> + <Import Project="$(SolutionDir)\Lol.Core.Vars.props" /> </ImportGroup> <PropertyGroup Label="UserMacros" /> - <Import Project="Lol.Core.Rules.props" /> + <Import Project="$(SolutionDir)\Lol.Core.Rules.props" /> <ItemDefinitionGroup /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> - <Import Project="Lol.Fx.targets" /> + <Import Project="$(SolutionDir)\Lol.Fx.targets" /> </ImportGroup> </Project> 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 @@ <LolFxCompile Include="..\test\tutorial\03_fractal.lolfx" /> </ItemGroup> <ItemGroup> - <ProjectReference Include="lolcore.vcxproj"> + <ProjectReference Include="$(SolutionDir)\lolcore.vcxproj"> <Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project> </ProjectReference> </ItemGroup> @@ -42,19 +42,19 @@ <ConfigurationType>Application</ConfigurationType> <Keyword>Win32Proj</Keyword> </PropertyGroup> - <Import Project="Lol.Core.Config.props" /> + <Import Project="$(SolutionDir)\Lol.Core.Config.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="Lol.Fx.props" /> + <Import Project="$(SolutionDir)\Lol.Fx.props" /> </ImportGroup> <ImportGroup Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="Lol.Core.Vars.props" /> + <Import Project="$(SolutionDir)\Lol.Core.Vars.props" /> </ImportGroup> <PropertyGroup Label="UserMacros" /> - <Import Project="Lol.Core.Rules.props" /> + <Import Project="$(SolutionDir)\Lol.Core.Rules.props" /> <ItemDefinitionGroup /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> - <Import Project="Lol.Fx.targets" /> + <Import Project="$(SolutionDir)\Lol.Fx.targets" /> </ImportGroup> </Project> 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 @@ <BuildMacro Include="XboxDefines"><Value>$(XboxDefines)</Value></BuildMacro> </ItemGroup> <PropertyGroup> - <OutDir>$(Platform) $(Configuration)\</OutDir> - <IntDir>$(Platform) $(Configuration)\$(ProjectName)\</IntDir> + <OutDir>$(SolutionDir)\$(Platform) $(Configuration)\</OutDir> + <IntDir>$(SolutionDir)\$(Platform) $(Configuration)\$(ProjectName)\</IntDir> </PropertyGroup> </Project> 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 @@ <ClCompile Include="..\test\benchsuite.cpp" /> </ItemGroup> <ItemGroup> - <ProjectReference Include="lolcore.vcxproj"> + <ProjectReference Include="$(SolutionDir)\lolcore.vcxproj"> <Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project> </ProjectReference> </ItemGroup> @@ -43,19 +43,19 @@ <ConfigurationType>Application</ConfigurationType> <Keyword>Win32Proj</Keyword> </PropertyGroup> - <Import Project="Lol.Core.Config.props" /> + <Import Project="$(SolutionDir)\Lol.Core.Config.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="Lol.Fx.props" /> + <Import Project="$(SolutionDir)\Lol.Fx.props" /> </ImportGroup> <ImportGroup Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="Lol.Core.Vars.props" /> + <Import Project="$(SolutionDir)\Lol.Core.Vars.props" /> </ImportGroup> <PropertyGroup Label="UserMacros" /> - <Import Project="Lol.Core.Rules.props" /> + <Import Project="$(SolutionDir)\Lol.Core.Rules.props" /> <ItemDefinitionGroup /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> - <Import Project="Lol.Fx.targets" /> + <Import Project="$(SolutionDir)\Lol.Fx.targets" /> </ImportGroup> </Project> 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 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="Debug|Win32"> - <Configuration>Debug</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Debug|x64"> - <Configuration>Debug</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Debug|Xbox 360"> - <Configuration>Debug</Configuration> - <Platform>Xbox 360</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|Win32"> - <Configuration>Release</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|x64"> - <Configuration>Release</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|Xbox 360"> - <Configuration>Release</Configuration> - <Platform>Xbox 360</Platform> - </ProjectConfiguration> - </ItemGroup> - <ItemGroup> - <ClInclude Include="..\deushax\debugsprite.h" /> - <ClInclude Include="..\deushax\game.h" /> - </ItemGroup> - <ItemGroup> - <ClCompile Include="..\deushax\debugsprite.cpp" /> - <ClCompile Include="..\deushax\deushax.cpp" /> - <ClCompile Include="..\deushax\game.cpp" /> - </ItemGroup> - <ItemGroup> - <ProjectReference Include="lolcore.vcxproj"> - <Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project> - </ProjectReference> - </ItemGroup> - <PropertyGroup Label="Globals"> - <ProjectGuid>{EF1A4E80-63FA-4EB0-B834-12B6C500F31C}</ProjectGuid> - <ConfigurationType>Application</ConfigurationType> - <Keyword>Win32Proj</Keyword> - </PropertyGroup> - <Import Project="Lol.Core.Config.props" /> - <ImportGroup Label="ExtensionSettings"> - <Import Project="Lol.Fx.props" /> - </ImportGroup> - <ImportGroup Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="Lol.Core.Vars.props" /> - </ImportGroup> - <PropertyGroup Label="UserMacros" /> - <Import Project="Lol.Core.Rules.props" /> - <ItemDefinitionGroup /> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <ImportGroup Label="ExtensionTargets"> - <Import Project="Lol.Fx.targets" /> - </ImportGroup> -</Project> 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 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup> - <ClInclude Include="..\deushax\debugsprite.h" /> - <ClInclude Include="..\deushax\game.h" /> - </ItemGroup> - <ItemGroup> - <ClCompile Include="..\deushax\debugsprite.cpp" /> - <ClCompile Include="..\deushax\deushax.cpp" /> - <ClCompile Include="..\deushax\game.cpp" /> - </ItemGroup> -</Project> \ 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 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="Debug|Win32"> - <Configuration>Debug</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Debug|x64"> - <Configuration>Debug</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Debug|Xbox 360"> - <Configuration>Debug</Configuration> - <Platform>Xbox 360</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|Win32"> - <Configuration>Release</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|x64"> - <Configuration>Release</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|Xbox 360"> - <Configuration>Release</Configuration> - <Platform>Xbox 360</Platform> - </ProjectConfiguration> - </ItemGroup> - <ItemGroup> - <ClInclude Include="..\deushax\gtk\glmapview.h" /> - <ClInclude Include="..\deushax\mapviewer.h" /> - </ItemGroup> - <ItemGroup> - <ClCompile Include="..\deushax\gtk\editor.cpp" /> - <ClCompile Include="..\deushax\gtk\glmapview.cpp" /> - <ClCompile Include="..\deushax\mapviewer.cpp" /> - </ItemGroup> - <ItemGroup> - <ProjectReference Include="lolcore.vcxproj"> - <Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project> - </ProjectReference> - </ItemGroup> - <PropertyGroup Label="Globals"> - <ProjectGuid>{9C66B179-0737-4BDA-AB42-2ADE478A9008}</ProjectGuid> - <ConfigurationType>Application</ConfigurationType> - <Keyword>Win32Proj</Keyword> - </PropertyGroup> - <Import Project="Lol.Core.Config.props" /> - <ImportGroup Label="ExtensionSettings"> - <Import Project="Lol.Fx.props" /> - </ImportGroup> - <ImportGroup Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="Lol.Core.Vars.props" /> - </ImportGroup> - <PropertyGroup Label="UserMacros" /> - <Import Project="Lol.Core.Rules.props" /> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <ClCompile> - <AdditionalIncludeDirectories>$(SolutionDir)\..\deushax;$(GtkIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - </ClCompile> - <Link> - <AdditionalDependencies>$(GtkDeps);%(AdditionalDependencies)</AdditionalDependencies> - <AdditionalLibraryDirectories>$(GtkLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <ClCompile> - <AdditionalIncludeDirectories>$(SolutionDir)\..\deushax;$(GtkIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - </ClCompile> - <Link> - <AdditionalDependencies>$(GtkDeps);%(AdditionalDependencies)</AdditionalDependencies> - <AdditionalLibraryDirectories>$(GtkLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'"> - <ClCompile> - <AdditionalIncludeDirectories>$(SolutionDir)\..\deushax;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - </ClCompile> - <Link> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <ClCompile> - <AdditionalIncludeDirectories>$(SolutionDir)\..\deushax;$(GtkIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - </ClCompile> - <Link> - <AdditionalDependencies>$(GtkDeps);%(AdditionalDependencies)</AdditionalDependencies> - <AdditionalLibraryDirectories>$(GtkLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <ClCompile> - <AdditionalIncludeDirectories>$(SolutionDir)\..\deushax;$(GtkIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - </ClCompile> - <Link> - <AdditionalDependencies>$(GtkDeps);%(AdditionalDependencies)</AdditionalDependencies> - <AdditionalLibraryDirectories>$(GtkLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'"> - <ClCompile> - <AdditionalIncludeDirectories>$(SolutionDir)\..\deushax;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - </ClCompile> - <Link> - </Link> - </ItemDefinitionGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <ImportGroup Label="ExtensionTargets"> - <Import Project="Lol.Fx.targets" /> - </ImportGroup> -</Project> 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 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup> - <ClInclude Include="..\deushax\gtk\glmapview.h" /> - <ClInclude Include="..\deushax\mapviewer.h" /> - </ItemGroup> - <ItemGroup> - <ClCompile Include="..\deushax\gtk\editor.cpp" /> - <ClCompile Include="..\deushax\gtk\glmapview.cpp" /> - <ClCompile Include="..\deushax\mapviewer.cpp" /> - </ItemGroup> -</Project> \ 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 @@ <ConfigurationType>StaticLibrary</ConfigurationType> <Keyword>Win32Proj</Keyword> </PropertyGroup> - <Import Project="Lol.Core.Config.props" /> + <Import Project="$(SolutionDir)\Lol.Core.Config.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <UseDebugLibraries>true</UseDebugLibraries> <CharacterSet>MultiByte</CharacterSet> @@ -58,14 +58,14 @@ <CharacterSet>MultiByte</CharacterSet> </PropertyGroup> <ImportGroup Label="ExtensionSettings"> - <Import Project="Lol.Fx.props" /> + <Import Project="$(SolutionDir)\Lol.Fx.props" /> </ImportGroup> <ImportGroup Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="Lol.Core.Vars.props" /> + <Import Project="$(SolutionDir)\Lol.Core.Vars.props" /> </ImportGroup> <PropertyGroup Label="UserMacros" /> - <Import Project="Lol.Core.Rules.props" /> + <Import Project="$(SolutionDir)\Lol.Core.Rules.props" /> <ItemDefinitionGroup> <ClCompile> <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> @@ -197,6 +197,6 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> - <Import Project="Lol.Fx.targets" /> + <Import Project="$(SolutionDir)\Lol.Fx.targets" /> </ImportGroup> </Project> 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 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="Debug|Win32"> - <Configuration>Debug</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Debug|x64"> - <Configuration>Debug</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Debug|Xbox 360"> - <Configuration>Debug</Configuration> - <Platform>Xbox 360</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|Win32"> - <Configuration>Release</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|x64"> - <Configuration>Release</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|Xbox 360"> - <Configuration>Release</Configuration> - <Platform>Xbox 360</Platform> - </ProjectConfiguration> - </ItemGroup> - <ItemGroup> - <ClInclude Include="..\monsterz\board.h" /> - <ClInclude Include="..\monsterz\interface.h" /> - <ClInclude Include="..\monsterz\mash.h" /> - <ClInclude Include="..\monsterz\monsterz.h" /> - <ClInclude Include="..\monsterz\piece.h" /> - <ClInclude Include="..\monsterz\score.h" /> - <ClInclude Include="..\monsterz\thumbs.h" /> - <ClInclude Include="..\monsterz\title.h" /> - </ItemGroup> - <ItemGroup> - <ClCompile Include="..\monsterz\board.cpp" /> - <ClCompile Include="..\monsterz\interface.cpp" /> - <ClCompile Include="..\monsterz\mash.cpp" /> - <ClCompile Include="..\monsterz\monsterz.cpp" /> - <ClCompile Include="..\monsterz\piece.cpp" /> - <ClCompile Include="..\monsterz\score.cpp" /> - <ClCompile Include="..\monsterz\thumbs.cpp" /> - <ClCompile Include="..\monsterz\title.cpp" /> - </ItemGroup> - <ItemGroup> - <ProjectReference Include="lolcore.vcxproj"> - <Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project> - </ProjectReference> - </ItemGroup> - <PropertyGroup Label="Globals"> - <ProjectGuid>{17f0f184-4436-4d08-b8aa-16572ea238db}</ProjectGuid> - <ConfigurationType>Application</ConfigurationType> - <Keyword>Win32Proj</Keyword> - </PropertyGroup> - <Import Project="Lol.Core.Config.props" /> - <ImportGroup Label="ExtensionSettings"> - <Import Project="Lol.Fx.props" /> - </ImportGroup> - <ImportGroup Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="Lol.Core.Vars.props" /> - </ImportGroup> - <PropertyGroup Label="UserMacros" /> - <Import Project="Lol.Core.Rules.props" /> - <ItemDefinitionGroup /> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <ImportGroup Label="ExtensionTargets"> - <Import Project="Lol.Fx.targets" /> - </ImportGroup> -</Project> 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 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup> - <ClInclude Include="..\monsterz\board.h" /> - <ClInclude Include="..\monsterz\interface.h" /> - <ClInclude Include="..\monsterz\piece.h" /> - <ClInclude Include="..\monsterz\thumbs.h" /> - <ClInclude Include="..\monsterz\title.h" /> - <ClInclude Include="..\monsterz\mash.h" /> - <ClInclude Include="..\monsterz\monsterz.h" /> - <ClInclude Include="..\monsterz\score.h" /> - </ItemGroup> - <ItemGroup> - <ClCompile Include="..\monsterz\board.cpp" /> - <ClCompile Include="..\monsterz\interface.cpp" /> - <ClCompile Include="..\monsterz\monsterz.cpp" /> - <ClCompile Include="..\monsterz\piece.cpp" /> - <ClCompile Include="..\monsterz\thumbs.cpp" /> - <ClCompile Include="..\monsterz\title.cpp" /> - <ClCompile Include="..\monsterz\mash.cpp" /> - <ClCompile Include="..\monsterz\score.cpp" /> - </ItemGroup> -</Project> \ 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 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="Debug|Win32"> - <Configuration>Debug</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Debug|x64"> - <Configuration>Debug</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Debug|Xbox 360"> - <Configuration>Debug</Configuration> - <Platform>Xbox 360</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|Win32"> - <Configuration>Release</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|x64"> - <Configuration>Release</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|Xbox 360"> - <Configuration>Release</Configuration> - <Platform>Xbox 360</Platform> - </ProjectConfiguration> - </ItemGroup> - <ItemGroup> - <ClInclude Include="..\mrpigeon\blueenemy.h" /> - <ClInclude Include="..\mrpigeon\enemy.h" /> - <ClInclude Include="..\mrpigeon\redenemy.h" /> - </ItemGroup> - <ItemGroup> - <ClInclude Include="..\mrpigeon\mrpigeon.h" /> - </ItemGroup> - <ItemGroup> - <ClInclude Include="..\mrpigeon\player.h" /> - </ItemGroup> - <ItemGroup> - <ClCompile Include="..\mrpigeon\blueenemy.cpp" /> - <ClCompile Include="..\mrpigeon\enemy.cpp" /> - <ClCompile Include="..\mrpigeon\redenemy.cpp" /> - </ItemGroup> - <ItemGroup> - <ClCompile Include="..\mrpigeon\mrpigeon.cpp" /> - </ItemGroup> - <ItemGroup> - <ClCompile Include="..\mrpigeon\player.cpp" /> - </ItemGroup> - <ItemGroup> - <ProjectReference Include="lolcore.vcxproj"> - <Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project> - </ProjectReference> - </ItemGroup> - <PropertyGroup Label="Globals"> - <ProjectGuid>{32f3f8cf-d22e-45e4-beb8-ad909e8c5515}</ProjectGuid> - <ConfigurationType>Application</ConfigurationType> - <Keyword>Win32Proj</Keyword> - </PropertyGroup> - <Import Project="Lol.Core.Config.props" /> - <ImportGroup Label="ExtensionSettings"> - <Import Project="Lol.Fx.props" /> - </ImportGroup> - <ImportGroup Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="Lol.Core.Vars.props" /> - </ImportGroup> - <PropertyGroup Label="UserMacros" /> - <Import Project="Lol.Core.Rules.props" /> - <ItemDefinitionGroup /> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <ImportGroup Label="ExtensionTargets"> - <Import Project="Lol.Fx.targets" /> - </ImportGroup> -</Project> 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 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup> - <ClInclude Include="..\mrpigeon\mrpigeon.h" /> - <ClInclude Include="..\mrpigeon\enemy.h" /> - <ClInclude Include="..\mrpigeon\player.h" /> - <ClInclude Include="..\mrpigeon\blueenemy.h" /> - <ClInclude Include="..\mrpigeon\redenemy.h" /> - </ItemGroup> - <ItemGroup> - <ClCompile Include="..\mrpigeon\mrpigeon.cpp" /> - <ClCompile Include="..\mrpigeon\enemy.cpp" /> - <ClCompile Include="..\mrpigeon\player.cpp" /> - <ClCompile Include="..\mrpigeon\blueenemy.cpp" /> - <ClCompile Include="..\mrpigeon\redenemy.cpp" /> - </ItemGroup> -</Project> \ 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 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="Debug|Win32"> - <Configuration>Debug</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Debug|x64"> - <Configuration>Debug</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Debug|Xbox 360"> - <Configuration>Debug</Configuration> - <Platform>Xbox 360</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|Win32"> - <Configuration>Release</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|x64"> - <Configuration>Release</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|Xbox 360"> - <Configuration>Release</Configuration> - <Platform>Xbox 360</Platform> - </ProjectConfiguration> - </ItemGroup> - <ItemGroup> - <ClInclude Include="..\neercs\neercs.h" /> - <ClInclude Include="..\neercs\video\render.h" /> - </ItemGroup> - <ItemGroup> - <ClCompile Include="..\neercs\neercs.cpp" /> - <ClCompile Include="..\neercs\video\render.cpp" /> - </ItemGroup> - <ItemGroup> - <LolFxCompile Include="..\neercs\video\test.lolfx" /> - </ItemGroup> - <ItemGroup> - <ProjectReference Include="lolcore.vcxproj"> - <Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project> - </ProjectReference> - </ItemGroup> - <PropertyGroup Label="Globals"> - <ProjectGuid>{587FCCE9-1D8D-4398-B8B6-E8F4E9A92233}</ProjectGuid> - <ConfigurationType>Application</ConfigurationType> - <Keyword>Win32Proj</Keyword> - </PropertyGroup> - <Import Project="Lol.Core.Config.props" /> - <ImportGroup Label="ExtensionSettings"> - <Import Project="Lol.Fx.props" /> - </ImportGroup> - <ImportGroup Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="Lol.Core.Vars.props" /> - </ImportGroup> - <PropertyGroup Label="UserMacros" /> - <Import Project="Lol.Core.Rules.props" /> - <ItemDefinitionGroup /> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <ImportGroup Label="ExtensionTargets"> - <Import Project="Lol.Fx.targets" /> - </ImportGroup> -</Project> \ 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 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup> - <ClCompile Include="..\neercs\neercs.cpp" /> - <ClCompile Include="..\neercs\video\render.cpp"> - <Filter>video</Filter> - </ClCompile> - </ItemGroup> - <ItemGroup> - <ClInclude Include="..\neercs\neercs.h" /> - <ClInclude Include="..\neercs\video\render.h"> - <Filter>video</Filter> - </ClInclude> - </ItemGroup> - <ItemGroup> - <Filter Include="video"> - <UniqueIdentifier>{8598edd6-ce35-4250-b16e-4237b34ebd2a}</UniqueIdentifier> - </Filter> - </ItemGroup> - <ItemGroup> - <LolFxCompile Include="..\neercs\video\test.lolfx"> - <Filter>video</Filter> - </LolFxCompile> - </ItemGroup> -</Project> \ 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 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="Debug|Win32"> - <Configuration>Debug</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Debug|x64"> - <Configuration>Debug</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Debug|Xbox 360"> - <Configuration>Debug</Configuration> - <Platform>Xbox 360</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|Win32"> - <Configuration>Release</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|x64"> - <Configuration>Release</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|Xbox 360"> - <Configuration>Release</Configuration> - <Platform>Xbox 360</Platform> - </ProjectConfiguration> - </ItemGroup> - <ItemGroup> - <ClInclude Include="..\orbital\generated\mesh-parser.h" /> - <ClInclude Include="..\orbital\generated\gun-parser.h" /> - <ClInclude Include="..\orbital\gun.h" /> - <ClInclude Include="..\orbital\mesh-compiler.h" /> - <ClInclude Include="..\orbital\gun-compiler.h" /> - <ClInclude Include="..\orbital\mesh.h" /> - <ClInclude Include="..\orbital\orbital.h" /> - <ClInclude Include="..\orbital\particlesystem.h" /> - <ClInclude Include="..\orbital\player.h" /> - <ClInclude Include="..\orbital\snake.h" /> - <ClInclude Include="..\orbital\starfield.h" /> - <ClInclude Include="..\orbital\tank.h" /> - </ItemGroup> - <ItemGroup> - <ClCompile Include="..\orbital\generated\mesh-parser.cpp" /> - <ClCompile Include="..\orbital\generated\gun-parser.cpp" /> - <ClCompile Include="..\orbital\generated\mesh-scanner.cpp" /> - <ClCompile Include="..\orbital\generated\gun-scanner.cpp" /> - <ClCompile Include="..\orbital\mesh-compiler.cpp" /> - <ClCompile Include="..\orbital\mesh.cpp" /> - <ClCompile Include="..\orbital\gun-compiler.cpp" /> - <ClCompile Include="..\orbital\gun.cpp" /> - <ClCompile Include="..\orbital\orbital.cpp" /> - </ItemGroup> - <ItemGroup> - <LolFxCompile Include="..\orbital\shiny.lolfx" /> - </ItemGroup> - <ItemGroup> - <ProjectReference Include="lolcore.vcxproj"> - <Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project> - </ProjectReference> - </ItemGroup> - <ItemGroup> - <None Include="..\orbital\generated\location.hh" /> - <None Include="..\orbital\generated\position.hh" /> - <None Include="..\orbital\generated\stack.hh" /> - <None Include="..\orbital\mesh-scanner.l" /> - <None Include="..\orbital\gun-scanner.l" /> - <None Include="..\orbital\mesh-parser.y" /> - <None Include="..\orbital\gun-parser.y" /> - </ItemGroup> - <PropertyGroup Label="Globals"> - <ProjectGuid>{ee203b88-44cf-4859-9d42-7a5f40fecb52}</ProjectGuid> - <ConfigurationType>Application</ConfigurationType> - <Keyword>Win32Proj</Keyword> - </PropertyGroup> - <Import Project="Lol.Core.Config.props" /> - <ImportGroup Label="ExtensionSettings"> - <Import Project="Lol.Fx.props" /> - </ImportGroup> - <ImportGroup Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="Lol.Core.Vars.props" /> - </ImportGroup> - <PropertyGroup Label="UserMacros" /> - <Import Project="Lol.Core.Rules.props" /> - <ItemDefinitionGroup /> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <ImportGroup Label="ExtensionTargets"> - <Import Project="Lol.Fx.targets" /> - </ImportGroup> -</Project> 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 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup> - <ClInclude Include="..\orbital\gun.h" /> - <ClInclude Include="..\orbital\mesh.h" /> - <ClInclude Include="..\orbital\player.h" /> - <ClInclude Include="..\orbital\tank.h" /> - <ClInclude Include="..\orbital\starfield.h" /> - <ClInclude Include="..\orbital\snake.h" /> - <ClInclude Include="..\orbital\mesh-compiler.h" /> - <ClInclude Include="..\orbital\gun-compiler.h" /> - <ClInclude Include="..\orbital\generated\mesh-parser.h"> - <Filter>generated</Filter> - </ClInclude> - <ClInclude Include="..\orbital\generated\gun-parser.h"> - <Filter>generated</Filter> - </ClInclude> - </ItemGroup> - <ItemGroup> - <ClInclude Include="..\orbital\orbital.h" /> - </ItemGroup> - <ItemGroup> - <ClInclude Include="..\orbital\particlesystem.h" /> - </ItemGroup> - <ItemGroup> - <ClCompile Include="..\orbital\orbital.cpp" /> - <ClCompile Include="..\orbital\mesh-compiler.cpp" /> - <ClCompile Include="..\orbital\mesh.cpp" /> - <ClCompile Include="..\orbital\gun-compiler.cpp" /> - <ClCompile Include="..\orbital\gun.cpp" /> - <ClCompile Include="..\orbital\generated\mesh-parser.cpp"> - <Filter>generated</Filter> - </ClCompile> - <ClCompile Include="..\orbital\generated\gun-parser.cpp"> - <Filter>generated</Filter> - </ClCompile> - <ClCompile Include="..\orbital\generated\mesh-scanner.cpp"> - <Filter>generated</Filter> - </ClCompile> - <ClCompile Include="..\orbital\generated\gun-scanner.cpp"> - <Filter>generated</Filter> - </ClCompile> - </ItemGroup> - <ItemGroup> - <LolFxCompile Include="..\orbital\shiny.lolfx" /> - </ItemGroup> - <ItemGroup> - <None Include="..\orbital\mesh-scanner.l" /> - <None Include="..\orbital\gun-scanner.l" /> - <None Include="..\orbital\mesh-parser.y" /> - <None Include="..\orbital\gun-parser.y" /> - <None Include="..\orbital\generated\location.hh"> - <Filter>generated</Filter> - </None> - <None Include="..\orbital\generated\position.hh"> - <Filter>generated</Filter> - </None> - <None Include="..\orbital\generated\stack.hh"> - <Filter>generated</Filter> - </None> - </ItemGroup> - <ItemGroup> - <Filter Include="generated"> - <UniqueIdentifier>{4fc7662b-b17a-49b9-acd1-0cf767183b06}</UniqueIdentifier> - </Filter> - </ItemGroup> -</Project> 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 @@ <ClCompile Include="..\test\debug\quad.cpp" /> </ItemGroup> <ItemGroup> - <ProjectReference Include="lolcore.vcxproj"> + <ProjectReference Include="$(SolutionDir)\lolcore.vcxproj"> <Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project> </ProjectReference> </ItemGroup> @@ -39,19 +39,19 @@ <ConfigurationType>Application</ConfigurationType> <Keyword>Win32Proj</Keyword> </PropertyGroup> - <Import Project="Lol.Core.Config.props" /> + <Import Project="$(SolutionDir)\Lol.Core.Config.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="Lol.Fx.props" /> + <Import Project="$(SolutionDir)\Lol.Fx.props" /> </ImportGroup> <ImportGroup Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="Lol.Core.Vars.props" /> + <Import Project="$(SolutionDir)\Lol.Core.Vars.props" /> </ImportGroup> <PropertyGroup Label="UserMacros" /> - <Import Project="Lol.Core.Rules.props" /> + <Import Project="$(SolutionDir)\Lol.Core.Rules.props" /> <ItemDefinitionGroup /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> - <Import Project="Lol.Fx.targets" /> + <Import Project="$(SolutionDir)\Lol.Fx.targets" /> </ImportGroup> </Project> 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 @@ <ClCompile Include="..\test\unit\vector.cpp" /> </ItemGroup> <ItemGroup> - <ProjectReference Include="lolcore.vcxproj"> + <ProjectReference Include="$(SolutionDir)\lolcore.vcxproj"> <Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project> </ProjectReference> </ItemGroup> @@ -50,19 +50,19 @@ <ConfigurationType>Application</ConfigurationType> <Keyword>Win32Proj</Keyword> </PropertyGroup> - <Import Project="Lol.Core.Config.props" /> + <Import Project="$(SolutionDir)\Lol.Core.Config.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="Lol.Fx.props" /> + <Import Project="$(SolutionDir)\Lol.Fx.props" /> </ImportGroup> <ImportGroup Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="Lol.Core.Vars.props" /> + <Import Project="$(SolutionDir)\Lol.Core.Vars.props" /> </ImportGroup> <PropertyGroup Label="UserMacros" /> - <Import Project="Lol.Core.Rules.props" /> + <Import Project="$(SolutionDir)\Lol.Core.Rules.props" /> <ItemDefinitionGroup /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> - <Import Project="Lol.Fx.targets" /> + <Import Project="$(SolutionDir)\Lol.Fx.targets" /> </ImportGroup> </Project>