Update MSVC project

platform/msvc2010/love.vcxproj

@@ -15,12 +15,58 @@
     <ClCompile Include="..\..\src\common\delay.cpp" />
     <ClCompile Include="..\..\src\common\Exception.cpp" />
     <ClCompile Include="..\..\src\common\Matrix.cpp" />
+    <ClCompile Include="..\..\src\common\Memoizer.cpp" />
     <ClCompile Include="..\..\src\common\Object.cpp" />
     <ClCompile Include="..\..\src\common\Reference.cpp" />
     <ClCompile Include="..\..\src\common\runtime.cpp" />
     <ClCompile Include="..\..\src\common\utf8.cpp" />
     <ClCompile Include="..\..\src\common\Vector.cpp" />
     <ClCompile Include="..\..\src\common\wrap_Data.cpp" />
+    <ClCompile Include="..\..\src\libraries\Box2D\Collision\b2BroadPhase.cpp" />
+    <ClCompile Include="..\..\src\libraries\Box2D\Collision\b2CollideCircle.cpp" />
+    <ClCompile Include="..\..\src\libraries\Box2D\Collision\b2CollideEdge.cpp" />
+    <ClCompile Include="..\..\src\libraries\Box2D\Collision\b2CollidePolygon.cpp" />
+    <ClCompile Include="..\..\src\libraries\Box2D\Collision\b2Collision.cpp" />
+    <ClCompile Include="..\..\src\libraries\Box2D\Collision\b2Distance.cpp" />
+    <ClCompile Include="..\..\src\libraries\Box2D\Collision\b2DynamicTree.cpp" />
+    <ClCompile Include="..\..\src\libraries\Box2D\Collision\b2TimeOfImpact.cpp" />
+    <ClCompile Include="..\..\src\libraries\Box2D\Collision\Shapes\b2ChainShape.cpp" />
+    <ClCompile Include="..\..\src\libraries\Box2D\Collision\Shapes\b2CircleShape.cpp" />
+    <ClCompile Include="..\..\src\libraries\Box2D\Collision\Shapes\b2EdgeShape.cpp" />
+    <ClCompile Include="..\..\src\libraries\Box2D\Collision\Shapes\b2PolygonShape.cpp" />
+    <ClCompile Include="..\..\src\libraries\Box2D\Common\b2BlockAllocator.cpp" />
+    <ClCompile Include="..\..\src\libraries\Box2D\Common\b2Draw.cpp" />
+    <ClCompile Include="..\..\src\libraries\Box2D\Common\b2Math.cpp" />
+    <ClCompile Include="..\..\src\libraries\Box2D\Common\b2Settings.cpp" />
+    <ClCompile Include="..\..\src\libraries\Box2D\Common\b2StackAllocator.cpp" />
+    <ClCompile Include="..\..\src\libraries\Box2D\Common\b2Timer.cpp" />
+    <ClCompile Include="..\..\src\libraries\Box2D\Dynamics\b2Body.cpp" />
+    <ClCompile Include="..\..\src\libraries\Box2D\Dynamics\b2ContactManager.cpp" />
+    <ClCompile Include="..\..\src\libraries\Box2D\Dynamics\b2Fixture.cpp" />
+    <ClCompile Include="..\..\src\libraries\Box2D\Dynamics\b2Island.cpp" />
+    <ClCompile Include="..\..\src\libraries\Box2D\Dynamics\b2World.cpp" />
+    <ClCompile Include="..\..\src\libraries\Box2D\Dynamics\b2WorldCallbacks.cpp" />
+    <ClCompile Include="..\..\src\libraries\Box2D\Dynamics\Contacts\b2ChainAndCircleContact.cpp" />
+    <ClCompile Include="..\..\src\libraries\Box2D\Dynamics\Contacts\b2ChainAndPolygonContact.cpp" />
+    <ClCompile Include="..\..\src\libraries\Box2D\Dynamics\Contacts\b2CircleContact.cpp" />
+    <ClCompile Include="..\..\src\libraries\Box2D\Dynamics\Contacts\b2Contact.cpp" />
+    <ClCompile Include="..\..\src\libraries\Box2D\Dynamics\Contacts\b2ContactSolver.cpp" />
+    <ClCompile Include="..\..\src\libraries\Box2D\Dynamics\Contacts\b2EdgeAndCircleContact.cpp" />
+    <ClCompile Include="..\..\src\libraries\Box2D\Dynamics\Contacts\b2EdgeAndPolygonContact.cpp" />
+    <ClCompile Include="..\..\src\libraries\Box2D\Dynamics\Contacts\b2PolygonAndCircleContact.cpp" />
+    <ClCompile Include="..\..\src\libraries\Box2D\Dynamics\Contacts\b2PolygonContact.cpp" />
+    <ClCompile Include="..\..\src\libraries\Box2D\Dynamics\Joints\b2DistanceJoint.cpp" />
+    <ClCompile Include="..\..\src\libraries\Box2D\Dynamics\Joints\b2FrictionJoint.cpp" />
+    <ClCompile Include="..\..\src\libraries\Box2D\Dynamics\Joints\b2GearJoint.cpp" />
+    <ClCompile Include="..\..\src\libraries\Box2D\Dynamics\Joints\b2Joint.cpp" />
+    <ClCompile Include="..\..\src\libraries\Box2D\Dynamics\Joints\b2MouseJoint.cpp" />
+    <ClCompile Include="..\..\src\libraries\Box2D\Dynamics\Joints\b2PrismaticJoint.cpp" />
+    <ClCompile Include="..\..\src\libraries\Box2D\Dynamics\Joints\b2PulleyJoint.cpp" />
+    <ClCompile Include="..\..\src\libraries\Box2D\Dynamics\Joints\b2RevoluteJoint.cpp" />
+    <ClCompile Include="..\..\src\libraries\Box2D\Dynamics\Joints\b2RopeJoint.cpp" />
+    <ClCompile Include="..\..\src\libraries\Box2D\Dynamics\Joints\b2WeldJoint.cpp" />
+    <ClCompile Include="..\..\src\libraries\Box2D\Dynamics\Joints\b2WheelJoint.cpp" />
+    <ClCompile Include="..\..\src\libraries\Box2D\Rope\b2Rope.cpp" />
     <ClCompile Include="..\..\src\libraries\luasocket\libluasocket\auxiliar.c">
       <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">TurnOffAllWarnings</WarningLevel>
     </ClCompile>
@@ -130,12 +176,16 @@
     <ClCompile Include="..\..\src\modules\mouse\Mouse.cpp" />
     <ClCompile Include="..\..\src\modules\mouse\sdl\Mouse.cpp" />
     <ClCompile Include="..\..\src\modules\mouse\sdl\wrap_Mouse.cpp" />
+    <ClCompile Include="..\..\src\modules\physics\Body.cpp" />
     <ClCompile Include="..\..\src\modules\physics\box2d\Body.cpp" />
+    <ClCompile Include="..\..\src\modules\physics\box2d\ChainShape.cpp" />
     <ClCompile Include="..\..\src\modules\physics\box2d\CircleShape.cpp" />
     <ClCompile Include="..\..\src\modules\physics\box2d\Contact.cpp" />
     <ClCompile Include="..\..\src\modules\physics\box2d\DistanceJoint.cpp" />
+    <ClCompile Include="..\..\src\modules\physics\box2d\EdgeShape.cpp" />
+    <ClCompile Include="..\..\src\modules\physics\box2d\Fixture.cpp" />
+    <ClCompile Include="..\..\src\modules\physics\box2d\FrictionJoint.cpp" />
     <ClCompile Include="..\..\src\modules\physics\box2d\GearJoint.cpp" />
-    <ClCompile Include="..\..\src\modules\physics\box2d\graham\GrahamScanConvexHull.cpp" />
     <ClCompile Include="..\..\src\modules\physics\box2d\Joint.cpp" />
     <ClCompile Include="..\..\src\modules\physics\box2d\MouseJoint.cpp" />
     <ClCompile Include="..\..\src\modules\physics\box2d\Physics.cpp" />
@@ -143,43 +193,19 @@
     <ClCompile Include="..\..\src\modules\physics\box2d\PrismaticJoint.cpp" />
     <ClCompile Include="..\..\src\modules\physics\box2d\PulleyJoint.cpp" />
     <ClCompile Include="..\..\src\modules\physics\box2d\RevoluteJoint.cpp" />
+    <ClCompile Include="..\..\src\modules\physics\box2d\RopeJoint.cpp" />
     <ClCompile Include="..\..\src\modules\physics\box2d\Shape.cpp" />
