build: reorganise all the build stuff so that it lies in build/ and

make sure each .vcxproj file is with its corresponding source code.

.gitignore

@@ -42,14 +42,14 @@ perf.data*
 *~
 # Visual Studio cruft
 *.vcxproj.user
-win32/ipch
-win32/*Debug
-win32/*Release
-win32/*.opensdf
-win32/*.sdf
-win32/*.suo
-win32/*.log
-win32/*.XGD
+build/vs2010/ipch
+build/vs2010/*Debug
+build/vs2010/*Release
+build/vs2010/*.opensdf
+build/vs2010/*.sdf
+build/vs2010/*.suo
+build/vs2010/*.log
+build/vs2010/*.XGD
 # Do not exclude anything in contrib; this is currently one level
 # more than our current max
 !contrib/*
@@ -61,9 +61,6 @@ win32/*.XGD
 !contrib/*/*/*/*/*/*/*
 # Our binaries
 test/testsuite
-test/tutorial/01_triangle
-test/tutorial/02_cube
-test/tutorial/03_fractal
 test/benchsuite
 test/quad
 test/sandbox/sample
@@ -72,4 +69,7 @@ test/math/poly
 test/math/remez
 test/xolotl/xolotl
 tools/make-font
+tutorial/01_triangle
+tutorial/02_cube
+tutorial/11_fractal
 # Our data

Makefile.am

@@ -1,5 +1,5 @@
 
-SUBDIRS = src test tools gfx
+SUBDIRS = src tutorial test tools gfx
 SUBDIRS += deushax
 SUBDIRS += monsterz
 SUBDIRS += mrpigeon

win32/lolengine.sln → build/vs2010/Lol.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\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\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", "..\deushax\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
@@ -20,45 +20,45 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Deus Hax", "Deus Hax", "{08
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Monsterz", "Monsterz", "{2F87CEAB-4818-443C-A5E3-6C34E7D967EC}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lolcore", "lolcore.vcxproj", "{9E62F2FE-3408-4EAE-8238-FD84238CEEDA}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lolcore", "..\..\src\lolcore.vcxproj", "{9E62F2FE-3408-4EAE-8238-FD84238CEEDA}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Test", "Test", "{E0491194-35E3-4513-9D31-608EA3165ECF}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "quad", "quad.vcxproj", "{53D9D96F-55C0-4044-BDB1-4A5E8EDBDF0E}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "quad", "..\..\test\debug\quad.vcxproj", "{53D9D96F-55C0-4044-BDB1-4A5E8EDBDF0E}"
 	ProjectSection(ProjectDependencies) = postProject
 		{9E62F2FE-3408-4EAE-8238-FD84238CEEDA} = {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "benchsuite", "benchsuite.vcxproj", "{B1E10086-A1DA-401A-834D-969C9DBB5CC1}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "benchsuite", "..\..\test\benchsuite.vcxproj", "{B1E10086-A1DA-401A-834D-969C9DBB5CC1}"
 	ProjectSection(ProjectDependencies) = postProject
 		{9E62F2FE-3408-4EAE-8238-FD84238CEEDA} = {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testsuite", "testsuite.vcxproj", "{80F81C11-8DA2-4990-91CB-9807783BA46E}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testsuite", "..\..\test\testsuite.vcxproj", "{80F81C11-8DA2-4990-91CB-9807783BA46E}"
 	ProjectSection(ProjectDependencies) = postProject
 		{9E62F2FE-3408-4EAE-8238-FD84238CEEDA} = {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tutorial", "Tutorial", "{E74CF679-CA2A-47E9-B1F4-3779D6AC6B04}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "01_triangle", "01_triangle.vcxproj", "{B92ABADC-45BE-4CC5-B724-9426053123A1}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "01_triangle", "..\..\tutorial\01_triangle.vcxproj", "{B92ABADC-45BE-4CC5-B724-9426053123A1}"
 	ProjectSection(ProjectDependencies) = postProject
 		{9E62F2FE-3408-4EAE-8238-FD84238CEEDA} = {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "02_cube", "02_cube.vcxproj", "{7B083DA2-FE08-4F6D-BFDD-195D5C2783EB}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "02_cube", "..\..\tutorial\02_cube.vcxproj", "{7B083DA2-FE08-4F6D-BFDD-195D5C2783EB}"
 	ProjectSection(ProjectDependencies) = postProject
 		{9E62F2FE-3408-4EAE-8238-FD84238CEEDA} = {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "03_fractal", "03_fractal.vcxproj", "{6BF81B39-EDC2-4227-9992-C2D8ABEA95AF}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "11_fractal", "..\..\tutorial\11_fractal.vcxproj", "{6BF81B39-EDC2-4227-9992-C2D8ABEA95AF}"
 	ProjectSection(ProjectDependencies) = postProject
 		{9E62F2FE-3408-4EAE-8238-FD84238CEEDA} = {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MrPigeon", "MrPigeon", "{33704AA4-F2B5-4138-A40D-E3E77F89ED46}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrpigeon", "..\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\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\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

configure.ac

@@ -377,10 +377,10 @@ AC_SUBST(LOL_LIBS)
 AC_CONFIG_FILES(
  [Makefile
   src/Makefile
+  tutorial/Makefile
   test/Makefile
   test/math/Makefile
   test/sandbox/Makefile
-  test/tutorial/Makefile
   test/xolotl/Makefile
   gfx/Makefile
   gfx/font/Makefile

src/lolcore.vcxproj

@@ -0,0 +1,219 @@
+<?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>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{9E62F2FE-3408-4EAE-8238-FD84238CEEDA}</ProjectGuid>
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(SolutionDir)\Lol.Core.Config.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'" Label="Configuration">
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'" Label="Configuration">
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <ImportGroup Label="ExtensionSettings">
+    <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="$(SolutionDir)\Lol.Core.Vars.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <Import Project="$(SolutionDir)\Lol.Core.Rules.props" />
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="application\application.cpp" />
+    <ClCompile Include="audio.cpp" />
+    <ClCompile Include="camera.cpp" />
+    <ClCompile Include="debug\fps.cpp" />
+    <ClCompile Include="debug\quad.cpp" />
+    <ClCompile Include="debug\record.cpp" />
+    <ClCompile Include="debug\sphere.cpp" />
+    <ClCompile Include="debug\stats.cpp" />
+    <ClCompile Include="dict.cpp" />
+    <ClCompile Include="easymesh\easymesh-compiler.cpp" />
+    <ClCompile Include="easymesh\easymesh.cpp" />
+    <ClCompile Include="eglapp.cpp" />
+    <ClCompile Include="emitter.cpp" />
+    <ClCompile Include="entity.cpp" />
+    <ClCompile Include="font.cpp" />
+    <ClCompile Include="forge.cpp" />
+    <ClCompile Include="generated\easymesh-parser.cpp" />
+    <ClCompile Include="generated\easymesh-scanner.cpp" />
+    <ClCompile Include="gpu\framebuffer.cpp" />
+    <ClCompile Include="gpu\indexbuffer.cpp" />
+    <ClCompile Include="gpu\shader.cpp" />
+    <ClCompile Include="gpu\vertexbuffer.cpp" />
+    <ClCompile Include="gradient.cpp" />
+    <ClCompile Include="hash.cpp" />
+    <ClCompile Include="image\codec\android-image.cpp" />
+    <ClCompile Include="image\codec\dummy-image.cpp" />
+    <ClCompile Include="image\codec\gdiplus-image.cpp" />
+    <ClCompile Include="image\codec\ios-image.cpp" />
+    <ClCompile Include="image\codec\ps3-image.cpp" />
+    <ClCompile Include="image\codec\sdl-image.cpp" />
+    <ClCompile Include="image\image.cpp" />
+    <ClCompile Include="input\input.cpp" />
+    <ClCompile Include="input\stick.cpp" />
+    <ClCompile Include="layer.cpp" />
+    <ClCompile Include="log.cpp" />
+    <ClCompile Include="map.cpp" />
+    <ClCompile Include="math\half.cpp" />
+    <ClCompile Include="math\real.cpp" />
+    <ClCompile Include="math\trig.cpp" />
+    <ClCompile Include="math\vector.cpp" />
+    <ClCompile Include="platform.cpp" />
+    <ClCompile Include="platform\d3d9\d3d9input.cpp" />
+    <ClCompile Include="platform\sdl\sdlapp.cpp" />
+    <ClCompile Include="platform\sdl\sdlinput.cpp" />
+    <ClCompile Include="platform\xbox\xboxapp.cpp" />
+    <ClCompile Include="platform\xbox\xboxinput.cpp" />
+    <ClCompile Include="profiler.cpp" />
+    <ClCompile Include="sample.cpp" />
+    <ClCompile Include="sampler.cpp" />
+    <ClCompile Include="scene.cpp" />
+    <ClCompile Include="sprite.cpp" />
+    <ClCompile Include="text.cpp" />
+    <ClCompile Include="ticker.cpp" />
+    <ClCompile Include="tiler.cpp" />
+    <ClCompile Include="tileset.cpp" />
+    <ClCompile Include="timer.cpp" />
+    <ClCompile Include="video.cpp" />
+    <ClCompile Include="world.cpp" />
+    <ClCompile Include="worldentity.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="application\application.h" />
+    <ClInclude Include="array.h" />
+    <ClInclude Include="audio.h" />
+    <ClInclude Include="bitfield.h" />
+    <ClInclude Include="camera.h" />
+    <ClInclude Include="core.h" />
+    <ClInclude Include="debug\fps.h" />
+    <ClInclude Include="debug\quad.h" />
+    <ClInclude Include="debug\record.h" />
+    <ClInclude Include="debug\sphere.h" />
+    <ClInclude Include="debug\stats.h" />
+    <ClInclude Include="dict.h" />
+    <ClInclude Include="easymesh\easymesh-compiler.h" />
+    <ClInclude Include="easymesh\easymesh.h" />
+    <ClInclude Include="eglapp.h" />
+    <ClInclude Include="emitter.h" />
+    <ClInclude Include="entity.h" />
+    <ClInclude Include="font.h" />
+    <ClInclude Include="forge.h" />
+    <ClInclude Include="generated\easymesh-parser.h" />
+    <ClInclude Include="generated\location.hh" />
+    <ClInclude Include="generated\position.hh" />
+    <ClInclude Include="generated\stack.hh" />
+    <ClInclude Include="gpu\framebuffer.h" />
+    <ClInclude Include="gpu\indexbuffer.h" />
+    <ClInclude Include="gpu\shader.h" />
+    <ClInclude Include="gpu\vertexbuffer.h" />
+    <ClInclude Include="gradient.h" />
+    <ClInclude Include="hash.h" />
+    <ClInclude Include="image\image-private.h" />
+    <ClInclude Include="image\image.h" />
+    <ClInclude Include="input\input.h" />
+    <ClInclude Include="input\stick.h" />
+    <ClInclude Include="layer.h" />
+    <ClInclude Include="log.h" />
+    <ClInclude Include="loldebug.h" />
+    <ClInclude Include="lolgl.h" />
+    <ClInclude Include="lol\debug.h" />
+    <ClInclude Include="lol\math\half.h" />
+    <ClInclude Include="lol\math\math.h" />
+    <ClInclude Include="lol\math\real.h" />
+    <ClInclude Include="lol\math\remez.h" />
+    <ClInclude Include="lol\math\vector.h" />
+    <ClInclude Include="lol\unit.h" />
+    <ClInclude Include="map.h" />
+    <ClInclude Include="numeric.h" />
+    <ClInclude Include="platform.h" />
+    <ClInclude Include="platform\d3d9\d3d9input.h" />
+    <ClInclude Include="platform\sdl\sdlapp.h" />
+    <ClInclude Include="platform\sdl\sdlinput.h" />
+    <ClInclude Include="platform\xbox\xboxapp.h" />
+    <ClInclude Include="platform\xbox\xboxinput.h" />
+    <ClInclude Include="profiler.h" />
+    <ClInclude Include="sample.h" />
+    <ClInclude Include="sampler.h" />
+    <ClInclude Include="scene.h" />
+    <ClInclude Include="simd.h" />
+    <ClInclude Include="sprite.h" />
+    <ClInclude Include="text.h" />
+    <ClInclude Include="thread\thread.h" />
+    <ClInclude Include="thread\threadbase.h" />
+    <ClInclude Include="ticker.h" />
+    <ClInclude Include="tiler.h" />
+    <ClInclude Include="tileset.h" />
+    <ClInclude Include="timer.h" />
+    <ClInclude Include="video.h" />
+    <ClInclude Include="world.h" />
+    <ClInclude Include="worldentity.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <LolFxCompile Include="easymesh\shiny.lolfx" />
+    <LolFxCompile Include="gpu\defaultmaterial.lolfx" />
+    <LolFxCompile Include="gpu\emptymaterial.lolfx" />
+    <LolFxCompile Include="gpu\testmaterial.lolfx" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="easymesh\easymesh-parser.y" />
+    <None Include="easymesh\easymesh-scanner.l" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+    <Import Project="$(SolutionDir)\Lol.Fx.targets" />
+  </ImportGroup>
+</Project>

win32/lolcore.vcxproj.filters → src/lolcore.vcxproj.filters

@@ -58,409 +58,409 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\src\image\image.cpp">
+    <ClCompile Include="image\image.cpp">
       <Filter>src\image</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\debug\fps.cpp">
+    <ClCompile Include="debug\fps.cpp">
       <Filter>src\debug</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\debug\quad.cpp">
+    <ClCompile Include="debug\quad.cpp">
       <Filter>src\debug</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\debug\record.cpp">
+    <ClCompile Include="debug\record.cpp">
       <Filter>src\debug</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\debug\sphere.cpp">
+    <ClCompile Include="debug\sphere.cpp">
       <Filter>src\debug</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\debug\stats.cpp">
+    <ClCompile Include="debug\stats.cpp">
       <Filter>src\debug</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\platform\sdl\sdlapp.cpp">
+    <ClCompile Include="platform\sdl\sdlapp.cpp">
       <Filter>src\platform\sdl</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\platform\sdl\sdlinput.cpp">
+    <ClCompile Include="platform\sdl\sdlinput.cpp">
       <Filter>src\platform\sdl</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\math\half.cpp">
+    <ClCompile Include="math\half.cpp">
       <Filter>src\math</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\math\real.cpp">
+    <ClCompile Include="math\real.cpp">
       <Filter>src\math</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\math\trig.cpp">
+    <ClCompile Include="math\trig.cpp">
       <Filter>src\math</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\math\vector.cpp">
+    <ClCompile Include="math\vector.cpp">
       <Filter>src\math</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\gpu\shader.cpp">
+    <ClCompile Include="gpu\shader.cpp">
       <Filter>src\gpu</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\gpu\vertexbuffer.cpp">
+    <ClCompile Include="gpu\vertexbuffer.cpp">
       <Filter>src\gpu</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\application\application.cpp">
+    <ClCompile Include="application\application.cpp">
       <Filter>src\application</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\image\codec\android-image.cpp">
+    <ClCompile Include="image\codec\android-image.cpp">
       <Filter>src\image\codec</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\image\codec\dummy-image.cpp">
+    <ClCompile Include="image\codec\dummy-image.cpp">
       <Filter>src\image\codec</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\image\codec\gdiplus-image.cpp">
+    <ClCompile Include="image\codec\gdiplus-image.cpp">
       <Filter>src\image\codec</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\image\codec\ios-image.cpp">
+    <ClCompile Include="image\codec\ios-image.cpp">
       <Filter>src\image\codec</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\image\codec\ps3-image.cpp">
+    <ClCompile Include="image\codec\ps3-image.cpp">
       <Filter>src\image\codec</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\image\codec\sdl-image.cpp">
+    <ClCompile Include="image\codec\sdl-image.cpp">
       <Filter>src\image\codec</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\platform\xbox\xboxapp.cpp">
+    <ClCompile Include="platform\xbox\xboxapp.cpp">
       <Filter>src\platform\xbox</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\platform\xbox\xboxinput.cpp">
+    <ClCompile Include="platform\xbox\xboxinput.cpp">
       <Filter>src\platform\xbox</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\gpu\indexbuffer.cpp">
+    <ClCompile Include="gpu\indexbuffer.cpp">
       <Filter>src\gpu</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\input\input.cpp">
+    <ClCompile Include="input\input.cpp">
       <Filter>src\input</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\input\stick.cpp">
+    <ClCompile Include="input\stick.cpp">
       <Filter>src\input</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\platform\d3d9\d3d9input.cpp">
+    <ClCompile Include="platform\d3d9\d3d9input.cpp">
       <Filter>src\platform\d3d9</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\audio.cpp">
+    <ClCompile Include="audio.cpp">
       <Filter>src\...</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\camera.cpp">
+    <ClCompile Include="camera.cpp">
       <Filter>src\...</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\dict.cpp">
+    <ClCompile Include="dict.cpp">
       <Filter>src\...</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\eglapp.cpp">
+    <ClCompile Include="eglapp.cpp">
       <Filter>src\...</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\emitter.cpp">
+    <ClCompile Include="emitter.cpp">
       <Filter>src\...</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\entity.cpp">
+    <ClCompile Include="entity.cpp">
       <Filter>src\...</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\font.cpp">
+    <ClCompile Include="font.cpp">
       <Filter>src\...</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\forge.cpp">
+    <ClCompile Include="forge.cpp">
       <Filter>src\...</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\gradient.cpp">
+    <ClCompile Include="gradient.cpp">
       <Filter>src\...</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\hash.cpp">
+    <ClCompile Include="hash.cpp">
       <Filter>src\...</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\layer.cpp">
+    <ClCompile Include="layer.cpp">
       <Filter>src\...</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\ticker.cpp">
+    <ClCompile Include="ticker.cpp">
       <Filter>src\...</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\log.cpp">
+    <ClCompile Include="log.cpp">
       <Filter>src\...</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\map.cpp">
+    <ClCompile Include="map.cpp">
       <Filter>src\...</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\platform.cpp">
+    <ClCompile Include="platform.cpp">
       <Filter>src\...</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\profiler.cpp">
+    <ClCompile Include="profiler.cpp">
       <Filter>src\...</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\sample.cpp">
+    <ClCompile Include="sample.cpp">
       <Filter>src\...</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\sampler.cpp">
+    <ClCompile Include="sampler.cpp">
       <Filter>src\...</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\scene.cpp">
+    <ClCompile Include="scene.cpp">
       <Filter>src\...</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\sprite.cpp">
+    <ClCompile Include="sprite.cpp">
       <Filter>src\...</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\text.cpp">
+    <ClCompile Include="text.cpp">
       <Filter>src\...</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\tiler.cpp">
+    <ClCompile Include="tiler.cpp">
       <Filter>src\...</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\tileset.cpp">
+    <ClCompile Include="tileset.cpp">
       <Filter>src\...</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\timer.cpp">
+    <ClCompile Include="timer.cpp">
       <Filter>src\...</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\video.cpp">
+    <ClCompile Include="video.cpp">
       <Filter>src\...</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\world.cpp">
+    <ClCompile Include="world.cpp">
       <Filter>src\...</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\worldentity.cpp">
+    <ClCompile Include="worldentity.cpp">
       <Filter>src\...</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\gpu\framebuffer.cpp">
+    <ClCompile Include="gpu\framebuffer.cpp">
       <Filter>src\gpu</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\easymesh\easymesh.cpp">
+    <ClCompile Include="easymesh\easymesh.cpp">
       <Filter>src\easymesh</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\easymesh\easymesh-compiler.cpp">
+    <ClCompile Include="easymesh\easymesh-compiler.cpp">
       <Filter>src\easymesh</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\generated\easymesh-parser.cpp">
+    <ClCompile Include="generated\easymesh-parser.cpp">
       <Filter>src\generated</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\generated\easymesh-scanner.cpp">
+    <ClCompile Include="generated\easymesh-scanner.cpp">
       <Filter>src\generated</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\src\image\image.h">
+    <ClInclude Include="image\image.h">
       <Filter>src\image</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\debug\fps.h">
+    <ClInclude Include="debug\fps.h">
       <Filter>src\debug</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\debug\quad.h">
+    <ClInclude Include="debug\quad.h">
       <Filter>src\debug</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\debug\record.h">
+    <ClInclude Include="debug\record.h">
       <Filter>src\debug</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\debug\sphere.h">
+    <ClInclude Include="debug\sphere.h">
       <Filter>src\debug</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\debug\stats.h">
+    <ClInclude Include="debug\stats.h">
       <Filter>src\debug</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\platform\sdl\sdlinput.h">
+    <ClInclude Include="platform\sdl\sdlinput.h">
       <Filter>src\platform\sdl</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\platform\sdl\sdlapp.h">
+    <ClInclude Include="platform\sdl\sdlapp.h">
       <Filter>src\platform\sdl</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\lol\math\half.h">
+    <ClInclude Include="lol\math\half.h">
       <Filter>src\lol\math</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\lol\math\math.h">
+    <ClInclude Include="lol\math\math.h">
       <Filter>src\lol\math</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\lol\math\real.h">
+    <ClInclude Include="lol\math\real.h">
       <Filter>src\lol\math</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\lol\math\remez.h">
+    <ClInclude Include="lol\math\remez.h">
       <Filter>src\lol\math</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\lol\math\vector.h">
+    <ClInclude Include="lol\math\vector.h">
       <Filter>src\lol\math</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\lol\unit.h">
+    <ClInclude Include="lol\unit.h">
       <Filter>src\lol</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\gpu\shader.h">
+    <ClInclude Include="gpu\shader.h">
       <Filter>src\gpu</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\gpu\vertexbuffer.h">
+    <ClInclude Include="gpu\vertexbuffer.h">
       <Filter>src\gpu</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\thread\thread.h">
+    <ClInclude Include="thread\thread.h">
       <Filter>src\thread</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\thread\threadbase.h">
+    <ClInclude Include="thread\threadbase.h">
       <Filter>src\thread</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\application\application.h">
+    <ClInclude Include="application\application.h">
       <Filter>src\application</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\image\image-private.h">
+    <ClInclude Include="image\image-private.h">
       <Filter>src\image</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\platform\xbox\xboxapp.h">
+    <ClInclude Include="platform\xbox\xboxapp.h">
       <Filter>src\platform\xbox</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\platform\xbox\xboxinput.h">
+    <ClInclude Include="platform\xbox\xboxinput.h">
       <Filter>src\platform\xbox</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\gpu\indexbuffer.h">
+    <ClInclude Include="gpu\indexbuffer.h">
       <Filter>src\gpu</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\lol\debug.h">
+    <ClInclude Include="lol\debug.h">
       <Filter>src\lol</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\input\input.h">
+    <ClInclude Include="input\input.h">
       <Filter>src\input</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\input\stick.h">
+    <ClInclude Include="input\stick.h">
       <Filter>src\input</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\platform\d3d9\d3d9input.h">
+    <ClInclude Include="platform\d3d9\d3d9input.h">
       <Filter>src\platform\d3d9</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\array.h">
+    <ClInclude Include="array.h">
       <Filter>src\...</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\hash.h">
+    <ClInclude Include="hash.h">
       <Filter>src\...</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\audio.h">
+    <ClInclude Include="audio.h">
       <Filter>src\...</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\bitfield.h">
+    <ClInclude Include="bitfield.h">
       <Filter>src\...</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\camera.h">
+    <ClInclude Include="camera.h">
       <Filter>src\...</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\core.h">
+    <ClInclude Include="core.h">
       <Filter>src\...</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\dict.h">
+    <ClInclude Include="dict.h">
       <Filter>src\...</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\eglapp.h">
+    <ClInclude Include="eglapp.h">
       <Filter>src\...</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\emitter.h">
+    <ClInclude Include="emitter.h">
       <Filter>src\...</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\entity.h">
+    <ClInclude Include="entity.h">
       <Filter>src\...</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\font.h">
+    <ClInclude Include="font.h">
       <Filter>src\...</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\forge.h">
+    <ClInclude Include="forge.h">
       <Filter>src\...</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\gradient.h">
+    <ClInclude Include="gradient.h">
       <Filter>src\...</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\layer.h">
+    <ClInclude Include="layer.h">
       <Filter>src\...</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\log.h">
+    <ClInclude Include="log.h">
       <Filter>src\...</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\loldebug.h">
+    <ClInclude Include="loldebug.h">
       <Filter>src\...</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\lolgl.h">
+    <ClInclude Include="lolgl.h">
       <Filter>src\...</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\map.h">
+    <ClInclude Include="map.h">
       <Filter>src\...</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\numeric.h">
+    <ClInclude Include="numeric.h">
       <Filter>src\...</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\platform.h">
+    <ClInclude Include="platform.h">
       <Filter>src\...</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\profiler.h">
+    <ClInclude Include="profiler.h">
       <Filter>src\...</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\sample.h">
+    <ClInclude Include="sample.h">
       <Filter>src\...</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\sampler.h">
+    <ClInclude Include="sampler.h">
       <Filter>src\...</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\scene.h">
+    <ClInclude Include="scene.h">
       <Filter>src\...</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\simd.h">
+    <ClInclude Include="simd.h">
       <Filter>src\...</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\sprite.h">
+    <ClInclude Include="sprite.h">
       <Filter>src\...</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\text.h">
+    <ClInclude Include="text.h">
       <Filter>src\...</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\ticker.h">
+    <ClInclude Include="ticker.h">
       <Filter>src\...</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\worldentity.h">
+    <ClInclude Include="worldentity.h">
       <Filter>src\...</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\tiler.h">
+    <ClInclude Include="tiler.h">
       <Filter>src\...</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\tileset.h">
+    <ClInclude Include="tileset.h">
       <Filter>src\...</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\timer.h">
+    <ClInclude Include="timer.h">
       <Filter>src\...</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\video.h">
+    <ClInclude Include="video.h">
       <Filter>src\...</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\world.h">
+    <ClInclude Include="world.h">
       <Filter>src\...</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\gpu\framebuffer.h">
+    <ClInclude Include="gpu\framebuffer.h">
       <Filter>src\gpu</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\generated\position.hh">
+    <ClInclude Include="generated\position.hh">
       <Filter>src\generated</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\generated\location.hh">
+    <ClInclude Include="generated\location.hh">
       <Filter>src\generated</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\generated\stack.hh">
+    <ClInclude Include="generated\stack.hh">
       <Filter>src\generated</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\easymesh\easymesh.h">
+    <ClInclude Include="easymesh\easymesh.h">
       <Filter>src\easymesh</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\easymesh\easymesh-compiler.h">
+    <ClInclude Include="easymesh\easymesh-compiler.h">
       <Filter>src\easymesh</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\generated\easymesh-parser.h">
+    <ClInclude Include="generated\easymesh-parser.h">
       <Filter>src\generated</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <LolFxCompile Include="..\src\gpu\emptymaterial.lolfx">
+    <LolFxCompile Include="gpu\emptymaterial.lolfx">
       <Filter>src\gpu</Filter>
     </LolFxCompile>
-    <LolFxCompile Include="..\src\gpu\defaultmaterial.lolfx">
+    <LolFxCompile Include="gpu\defaultmaterial.lolfx">
       <Filter>src\gpu</Filter>
     </LolFxCompile>
-    <LolFxCompile Include="..\src\gpu\testmaterial.lolfx">
+    <LolFxCompile Include="gpu\testmaterial.lolfx">
       <Filter>src\gpu</Filter>
     </LolFxCompile>
-    <LolFxCompile Include="..\src\easymesh\shiny.lolfx">
+    <LolFxCompile Include="easymesh\shiny.lolfx">
       <Filter>src\easymesh</Filter>
     </LolFxCompile>
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\src\easymesh\easymesh-parser.y">
+    <None Include="easymesh\easymesh-parser.y">
       <Filter>src\easymesh</Filter>
     </None>
-    <None Include="..\src\easymesh\easymesh-scanner.l">
+    <None Include="easymesh\easymesh-scanner.l">
       <Filter>src\easymesh</Filter>
     </None>
   </ItemGroup>

test/Makefile.am

@@ -1,5 +1,5 @@
 
-SUBDIRS = math tutorial sandbox xolotl
+SUBDIRS = math sandbox xolotl
 
 AM_CPPFLAGS = -I$(top_srcdir)/src
 

win32/benchsuite.vcxproj → test/benchsuite.vcxproj

@@ -27,11 +27,11 @@
     </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\test\benchmark\half.cpp" />
-    <ClCompile Include="..\test\benchmark\real.cpp" />
-    <ClCompile Include="..\test\benchmark\trig.cpp" />
-    <ClCompile Include="..\test\benchmark\vector.cpp" />
-    <ClCompile Include="..\test\benchsuite.cpp" />
+    <ClCompile Include="benchmark\half.cpp" />
+    <ClCompile Include="benchmark\real.cpp" />
+    <ClCompile Include="benchmark\trig.cpp" />
+    <ClCompile Include="benchmark\vector.cpp" />
+    <ClCompile Include="benchsuite.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="$(SolutionDir)\lolcore.vcxproj">

win32/quad.vcxproj → test/debug/quad.vcxproj

@@ -27,7 +27,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\test\debug\quad.cpp" />
+    <ClCompile Include="quad.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="$(SolutionDir)\lolcore.vcxproj">

win32/testsuite.vcxproj → test/testsuite.vcxproj

@@ -27,18 +27,18 @@
     </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\test\testsuite.cpp" />
-    <ClCompile Include="..\test\unit\array.cpp" />
-    <ClCompile Include="..\test\unit\build.cpp" />
-    <ClCompile Include="..\test\unit\cmplx.cpp" />
-    <ClCompile Include="..\test\unit\half.cpp" />
-    <ClCompile Include="..\test\unit\image.cpp" />
-    <ClCompile Include="..\test\unit\matrix.cpp" />
-    <ClCompile Include="..\test\unit\quat.cpp" />
-    <ClCompile Include="..\test\unit\real.cpp" />
-    <ClCompile Include="..\test\unit\rotation.cpp" />
-    <ClCompile Include="..\test\unit\trig.cpp" />
-    <ClCompile Include="..\test\unit\vector.cpp" />
+    <ClCompile Include="testsuite.cpp" />
+    <ClCompile Include="unit\array.cpp" />
+    <ClCompile Include="unit\build.cpp" />
+    <ClCompile Include="unit\cmplx.cpp" />
+    <ClCompile Include="unit\half.cpp" />
+    <ClCompile Include="unit\image.cpp" />
+    <ClCompile Include="unit\matrix.cpp" />
+    <ClCompile Include="unit\quat.cpp" />
+    <ClCompile Include="unit\real.cpp" />
+    <ClCompile Include="unit\rotation.cpp" />
+    <ClCompile Include="unit\trig.cpp" />
+    <ClCompile Include="unit\vector.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="$(SolutionDir)\lolcore.vcxproj">

win32/01_triangle.vcxproj → tutorial/01_triangle.vcxproj

@@ -27,10 +27,10 @@
     </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\test\tutorial\01_triangle.cpp" />
+    <ClCompile Include="01_triangle.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <LolFxCompile Include="..\test\tutorial\01_triangle.lolfx" />
+    <LolFxCompile Include="01_triangle.lolfx" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="$(SolutionDir)\lolcore.vcxproj">

win32/02_cube.vcxproj → tutorial/02_cube.vcxproj

@@ -27,10 +27,10 @@
     </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\test\tutorial\02_cube.cpp" />
+    <ClCompile Include="02_cube.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <LolFxCompile Include="..\test\tutorial\02_cube.lolfx" />
+    <LolFxCompile Include="02_cube.lolfx" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="$(SolutionDir)\lolcore.vcxproj">

test/tutorial/03_fractal.cpp → tutorial/11_fractal.cpp

@@ -35,7 +35,7 @@ using namespace lol;
 #   include <direct.h>
 #endif
 
-extern char const *lolfx_03_fractal;
+extern char const *lolfx_11_fractal;
 
 #if defined USE_D3D9
 extern IDirect3DDevice9 *g_d3ddevice;
@@ -478,7 +478,7 @@ public:
                                        D3DPOOL_SYSTEMMEM, &m_tex, NULL);
 #endif
 
-            m_shader = Shader::Create(lolfx_03_fractal);
+            m_shader = Shader::Create(lolfx_11_fractal);
 
             m_vertexattrib = m_shader->GetAttribLocation("a_Vertex", VertexUsage::Position, 0);
             m_texattrib = m_shader->GetAttribLocation("a_TexCoord", VertexUsage::TexCoord, 0);

win32/03_fractal.vcxproj → tutorial/11_fractal.vcxproj

@@ -27,10 +27,10 @@
     </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\test\tutorial\03_fractal.cpp" />
+    <ClCompile Include="11_fractal.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <LolFxCompile Include="..\test\tutorial\03_fractal.lolfx" />
+    <LolFxCompile Include="11_fractal.lolfx" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="$(SolutionDir)\lolcore.vcxproj">

test/tutorial/Makefile.am → tutorial/Makefile.am

@@ -18,7 +18,7 @@ SUFFIXES = .lolfx
 	 $(SED) 's/\([^\r]*\).*/"\1\\n"/'; \
 	 echo ";") | $(CXXCOMPILE) -xc++ -c - -o $@
 
