win32: add a custom build rule for '.lolfx' files. The files are properly

transformed to C++ but aren't compiled into the project yet.

src/gpu/defaultmaterial.lolfx

@@ -0,0 +1,2 @@
+/* Default material example file */
+

src/gpu/emptymaterial.lolfx

@@ -0,0 +1,2 @@
+/* Empty material example file */
+

win32/01_triangle.vcxproj

@@ -39,17 +39,19 @@
     <ConfigurationType>Application</ConfigurationType>
     <Keyword>Win32Proj</Keyword>
   </PropertyGroup>
-  <Import Project="Lol.Config.props" />
+  <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.Vars.props" />
+    <Import Project="Lol.Core.Vars.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <Import Project="Lol.Rules.props" />
+  <Import Project="Lol.Core.Rules.props" />
   <ItemDefinitionGroup />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
+    <Import Project="Lol.Fx.targets" />
   </ImportGroup>
-</Project>
+</Project>

win32/02_cube.vcxproj

@@ -39,17 +39,19 @@
     <ConfigurationType>Application</ConfigurationType>
     <Keyword>Win32Proj</Keyword>
   </PropertyGroup>
-  <Import Project="Lol.Config.props" />
+  <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.Vars.props" />
+    <Import Project="Lol.Core.Vars.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <Import Project="Lol.Rules.props" />
+  <Import Project="Lol.Core.Rules.props" />
   <ItemDefinitionGroup />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
+    <Import Project="Lol.Fx.targets" />
   </ImportGroup>
-</Project>
+</Project>

win32/03_fractal.vcxproj

@@ -39,17 +39,19 @@
     <ConfigurationType>Application</ConfigurationType>
     <Keyword>Win32Proj</Keyword>
   </PropertyGroup>
-  <Import Project="Lol.Config.props" />
+  <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.Vars.props" />
+    <Import Project="Lol.Core.Vars.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <Import Project="Lol.Rules.props" />
+  <Import Project="Lol.Core.Rules.props" />
   <ItemDefinitionGroup />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
+    <Import Project="Lol.Fx.targets" />
   </ImportGroup>
-</Project>
+</Project>

win32/Lol.Config.props → win32/Lol.Core.Config.props

@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
-    <UseDebugLibraries>true</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration">
-    <CharacterSet>MultiByte</CharacterSet>
-    <UseOfMfc>Dynamic</UseOfMfc>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-</Project>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
+    <UseDebugLibraries>true</UseDebugLibraries>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration">
+    <CharacterSet>MultiByte</CharacterSet>
+    <UseOfMfc>Dynamic</UseOfMfc>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+</Project>

win32/Lol.Rules.props → win32/Lol.Core.Rules.props