-    <ClCompile Include="..\..\src\modules\physics\box2d\Source\Collision\b2BroadPhase.cpp" />
-    <ClCompile Include="..\..\src\modules\physics\box2d\Source\Collision\b2CollideCircle.cpp" />
-    <ClCompile Include="..\..\src\modules\physics\box2d\Source\Collision\b2CollidePoly.cpp" />
-    <ClCompile Include="..\..\src\modules\physics\box2d\Source\Collision\b2Collision.cpp" />
-    <ClCompile Include="..\..\src\modules\physics\box2d\Source\Collision\b2Distance.cpp" />
-    <ClCompile Include="..\..\src\modules\physics\box2d\Source\Collision\b2PairManager.cpp" />
-    <ClCompile Include="..\..\src\modules\physics\box2d\Source\Collision\b2TimeOfImpact.cpp" />
-    <ClCompile Include="..\..\src\modules\physics\box2d\Source\Collision\Shapes\b2CircleShape.cpp" />
-    <ClCompile Include="..\..\src\modules\physics\box2d\Source\Collision\Shapes\b2PolygonShape.cpp" />
-    <ClCompile Include="..\..\src\modules\physics\box2d\Source\Collision\Shapes\b2Shape.cpp" />
-    <ClCompile Include="..\..\src\modules\physics\box2d\Source\Common\b2BlockAllocator.cpp" />
-    <ClCompile Include="..\..\src\modules\physics\box2d\Source\Common\b2Math.cpp" />
-    <ClCompile Include="..\..\src\modules\physics\box2d\Source\Common\b2Settings.cpp" />
-    <ClCompile Include="..\..\src\modules\physics\box2d\Source\Common\b2StackAllocator.cpp" />
-    <ClCompile Include="..\..\src\modules\physics\box2d\Source\Dynamics\b2Body.cpp" />
-    <ClCompile Include="..\..\src\modules\physics\box2d\Source\Dynamics\b2ContactManager.cpp" />
-    <ClCompile Include="..\..\src\modules\physics\box2d\Source\Dynamics\b2Island.cpp" />
-    <ClCompile Include="..\..\src\modules\physics\box2d\Source\Dynamics\b2World.cpp" />
-    <ClCompile Include="..\..\src\modules\physics\box2d\Source\Dynamics\b2WorldCallbacks.cpp" />
-    <ClCompile Include="..\..\src\modules\physics\box2d\Source\Dynamics\Contacts\b2CircleContact.cpp" />
-    <ClCompile Include="..\..\src\modules\physics\box2d\Source\Dynamics\Contacts\b2Contact.cpp" />
-    <ClCompile Include="..\..\src\modules\physics\box2d\Source\Dynamics\Contacts\b2ContactSolver.cpp" />
-    <ClCompile Include="..\..\src\modules\physics\box2d\Source\Dynamics\Contacts\b2PolyAndCircleContact.cpp" />
-    <ClCompile Include="..\..\src\modules\physics\box2d\Source\Dynamics\Contacts\b2PolyContact.cpp" />
-    <ClCompile Include="..\..\src\modules\physics\box2d\Source\Dynamics\Joints\b2DistanceJoint.cpp" />
-    <ClCompile Include="..\..\src\modules\physics\box2d\Source\Dynamics\Joints\b2GearJoint.cpp" />
-    <ClCompile Include="..\..\src\modules\physics\box2d\Source\Dynamics\Joints\b2Joint.cpp" />
-    <ClCompile Include="..\..\src\modules\physics\box2d\Source\Dynamics\Joints\b2MouseJoint.cpp" />
-    <ClCompile Include="..\..\src\modules\physics\box2d\Source\Dynamics\Joints\b2PrismaticJoint.cpp" />
-    <ClCompile Include="..\..\src\modules\physics\box2d\Source\Dynamics\Joints\b2PulleyJoint.cpp" />
-    <ClCompile Include="..\..\src\modules\physics\box2d\Source\Dynamics\Joints\b2RevoluteJoint.cpp" />
+    <ClCompile Include="..\..\src\modules\physics\box2d\WeldJoint.cpp" />
+    <ClCompile Include="..\..\src\modules\physics\box2d\WheelJoint.cpp" />
     <ClCompile Include="..\..\src\modules\physics\box2d\World.cpp" />
     <ClCompile Include="..\..\src\modules\physics\box2d\wrap_Body.cpp" />
+    <ClCompile Include="..\..\src\modules\physics\box2d\wrap_ChainShape.cpp" />
     <ClCompile Include="..\..\src\modules\physics\box2d\wrap_CircleShape.cpp" />
     <ClCompile Include="..\..\src\modules\physics\box2d\wrap_Contact.cpp" />
     <ClCompile Include="..\..\src\modules\physics\box2d\wrap_DistanceJoint.cpp" />
+    <ClCompile Include="..\..\src\modules\physics\box2d\wrap_EdgeShape.cpp" />
+    <ClCompile Include="..\..\src\modules\physics\box2d\wrap_Fixture.cpp" />
+    <ClCompile Include="..\..\src\modules\physics\box2d\wrap_FrictionJoint.cpp" />
     <ClCompile Include="..\..\src\modules\physics\box2d\wrap_GearJoint.cpp" />
     <ClCompile Include="..\..\src\modules\physics\box2d\wrap_Joint.cpp" />
     <ClCompile Include="..\..\src\modules\physics\box2d\wrap_MouseJoint.cpp" />
@@ -188,7 +214,10 @@
     <ClCompile Include="..\..\src\modules\physics\box2d\wrap_PrismaticJoint.cpp" />
     <ClCompile Include="..\..\src\modules\physics\box2d\wrap_PulleyJoint.cpp" />
     <ClCompile Include="..\..\src\modules\physics\box2d\wrap_RevoluteJoint.cpp" />
+    <ClCompile Include="..\..\src\modules\physics\box2d\wrap_RopeJoint.cpp" />
     <ClCompile Include="..\..\src\modules\physics\box2d\wrap_Shape.cpp" />
+    <ClCompile Include="..\..\src\modules\physics\box2d\wrap_WeldJoint.cpp" />
+    <ClCompile Include="..\..\src\modules\physics\box2d\wrap_WheelJoint.cpp" />
     <ClCompile Include="..\..\src\modules\physics\box2d\wrap_World.cpp" />
     <ClCompile Include="..\..\src\modules\physics\Joint.cpp" />
     <ClCompile Include="..\..\src\modules\physics\Shape.cpp" />
@@ -230,6 +259,7 @@
     <ClInclude Include="..\..\src\common\Exception.h" />
     <ClInclude Include="..\..\src\common\math.h" />
     <ClInclude Include="..\..\src\common\Matrix.h" />
+    <ClInclude Include="..\..\src\common\Memoizer.h" />
     <ClInclude Include="..\..\src\common\Module.h" />
     <ClInclude Include="..\..\src\common\Object.h" />
     <ClInclude Include="..\..\src\common\Reference.h" />
@@ -240,6 +270,52 @@
     <ClInclude Include="..\..\src\common\Vector.h" />
     <ClInclude Include="..\..\src\common\version.h" />
     <ClInclude Include="..\..\src\common\wrap_Data.h" />