-noinst_PROGRAMS = 01_triangle 02_cube 03_fractal
+noinst_PROGRAMS = 01_triangle 02_cube 11_fractal
 
 01_triangle_SOURCES = 01_triangle.cpp 01_triangle.lolfx
 01_triangle_CPPFLAGS = @LOL_CFLAGS@ @PIPI_CFLAGS@
@@ -30,8 +30,8 @@ noinst_PROGRAMS = 01_triangle 02_cube 03_fractal
 02_cube_LDFLAGS = $(top_builddir)/src/liblol.a @LOL_LIBS@ @PIPI_LIBS@
 02_cube_DEPENDENCIES = $(top_builddir)/src/liblol.a
 
-03_fractal_SOURCES = 03_fractal.cpp 03_fractal.lolfx
-03_fractal_CPPFLAGS = @LOL_CFLAGS@ @PIPI_CFLAGS@
-03_fractal_LDFLAGS = $(top_builddir)/src/liblol.a @LOL_LIBS@ @PIPI_LIBS@
-03_fractal_DEPENDENCIES = $(top_builddir)/src/liblol.a
+11_fractal_SOURCES = 11_fractal.cpp 11_fractal.lolfx
+11_fractal_CPPFLAGS = @LOL_CFLAGS@ @PIPI_CFLAGS@
+11_fractal_LDFLAGS = $(top_builddir)/src/liblol.a @LOL_LIBS@ @PIPI_LIBS@
+11_fractal_DEPENDENCIES = $(top_builddir)/src/liblol.a
 

