diff --git a/.gitignore b/.gitignore
index 98b150e2..de98e839 100644
--- a/.gitignore
+++ b/.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
diff --git a/Makefile.am b/Makefile.am
index f5cf8bbd..a6af9796 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
-SUBDIRS = src test tools gfx
+SUBDIRS = src tutorial test tools gfx
SUBDIRS += deushax
SUBDIRS += monsterz
SUBDIRS += mrpigeon
diff --git a/build-linux b/build/build-linux
similarity index 100%
rename from build-linux
rename to build/build-linux
diff --git a/build-mingw b/build/build-mingw
similarity index 100%
rename from build-mingw
rename to build/build-mingw
diff --git a/build-mingw64 b/build/build-mingw64
similarity index 100%
rename from build-mingw64
rename to build/build-mingw64
diff --git a/build-nacl32 b/build/build-nacl32
similarity index 100%
rename from build-nacl32
rename to build/build-nacl32
diff --git a/build-nacl64 b/build/build-nacl64
similarity index 100%
rename from build-nacl64
rename to build/build-nacl64
diff --git a/build-ps3 b/build/build-ps3
similarity index 100%
rename from build-ps3
rename to build/build-ps3
diff --git a/win32/Lol.Core.Build.props b/build/vs2010/Lol.Core.Build.props
similarity index 100%
rename from win32/Lol.Core.Build.props
rename to build/vs2010/Lol.Core.Build.props
diff --git a/win32/Lol.Core.Config.props b/build/vs2010/Lol.Core.Config.props
similarity index 100%
rename from win32/Lol.Core.Config.props
rename to build/vs2010/Lol.Core.Config.props
diff --git a/win32/Lol.Core.Rules.props b/build/vs2010/Lol.Core.Rules.props
similarity index 100%
rename from win32/Lol.Core.Rules.props
rename to build/vs2010/Lol.Core.Rules.props
diff --git a/win32/Lol.Core.Vars.props b/build/vs2010/Lol.Core.Vars.props
similarity index 100%
rename from win32/Lol.Core.Vars.props
rename to build/vs2010/Lol.Core.Vars.props
diff --git a/win32/Lol.Fx.props b/build/vs2010/Lol.Fx.props
similarity index 100%
rename from win32/Lol.Fx.props
rename to build/vs2010/Lol.Fx.props
diff --git a/win32/Lol.Fx.targets b/build/vs2010/Lol.Fx.targets
similarity index 100%
rename from win32/Lol.Fx.targets
rename to build/vs2010/Lol.Fx.targets
diff --git a/win32/Lol.Fx.xml b/build/vs2010/Lol.Fx.xml
similarity index 100%
rename from win32/Lol.Fx.xml
rename to build/vs2010/Lol.Fx.xml
diff --git a/win32/lolengine.sln b/build/vs2010/Lol.sln
similarity index 94%
rename from win32/lolengine.sln
rename to build/vs2010/Lol.sln
index 32a54373..052e7173 100644
--- a/win32/lolengine.sln
+++ b/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
diff --git a/configure.ac b/configure.ac
index d99d5c7a..0dadcb27 100644
--- a/configure.ac
+++ b/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
diff --git a/src/lolcore.vcxproj b/src/lolcore.vcxproj
new file mode 100644
index 00000000..df298a2e
--- /dev/null
+++ b/src/lolcore.vcxproj
@@ -0,0 +1,219 @@
+
+
+
+
+ Debug
+ Win32
+
+
+ Debug
+ x64
+
+
+ Debug
+ Xbox 360
+
+
+ Release
+ Win32
+
+
+ Release
+ x64
+
+
+ Release
+ Xbox 360
+
+
+
+ {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}
+ StaticLibrary
+ Win32Proj
+
+
+
+ true
+ MultiByte
+
+
+ true
+ MultiByte
+
+
+ MultiByte
+
+
+ false
+ true
+ MultiByte
+
+
+ false
+ true
+ MultiByte
+
+
+ true
+ MultiByte
+
+
+
+
+
+
+
+
+
+
+
+
+ _LIB;%(PreprocessorDefinitions)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/win32/lolcore.vcxproj.filters b/src/lolcore.vcxproj.filters
similarity index 59%
rename from win32/lolcore.vcxproj.filters
rename to src/lolcore.vcxproj.filters
index 64fe3829..f0b22f83 100644
--- a/win32/lolcore.vcxproj.filters
+++ b/src/lolcore.vcxproj.filters
@@ -58,409 +58,409 @@
-
+
src\image
-
+
src\debug
-
+
src\debug
-
+
src\debug
-
+
src\debug
-
+
src\debug
-
+
src\platform\sdl
-
+
src\platform\sdl
-
+
src\math
-
+
src\math
-
+
src\math
-
+
src\math
-
+
src\gpu
-
+
src\gpu
-
+
src\application
-
+
src\image\codec
-
+
src\image\codec
-
+
src\image\codec
-
+
src\image\codec
-
+
src\image\codec
-
+
src\image\codec
-
+
src\platform\xbox
-
+
src\platform\xbox
-
+
src\gpu
-
+
src\input
-
+
src\input
-
+
src\platform\d3d9
-
+
src\...
-
+
src\...
-
+
src\...
-
+
src\...
-
+
src\...
-
+
src\...
-
+
src\...
-
+
src\...
-
+
src\...
-
+
src\...
-
+
src\...
-
+
src\...
-
+
src\...
-
+
src\...
-
+
src\...
-
+
src\...
-
+
src\...
-
+
src\...
-
+
src\...
-
+
src\...
-
+
src\...
-
+
src\...
-
+
src\...
-
+
src\...
-
+
src\...
-
+
src\...
-
+
src\...
-
+
src\gpu
-
+
src\easymesh
-
+
src\easymesh
-
+
src\generated
-
+
src\generated
-
+
src\image
-
+
src\debug
-
+
src\debug
-
+
src\debug
-
+
src\debug
-
+
src\debug
-
+
src\platform\sdl
-
+
src\platform\sdl
-
+
src\lol\math
-
+
src\lol\math
-
+
src\lol\math
-
+
src\lol\math
-
+
src\lol\math
-
+
src\lol
-
+
src\gpu
-
+
src\gpu
-
+
src\thread
-
+
src\thread
-
+
src\application
-
+
src\image
-
+
src\platform\xbox
-
+
src\platform\xbox
-
+
src\gpu
-
+
src\lol
-
+
src\input
-
+
src\input
-
+
src\platform\d3d9
-
+
src\...
-
+
src\...
-
+
src\...
-
+
src\...
-
+
src\...
-
+
src\...
-
+
src\...
-
+
src\...
-
+
src\...
-
+
src\...
-
+
src\...
-
+
src\...
-
+
src\...
-
+
src\...
-
+
src\...
-
+
src\...
-
+
src\...
-
+
src\...
-
+
src\...
-
+
src\...
-
+
src\...
-
+
src\...
-
+
src\...
-
+
src\...
-
+
src\...
-
+
src\...
-
+
src\...
-
+
src\...
-
+
src\...
-
+
src\...
-
+
src\...
-
+
src\...
-
+
src\...
-
+
src\...
-
+
src\gpu
-
+
src\generated
-
+
src\generated
-
+
src\generated
-
+
src\easymesh
-
+
src\easymesh
-
+
src\generated
-
+
src\gpu
-
+
src\gpu
-
+
src\gpu
-
+
src\easymesh
-
+
src\easymesh
-
+
src\easymesh
diff --git a/test/Makefile.am b/test/Makefile.am
index e738c6f3..b9707622 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,5 +1,5 @@
-SUBDIRS = math tutorial sandbox xolotl
+SUBDIRS = math sandbox xolotl
AM_CPPFLAGS = -I$(top_srcdir)/src
diff --git a/win32/benchsuite.vcxproj b/test/benchsuite.vcxproj
similarity index 89%
rename from win32/benchsuite.vcxproj
rename to test/benchsuite.vcxproj
index adc3e7e0..fe3e5498 100644
--- a/win32/benchsuite.vcxproj
+++ b/test/benchsuite.vcxproj
@@ -27,11 +27,11 @@
-
-
-
-
-
+
+
+
+
+
diff --git a/win32/quad.vcxproj b/test/debug/quad.vcxproj
similarity index 97%
rename from win32/quad.vcxproj
rename to test/debug/quad.vcxproj
index 69c08d82..78f64bb9 100644
--- a/win32/quad.vcxproj
+++ b/test/debug/quad.vcxproj
@@ -27,7 +27,7 @@
-
+
diff --git a/win32/testsuite.vcxproj b/test/testsuite.vcxproj
similarity index 79%
rename from win32/testsuite.vcxproj
rename to test/testsuite.vcxproj
index 15ad9e69..5a69eb8f 100644
--- a/win32/testsuite.vcxproj
+++ b/test/testsuite.vcxproj
@@ -27,18 +27,18 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/test/tutorial/01_triangle.cpp b/tutorial/01_triangle.cpp
similarity index 100%
rename from test/tutorial/01_triangle.cpp
rename to tutorial/01_triangle.cpp
diff --git a/test/tutorial/01_triangle.lolfx b/tutorial/01_triangle.lolfx
similarity index 100%
rename from test/tutorial/01_triangle.lolfx
rename to tutorial/01_triangle.lolfx
diff --git a/win32/01_triangle.vcxproj b/tutorial/01_triangle.vcxproj
similarity index 94%
rename from win32/01_triangle.vcxproj
rename to tutorial/01_triangle.vcxproj
index f8a99b97..7a94016a 100644
--- a/win32/01_triangle.vcxproj
+++ b/tutorial/01_triangle.vcxproj
@@ -27,10 +27,10 @@
-
+
-
+
diff --git a/test/tutorial/02_cube.cpp b/tutorial/02_cube.cpp
similarity index 100%
rename from test/tutorial/02_cube.cpp
rename to tutorial/02_cube.cpp
diff --git a/test/tutorial/02_cube.lolfx b/tutorial/02_cube.lolfx
similarity index 100%
rename from test/tutorial/02_cube.lolfx
rename to tutorial/02_cube.lolfx
diff --git a/win32/02_cube.vcxproj b/tutorial/02_cube.vcxproj
similarity index 95%
rename from win32/02_cube.vcxproj
rename to tutorial/02_cube.vcxproj
index 9a9385c3..5df1c819 100644
--- a/win32/02_cube.vcxproj
+++ b/tutorial/02_cube.vcxproj
@@ -27,10 +27,10 @@
-
+
-
+
diff --git a/test/tutorial/03_fractal.cpp b/tutorial/11_fractal.cpp
similarity index 99%
rename from test/tutorial/03_fractal.cpp
rename to tutorial/11_fractal.cpp
index 1b90fb71..4fb80a90 100644
--- a/test/tutorial/03_fractal.cpp
+++ b/tutorial/11_fractal.cpp
@@ -35,7 +35,7 @@ using namespace lol;
# include
#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);
diff --git a/test/tutorial/03_fractal.lolfx b/tutorial/11_fractal.lolfx
similarity index 100%
rename from test/tutorial/03_fractal.lolfx
rename to tutorial/11_fractal.lolfx
diff --git a/win32/03_fractal.vcxproj b/tutorial/11_fractal.vcxproj
similarity index 95%
rename from win32/03_fractal.vcxproj
rename to tutorial/11_fractal.vcxproj
index 77ffa521..e96187ba 100644
--- a/win32/03_fractal.vcxproj
+++ b/tutorial/11_fractal.vcxproj
@@ -27,10 +27,10 @@
-
+
-
+
diff --git a/test/tutorial/Makefile.am b/tutorial/Makefile.am
similarity index 79%
rename from test/tutorial/Makefile.am
rename to tutorial/Makefile.am
index fac57274..1673ef21 100644
--- a/test/tutorial/Makefile.am
+++ b/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
diff --git a/win32/lolcore.vcxproj b/win32/lolcore.vcxproj
deleted file mode 100644
index a2f37400..00000000
--- a/win32/lolcore.vcxproj
+++ /dev/null
@@ -1,219 +0,0 @@
-
-
-
-
- Debug
- Win32
-
-
- Debug
- x64
-
-
- Debug
- Xbox 360
-
-
- Release
- Win32
-
-
- Release
- x64
-
-
- Release
- Xbox 360
-
-
-
- {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}
- StaticLibrary
- Win32Proj
-
-
-
- true
- MultiByte
-
-
- true
- MultiByte
-
-
- MultiByte
-
-
- false
- true
- MultiByte
-
-
- false
- true
- MultiByte
-
-
- true
- MultiByte
-
-
-
-
-
-
-
-
-
-
-
-
- _LIB;%(PreprocessorDefinitions)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-