+    <ClInclude Include="..\..\src\libraries\Box2D\Box2D.h" />
+    <ClInclude Include="..\..\src\libraries\Box2D\Collision\b2BroadPhase.h" />
+    <ClInclude Include="..\..\src\libraries\Box2D\Collision\b2Collision.h" />
+    <ClInclude Include="..\..\src\libraries\Box2D\Collision\b2Distance.h" />
+    <ClInclude Include="..\..\src\libraries\Box2D\Collision\b2DynamicTree.h" />
+    <ClInclude Include="..\..\src\libraries\Box2D\Collision\b2TimeOfImpact.h" />
+    <ClInclude Include="..\..\src\libraries\Box2D\Collision\Shapes\b2ChainShape.h" />
+    <ClInclude Include="..\..\src\libraries\Box2D\Collision\Shapes\b2CircleShape.h" />
+    <ClInclude Include="..\..\src\libraries\Box2D\Collision\Shapes\b2EdgeShape.h" />
+    <ClInclude Include="..\..\src\libraries\Box2D\Collision\Shapes\b2PolygonShape.h" />
+    <ClInclude Include="..\..\src\libraries\Box2D\Collision\Shapes\b2Shape.h" />
+    <ClInclude Include="..\..\src\libraries\Box2D\Common\b2BlockAllocator.h" />
+    <ClInclude Include="..\..\src\libraries\Box2D\Common\b2Draw.h" />
+    <ClInclude Include="..\..\src\libraries\Box2D\Common\b2GrowableStack.h" />
+    <ClInclude Include="..\..\src\libraries\Box2D\Common\b2Math.h" />
+    <ClInclude Include="..\..\src\libraries\Box2D\Common\b2Settings.h" />
+    <ClInclude Include="..\..\src\libraries\Box2D\Common\b2StackAllocator.h" />
+    <ClInclude Include="..\..\src\libraries\Box2D\Common\b2Timer.h" />
+    <ClInclude Include="..\..\src\libraries\Box2D\Dynamics\b2Body.h" />
+    <ClInclude Include="..\..\src\libraries\Box2D\Dynamics\b2ContactManager.h" />
+    <ClInclude Include="..\..\src\libraries\Box2D\Dynamics\b2Fixture.h" />
+    <ClInclude Include="..\..\src\libraries\Box2D\Dynamics\b2Island.h" />
+    <ClInclude Include="..\..\src\libraries\Box2D\Dynamics\b2TimeStep.h" />
+    <ClInclude Include="..\..\src\libraries\Box2D\Dynamics\b2World.h" />
+    <ClInclude Include="..\..\src\libraries\Box2D\Dynamics\b2WorldCallbacks.h" />
+    <ClInclude Include="..\..\src\libraries\Box2D\Dynamics\Contacts\b2ChainAndCircleContact.h" />
+    <ClInclude Include="..\..\src\libraries\Box2D\Dynamics\Contacts\b2ChainAndPolygonContact.h" />
+    <ClInclude Include="..\..\src\libraries\Box2D\Dynamics\Contacts\b2CircleContact.h" />
+    <ClInclude Include="..\..\src\libraries\Box2D\Dynamics\Contacts\b2Contact.h" />
+    <ClInclude Include="..\..\src\libraries\Box2D\Dynamics\Contacts\b2ContactSolver.h" />
+    <ClInclude Include="..\..\src\libraries\Box2D\Dynamics\Contacts\b2EdgeAndCircleContact.h" />
+    <ClInclude Include="..\..\src\libraries\Box2D\Dynamics\Contacts\b2EdgeAndPolygonContact.h" />
+    <ClInclude Include="..\..\src\libraries\Box2D\Dynamics\Contacts\b2PolygonAndCircleContact.h" />
+    <ClInclude Include="..\..\src\libraries\Box2D\Dynamics\Contacts\b2PolygonContact.h" />
+    <ClInclude Include="..\..\src\libraries\Box2D\Dynamics\Joints\b2DistanceJoint.h" />
+    <ClInclude Include="..\..\src\libraries\Box2D\Dynamics\Joints\b2FrictionJoint.h" />
+    <ClInclude Include="..\..\src\libraries\Box2D\Dynamics\Joints\b2GearJoint.h" />
+    <ClInclude Include="..\..\src\libraries\Box2D\Dynamics\Joints\b2Joint.h" />
+    <ClInclude Include="..\..\src\libraries\Box2D\Dynamics\Joints\b2MouseJoint.h" />
+    <ClInclude Include="..\..\src\libraries\Box2D\Dynamics\Joints\b2PrismaticJoint.h" />
+    <ClInclude Include="..\..\src\libraries\Box2D\Dynamics\Joints\b2PulleyJoint.h" />
+    <ClInclude Include="..\..\src\libraries\Box2D\Dynamics\Joints\b2RevoluteJoint.h" />
+    <ClInclude Include="..\..\src\libraries\Box2D\Dynamics\Joints\b2RopeJoint.h" />
+    <ClInclude Include="..\..\src\libraries\Box2D\Dynamics\Joints\b2WeldJoint.h" />
+    <ClInclude Include="..\..\src\libraries\Box2D\Dynamics\Joints\b2WheelJoint.h" />
+    <ClInclude Include="..\..\src\libraries\Box2D\Rope\b2Rope.h" />
     <ClInclude Include="..\..\src\libraries\luasocket\luasocket.h" />
     <ClInclude Include="..\..\src\libraries\utf8\utf8.h" />
     <ClInclude Include="..\..\src\libraries\utf8\utf8\checked.h" />
@@ -312,10 +388,15 @@
     <ClInclude Include="..\..\src\modules\mouse\Mouse.h" />
     <ClInclude Include="..\..\src\modules\mouse\sdl\Mouse.h" />
     <ClInclude Include="..\..\src\modules\mouse\sdl\wrap_Mouse.h" />
+    <ClInclude Include="..\..\src\modules\physics\Body.h" />
     <ClInclude Include="..\..\src\modules\physics\box2d\Body.h" />
+    <ClInclude Include="..\..\src\modules\physics\box2d\ChainShape.h" />
     <ClInclude Include="..\..\src\modules\physics\box2d\CircleShape.h" />
     <ClInclude Include="..\..\src\modules\physics\box2d\Contact.h" />
     <ClInclude Include="..\..\src\modules\physics\box2d\DistanceJoint.h" />
+    <ClInclude Include="..\..\src\modules\physics\box2d\EdgeShape.h" />
+    <ClInclude Include="..\..\src\modules\physics\box2d\Fixture.h" />
+    <ClInclude Include="..\..\src\modules\physics\box2d\FrictionJoint.h" />
     <ClInclude Include="..\..\src\modules\physics\box2d\GearJoint.h" />
     <ClInclude Include="..\..\src\modules\physics\box2d\Joint.h" />
     <ClInclude Include="..\..\src\modules\physics\box2d\MouseJoint.h" />
@@ -324,12 +405,19 @@
     <ClInclude Include="..\..\src\modules\physics\box2d\PrismaticJoint.h" />
     <ClInclude Include="..\..\src\modules\physics\box2d\PulleyJoint.h" />
     <ClInclude Include="..\..\src\modules\physics\box2d\RevoluteJoint.h" />
+    <ClInclude Include="..\..\src\modules\physics\box2d\RopeJoint.h" />
     <ClInclude Include="..\..\src\modules\physics\box2d\Shape.h" />
+    <ClInclude Include="..\..\src\modules\physics\box2d\WeldJoint.h" />
+    <ClInclude Include="..\..\src\modules\physics\box2d\WheelJoint.h" />
     <ClInclude Include="..\..\src\modules\physics\box2d\World.h" />
     <ClInclude Include="..\..\src\modules\physics\box2d\wrap_Body.h" />
+    <ClInclude Include="..\..\src\modules\physics\box2d\wrap_ChainShape.h" />
     <ClInclude Include="..\..\src\modules\physics\box2d\wrap_CircleShape.h" />
     <ClInclude Include="..\..\src\modules\physics\box2d\wrap_Contact.h" />
     <ClInclude Include="..\..\src\modules\physics\box2d\wrap_DistanceJoint.h" />
+    <ClInclude Include="..\..\src\modules\physics\box2d\wrap_EdgeShape.h" />
+    <ClInclude Include="..\..\src\modules\physics\box2d\wrap_Fixture.h" />
+    <ClInclude Include="..\..\src\modules\physics\box2d\wrap_FrictionJoint.h" />
     <ClInclude Include="..\..\src\modules\physics\box2d\wrap_GearJoint.h" />
     <ClInclude Include="..\..\src\modules\physics\box2d\wrap_Joint.h" />
     <ClInclude Include="..\..\src\modules\physics\box2d\wrap_MouseJoint.h" />
@@ -338,7 +426,10 @@
     <ClInclude Include="..\..\src\modules\physics\box2d\wrap_PrismaticJoint.h" />
     <ClInclude Include="..\..\src\modules\physics\box2d\wrap_PulleyJoint.h" />
     <ClInclude Include="..\..\src\modules\physics\box2d\wrap_RevoluteJoint.h" />
+    <ClInclude Include="..\..\src\modules\physics\box2d\wrap_RopeJoint.h" />
     <ClInclude Include="..\..\src\modules\physics\box2d\wrap_Shape.h" />
+    <ClInclude Include="..\..\src\modules\physics\box2d\wrap_WeldJoint.h" />
+    <ClInclude Include="..\..\src\modules\physics\box2d\wrap_WheelJoint.h" />
     <ClInclude Include="..\..\src\modules\physics\box2d\wrap_World.h" />
     <ClInclude Include="..\..\src\modules\physics\Joint.h" />
     <ClInclude Include="..\..\src\modules\physics\Shape.h" />
@@ -397,7 +488,7 @@
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>include;include\SDL;include\AL;..\..\src;..\..\src\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>include;include\SDL;include\AL;..\..\src;..\..\src\libraries;..\..\src\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <ObjectFileName>%(Identity)_d.obj</ObjectFileName>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
@@ -420,7 +511,7 @@
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>include;include\SDL;include\AL;..\..\src;..\..\src\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>include;include\SDL;include\AL;..\..\src;..\..\src\libraries;..\..\src\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
       <ObjectFileName>%(Identity).obj</ObjectFileName>

platform/msvc2010/love.vcxproj.filters

@@ -64,12 +64,6 @@
     <Filter Include="modules\physics">
       <UniqueIdentifier>{b1d3e8d2-4ac9-4f6a-b69d-7ac42113d87f}</UniqueIdentifier>
     </Filter>
-    <Filter Include="modules\physics\box2d">
-      <UniqueIdentifier>{56c3b1e6-7dbc-40df-be87-11e6531de639}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="modules\physics\box2d\Source">
-      <UniqueIdentifier>{d05db3cf-4382-4e60-93ec-f0003a477a4c}</UniqueIdentifier>
-    </Filter>
     <Filter Include="modules\sound">
       <UniqueIdentifier>{cee682a4-e85e-49e5-b67c-c7ee37cca3aa}</UniqueIdentifier>
     </Filter>
@@ -109,6 +103,33 @@
     <Filter Include="modules\thread\posix">
       <UniqueIdentifier>{58b00bbb-5c09-4510-8a23-5c3f869354b2}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Box2D">