win32/lolcore.vcxproj

@@ -1,219 +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>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{9E62F2FE-3408-4EAE-8238-FD84238CEEDA}</ProjectGuid>
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(SolutionDir)\Lol.Core.Config.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'" Label="Configuration">
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'" Label="Configuration">
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <ImportGroup Label="ExtensionSettings">
-    <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="$(SolutionDir)\Lol.Core.Vars.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <Import Project="$(SolutionDir)\Lol.Core.Rules.props" />
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\src\application\application.cpp" />
-    <ClCompile Include="..\src\audio.cpp" />
-    <ClCompile Include="..\src\camera.cpp" />
-    <ClCompile Include="..\src\debug\fps.cpp" />
-    <ClCompile Include="..\src\debug\quad.cpp" />
-    <ClCompile Include="..\src\debug\record.cpp" />
-    <ClCompile Include="..\src\debug\sphere.cpp" />
-    <ClCompile Include="..\src\debug\stats.cpp" />
-    <ClCompile Include="..\src\dict.cpp" />
-    <ClCompile Include="..\src\easymesh\easymesh-compiler.cpp" />
-    <ClCompile Include="..\src\easymesh\easymesh.cpp" />
-    <ClCompile Include="..\src\eglapp.cpp" />
-    <ClCompile Include="..\src\emitter.cpp" />
-    <ClCompile Include="..\src\entity.cpp" />
-    <ClCompile Include="..\src\font.cpp" />
-    <ClCompile Include="..\src\forge.cpp" />
-    <ClCompile Include="..\src\generated\easymesh-parser.cpp" />
-    <ClCompile Include="..\src\generated\easymesh-scanner.cpp" />
-    <ClCompile Include="..\src\gpu\framebuffer.cpp" />
-    <ClCompile Include="..\src\gpu\indexbuffer.cpp" />
-    <ClCompile Include="..\src\gpu\shader.cpp" />
-    <ClCompile Include="..\src\gpu\vertexbuffer.cpp" />
-    <ClCompile Include="..\src\gradient.cpp" />
-    <ClCompile Include="..\src\hash.cpp" />
-    <ClCompile Include="..\src\image\codec\android-image.cpp" />
-    <ClCompile Include="..\src\image\codec\dummy-image.cpp" />
-    <ClCompile Include="..\src\image\codec\gdiplus-image.cpp" />
-    <ClCompile Include="..\src\image\codec\ios-image.cpp" />
-    <ClCompile Include="..\src\image\codec\ps3-image.cpp" />
-    <ClCompile Include="..\src\image\codec\sdl-image.cpp" />
-    <ClCompile Include="..\src\image\image.cpp" />
-    <ClCompile Include="..\src\input\input.cpp" />
-    <ClCompile Include="..\src\input\stick.cpp" />
-    <ClCompile Include="..\src\layer.cpp" />
-    <ClCompile Include="..\src\log.cpp" />
-    <ClCompile Include="..\src\map.cpp" />
-    <ClCompile Include="..\src\math\half.cpp" />
-    <ClCompile Include="..\src\math\real.cpp" />
-    <ClCompile Include="..\src\math\trig.cpp" />
-    <ClCompile Include="..\src\math\vector.cpp" />
-    <ClCompile Include="..\src\platform.cpp" />
-    <ClCompile Include="..\src\platform\d3d9\d3d9input.cpp" />
-    <ClCompile Include="..\src\platform\sdl\sdlapp.cpp" />
-    <ClCompile Include="..\src\platform\sdl\sdlinput.cpp" />
-    <ClCompile Include="..\src\platform\xbox\xboxapp.cpp" />
-    <ClCompile Include="..\src\platform\xbox\xboxinput.cpp" />
-    <ClCompile Include="..\src\profiler.cpp" />
-    <ClCompile Include="..\src\sample.cpp" />
-    <ClCompile Include="..\src\sampler.cpp" />
-    <ClCompile Include="..\src\scene.cpp" />
-    <ClCompile Include="..\src\sprite.cpp" />
-    <ClCompile Include="..\src\text.cpp" />
-    <ClCompile Include="..\src\ticker.cpp" />
-    <ClCompile Include="..\src\tiler.cpp" />
-    <ClCompile Include="..\src\tileset.cpp" />
-    <ClCompile Include="..\src\timer.cpp" />
-    <ClCompile Include="..\src\video.cpp" />
-    <ClCompile Include="..\src\world.cpp" />
-    <ClCompile Include="..\src\worldentity.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\src\application\application.h" />
-    <ClInclude Include="..\src\array.h" />
-    <ClInclude Include="..\src\audio.h" />
-    <ClInclude Include="..\src\bitfield.h" />
-    <ClInclude Include="..\src\camera.h" />
-    <ClInclude Include="..\src\core.h" />
-    <ClInclude Include="..\src\debug\fps.h" />
-    <ClInclude Include="..\src\debug\quad.h" />
-    <ClInclude Include="..\src\debug\record.h" />
-    <ClInclude Include="..\src\debug\sphere.h" />
-    <ClInclude Include="..\src\debug\stats.h" />
-    <ClInclude Include="..\src\dict.h" />
-    <ClInclude Include="..\src\easymesh\easymesh-compiler.h" />
-    <ClInclude Include="..\src\easymesh\easymesh.h" />
-    <ClInclude Include="..\src\eglapp.h" />
-    <ClInclude Include="..\src\emitter.h" />
-    <ClInclude Include="..\src\entity.h" />
-    <ClInclude Include="..\src\font.h" />
-    <ClInclude Include="..\src\forge.h" />
-    <ClInclude Include="..\src\generated\easymesh-parser.h" />
-    <ClInclude Include="..\src\generated\location.hh" />
-    <ClInclude Include="..\src\generated\position.hh" />
-    <ClInclude Include="..\src\generated\stack.hh" />
-    <ClInclude Include="..\src\gpu\framebuffer.h" />
-    <ClInclude Include="..\src\gpu\indexbuffer.h" />
-    <ClInclude Include="..\src\gpu\shader.h" />
-    <ClInclude Include="..\src\gpu\vertexbuffer.h" />
-    <ClInclude Include="..\src\gradient.h" />
-    <ClInclude Include="..\src\hash.h" />
-    <ClInclude Include="..\src\image\image-private.h" />
-    <ClInclude Include="..\src\image\image.h" />
-    <ClInclude Include="..\src\input\input.h" />
-    <ClInclude Include="..\src\input\stick.h" />
-    <ClInclude Include="..\src\layer.h" />
-    <ClInclude Include="..\src\log.h" />
-    <ClInclude Include="..\src\loldebug.h" />
-    <ClInclude Include="..\src\lolgl.h" />
-    <ClInclude Include="..\src\lol\debug.h" />
-    <ClInclude Include="..\src\lol\math\half.h" />
-    <ClInclude Include="..\src\lol\math\math.h" />
-    <ClInclude Include="..\src\lol\math\real.h" />
-    <ClInclude Include="..\src\lol\math\remez.h" />
-    <ClInclude Include="..\src\lol\math\vector.h" />
-    <ClInclude Include="..\src\lol\unit.h" />
-    <ClInclude Include="..\src\map.h" />
-    <ClInclude Include="..\src\numeric.h" />
-    <ClInclude Include="..\src\platform.h" />
-    <ClInclude Include="..\src\platform\d3d9\d3d9input.h" />
-    <ClInclude Include="..\src\platform\sdl\sdlapp.h" />
-    <ClInclude Include="..\src\platform\sdl\sdlinput.h" />
-    <ClInclude Include="..\src\platform\xbox\xboxapp.h" />
-    <ClInclude Include="..\src\platform\xbox\xboxinput.h" />
-    <ClInclude Include="..\src\profiler.h" />
-    <ClInclude Include="..\src\sample.h" />
-    <ClInclude Include="..\src\sampler.h" />
-    <ClInclude Include="..\src\scene.h" />
-    <ClInclude Include="..\src\simd.h" />
-    <ClInclude Include="..\src\sprite.h" />
-    <ClInclude Include="..\src\text.h" />
-    <ClInclude Include="..\src\thread\thread.h" />
-    <ClInclude Include="..\src\thread\threadbase.h" />
-    <ClInclude Include="..\src\ticker.h" />
-    <ClInclude Include="..\src\tiler.h" />
-    <ClInclude Include="..\src\tileset.h" />
-    <ClInclude Include="..\src\timer.h" />
-    <ClInclude Include="..\src\video.h" />
-    <ClInclude Include="..\src\world.h" />
-    <ClInclude Include="..\src\worldentity.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <LolFxCompile Include="..\src\easymesh\shiny.lolfx" />
-    <LolFxCompile Include="..\src\gpu\defaultmaterial.lolfx" />
-    <LolFxCompile Include="..\src\gpu\emptymaterial.lolfx" />
-    <LolFxCompile Include="..\src\gpu\testmaterial.lolfx" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\src\easymesh\easymesh-parser.y" />
-    <None Include="..\src\easymesh\easymesh-scanner.l" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-    <Import Project="$(SolutionDir)\Lol.Fx.targets" />
-  </ImportGroup>
-</Project>