diff --git a/build/vs2010/Lol.Core.Config.props b/build/vs2010/Lol.Core.Config.props
index 710c999e..c3ccdec1 100644
--- a/build/vs2010/Lol.Core.Config.props
+++ b/build/vs2010/Lol.Core.Config.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="Lol.Core.Build.props" />
+  <Import Project="config-build.xml" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
     <UseDebugLibraries>true</UseDebugLibraries>
diff --git a/build/vs2010/Lol.Core.Vars.props b/build/vs2010/Lol.Core.Vars.props
index 7c240c53..ad067dae 100644
--- a/build/vs2010/Lol.Core.Vars.props
+++ b/build/vs2010/Lol.Core.Vars.props
@@ -22,11 +22,11 @@
     <!-- BulletPhysics -->
     <BtPhysDir>$(ContribDir)\bullet-2.80-rev2531</BtPhysDir>
     <BtPhysIncludes>$(BtPhysDir)\include;$(BtPhysDir)\include\bullet</BtPhysIncludes>
-	<Win32Defines>HAVE_PHYS_USE_BULLET;$(Win32Defines)</Win32Defines>
-	<Ps3Defines>HAVE_PHYS_USE_BULLET;$(Ps3Defines)</Ps3Defines>
-	<XboxDefines>HAVE_PHYS_USE_BULLET;$(XboxDefines)</XboxDefines>
+    <Win32Defines Condition="'$(UseBullet)'=='true'">HAVE_PHYS_USE_BULLET;$(Win32Defines)</Win32Defines>
+    <Ps3Defines Condition="'$(UseBullet)'=='true'">HAVE_PHYS_USE_BULLET;$(Ps3Defines)</Ps3Defines>
+    <XboxDefines Condition="'$(UseBullet)'=='true'">HAVE_PHYS_USE_BULLET;$(XboxDefines)</XboxDefines>
 
-	  <!-- GTK+ & GtkGl -->
+    <!-- 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>
diff --git a/build/vs2010/Lol.sln b/build/vs2010/Lol.sln
index 0545d482..89b03422 100644
--- a/build/vs2010/Lol.sln
+++ b/build/vs2010/Lol.sln
@@ -76,7 +76,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "orbital", "..\..\games\orbi
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Engine", "Engine", "{1AFD580B-98B8-4689-B661-38C41132C60E}"
 	ProjectSection(SolutionItems) = preProject
-		Lol.Core.Build.props = Lol.Core.Build.props
+		config-build.xml = config-build.xml
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{3D341D8A-E400-4B1D-BC05-B5C35487D9B5}"
@@ -259,6 +259,14 @@ Global
 		{7B083DA2-FE08-4F6D-BFDD-195D5C2783EB}.Release|Xbox 360.ActiveCfg = Release|Xbox 360
 		{7B083DA2-FE08-4F6D-BFDD-195D5C2783EB}.Release|Xbox 360.Build.0 = Release|Xbox 360
 		{7B083DA2-FE08-4F6D-BFDD-195D5C2783EB}.Release|Xbox 360.Deploy.0 = Release|Xbox 360
+		{1C5B8702-290C-42DA-AA9E-671348F5B747}.Debug|PS3.ActiveCfg = Debug|PS3
+		{1C5B8702-290C-42DA-AA9E-671348F5B747}.Debug|Win32.ActiveCfg = Debug|Win32
+		{1C5B8702-290C-42DA-AA9E-671348F5B747}.Debug|x64.ActiveCfg = Debug|x64
+		{1C5B8702-290C-42DA-AA9E-671348F5B747}.Debug|Xbox 360.ActiveCfg = Debug|Xbox 360
+		{1C5B8702-290C-42DA-AA9E-671348F5B747}.Release|PS3.ActiveCfg = Release|PS3
+		{1C5B8702-290C-42DA-AA9E-671348F5B747}.Release|Win32.ActiveCfg = Release|Win32
+		{1C5B8702-290C-42DA-AA9E-671348F5B747}.Release|x64.ActiveCfg = Release|x64
+		{1C5B8702-290C-42DA-AA9E-671348F5B747}.Release|Xbox 360.ActiveCfg = Release|Xbox 360
 		{6BF81B39-EDC2-4227-9992-C2D8ABEA95AF}.Debug|PS3.ActiveCfg = Debug|PS3
 		{6BF81B39-EDC2-4227-9992-C2D8ABEA95AF}.Debug|PS3.Build.0 = Debug|PS3
 		{6BF81B39-EDC2-4227-9992-C2D8ABEA95AF}.Debug|Win32.ActiveCfg = Debug|Win32
@@ -401,6 +409,7 @@ Global
 		{7B083DA2-FE08-4F6D-BFDD-195D5C2783EB} = {E74CF679-CA2A-47E9-B1F4-3779D6AC6B04}
 		{6BF81B39-EDC2-4227-9992-C2D8ABEA95AF} = {E74CF679-CA2A-47E9-B1F4-3779D6AC6B04}
 		{BCEE0132-8E24-49BE-AFEB-96DAD14396BA} = {E74CF679-CA2A-47E9-B1F4-3779D6AC6B04}