+      <UniqueIdentifier>{5e41ee66-11e1-479f-8937-b14436a34de1}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Box2D\Collision">
+      <UniqueIdentifier>{997022df-9fb8-4c89-9030-669d180c5a98}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Box2D\Common">
+      <UniqueIdentifier>{e757e102-2b56-4802-9a6d-03be5d69be25}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Box2D\Dynamics">
+      <UniqueIdentifier>{31f30224-9040-4f55-b5fa-3e5a288e75d0}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Box2D\Rope">
+      <UniqueIdentifier>{33235938-7b0c-451e-be82-8fe0cdb5a7be}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Box2D\Collision\Shapes">
+      <UniqueIdentifier>{31ed03bf-a64f-4508-8de3-de81c295a31f}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Box2D\Dynamics\Contacts">
+      <UniqueIdentifier>{12990be8-e8f2-4b22-994e-edd15c2b1cdd}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Box2D\Dynamics\Joints">
+      <UniqueIdentifier>{0af6f9d5-64f5-4d97-bc07-502d9c7c6f7b}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="modules\physics\box2d">
+      <UniqueIdentifier>{9282b1b4-0df5-4180-8840-ea58561dc7b8}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\src\love.cpp" />
@@ -283,192 +304,6 @@
     <ClCompile Include="..\..\src\modules\mouse\sdl\wrap_Mouse.cpp">
       <Filter>modules\mouse\sdl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\modules\physics\Joint.cpp">
-      <Filter>modules\physics</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\modules\physics\Shape.cpp">
-      <Filter>modules\physics</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\modules\physics\box2d\Body.cpp">
-      <Filter>modules\physics\box2d</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\modules\physics\box2d\CircleShape.cpp">
-      <Filter>modules\physics\box2d</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\modules\physics\box2d\Contact.cpp">
-      <Filter>modules\physics\box2d</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\modules\physics\box2d\DistanceJoint.cpp">
-      <Filter>modules\physics\box2d</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\modules\physics\box2d\GearJoint.cpp">
-      <Filter>modules\physics\box2d</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\modules\physics\box2d\Joint.cpp">
-      <Filter>modules\physics\box2d</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\modules\physics\box2d\MouseJoint.cpp">
-      <Filter>modules\physics\box2d</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\modules\physics\box2d\Physics.cpp">
-      <Filter>modules\physics\box2d</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\modules\physics\box2d\PolygonShape.cpp">
-      <Filter>modules\physics\box2d</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\modules\physics\box2d\PrismaticJoint.cpp">
-      <Filter>modules\physics\box2d</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\modules\physics\box2d\PulleyJoint.cpp">
-      <Filter>modules\physics\box2d</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\modules\physics\box2d\RevoluteJoint.cpp">
-      <Filter>modules\physics\box2d</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\modules\physics\box2d\Shape.cpp">
-      <Filter>modules\physics\box2d</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\modules\physics\box2d\World.cpp">
-      <Filter>modules\physics\box2d</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\modules\physics\box2d\wrap_Body.cpp">
-      <Filter>modules\physics\box2d</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\modules\physics\box2d\wrap_CircleShape.cpp">
-      <Filter>modules\physics\box2d</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\modules\physics\box2d\wrap_Contact.cpp">
-      <Filter>modules\physics\box2d</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\modules\physics\box2d\wrap_DistanceJoint.cpp">
-      <Filter>modules\physics\box2d</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\modules\physics\box2d\wrap_GearJoint.cpp">
-      <Filter>modules\physics\box2d</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\modules\physics\box2d\wrap_Joint.cpp">
-      <Filter>modules\physics\box2d</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\modules\physics\box2d\wrap_MouseJoint.cpp">
-      <Filter>modules\physics\box2d</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\modules\physics\box2d\wrap_Physics.cpp">
-      <Filter>modules\physics\box2d</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\modules\physics\box2d\wrap_PolygonShape.cpp">
-      <Filter>modules\physics\box2d</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\modules\physics\box2d\wrap_PrismaticJoint.cpp">
-      <Filter>modules\physics\box2d</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\modules\physics\box2d\wrap_PulleyJoint.cpp">
-      <Filter>modules\physics\box2d</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\modules\physics\box2d\wrap_RevoluteJoint.cpp">
-      <Filter>modules\physics\box2d</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\modules\physics\box2d\wrap_Shape.cpp">
-      <Filter>modules\physics\box2d</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\modules\physics\box2d\wrap_World.cpp">
-      <Filter>modules\physics\box2d</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\modules\physics\box2d\Source\Collision\Shapes\b2CircleShape.cpp">
-      <Filter>modules\physics\box2d\Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\modules\physics\box2d\Source\Collision\Shapes\b2PolygonShape.cpp">
-      <Filter>modules\physics\box2d\Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\modules\physics\box2d\Source\Collision\Shapes\b2Shape.cpp">
-      <Filter>modules\physics\box2d\Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\modules\physics\box2d\Source\Collision\b2BroadPhase.cpp">
-      <Filter>modules\physics\box2d\Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\modules\physics\box2d\Source\Collision\b2CollideCircle.cpp">
-      <Filter>modules\physics\box2d\Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\modules\physics\box2d\Source\Collision\b2CollidePoly.cpp">
-      <Filter>modules\physics\box2d\Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\modules\physics\box2d\Source\Collision\b2Collision.cpp">
-      <Filter>modules\physics\box2d\Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\modules\physics\box2d\Source\Collision\b2Distance.cpp">
-      <Filter>modules\physics\box2d\Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\modules\physics\box2d\Source\Collision\b2PairManager.cpp">
-      <Filter>modules\physics\box2d\Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\modules\physics\box2d\Source\Collision\b2TimeOfImpact.cpp">
-      <Filter>modules\physics\box2d\Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\modules\physics\box2d\Source\Common\b2BlockAllocator.cpp">
-      <Filter>modules\physics\box2d\Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\modules\physics\box2d\Source\Common\b2Math.cpp">
-      <Filter>modules\physics\box2d\Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\modules\physics\box2d\Source\Common\b2Settings.cpp">
-      <Filter>modules\physics\box2d\Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\modules\physics\box2d\Source\Common\b2StackAllocator.cpp">
-      <Filter>modules\physics\box2d\Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\modules\physics\box2d\Source\Dynamics\b2Body.cpp">
-      <Filter>modules\physics\box2d\Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\modules\physics\box2d\Source\Dynamics\b2ContactManager.cpp">
-      <Filter>modules\physics\box2d\Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\modules\physics\box2d\Source\Dynamics\b2Island.cpp">
-      <Filter>modules\physics\box2d\Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\modules\physics\box2d\Source\Dynamics\b2World.cpp">
-      <Filter>modules\physics\box2d\Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\modules\physics\box2d\Source\Dynamics\b2WorldCallbacks.cpp">
-      <Filter>modules\physics\box2d\Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\modules\physics\box2d\Source\Dynamics\Contacts\b2PolyAndCircleContact.cpp">
-      <Filter>modules\physics\box2d\Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\modules\physics\box2d\Source\Dynamics\Contacts\b2PolyContact.cpp">
-      <Filter>modules\physics\box2d\Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\modules\physics\box2d\Source\Dynamics\Contacts\b2CircleContact.cpp">
-      <Filter>modules\physics\box2d\Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\modules\physics\box2d\Source\Dynamics\Contacts\b2Contact.cpp">
-      <Filter>modules\physics\box2d\Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\modules\physics\box2d\Source\Dynamics\Contacts\b2ContactSolver.cpp">
-      <Filter>modules\physics\box2d\Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\modules\physics\box2d\Source\Dynamics\Joints\b2PulleyJoint.cpp">
-      <Filter>modules\physics\box2d\Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\modules\physics\box2d\Source\Dynamics\Joints\b2RevoluteJoint.cpp">
-      <Filter>modules\physics\box2d\Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\modules\physics\box2d\Source\Dynamics\Joints\b2DistanceJoint.cpp">
-      <Filter>modules\physics\box2d\Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\modules\physics\box2d\Source\Dynamics\Joints\b2GearJoint.cpp">
-      <Filter>modules\physics\box2d\Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\modules\physics\box2d\Source\Dynamics\Joints\b2Joint.cpp">
-      <Filter>modules\physics\box2d\Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\modules\physics\box2d\Source\Dynamics\Joints\b2MouseJoint.cpp">
-      <Filter>modules\physics\box2d\Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\modules\physics\box2d\Source\Dynamics\Joints\b2PrismaticJoint.cpp">
-      <Filter>modules\physics\box2d\Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\modules\physics\box2d\graham\GrahamScanConvexHull.cpp">
-      <Filter>modules\physics\box2d\Source</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\modules\sound\Sound.cpp">
       <Filter>modules\sound</Filter>
     </ClCompile>
@@ -619,277 +454,460 @@
     <ClCompile Include="..\..\src\modules\graphics\Quad.cpp">
       <Filter>modules\graphics</Filter>
     </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\src\modules\audio\Audio.h">