@@ -1,77 +1,77 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <LinkIncremental Condition="'$(Configuration)'=='Debug'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)'=='Release'">false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <AdditionalIncludeDirectories>$(SolutionDir)\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Platform)'=='Win32'">$(GlIncludes);$(SdlIncludes);$(D3d9Includes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Platform)'=='x64'">$(GlIncludes);$(SdlIncludes);$(D3d9Includes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Platform)'=='Win32'">WIN32;$(Win32Defines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Platform)'=='x64'">WIN32;$(Win32Defines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Platform)'=='Xbox 360'">_XBOX;$(XboxDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BufferSecurityCheck Condition="'$(Platform)'=='Xbox 360'">false</BufferSecurityCheck>
-    </ClCompile>
-    <ClCompile Condition="'$(Configuration)'=='Debug'">
-      <Optimization>Disabled</Optimization>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Condition="'$(Configuration)'=='Release'">
-      <Optimization>MaxSpeed</Optimization>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <!-- FIXME: not for the static library! -->
-      <AdditionalDependencies Condition="'$(Platform)'=='Win32'">kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;$(SdlDeps);$(GdiDeps);$(GlDeps);$(D3d9Deps);%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories Condition="'$(Platform)'=='Win32'">$(SdlLibs);$(GlLibs);$(D3d9Libs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies Condition="'$(Platform)'=='x64'">kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;$(SdlDeps);$(GdiDeps);$(GlDeps);$(D3d9Deps);%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories Condition="'$(Platform)'=='x64'">$(SdlLibs);$(GlLibs);$(D3d9Libs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">xapilibd.lib;d3d9d.lib;d3dx9d.lib;xgraphicsd.lib;xboxkrnl.lib;xnetd.lib;xaudiod2.lib;xactd3.lib;x3daudiod.lib;xmcored.lib;xbdm.lib;vcompd.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">xapilib.lib;d3d9.lib;d3dx9.lib;xgraphics.lib;xboxkrnl.lib;xnet.lib;xaudio2.lib;xact3.lib;x3daudio.lib;xmcore.lib;vcomp.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <Link Condition="'$(Configuration)'=='Release'">
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-
-    <!-- FIXME: not for the static library! -->
-    <PostBuildEvent Condition="'$(Platform)'=='Win32'">
-      <Command>
-        set A=$(SdlLibs)
-        :again
-        for /f "tokens=1* delims=;" %%I in ("%A%") do (
-          if not "%%I" == "" xcopy /y /c /d "%%I"\*.dll "$(TargetDir)" &amp;&amp; set A=%%J
-          if not "%%I" == "" goto again
-        )
-      </Command>
-    </PostBuildEvent>
-    <PostBuildEvent Condition="'$(Platform)'=='x64'">
-      <Command>
-        set A=$(SdlLibs)
-        :again
-        for /f "tokens=1* delims=;" %%I in ("%A%") do (
-          if not "%%I" == "" xcopy /y /c /d "%%I"\*.dll "$(TargetDir)" &amp;&amp; set A=%%J
-          if not "%%I" == "" goto again
-        )
-      </Command>
-    </PostBuildEvent>
-
-    <!-- FIXME: not for the static library! -->
-    <Deploy Condition="'$(Platform)'=='Xbox 360'">
-      <DeploymentType>CopyToHardDrive</DeploymentType>
-    </Deploy>
-
-  </ItemDefinitionGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <LinkIncremental Condition="'$(Configuration)'=='Debug'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)'=='Release'">false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <FloatingPointModel>Fast</FloatingPointModel>
+      <AdditionalIncludeDirectories>$(SolutionDir)\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Platform)'=='Win32'">$(GlIncludes);$(SdlIncludes);$(D3d9Includes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Platform)'=='x64'">$(GlIncludes);$(SdlIncludes);$(D3d9Includes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Platform)'=='Win32'">WIN32;$(Win32Defines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Platform)'=='x64'">WIN32;$(Win32Defines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Platform)'=='Xbox 360'">_XBOX;$(XboxDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BufferSecurityCheck Condition="'$(Platform)'=='Xbox 360'">false</BufferSecurityCheck>
+    </ClCompile>
+    <ClCompile Condition="'$(Configuration)'=='Debug'">
+      <Optimization>Disabled</Optimization>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Condition="'$(Configuration)'=='Release'">
+      <Optimization>MaxSpeed</Optimization>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <!-- FIXME: not for the static library! -->
+      <AdditionalDependencies Condition="'$(Platform)'=='Win32'">kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;$(SdlDeps);$(GdiDeps);$(GlDeps);$(D3d9Deps);%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories Condition="'$(Platform)'=='Win32'">$(SdlLibs);$(GlLibs);$(D3d9Libs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies Condition="'$(Platform)'=='x64'">kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;$(SdlDeps);$(GdiDeps);$(GlDeps);$(D3d9Deps);%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories Condition="'$(Platform)'=='x64'">$(SdlLibs);$(GlLibs);$(D3d9Libs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">xapilibd.lib;d3d9d.lib;d3dx9d.lib;xgraphicsd.lib;xboxkrnl.lib;xnetd.lib;xaudiod2.lib;xactd3.lib;x3daudiod.lib;xmcored.lib;xbdm.lib;vcompd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">xapilib.lib;d3d9.lib;d3dx9.lib;xgraphics.lib;xboxkrnl.lib;xnet.lib;xaudio2.lib;xact3.lib;x3daudio.lib;xmcore.lib;vcomp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+    <Link Condition="'$(Configuration)'=='Release'">
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+
+    <!-- FIXME: not for the static library! -->
+    <PostBuildEvent Condition="'$(Platform)'=='Win32'">
+      <Command>
+        set A=$(SdlLibs)
+        :again
+        for /f "tokens=1* delims=;" %%I in ("%A%") do (
+          if not "%%I" == "" xcopy /y /c /d "%%I"\*.dll "$(TargetDir)" &amp;&amp; set A=%%J
+          if not "%%I" == "" goto again
+        )
+      </Command>
+    </PostBuildEvent>
+    <PostBuildEvent Condition="'$(Platform)'=='x64'">
+      <Command>
+        set A=$(SdlLibs)
+        :again
+        for /f "tokens=1* delims=;" %%I in ("%A%") do (
+          if not "%%I" == "" xcopy /y /c /d "%%I"\*.dll "$(TargetDir)" &amp;&amp; set A=%%J
+          if not "%%I" == "" goto again
+        )
+      </Command>
+    </PostBuildEvent>
+
+    <!-- FIXME: not for the static library! -->
+    <Deploy Condition="'$(Platform)'=='Xbox 360'">
+      <DeploymentType>CopyToHardDrive</DeploymentType>
+    </Deploy>
+
+  </ItemDefinitionGroup>
+</Project>

win32/Lol.Vars.props → win32/Lol.Core.Vars.props

@@ -1,74 +1,74 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ImportGroup Label="PropertySheets" />
-  <PropertyGroup Label="UserMacros">
-    <ContribDir>$(SolutionDir)\..\contrib</ContribDir>
-
-    <!-- SDL -->
-    <SdlDir>$(ContribDir)\sdl-1.2.14</SdlDir>
-    <SdlImageDir>$(ContribDir)\sdl-image-1.2.10</SdlImageDir>
-    <SdlMixerDir>$(ContribDir)\sdl-mixer-1.2.11</SdlMixerDir>
-    <SdlIncludes>$(SdlDir)\include;$(SdlImageDir)\include;$(SdlMixerDir)\include</SdlIncludes>
-    <SdlLibs Condition="'$(Platform)'=='Win32'">$(SdlDir)\lib\i686-w64-mingw32;$(SdlImageDir)\lib\i686-w64-mingw32;$(SdlMixerDir)\lib\i686-w64-mingw32</SdlLibs>
-    <SdlLibs Condition="'$(Platform)'=='x64'">$(SdlDir)\lib\x86_64-w64-mingw32</SdlLibs>
-    <SdlDeps Condition="'$(Platform)'=='Win32'">SDL.lib;SDLmain.lib;SDL_image.lib;SDL_mixer.lib</SdlDeps>
-    <SdlDeps Condition="'$(Platform)'=='x64'">libSDL.a;libSDLmain.a</SdlDeps>
-
-    <!-- GTK+ & GtkGl -->
-    <GtkDir>$(ContribDir)\gtk-2.22.1</GtkDir>
-    <GtkGlDir>$(ContribDir)\gtkglarea-2.0.1</GtkGlDir>
-    <GtkIncludes>$(GtkDir)\lib\glib-2.0\include;$(GtkDir)\lib\gtk-2.0\include;$(GtkDir)\include\glib-2.0;$(GtkDir)\include\gtk-2.0;$(GtkDir)\include\cairo;$(GtkDir)\include\pango-1.0;$(GtkDir)\include\gdk-pixbuf-2.0;$(GtkDir)\include\atk-1.0;$(GtkGlDir)\include</GtkIncludes>
-    <GtkLibs>$(GtkDir)\lib;$(GtkDir)\bin;$(GtkGlDir)\lib</GtkLibs>
-    <GtkDeps>gobject-2.0.lib;gthread-2.0.lib;glib-2.0.lib;gdk-win32-2.0.lib;gtk-win32-2.0.lib;gtkgl-2.0.lib</GtkDeps>
-
-    <!-- GDI+ -->
-    <GdiDeps>Gdiplus.lib</GdiDeps>
-
-    <!-- OpenGL & GLEW -->
-    <GlewDir>$(ContribDir)\glew-1.7.0</GlewDir>
-    <GlIncludes>$(GlewDir)\include\GL</GlIncludes>
-    <GlLibs Condition="'$(Platform)'=='Win32'">$(GlewDir)\lib\i686-w64-mingw32</GlLibs>
-    <GlLibs Condition="'$(Platform)'=='x64'">$(GlewDir)\lib\x86_64-w64-mingw32</GlLibs>
-    <GlDeps>opengl32.lib;glew32.lib</GlDeps>
-
-    <!-- Direct3D 9 -->
-    <D3d9Includes>$(DXSDK_DIR)\Include</D3d9Includes>
-    <D3d9Libs Condition="'$(Platform)'=='Win32'">$(DXSDK_DIR)\Lib\x86</D3d9Libs>
-    <D3d9Libs Condition="'$(Platform)'=='x64'">$(DXSDK_DIR)\Lib\x64</D3d9Libs>
-    <D3d9Deps Condition="'$(Configuration)'=='Release'">d3d9.lib;d3dx9.lib;xinput.lib</D3d9Deps>
-    <D3d9Deps Condition="'$(Configuration)'=='Debug'">d3d9.lib;d3dx9d.lib;xinput.lib</D3d9Deps>
-
-    <Win32Defines>HAVE_SDL_H;USE_SDL;USE_GDIPLUS;USE_D3D9</Win32Defines>
-    <XboxDefines></XboxDefines>
-  </PropertyGroup>
-  <PropertyGroup />
-  <ItemDefinitionGroup />
-  <ItemGroup>
-    <BuildMacro Include="ContribDir"><Value>$(ContribDir)</Value></BuildMacro>
-    <BuildMacro Include="SdlDir"><Value>$(SdlDir)</Value></BuildMacro>
-    <BuildMacro Include="SdlImageDir"><Value>$(SdlImageDir)</Value></BuildMacro>
-    <BuildMacro Include="SdlMixerDir"><Value>$(SdlMixerDir)</Value></BuildMacro>
-    <BuildMacro Include="SdlIncludes"><Value>$(SdlIncludes)</Value></BuildMacro>
-    <BuildMacro Include="SdlLibs"><Value>$(SdlLibs)</Value></BuildMacro>
-    <BuildMacro Include="SdlDeps"><Value>$(SdlDeps)</Value></BuildMacro>
-    <BuildMacro Include="GtkDir"><Value>$(GtkDir)</Value></BuildMacro>
-    <BuildMacro Include="GtkGlDir"><Value>$(GtkGlDir)</Value></BuildMacro>
-    <BuildMacro Include="GtkIncludes"><Value>$(GtkIncludes)</Value></BuildMacro>
-    <BuildMacro Include="GtkLibs"><Value>$(GtkLibs)</Value></BuildMacro>
-    <BuildMacro Include="GtkDeps"><Value>$(GtkDeps)</Value></BuildMacro>
-    <BuildMacro Include="GdiDeps"><Value>$(GdiDeps)</Value></BuildMacro>
-    <BuildMacro Include="GlewDir"><Value>$(GlewDir)</Value></BuildMacro>
-    <BuildMacro Include="GlIncludes"><Value>$(GlIncludes)</Value></BuildMacro>
-    <BuildMacro Include="GlLibs"><Value>$(GlLibs)</Value></BuildMacro>
-    <BuildMacro Include="GlDeps"><Value>$(GlDeps)</Value></BuildMacro>
-    <BuildMacro Include="D3d9Includes"><Value>$(D3d9Includes)</Value></BuildMacro>
-    <BuildMacro Include="D3d9Libs"><Value>$(D3d9Libs)</Value></BuildMacro>
-    <BuildMacro Include="D3d9Deps"><Value>$(D3d9Deps)</Value></BuildMacro>
-    <BuildMacro Include="Win32Defines"><Value>$(Win32Defines)</Value></BuildMacro>
-    <BuildMacro Include="XboxDefines"><Value>$(XboxDefines)</Value></BuildMacro>
-  </ItemGroup>
-  <PropertyGroup>
-    <OutDir>$(Platform) $(Configuration)\</OutDir>
-    <IntDir>$(Platform) $(Configuration)\$(ProjectName)\</IntDir>
-  </PropertyGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ImportGroup Label="PropertySheets" />
+  <PropertyGroup Label="UserMacros">
+    <ContribDir>$(SolutionDir)\..\contrib</ContribDir>
+
+    <!-- SDL -->
+    <SdlDir>$(ContribDir)\sdl-1.2.14</SdlDir>
+    <SdlImageDir>$(ContribDir)\sdl-image-1.2.10</SdlImageDir>
+    <SdlMixerDir>$(ContribDir)\sdl-mixer-1.2.11</SdlMixerDir>
+    <SdlIncludes>$(SdlDir)\include;$(SdlImageDir)\include;$(SdlMixerDir)\include</SdlIncludes>
+    <SdlLibs Condition="'$(Platform)'=='Win32'">$(SdlDir)\lib\i686-w64-mingw32;$(SdlImageDir)\lib\i686-w64-mingw32;$(SdlMixerDir)\lib\i686-w64-mingw32</SdlLibs>
+    <SdlLibs Condition="'$(Platform)'=='x64'">$(SdlDir)\lib\x86_64-w64-mingw32</SdlLibs>
+    <SdlDeps Condition="'$(Platform)'=='Win32'">SDL.lib;SDLmain.lib;SDL_image.lib;SDL_mixer.lib</SdlDeps>
+    <SdlDeps Condition="'$(Platform)'=='x64'">libSDL.a;libSDLmain.a</SdlDeps>
+
+    <!-- GTK+ & GtkGl -->
+    <GtkDir>$(ContribDir)\gtk-2.22.1</GtkDir>
+    <GtkGlDir>$(ContribDir)\gtkglarea-2.0.1</GtkGlDir>
+    <GtkIncludes>$(GtkDir)\lib\glib-2.0\include;$(GtkDir)\lib\gtk-2.0\include;$(GtkDir)\include\glib-2.0;$(GtkDir)\include\gtk-2.0;$(GtkDir)\include\cairo;$(GtkDir)\include\pango-1.0;$(GtkDir)\include\gdk-pixbuf-2.0;$(GtkDir)\include\atk-1.0;$(GtkGlDir)\include</GtkIncludes>
+    <GtkLibs>$(GtkDir)\lib;$(GtkDir)\bin;$(GtkGlDir)\lib</GtkLibs>
+    <GtkDeps>gobject-2.0.lib;gthread-2.0.lib;glib-2.0.lib;gdk-win32-2.0.lib;gtk-win32-2.0.lib;gtkgl-2.0.lib</GtkDeps>
+
+    <!-- GDI+ -->
+    <GdiDeps>Gdiplus.lib</GdiDeps>
+
+    <!-- OpenGL & GLEW -->
+    <GlewDir>$(ContribDir)\glew-1.7.0</GlewDir>
+    <GlIncludes>$(GlewDir)\include\GL</GlIncludes>
+    <GlLibs Condition="'$(Platform)'=='Win32'">$(GlewDir)\lib\i686-w64-mingw32</GlLibs>
+    <GlLibs Condition="'$(Platform)'=='x64'">$(GlewDir)\lib\x86_64-w64-mingw32</GlLibs>
+    <GlDeps>opengl32.lib;glew32.lib</GlDeps>
+
+    <!-- Direct3D 9 -->
+    <D3d9Includes>$(DXSDK_DIR)\Include</D3d9Includes>
+    <D3d9Libs Condition="'$(Platform)'=='Win32'">$(DXSDK_DIR)\Lib\x86</D3d9Libs>
+    <D3d9Libs Condition="'$(Platform)'=='x64'">$(DXSDK_DIR)\Lib\x64</D3d9Libs>
+    <D3d9Deps Condition="'$(Configuration)'=='Release'">d3d9.lib;d3dx9.lib;xinput.lib</D3d9Deps>
+    <D3d9Deps Condition="'$(Configuration)'=='Debug'">d3d9.lib;d3dx9d.lib;xinput.lib</D3d9Deps>
+
+    <Win32Defines>HAVE_SDL_H;USE_SDL;USE_GDIPLUS;USE_D3D9</Win32Defines>
+    <XboxDefines></XboxDefines>
+  </PropertyGroup>
+  <PropertyGroup />
+  <ItemDefinitionGroup />
+  <ItemGroup>
+    <BuildMacro Include="ContribDir"><Value>$(ContribDir)</Value></BuildMacro>
+    <BuildMacro Include="SdlDir"><Value>$(SdlDir)</Value></BuildMacro>
+    <BuildMacro Include="SdlImageDir"><Value>$(SdlImageDir)</Value></BuildMacro>
+    <BuildMacro Include="SdlMixerDir"><Value>$(SdlMixerDir)</Value></BuildMacro>
+    <BuildMacro Include="SdlIncludes"><Value>$(SdlIncludes)</Value></BuildMacro>
+    <BuildMacro Include="SdlLibs"><Value>$(SdlLibs)</Value></BuildMacro>
+    <BuildMacro Include="SdlDeps"><Value>$(SdlDeps)</Value></BuildMacro>
+    <BuildMacro Include="GtkDir"><Value>$(GtkDir)</Value></BuildMacro>
+    <BuildMacro Include="GtkGlDir"><Value>$(GtkGlDir)</Value></BuildMacro>
+    <BuildMacro Include="GtkIncludes"><Value>$(GtkIncludes)</Value></BuildMacro>
+    <BuildMacro Include="GtkLibs"><Value>$(GtkLibs)</Value></BuildMacro>
+    <BuildMacro Include="GtkDeps"><Value>$(GtkDeps)</Value></BuildMacro>
+    <BuildMacro Include="GdiDeps"><Value>$(GdiDeps)</Value></BuildMacro>
+    <BuildMacro Include="GlewDir"><Value>$(GlewDir)</Value></BuildMacro>
+    <BuildMacro Include="GlIncludes"><Value>$(GlIncludes)</Value></BuildMacro>
+    <BuildMacro Include="GlLibs"><Value>$(GlLibs)</Value></BuildMacro>
+    <BuildMacro Include="GlDeps"><Value>$(GlDeps)</Value></BuildMacro>
+    <BuildMacro Include="D3d9Includes"><Value>$(D3d9Includes)</Value></BuildMacro>
+    <BuildMacro Include="D3d9Libs"><Value>$(D3d9Libs)</Value></BuildMacro>
+    <BuildMacro Include="D3d9Deps"><Value>$(D3d9Deps)</Value></BuildMacro>
+    <BuildMacro Include="Win32Defines"><Value>$(Win32Defines)</Value></BuildMacro>
+    <BuildMacro Include="XboxDefines"><Value>$(XboxDefines)</Value></BuildMacro>
+  </ItemGroup>
+  <PropertyGroup>
+    <OutDir>$(Platform) $(Configuration)\</OutDir>
+    <IntDir>$(Platform) $(Configuration)\$(ProjectName)\</IntDir>
+  </PropertyGroup>
+</Project>

win32/Lol.Fx.props

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup
+    Condition="'$(LolFxCompileBeforeTargets)' == '' and '$(LolFxCompileAfterTargets)' == '' and '$(ConfigurationType)' != 'Makefile'">
+    <LolFxCompileBeforeTargets>Midl</LolFxCompileBeforeTargets>
+    <LolFxCompileAfterTargets>CustomBuild</LolFxCompileAfterTargets>
+  </PropertyGroup>
+  <PropertyGroup>
+    <LolFxCompileDependsOn
+      Condition="'$(ConfigurationType)' != 'Makefile'">_SelectedFiles;$(LolFxCompileDependsOn)</LolFxCompileDependsOn>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <LolFxCompile>
+      <CommandLineTemplate>@echo off
+set D=$(IntDir)%(Filename)%(Extension).cpp
+echo /* This file was autogenerated. DO NOT MODIFY IT. */ &gt; "%D%"
+echo char const *lolfx_%(Filename) = &gt;&gt; "%D%"
+setlocal disabledelayedexpansion
+for /F "tokens=1,* delims=`" %%L in ('type "%(Fullpath)"') do (
+  set "line=%%L"
+  setlocal enabledelayedexpansion
+  echo "!line:"=\"!\n" &gt;&gt; "%D%"
+  endlocal
+)
+endlocal
+echo ; &gt;&gt; "%D%"</CommandLineTemplate>
+      <ExecutionDescription>Compiling with Lol Fx Build Rule...</ExecutionDescription>
+    </LolFxCompile>
+  </ItemDefinitionGroup>
+</Project>

win32/Lol.Fx.targets

@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <PropertyPageSchema
+      Include="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).xml" />
+    <AvailableItemName
+      Include="LolFxCompile">
+      <Targets>LolFxCompile</Targets>
+    </AvailableItemName>
+  </ItemGroup>
+  <UsingTask
+    TaskName="LolFxCompile"
+    TaskFactory="XamlTaskFactory"
+    AssemblyName="Microsoft.Build.Tasks.v4.0">
+    <Task>$(MSBuildThisFileDirectory)$(MSBuildThisFileName).xml</Task>
+  </UsingTask>
+  <Target
+    Name="LolFxCompile"
+    BeforeTargets="$(LolFxCompileBeforeTargets)"
+    AfterTargets="$(LolFxCompileAfterTargets)"
+    Condition="'@(LolFxCompile)' != ''"
+    DependsOnTargets="$(LolFxCompileDependsOn);ComputeLolFxCompileOutput"
+    Outputs="@(LolFxCompile-&gt;Metadata('CompileOut')-&gt;Distinct())"
+    Inputs="@(LolFxCompile);%(LolFxCompile.AdditionalDependencies);$(MSBuildProjectFile)">
+    <ItemGroup
+      Condition="'@(SelectedFiles)' != ''">
+      <LolFxCompile
+        Remove="@(LolFxCompile)"
+        Condition="'%(Identity)' != '@(SelectedFiles)'" />
+    </ItemGroup>
+    <ItemGroup>
+      <LolFxCompile_tlog
+        Include="%(LolFxCompile.Outputs)"
+        Condition="'%(LolFxCompile.Outputs)' != '' and '%(LolFxCompile.ExcludedFromBuild)' != 'true'">
+        <Source>@(LolFxCompile, '|')</Source>
+      </LolFxCompile_tlog>
+    </ItemGroup>
+    <Message
+      Importance="High"
+      Text="%(LolFxCompile.ExecutionDescription)" />
+    <WriteLinesToFile
+      Condition="'@(LolFxCompile_tlog)' != '' and '%(LolFxCompile_tlog.ExcludedFromBuild)' != 'true'"
+      File="$(IntDir)$(ProjectName).write.1.tlog"
+      Lines="^%(LolFxCompile_tlog.Source);@(LolFxCompile_tlog-&gt;'%(Fullpath)')" />
+    <ItemGroup>
+      <LolFxCompile>
+      </LolFxCompile>
+    </ItemGroup>
+    <LolFxCompile
+      Condition="'@(LolFxCompile)' != '' and '%(LolFxCompile.ExcludedFromBuild)' != 'true'"
+      CommandLineTemplate="%(LolFxCompile.CommandLineTemplate)"
+      IntDir="$(IntDir)"
+      Outputs="$(Outputs)"
+      FileName="%(FileName)"
+      Inputs="@(LolFxCompile)" />
+  </Target>
+
+  <PropertyGroup>
+    <ComputeLinkInputsTargets>
+      $(ComputeLinkInputsTargets);
+      ComputeLolFxCompileOutput;
+    </ComputeLinkInputsTargets>
+    <ComputeLibInputsTargets>
+      $(ComputeLibInputsTargets);
+      ComputeLolFxCompileOutput;
+    </ComputeLibInputsTargets>
+  </PropertyGroup>
+
+  <Target Name="ComputeLolFxCompileOutput" Condition="'@(LolFxCompile)' != ''">
+    <ItemGroup>
+      <LolFxCompile>
+        <CompileOut>$(IntDir)\%(FileName).lolfx.cpp</CompileOut>
+      </LolFxCompile>
+    </ItemGroup>
+    <ItemGroup>
+      <ClCompile Include="%(LolFxCompile.Outputs)" />
+    </ItemGroup>
+  </Target>
+
+</Project>

win32/Lol.Fx.xml

@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ProjectSchemaDefinitions xmlns="clr-namespace:Microsoft.Build.Framework.XamlTypes;assembly=Microsoft.Build.Framework" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:sys="clr-namespace:System;assembly=mscorlib" xmlns:transformCallback="Microsoft.Cpp.Dev10.ConvertPropertyCallback">
+  <Rule
+    Name="LolFxCompile"
+    PageTemplate="tool"
+    DisplayName="Lol Fx Build Rule v0.0"
+    Order="200">
+    <Rule.DataSource>
+      <DataSource
+        Persistence="ProjectFile"
+        ItemType="LolFxCompile" />
+    </Rule.DataSource>
+    <Rule.Categories>
+      <Category
+        Name="General">
+        <Category.DisplayName>
+          <sys:String>General</sys:String>
+        </Category.DisplayName>
+      </Category>
+      <Category
+        Name="Command Line"
+        Subtype="CommandLine">
+        <Category.DisplayName>
+          <sys:String>Command Line</sys:String>
+        </Category.DisplayName>
+      </Category>
+    </Rule.Categories>
+    <StringListProperty
+      Name="Inputs"
+      Category="Command Line"
+      IsRequired="true"
+      Switch=" ">
+      <StringListProperty.DataSource>
+        <DataSource
+          Persistence="ProjectFile"
+          ItemType="LolFxCompile"
+          SourceType="Item" />
+      </StringListProperty.DataSource>
+    </StringListProperty>
+    <StringListProperty
+      Name="IntDir"
+      Category="Command Line"
+      IsRequired="true"
+      Switch=" ">
+      <StringListProperty.DataSource>
+        <DataSource
+          Persistence="ProjectFile"
+          ItemType="LolFxCompile"
+          SourceType="Item" />
+      </StringListProperty.DataSource>
+    </StringListProperty>
+    <StringListProperty
+      Name="Outputs"
+      DisplayName="Outputs"
+      Visible="False"
+      IncludeInCommandLine="False" />
+    <StringListProperty
+      Name="FileName"
+      Category="Command Line"
+      IsRequired="true"
+      Switch=" ">
+    </StringListProperty>
+    <StringProperty
+      Name="CommandLineTemplate"
+      DisplayName="Command Line"
+      Visible="False"
+      IncludeInCommandLine="False" />
+  </Rule>
+  <ItemType
+    Name="LolFxCompile"
+    DisplayName="Lol Fx Build Rule v0.0" />
+  <FileExtension
+    Name="*.lolfx"
+    ContentType="LolFxCompile" />
+  <ContentType
+    Name="LolFxCompile"
+    DisplayName="Lol Fx Build Rule v0.0"
+    ItemType="LolFxCompile" />
+</ProjectSchemaDefinitions>

win32/benchsuite.vcxproj

@@ -43,17 +43,19 @@
     <ConfigurationType>Application</ConfigurationType>
     <Keyword>Win32Proj</Keyword>
   </PropertyGroup>
-  <Import Project="Lol.Config.props" />
+  <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.Vars.props" />
+    <Import Project="Lol.Core.Vars.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <Import Project="Lol.Rules.props" />
+  <Import Project="Lol.Core.Rules.props" />
   <ItemDefinitionGroup />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
+    <Import Project="Lol.Fx.targets" />
   </ImportGroup>
-</Project>
+</Project>

win32/deushax.vcxproj

@@ -45,17 +45,19 @@
     <ConfigurationType>Application</ConfigurationType>
     <Keyword>Win32Proj</Keyword>
   </PropertyGroup>
-  <Import Project="Lol.Config.props" />
+  <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.Vars.props" />
+    <Import Project="Lol.Core.Vars.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <Import Project="Lol.Rules.props" />
+  <Import Project="Lol.Core.Rules.props" />
   <ItemDefinitionGroup />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
+    <Import Project="Lol.Fx.targets" />
   </ImportGroup>
-</Project>
+</Project>

win32/editor.vcxproj

@@ -45,15 +45,16 @@
     <ConfigurationType>Application</ConfigurationType>
     <Keyword>Win32Proj</Keyword>
   </PropertyGroup>
-  <Import Project="Lol.Config.props" />
+  <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.Vars.props" />
+    <Import Project="Lol.Core.Vars.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <Import Project="Lol.Rules.props" />
+  <Import Project="Lol.Core.Rules.props" />
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>$(SolutionDir)\..\deushax;$(GtkIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -106,5 +107,6 @@
   </ItemDefinitionGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
+    <Import Project="Lol.Fx.targets" />
   </ImportGroup>
-</Project>
+</Project>

win32/lolcore.vcxproj

@@ -59,13 +59,14 @@
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.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.Vars.props" />
+    <Import Project="Lol.Core.Vars.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <Import Project="Lol.Rules.props" />
+  <Import Project="Lol.Core.Rules.props" />
   <ItemDefinitionGroup>
     <ClCompile>
       <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -190,7 +191,12 @@
     <ClInclude Include="..\src\world.h" />
     <ClInclude Include="..\src\worldentity.h" />
   </ItemGroup>
+  <ItemGroup>
+    <LolFxCompile Include="..\src\gpu\defaultmaterial.lolfx" />
+    <LolFxCompile Include="..\src\gpu\emptymaterial.lolfx" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
+    <Import Project="Lol.Fx.targets" />
   </ImportGroup>
-</Project>
+</Project>

win32/lolcore.vcxproj.filters

@@ -47,6 +47,9 @@
     <Filter Include="src\platform\d3d9">
       <UniqueIdentifier>{a914e15d-3201-467a-a9c9-d7c5244b13ee}</UniqueIdentifier>
     </Filter>
+    <Filter Include="src\...">
+      <UniqueIdentifier>{3592ed6a-59d7-4a6d-be5a-c05cb5dab730}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\src\image\image.cpp">
@@ -73,99 +76,18 @@
     <ClCompile Include="..\src\platform\sdl\sdlinput.cpp">
       <Filter>src\platform\sdl</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\audio.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\camera.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\dict.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\eglapp.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\emitter.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\entity.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\font.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\forge.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\gradient.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
     <ClCompile Include="..\src\math\half.cpp">
       <Filter>src\math</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\hash.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\layer.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\log.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\map.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\platform.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\profiler.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
     <ClCompile Include="..\src\math\real.cpp">
       <Filter>src\math</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\sample.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\sampler.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\scene.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\sprite.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\text.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\ticker.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\tiler.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\tileset.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\timer.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
     <ClCompile Include="..\src\math\trig.cpp">
       <Filter>src\math</Filter>
     </ClCompile>
     <ClCompile Include="..\src\math\vector.cpp">
       <Filter>src\math</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\video.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\world.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\worldentity.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
     <ClCompile Include="..\src\gpu\shader.cpp">
       <Filter>src\gpu</Filter>
     </ClCompile>
@@ -211,6 +133,87 @@
     <ClCompile Include="..\src\platform\d3d9\d3d9input.cpp">
       <Filter>src\platform\d3d9</Filter>
     </ClCompile>
+    <ClCompile Include="..\src\audio.cpp">
+      <Filter>src\...</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\camera.cpp">
+      <Filter>src\...</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\dict.cpp">
+      <Filter>src\...</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\eglapp.cpp">
+      <Filter>src\...</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\emitter.cpp">
+      <Filter>src\...</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\entity.cpp">
+      <Filter>src\...</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\font.cpp">
+      <Filter>src\...</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\forge.cpp">
+      <Filter>src\...</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\gradient.cpp">
+      <Filter>src\...</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\hash.cpp">
+      <Filter>src\...</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\layer.cpp">
+      <Filter>src\...</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\ticker.cpp">
+      <Filter>src\...</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\log.cpp">
+      <Filter>src\...</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\map.cpp">
+      <Filter>src\...</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\platform.cpp">
+      <Filter>src\...</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\profiler.cpp">
+      <Filter>src\...</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\sample.cpp">
+      <Filter>src\...</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\sampler.cpp">
+      <Filter>src\...</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\scene.cpp">
+      <Filter>src\...</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\sprite.cpp">
+      <Filter>src\...</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\text.cpp">
+      <Filter>src\...</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\tiler.cpp">
+      <Filter>src\...</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\tileset.cpp">
+      <Filter>src\...</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\timer.cpp">
+      <Filter>src\...</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\video.cpp">
+      <Filter>src\...</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\world.cpp">
+      <Filter>src\...</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\worldentity.cpp">
+      <Filter>src\...</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\src\image\image.h">
@@ -237,164 +240,172 @@
     <ClInclude Include="..\src\platform\sdl\sdlapp.h">
       <Filter>src\platform\sdl</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\math\trig.h">
+      <Filter>src\math</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\lol\math\half.h">
+      <Filter>src\lol\math</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\lol\math\real.h">
+      <Filter>src\lol\math</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\lol\math\remez.h">
+      <Filter>src\lol\math</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\lol\math\vector.h">
+      <Filter>src\lol\math</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\lol\unit.h">
+      <Filter>src\lol</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\gpu\shader.h">
+      <Filter>src\gpu</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\gpu\vertexbuffer.h">
+      <Filter>src\gpu</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\thread\thread.h">
+      <Filter>src\thread</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\thread\threadbase.h">
+      <Filter>src\thread</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\application\application.h">
+      <Filter>src\application</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\image\image-private.h">
+      <Filter>src\image</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\platform\xbox\xboxapp.h">
+      <Filter>src\platform\xbox</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\platform\xbox\xboxinput.h">
+      <Filter>src\platform\xbox</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\gpu\indexbuffer.h">
+      <Filter>src\gpu</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\lol\debug.h">
+      <Filter>src\lol</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\input\input.h">
+      <Filter>src\input</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\input\stick.h">
+      <Filter>src\input</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\platform\d3d9\d3d9input.h">
+      <Filter>src\platform\d3d9</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\array.h">
+      <Filter>src\...</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\hash.h">
+      <Filter>src\...</Filter>
+    </ClInclude>
     <ClInclude Include="..\src\audio.h">
-      <Filter>src</Filter>
+      <Filter>src\...</Filter>
     </ClInclude>
     <ClInclude Include="..\src\bitfield.h">
-      <Filter>src</Filter>
+      <Filter>src\...</Filter>
     </ClInclude>
     <ClInclude Include="..\src\camera.h">
-      <Filter>src</Filter>
+      <Filter>src\...</Filter>
     </ClInclude>
     <ClInclude Include="..\src\core.h">
-      <Filter>src</Filter>
+      <Filter>src\...</Filter>
     </ClInclude>
     <ClInclude Include="..\src\dict.h">
-      <Filter>src</Filter>
+      <Filter>src\...</Filter>
     </ClInclude>
     <ClInclude Include="..\src\eglapp.h">
-      <Filter>src</Filter>
+      <Filter>src\...</Filter>
     </ClInclude>
     <ClInclude Include="..\src\emitter.h">
-      <Filter>src</Filter>
+      <Filter>src\...</Filter>
     </ClInclude>
     <ClInclude Include="..\src\entity.h">
-      <Filter>src</Filter>
+      <Filter>src\...</Filter>
     </ClInclude>
     <ClInclude Include="..\src\font.h">
-      <Filter>src</Filter>
+      <Filter>src\...</Filter>
     </ClInclude>
     <ClInclude Include="..\src\forge.h">
-      <Filter>src</Filter>
+      <Filter>src\...</Filter>
     </ClInclude>
     <ClInclude Include="..\src\gradient.h">
-      <Filter>src</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\hash.h">
-      <Filter>src</Filter>
+      <Filter>src\...</Filter>
     </ClInclude>
     <ClInclude Include="..\src\layer.h">
-      <Filter>src</Filter>
+      <Filter>src\...</Filter>
     </ClInclude>
     <ClInclude Include="..\src\log.h">
-      <Filter>src</Filter>
+      <Filter>src\...</Filter>
     </ClInclude>
     <ClInclude Include="..\src\loldebug.h">
-      <Filter>src</Filter>
+      <Filter>src\...</Filter>
     </ClInclude>
     <ClInclude Include="..\src\lolgl.h">
-      <Filter>src</Filter>
+      <Filter>src\...</Filter>
     </ClInclude>
     <ClInclude Include="..\src\map.h">
-      <Filter>src</Filter>
+      <Filter>src\...</Filter>
     </ClInclude>
     <ClInclude Include="..\src\numeric.h">
-      <Filter>src</Filter>
+      <Filter>src\...</Filter>
     </ClInclude>
     <ClInclude Include="..\src\platform.h">
-      <Filter>src</Filter>
+      <Filter>src\...</Filter>
     </ClInclude>
     <ClInclude Include="..\src\profiler.h">
-      <Filter>src</Filter>
+      <Filter>src\...</Filter>
     </ClInclude>
     <ClInclude Include="..\src\sample.h">
-      <Filter>src</Filter>
+      <Filter>src\...</Filter>
     </ClInclude>
     <ClInclude Include="..\src\sampler.h">
-      <Filter>src</Filter>
+      <Filter>src\...</Filter>
     </ClInclude>
     <ClInclude Include="..\src\scene.h">
-      <Filter>src</Filter>
+      <Filter>src\...</Filter>
     </ClInclude>
     <ClInclude Include="..\src\simd.h">
-      <Filter>src</Filter>
+      <Filter>src\...</Filter>
     </ClInclude>
     <ClInclude Include="..\src\sprite.h">
-      <Filter>src</Filter>
+      <Filter>src\...</Filter>
     </ClInclude>
     <ClInclude Include="..\src\text.h">
-      <Filter>src</Filter>
+      <Filter>src\...</Filter>
     </ClInclude>
     <ClInclude Include="..\src\ticker.h">
-      <Filter>src</Filter>
+      <Filter>src\...</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\worldentity.h">
+      <Filter>src\...</Filter>
     </ClInclude>
     <ClInclude Include="..\src\tiler.h">
-      <Filter>src</Filter>
+      <Filter>src\...</Filter>
     </ClInclude>
     <ClInclude Include="..\src\tileset.h">
-      <Filter>src</Filter>
+      <Filter>src\...</Filter>
     </ClInclude>
     <ClInclude Include="..\src\timer.h">
-      <Filter>src</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\math\trig.h">
-      <Filter>src\math</Filter>
+      <Filter>src\...</Filter>
     </ClInclude>
     <ClInclude Include="..\src\video.h">
-      <Filter>src</Filter>
+      <Filter>src\...</Filter>
     </ClInclude>
     <ClInclude Include="..\src\world.h">
-      <Filter>src</Filter>
+      <Filter>src\...</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\worldentity.h">
-      <Filter>src</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\lol\math\half.h">
-      <Filter>src\lol\math</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\lol\math\real.h">
-      <Filter>src\lol\math</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\lol\math\remez.h">
-      <Filter>src\lol\math</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\lol\math\vector.h">
-      <Filter>src\lol\math</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\lol\unit.h">
-      <Filter>src\lol</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\gpu\shader.h">
-      <Filter>src\gpu</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\gpu\vertexbuffer.h">
+  </ItemGroup>
+  <ItemGroup>
+    <LolFxCompile Include="..\src\gpu\emptymaterial.lolfx">
       <Filter>src\gpu</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\thread\thread.h">
-      <Filter>src\thread</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\thread\threadbase.h">
-      <Filter>src\thread</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\application\application.h">
-      <Filter>src\application</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\image\image-private.h">
-      <Filter>src\image</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\platform\xbox\xboxapp.h">
-      <Filter>src\platform\xbox</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\platform\xbox\xboxinput.h">
-      <Filter>src\platform\xbox</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\gpu\indexbuffer.h">
+    </LolFxCompile>
+    <LolFxCompile Include="..\src\gpu\defaultmaterial.lolfx">
       <Filter>src\gpu</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\array.h">
-      <Filter>src</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\lol\debug.h">
-      <Filter>src\lol</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\input\input.h">
-      <Filter>src\input</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\input\stick.h">
-      <Filter>src\input</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\platform\d3d9\d3d9input.h">
-      <Filter>src\platform\d3d9</Filter>
-    </ClInclude>
+    </LolFxCompile>
   </ItemGroup>
 </Project>

win32/lolengine.sln

@@ -69,6 +69,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Orbital", "Orbital", "{8C77
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "orbital", "orbital.vcxproj", "{EE203B88-44CF-4859-9D42-7A5F40FECB52}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Engine", "Engine", "{1AFD580B-98B8-4689-B661-38C41132C60E}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -263,5 +265,6 @@ Global
 		{6BF81B39-EDC2-4227-9992-C2D8ABEA95AF} = {E74CF679-CA2A-47E9-B1F4-3779D6AC6B04}
 		{32F3F8CF-D22E-45E4-BEB8-AD909E8C5515} = {33704AA4-F2B5-4138-A40D-E3E77F89ED46}
 		{EE203B88-44CF-4859-9D42-7A5F40FECB52} = {8C77EAA8-1077-4EF7-AE53-97C6C60A3601}
+		{9E62F2FE-3408-4EAE-8238-FD84238CEEDA} = {1AFD580B-98B8-4689-B661-38C41132C60E}
 	EndGlobalSection
 EndGlobal

win32/monsterz.vcxproj

@@ -56,17 +56,19 @@
     <ConfigurationType>Application</ConfigurationType>
     <Keyword>Win32Proj</Keyword>
   </PropertyGroup>
-  <Import Project="Lol.Config.props" />
+  <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.Vars.props" />
+    <Import Project="Lol.Core.Vars.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <Import Project="Lol.Rules.props" />
+  <Import Project="Lol.Core.Rules.props" />
   <ItemDefinitionGroup />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
+    <Import Project="Lol.Fx.targets" />
   </ImportGroup>
-</Project>
+</Project>

win32/mrpigeon.vcxproj

@@ -58,17 +58,19 @@
     <ConfigurationType>Application</ConfigurationType>
     <Keyword>Win32Proj</Keyword>
   </PropertyGroup>
-  <Import Project="Lol.Config.props" />
+  <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.Vars.props" />
+    <Import Project="Lol.Core.Vars.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <Import Project="Lol.Rules.props" />
+  <Import Project="Lol.Core.Rules.props" />
   <ItemDefinitionGroup />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
+    <Import Project="Lol.Fx.targets" />
   </ImportGroup>
-</Project>
+</Project>

win32/orbital.vcxproj

@@ -1,65 +1,67 @@
-<?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\CommandParser.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\orbital.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="lolcore.vcxproj">
-      <Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{ee203b88-44cf-4859-9d42-7a5f40fecb52}</ProjectGuid>
-    <ConfigurationType>Application</ConfigurationType>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="Lol.Config.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </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.Vars.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <Import Project="Lol.Rules.props" />
-  <ItemDefinitionGroup />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
+<?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\CommandParser.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\orbital.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="lolcore.vcxproj">
+      <Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project>
+    </ProjectReference>
+  </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>

win32/orbital.vcxproj.filters

@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\orbital\mesh.h" />
-    <ClInclude Include="..\orbital\CommandParser.h" />
-    <ClInclude Include="..\orbital\player.h" />
-    <ClInclude Include="..\orbital\tank.h" />
-    <ClInclude Include="..\orbital\starfield.h" />
-    <ClInclude Include="..\orbital\snake.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\orbital\orbital.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\orbital\particlesystem.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\orbital\orbital.cpp" />
-  </ItemGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <ClInclude Include="..\orbital\mesh.h" />
+    <ClInclude Include="..\orbital\CommandParser.h" />
+    <ClInclude Include="..\orbital\player.h" />
+    <ClInclude Include="..\orbital\tank.h" />
+    <ClInclude Include="..\orbital\starfield.h" />
+    <ClInclude Include="..\orbital\snake.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\orbital\orbital.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\orbital\particlesystem.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\orbital\orbital.cpp" />
+  </ItemGroup>
 </Project>

win32/quad.vcxproj

@@ -39,17 +39,19 @@
     <ConfigurationType>Application</ConfigurationType>
     <Keyword>Win32Proj</Keyword>
   </PropertyGroup>
-  <Import Project="Lol.Config.props" />
+  <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.Vars.props" />
+    <Import Project="Lol.Core.Vars.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <Import Project="Lol.Rules.props" />
+  <Import Project="Lol.Core.Rules.props" />
   <ItemDefinitionGroup />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
+    <Import Project="Lol.Fx.targets" />
   </ImportGroup>
-</Project>
+</Project>

win32/testsuite.vcxproj

@@ -50,17 +50,19 @@
     <ConfigurationType>Application</ConfigurationType>
     <Keyword>Win32Proj</Keyword>
   </PropertyGroup>
-  <Import Project="Lol.Config.props" />
+  <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.Vars.props" />
+    <Import Project="Lol.Core.Vars.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <Import Project="Lol.Rules.props" />
+  <Import Project="Lol.Core.Rules.props" />
   <ItemDefinitionGroup />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
+    <Import Project="Lol.Fx.targets" />
   </ImportGroup>
 </Project>