+		{1C5B8702-290C-42DA-AA9E-671348F5B747} = {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}
 		{B357514A-7881-422D-8358-161B689E7620} = {3D341D8A-E400-4B1D-BC05-B5C35487D9B5}
diff --git a/build/vs2010/Lol.Core.Build.props b/build/vs2010/config-build.xml
similarity index 84%
rename from build/vs2010/Lol.Core.Build.props
rename to build/vs2010/config-build.xml
index 5b1c0ce6..5bab9443 100644
--- a/build/vs2010/Lol.Core.Build.props
+++ b/build/vs2010/config-build.xml
@@ -9,5 +9,8 @@
     <!-- Use OpenGL instead of Direct3D? -->
     <UseOpenGL>true</UseOpenGL>
 
+    <!-- Use Bullet for our physics solver? -->
+    <UseBullet>true</UseBullet>
+
   </PropertyGroup>
 </Project>
diff --git a/src/lolcore.vcxproj b/src/lolcore.vcxproj
index 76d3fab6..59e4e441 100644
--- a/src/lolcore.vcxproj
+++ b/src/lolcore.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?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|PS3">
@@ -276,9 +276,7 @@
     <ClCompile Include="math\vector.cpp" />
     <ClCompile Include="platform.cpp" />
     <ClCompile Include="platform\d3d9\d3d9input.cpp" />
-    <ClCompile Condition="'$(Platform)'=='PS3'" Include="platform\ps3\ps3app.cpp" />
     <ClCompile Include="platform\ps3\ps3app.cpp" />
-    <ClCompile Condition="'$(Platform)'=='PS3'" Include="platform\ps3\ps3input.cpp" />
     <ClCompile Include="platform\ps3\ps3input.cpp" />
     <ClCompile Include="platform\sdl\sdlapp.cpp" />
     <ClCompile Include="platform\sdl\sdlinput.cpp" />
@@ -593,9 +591,9 @@
     <ClInclude Include="numeric.h" />
     <ClInclude Include="platform.h" />
     <ClInclude Include="platform\d3d9\d3d9input.h" />
-    <ClInclude Condition="'$(Platform)'=='PS3'" Include="platform\ps3\ps3app.h" />
-    <ClInclude Condition="'$(Platform)'=='PS3'" Include="platform\ps3\ps3input.h" />
-    <ClInclude Condition="'$(Platform)'=='PS3'" Include="platform\ps3\threadbase.h" />
+    <ClInclude Include="platform\ps3\ps3app.h" />
+    <ClInclude Include="platform\ps3\ps3input.h" />
+    <ClInclude Include="platform\ps3\threadbase.h" />
     <ClInclude Include="platform\sdl\sdlapp.h" />
     <ClInclude Include="platform\sdl\sdlinput.h" />
     <ClInclude Include="platform\xbox\xboxapp.h" />
diff --git a/src/lolcore.vcxproj.filters b/src/lolcore.vcxproj.filters
index 5ddb33ea..5aaf4a12 100644
--- a/src/lolcore.vcxproj.filters
+++ b/src/lolcore.vcxproj.filters
@@ -628,6 +628,9 @@
     <ClCompile Include="bullet\BulletCollision\Gimpact\gim_tri_collision.cpp">
       <Filter>bullet</Filter>
     </ClCompile>
+    <ClCompile Include="gpu\lolfx-compiler.cpp">
+      <Filter>src\gpu</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="image\image.h">
@@ -1566,6 +1569,21 @@
     <ClInclude Include="bullet\BulletMultiThreaded\vectormath2bullet.h">
       <Filter>bullet</Filter>
     </ClInclude>
+    <ClInclude Include="gpu\lolfx-compiler.h">
+      <Filter>src\gpu</Filter>
+    </ClInclude>
+    <ClInclude Include="generated\lolfx-parser.h">
+      <Filter>src\gpu</Filter>
+    </ClInclude>
+    <ClInclude Include="platform\ps3\ps3app.h">
+      <Filter>src\platform\ps3</Filter>
+    </ClInclude>
+    <ClInclude Include="platform\ps3\ps3input.h">
+      <Filter>src\platform\ps3</Filter>
+    </ClInclude>
+    <ClInclude Include="platform\ps3\threadbase.h">
+      <Filter>src\platform\ps3</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <LolFxCompile Include="gpu\emptymaterial.lolfx">
@@ -1588,5 +1606,11 @@
     <None Include="easymesh\easymesh-scanner.l">
       <Filter>src\easymesh</Filter>
     </None>
+    <None Include="gpu\lolfx-scanner.l">
+      <Filter>src\gpu</Filter>
+    </None>
+    <None Include="gpu\lolfx-parser.y">
+      <Filter>src\gpu</Filter>
+    </None>
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file