-      <Filter>modules\audio</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\modules\audio\Source.h">
-      <Filter>modules\audio</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\modules\audio\wrap_Audio.h">
-      <Filter>modules\audio</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\modules\audio\wrap_Source.h">
-      <Filter>modules\audio</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\modules\audio\openal\Audio.h">
-      <Filter>modules\audio\openal</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\modules\audio\openal\Pool.h">
-      <Filter>modules\audio\openal</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\modules\audio\openal\Source.h">
-      <Filter>modules\audio\openal</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\modules\audio\null\Audio.h">
-      <Filter>modules\audio\null</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\modules\audio\null\Source.h">
-      <Filter>modules\audio\null</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\modules\event\Event.h">
-      <Filter>modules\event</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\modules\event\sdl\Event.h">
-      <Filter>modules\event\sdl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\modules\event\sdl\wrap_Event.h">
-      <Filter>modules\event\sdl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\modules\filesystem\File.h">
-      <Filter>modules\filesystem</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\modules\filesystem\FileData.h">
-      <Filter>modules\filesystem</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\modules\filesystem\physfs\File.h">
-      <Filter>modules\filesystem\physfs</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\modules\filesystem\physfs\Filesystem.h">
-      <Filter>modules\filesystem\physfs</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\modules\filesystem\physfs\wrap_File.h">
-      <Filter>modules\filesystem\physfs</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\modules\filesystem\physfs\wrap_FileData.h">
-      <Filter>modules\filesystem\physfs</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\modules\filesystem\physfs\wrap_Filesystem.h">
-      <Filter>modules\filesystem\physfs</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\modules\font\Font.h">
-      <Filter>modules\font</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\modules\font\GlyphData.h">
-      <Filter>modules\font</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\modules\font\ImageRasterizer.h">
-      <Filter>modules\font</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\modules\font\Rasterizer.h">
-      <Filter>modules\font</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\modules\font\wrap_GlyphData.h">
-      <Filter>modules\font</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\modules\font\wrap_Rasterizer.h">
-      <Filter>modules\font</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\modules\font\freetype\Font.h">
-      <Filter>modules\font\freetype</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\modules\font\freetype\TrueTypeRasterizer.h">
-      <Filter>modules\font\freetype</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\modules\font\freetype\wrap_Font.h">
-      <Filter>modules\font\freetype</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\modules\graphics\Drawable.h">
-      <Filter>modules\graphics</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\modules\graphics\Graphics.h">
-      <Filter>modules\graphics</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\modules\graphics\Image.h">
-      <Filter>modules\graphics</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\modules\graphics\Volatile.h">
-      <Filter>modules\graphics</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\modules\graphics\opengl\Font.h">
-      <Filter>modules\graphics\opengl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\modules\graphics\opengl\GLee.h">
-      <Filter>modules\graphics\opengl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\modules\graphics\opengl\Graphics.h">
-      <Filter>modules\graphics\opengl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\modules\graphics\opengl\Image.h">
-      <Filter>modules\graphics\opengl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\modules\graphics\opengl\ParticleSystem.h">
-      <Filter>modules\graphics\opengl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\modules\graphics\opengl\Quad.h">
-      <Filter>modules\graphics\opengl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\modules\graphics\opengl\SpriteBatch.h">
-      <Filter>modules\graphics\opengl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\modules\graphics\opengl\wrap_Font.h">
-      <Filter>modules\graphics\opengl</Filter>
+    <ClCompile Include="..\..\src\libraries\Box2D\Collision\Shapes\b2ChainShape.cpp">
+      <Filter>Box2D\Collision\Shapes</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\libraries\Box2D\Collision\Shapes\b2CircleShape.cpp">
+      <Filter>Box2D\Collision\Shapes</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\libraries\Box2D\Collision\Shapes\b2EdgeShape.cpp">
+      <Filter>Box2D\Collision\Shapes</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\libraries\Box2D\Collision\Shapes\b2PolygonShape.cpp">
+      <Filter>Box2D\Collision\Shapes</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\libraries\Box2D\Collision\b2BroadPhase.cpp">
+      <Filter>Box2D\Collision</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\libraries\Box2D\Collision\b2CollideCircle.cpp">
+      <Filter>Box2D\Collision</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\libraries\Box2D\Collision\b2CollideEdge.cpp">
+      <Filter>Box2D\Collision</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\libraries\Box2D\Collision\b2CollidePolygon.cpp">
+      <Filter>Box2D\Collision</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\libraries\Box2D\Collision\b2Collision.cpp">
+      <Filter>Box2D\Collision</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\libraries\Box2D\Collision\b2Distance.cpp">
+      <Filter>Box2D\Collision</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\libraries\Box2D\Collision\b2DynamicTree.cpp">
+      <Filter>Box2D\Collision</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\libraries\Box2D\Collision\b2TimeOfImpact.cpp">
+      <Filter>Box2D\Collision</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\libraries\Box2D\Common\b2BlockAllocator.cpp">
+      <Filter>Box2D\Common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\libraries\Box2D\Common\b2Draw.cpp">
+      <Filter>Box2D\Common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\libraries\Box2D\Common\b2Math.cpp">
+      <Filter>Box2D\Common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\libraries\Box2D\Common\b2Settings.cpp">
+      <Filter>Box2D\Common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\libraries\Box2D\Common\b2StackAllocator.cpp">
+      <Filter>Box2D\Common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\libraries\Box2D\Common\b2Timer.cpp">
+      <Filter>Box2D\Common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\libraries\Box2D\Dynamics\Contacts\b2ChainAndPolygonContact.cpp">
+      <Filter>Box2D\Dynamics\Contacts</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\libraries\Box2D\Dynamics\Contacts\b2CircleContact.cpp">
+      <Filter>Box2D\Dynamics\Contacts</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\libraries\Box2D\Dynamics\Contacts\b2Contact.cpp">
+      <Filter>Box2D\Dynamics\Contacts</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\libraries\Box2D\Dynamics\Contacts\b2ContactSolver.cpp">
+      <Filter>Box2D\Dynamics\Contacts</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\libraries\Box2D\Dynamics\Contacts\b2EdgeAndCircleContact.cpp">
+      <Filter>Box2D\Dynamics\Contacts</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\libraries\Box2D\Dynamics\Contacts\b2EdgeAndPolygonContact.cpp">
+      <Filter>Box2D\Dynamics\Contacts</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\libraries\Box2D\Dynamics\Contacts\b2PolygonAndCircleContact.cpp">
+      <Filter>Box2D\Dynamics\Contacts</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\libraries\Box2D\Dynamics\Contacts\b2PolygonContact.cpp">
+      <Filter>Box2D\Dynamics\Contacts</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\libraries\Box2D\Dynamics\Contacts\b2ChainAndCircleContact.cpp">
+      <Filter>Box2D\Dynamics\Contacts</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\libraries\Box2D\Dynamics\Joints\b2RevoluteJoint.cpp">
+      <Filter>Box2D\Dynamics\Joints</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\libraries\Box2D\Dynamics\Joints\b2RopeJoint.cpp">
+      <Filter>Box2D\Dynamics\Joints</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\libraries\Box2D\Dynamics\Joints\b2WeldJoint.cpp">
+      <Filter>Box2D\Dynamics\Joints</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\libraries\Box2D\Dynamics\Joints\b2WheelJoint.cpp">
+      <Filter>Box2D\Dynamics\Joints</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\libraries\Box2D\Dynamics\Joints\b2DistanceJoint.cpp">
+      <Filter>Box2D\Dynamics\Joints</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\libraries\Box2D\Dynamics\Joints\b2FrictionJoint.cpp">
+      <Filter>Box2D\Dynamics\Joints</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\libraries\Box2D\Dynamics\Joints\b2GearJoint.cpp">
+      <Filter>Box2D\Dynamics\Joints</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\libraries\Box2D\Dynamics\Joints\b2Joint.cpp">
+      <Filter>Box2D\Dynamics\Joints</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\libraries\Box2D\Dynamics\Joints\b2MouseJoint.cpp">
+      <Filter>Box2D\Dynamics\Joints</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\libraries\Box2D\Dynamics\Joints\b2PrismaticJoint.cpp">
+      <Filter>Box2D\Dynamics\Joints</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\libraries\Box2D\Dynamics\Joints\b2PulleyJoint.cpp">
+      <Filter>Box2D\Dynamics\Joints</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\libraries\Box2D\Dynamics\b2Body.cpp">
+      <Filter>Box2D\Dynamics</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\libraries\Box2D\Dynamics\b2ContactManager.cpp">
+      <Filter>Box2D\Dynamics</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\libraries\Box2D\Dynamics\b2Fixture.cpp">
+      <Filter>Box2D\Dynamics</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\libraries\Box2D\Dynamics\b2Island.cpp">
+      <Filter>Box2D\Dynamics</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\libraries\Box2D\Dynamics\b2World.cpp">
+      <Filter>Box2D\Dynamics</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\libraries\Box2D\Dynamics\b2WorldCallbacks.cpp">
+      <Filter>Box2D\Dynamics</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\libraries\Box2D\Rope\b2Rope.cpp">
+      <Filter>Box2D\Rope</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\modules\physics\Body.cpp">
+      <Filter>modules\physics</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\modules\physics\Joint.cpp">
+      <Filter>modules\physics</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\modules\physics\Shape.cpp">
+      <Filter>modules\physics</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\modules\physics\box2d\Body.cpp">
+      <Filter>modules\physics\box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\modules\physics\box2d\ChainShape.cpp">
+      <Filter>modules\physics\box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\modules\physics\box2d\CircleShape.cpp">
+      <Filter>modules\physics\box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\modules\physics\box2d\Contact.cpp">
+      <Filter>modules\physics\box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\modules\physics\box2d\DistanceJoint.cpp">
+      <Filter>modules\physics\box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\modules\physics\box2d\EdgeShape.cpp">
+      <Filter>modules\physics\box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\modules\physics\box2d\Fixture.cpp">
+      <Filter>modules\physics\box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\modules\physics\box2d\FrictionJoint.cpp">
+      <Filter>modules\physics\box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\modules\physics\box2d\GearJoint.cpp">
+      <Filter>modules\physics\box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\modules\physics\box2d\Joint.cpp">
+      <Filter>modules\physics\box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\modules\physics\box2d\MouseJoint.cpp">
+      <Filter>modules\physics\box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\modules\physics\box2d\Physics.cpp">
+      <Filter>modules\physics\box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\modules\physics\box2d\PolygonShape.cpp">
+      <Filter>modules\physics\box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\modules\physics\box2d\PrismaticJoint.cpp">
+      <Filter>modules\physics\box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\modules\physics\box2d\PulleyJoint.cpp">
+      <Filter>modules\physics\box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\modules\physics\box2d\RevoluteJoint.cpp">
+      <Filter>modules\physics\box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\modules\physics\box2d\RopeJoint.cpp">
+      <Filter>modules\physics\box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\modules\physics\box2d\Shape.cpp">
+      <Filter>modules\physics\box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\modules\physics\box2d\WeldJoint.cpp">
+      <Filter>modules\physics\box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\modules\physics\box2d\WheelJoint.cpp">
+      <Filter>modules\physics\box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\modules\physics\box2d\World.cpp">
+      <Filter>modules\physics\box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\modules\physics\box2d\wrap_Body.cpp">
+      <Filter>modules\physics\box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\modules\physics\box2d\wrap_ChainShape.cpp">
+      <Filter>modules\physics\box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\modules\physics\box2d\wrap_CircleShape.cpp">
+      <Filter>modules\physics\box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\modules\physics\box2d\wrap_Contact.cpp">
+      <Filter>modules\physics\box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\modules\physics\box2d\wrap_DistanceJoint.cpp">
+      <Filter>modules\physics\box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\modules\physics\box2d\wrap_EdgeShape.cpp">
+      <Filter>modules\physics\box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\modules\physics\box2d\wrap_Fixture.cpp">
+      <Filter>modules\physics\box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\modules\physics\box2d\wrap_FrictionJoint.cpp">
+      <Filter>modules\physics\box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\modules\physics\box2d\wrap_GearJoint.cpp">
+      <Filter>modules\physics\box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\modules\physics\box2d\wrap_Joint.cpp">
+      <Filter>modules\physics\box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\modules\physics\box2d\wrap_MouseJoint.cpp">
+      <Filter>modules\physics\box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\modules\physics\box2d\wrap_Physics.cpp">
+      <Filter>modules\physics\box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\modules\physics\box2d\wrap_PolygonShape.cpp">
+      <Filter>modules\physics\box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\modules\physics\box2d\wrap_PrismaticJoint.cpp">
+      <Filter>modules\physics\box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\modules\physics\box2d\wrap_PulleyJoint.cpp">
+      <Filter>modules\physics\box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\modules\physics\box2d\wrap_RevoluteJoint.cpp">
+      <Filter>modules\physics\box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\modules\physics\box2d\wrap_RopeJoint.cpp">
+      <Filter>modules\physics\box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\modules\physics\box2d\wrap_Shape.cpp">
+      <Filter>modules\physics\box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\modules\physics\box2d\wrap_WeldJoint.cpp">
+      <Filter>modules\physics\box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\modules\physics\box2d\wrap_WheelJoint.cpp">
+      <Filter>modules\physics\box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\modules\physics\box2d\wrap_World.cpp">
+      <Filter>modules\physics\box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\common\Memoizer.cpp">
+      <Filter>common</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\src\modules\audio\Audio.h">
+      <Filter>modules\audio</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\modules\graphics\opengl\wrap_Graphics.h">
-      <Filter>modules\graphics\opengl</Filter>
+    <ClInclude Include="..\..\src\modules\audio\Source.h">
+      <Filter>modules\audio</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\modules\graphics\opengl\wrap_Image.h">
-      <Filter>modules\graphics\opengl</Filter>
+    <ClInclude Include="..\..\src\modules\audio\wrap_Audio.h">
+      <Filter>modules\audio</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\modules\graphics\opengl\wrap_ParticleSystem.h">
-      <Filter>modules\graphics\opengl</Filter>
+    <ClInclude Include="..\..\src\modules\audio\wrap_Source.h">
+      <Filter>modules\audio</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\modules\graphics\opengl\wrap_Quad.h">
-      <Filter>modules\graphics\opengl</Filter>
+    <ClInclude Include="..\..\src\modules\audio\openal\Audio.h">
+      <Filter>modules\audio\openal</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\modules\graphics\opengl\wrap_SpriteBatch.h">
-      <Filter>modules\graphics\opengl</Filter>
+    <ClInclude Include="..\..\src\modules\audio\openal\Pool.h">
+      <Filter>modules\audio\openal</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\modules\image\Image.h">
-      <Filter>modules\image</Filter>
+    <ClInclude Include="..\..\src\modules\audio\openal\Source.h">
+      <Filter>modules\audio\openal</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\modules\image\ImageData.h">
-      <Filter>modules\image</Filter>
+    <ClInclude Include="..\..\src\modules\audio\null\Audio.h">
+      <Filter>modules\audio\null</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\modules\image\wrap_Image.h">
-      <Filter>modules\image</Filter>
+    <ClInclude Include="..\..\src\modules\audio\null\Source.h">
+      <Filter>modules\audio\null</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\modules\image\wrap_ImageData.h">
-      <Filter>modules\image</Filter>
+    <ClInclude Include="..\..\src\modules\event\Event.h">
+      <Filter>modules\event</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\modules\image\devil\Image.h">
-      <Filter>modules\image\devil</Filter>
+    <ClInclude Include="..\..\src\modules\event\sdl\Event.h">
+      <Filter>modules\event\sdl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\modules\image\devil\ImageData.h">
-      <Filter>modules\image\devil</Filter>
+    <ClInclude Include="..\..\src\modules\event\sdl\wrap_Event.h">
+      <Filter>modules\event\sdl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\modules\joystick\Joystick.h">
-      <Filter>modules\joystick</Filter>
+    <ClInclude Include="..\..\src\modules\filesystem\File.h">
+      <Filter>modules\filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\modules\joystick\sdl\Joystick.h">
-      <Filter>modules\joystick\sdl</Filter>
+    <ClInclude Include="..\..\src\modules\filesystem\FileData.h">
+      <Filter>modules\filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\modules\joystick\sdl\wrap_Joystick.h">
-      <Filter>modules\joystick\sdl</Filter>
+    <ClInclude Include="..\..\src\modules\filesystem\physfs\File.h">
+      <Filter>modules\filesystem\physfs</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\modules\keyboard\Keyboard.h">
-      <Filter>modules\keyboard</Filter>
+    <ClInclude Include="..\..\src\modules\filesystem\physfs\Filesystem.h">
+      <Filter>modules\filesystem\physfs</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\modules\keyboard\sdl\Keyboard.h">
-      <Filter>modules\keyboard\sdl</Filter>
+    <ClInclude Include="..\..\src\modules\filesystem\physfs\wrap_File.h">
+      <Filter>modules\filesystem\physfs</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\modules\keyboard\sdl\wrap_Keyboard.h">
-      <Filter>modules\keyboard\sdl</Filter>
+    <ClInclude Include="..\..\src\modules\filesystem\physfs\wrap_FileData.h">
+      <Filter>modules\filesystem\physfs</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\modules\mouse\Mouse.h">
-      <Filter>modules\mouse</Filter>
+    <ClInclude Include="..\..\src\modules\filesystem\physfs\wrap_Filesystem.h">
+      <Filter>modules\filesystem\physfs</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\modules\mouse\sdl\Mouse.h">
-      <Filter>modules\mouse\sdl</Filter>
+    <ClInclude Include="..\..\src\modules\font\Font.h">
+      <Filter>modules\font</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\modules\mouse\sdl\wrap_Mouse.h">
-      <Filter>modules\mouse\sdl</Filter>
+    <ClInclude Include="..\..\src\modules\font\GlyphData.h">
+      <Filter>modules\font</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\modules\physics\Joint.h">
-      <Filter>modules\physics</Filter>
+    <ClInclude Include="..\..\src\modules\font\ImageRasterizer.h">
+      <Filter>modules\font</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\modules\physics\Shape.h">
-      <Filter>modules\physics</Filter>
+    <ClInclude Include="..\..\src\modules\font\Rasterizer.h">
+      <Filter>modules\font</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\modules\physics\box2d\Body.h">
-      <Filter>modules\physics\box2d</Filter>
+    <ClInclude Include="..\..\src\modules\font\wrap_GlyphData.h">
+      <Filter>modules\font</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\modules\physics\box2d\CircleShape.h">
-      <Filter>modules\physics\box2d</Filter>
+    <ClInclude Include="..\..\src\modules\font\wrap_Rasterizer.h">
+      <Filter>modules\font</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\modules\physics\box2d\Contact.h">
-      <Filter>modules\physics\box2d</Filter>
+    <ClInclude Include="..\..\src\modules\font\freetype\Font.h">
+      <Filter>modules\font\freetype</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\modules\physics\box2d\DistanceJoint.h">
-      <Filter>modules\physics\box2d</Filter>
+    <ClInclude Include="..\..\src\modules\font\freetype\TrueTypeRasterizer.h">
+      <Filter>modules\font\freetype</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\modules\physics\box2d\GearJoint.h">
-      <Filter>modules\physics\box2d</Filter>
+    <ClInclude Include="..\..\src\modules\font\freetype\wrap_Font.h">
+      <Filter>modules\font\freetype</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\modules\physics\box2d\Joint.h">
-      <Filter>modules\physics\box2d</Filter>
+    <ClInclude Include="..\..\src\modules\graphics\Drawable.h">
+      <Filter>modules\graphics</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\modules\graphics\Graphics.h">
+      <Filter>modules\graphics</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\modules\graphics\Image.h">
+      <Filter>modules\graphics</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\modules\graphics\Volatile.h">
+      <Filter>modules\graphics</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\modules\graphics\opengl\Font.h">
+      <Filter>modules\graphics\opengl</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\modules\graphics\opengl\GLee.h">
+      <Filter>modules\graphics\opengl</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\modules\graphics\opengl\Graphics.h">
+      <Filter>modules\graphics\opengl</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\modules\graphics\opengl\Image.h">
+      <Filter>modules\graphics\opengl</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\modules\graphics\opengl\ParticleSystem.h">
+      <Filter>modules\graphics\opengl</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\modules\graphics\opengl\Quad.h">
+      <Filter>modules\graphics\opengl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\modules\physics\box2d\MouseJoint.h">
-      <Filter>modules\physics\box2d</Filter>
+    <ClInclude Include="..\..\src\modules\graphics\opengl\SpriteBatch.h">
+      <Filter>modules\graphics\opengl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\modules\physics\box2d\Physics.h">
-      <Filter>modules\physics\box2d</Filter>
+    <ClInclude Include="..\..\src\modules\graphics\opengl\wrap_Font.h">
+      <Filter>modules\graphics\opengl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\modules\physics\box2d\PolygonShape.h">
-      <Filter>modules\physics\box2d</Filter>
+    <ClInclude Include="..\..\src\modules\graphics\opengl\wrap_Graphics.h">
+      <Filter>modules\graphics\opengl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\modules\physics\box2d\PrismaticJoint.h">
-      <Filter>modules\physics\box2d</Filter>
+    <ClInclude Include="..\..\src\modules\graphics\opengl\wrap_Image.h">
+      <Filter>modules\graphics\opengl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\modules\physics\box2d\PulleyJoint.h">
-      <Filter>modules\physics\box2d</Filter>
+    <ClInclude Include="..\..\src\modules\graphics\opengl\wrap_ParticleSystem.h">
+      <Filter>modules\graphics\opengl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\modules\physics\box2d\RevoluteJoint.h">
-      <Filter>modules\physics\box2d</Filter>
+    <ClInclude Include="..\..\src\modules\graphics\opengl\wrap_Quad.h">
+      <Filter>modules\graphics\opengl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\modules\physics\box2d\Shape.h">
-      <Filter>modules\physics\box2d</Filter>
+    <ClInclude Include="..\..\src\modules\graphics\opengl\wrap_SpriteBatch.h">
+      <Filter>modules\graphics\opengl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\modules\physics\box2d\World.h">
-      <Filter>modules\physics\box2d</Filter>
+    <ClInclude Include="..\..\src\modules\image\Image.h">
+      <Filter>modules\image</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\modules\physics\box2d\wrap_Body.h">
-      <Filter>modules\physics\box2d</Filter>
+    <ClInclude Include="..\..\src\modules\image\ImageData.h">
+      <Filter>modules\image</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\modules\physics\box2d\wrap_CircleShape.h">
-      <Filter>modules\physics\box2d</Filter>
+    <ClInclude Include="..\..\src\modules\image\wrap_Image.h">
+      <Filter>modules\image</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\modules\physics\box2d\wrap_Contact.h">
-      <Filter>modules\physics\box2d</Filter>
+    <ClInclude Include="..\..\src\modules\image\wrap_ImageData.h">
+      <Filter>modules\image</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\modules\physics\box2d\wrap_DistanceJoint.h">
-      <Filter>modules\physics\box2d</Filter>
+    <ClInclude Include="..\..\src\modules\image\devil\Image.h">
+      <Filter>modules\image\devil</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\modules\physics\box2d\wrap_GearJoint.h">
-      <Filter>modules\physics\box2d</Filter>
+    <ClInclude Include="..\..\src\modules\image\devil\ImageData.h">
+      <Filter>modules\image\devil</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\modules\physics\box2d\wrap_Joint.h">
-      <Filter>modules\physics\box2d</Filter>
+    <ClInclude Include="..\..\src\modules\joystick\Joystick.h">
+      <Filter>modules\joystick</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\modules\physics\box2d\wrap_MouseJoint.h">
-      <Filter>modules\physics\box2d</Filter>
+    <ClInclude Include="..\..\src\modules\joystick\sdl\Joystick.h">
+      <Filter>modules\joystick\sdl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\modules\physics\box2d\wrap_Physics.h">
-      <Filter>modules\physics\box2d</Filter>
+    <ClInclude Include="..\..\src\modules\joystick\sdl\wrap_Joystick.h">
+      <Filter>modules\joystick\sdl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\modules\physics\box2d\wrap_PolygonShape.h">
-      <Filter>modules\physics\box2d</Filter>
+    <ClInclude Include="..\..\src\modules\keyboard\Keyboard.h">
+      <Filter>modules\keyboard</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\modules\physics\box2d\wrap_PrismaticJoint.h">
-      <Filter>modules\physics\box2d</Filter>
+    <ClInclude Include="..\..\src\modules\keyboard\sdl\Keyboard.h">
+      <Filter>modules\keyboard\sdl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\modules\physics\box2d\wrap_PulleyJoint.h">
-      <Filter>modules\physics\box2d</Filter>
+    <ClInclude Include="..\..\src\modules\keyboard\sdl\wrap_Keyboard.h">
+      <Filter>modules\keyboard\sdl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\modules\physics\box2d\wrap_RevoluteJoint.h">
-      <Filter>modules\physics\box2d</Filter>
+    <ClInclude Include="..\..\src\modules\mouse\Mouse.h">
+      <Filter>modules\mouse</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\modules\physics\box2d\wrap_Shape.h">
-      <Filter>modules\physics\box2d</Filter>
+    <ClInclude Include="..\..\src\modules\mouse\sdl\Mouse.h">
+      <Filter>modules\mouse\sdl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\modules\physics\box2d\wrap_World.h">
-      <Filter>modules\physics\box2d</Filter>
+    <ClInclude Include="..\..\src\modules\mouse\sdl\wrap_Mouse.h">
+      <Filter>modules\mouse\sdl</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\modules\timer\sdl\Timer.h">
       <Filter>modules\timer\sdl</Filter>
@@ -1005,6 +1023,282 @@
     <ClInclude Include="..\..\src\modules\graphics\Quad.h">
       <Filter>modules\graphics</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\libraries\Box2D\Box2D.h">
+      <Filter>Box2D</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\libraries\Box2D\Collision\Shapes\b2ChainShape.h">
+      <Filter>Box2D\Collision\Shapes</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\libraries\Box2D\Collision\Shapes\b2CircleShape.h">
+      <Filter>Box2D\Collision\Shapes</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\libraries\Box2D\Collision\Shapes\b2EdgeShape.h">
+      <Filter>Box2D\Collision\Shapes</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\libraries\Box2D\Collision\Shapes\b2PolygonShape.h">
+      <Filter>Box2D\Collision\Shapes</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\libraries\Box2D\Collision\Shapes\b2Shape.h">
+      <Filter>Box2D\Collision\Shapes</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\libraries\Box2D\Collision\b2BroadPhase.h">
+      <Filter>Box2D\Collision</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\libraries\Box2D\Collision\b2Collision.h">
+      <Filter>Box2D\Collision</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\libraries\Box2D\Collision\b2Distance.h">
+      <Filter>Box2D\Collision</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\libraries\Box2D\Collision\b2DynamicTree.h">
+      <Filter>Box2D\Collision</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\libraries\Box2D\Collision\b2TimeOfImpact.h">
+      <Filter>Box2D\Collision</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\libraries\Box2D\Common\b2BlockAllocator.h">
+      <Filter>Box2D\Common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\libraries\Box2D\Common\b2Draw.h">
+      <Filter>Box2D\Common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\libraries\Box2D\Common\b2GrowableStack.h">
+      <Filter>Box2D\Common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\libraries\Box2D\Common\b2Math.h">
+      <Filter>Box2D\Common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\libraries\Box2D\Common\b2Settings.h">
+      <Filter>Box2D\Common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\libraries\Box2D\Common\b2StackAllocator.h">
+      <Filter>Box2D\Common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\libraries\Box2D\Common\b2Timer.h">
+      <Filter>Box2D\Common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\libraries\Box2D\Dynamics\Contacts\b2ChainAndPolygonContact.h">
+      <Filter>Box2D\Dynamics\Contacts</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\libraries\Box2D\Dynamics\Contacts\b2CircleContact.h">
+      <Filter>Box2D\Dynamics\Contacts</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\libraries\Box2D\Dynamics\Contacts\b2Contact.h">
+      <Filter>Box2D\Dynamics\Contacts</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\libraries\Box2D\Dynamics\Contacts\b2ContactSolver.h">
+      <Filter>Box2D\Dynamics\Contacts</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\libraries\Box2D\Dynamics\Contacts\b2EdgeAndCircleContact.h">
+      <Filter>Box2D\Dynamics\Contacts</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\libraries\Box2D\Dynamics\Contacts\b2EdgeAndPolygonContact.h">
+      <Filter>Box2D\Dynamics\Contacts</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\libraries\Box2D\Dynamics\Contacts\b2PolygonAndCircleContact.h">
+      <Filter>Box2D\Dynamics\Contacts</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\libraries\Box2D\Dynamics\Contacts\b2PolygonContact.h">
+      <Filter>Box2D\Dynamics\Contacts</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\libraries\Box2D\Dynamics\Contacts\b2ChainAndCircleContact.h">
+      <Filter>Box2D\Dynamics\Contacts</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\libraries\Box2D\Dynamics\Joints\b2RevoluteJoint.h">
+      <Filter>Box2D\Dynamics\Joints</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\libraries\Box2D\Dynamics\Joints\b2RopeJoint.h">
+      <Filter>Box2D\Dynamics\Joints</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\libraries\Box2D\Dynamics\Joints\b2WeldJoint.h">
+      <Filter>Box2D\Dynamics\Joints</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\libraries\Box2D\Dynamics\Joints\b2WheelJoint.h">
+      <Filter>Box2D\Dynamics\Joints</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\libraries\Box2D\Dynamics\Joints\b2DistanceJoint.h">
+      <Filter>Box2D\Dynamics\Joints</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\libraries\Box2D\Dynamics\Joints\b2FrictionJoint.h">
+      <Filter>Box2D\Dynamics\Joints</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\libraries\Box2D\Dynamics\Joints\b2GearJoint.h">
+      <Filter>Box2D\Dynamics\Joints</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\libraries\Box2D\Dynamics\Joints\b2Joint.h">
+      <Filter>Box2D\Dynamics\Joints</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\libraries\Box2D\Dynamics\Joints\b2MouseJoint.h">
+      <Filter>Box2D\Dynamics\Joints</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\libraries\Box2D\Dynamics\Joints\b2PrismaticJoint.h">
+      <Filter>Box2D\Dynamics\Joints</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\libraries\Box2D\Dynamics\Joints\b2PulleyJoint.h">
+      <Filter>Box2D\Dynamics\Joints</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\libraries\Box2D\Dynamics\b2Body.h">
+      <Filter>Box2D\Dynamics</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\libraries\Box2D\Dynamics\b2ContactManager.h">
+      <Filter>Box2D\Dynamics</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\libraries\Box2D\Dynamics\b2Fixture.h">
+      <Filter>Box2D\Dynamics</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\libraries\Box2D\Dynamics\b2Island.h">
+      <Filter>Box2D\Dynamics</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\libraries\Box2D\Dynamics\b2TimeStep.h">
+      <Filter>Box2D\Dynamics</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\libraries\Box2D\Dynamics\b2World.h">
+      <Filter>Box2D\Dynamics</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\libraries\Box2D\Dynamics\b2WorldCallbacks.h">
+      <Filter>Box2D\Dynamics</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\libraries\Box2D\Rope\b2Rope.h">
+      <Filter>Box2D\Rope</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\modules\physics\Body.h">
+      <Filter>modules\physics</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\modules\physics\Joint.h">
+      <Filter>modules\physics</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\modules\physics\Shape.h">
+      <Filter>modules\physics</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\modules\physics\box2d\Body.h">
+      <Filter>modules\physics\box2d</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\modules\physics\box2d\ChainShape.h">
+      <Filter>modules\physics\box2d</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\modules\physics\box2d\CircleShape.h">
+      <Filter>modules\physics\box2d</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\modules\physics\box2d\Contact.h">
+      <Filter>modules\physics\box2d</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\modules\physics\box2d\DistanceJoint.h">
+      <Filter>modules\physics\box2d</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\modules\physics\box2d\EdgeShape.h">
+      <Filter>modules\physics\box2d</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\modules\physics\box2d\Fixture.h">
+      <Filter>modules\physics\box2d</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\modules\physics\box2d\FrictionJoint.h">
+      <Filter>modules\physics\box2d</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\modules\physics\box2d\GearJoint.h">
+      <Filter>modules\physics\box2d</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\modules\physics\box2d\Joint.h">
+      <Filter>modules\physics\box2d</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\modules\physics\box2d\MouseJoint.h">
+      <Filter>modules\physics\box2d</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\modules\physics\box2d\Physics.h">
+      <Filter>modules\physics\box2d</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\modules\physics\box2d\PolygonShape.h">
+      <Filter>modules\physics\box2d</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\modules\physics\box2d\PrismaticJoint.h">
+      <Filter>modules\physics\box2d</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\modules\physics\box2d\PulleyJoint.h">
+      <Filter>modules\physics\box2d</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\modules\physics\box2d\RevoluteJoint.h">
+      <Filter>modules\physics\box2d</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\modules\physics\box2d\RopeJoint.h">
+      <Filter>modules\physics\box2d</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\modules\physics\box2d\Shape.h">
+      <Filter>modules\physics\box2d</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\modules\physics\box2d\WeldJoint.h">
+      <Filter>modules\physics\box2d</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\modules\physics\box2d\WheelJoint.h">
+      <Filter>modules\physics\box2d</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\modules\physics\box2d\World.h">
+      <Filter>modules\physics\box2d</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\modules\physics\box2d\wrap_Body.h">
+      <Filter>modules\physics\box2d</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\modules\physics\box2d\wrap_ChainShape.h">
+      <Filter>modules\physics\box2d</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\modules\physics\box2d\wrap_CircleShape.h">
+      <Filter>modules\physics\box2d</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\modules\physics\box2d\wrap_Contact.h">
+      <Filter>modules\physics\box2d</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\modules\physics\box2d\wrap_DistanceJoint.h">
+      <Filter>modules\physics\box2d</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\modules\physics\box2d\wrap_EdgeShape.h">
+      <Filter>modules\physics\box2d</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\modules\physics\box2d\wrap_Fixture.h">
+      <Filter>modules\physics\box2d</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\modules\physics\box2d\wrap_FrictionJoint.h">
+      <Filter>modules\physics\box2d</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\modules\physics\box2d\wrap_GearJoint.h">
+      <Filter>modules\physics\box2d</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\modules\physics\box2d\wrap_Joint.h">
+      <Filter>modules\physics\box2d</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\modules\physics\box2d\wrap_MouseJoint.h">
+      <Filter>modules\physics\box2d</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\modules\physics\box2d\wrap_Physics.h">
+      <Filter>modules\physics\box2d</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\modules\physics\box2d\wrap_PolygonShape.h">
+      <Filter>modules\physics\box2d</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\modules\physics\box2d\wrap_PrismaticJoint.h">
+      <Filter>modules\physics\box2d</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\modules\physics\box2d\wrap_PulleyJoint.h">
+      <Filter>modules\physics\box2d</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\modules\physics\box2d\wrap_RevoluteJoint.h">
+      <Filter>modules\physics\box2d</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\modules\physics\box2d\wrap_RopeJoint.h">
+      <Filter>modules\physics\box2d</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\modules\physics\box2d\wrap_Shape.h">
+      <Filter>modules\physics\box2d</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\modules\physics\box2d\wrap_WeldJoint.h">
+      <Filter>modules\physics\box2d</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\modules\physics\box2d\wrap_WheelJoint.h">
+      <Filter>modules\physics\box2d</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\modules\physics\box2d\wrap_World.h">
+      <Filter>modules\physics\box2d</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\common\Memoizer.h">
+      <Filter>common</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="app.rc" />