Fixed some merge conflicts between development and linux branches

Conflicts:
	engine/source/platformX86UNIX/x86UNIXStrings.cc
	engine/source/platformX86UNIX/x86UNIXThread.cc

engine/compilers/Make/Makefile

@@ -0,0 +1,31 @@
+DEPS :=
+LIB_TARGETS :=
+LIB_TARGETS_DEBUG :=
+SHARED_LIB_TARGETS :=
+SHARED_LIB_TARGETS_DEBUG :=
+APP_TARGETS :=
+APP_TARGETS_DEBUG :=
+
+all: debug release
+
+clean:
+	rm -rfv Debug
+	rm -rfv Release
+	rm -rfv lib
+
+.PHONY: all debug release clean
+
+-include x Torque2D
+-include x zlib
+-include x lpng
+-include x ljpeg
+
+release: $(LIB_TARGETS) $(SHARED_LIB_TARGETS) $(APP_TARGETS)
+	@echo Built libraries: $(LIB_TARGETS)
+	@echo Built shared libraries: $(SHARED_LIB_TARGETS)
+	@echo Built apps: $(APP_TARGETS)
+
+debug: $(LIB_TARGETS_DEBUG) $(SHARED_LIB_TARGETS_DEBUG) $(APP_TARGETS_DEBUG)
+	@echo Built libraries: $(LIB_TARGETS_DEBUG)
+	@echo Built shared libraries: $(SHARED_LIB_TARGETS_DEBUG)
+	@echo Built apps: $(APP_TARGETS_DEBUG)

engine/compilers/Make/Torque2D

@@ -0,0 +1,538 @@
+APPNAME := ../../../Torque2D
+
+SOURCES := ../../lib/ljpeg/jcapimin.c \
+	../../lib/ljpeg/jcapistd.c \
+	../../lib/ljpeg/jccoefct.c \
+	../../lib/ljpeg/jccolor.c \
+	../../lib/ljpeg/jcdctmgr.c \
+	../../lib/ljpeg/jchuff.c \
+	../../lib/ljpeg/jcinit.c \
+	../../lib/ljpeg/jcmainct.c \
+	../../lib/ljpeg/jcmarker.c \
+	../../lib/ljpeg/jcmaster.c \
+	../../lib/ljpeg/jcomapi.c \
+	../../lib/ljpeg/jcparam.c \
+	../../lib/ljpeg/jcphuff.c \
+	../../lib/ljpeg/jcprepct.c \
+	../../lib/ljpeg/jcsample.c \
+	../../lib/ljpeg/jctrans.c \
+	../../lib/ljpeg/jdapimin.c \
+	../../lib/ljpeg/jdapistd.c \
+	../../lib/ljpeg/jdatadst.c \
+	../../lib/ljpeg/jdatasrc.c \
+	../../lib/ljpeg/jdcoefct.c \
+	../../lib/ljpeg/jdcolor.c \
+	../../lib/ljpeg/jddctmgr.c \
+	../../lib/ljpeg/jdhuff.c \
+	../../lib/ljpeg/jdinput.c \
+	../../lib/ljpeg/jdmainct.c \
+	../../lib/ljpeg/jdmarker.c \
+	../../lib/ljpeg/jdmaster.c \
+	../../lib/ljpeg/jdmerge.c \
+	../../lib/ljpeg/jdphuff.c \
+	../../lib/ljpeg/jdpostct.c \
+	../../lib/ljpeg/jdsample.c \
+	../../lib/ljpeg/jdtrans.c \
+	../../lib/ljpeg/jerror.c \
+	../../lib/ljpeg/jfdctflt.c \
+	../../lib/ljpeg/jfdctfst.c \
+	../../lib/ljpeg/jfdctint.c \
+	../../lib/ljpeg/jidctflt.c \
+	../../lib/ljpeg/jidctfst.c \
+	../../lib/ljpeg/jidctint.c \
+	../../lib/ljpeg/jidctred.c \
+	../../lib/ljpeg/jmemansi.c \
+	../../lib/ljpeg/jmemmgr.c \
+	../../lib/ljpeg/jquant1.c \
+	../../lib/ljpeg/jquant2.c \
+	../../lib/ljpeg/jutils.c \
+	../../lib/lpng/png.c \
+	../../lib/lpng/pngerror.c \
+	../../lib/lpng/pngget.c \
+	../../lib/lpng/pngmem.c \
+	../../lib/lpng/pngpread.c \
+	../../lib/lpng/pngread.c \
+	../../lib/lpng/pngrio.c \
+	../../lib/lpng/pngrtran.c \
+	../../lib/lpng/pngrutil.c \
+	../../lib/lpng/pngset.c \
+	../../lib/lpng/pngtrans.c \
+	../../lib/lpng/pngwio.c \
+	../../lib/lpng/pngwrite.c \
+	../../lib/lpng/pngwtran.c \
+	../../lib/lpng/pngwutil.c \
+	../../source/2d/assets/AnimationAsset.cc \
+	../../source/2d/assets/ImageAsset.cc \
+	../../source/2d/assets/ParticleAsset.cc \
+	../../source/2d/assets/ParticleAssetEmitter.cc \
+	../../source/2d/assets/ParticleAssetField.cc \
+	../../source/2d/assets/ParticleAssetFieldCollection.cc \
+	../../source/2d/assets/SkeletonAsset.cc \
+	../../source/2d/controllers/AmbientForceController.cc \
+	../../source/2d/controllers/BuoyancyController.cc \
+	../../source/2d/controllers/core/GroupedSceneController.cc \
+	../../source/2d/controllers/core/PickingSceneController.cc \
+	../../source/2d/controllers/PointForceController.cc \
+	../../source/2d/core/BatchRender.cc \
+	../../source/2d/core/CoreMath.cc \
+	../../source/2d/core/ImageFrameProvider.cc \
+	../../source/2d/core/ImageFrameProviderCore.cc \
+	../../source/2d/core/ParticleSystem.cc \
+	../../source/2d/core/RenderProxy.cc \
+	../../source/2d/core/SpriteBase.cc \
+	../../source/2d/core/SpriteBatch.cc \
+	../../source/2d/core/SpriteBatchItem.cc \
+	../../source/2d/core/SpriteBatchQuery.cc \
+	../../source/2d/core/Utility.cc \
+	../../source/2d/core/Vector2.cc \
+	../../source/2d/experimental/composites/WaveComposite.cc \
+	../../source/2d/gui/guiImageButtonCtrl.cc \
+	../../source/2d/gui/guiSceneObjectCtrl.cc \
+	../../source/2d/gui/guiSpriteCtrl.cc \
+	../../source/2d/gui/SceneWindow.cc \
+	../../source/2d/sceneobject/CompositeSprite.cc \
+	../../source/2d/sceneobject/ImageFont.cc \
+	../../source/2d/sceneobject/ParticlePlayer.cc \
+	../../source/2d/sceneobject/SceneObject.cc \
+	../../source/2d/sceneobject/SceneObjectList.cc \
+	../../source/2d/sceneobject/SceneObjectSet.cc \
+	../../source/2d/sceneobject/Scroller.cc \
+	../../source/2d/sceneobject/ShapeVector.cc \
+	../../source/2d/sceneobject/Skeleton.cc \
+	../../source/2d/sceneobject/Sprite.cc \
+	../../source/2d/sceneobject/Trigger.cc \
+	../../source/2d/scene/ContactFilter.cc \
+	../../source/2d/scene/DebugDraw.cc \
+	../../source/2d/scene/Scene.cc \
+	../../source/2d/scene/SceneRenderFactories.cpp \
+	../../source/2d/scene/SceneRenderQueue.cpp \
+	../../source/2d/scene/WorldQuery.cc \
+	../../source/algorithm/crc.cc \
+	../../source/algorithm/hashFunction.cc \
+	../../source/assets/assetBase.cc \
+	../../source/assets/assetFieldTypes.cc \
+	../../source/assets/assetManager.cc \
+	../../source/assets/assetQuery.cc \
+	../../source/assets/assetTagsManifest.cc \
+	../../source/assets/declaredAssets.cc \
+	../../source/assets/referencedAssets.cc \
+	../../source/audio/AudioAsset.cc \
+	../../source/Box2D/Collision/b2BroadPhase.cpp \
+	../../source/Box2D/Collision/b2CollideCircle.cpp \
+	../../source/Box2D/Collision/b2CollideEdge.cpp \
+	../../source/Box2D/Collision/b2CollidePolygon.cpp \
+	../../source/Box2D/Collision/b2Collision.cpp \
+	../../source/Box2D/Collision/b2Distance.cpp \
+	../../source/Box2D/Collision/b2DynamicTree.cpp \
+	../../source/Box2D/Collision/b2TimeOfImpact.cpp \
+	../../source/Box2D/Collision/Shapes/b2ChainShape.cpp \
+	../../source/Box2D/Collision/Shapes/b2CircleShape.cpp \
+	../../source/Box2D/Collision/Shapes/b2EdgeShape.cpp \
+	../../source/Box2D/Collision/Shapes/b2PolygonShape.cpp \
+	../../source/Box2D/Common/b2BlockAllocator.cpp \
+	../../source/Box2D/Common/b2Draw.cpp \
+	../../source/Box2D/Common/b2Math.cpp \
+	../../source/Box2D/Common/b2Settings.cpp \
+	../../source/Box2D/Common/b2StackAllocator.cpp \
+	../../source/Box2D/Common/b2Timer.cpp \
+	../../source/Box2D/Dynamics/b2Body.cpp \
+	../../source/Box2D/Dynamics/b2ContactManager.cpp \
+	../../source/Box2D/Dynamics/b2Fixture.cpp \
+	../../source/Box2D/Dynamics/b2Island.cpp \
+	../../source/Box2D/Dynamics/b2World.cpp \
+	../../source/Box2D/Dynamics/b2WorldCallbacks.cpp \
+	../../source/Box2D/Dynamics/Contacts/b2ChainAndCircleContact.cpp \
+	../../source/Box2D/Dynamics/Contacts/b2ChainAndPolygonContact.cpp \
+	../../source/Box2D/Dynamics/Contacts/b2CircleContact.cpp \
+	../../source/Box2D/Dynamics/Contacts/b2Contact.cpp \
+	../../source/Box2D/Dynamics/Contacts/b2ContactSolver.cpp \
+	../../source/Box2D/Dynamics/Contacts/b2EdgeAndCircleContact.cpp \
+	../../source/Box2D/Dynamics/Contacts/b2EdgeAndPolygonContact.cpp \
+	../../source/Box2D/Dynamics/Contacts/b2PolygonAndCircleContact.cpp \
+	../../source/Box2D/Dynamics/Contacts/b2PolygonContact.cpp \
+	../../source/Box2D/Dynamics/Joints/b2DistanceJoint.cpp \
+	../../source/Box2D/Dynamics/Joints/b2FrictionJoint.cpp \
+	../../source/Box2D/Dynamics/Joints/b2GearJoint.cpp \
+	../../source/Box2D/Dynamics/Joints/b2Joint.cpp \
+	../../source/Box2D/Dynamics/Joints/b2MotorJoint.cpp \
+	../../source/Box2D/Dynamics/Joints/b2MouseJoint.cpp \
+	../../source/Box2D/Dynamics/Joints/b2PrismaticJoint.cpp \
+	../../source/Box2D/Dynamics/Joints/b2PulleyJoint.cpp \
+	../../source/Box2D/Dynamics/Joints/b2RevoluteJoint.cpp \
+	../../source/Box2D/Dynamics/Joints/b2RopeJoint.cpp \
+	../../source/Box2D/Dynamics/Joints/b2WeldJoint.cpp \
+	../../source/Box2D/Dynamics/Joints/b2WheelJoint.cpp \
+	../../source/Box2D/Rope/b2Rope.cpp \
+	../../source/collection/bitTables.cc \
+	../../source/collection/hashTable.cc \
+	../../source/collection/nameTags.cpp \
+	../../source/collection/undo.cc \
+	../../source/collection/vector.cc \
+	../../source/console/consoleBaseType.cc \
+	../../source/console/consoleDictionary.cc \
+	../../source/console/consoleExprEvalState.cc \
+	../../source/console/consoleNamespace.cc \
+	../../source/console/ConsoleTypeValidators.cc \
+	../../source/console/metaScripting_ScriptBinding.cc \
+	../../source/debug/profiler.cc \
+	../../source/debug/remote/RemoteDebugger1.cc \
+	../../source/debug/remote/RemoteDebuggerBase.cc \
+	../../source/debug/remote/RemoteDebuggerBridge.cc \
+	../../source/debug/telnetDebugger.cc \
+	../../source/delegates/delegateSignal.cpp \
+	../../source/game/defaultGame.cc \
+	../../source/game/gameInterface.cc \
+	../../source/graphics/bitmapBmp.cc \
+	../../source/graphics/bitmapJpeg.cc \
+	../../source/graphics/bitmapPng.cc \
+	../../source/graphics/color.cc \
+	../../source/graphics/dgl.cc \
+	../../source/graphics/dglMatrix.cc \
+	../../source/graphics/DynamicTexture.cc \
+	../../source/graphics/gBitmap.cc \
+	../../source/graphics/gFont.cc \
+	../../source/graphics/gPalette.cc \
+	../../source/graphics/PNGImage.cpp \
+	../../source/graphics/splineUtil.cc \
+	../../source/graphics/TextureDictionary.cc \
+	../../source/graphics/TextureHandle.cc \
+	../../source/graphics/TextureManager.cc \
+	../../source/gui/containers/guiGridCtrl.cc \
+	../../source/gui/guiArrayCtrl.cc \
+	../../source/gui/guiBackgroundCtrl.cc \
+	../../source/gui/guiBitmapBorderCtrl.cc \
+	../../source/gui/guiBitmapCtrl.cc \
+	../../source/gui/guiBubbleTextCtrl.cc \
+	../../source/gui/guiCanvas.cc \
+	../../source/gui/guiColorPicker.cc \
+	../../source/gui/guiConsole.cc \
+	../../source/gui/guiConsoleEditCtrl.cc \
+	../../source/gui/guiConsoleTextCtrl.cc \
+	../../source/gui/guiControl.cc \
+	../../source/gui/guiDefaultControlRender.cc \
+	../../source/gui/guiFadeinBitmapCtrl.cc \
+	../../source/gui/guiInputCtrl.cc \
+	../../source/gui/guiListBoxCtrl.cc \
+	../../source/gui/guiMessageVectorCtrl.cc \
+	../../source/gui/guiMLTextCtrl.cc \
+	../../source/gui/guiMLTextEditCtrl.cc \
+	../../source/gui/guiMouseEventCtrl.cc \
+	../../source/gui/guiPopUpCtrl.cc \
+	../../source/gui/guiPopUpCtrlEx.cc \
+	../../source/gui/guiProgressCtrl.cc \
+	../../source/gui/guiScriptNotifyControl.cc \
+	../../source/gui/guiSliderCtrl.cc \
+	../../source/gui/guiTabPageCtrl.cc \
+	../../source/gui/guiTextCtrl.cc \
+	../../source/gui/guiTextEditCtrl.cc \
+	../../source/gui/guiTextEditSliderCtrl.cc \
+	../../source/gui/guiTextListCtrl.cc \
+	../../source/gui/guiTickCtrl.cc \
+	../../source/gui/guiTreeViewCtrl.cc \
+	../../source/gui/guiTypes.cc \
+	../../source/gui/language/lang.cc \
+	../../source/gui/messageVector.cc \
+	../../source/input/actionMap.cc \
+	../../source/io/bitStream.cc \
+	../../source/io/bufferStream.cc \
+	../../source/io/fileObject.cc \
+	../../source/io/fileStream.cc \
+	../../source/io/fileStreamObject.cc \
+	../../source/io/fileSystem_ScriptBinding.cc \
+	../../source/io/filterStream.cc \
+	../../source/io/memStream.cc \
+	../../source/io/nStream.cc \
+	../../source/io/resizeStream.cc \
+	../../source/io/resource/resourceDictionary.cc \
+	../../source/io/resource/resourceManager.cc \
+	../../source/io/streamObject.cc \
+	../../source/io/zip/centralDir.cc \
+	../../source/io/zip/compressor.cc \
+	../../source/io/zip/deflate.cc \
+	../../source/io/zip/extraField.cc \
+	../../source/io/zip/fileHeader.cc \
+	../../source/io/zip/stored.cc \
+	../../source/io/zip/zipArchive.cc \
+	../../source/io/zip/zipCryptStream.cc \
+	../../source/io/zip/zipObject.cc \
+	../../source/io/zip/zipSubStream.cc \
+	../../source/io/zip/zipTempStream.cc \
+	../../source/math/rectClipper.cpp \
+	../../source/memory/dataChunker.cc \
+	../../source/memory/frameAllocator_ScriptBinding.cc \
+	../../source/messaging/dispatcher.cc \
+	../../source/messaging/eventManager.cc \
+	../../source/messaging/message.cc \
+	../../source/messaging/messageForwarder.cc \
+	../../source/messaging/scriptMsgListener.cc \
+	../../source/module/moduleDefinition.cc \
+	../../source/module/moduleManager.cc \
+	../../source/module/moduleMergeDefinition.cc \
+	../../source/network/connectionProtocol.cc \
+	../../source/network/connectionStringTable.cc \
+	../../source/network/httpObject.cc \
+	../../source/network/netConnection.cc \
+	../../source/network/netDownload.cc \
+	../../source/network/netEvent.cc \
+	../../source/network/netGhost.cc \
+	../../source/network/netInterface.cc \
+	../../source/network/netObject.cc \
+	../../source/network/netStringTable.cc \
+	../../source/network/netTest.cc \
+	../../source/network/networkProcessList.cc \
+	../../source/network/RemoteCommandEvent.cc \
+	../../source/network/serverQuery.cc \
+	../../source/network/tcpObject.cc \
+	../../source/network/telnetConsole.cc \
+	../../source/persistence/taml/binary/tamlBinaryReader.cc \
+	../../source/persistence/taml/binary/tamlBinaryWriter.cc \
+	../../source/persistence/taml/json/tamlJSONParser.cc \
+	../../source/persistence/taml/json/tamlJSONReader.cc \
+	../../source/persistence/taml/json/tamlJSONWriter.cc \
+	../../source/persistence/taml/taml.cc \
+	../../source/persistence/taml/tamlCustom.cc \
+	../../source/persistence/taml/tamlWriteNode.cc \
+	../../source/persistence/taml/xml/tamlXmlParser.cc \
+	../../source/persistence/taml/xml/tamlXmlReader.cc \
+	../../source/persistence/taml/xml/tamlXmlWriter.cc \
+	../../source/persistence/tinyXML/tinystr.cpp \
+	../../source/persistence/tinyXML/tinyxml.cpp \
+	../../source/persistence/tinyXML/tinyxmlerror.cpp \
+	../../source/persistence/tinyXML/tinyxmlparser.cpp \
+	../../source/audio/audio.cc \
+	../../source/audio/audioBuffer.cc \
+	../../source/audio/audioDataBlock.cc \
+	../../source/audio/audio_ScriptBinding.cc \
+	../../source/audio/audioStreamSourceFactory.cc \
+	../../source/audio/wavStreamSource.cc \
+	../../source/component/dynamicConsoleMethodComponent.cpp \
+	../../source/component/simComponent.cpp \
+	../../source/component/behaviors/behaviorComponent.cpp \
+	../../source/component/behaviors/behaviorInstance.cpp \
+	../../source/component/behaviors/behaviorTemplate.cpp \
+	../../source/console/astAlloc.cc \
+	../../source/console/astNodes.cc \
+	../../source/console/cmdgram.cc \
+	../../source/console/CMDscan.cc \
+	../../source/console/codeBlock.cc \
+	../../source/console/compiledEval.cc \
+	../../source/console/compiler.cc \
+	../../source/console/console.cc \
+	../../source/console/consoleDoc.cc \
+	../../source/console/consoleFunctions.cc \
+	../../source/console/consoleLogger.cc \
+	../../source/console/consoleObject.cc \
+	../../source/console/consoleParser.cc \
+	../../source/console/consoleTypes.cc \
+	../../source/game/gameConnection.cc \
+	../../source/game/version.cc \
+	../../source/math/math_ScriptBinding.cc \
+	../../source/math/mathTypes.cc \
+	../../source/math/mathUtils.cc \
+	../../source/math/mBox.cc \
+	../../source/math/mMath_C.cc \
+	../../source/math/mMathAltivec.cc \
+	../../source/math/mMathAMD.cc \
+	../../source/math/mMathAMD_ASM.asm \
+	../../source/math/mMathSSE.cc \
+	../../source/math/mMathSSE_ASM.asm \
+	../../source/math/mMath_ASM.asm \
+	../../source/math/mMathFn.cc \
+	../../source/math/mMatrix.cc \
+	../../source/math/mPlaneTransformer.cc \
+	../../source/math/mPoint.cpp \
+	../../source/math/mQuadPatch.cc \
+	../../source/math/mQuat.cc \
+	../../source/math/mRandom.cc \
+	../../source/math/mSolver.cc \
+	../../source/math/mSplinePatch.cc \
+	../../source/persistence/SimXMLDocument.cpp \
+	../../source/platform/CursorManager.cc \
+	../../source/platform/platformCPUInfo.asm \
+	../../source/platform/nativeDialogs/fileDialog.cc \
+	../../source/platform/platform.cc \
+	../../source/platform/platformAssert.cc \
+	../../source/platform/platformCPU.cc \
+	../../source/platform/platformFileIO.cc \
+	../../source/platform/platformFont.cc \
+	../../source/platform/platformMemory.cc \
+	../../source/platform/platformNetwork_ScriptBinding.cc \
+	../../source/platform/platformString.cc \
+	../../source/platform/platformVideo.cc \
+	../../source/platform/platformNetAsync.unix.cc \
+	../../source/platform/menus/popupMenu.cc \
+	../../source/platform/nativeDialogs/msgBox.cpp \
+	../../source/platform/Tickable.cc \
+	../../source/platformX86UNIX/x86UNIXAsmBlit.cc \
+	../../source/platformX86UNIX/x86UNIXConsole.cc \
+	../../source/platformX86UNIX/x86UNIXCPUInfo.cc \
+	../../source/platformX86UNIX/x86UNIXFileio.cc \
+	../../source/platformX86UNIX/x86UNIXFont.cc \
+	../../source/platformX86UNIX/x86UNIXGL.cc \
+	../../source/platformX86UNIX/x86UNIXInput.cc \
+	../../source/platformX86UNIX/x86UNIXInputManager.cc \
+	../../source/platformX86UNIX/x86UNIXIO.cc \
+	../../source/platformX86UNIX/x86UNIXMath.cc \
+	../../source/platformX86UNIX/x86UNIXMath_ASM.cc \
+	../../source/platformX86UNIX/x86UNIXMemory.cc \
+	../../source/platformX86UNIX/x86UNIXMessageBox.cc \
+	../../source/platformX86UNIX/x86UNIXMutex.cc \
+	../../source/platformX86UNIX/x86UNIXNet.cc \
+	../../source/platformX86UNIX/x86UNIXOGLVideo.cc \
+	../../source/platformX86UNIX/x86UNIXOpenAL.cc \
+	../../source/platformX86UNIX/x86UNIXProcessControl.cc \
+	../../source/platformX86UNIX/x86UNIXSemaphore.cc \
+	../../source/platformX86UNIX/x86UNIXStrings.cc \
+	../../source/platformX86UNIX/x86UNIXThread.cc \
+	../../source/platformX86UNIX/x86UNIXTime.cc \
+	../../source/platformX86UNIX/x86UNIXUtils.cc \
+	../../source/platformX86UNIX/x86UNIXWindow.cc \
+	../../source/platformX86UNIX/x86UNIXPopupMenu.cc \
+	../../source/platformX86UNIX/x86UNIXDialogs.cc \
+	../../source/sim/scriptGroup.cc \
+	../../source/sim/scriptObject.cc \
+	../../source/sim/simBase.cc \
+	../../source/sim/simConsoleEvent.cc \
+	../../source/sim/simConsoleThreadExecEvent.cc \
+	../../source/sim/simDatablock.cc \
+	../../source/sim/simDictionary.cc \
+	../../source/sim/simFieldDictionary.cc \
+	../../source/sim/simManager.cc \
+	../../source/sim/simObject.cc \
+	../../source/sim/SimObjectList.cc \
+	../../source/sim/simSerialize.cpp \
+	../../source/sim/simSet.cc \
+	../../source/spine/Animation.c \
+	../../source/spine/AnimationState.c \
+	../../source/spine/AnimationStateData.c \
+	../../source/spine/Atlas.c \
+	../../source/spine/AtlasAttachmentLoader.c \
+	../../source/spine/Attachment.c \
+	../../source/spine/AttachmentLoader.c \
+	../../source/spine/Bone.c \
+	../../source/spine/BoneData.c \
+	../../source/spine/BoundingBoxAttachment.c \
+	../../source/spine/Event.c \
+	../../source/spine/EventData.c \
+	../../source/spine/extension.c \
+	../../source/spine/Json.c \
+	../../source/spine/RegionAttachment.c \
+	../../source/spine/Skeleton.c \
+	../../source/spine/SkeletonBounds.c \
+	../../source/spine/SkeletonData.c \
+	../../source/spine/SkeletonJson.c \
+	../../source/spine/Skin.c \
+	../../source/spine/Slot.c \
+	../../source/spine/SlotData.c \
+	../../source/string/findMatch.cc \
+	../../source/string/stringBuffer.cc \
+	../../source/string/stringStack.cc \
+	../../source/string/stringTable.cc \
+	../../source/string/stringUnit.cpp \
+	../../source/string/unicode.cc \
+	../../source/gui/buttons/guiBitmapButtonCtrl.cc \
+	../../source/gui/buttons/guiBorderButton.cc \
+	../../source/gui/buttons/guiButtonBaseCtrl.cc \
+	../../source/gui/buttons/guiButtonCtrl.cc \
+	../../source/gui/buttons/guiCheckBoxCtrl.cc \
+	../../source/gui/buttons/guiIconButtonCtrl.cc \
+	../../source/gui/buttons/guiRadioCtrl.cc \
+	../../source/gui/buttons/guiToolboxButtonCtrl.cc \
+	../../source/gui/containers/guiAutoScrollCtrl.cc \
+	../../source/gui/containers/guiCtrlArrayCtrl.cc \
+	../../source/gui/containers/guiDragAndDropCtrl.cc \
+	../../source/gui/containers/guiDynamicCtrlArrayCtrl.cc \
+	../../source/gui/containers/guiFormCtrl.cc \
+	../../source/gui/containers/guiFrameCtrl.cc \
+	../../source/gui/containers/guiPaneCtrl.cc \
+	../../source/gui/containers/guiRolloutCtrl.cc \
+	../../source/gui/containers/guiScrollCtrl.cc \
+	../../source/gui/containers/guiStackCtrl.cc \
+	../../source/gui/containers/guiTabBookCtrl.cc \
+	../../source/gui/containers/guiWindowCtrl.cc \
+	../../source/gui/editor/guiControlListPopup.cc \
+	../../source/gui/editor/guiDebugger.cc \
+	../../source/gui/editor/guiEditCtrl.cc \
+	../../source/gui/editor/guiFilterCtrl.cc \
+	../../source/gui/editor/guiGraphCtrl.cc \
+	../../source/gui/editor/guiImageList.cc \
+	../../source/gui/editor/guiInspector.cc \
+	../../source/gui/editor/guiInspectorTypes.cc \
+	../../source/gui/editor/guiMenuBar.cc \
+	../../source/gui/editor/guiSeparatorCtrl.cc 
+
+LDFLAGS := -g -m32
+LDLIBS := -lstdc++ -lm -ldl -lpthread -lrt -lX11 -lXft -lSDL -lopenal
+
+CFLAGS := -MMD -I. -Wfatal-errors -Wunused -m32 -msse -march=i686 -pipe
+
+CFLAGS += -I/usr/include
+CFLAGS += -I/usr/include/freetype2
+CFLAGS += -I../../source
+CFLAGS += -I../../source/persistence/rapidjson/include
+CFLAGS += -I../../lib/ljpeg
+CFLAGS += -I../../lib/zlib
+CFLAGS += -I../../lib/lpng
+CFLAGS += -I../../lib/freetype
+
+CFLAGS += -DLINUX
+
+CFLAGS_DEBUG := $(CFLAGS) -ggdb
+CFLAGS_DEBUG += -DTORQUE_DEBUG
+CFLAGS_DEBUG += -DTORQUE_DEBUG_GUARD
+CFLAGS_DEBUG += -DTORQUE_NET_STATS
+
+CFLAGS += -O0
+
+NASMFLAGS := -f elf -D LINUX
+
+CC := gcc
+LD := gcc
+
+APP_TARGETS += $(APPNAME)
+APP_TARGETS_DEBUG += $(APPNAME)_DEBUG
+
+OBJS := $(patsubst ../../source/%,Release/%.o,$(SOURCES))
+OBJS := $(filter %.o, $(OBJS))
+
+OBJS_DEBUG := $(patsubst ../../source/%,Debug/%.o,$(SOURCES))
+OBJS_DEBUG := $(filter %.o,$(OBJS_DEBUG))
+
+$(APP_TARGETS): $(OBJS) $(LIB_TARGETS)
+	@echo Linking release
+	$(LD) $(LBFLAGS) -o $@ $(OBJS) $(LIB_TARGETS) $(LDLIBS)
+
+$(APP_TARGETS_DEBUG): $(OBJS_DEBUG) $(LIB_TARGETS_DEBUG)
+	@echo Linking debug
+	$(LD) $(LDFLAGS) -o $@ $(OBJS_DEBUG) $(LIB_TARGETS_DEBUG) $(LDLIBS)
+
+Release/%.asm.o:	../../source/%.asm
+	@echo Building release asm $@
+	@mkdir -p $(dir $@)
+	nasm $(NASMFLAGS) $< -o $@
+
+Release/%.o:	../../source/%
+	@echo Building release object $@
+	@mkdir -p $(dir $@)
+	$(CC) -c $(CFLAGS) $< -o $@
+
+Debug/%.asm.o:	../../source/%.asm
+	@echo Building debug asm $@
+	@mkdir -p $(dir $@)
+	nasm $(NASMFLAGS) $< -o $@
+
+Debug/%.o:	../../source/%
+	@echo Building debug object $@
+	@mkdir -p $(dir $@)
+	$(CC) -c $(CFLAGS_DEBUG) $< -o $@
+
+release: $(APP_TARGETS)
+debug: $(APP_TARGETS_DEBUG)
+
+.PHONY: $(APP_TARGETS) $(APP_TARGETS_DEBUG)
+
+DEPS += $(patsubst %.o,%.d,$(OBJS))
+DEPS += $(patsubst %.o,%.d,$(OBJS_DEBUG))
+
+APPNAME :=
+SOURCES :=

engine/compilers/Make/ljpeg

@@ -0,0 +1,109 @@
+# I release this sample under the MIT license: free for any use, provided 
+# you hold me harmless from any such use you make, and you retain my 
+# copyright on the actual sources.
+# Copyright 2005 Jon Watte.
+
+LIBNAME := ljpeg
+SOURCES := ../../lib/ljpeg/jidctint.c \
+../../lib/ljpeg/jcmainct.c \
+../../lib/ljpeg/jfdctfst.c \
+../../lib/ljpeg/jdatadst.c \
+../../lib/ljpeg/jdsample.c \
+../../lib/ljpeg/jmemmgr.c \
+../../lib/ljpeg/jidctred.c \
+../../lib/ljpeg/jcphuff.c \
+../../lib/ljpeg/jchuff.c \
+../../lib/ljpeg/jdapistd.c \
+../../lib/ljpeg/jdpostct.c \
+../../lib/ljpeg/jquant2.c \
+../../lib/ljpeg/jdmerge.c \
+../../lib/ljpeg/jfdctflt.c \
+../../lib/ljpeg/jcprepct.c \
+../../lib/ljpeg/jccolor.c \
+../../lib/ljpeg/jfdctint.c \
+../../lib/ljpeg/jdhuff.c \
+../../lib/ljpeg/jcomapi.c \
+../../lib/ljpeg/jcinit.c \
+../../lib/ljpeg/jccoefct.c \
+../../lib/ljpeg/jdinput.c \
+../../lib/ljpeg/jutils.c \
+../../lib/ljpeg/jcapimin.c \
+../../lib/ljpeg/jdcoefct.c \
+../../lib/ljpeg/jidctflt.c \
+../../lib/ljpeg/jcmaster.c \
+../../lib/ljpeg/jddctmgr.c \
+../../lib/ljpeg/jidctfst.c \
+../../lib/ljpeg/jcparam.c \
+../../lib/ljpeg/jcapistd.c \
+../../lib/ljpeg/jdmaster.c \
+../../lib/ljpeg/jcdctmgr.c \
+../../lib/ljpeg/jctrans.c \
+../../lib/ljpeg/jdmainct.c \
+../../lib/ljpeg/jdtrans.c \
+../../lib/ljpeg/jcsample.c \
+../../lib/ljpeg/jdmarker.c \
+../../lib/ljpeg/jdatasrc.c \
+../../lib/ljpeg/jerror.c \
+../../lib/ljpeg/jquant1.c \
+../../lib/ljpeg/jdphuff.c \
+../../lib/ljpeg/jcmarker.c \
+../../lib/ljpeg/jdapimin.c \
+../../lib/ljpeg/jdcolor.c \
+../../lib/ljpeg/jmemnobs.c \
+
+LDFLAGS_ljpeg := -g -m32
+
+CFLAGS_ljpeg := -MMD -I. -m32 -msse -mmmx -march=i686
+
+CFLAGS_ljpeg += -I../../lib/ljpeg
+
+CFLAGS_ljpeg += -DUNICODE
+CFLAGS_ljpeg += -DLINUX
+
+CFLAGS_DEBUG_ljpeg := $(CFLAGS_ljpeg) -ggdb
+CFLAGS_DEBUG_ljpeg += -DTORQUE_DEBUG
+CFLAGS_DEBUG_ljpeg += -DTORQUE_DEBUG_GUARD
+CFLAGS_DEBUG_ljpeg += -DTORQUE_NET_STATS
+
+CFLAGS_ljpeg += -O3
+
+CC := gcc
+LD := gcc
+
+TARGET_ljpeg := lib/ljpeg.a
+TARGET_ljpeg_DEBUG := lib/ljpeg_DEBUG.a
+
+LIB_TARGETS += $(TARGET_ljpeg)
+LIB_TARGETS_DEBUG += $(TARGET_ljpeg_DEBUG)
+
+OBJS_ljpeg := $(patsubst ../../lib/ljpeg/%,Release/ljpeg/%.o,$(SOURCES))
+OBJS_ljpeg_DEBUG := $(patsubst ../../lib/ljpeg/%,Debug/ljpeg/%.o,$(SOURCES))
+
+# Deriving the variable name from the target name is the secret sauce 
+# of the build system.
+#
+$(TARGET_ljpeg):	$(OBJS_ljpeg)
+	@echo Linking library ljpng 
+	@mkdir -p $(dir $@)
+	ar cr $@ $(OBJS_ljpeg)
+   
+$(TARGET_ljpeg_DEBUG):	$(OBJS_ljpeg_DEBUG)
+	@echo Linking debug library ljpng 
+	@mkdir -p $(dir $@)
+	ar cr $@ $(OBJS_ljpeg_DEBUG)
+
+Release/ljpeg/%.o:	../../lib/ljpeg/%
+	@mkdir -p $(dir $@)
+	$(CC) -c $(CFLAGS_ljpeg) $< -o $@
+   
+Debug/ljpeg/%.o:	../../lib/ljpeg/%
+	@mkdir -p $(dir $@)
+	$(CC) -c $(CFLAGS_DEBUG_ljpeg) $< -o $@
+   
+release_ljpeg: $(TARGET_ljpeg)
+debug_ljpeg: $(TARGET_ljpeg_DEBUG)
+
+.PHONY: debug_ljpeg release_ljpeg
+
+DEPS += $(patsubst %.o,%.d,$(OBJS_ljpeg))
+DEPS += $(patsubst %.o,%.d,$(OBJS_ljpeg_DEBUG))

engine/compilers/Make/lpng

@@ -0,0 +1,78 @@
+# I release this sample under the MIT license: free for any use, provided 
+# you hold me harmless from any such use you make, and you retain my 
+# copyright on the actual sources.
+# Copyright 2005 Jon Watte.
+
+LIBNAME := lpng
+SOURCES := ../../lib/lpng/pngerror.c \
+../../lib/lpng/pngwrite.c \
+../../lib/lpng/pngread.c \
+../../lib/lpng/pngmem.c \
+../../lib/lpng/pngset.c \
+../../lib/lpng/pngwio.c \
+../../lib/lpng/pngrtran.c \
+../../lib/lpng/pngtrans.c \
+../../lib/lpng/pngrutil.c \
+../../lib/lpng/pngwtran.c \
+../../lib/lpng/png.c \
+../../lib/lpng/pngrio.c \
+../../lib/lpng/pngwutil.c \
+../../lib/lpng/pngget.c \
+../../lib/lpng/pngpread.c \
+
+LDFLAGS_lpng := -g -m32
+#LDLIBS_lpng := -lstdc++
+CFLAGS_lpng := -MMD -I. -m32 -msse -mmmx -march=i686
+
+CFLAGS_lpng += -I../../lib/zlib
+CFLAGS_lpng += -I../../lib/lpng
+
+CFLAGS_lpng += -DUNICODE
+CFLAGS_lpng += -DLINUX
+
+
+CFLAGS_DEBUG_lpng := $(CFLAGS_lpng) -ggdb
+CFLAGS_DEBUG_lpng += -DTORQUE_DEBUG
+CFLAGS_DEBUG_lpng += -DTORQUE_DEBUG_GUARD
+CFLAGS_DEBUG_lpng += -DTORQUE_NET_STATS
+
+CFLAGS_lpng += -O3
+
+CC := gcc
+LD := gcc
+
+TARGET_lpng := lib/lpng.a
+TARGET_lpng_DEBUG := lib/lpng_DEBUG.a
+
+LIB_TARGETS += $(TARGET_lpng)
+LIB_TARGETS_DEBUG += $(TARGET_lpng_DEBUG)
+
+OBJS_lpng := $(patsubst ../../lib/lpng/%,Release/lpng/%.o,$(SOURCES))
+OBJS_lpng_DEBUG := $(patsubst ../../lib/lpng/%,Debug/lpng/%.o,$(SOURCES))
+
+# Deriving the variable name from the target name is the secret sauce 
+# of the build system.
+#
+$(TARGET_lpng):	$(OBJS_lpng)
+	@mkdir -p $(dir $@)
+	ar cr $@ $(OBJS_lpng)
+   
+$(TARGET_lpng_DEBUG):	$(OBJS_lpng_DEBUG)
+	@mkdir -p $(dir $@)
+	ar cr $@ $(OBJS_lpng_DEBUG)
+
+Release/lpng/%.o:	../../lib/lpng/%
+	@mkdir -p $(dir $@)
+	$(CC) -c $(CFLAGS_lpng) $< -o $@
+   
+Debug/lpng/%.o:	../../lib/lpng/%
+	@mkdir -p $(dir $@)
+	$(CC) -c $(CFLAGS_DEBUG_lpng) $< -o $@
+   
+release_lpng: $(TARGET_lpng)
+debug_lpng: $(TARGET_lpng_DEBUG)
+
+.PHONY: debug_lpng release_lpng
+
+DEPS += $(patsubst %.o,%.d,$(OBJS_lpng))
+DEPS += $(patsubst %.o,%.d,$(OBJS_lpng_DEBUG))

engine/compilers/Make/zlib

@@ -0,0 +1,76 @@
+# I release this sample under the MIT license: free for any use, provided 
+# you hold me harmless from any such use you make, and you retain my 
+# copyright on the actual sources.
+# Copyright 2005 Jon Watte.
+
+LIBNAME := zlib
+SOURCES := ../../lib/zlib/adler32.c \
+../../lib/zlib/zutil.c \
+../../lib/zlib/crc32.c \
+../../lib/zlib/trees.c \
+../../lib/zlib/inflate.c \
+../../lib/zlib/inftrees.c \
+../../lib/zlib/gzclose.c \
+../../lib/zlib/gzread.c \
+../../lib/zlib/infback.c \
+../../lib/zlib/uncompr.c \
+../../lib/zlib/deflate.c \
+../../lib/zlib/inffast.c \
+../../lib/zlib/gzwrite.c \
+../../lib/zlib/compress.c \
+../../lib/zlib/gzlib.c \
+
+LDFLAGS_zlib := -g -m32
+
+CFLAGS_zlib := -MMD -I. -m32 -msse -mmmx -march=i686
+
+CFLAGS_zlib += -I../../lib/zlib
+
+CFLAGS_zlib += -DUNICODE
+CFLAGS_zlib += -DLINUX
+
+CFLAGS_DEBUG_zlib := $(CFLAGS_zlib) -ggdb
+CFLAGS_DEBUG_zlib += -DTORQUE_DEBUG
+CFLAGS_DEBUG_zlib += -DTORQUE_DEBUG_GUARD
+CFLAGS_DEBUG_zlib += -DTORQUE_NET_STATS
+
+CFLAGS_zlib += -O3
+
+CC := gcc
+LD := gcc
+
+TARGET_zlib := lib/zlib.a
+TARGET_zlib_DEBUG := lib/zlib_DEBUG.a
+
+LIB_TARGETS += $(TARGET_zlib)
+LIB_TARGETS_DEBUG += $(TARGET_zlib_DEBUG)
+
+OBJS_zlib := $(patsubst ../../lib/zlib/%,Release/zlib/%.o,$(SOURCES))
+OBJS_zlib_DEBUG := $(patsubst ../../lib/zlib/%,Debug/zlib/%.o,$(SOURCES))
+
+# Deriving the variable name from the target name is the secret sauce 
+# of the build system.
+#
+$(TARGET_zlib):	$(OBJS_zlib)
+	@mkdir -p $(dir $@)
+	ar cr $@ $(OBJS_zlib)
+   
+$(TARGET_zlib_DEBUG):	$(OBJS_zlib_DEBUG)
+	@mkdir -p $(dir $@)
+	ar cr $@ $(OBJS_zlib_DEBUG)
+
+Release/zlib/%.o:	../../lib/zlib/%
+	@mkdir -p $(dir $@)
+	$(CC) -c $(CFLAGS_zlib) $< -o $@
+   
+Debug/zlib/%.o:	../../lib/zlib/%
+	@mkdir -p $(dir $@)
+	$(CC) -c $(CFLAGS_DEBUG_zlib) $< -o $@
+   
+release_zlib: $(TARGET_zlib)
+debug_zlib: $(TARGET_zlib_DEBUG)
+
+.PHONY: debug_zlib release_zlib
+
+DEPS += $(patsubst %.o,%.d,$(OBJS_zlib))
+DEPS += $(patsubst %.o,%.d,$(OBJS_zlib_DEBUG))

engine/compilers/VisualStudio 2010/Torque 2D.vcxproj

@@ -287,52 +287,52 @@
     <ClCompile Include="..\..\source\assets\referencedAssets.cc" />
     <ClCompile Include="..\..\source\audio\AudioAsset.cc" />
     <ClCompile Include="..\..\source\audio\audio_ScriptBinding.cc" />
-    <ClCompile Include="..\..\source\box2d\Collision\b2BroadPhase.cpp" />
-    <ClCompile Include="..\..\source\box2d\Collision\b2CollideCircle.cpp" />
-    <ClCompile Include="..\..\source\box2d\Collision\b2CollideEdge.cpp" />
-    <ClCompile Include="..\..\source\box2d\Collision\b2CollidePolygon.cpp" />
-    <ClCompile Include="..\..\source\box2d\Collision\b2Collision.cpp" />
-    <ClCompile Include="..\..\source\box2d\Collision\b2Distance.cpp" />
-    <ClCompile Include="..\..\source\box2d\Collision\b2DynamicTree.cpp" />
-    <ClCompile Include="..\..\source\box2d\Collision\b2TimeOfImpact.cpp" />
-    <ClCompile Include="..\..\source\box2d\Collision\Shapes\b2ChainShape.cpp" />
-    <ClCompile Include="..\..\source\box2d\Collision\Shapes\b2CircleShape.cpp" />
-    <ClCompile Include="..\..\source\box2d\Collision\Shapes\b2EdgeShape.cpp" />
-    <ClCompile Include="..\..\source\box2d\Collision\Shapes\b2PolygonShape.cpp" />
-    <ClCompile Include="..\..\source\box2d\Common\b2BlockAllocator.cpp" />
-    <ClCompile Include="..\..\source\box2d\Common\b2Draw.cpp" />
-    <ClCompile Include="..\..\source\box2d\Common\b2Math.cpp" />
-    <ClCompile Include="..\..\source\box2d\Common\b2Settings.cpp" />
-    <ClCompile Include="..\..\source\box2d\Common\b2StackAllocator.cpp" />
-    <ClCompile Include="..\..\source\box2d\Common\b2Timer.cpp" />
-    <ClCompile Include="..\..\source\box2d\Dynamics\b2Body.cpp" />
-    <ClCompile Include="..\..\source\box2d\Dynamics\b2ContactManager.cpp" />
-    <ClCompile Include="..\..\source\box2d\Dynamics\b2Fixture.cpp" />
-    <ClCompile Include="..\..\source\box2d\Dynamics\b2Island.cpp" />
-    <ClCompile Include="..\..\source\box2d\Dynamics\b2World.cpp" />
-    <ClCompile Include="..\..\source\box2d\Dynamics\b2WorldCallbacks.cpp" />
-    <ClCompile Include="..\..\source\box2d\Dynamics\Contacts\b2ChainAndCircleContact.cpp" />
-    <ClCompile Include="..\..\source\box2d\Dynamics\Contacts\b2ChainAndPolygonContact.cpp" />
-    <ClCompile Include="..\..\source\box2d\Dynamics\Contacts\b2CircleContact.cpp" />
-    <ClCompile Include="..\..\source\box2d\Dynamics\Contacts\b2Contact.cpp" />
-    <ClCompile Include="..\..\source\box2d\Dynamics\Contacts\b2ContactSolver.cpp" />
-    <ClCompile Include="..\..\source\box2d\Dynamics\Contacts\b2EdgeAndCircleContact.cpp" />
-    <ClCompile Include="..\..\source\box2d\Dynamics\Contacts\b2EdgeAndPolygonContact.cpp" />
-    <ClCompile Include="..\..\source\box2d\Dynamics\Contacts\b2PolygonAndCircleContact.cpp" />
-    <ClCompile Include="..\..\source\box2d\Dynamics\Contacts\b2PolygonContact.cpp" />
-    <ClCompile Include="..\..\source\box2d\Dynamics\Joints\b2DistanceJoint.cpp" />
-    <ClCompile Include="..\..\source\box2d\Dynamics\Joints\b2FrictionJoint.cpp" />
-    <ClCompile Include="..\..\source\box2d\Dynamics\Joints\b2GearJoint.cpp" />
-    <ClCompile Include="..\..\source\box2d\Dynamics\Joints\b2Joint.cpp" />
-    <ClCompile Include="..\..\source\box2d\Dynamics\Joints\b2MotorJoint.cpp" />
-    <ClCompile Include="..\..\source\box2d\Dynamics\Joints\b2MouseJoint.cpp" />
-    <ClCompile Include="..\..\source\box2d\Dynamics\Joints\b2PrismaticJoint.cpp" />
-    <ClCompile Include="..\..\source\box2d\Dynamics\Joints\b2PulleyJoint.cpp" />
-    <ClCompile Include="..\..\source\box2d\Dynamics\Joints\b2RevoluteJoint.cpp" />
-    <ClCompile Include="..\..\source\box2d\Dynamics\Joints\b2RopeJoint.cpp" />
-    <ClCompile Include="..\..\source\box2d\Dynamics\Joints\b2WeldJoint.cpp" />
-    <ClCompile Include="..\..\source\box2d\Dynamics\Joints\b2WheelJoint.cpp" />
-    <ClCompile Include="..\..\source\box2d\Rope\b2Rope.cpp" />
+    <ClCompile Include="..\..\source\Box2D\Collision\b2BroadPhase.cpp" />
+    <ClCompile Include="..\..\source\Box2D\Collision\b2CollideCircle.cpp" />
+    <ClCompile Include="..\..\source\Box2D\Collision\b2CollideEdge.cpp" />
+    <ClCompile Include="..\..\source\Box2D\Collision\b2CollidePolygon.cpp" />
+    <ClCompile Include="..\..\source\Box2D\Collision\b2Collision.cpp" />
+    <ClCompile Include="..\..\source\Box2D\Collision\b2Distance.cpp" />
+    <ClCompile Include="..\..\source\Box2D\Collision\b2DynamicTree.cpp" />
+    <ClCompile Include="..\..\source\Box2D\Collision\b2TimeOfImpact.cpp" />
+    <ClCompile Include="..\..\source\Box2D\Collision\Shapes\b2ChainShape.cpp" />
+    <ClCompile Include="..\..\source\Box2D\Collision\Shapes\b2CircleShape.cpp" />
+    <ClCompile Include="..\..\source\Box2D\Collision\Shapes\b2EdgeShape.cpp" />
+    <ClCompile Include="..\..\source\Box2D\Collision\Shapes\b2PolygonShape.cpp" />
+    <ClCompile Include="..\..\source\Box2D\Common\b2BlockAllocator.cpp" />
+    <ClCompile Include="..\..\source\Box2D\Common\b2Draw.cpp" />
+    <ClCompile Include="..\..\source\Box2D\Common\b2Math.cpp" />
+    <ClCompile Include="..\..\source\Box2D\Common\b2Settings.cpp" />
+    <ClCompile Include="..\..\source\Box2D\Common\b2StackAllocator.cpp" />
+    <ClCompile Include="..\..\source\Box2D\Common\b2Timer.cpp" />
+    <ClCompile Include="..\..\source\Box2D\Dynamics\b2Body.cpp" />
+    <ClCompile Include="..\..\source\Box2D\Dynamics\b2ContactManager.cpp" />
+    <ClCompile Include="..\..\source\Box2D\Dynamics\b2Fixture.cpp" />
+    <ClCompile Include="..\..\source\Box2D\Dynamics\b2Island.cpp" />
+    <ClCompile Include="..\..\source\Box2D\Dynamics\b2World.cpp" />
+    <ClCompile Include="..\..\source\Box2D\Dynamics\b2WorldCallbacks.cpp" />
+    <ClCompile Include="..\..\source\Box2D\Dynamics\Contacts\b2ChainAndCircleContact.cpp" />
+    <ClCompile Include="..\..\source\Box2D\Dynamics\Contacts\b2ChainAndPolygonContact.cpp" />
+    <ClCompile Include="..\..\source\Box2D\Dynamics\Contacts\b2CircleContact.cpp" />
+    <ClCompile Include="..\..\source\Box2D\Dynamics\Contacts\b2Contact.cpp" />
+    <ClCompile Include="..\..\source\Box2D\Dynamics\Contacts\b2ContactSolver.cpp" />
+    <ClCompile Include="..\..\source\Box2D\Dynamics\Contacts\b2EdgeAndCircleContact.cpp" />
+    <ClCompile Include="..\..\source\Box2D\Dynamics\Contacts\b2EdgeAndPolygonContact.cpp" />
+    <ClCompile Include="..\..\source\Box2D\Dynamics\Contacts\b2PolygonAndCircleContact.cpp" />
+    <ClCompile Include="..\..\source\Box2D\Dynamics\Contacts\b2PolygonContact.cpp" />
+    <ClCompile Include="..\..\source\Box2D\Dynamics\Joints\b2DistanceJoint.cpp" />
+    <ClCompile Include="..\..\source\Box2D\Dynamics\Joints\b2FrictionJoint.cpp" />
+    <ClCompile Include="..\..\source\Box2D\Dynamics\Joints\b2GearJoint.cpp" />
+    <ClCompile Include="..\..\source\Box2D\Dynamics\Joints\b2Joint.cpp" />
+    <ClCompile Include="..\..\source\Box2D\Dynamics\Joints\b2MotorJoint.cpp" />
+    <ClCompile Include="..\..\source\Box2D\Dynamics\Joints\b2MouseJoint.cpp" />
+    <ClCompile Include="..\..\source\Box2D\Dynamics\Joints\b2PrismaticJoint.cpp" />
+    <ClCompile Include="..\..\source\Box2D\Dynamics\Joints\b2PulleyJoint.cpp" />
+    <ClCompile Include="..\..\source\Box2D\Dynamics\Joints\b2RevoluteJoint.cpp" />
+    <ClCompile Include="..\..\source\Box2D\Dynamics\Joints\b2RopeJoint.cpp" />
+    <ClCompile Include="..\..\source\Box2D\Dynamics\Joints\b2WeldJoint.cpp" />
+    <ClCompile Include="..\..\source\Box2D\Dynamics\Joints\b2WheelJoint.cpp" />
+    <ClCompile Include="..\..\source\Box2D\Rope\b2Rope.cpp" />
     <ClCompile Include="..\..\source\collection\bitTables.cc" />
     <ClCompile Include="..\..\source\collection\hashTable.cc" />
     <ClCompile Include="..\..\source\collection\nameTags.cpp" />
@@ -722,53 +722,53 @@
     <ClInclude Include="..\..\source\assets\tamlAssetReferencedUpdateVisitor.h" />
     <ClInclude Include="..\..\source\assets\tamlAssetReferencedVisitor.h" />
     <ClInclude Include="..\..\source\audio\AudioAsset.h" />
-    <ClInclude Include="..\..\source\box2d\Box2D.h" />
-    <ClInclude Include="..\..\source\box2d\Collision\b2BroadPhase.h" />
-    <ClInclude Include="..\..\source\box2d\Collision\b2Collision.h" />
-    <ClInclude Include="..\..\source\box2d\Collision\b2Distance.h" />
-    <ClInclude Include="..\..\source\box2d\Collision\b2DynamicTree.h" />
-    <ClInclude Include="..\..\source\box2d\Collision\b2TimeOfImpact.h" />
-    <ClInclude Include="..\..\source\box2d\Collision\Shapes\b2ChainShape.h" />
-    <ClInclude Include="..\..\source\box2d\Collision\Shapes\b2CircleShape.h" />
-    <ClInclude Include="..\..\source\box2d\Collision\Shapes\b2EdgeShape.h" />
-    <ClInclude Include="..\..\source\box2d\Collision\Shapes\b2PolygonShape.h" />
-    <ClInclude Include="..\..\source\box2d\Collision\Shapes\b2Shape.h" />
-    <ClInclude Include="..\..\source\box2d\Common\b2BlockAllocator.h" />
-    <ClInclude Include="..\..\source\box2d\Common\b2Draw.h" />
-    <ClInclude Include="..\..\source\box2d\Common\b2GrowableStack.h" />
-    <ClInclude Include="..\..\source\box2d\Common\b2Math.h" />
-    <ClInclude Include="..\..\source\box2d\Common\b2Settings.h" />
-    <ClInclude Include="..\..\source\box2d\Common\b2StackAllocator.h" />
-    <ClInclude Include="..\..\source\box2d\Common\b2Timer.h" />
-    <ClInclude Include="..\..\source\box2d\Dynamics\b2Body.h" />
-    <ClInclude Include="..\..\source\box2d\Dynamics\b2ContactManager.h" />
-    <ClInclude Include="..\..\source\box2d\Dynamics\b2Fixture.h" />
-    <ClInclude Include="..\..\source\box2d\Dynamics\b2Island.h" />
-    <ClInclude Include="..\..\source\box2d\Dynamics\b2TimeStep.h" />
-    <ClInclude Include="..\..\source\box2d\Dynamics\b2World.h" />
-    <ClInclude Include="..\..\source\box2d\Dynamics\b2WorldCallbacks.h" />
-    <ClInclude Include="..\..\source\box2d\Dynamics\Contacts\b2ChainAndCircleContact.h" />
-    <ClInclude Include="..\..\source\box2d\Dynamics\Contacts\b2ChainAndPolygonContact.h" />
-    <ClInclude Include="..\..\source\box2d\Dynamics\Contacts\b2CircleContact.h" />
-    <ClInclude Include="..\..\source\box2d\Dynamics\Contacts\b2Contact.h" />
-    <ClInclude Include="..\..\source\box2d\Dynamics\Contacts\b2ContactSolver.h" />
-    <ClInclude Include="..\..\source\box2d\Dynamics\Contacts\b2EdgeAndCircleContact.h" />
-    <ClInclude Include="..\..\source\box2d\Dynamics\Contacts\b2EdgeAndPolygonContact.h" />
-    <ClInclude Include="..\..\source\box2d\Dynamics\Contacts\b2PolygonAndCircleContact.h" />
-    <ClInclude Include="..\..\source\box2d\Dynamics\Contacts\b2PolygonContact.h" />
-    <ClInclude Include="..\..\source\box2d\Dynamics\Joints\b2DistanceJoint.h" />
-    <ClInclude Include="..\..\source\box2d\Dynamics\Joints\b2FrictionJoint.h" />
-    <ClInclude Include="..\..\source\box2d\Dynamics\Joints\b2GearJoint.h" />
-    <ClInclude Include="..\..\source\box2d\Dynamics\Joints\b2Joint.h" />
-    <ClInclude Include="..\..\source\box2d\Dynamics\Joints\b2MotorJoint.h" />
-    <ClInclude Include="..\..\source\box2d\Dynamics\Joints\b2MouseJoint.h" />
-    <ClInclude Include="..\..\source\box2d\Dynamics\Joints\b2PrismaticJoint.h" />
-    <ClInclude Include="..\..\source\box2d\Dynamics\Joints\b2PulleyJoint.h" />
-    <ClInclude Include="..\..\source\box2d\Dynamics\Joints\b2RevoluteJoint.h" />
-    <ClInclude Include="..\..\source\box2d\Dynamics\Joints\b2RopeJoint.h" />
-    <ClInclude Include="..\..\source\box2d\Dynamics\Joints\b2WeldJoint.h" />
-    <ClInclude Include="..\..\source\box2d\Dynamics\Joints\b2WheelJoint.h" />
-    <ClInclude Include="..\..\source\box2d\Rope\b2Rope.h" />
+    <ClInclude Include="..\..\source\Box2D\Box2D.h" />
+    <ClInclude Include="..\..\source\Box2D\Collision\b2BroadPhase.h" />
+    <ClInclude Include="..\..\source\Box2D\Collision\b2Collision.h" />
+    <ClInclude Include="..\..\source\Box2D\Collision\b2Distance.h" />
+    <ClInclude Include="..\..\source\Box2D\Collision\b2DynamicTree.h" />
+    <ClInclude Include="..\..\source\Box2D\Collision\b2TimeOfImpact.h" />
+    <ClInclude Include="..\..\source\Box2D\Collision\Shapes\b2ChainShape.h" />
+    <ClInclude Include="..\..\source\Box2D\Collision\Shapes\b2CircleShape.h" />
+    <ClInclude Include="..\..\source\Box2D\Collision\Shapes\b2EdgeShape.h" />
+    <ClInclude Include="..\..\source\Box2D\Collision\Shapes\b2PolygonShape.h" />
+    <ClInclude Include="..\..\source\Box2D\Collision\Shapes\b2Shape.h" />
+    <ClInclude Include="..\..\source\Box2D\Common\b2BlockAllocator.h" />
+    <ClInclude Include="..\..\source\Box2D\Common\b2Draw.h" />
+    <ClInclude Include="..\..\source\Box2D\Common\b2GrowableStack.h" />
+    <ClInclude Include="..\..\source\Box2D\Common\b2Math.h" />
+    <ClInclude Include="..\..\source\Box2D\Common\b2Settings.h" />
+    <ClInclude Include="..\..\source\Box2D\Common\b2StackAllocator.h" />
+    <ClInclude Include="..\..\source\Box2D\Common\b2Timer.h" />
+    <ClInclude Include="..\..\source\Box2D\Dynamics\b2Body.h" />
+    <ClInclude Include="..\..\source\Box2D\Dynamics\b2ContactManager.h" />
+    <ClInclude Include="..\..\source\Box2D\Dynamics\b2Fixture.h" />
+    <ClInclude Include="..\..\source\Box2D\Dynamics\b2Island.h" />
+    <ClInclude Include="..\..\source\Box2D\Dynamics\b2TimeStep.h" />
+    <ClInclude Include="..\..\source\Box2D\Dynamics\b2World.h" />
+    <ClInclude Include="..\..\source\Box2D\Dynamics\b2WorldCallbacks.h" />
+    <ClInclude Include="..\..\source\Box2D\Dynamics\Contacts\b2ChainAndCircleContact.h" />
+    <ClInclude Include="..\..\source\Box2D\Dynamics\Contacts\b2ChainAndPolygonContact.h" />
+    <ClInclude Include="..\..\source\Box2D\Dynamics\Contacts\b2CircleContact.h" />
+    <ClInclude Include="..\..\source\Box2D\Dynamics\Contacts\b2Contact.h" />
+    <ClInclude Include="..\..\source\Box2D\Dynamics\Contacts\b2ContactSolver.h" />
+    <ClInclude Include="..\..\source\Box2D\Dynamics\Contacts\b2EdgeAndCircleContact.h" />
+    <ClInclude Include="..\..\source\Box2D\Dynamics\Contacts\b2EdgeAndPolygonContact.h" />
+    <ClInclude Include="..\..\source\Box2D\Dynamics\Contacts\b2PolygonAndCircleContact.h" />
+    <ClInclude Include="..\..\source\Box2D\Dynamics\Contacts\b2PolygonContact.h" />
+    <ClInclude Include="..\..\source\Box2D\Dynamics\Joints\b2DistanceJoint.h" />
+    <ClInclude Include="..\..\source\Box2D\Dynamics\Joints\b2FrictionJoint.h" />
+    <ClInclude Include="..\..\source\Box2D\Dynamics\Joints\b2GearJoint.h" />
+    <ClInclude Include="..\..\source\Box2D\Dynamics\Joints\b2Joint.h" />
+    <ClInclude Include="..\..\source\Box2D\Dynamics\Joints\b2MotorJoint.h" />
+    <ClInclude Include="..\..\source\Box2D\Dynamics\Joints\b2MouseJoint.h" />
+    <ClInclude Include="..\..\source\Box2D\Dynamics\Joints\b2PrismaticJoint.h" />
+    <ClInclude Include="..\..\source\Box2D\Dynamics\Joints\b2PulleyJoint.h" />
+    <ClInclude Include="..\..\source\Box2D\Dynamics\Joints\b2RevoluteJoint.h" />
+    <ClInclude Include="..\..\source\Box2D\Dynamics\Joints\b2RopeJoint.h" />
+    <ClInclude Include="..\..\source\Box2D\Dynamics\Joints\b2WeldJoint.h" />
+    <ClInclude Include="..\..\source\Box2D\Dynamics\Joints\b2WheelJoint.h" />
+    <ClInclude Include="..\..\source\Box2D\Rope\b2Rope.h" />
     <ClInclude Include="..\..\source\collection\bitMatrix.h" />
     <ClInclude Include="..\..\source\collection\bitSet.h" />
     <ClInclude Include="..\..\source\collection\bitTables.h" />

engine/compilers/VisualStudio 2010/Torque 2D.vcxproj.filters

@@ -28,28 +28,28 @@
     <Filter Include="audio">
       <UniqueIdentifier>{bfd4849e-66c6-450b-9a01-0873aa28e21a}</UniqueIdentifier>
     </Filter>
-    <Filter Include="box2d">
+    <Filter Include="Box2D">
       <UniqueIdentifier>{1f640da6-77a4-4176-a018-9bfad5becf95}</UniqueIdentifier>
     </Filter>
-    <Filter Include="box2d\Collision">
+    <Filter Include="Box2D\Collision">
       <UniqueIdentifier>{4faf4110-842d-4178-81ca-0375f3804cac}</UniqueIdentifier>
     </Filter>
-    <Filter Include="box2d\Collision\Shapes">
+    <Filter Include="Box2D\Collision\Shapes">
       <UniqueIdentifier>{2f939a2b-3cd9-4e67-8311-bf751093f2a5}</UniqueIdentifier>
     </Filter>
-    <Filter Include="box2d\Common">
+    <Filter Include="Box2D\Common">
       <UniqueIdentifier>{84907fc2-76e8-4a3b-9df4-76451387d3f9}</UniqueIdentifier>
     </Filter>
-    <Filter Include="box2d\Dynamics">
+    <Filter Include="Box2D\Dynamics">
       <UniqueIdentifier>{e2574a74-ff0d-401d-818d-96e6c155a4b4}</UniqueIdentifier>
     </Filter>
-    <Filter Include="box2d\Dynamics\Contacts">
+    <Filter Include="Box2D\Dynamics\Contacts">
       <UniqueIdentifier>{18c9fe85-da18-45d5-9573-a71ce9373961}</UniqueIdentifier>
     </Filter>
-    <Filter Include="box2d\Dynamics\Joints">
+    <Filter Include="Box2D\Dynamics\Joints">
       <UniqueIdentifier>{4f9157b1-a024-450f-a352-1849cf2bddcc}</UniqueIdentifier>
     </Filter>
-    <Filter Include="box2d\Rope">
+    <Filter Include="Box2D\Rope">
       <UniqueIdentifier>{14385fbb-f8af-4849-bdd9-8c8f67d3928e}</UniqueIdentifier>
     </Filter>
     <Filter Include="collection">
@@ -540,143 +540,143 @@
     <ClCompile Include="..\..\source\gui\editor\guiSeparatorCtrl.cc">
       <Filter>gui\editor</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\box2d\Collision\b2BroadPhase.cpp">
-      <Filter>box2d\Collision</Filter>
+    <ClCompile Include="..\..\source\Box2D\Collision\b2BroadPhase.cpp">
+      <Filter>Box2D\Collision</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\box2d\Collision\b2CollideCircle.cpp">
-      <Filter>box2d\Collision</Filter>
+    <ClCompile Include="..\..\source\Box2D\Collision\b2CollideCircle.cpp">
+      <Filter>Box2D\Collision</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\box2d\Collision\b2CollideEdge.cpp">
-      <Filter>box2d\Collision</Filter>
+    <ClCompile Include="..\..\source\Box2D\Collision\b2CollideEdge.cpp">
+      <Filter>Box2D\Collision</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\box2d\Collision\b2CollidePolygon.cpp">
-      <Filter>box2d\Collision</Filter>
+    <ClCompile Include="..\..\source\Box2D\Collision\b2CollidePolygon.cpp">
+      <Filter>Box2D\Collision</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\box2d\Collision\b2Collision.cpp">
-      <Filter>box2d\Collision</Filter>
+    <ClCompile Include="..\..\source\Box2D\Collision\b2Collision.cpp">
+      <Filter>Box2D\Collision</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\box2d\Collision\b2Distance.cpp">
-      <Filter>box2d\Collision</Filter>
+    <ClCompile Include="..\..\source\Box2D\Collision\b2Distance.cpp">
+      <Filter>Box2D\Collision</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\box2d\Collision\b2DynamicTree.cpp">
-      <Filter>box2d\Collision</Filter>
+    <ClCompile Include="..\..\source\Box2D\Collision\b2DynamicTree.cpp">
+      <Filter>Box2D\Collision</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\box2d\Collision\b2TimeOfImpact.cpp">
-      <Filter>box2d\Collision</Filter>
+    <ClCompile Include="..\..\source\Box2D\Collision\b2TimeOfImpact.cpp">
+      <Filter>Box2D\Collision</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\box2d\Collision\Shapes\b2ChainShape.cpp">
-      <Filter>box2d\Collision\Shapes</Filter>
+    <ClCompile Include="..\..\source\Box2D\Collision\Shapes\b2ChainShape.cpp">
+      <Filter>Box2D\Collision\Shapes</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\box2d\Collision\Shapes\b2CircleShape.cpp">
-      <Filter>box2d\Collision\Shapes</Filter>
+    <ClCompile Include="..\..\source\Box2D\Collision\Shapes\b2CircleShape.cpp">
+      <Filter>Box2D\Collision\Shapes</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\box2d\Collision\Shapes\b2EdgeShape.cpp">
-      <Filter>box2d\Collision\Shapes</Filter>
+    <ClCompile Include="..\..\source\Box2D\Collision\Shapes\b2EdgeShape.cpp">
+      <Filter>Box2D\Collision\Shapes</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\box2d\Collision\Shapes\b2PolygonShape.cpp">
-      <Filter>box2d\Collision\Shapes</Filter>
+    <ClCompile Include="..\..\source\Box2D\Collision\Shapes\b2PolygonShape.cpp">
+      <Filter>Box2D\Collision\Shapes</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\box2d\Common\b2BlockAllocator.cpp">
-      <Filter>box2d\Common</Filter>
+    <ClCompile Include="..\..\source\Box2D\Common\b2BlockAllocator.cpp">
+      <Filter>Box2D\Common</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\box2d\Common\b2Draw.cpp">
-      <Filter>box2d\Common</Filter>
+    <ClCompile Include="..\..\source\Box2D\Common\b2Draw.cpp">
+      <Filter>Box2D\Common</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\box2d\Common\b2Math.cpp">
-      <Filter>box2d\Common</Filter>
+    <ClCompile Include="..\..\source\Box2D\Common\b2Math.cpp">
+      <Filter>Box2D\Common</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\box2d\Common\b2Settings.cpp">
-      <Filter>box2d\Common</Filter>
+    <ClCompile Include="..\..\source\Box2D\Common\b2Settings.cpp">
+      <Filter>Box2D\Common</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\box2d\Common\b2StackAllocator.cpp">
-      <Filter>box2d\Common</Filter>
+    <ClCompile Include="..\..\source\Box2D\Common\b2StackAllocator.cpp">
+      <Filter>Box2D\Common</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\box2d\Common\b2Timer.cpp">
-      <Filter>box2d\Common</Filter>
+    <ClCompile Include="..\..\source\Box2D\Common\b2Timer.cpp">
+      <Filter>Box2D\Common</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\box2d\Dynamics\b2Body.cpp">
-      <Filter>box2d\Dynamics</Filter>
+    <ClCompile Include="..\..\source\Box2D\Dynamics\b2Body.cpp">
+      <Filter>Box2D\Dynamics</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\box2d\Dynamics\b2ContactManager.cpp">
-      <Filter>box2d\Dynamics</Filter>
+    <ClCompile Include="..\..\source\Box2D\Dynamics\b2ContactManager.cpp">
+      <Filter>Box2D\Dynamics</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\box2d\Dynamics\b2Fixture.cpp">
-      <Filter>box2d\Dynamics</Filter>
+    <ClCompile Include="..\..\source\Box2D\Dynamics\b2Fixture.cpp">
+      <Filter>Box2D\Dynamics</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\box2d\Dynamics\b2Island.cpp">
-      <Filter>box2d\Dynamics</Filter>
+    <ClCompile Include="..\..\source\Box2D\Dynamics\b2Island.cpp">
+      <Filter>Box2D\Dynamics</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\box2d\Dynamics\b2World.cpp">
-      <Filter>box2d\Dynamics</Filter>
+    <ClCompile Include="..\..\source\Box2D\Dynamics\b2World.cpp">
+      <Filter>Box2D\Dynamics</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\box2d\Dynamics\b2WorldCallbacks.cpp">
-      <Filter>box2d\Dynamics</Filter>
+    <ClCompile Include="..\..\source\Box2D\Dynamics\b2WorldCallbacks.cpp">
+      <Filter>Box2D\Dynamics</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\box2d\Dynamics\Contacts\b2ChainAndCircleContact.cpp">
-      <Filter>box2d\Dynamics\Contacts</Filter>
+    <ClCompile Include="..\..\source\Box2D\Dynamics\Contacts\b2ChainAndCircleContact.cpp">
+      <Filter>Box2D\Dynamics\Contacts</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\box2d\Dynamics\Contacts\b2ChainAndPolygonContact.cpp">
-      <Filter>box2d\Dynamics\Contacts</Filter>
+    <ClCompile Include="..\..\source\Box2D\Dynamics\Contacts\b2ChainAndPolygonContact.cpp">
+      <Filter>Box2D\Dynamics\Contacts</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\box2d\Dynamics\Contacts\b2CircleContact.cpp">
-      <Filter>box2d\Dynamics\Contacts</Filter>
+    <ClCompile Include="..\..\source\Box2D\Dynamics\Contacts\b2CircleContact.cpp">
+      <Filter>Box2D\Dynamics\Contacts</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\box2d\Dynamics\Contacts\b2Contact.cpp">
-      <Filter>box2d\Dynamics\Contacts</Filter>
+    <ClCompile Include="..\..\source\Box2D\Dynamics\Contacts\b2Contact.cpp">
+      <Filter>Box2D\Dynamics\Contacts</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\box2d\Dynamics\Contacts\b2ContactSolver.cpp">
-      <Filter>box2d\Dynamics\Contacts</Filter>
+    <ClCompile Include="..\..\source\Box2D\Dynamics\Contacts\b2ContactSolver.cpp">
+      <Filter>Box2D\Dynamics\Contacts</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\box2d\Dynamics\Contacts\b2EdgeAndCircleContact.cpp">
-      <Filter>box2d\Dynamics\Contacts</Filter>
+    <ClCompile Include="..\..\source\Box2D\Dynamics\Contacts\b2EdgeAndCircleContact.cpp">
+      <Filter>Box2D\Dynamics\Contacts</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\box2d\Dynamics\Contacts\b2EdgeAndPolygonContact.cpp">
-      <Filter>box2d\Dynamics\Contacts</Filter>
+    <ClCompile Include="..\..\source\Box2D\Dynamics\Contacts\b2EdgeAndPolygonContact.cpp">
+      <Filter>Box2D\Dynamics\Contacts</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\box2d\Dynamics\Contacts\b2PolygonAndCircleContact.cpp">
-      <Filter>box2d\Dynamics\Contacts</Filter>
+    <ClCompile Include="..\..\source\Box2D\Dynamics\Contacts\b2PolygonAndCircleContact.cpp">
+      <Filter>Box2D\Dynamics\Contacts</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\box2d\Dynamics\Contacts\b2PolygonContact.cpp">
-      <Filter>box2d\Dynamics\Contacts</Filter>
+    <ClCompile Include="..\..\source\Box2D\Dynamics\Contacts\b2PolygonContact.cpp">
+      <Filter>Box2D\Dynamics\Contacts</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\box2d\Dynamics\Joints\b2DistanceJoint.cpp">
-      <Filter>box2d\Dynamics\Joints</Filter>
+    <ClCompile Include="..\..\source\Box2D\Dynamics\Joints\b2DistanceJoint.cpp">
+      <Filter>Box2D\Dynamics\Joints</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\box2d\Dynamics\Joints\b2FrictionJoint.cpp">
-      <Filter>box2d\Dynamics\Joints</Filter>
+    <ClCompile Include="..\..\source\Box2D\Dynamics\Joints\b2FrictionJoint.cpp">
+      <Filter>Box2D\Dynamics\Joints</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\box2d\Dynamics\Joints\b2GearJoint.cpp">
-      <Filter>box2d\Dynamics\Joints</Filter>
+    <ClCompile Include="..\..\source\Box2D\Dynamics\Joints\b2GearJoint.cpp">
+      <Filter>Box2D\Dynamics\Joints</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\box2d\Dynamics\Joints\b2Joint.cpp">
-      <Filter>box2d\Dynamics\Joints</Filter>
+    <ClCompile Include="..\..\source\Box2D\Dynamics\Joints\b2Joint.cpp">
+      <Filter>Box2D\Dynamics\Joints</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\box2d\Dynamics\Joints\b2MotorJoint.cpp">
-      <Filter>box2d\Dynamics\Joints</Filter>
+    <ClCompile Include="..\..\source\Box2D\Dynamics\Joints\b2MotorJoint.cpp">
+      <Filter>Box2D\Dynamics\Joints</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\box2d\Dynamics\Joints\b2MouseJoint.cpp">
-      <Filter>box2d\Dynamics\Joints</Filter>
+    <ClCompile Include="..\..\source\Box2D\Dynamics\Joints\b2MouseJoint.cpp">
+      <Filter>Box2D\Dynamics\Joints</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\box2d\Dynamics\Joints\b2PrismaticJoint.cpp">
-      <Filter>box2d\Dynamics\Joints</Filter>
+    <ClCompile Include="..\..\source\Box2D\Dynamics\Joints\b2PrismaticJoint.cpp">
+      <Filter>Box2D\Dynamics\Joints</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\box2d\Dynamics\Joints\b2PulleyJoint.cpp">
-      <Filter>box2d\Dynamics\Joints</Filter>
+    <ClCompile Include="..\..\source\Box2D\Dynamics\Joints\b2PulleyJoint.cpp">
+      <Filter>Box2D\Dynamics\Joints</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\box2d\Dynamics\Joints\b2RevoluteJoint.cpp">
-      <Filter>box2d\Dynamics\Joints</Filter>
+    <ClCompile Include="..\..\source\Box2D\Dynamics\Joints\b2RevoluteJoint.cpp">
+      <Filter>Box2D\Dynamics\Joints</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\box2d\Dynamics\Joints\b2RopeJoint.cpp">
-      <Filter>box2d\Dynamics\Joints</Filter>
+    <ClCompile Include="..\..\source\Box2D\Dynamics\Joints\b2RopeJoint.cpp">
+      <Filter>Box2D\Dynamics\Joints</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\box2d\Dynamics\Joints\b2WeldJoint.cpp">
-      <Filter>box2d\Dynamics\Joints</Filter>
+    <ClCompile Include="..\..\source\Box2D\Dynamics\Joints\b2WeldJoint.cpp">
+      <Filter>Box2D\Dynamics\Joints</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\box2d\Dynamics\Joints\b2WheelJoint.cpp">
-      <Filter>box2d\Dynamics\Joints</Filter>
+    <ClCompile Include="..\..\source\Box2D\Dynamics\Joints\b2WheelJoint.cpp">
+      <Filter>Box2D\Dynamics\Joints</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\box2d\Rope\b2Rope.cpp">
-      <Filter>box2d\Rope</Filter>
+    <ClCompile Include="..\..\source\Box2D\Rope\b2Rope.cpp">
+      <Filter>Box2D\Rope</Filter>
     </ClCompile>
     <ClCompile Include="..\..\source\persistence\taml\taml.cc">
       <Filter>persistence\taml</Filter>
@@ -1712,146 +1712,146 @@
     <ClInclude Include="..\..\source\gui\editor\guiSeparatorCtrl.h">
       <Filter>gui\editor</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\source\box2d\Box2D.h">
-      <Filter>box2d</Filter>
+    <ClInclude Include="..\..\source\Box2D\Box2D.h">
+      <Filter>Box2D</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\source\box2d\Collision\b2BroadPhase.h">
-      <Filter>box2d\Collision</Filter>
+    <ClInclude Include="..\..\source\Box2D\Collision\b2BroadPhase.h">
+      <Filter>Box2D\Collision</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\source\box2d\Collision\b2Collision.h">
-      <Filter>box2d\Collision</Filter>
+    <ClInclude Include="..\..\source\Box2D\Collision\b2Collision.h">
+      <Filter>Box2D\Collision</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\source\box2d\Collision\b2Distance.h">
-      <Filter>box2d\Collision</Filter>
+    <ClInclude Include="..\..\source\Box2D\Collision\b2Distance.h">
+      <Filter>Box2D\Collision</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\source\box2d\Collision\b2DynamicTree.h">
-      <Filter>box2d\Collision</Filter>
+    <ClInclude Include="..\..\source\Box2D\Collision\b2DynamicTree.h">
+      <Filter>Box2D\Collision</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\source\box2d\Collision\b2TimeOfImpact.h">
-      <Filter>box2d\Collision</Filter>
+    <ClInclude Include="..\..\source\Box2D\Collision\b2TimeOfImpact.h">
+      <Filter>Box2D\Collision</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\source\box2d\Collision\Shapes\b2ChainShape.h">
-      <Filter>box2d\Collision\Shapes</Filter>
+    <ClInclude Include="..\..\source\Box2D\Collision\Shapes\b2ChainShape.h">
+      <Filter>Box2D\Collision\Shapes</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\source\box2d\Collision\Shapes\b2CircleShape.h">
-      <Filter>box2d\Collision\Shapes</Filter>
+    <ClInclude Include="..\..\source\Box2D\Collision\Shapes\b2CircleShape.h">
+      <Filter>Box2D\Collision\Shapes</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\source\box2d\Collision\Shapes\b2EdgeShape.h">
-      <Filter>box2d\Collision\Shapes</Filter>
+    <ClInclude Include="..\..\source\Box2D\Collision\Shapes\b2EdgeShape.h">
+      <Filter>Box2D\Collision\Shapes</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\source\box2d\Collision\Shapes\b2PolygonShape.h">
-      <Filter>box2d\Collision\Shapes</Filter>
+    <ClInclude Include="..\..\source\Box2D\Collision\Shapes\b2PolygonShape.h">
+      <Filter>Box2D\Collision\Shapes</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\source\box2d\Collision\Shapes\b2Shape.h">
-      <Filter>box2d\Collision\Shapes</Filter>
+    <ClInclude Include="..\..\source\Box2D\Collision\Shapes\b2Shape.h">
+      <Filter>Box2D\Collision\Shapes</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\source\box2d\Common\b2BlockAllocator.h">
-      <Filter>box2d\Common</Filter>
+    <ClInclude Include="..\..\source\Box2D\Common\b2BlockAllocator.h">
+      <Filter>Box2D\Common</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\source\box2d\Common\b2Draw.h">
-      <Filter>box2d\Common</Filter>
+    <ClInclude Include="..\..\source\Box2D\Common\b2Draw.h">
+      <Filter>Box2D\Common</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\source\box2d\Common\b2GrowableStack.h">
-      <Filter>box2d\Common</Filter>
+    <ClInclude Include="..\..\source\Box2D\Common\b2GrowableStack.h">
+      <Filter>Box2D\Common</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\source\box2d\Common\b2Math.h">
-      <Filter>box2d\Common</Filter>
+    <ClInclude Include="..\..\source\Box2D\Common\b2Math.h">
+      <Filter>Box2D\Common</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\source\box2d\Common\b2Settings.h">
-      <Filter>box2d\Common</Filter>
+    <ClInclude Include="..\..\source\Box2D\Common\b2Settings.h">
+      <Filter>Box2D\Common</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\source\box2d\Common\b2StackAllocator.h">
-      <Filter>box2d\Common</Filter>
+    <ClInclude Include="..\..\source\Box2D\Common\b2StackAllocator.h">
+      <Filter>Box2D\Common</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\source\box2d\Common\b2Timer.h">
-      <Filter>box2d\Common</Filter>
+    <ClInclude Include="..\..\source\Box2D\Common\b2Timer.h">
+      <Filter>Box2D\Common</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\source\box2d\Dynamics\b2Body.h">
-      <Filter>box2d\Dynamics</Filter>
+    <ClInclude Include="..\..\source\Box2D\Dynamics\b2Body.h">
+      <Filter>Box2D\Dynamics</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\source\box2d\Dynamics\b2ContactManager.h">
-      <Filter>box2d\Dynamics</Filter>
+    <ClInclude Include="..\..\source\Box2D\Dynamics\b2ContactManager.h">
+      <Filter>Box2D\Dynamics</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\source\box2d\Dynamics\b2Fixture.h">
-      <Filter>box2d\Dynamics</Filter>
+    <ClInclude Include="..\..\source\Box2D\Dynamics\b2Fixture.h">
+      <Filter>Box2D\Dynamics</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\source\box2d\Dynamics\b2Island.h">
-      <Filter>box2d\Dynamics</Filter>
+    <ClInclude Include="..\..\source\Box2D\Dynamics\b2Island.h">
+      <Filter>Box2D\Dynamics</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\source\box2d\Dynamics\b2TimeStep.h">
-      <Filter>box2d\Dynamics</Filter>
+    <ClInclude Include="..\..\source\Box2D\Dynamics\b2TimeStep.h">
+      <Filter>Box2D\Dynamics</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\source\box2d\Dynamics\b2World.h">
-      <Filter>box2d\Dynamics</Filter>
+    <ClInclude Include="..\..\source\Box2D\Dynamics\b2World.h">
+      <Filter>Box2D\Dynamics</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\source\box2d\Dynamics\b2WorldCallbacks.h">
-      <Filter>box2d\Dynamics</Filter>
+    <ClInclude Include="..\..\source\Box2D\Dynamics\b2WorldCallbacks.h">
+      <Filter>Box2D\Dynamics</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\source\box2d\Dynamics\Contacts\b2ChainAndCircleContact.h">
-      <Filter>box2d\Dynamics\Contacts</Filter>
+    <ClInclude Include="..\..\source\Box2D\Dynamics\Contacts\b2ChainAndCircleContact.h">
+      <Filter>Box2D\Dynamics\Contacts</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\source\box2d\Dynamics\Contacts\b2ChainAndPolygonContact.h">
-      <Filter>box2d\Dynamics\Contacts</Filter>
+    <ClInclude Include="..\..\source\Box2D\Dynamics\Contacts\b2ChainAndPolygonContact.h">
+      <Filter>Box2D\Dynamics\Contacts</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\source\box2d\Dynamics\Contacts\b2CircleContact.h">
-      <Filter>box2d\Dynamics\Contacts</Filter>
+    <ClInclude Include="..\..\source\Box2D\Dynamics\Contacts\b2CircleContact.h">
+      <Filter>Box2D\Dynamics\Contacts</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\source\box2d\Dynamics\Contacts\b2Contact.h">
-      <Filter>box2d\Dynamics\Contacts</Filter>
+    <ClInclude Include="..\..\source\Box2D\Dynamics\Contacts\b2Contact.h">
+      <Filter>Box2D\Dynamics\Contacts</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\source\box2d\Dynamics\Contacts\b2ContactSolver.h">
-      <Filter>box2d\Dynamics\Contacts</Filter>
+    <ClInclude Include="..\..\source\Box2D\Dynamics\Contacts\b2ContactSolver.h">
+      <Filter>Box2D\Dynamics\Contacts</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\source\box2d\Dynamics\Contacts\b2EdgeAndCircleContact.h">
-      <Filter>box2d\Dynamics\Contacts</Filter>
+    <ClInclude Include="..\..\source\Box2D\Dynamics\Contacts\b2EdgeAndCircleContact.h">
+      <Filter>Box2D\Dynamics\Contacts</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\source\box2d\Dynamics\Contacts\b2EdgeAndPolygonContact.h">
-      <Filter>box2d\Dynamics\Contacts</Filter>
+    <ClInclude Include="..\..\source\Box2D\Dynamics\Contacts\b2EdgeAndPolygonContact.h">
+      <Filter>Box2D\Dynamics\Contacts</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\source\box2d\Dynamics\Contacts\b2PolygonAndCircleContact.h">
-      <Filter>box2d\Dynamics\Contacts</Filter>
+    <ClInclude Include="..\..\source\Box2D\Dynamics\Contacts\b2PolygonAndCircleContact.h">
+      <Filter>Box2D\Dynamics\Contacts</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\source\box2d\Dynamics\Contacts\b2PolygonContact.h">
-      <Filter>box2d\Dynamics\Contacts</Filter>
+    <ClInclude Include="..\..\source\Box2D\Dynamics\Contacts\b2PolygonContact.h">
+      <Filter>Box2D\Dynamics\Contacts</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\source\box2d\Dynamics\Joints\b2DistanceJoint.h">
-      <Filter>box2d\Dynamics\Joints</Filter>
+    <ClInclude Include="..\..\source\Box2D\Dynamics\Joints\b2DistanceJoint.h">
+      <Filter>Box2D\Dynamics\Joints</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\source\box2d\Dynamics\Joints\b2FrictionJoint.h">
-      <Filter>box2d\Dynamics\Joints</Filter>
+    <ClInclude Include="..\..\source\Box2D\Dynamics\Joints\b2FrictionJoint.h">
+      <Filter>Box2D\Dynamics\Joints</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\source\box2d\Dynamics\Joints\b2GearJoint.h">
-      <Filter>box2d\Dynamics\Joints</Filter>
+    <ClInclude Include="..\..\source\Box2D\Dynamics\Joints\b2GearJoint.h">
+      <Filter>Box2D\Dynamics\Joints</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\source\box2d\Dynamics\Joints\b2Joint.h">
-      <Filter>box2d\Dynamics\Joints</Filter>
+    <ClInclude Include="..\..\source\Box2D\Dynamics\Joints\b2Joint.h">
+      <Filter>Box2D\Dynamics\Joints</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\source\box2d\Dynamics\Joints\b2MotorJoint.h">
-      <Filter>box2d\Dynamics\Joints</Filter>
+    <ClInclude Include="..\..\source\Box2D\Dynamics\Joints\b2MotorJoint.h">
+      <Filter>Box2D\Dynamics\Joints</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\source\box2d\Dynamics\Joints\b2MouseJoint.h">
-      <Filter>box2d\Dynamics\Joints</Filter>
+    <ClInclude Include="..\..\source\Box2D\Dynamics\Joints\b2MouseJoint.h">
+      <Filter>Box2D\Dynamics\Joints</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\source\box2d\Dynamics\Joints\b2PrismaticJoint.h">
-      <Filter>box2d\Dynamics\Joints</Filter>
+    <ClInclude Include="..\..\source\Box2D\Dynamics\Joints\b2PrismaticJoint.h">
+      <Filter>Box2D\Dynamics\Joints</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\source\box2d\Dynamics\Joints\b2PulleyJoint.h">
-      <Filter>box2d\Dynamics\Joints</Filter>
+    <ClInclude Include="..\..\source\Box2D\Dynamics\Joints\b2PulleyJoint.h">
+      <Filter>Box2D\Dynamics\Joints</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\source\box2d\Dynamics\Joints\b2RevoluteJoint.h">
-      <Filter>box2d\Dynamics\Joints</Filter>
+    <ClInclude Include="..\..\source\Box2D\Dynamics\Joints\b2RevoluteJoint.h">
+      <Filter>Box2D\Dynamics\Joints</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\source\box2d\Dynamics\Joints\b2RopeJoint.h">
-      <Filter>box2d\Dynamics\Joints</Filter>
+    <ClInclude Include="..\..\source\Box2D\Dynamics\Joints\b2RopeJoint.h">
+      <Filter>Box2D\Dynamics\Joints</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\source\box2d\Dynamics\Joints\b2WeldJoint.h">
-      <Filter>box2d\Dynamics\Joints</Filter>
+    <ClInclude Include="..\..\source\Box2D\Dynamics\Joints\b2WeldJoint.h">
+      <Filter>Box2D\Dynamics\Joints</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\source\box2d\Dynamics\Joints\b2WheelJoint.h">
-      <Filter>box2d\Dynamics\Joints</Filter>
+    <ClInclude Include="..\..\source\Box2D\Dynamics\Joints\b2WheelJoint.h">
+      <Filter>Box2D\Dynamics\Joints</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\source\box2d\Rope\b2Rope.h">
-      <Filter>box2d\Rope</Filter>
+    <ClInclude Include="..\..\source\Box2D\Rope\b2Rope.h">
+      <Filter>Box2D\Rope</Filter>
     </ClInclude>
     <ClInclude Include="..\..\source\component\behaviors\behaviorComponent_ScriptBinding.h">
       <Filter>component\behaviors</Filter>

engine/compilers/VisualStudio 2012/Torque 2D.vcxproj

@@ -294,52 +294,52 @@
     <ClCompile Include="..\..\source\assets\referencedAssets.cc" />
     <ClCompile Include="..\..\source\audio\AudioAsset.cc" />
     <ClCompile Include="..\..\source\audio\audio_ScriptBinding.cc" />
-    <ClCompile Include="..\..\source\box2d\Collision\b2BroadPhase.cpp" />
-    <ClCompile Include="..\..\source\box2d\Collision\b2CollideCircle.cpp" />
-    <ClCompile Include="..\..\source\box2d\Collision\b2CollideEdge.cpp" />
-    <ClCompile Include="..\..\source\box2d\Collision\b2CollidePolygon.cpp" />
-    <ClCompile Include="..\..\source\box2d\Collision\b2Collision.cpp" />
-    <ClCompile Include="..\..\source\box2d\Collision\b2Distance.cpp" />
-    <ClCompile Include="..\..\source\box2d\Collision\b2DynamicTree.cpp" />
-    <ClCompile Include="..\..\source\box2d\Collision\b2TimeOfImpact.cpp" />
-    <ClCompile Include="..\..\source\box2d\Collision\Shapes\b2ChainShape.cpp" />
-    <ClCompile Include="..\..\source\box2d\Collision\Shapes\b2CircleShape.cpp" />
-    <ClCompile Include="..\..\source\box2d\Collision\Shapes\b2EdgeShape.cpp" />
-    <ClCompile Include="..\..\source\box2d\Collision\Shapes\b2PolygonShape.cpp" />
-    <ClCompile Include="..\..\source\box2d\Common\b2BlockAllocator.cpp" />
-    <ClCompile Include="..\..\source\box2d\Common\b2Draw.cpp" />
-    <ClCompile Include="..\..\source\box2d\Common\b2Math.cpp" />
-    <ClCompile Include="..\..\source\box2d\Common\b2Settings.cpp" />
-    <ClCompile Include="..\..\source\box2d\Common\b2StackAllocator.cpp" />
-    <ClCompile Include="..\..\source\box2d\Common\b2Timer.cpp" />
-    <ClCompile Include="..\..\source\box2d\Dynamics\b2Body.cpp" />
-    <ClCompile Include="..\..\source\box2d\Dynamics\b2ContactManager.cpp" />
-    <ClCompile Include="..\..\source\box2d\Dynamics\b2Fixture.cpp" />
-    <ClCompile Include="..\..\source\box2d\Dynamics\b2Island.cpp" />
-    <ClCompile Include="..\..\source\box2d\Dynamics\b2World.cpp" />
-    <ClCompile Include="..\..\source\box2d\Dynamics\b2WorldCallbacks.cpp" />
-    <ClCompile Include="..\..\source\box2d\Dynamics\Contacts\b2ChainAndCircleContact.cpp" />
-    <ClCompile Include="..\..\source\box2d\Dynamics\Contacts\b2ChainAndPolygonContact.cpp" />
-    <ClCompile Include="..\..\source\box2d\Dynamics\Contacts\b2CircleContact.cpp" />
-    <ClCompile Include="..\..\source\box2d\Dynamics\Contacts\b2Contact.cpp" />
-    <ClCompile Include="..\..\source\box2d\Dynamics\Contacts\b2ContactSolver.cpp" />
-    <ClCompile Include="..\..\source\box2d\Dynamics\Contacts\b2EdgeAndCircleContact.cpp" />
-    <ClCompile Include="..\..\source\box2d\Dynamics\Contacts\b2EdgeAndPolygonContact.cpp" />
-    <ClCompile Include="..\..\source\box2d\Dynamics\Contacts\b2PolygonAndCircleContact.cpp" />
-    <ClCompile Include="..\..\source\box2d\Dynamics\Contacts\b2PolygonContact.cpp" />
-    <ClCompile Include="..\..\source\box2d\Dynamics\Joints\b2DistanceJoint.cpp" />
-    <ClCompile Include="..\..\source\box2d\Dynamics\Joints\b2FrictionJoint.cpp" />
-    <ClCompile Include="..\..\source\box2d\Dynamics\Joints\b2GearJoint.cpp" />
-    <ClCompile Include="..\..\source\box2d\Dynamics\Joints\b2Joint.cpp" />
-    <ClCompile Include="..\..\source\box2d\Dynamics\Joints\b2MotorJoint.cpp" />
-    <ClCompile Include="..\..\source\box2d\Dynamics\Joints\b2MouseJoint.cpp" />
-    <ClCompile Include="..\..\source\box2d\Dynamics\Joints\b2PrismaticJoint.cpp" />
-    <ClCompile Include="..\..\source\box2d\Dynamics\Joints\b2PulleyJoint.cpp" />
-    <ClCompile Include="..\..\source\box2d\Dynamics\Joints\b2RevoluteJoint.cpp" />
-    <ClCompile Include="..\..\source\box2d\Dynamics\Joints\b2RopeJoint.cpp" />
-    <ClCompile Include="..\..\source\box2d\Dynamics\Joints\b2WeldJoint.cpp" />
-    <ClCompile Include="..\..\source\box2d\Dynamics\Joints\b2WheelJoint.cpp" />
-    <ClCompile Include="..\..\source\box2d\Rope\b2Rope.cpp" />
+    <ClCompile Include="..\..\source\Box2D\Collision\b2BroadPhase.cpp" />
+    <ClCompile Include="..\..\source\Box2D\Collision\b2CollideCircle.cpp" />
+    <ClCompile Include="..\..\source\Box2D\Collision\b2CollideEdge.cpp" />
+    <ClCompile Include="..\..\source\Box2D\Collision\b2CollidePolygon.cpp" />
+    <ClCompile Include="..\..\source\Box2D\Collision\b2Collision.cpp" />
+    <ClCompile Include="..\..\source\Box2D\Collision\b2Distance.cpp" />
+    <ClCompile Include="..\..\source\Box2D\Collision\b2DynamicTree.cpp" />
+    <ClCompile Include="..\..\source\Box2D\Collision\b2TimeOfImpact.cpp" />
+    <ClCompile Include="..\..\source\Box2D\Collision\Shapes\b2ChainShape.cpp" />
+    <ClCompile Include="..\..\source\Box2D\Collision\Shapes\b2CircleShape.cpp" />
+    <ClCompile Include="..\..\source\Box2D\Collision\Shapes\b2EdgeShape.cpp" />
+    <ClCompile Include="..\..\source\Box2D\Collision\Shapes\b2PolygonShape.cpp" />
+    <ClCompile Include="..\..\source\Box2D\Common\b2BlockAllocator.cpp" />
+    <ClCompile Include="..\..\source\Box2D\Common\b2Draw.cpp" />
+    <ClCompile Include="..\..\source\Box2D\Common\b2Math.cpp" />
+    <ClCompile Include="..\..\source\Box2D\Common\b2Settings.cpp" />
+    <ClCompile Include="..\..\source\Box2D\Common\b2StackAllocator.cpp" />
+    <ClCompile Include="..\..\source\Box2D\Common\b2Timer.cpp" />
+    <ClCompile Include="..\..\source\Box2D\Dynamics\b2Body.cpp" />
+    <ClCompile Include="..\..\source\Box2D\Dynamics\b2ContactManager.cpp" />
+    <ClCompile Include="..\..\source\Box2D\Dynamics\b2Fixture.cpp" />
+    <ClCompile Include="..\..\source\Box2D\Dynamics\b2Island.cpp" />
+    <ClCompile Include="..\..\source\Box2D\Dynamics\b2World.cpp" />
+    <ClCompile Include="..\..\source\Box2D\Dynamics\b2WorldCallbacks.cpp" />
+    <ClCompile Include="..\..\source\Box2D\Dynamics\Contacts\b2ChainAndCircleContact.cpp" />
+    <ClCompile Include="..\..\source\Box2D\Dynamics\Contacts\b2ChainAndPolygonContact.cpp" />
+    <ClCompile Include="..\..\source\Box2D\Dynamics\Contacts\b2CircleContact.cpp" />
+    <ClCompile Include="..\..\source\Box2D\Dynamics\Contacts\b2Contact.cpp" />
+    <ClCompile Include="..\..\source\Box2D\Dynamics\Contacts\b2ContactSolver.cpp" />
+    <ClCompile Include="..\..\source\Box2D\Dynamics\Contacts\b2EdgeAndCircleContact.cpp" />
+    <ClCompile Include="..\..\source\Box2D\Dynamics\Contacts\b2EdgeAndPolygonContact.cpp" />
+    <ClCompile Include="..\..\source\Box2D\Dynamics\Contacts\b2PolygonAndCircleContact.cpp" />
+    <ClCompile Include="..\..\source\Box2D\Dynamics\Contacts\b2PolygonContact.cpp" />
+    <ClCompile Include="..\..\source\Box2D\Dynamics\Joints\b2DistanceJoint.cpp" />
+    <ClCompile Include="..\..\source\Box2D\Dynamics\Joints\b2FrictionJoint.cpp" />
+    <ClCompile Include="..\..\source\Box2D\Dynamics\Joints\b2GearJoint.cpp" />
+    <ClCompile Include="..\..\source\Box2D\Dynamics\Joints\b2Joint.cpp" />
+    <ClCompile Include="..\..\source\Box2D\Dynamics\Joints\b2MotorJoint.cpp" />
+    <ClCompile Include="..\..\source\Box2D\Dynamics\Joints\b2MouseJoint.cpp" />
+    <ClCompile Include="..\..\source\Box2D\Dynamics\Joints\b2PrismaticJoint.cpp" />
+    <ClCompile Include="..\..\source\Box2D\Dynamics\Joints\b2PulleyJoint.cpp" />
+    <ClCompile Include="..\..\source\Box2D\Dynamics\Joints\b2RevoluteJoint.cpp" />
+    <ClCompile Include="..\..\source\Box2D\Dynamics\Joints\b2RopeJoint.cpp" />
+    <ClCompile Include="..\..\source\Box2D\Dynamics\Joints\b2WeldJoint.cpp" />
+    <ClCompile Include="..\..\source\Box2D\Dynamics\Joints\b2WheelJoint.cpp" />
+    <ClCompile Include="..\..\source\Box2D\Rope\b2Rope.cpp" />
     <ClCompile Include="..\..\source\collection\bitTables.cc" />
     <ClCompile Include="..\..\source\collection\hashTable.cc" />
     <ClCompile Include="..\..\source\collection\nameTags.cpp" />
@@ -729,53 +729,53 @@
     <ClInclude Include="..\..\source\assets\tamlAssetReferencedUpdateVisitor.h" />
     <ClInclude Include="..\..\source\assets\tamlAssetReferencedVisitor.h" />
     <ClInclude Include="..\..\source\audio\AudioAsset.h" />
-    <ClInclude Include="..\..\source\box2d\Box2D.h" />
-    <ClInclude Include="..\..\source\box2d\Collision\b2BroadPhase.h" />
-    <ClInclude Include="..\..\source\box2d\Collision\b2Collision.h" />
-    <ClInclude Include="..\..\source\box2d\Collision\b2Distance.h" />
-    <ClInclude Include="..\..\source\box2d\Collision\b2DynamicTree.h" />
-    <ClInclude Include="..\..\source\box2d\Collision\b2TimeOfImpact.h" />
-    <ClInclude Include="..\..\source\box2d\Collision\Shapes\b2ChainShape.h" />
-    <ClInclude Include="..\..\source\box2d\Collision\Shapes\b2CircleShape.h" />
-    <ClInclude Include="..\..\source\box2d\Collision\Shapes\b2EdgeShape.h" />
-    <ClInclude Include="..\..\source\box2d\Collision\Shapes\b2PolygonShape.h" />
-    <ClInclude Include="..\..\source\box2d\Collision\Shapes\b2Shape.h" />
-    <ClInclude Include="..\..\source\box2d\Common\b2BlockAllocator.h" />
-    <ClInclude Include="..\..\source\box2d\Common\b2Draw.h" />
-    <ClInclude Include="..\..\source\box2d\Common\b2GrowableStack.h" />
-    <ClInclude Include="..\..\source\box2d\Common\b2Math.h" />
-    <ClInclude Include="..\..\source\box2d\Common\b2Settings.h" />
-    <ClInclude Include="..\..\source\box2d\Common\b2StackAllocator.h" />
-    <ClInclude Include="..\..\source\box2d\Common\b2Timer.h" />
-    <ClInclude Include="..\..\source\box2d\Dynamics\b2Body.h" />
-    <ClInclude Include="..\..\source\box2d\Dynamics\b2ContactManager.h" />
-    <ClInclude Include="..\..\source\box2d\Dynamics\b2Fixture.h" />
-    <ClInclude Include="..\..\source\box2d\Dynamics\b2Island.h" />
-    <ClInclude Include="..\..\source\box2d\Dynamics\b2TimeStep.h" />
-    <ClInclude Include="..\..\source\box2d\Dynamics\b2World.h" />
-    <ClInclude Include="..\..\source\box2d\Dynamics\b2WorldCallbacks.h" />
-    <ClInclude Include="..\..\source\box2d\Dynamics\Contacts\b2ChainAndCircleContact.h" />
-    <ClInclude Include="..\..\source\box2d\Dynamics\Contacts\b2ChainAndPolygonContact.h" />
-    <ClInclude Include="..\..\source\box2d\Dynamics\Contacts\b2CircleContact.h" />
-    <ClInclude Include="..\..\source\box2d\Dynamics\Contacts\b2Contact.h" />
-    <ClInclude Include="..\..\source\box2d\Dynamics\Contacts\b2ContactSolver.h" />
-    <ClInclude Include="..\..\source\box2d\Dynamics\Contacts\b2EdgeAndCircleContact.h" />
-    <ClInclude Include="..\..\source\box2d\Dynamics\Contacts\b2EdgeAndPolygonContact.h" />
-    <ClInclude Include="..\..\source\box2d\Dynamics\Contacts\b2PolygonAndCircleContact.h" />
-    <ClInclude Include="..\..\source\box2d\Dynamics\Contacts\b2PolygonContact.h" />
-    <ClInclude Include="..\..\source\box2d\Dynamics\Joints\b2DistanceJoint.h" />
-    <ClInclude Include="..\..\source\box2d\Dynamics\Joints\b2FrictionJoint.h" />
-    <ClInclude Include="..\..\source\box2d\Dynamics\Joints\b2GearJoint.h" />
-    <ClInclude Include="..\..\source\box2d\Dynamics\Joints\b2Joint.h" />
-    <ClInclude Include="..\..\source\box2d\Dynamics\Joints\b2MotorJoint.h" />
-    <ClInclude Include="..\..\source\box2d\Dynamics\Joints\b2MouseJoint.h" />
-    <ClInclude Include="..\..\source\box2d\Dynamics\Joints\b2PrismaticJoint.h" />
-    <ClInclude Include="..\..\source\box2d\Dynamics\Joints\b2PulleyJoint.h" />
-    <ClInclude Include="..\..\source\box2d\Dynamics\Joints\b2RevoluteJoint.h" />
-    <ClInclude Include="..\..\source\box2d\Dynamics\Joints\b2RopeJoint.h" />
-    <ClInclude Include="..\..\source\box2d\Dynamics\Joints\b2WeldJoint.h" />
-    <ClInclude Include="..\..\source\box2d\Dynamics\Joints\b2WheelJoint.h" />
-    <ClInclude Include="..\..\source\box2d\Rope\b2Rope.h" />
+    <ClInclude Include="..\..\source\Box2D\Box2D.h" />
+    <ClInclude Include="..\..\source\Box2D\Collision\b2BroadPhase.h" />
+    <ClInclude Include="..\..\source\Box2D\Collision\b2Collision.h" />
+    <ClInclude Include="..\..\source\Box2D\Collision\b2Distance.h" />
+    <ClInclude Include="..\..\source\Box2D\Collision\b2DynamicTree.h" />
+    <ClInclude Include="..\..\source\Box2D\Collision\b2TimeOfImpact.h" />
+    <ClInclude Include="..\..\source\Box2D\Collision\Shapes\b2ChainShape.h" />
+    <ClInclude Include="..\..\source\Box2D\Collision\Shapes\b2CircleShape.h" />
+    <ClInclude Include="..\..\source\Box2D\Collision\Shapes\b2EdgeShape.h" />
+    <ClInclude Include="..\..\source\Box2D\Collision\Shapes\b2PolygonShape.h" />
+    <ClInclude Include="..\..\source\Box2D\Collision\Shapes\b2Shape.h" />
+    <ClInclude Include="..\..\source\Box2D\Common\b2BlockAllocator.h" />
+    <ClInclude Include="..\..\source\Box2D\Common\b2Draw.h" />
+    <ClInclude Include="..\..\source\Box2D\Common\b2GrowableStack.h" />
+    <ClInclude Include="..\..\source\Box2D\Common\b2Math.h" />
+    <ClInclude Include="..\..\source\Box2D\Common\b2Settings.h" />
+    <ClInclude Include="..\..\source\Box2D\Common\b2StackAllocator.h" />
+    <ClInclude Include="..\..\source\Box2D\Common\b2Timer.h" />
+    <ClInclude Include="..\..\source\Box2D\Dynamics\b2Body.h" />
+    <ClInclude Include="..\..\source\Box2D\Dynamics\b2ContactManager.h" />
+    <ClInclude Include="..\..\source\Box2D\Dynamics\b2Fixture.h" />
+    <ClInclude Include="..\..\source\Box2D\Dynamics\b2Island.h" />
+    <ClInclude Include="..\..\source\Box2D\Dynamics\b2TimeStep.h" />
+    <ClInclude Include="..\..\source\Box2D\Dynamics\b2World.h" />
+    <ClInclude Include="..\..\source\Box2D\Dynamics\b2WorldCallbacks.h" />
+    <ClInclude Include="..\..\source\Box2D\Dynamics\Contacts\b2ChainAndCircleContact.h" />
+    <ClInclude Include="..\..\source\Box2D\Dynamics\Contacts\b2ChainAndPolygonContact.h" />
+    <ClInclude Include="..\..\source\Box2D\Dynamics\Contacts\b2CircleContact.h" />
+    <ClInclude Include="..\..\source\Box2D\Dynamics\Contacts\b2Contact.h" />
+    <ClInclude Include="..\..\source\Box2D\Dynamics\Contacts\b2ContactSolver.h" />
+    <ClInclude Include="..\..\source\Box2D\Dynamics\Contacts\b2EdgeAndCircleContact.h" />
+    <ClInclude Include="..\..\source\Box2D\Dynamics\Contacts\b2EdgeAndPolygonContact.h" />
+    <ClInclude Include="..\..\source\Box2D\Dynamics\Contacts\b2PolygonAndCircleContact.h" />
+    <ClInclude Include="..\..\source\Box2D\Dynamics\Contacts\b2PolygonContact.h" />
+    <ClInclude Include="..\..\source\Box2D\Dynamics\Joints\b2DistanceJoint.h" />
+    <ClInclude Include="..\..\source\Box2D\Dynamics\Joints\b2FrictionJoint.h" />
+    <ClInclude Include="..\..\source\Box2D\Dynamics\Joints\b2GearJoint.h" />
+    <ClInclude Include="..\..\source\Box2D\Dynamics\Joints\b2Joint.h" />
+    <ClInclude Include="..\..\source\Box2D\Dynamics\Joints\b2MotorJoint.h" />
+    <ClInclude Include="..\..\source\Box2D\Dynamics\Joints\b2MouseJoint.h" />
+    <ClInclude Include="..\..\source\Box2D\Dynamics\Joints\b2PrismaticJoint.h" />
+    <ClInclude Include="..\..\source\Box2D\Dynamics\Joints\b2PulleyJoint.h" />
+    <ClInclude Include="..\..\source\Box2D\Dynamics\Joints\b2RevoluteJoint.h" />
+    <ClInclude Include="..\..\source\Box2D\Dynamics\Joints\b2RopeJoint.h" />
+    <ClInclude Include="..\..\source\Box2D\Dynamics\Joints\b2WeldJoint.h" />
+    <ClInclude Include="..\..\source\Box2D\Dynamics\Joints\b2WheelJoint.h" />
+    <ClInclude Include="..\..\source\Box2D\Rope\b2Rope.h" />
     <ClInclude Include="..\..\source\collection\bitMatrix.h" />
     <ClInclude Include="..\..\source\collection\bitSet.h" />
     <ClInclude Include="..\..\source\collection\bitTables.h" />

engine/compilers/VisualStudio 2012/Torque 2D.vcxproj.filters

@@ -28,28 +28,28 @@
     <Filter Include="audio">
       <UniqueIdentifier>{bfd4849e-66c6-450b-9a01-0873aa28e21a}</UniqueIdentifier>
     </Filter>
-    <Filter Include="box2d">
+    <Filter Include="Box2D">
       <UniqueIdentifier>{1f640da6-77a4-4176-a018-9bfad5becf95}</UniqueIdentifier>
     </Filter>
-    <Filter Include="box2d\Collision">
+    <Filter Include="Box2D\Collision">
       <UniqueIdentifier>{4faf4110-842d-4178-81ca-0375f3804cac}</UniqueIdentifier>
     </Filter>
-    <Filter Include="box2d\Collision\Shapes">
+    <Filter Include="Box2D\Collision\Shapes">
       <UniqueIdentifier>{2f939a2b-3cd9-4e67-8311-bf751093f2a5}</UniqueIdentifier>
     </Filter>
-    <Filter Include="box2d\Common">
+    <Filter Include="Box2D\Common">
       <UniqueIdentifier>{84907fc2-76e8-4a3b-9df4-76451387d3f9}</UniqueIdentifier>
     </Filter>
-    <Filter Include="box2d\Dynamics">
+    <Filter Include="Box2D\Dynamics">
       <UniqueIdentifier>{e2574a74-ff0d-401d-818d-96e6c155a4b4}</UniqueIdentifier>
     </Filter>
-    <Filter Include="box2d\Dynamics\Contacts">
+    <Filter Include="Box2D\Dynamics\Contacts">
       <UniqueIdentifier>{18c9fe85-da18-45d5-9573-a71ce9373961}</UniqueIdentifier>
     </Filter>
-    <Filter Include="box2d\Dynamics\Joints">
+    <Filter Include="Box2D\Dynamics\Joints">
       <UniqueIdentifier>{4f9157b1-a024-450f-a352-1849cf2bddcc}</UniqueIdentifier>
     </Filter>
-    <Filter Include="box2d\Rope">
+    <Filter Include="Box2D\Rope">
       <UniqueIdentifier>{14385fbb-f8af-4849-bdd9-8c8f67d3928e}</UniqueIdentifier>
     </Filter>
     <Filter Include="collection">
@@ -540,143 +540,143 @@
     <ClCompile Include="..\..\source\gui\editor\guiSeparatorCtrl.cc">
       <Filter>gui\editor</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\box2d\Collision\b2BroadPhase.cpp">
-      <Filter>box2d\Collision</Filter>
+    <ClCompile Include="..\..\source\Box2D\Collision\b2BroadPhase.cpp">
+      <Filter>Box2D\Collision</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\box2d\Collision\b2CollideCircle.cpp">
-      <Filter>box2d\Collision</Filter>
+    <ClCompile Include="..\..\source\Box2D\Collision\b2CollideCircle.cpp">
+      <Filter>Box2D\Collision</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\box2d\Collision\b2CollideEdge.cpp">
-      <Filter>box2d\Collision</Filter>
+    <ClCompile Include="..\..\source\Box2D\Collision\b2CollideEdge.cpp">
+      <Filter>Box2D\Collision</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\box2d\Collision\b2CollidePolygon.cpp">
-      <Filter>box2d\Collision</Filter>
+    <ClCompile Include="..\..\source\Box2D\Collision\b2CollidePolygon.cpp">
+      <Filter>Box2D\Collision</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\box2d\Collision\b2Collision.cpp">
-      <Filter>box2d\Collision</Filter>
+    <ClCompile Include="..\..\source\Box2D\Collision\b2Collision.cpp">
+      <Filter>Box2D\Collision</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\box2d\Collision\b2Distance.cpp">
-      <Filter>box2d\Collision</Filter>
+    <ClCompile Include="..\..\source\Box2D\Collision\b2Distance.cpp">
+      <Filter>Box2D\Collision</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\box2d\Collision\b2DynamicTree.cpp">
-      <Filter>box2d\Collision</Filter>
+    <ClCompile Include="..\..\source\Box2D\Collision\b2DynamicTree.cpp">
+      <Filter>Box2D\Collision</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\box2d\Collision\b2TimeOfImpact.cpp">
-      <Filter>box2d\Collision</Filter>
+    <ClCompile Include="..\..\source\Box2D\Collision\b2TimeOfImpact.cpp">
+      <Filter>Box2D\Collision</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\box2d\Collision\Shapes\b2ChainShape.cpp">
-      <Filter>box2d\Collision\Shapes</Filter>
+    <ClCompile Include="..\..\source\Box2D\Collision\Shapes\b2ChainShape.cpp">
+      <Filter>Box2D\Collision\Shapes</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\box2d\Collision\Shapes\b2CircleShape.cpp">
-      <Filter>box2d\Collision\Shapes</Filter>
+    <ClCompile Include="..\..\source\Box2D\Collision\Shapes\b2CircleShape.cpp">
+      <Filter>Box2D\Collision\Shapes</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\box2d\Collision\Shapes\b2EdgeShape.cpp">
-      <Filter>box2d\Collision\Shapes</Filter>
+    <ClCompile Include="..\..\source\Box2D\Collision\Shapes\b2EdgeShape.cpp">
+      <Filter>Box2D\Collision\Shapes</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\box2d\Collision\Shapes\b2PolygonShape.cpp">
-      <Filter>box2d\Collision\Shapes</Filter>
+    <ClCompile Include="..\..\source\Box2D\Collision\Shapes\b2PolygonShape.cpp">
+      <Filter>Box2D\Collision\Shapes</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\box2d\Common\b2BlockAllocator.cpp">
-      <Filter>box2d\Common</Filter>
+    <ClCompile Include="..\..\source\Box2D\Common\b2BlockAllocator.cpp">
+      <Filter>Box2D\Common</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\box2d\Common\b2Draw.cpp">
-      <Filter>box2d\Common</Filter>
+    <ClCompile Include="..\..\source\Box2D\Common\b2Draw.cpp">
+      <Filter>Box2D\Common</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\box2d\Common\b2Math.cpp">
-      <Filter>box2d\Common</Filter>
+    <ClCompile Include="..\..\source\Box2D\Common\b2Math.cpp">
+      <Filter>Box2D\Common</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\box2d\Common\b2Settings.cpp">
-      <Filter>box2d\Common</Filter>
+    <ClCompile Include="..\..\source\Box2D\Common\b2Settings.cpp">
+      <Filter>Box2D\Common</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\box2d\Common\b2StackAllocator.cpp">
-      <Filter>box2d\Common</Filter>
+    <ClCompile Include="..\..\source\Box2D\Common\b2StackAllocator.cpp">
+      <Filter>Box2D\Common</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\box2d\Common\b2Timer.cpp">
-      <Filter>box2d\Common</Filter>
+    <ClCompile Include="..\..\source\Box2D\Common\b2Timer.cpp">
+      <Filter>Box2D\Common</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\box2d\Dynamics\b2Body.cpp">
-      <Filter>box2d\Dynamics</Filter>
+    <ClCompile Include="..\..\source\Box2D\Dynamics\b2Body.cpp">
+      <Filter>Box2D\Dynamics</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\box2d\Dynamics\b2ContactManager.cpp">
-      <Filter>box2d\Dynamics</Filter>
+    <ClCompile Include="..\..\source\Box2D\Dynamics\b2ContactManager.cpp">
+      <Filter>Box2D\Dynamics</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\box2d\Dynamics\b2Fixture.cpp">
-      <Filter>box2d\Dynamics</Filter>
+    <ClCompile Include="..\..\source\Box2D\Dynamics\b2Fixture.cpp">
+      <Filter>Box2D\Dynamics</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\box2d\Dynamics\b2Island.cpp">
-      <Filter>box2d\Dynamics</Filter>
+    <ClCompile Include="..\..\source\Box2D\Dynamics\b2Island.cpp">
+      <Filter>Box2D\Dynamics</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\box2d\Dynamics\b2World.cpp">
-      <Filter>box2d\Dynamics</Filter>
+    <ClCompile Include="..\..\source\Box2D\Dynamics\b2World.cpp">
+      <Filter>Box2D\Dynamics</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\box2d\Dynamics\b2WorldCallbacks.cpp">
-      <Filter>box2d\Dynamics</Filter>
+    <ClCompile Include="..\..\source\Box2D\Dynamics\b2WorldCallbacks.cpp">
+      <Filter>Box2D\Dynamics</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\box2d\Dynamics\Contacts\b2ChainAndCircleContact.cpp">
-      <Filter>box2d\Dynamics\Contacts</Filter>
+    <ClCompile Include="..\..\source\Box2D\Dynamics\Contacts\b2ChainAndCircleContact.cpp">
+      <Filter>Box2D\Dynamics\Contacts</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\box2d\Dynamics\Contacts\b2ChainAndPolygonContact.cpp">
-      <Filter>box2d\Dynamics\Contacts</Filter>
+    <ClCompile Include="..\..\source\Box2D\Dynamics\Contacts\b2ChainAndPolygonContact.cpp">
+      <Filter>Box2D\Dynamics\Contacts</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\box2d\Dynamics\Contacts\b2CircleContact.cpp">
-      <Filter>box2d\Dynamics\Contacts</Filter>
+    <ClCompile Include="..\..\source\Box2D\Dynamics\Contacts\b2CircleContact.cpp">
+      <Filter>Box2D\Dynamics\Contacts</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\box2d\Dynamics\Contacts\b2Contact.cpp">
-      <Filter>box2d\Dynamics\Contacts</Filter>
+    <ClCompile Include="..\..\source\Box2D\Dynamics\Contacts\b2Contact.cpp">
+      <Filter>Box2D\Dynamics\Contacts</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\box2d\Dynamics\Contacts\b2ContactSolver.cpp">
-      <Filter>box2d\Dynamics\Contacts</Filter>
+    <ClCompile Include="..\..\source\Box2D\Dynamics\Contacts\b2ContactSolver.cpp">
+      <Filter>Box2D\Dynamics\Contacts</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\box2d\Dynamics\Contacts\b2EdgeAndCircleContact.cpp">
-      <Filter>box2d\Dynamics\Contacts</Filter>
+    <ClCompile Include="..\..\source\Box2D\Dynamics\Contacts\b2EdgeAndCircleContact.cpp">
+      <Filter>Box2D\Dynamics\Contacts</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\box2d\Dynamics\Contacts\b2EdgeAndPolygonContact.cpp">
-      <Filter>box2d\Dynamics\Contacts</Filter>
+    <ClCompile Include="..\..\source\Box2D\Dynamics\Contacts\b2EdgeAndPolygonContact.cpp">
+      <Filter>Box2D\Dynamics\Contacts</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\box2d\Dynamics\Contacts\b2PolygonAndCircleContact.cpp">
-      <Filter>box2d\Dynamics\Contacts</Filter>
+    <ClCompile Include="..\..\source\Box2D\Dynamics\Contacts\b2PolygonAndCircleContact.cpp">
+      <Filter>Box2D\Dynamics\Contacts</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\box2d\Dynamics\Contacts\b2PolygonContact.cpp">
-      <Filter>box2d\Dynamics\Contacts</Filter>
+    <ClCompile Include="..\..\source\Box2D\Dynamics\Contacts\b2PolygonContact.cpp">
+      <Filter>Box2D\Dynamics\Contacts</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\box2d\Dynamics\Joints\b2DistanceJoint.cpp">
-      <Filter>box2d\Dynamics\Joints</Filter>
+    <ClCompile Include="..\..\source\Box2D\Dynamics\Joints\b2DistanceJoint.cpp">
+      <Filter>Box2D\Dynamics\Joints</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\box2d\Dynamics\Joints\b2FrictionJoint.cpp">
-      <Filter>box2d\Dynamics\Joints</Filter>
+    <ClCompile Include="..\..\source\Box2D\Dynamics\Joints\b2FrictionJoint.cpp">
+      <Filter>Box2D\Dynamics\Joints</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\box2d\Dynamics\Joints\b2GearJoint.cpp">
-      <Filter>box2d\Dynamics\Joints</Filter>
+    <ClCompile Include="..\..\source\Box2D\Dynamics\Joints\b2GearJoint.cpp">
+      <Filter>Box2D\Dynamics\Joints</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\box2d\Dynamics\Joints\b2Joint.cpp">
-      <Filter>box2d\Dynamics\Joints</Filter>
+    <ClCompile Include="..\..\source\Box2D\Dynamics\Joints\b2Joint.cpp">
+      <Filter>Box2D\Dynamics\Joints</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\box2d\Dynamics\Joints\b2MotorJoint.cpp">
-      <Filter>box2d\Dynamics\Joints</Filter>
+    <ClCompile Include="..\..\source\Box2D\Dynamics\Joints\b2MotorJoint.cpp">
+      <Filter>Box2D\Dynamics\Joints</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\box2d\Dynamics\Joints\b2MouseJoint.cpp">
-      <Filter>box2d\Dynamics\Joints</Filter>
+    <ClCompile Include="..\..\source\Box2D\Dynamics\Joints\b2MouseJoint.cpp">
+      <Filter>Box2D\Dynamics\Joints</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\box2d\Dynamics\Joints\b2PrismaticJoint.cpp">
-      <Filter>box2d\Dynamics\Joints</Filter>
+    <ClCompile Include="..\..\source\Box2D\Dynamics\Joints\b2PrismaticJoint.cpp">
+      <Filter>Box2D\Dynamics\Joints</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\box2d\Dynamics\Joints\b2PulleyJoint.cpp">
-      <Filter>box2d\Dynamics\Joints</Filter>
+    <ClCompile Include="..\..\source\Box2D\Dynamics\Joints\b2PulleyJoint.cpp">
+      <Filter>Box2D\Dynamics\Joints</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\box2d\Dynamics\Joints\b2RevoluteJoint.cpp">
-      <Filter>box2d\Dynamics\Joints</Filter>
+    <ClCompile Include="..\..\source\Box2D\Dynamics\Joints\b2RevoluteJoint.cpp">
+      <Filter>Box2D\Dynamics\Joints</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\box2d\Dynamics\Joints\b2RopeJoint.cpp">
-      <Filter>box2d\Dynamics\Joints</Filter>
+    <ClCompile Include="..\..\source\Box2D\Dynamics\Joints\b2RopeJoint.cpp">
+      <Filter>Box2D\Dynamics\Joints</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\box2d\Dynamics\Joints\b2WeldJoint.cpp">
-      <Filter>box2d\Dynamics\Joints</Filter>
+    <ClCompile Include="..\..\source\Box2D\Dynamics\Joints\b2WeldJoint.cpp">
+      <Filter>Box2D\Dynamics\Joints</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\box2d\Dynamics\Joints\b2WheelJoint.cpp">
-      <Filter>box2d\Dynamics\Joints</Filter>
+    <ClCompile Include="..\..\source\Box2D\Dynamics\Joints\b2WheelJoint.cpp">
+      <Filter>Box2D\Dynamics\Joints</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\box2d\Rope\b2Rope.cpp">
-      <Filter>box2d\Rope</Filter>
+    <ClCompile Include="..\..\source\Box2D\Rope\b2Rope.cpp">
+      <Filter>Box2D\Rope</Filter>
     </ClCompile>
     <ClCompile Include="..\..\source\persistence\taml\taml.cc">
       <Filter>persistence\taml</Filter>
@@ -1712,146 +1712,146 @@
     <ClInclude Include="..\..\source\gui\editor\guiSeparatorCtrl.h">
       <Filter>gui\editor</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\source\box2d\Box2D.h">
-      <Filter>box2d</Filter>
+    <ClInclude Include="..\..\source\Box2D\Box2D.h">
+      <Filter>Box2D</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\source\box2d\Collision\b2BroadPhase.h">
-      <Filter>box2d\Collision</Filter>
+    <ClInclude Include="..\..\source\Box2D\Collision\b2BroadPhase.h">
+      <Filter>Box2D\Collision</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\source\box2d\Collision\b2Collision.h">
-      <Filter>box2d\Collision</Filter>
+    <ClInclude Include="..\..\source\Box2D\Collision\b2Collision.h">
+      <Filter>Box2D\Collision</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\source\box2d\Collision\b2Distance.h">
-      <Filter>box2d\Collision</Filter>
+    <ClInclude Include="..\..\source\Box2D\Collision\b2Distance.h">
+      <Filter>Box2D\Collision</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\source\box2d\Collision\b2DynamicTree.h">
-      <Filter>box2d\Collision</Filter>
+    <ClInclude Include="..\..\source\Box2D\Collision\b2DynamicTree.h">
+      <Filter>Box2D\Collision</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\source\box2d\Collision\b2TimeOfImpact.h">
-      <Filter>box2d\Collision</Filter>
+    <ClInclude Include="..\..\source\Box2D\Collision\b2TimeOfImpact.h">
+      <Filter>Box2D\Collision</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\source\box2d\Collision\Shapes\b2ChainShape.h">
-      <Filter>box2d\Collision\Shapes</Filter>
+    <ClInclude Include="..\..\source\Box2D\Collision\Shapes\b2ChainShape.h">
+      <Filter>Box2D\Collision\Shapes</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\source\box2d\Collision\Shapes\b2CircleShape.h">
-      <Filter>box2d\Collision\Shapes</Filter>
+    <ClInclude Include="..\..\source\Box2D\Collision\Shapes\b2CircleShape.h">
+      <Filter>Box2D\Collision\Shapes</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\source\box2d\Collision\Shapes\b2EdgeShape.h">
-      <Filter>box2d\Collision\Shapes</Filter>
+    <ClInclude Include="..\..\source\Box2D\Collision\Shapes\b2EdgeShape.h">
+      <Filter>Box2D\Collision\Shapes</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\source\box2d\Collision\Shapes\b2PolygonShape.h">
-      <Filter>box2d\Collision\Shapes</Filter>
+    <ClInclude Include="..\..\source\Box2D\Collision\Shapes\b2PolygonShape.h">
+      <Filter>Box2D\Collision\Shapes</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\source\box2d\Collision\Shapes\b2Shape.h">
-      <Filter>box2d\Collision\Shapes</Filter>
+    <ClInclude Include="..\..\source\Box2D\Collision\Shapes\b2Shape.h">
+      <Filter>Box2D\Collision\Shapes</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\source\box2d\Common\b2BlockAllocator.h">
-      <Filter>box2d\Common</Filter>
+    <ClInclude Include="..\..\source\Box2D\Common\b2BlockAllocator.h">
+      <Filter>Box2D\Common</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\source\box2d\Common\b2Draw.h">
-      <Filter>box2d\Common</Filter>
+    <ClInclude Include="..\..\source\Box2D\Common\b2Draw.h">
+      <Filter>Box2D\Common</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\source\box2d\Common\b2GrowableStack.h">
-      <Filter>box2d\Common</Filter>
+    <ClInclude Include="..\..\source\Box2D\Common\b2GrowableStack.h">
+      <Filter>Box2D\Common</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\source\box2d\Common\b2Math.h">
-      <Filter>box2d\Common</Filter>
+    <ClInclude Include="..\..\source\Box2D\Common\b2Math.h">
+      <Filter>Box2D\Common</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\source\box2d\Common\b2Settings.h">
-      <Filter>box2d\Common</Filter>
+    <ClInclude Include="..\..\source\Box2D\Common\b2Settings.h">
+      <Filter>Box2D\Common</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\source\box2d\Common\b2StackAllocator.h">
-      <Filter>box2d\Common</Filter>
+    <ClInclude Include="..\..\source\Box2D\Common\b2StackAllocator.h">
+      <Filter>Box2D\Common</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\source\box2d\Common\b2Timer.h">
-      <Filter>box2d\Common</Filter>
+    <ClInclude Include="..\..\source\Box2D\Common\b2Timer.h">
+      <Filter>Box2D\Common</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\source\box2d\Dynamics\b2Body.h">
-      <Filter>box2d\Dynamics</Filter>
+    <ClInclude Include="..\..\source\Box2D\Dynamics\b2Body.h">
+      <Filter>Box2D\Dynamics</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\source\box2d\Dynamics\b2ContactManager.h">
-      <Filter>box2d\Dynamics</Filter>
+    <ClInclude Include="..\..\source\Box2D\Dynamics\b2ContactManager.h">
+      <Filter>Box2D\Dynamics</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\source\box2d\Dynamics\b2Fixture.h">
-      <Filter>box2d\Dynamics</Filter>
+    <ClInclude Include="..\..\source\Box2D\Dynamics\b2Fixture.h">
+      <Filter>Box2D\Dynamics</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\source\box2d\Dynamics\b2Island.h">
-      <Filter>box2d\Dynamics</Filter>
+    <ClInclude Include="..\..\source\Box2D\Dynamics\b2Island.h">
+      <Filter>Box2D\Dynamics</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\source\box2d\Dynamics\b2TimeStep.h">
-      <Filter>box2d\Dynamics</Filter>
+    <ClInclude Include="..\..\source\Box2D\Dynamics\b2TimeStep.h">
+      <Filter>Box2D\Dynamics</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\source\box2d\Dynamics\b2World.h">
-      <Filter>box2d\Dynamics</Filter>
+    <ClInclude Include="..\..\source\Box2D\Dynamics\b2World.h">
+      <Filter>Box2D\Dynamics</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\source\box2d\Dynamics\b2WorldCallbacks.h">
-      <Filter>box2d\Dynamics</Filter>
+    <ClInclude Include="..\..\source\Box2D\Dynamics\b2WorldCallbacks.h">
+      <Filter>Box2D\Dynamics</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\source\box2d\Dynamics\Contacts\b2ChainAndCircleContact.h">
-      <Filter>box2d\Dynamics\Contacts</Filter>
+    <ClInclude Include="..\..\source\Box2D\Dynamics\Contacts\b2ChainAndCircleContact.h">
+      <Filter>Box2D\Dynamics\Contacts</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\source\box2d\Dynamics\Contacts\b2ChainAndPolygonContact.h">
-      <Filter>box2d\Dynamics\Contacts</Filter>
+    <ClInclude Include="..\..\source\Box2D\Dynamics\Contacts\b2ChainAndPolygonContact.h">
+      <Filter>Box2D\Dynamics\Contacts</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\source\box2d\Dynamics\Contacts\b2CircleContact.h">
-      <Filter>box2d\Dynamics\Contacts</Filter>
+    <ClInclude Include="..\..\source\Box2D\Dynamics\Contacts\b2CircleContact.h">
+      <Filter>Box2D\Dynamics\Contacts</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\source\box2d\Dynamics\Contacts\b2Contact.h">
-      <Filter>box2d\Dynamics\Contacts</Filter>
+    <ClInclude Include="..\..\source\Box2D\Dynamics\Contacts\b2Contact.h">
+      <Filter>Box2D\Dynamics\Contacts</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\source\box2d\Dynamics\Contacts\b2ContactSolver.h">
-      <Filter>box2d\Dynamics\Contacts</Filter>
+    <ClInclude Include="..\..\source\Box2D\Dynamics\Contacts\b2ContactSolver.h">
+      <Filter>Box2D\Dynamics\Contacts</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\source\box2d\Dynamics\Contacts\b2EdgeAndCircleContact.h">
-      <Filter>box2d\Dynamics\Contacts</Filter>
+    <ClInclude Include="..\..\source\Box2D\Dynamics\Contacts\b2EdgeAndCircleContact.h">
+      <Filter>Box2D\Dynamics\Contacts</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\source\box2d\Dynamics\Contacts\b2EdgeAndPolygonContact.h">
-      <Filter>box2d\Dynamics\Contacts</Filter>
+    <ClInclude Include="..\..\source\Box2D\Dynamics\Contacts\b2EdgeAndPolygonContact.h">
+      <Filter>Box2D\Dynamics\Contacts</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\source\box2d\Dynamics\Contacts\b2PolygonAndCircleContact.h">
-      <Filter>box2d\Dynamics\Contacts</Filter>
+    <ClInclude Include="..\..\source\Box2D\Dynamics\Contacts\b2PolygonAndCircleContact.h">
+      <Filter>Box2D\Dynamics\Contacts</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\source\box2d\Dynamics\Contacts\b2PolygonContact.h">
-      <Filter>box2d\Dynamics\Contacts</Filter>
+    <ClInclude Include="..\..\source\Box2D\Dynamics\Contacts\b2PolygonContact.h">
+      <Filter>Box2D\Dynamics\Contacts</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\source\box2d\Dynamics\Joints\b2DistanceJoint.h">
-      <Filter>box2d\Dynamics\Joints</Filter>
+    <ClInclude Include="..\..\source\Box2D\Dynamics\Joints\b2DistanceJoint.h">
+      <Filter>Box2D\Dynamics\Joints</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\source\box2d\Dynamics\Joints\b2FrictionJoint.h">
-      <Filter>box2d\Dynamics\Joints</Filter>
+    <ClInclude Include="..\..\source\Box2D\Dynamics\Joints\b2FrictionJoint.h">
+      <Filter>Box2D\Dynamics\Joints</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\source\box2d\Dynamics\Joints\b2GearJoint.h">
-      <Filter>box2d\Dynamics\Joints</Filter>
+    <ClInclude Include="..\..\source\Box2D\Dynamics\Joints\b2GearJoint.h">
+      <Filter>Box2D\Dynamics\Joints</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\source\box2d\Dynamics\Joints\b2Joint.h">
-      <Filter>box2d\Dynamics\Joints</Filter>
+    <ClInclude Include="..\..\source\Box2D\Dynamics\Joints\b2Joint.h">
+      <Filter>Box2D\Dynamics\Joints</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\source\box2d\Dynamics\Joints\b2MotorJoint.h">
-      <Filter>box2d\Dynamics\Joints</Filter>
+    <ClInclude Include="..\..\source\Box2D\Dynamics\Joints\b2MotorJoint.h">
+      <Filter>Box2D\Dynamics\Joints</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\source\box2d\Dynamics\Joints\b2MouseJoint.h">
-      <Filter>box2d\Dynamics\Joints</Filter>
+    <ClInclude Include="..\..\source\Box2D\Dynamics\Joints\b2MouseJoint.h">
+      <Filter>Box2D\Dynamics\Joints</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\source\box2d\Dynamics\Joints\b2PrismaticJoint.h">
-      <Filter>box2d\Dynamics\Joints</Filter>
+    <ClInclude Include="..\..\source\Box2D\Dynamics\Joints\b2PrismaticJoint.h">
+      <Filter>Box2D\Dynamics\Joints</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\source\box2d\Dynamics\Joints\b2PulleyJoint.h">
-      <Filter>box2d\Dynamics\Joints</Filter>
+    <ClInclude Include="..\..\source\Box2D\Dynamics\Joints\b2PulleyJoint.h">
+      <Filter>Box2D\Dynamics\Joints</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\source\box2d\Dynamics\Joints\b2RevoluteJoint.h">
-      <Filter>box2d\Dynamics\Joints</Filter>
+    <ClInclude Include="..\..\source\Box2D\Dynamics\Joints\b2RevoluteJoint.h">
+      <Filter>Box2D\Dynamics\Joints</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\source\box2d\Dynamics\Joints\b2RopeJoint.h">
-      <Filter>box2d\Dynamics\Joints</Filter>
+    <ClInclude Include="..\..\source\Box2D\Dynamics\Joints\b2RopeJoint.h">
+      <Filter>Box2D\Dynamics\Joints</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\source\box2d\Dynamics\Joints\b2WeldJoint.h">
-      <Filter>box2d\Dynamics\Joints</Filter>
+    <ClInclude Include="..\..\source\Box2D\Dynamics\Joints\b2WeldJoint.h">
+      <Filter>Box2D\Dynamics\Joints</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\source\box2d\Dynamics\Joints\b2WheelJoint.h">
-      <Filter>box2d\Dynamics\Joints</Filter>
+    <ClInclude Include="..\..\source\Box2D\Dynamics\Joints\b2WheelJoint.h">
+      <Filter>Box2D\Dynamics\Joints</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\source\box2d\Rope\b2Rope.h">
-      <Filter>box2d\Rope</Filter>
+    <ClInclude Include="..\..\source\Box2D\Rope\b2Rope.h">
+      <Filter>Box2D\Rope</Filter>
     </ClInclude>
     <ClInclude Include="..\..\source\component\behaviors\behaviorComponent_ScriptBinding.h">
       <Filter>component\behaviors</Filter>

engine/compilers/Xcode/Torque2D.xcodeproj/project.pbxproj

@@ -1780,12 +1780,12 @@
 			children = (
 				865A22D6165187D700527C44 /* lpng */,
 				865A22D5165187D100527C44 /* ljpeg */,
-				865A21E8165187B600527C44 /* box2d */,
+				865A21E8165187B600527C44 /* Box2D */,
 			);
 			name = Support_Libraries;
 			sourceTree = "<group>";
 		};
-		865A21E8165187B600527C44 /* box2d */ = {
+		865A21E8165187B600527C44 /* Box2D */ = {
 			isa = PBXGroup;
 			children = (
 				865A21E9165187B600527C44 /* Box2D.h */,
@@ -1794,8 +1794,8 @@
 				865A2210165187B600527C44 /* Dynamics */,
 				865A2278165187B600527C44 /* Rope */,
 			);
-			name = box2d;
-			path = ../../source/box2d;
+			name = Box2D;
+			path = ../../source/Box2D;
 			sourceTree = "<group>";
 		};
 		865A21EA165187B600527C44 /* Collision */ = {

engine/compilers/Xcode_iOS/Torque2D.xcodeproj/project.pbxproj

@@ -2927,7 +2927,7 @@
 		867BB11916AEC9E10033868F /* Support_Libraries */ = {
 			isa = PBXGroup;
 			children = (
-				867BB11C16AEC9FC0033868F /* box2d */,
+				867BB11C16AEC9FC0033868F /* Box2D */,
 				867BB11B16AEC9ED0033868F /* lpng */,
 				867BB11A16AEC9E90033868F /* ljpeg */,
 			);
@@ -3009,7 +3009,7 @@
 			name = lpng;
 			sourceTree = "<group>";
 		};
-		867BB11C16AEC9FC0033868F /* box2d */ = {
+		867BB11C16AEC9FC0033868F /* Box2D */ = {
 			isa = PBXGroup;
 			children = (
 				867BB11D16AEC9FC0033868F /* Box2D.h */,
@@ -3018,8 +3018,8 @@
 				867BB14416AEC9FC0033868F /* Dynamics */,
 				867BB1AC16AEC9FC0033868F /* Rope */,
 			);
-			name = box2d;
-			path = ../../source/box2d;
+			name = Box2D;
+			path = ../../source/Box2D;
 			sourceTree = "<group>";
 		};
 		867BB11E16AEC9FC0033868F /* Collision */ = {

engine/compilers/android/jni/Android.mk

@@ -60,14 +60,14 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH) \
     				$(LOCAL_PATH)/../../../source/algorithm \
     				$(LOCAL_PATH)/../../../source/assets \
     				$(LOCAL_PATH)/../../../source/audio \
-    				$(LOCAL_PATH)/../../../source/box2d \
-    				$(LOCAL_PATH)/../../../source/box2d/Collision \
-					$(LOCAL_PATH)/../../../source/box2d/Collision/Shapes \
-					$(LOCAL_PATH)/../../../source/box2d/Common \
-					$(LOCAL_PATH)/../../../source/box2d/Dynamics \
-					$(LOCAL_PATH)/../../../source/box2d/Dynamics/Contacts \
-					$(LOCAL_PATH)/../../../source/box2d/Dynamics/Joints \
-					$(LOCAL_PATH)/../../../source/box2d/Rope \
+    				$(LOCAL_PATH)/../../../source/Box2D \
+    				$(LOCAL_PATH)/../../../source/Box2D/Collision \
+					$(LOCAL_PATH)/../../../source/Box2D/Collision/Shapes \
+					$(LOCAL_PATH)/../../../source/Box2D/Common \
+					$(LOCAL_PATH)/../../../source/Box2D/Dynamics \
+					$(LOCAL_PATH)/../../../source/Box2D/Dynamics/Contacts \
+					$(LOCAL_PATH)/../../../source/Box2D/Dynamics/Joints \
+					$(LOCAL_PATH)/../../../source/Box2D/Rope \
     				$(LOCAL_PATH)/../../../source/collection \
     				$(LOCAL_PATH)/../../../source/component \
     				$(LOCAL_PATH)/../../../source/component/behaviors \
@@ -222,52 +222,52 @@ LOCAL_SRC_FILES :=  ../../../lib/ljpeg/jcapimin.c \
 					../../../source/assets/declaredAssets.cc \
 					../../../source/assets/referencedAssets.cc \
 					../../../source/audio/AudioAsset.cc \
-					../../../source/box2d/Collision/b2BroadPhase.cpp \
-					../../../source/box2d/Collision/b2CollideCircle.cpp \
-					../../../source/box2d/Collision/b2CollideEdge.cpp \
-					../../../source/box2d/Collision/b2CollidePolygon.cpp \
-					../../../source/box2d/Collision/b2Collision.cpp \
-					../../../source/box2d/Collision/b2Distance.cpp \
-					../../../source/box2d/Collision/b2DynamicTree.cpp \
-					../../../source/box2d/Collision/b2TimeOfImpact.cpp \
-					../../../source/box2d/Collision/Shapes/b2ChainShape.cpp \
-					../../../source/box2d/Collision/Shapes/b2CircleShape.cpp \
-					../../../source/box2d/Collision/Shapes/b2EdgeShape.cpp \
-					../../../source/box2d/Collision/Shapes/b2PolygonShape.cpp \
-					../../../source/box2d/Common/b2BlockAllocator.cpp \
-					../../../source/box2d/Common/b2Draw.cpp \
-					../../../source/box2d/Common/b2Math.cpp \
-					../../../source/box2d/Common/b2Settings.cpp \
-					../../../source/box2d/Common/b2StackAllocator.cpp \
-					../../../source/box2d/Common/b2Timer.cpp \
-					../../../source/box2d/Dynamics/b2Body.cpp \
-					../../../source/box2d/Dynamics/b2ContactManager.cpp \
-					../../../source/box2d/Dynamics/b2Fixture.cpp \
-					../../../source/box2d/Dynamics/b2Island.cpp \
-					../../../source/box2d/Dynamics/b2World.cpp \
-					../../../source/box2d/Dynamics/b2WorldCallbacks.cpp \
-					../../../source/box2d/Dynamics/Contacts/b2ChainAndCircleContact.cpp \
-					../../../source/box2d/Dynamics/Contacts/b2ChainAndPolygonContact.cpp \
-					../../../source/box2d/Dynamics/Contacts/b2CircleContact.cpp \
-					../../../source/box2d/Dynamics/Contacts/b2Contact.cpp \
-					../../../source/box2d/Dynamics/Contacts/b2ContactSolver.cpp \
-					../../../source/box2d/Dynamics/Contacts/b2EdgeAndCircleContact.cpp \
-					../../../source/box2d/Dynamics/Contacts/b2EdgeAndPolygonContact.cpp \
-					../../../source/box2d/Dynamics/Contacts/b2PolygonAndCircleContact.cpp \
-					../../../source/box2d/Dynamics/Contacts/b2PolygonContact.cpp \
-					../../../source/box2d/Dynamics/Joints/b2DistanceJoint.cpp \
-					../../../source/box2d/Dynamics/Joints/b2FrictionJoint.cpp \
-					../../../source/box2d/Dynamics/Joints/b2GearJoint.cpp \
-					../../../source/box2d/Dynamics/Joints/b2Joint.cpp \
-					../../../source/box2d/Dynamics/Joints/b2MotorJoint.cpp \
-					../../../source/box2d/Dynamics/Joints/b2MouseJoint.cpp \
-					../../../source/box2d/Dynamics/Joints/b2PrismaticJoint.cpp \
-					../../../source/box2d/Dynamics/Joints/b2PulleyJoint.cpp \
-					../../../source/box2d/Dynamics/Joints/b2RevoluteJoint.cpp \
-					../../../source/box2d/Dynamics/Joints/b2RopeJoint.cpp \
-					../../../source/box2d/Dynamics/Joints/b2WeldJoint.cpp \
-					../../../source/box2d/Dynamics/Joints/b2WheelJoint.cpp \
-					../../../source/box2d/Rope/b2Rope.cpp \
+					../../../source/Box2D/Collision/b2BroadPhase.cpp \
+					../../../source/Box2D/Collision/b2CollideCircle.cpp \
+					../../../source/Box2D/Collision/b2CollideEdge.cpp \
+					../../../source/Box2D/Collision/b2CollidePolygon.cpp \
+					../../../source/Box2D/Collision/b2Collision.cpp \
+					../../../source/Box2D/Collision/b2Distance.cpp \
+					../../../source/Box2D/Collision/b2DynamicTree.cpp \
+					../../../source/Box2D/Collision/b2TimeOfImpact.cpp \
+					../../../source/Box2D/Collision/Shapes/b2ChainShape.cpp \
+					../../../source/Box2D/Collision/Shapes/b2CircleShape.cpp \
+					../../../source/Box2D/Collision/Shapes/b2EdgeShape.cpp \
+					../../../source/Box2D/Collision/Shapes/b2PolygonShape.cpp \
+					../../../source/Box2D/Common/b2BlockAllocator.cpp \
+					../../../source/Box2D/Common/b2Draw.cpp \
+					../../../source/Box2D/Common/b2Math.cpp \
+					../../../source/Box2D/Common/b2Settings.cpp \
+					../../../source/Box2D/Common/b2StackAllocator.cpp \
+					../../../source/Box2D/Common/b2Timer.cpp \
+					../../../source/Box2D/Dynamics/b2Body.cpp \
+					../../../source/Box2D/Dynamics/b2ContactManager.cpp \
+					../../../source/Box2D/Dynamics/b2Fixture.cpp \
+					../../../source/Box2D/Dynamics/b2Island.cpp \
+					../../../source/Box2D/Dynamics/b2World.cpp \
+					../../../source/Box2D/Dynamics/b2WorldCallbacks.cpp \
+					../../../source/Box2D/Dynamics/Contacts/b2ChainAndCircleContact.cpp \
+					../../../source/Box2D/Dynamics/Contacts/b2ChainAndPolygonContact.cpp \
+					../../../source/Box2D/Dynamics/Contacts/b2CircleContact.cpp \
+					../../../source/Box2D/Dynamics/Contacts/b2Contact.cpp \
+					../../../source/Box2D/Dynamics/Contacts/b2ContactSolver.cpp \
+					../../../source/Box2D/Dynamics/Contacts/b2EdgeAndCircleContact.cpp \
+					../../../source/Box2D/Dynamics/Contacts/b2EdgeAndPolygonContact.cpp \
+					../../../source/Box2D/Dynamics/Contacts/b2PolygonAndCircleContact.cpp \
+					../../../source/Box2D/Dynamics/Contacts/b2PolygonContact.cpp \
+					../../../source/Box2D/Dynamics/Joints/b2DistanceJoint.cpp \
+					../../../source/Box2D/Dynamics/Joints/b2FrictionJoint.cpp \
+					../../../source/Box2D/Dynamics/Joints/b2GearJoint.cpp \
+					../../../source/Box2D/Dynamics/Joints/b2Joint.cpp \
+					../../../source/Box2D/Dynamics/Joints/b2MotorJoint.cpp \
+					../../../source/Box2D/Dynamics/Joints/b2MouseJoint.cpp \
+					../../../source/Box2D/Dynamics/Joints/b2PrismaticJoint.cpp \
+					../../../source/Box2D/Dynamics/Joints/b2PulleyJoint.cpp \
+					../../../source/Box2D/Dynamics/Joints/b2RevoluteJoint.cpp \
+					../../../source/Box2D/Dynamics/Joints/b2RopeJoint.cpp \
+					../../../source/Box2D/Dynamics/Joints/b2WeldJoint.cpp \
+					../../../source/Box2D/Dynamics/Joints/b2WheelJoint.cpp \
+					../../../source/Box2D/Rope/b2Rope.cpp \
 					../../../source/collection/bitTables.cc \
 					../../../source/collection/hashTable.cc \
 					../../../source/collection/nameTags.cpp \

engine/source/2d/assets/ParticleAsset.h

@@ -24,7 +24,7 @@
 #define _PARTICLE_ASSET_H_
 
 #ifndef _PARTICLE_ASSET_EMITTER_H_
-#include "2d/assets/particleAssetEmitter.h"
+#include "2d/assets/ParticleAssetEmitter.h"
 #endif
 
 #ifndef _TAML_CHILDREN_H_
@@ -172,4 +172,4 @@ protected:
     static bool writeLifeMode( void* obj, StringTableEntry pFieldName )     { return static_cast<ParticleAsset*>(obj)->getLifeMode() != INFINITE; }
 };
 
-#endif // _PARTICLE_ASSET_H_
+#endif // _PARTICLE_ASSET_H_

engine/source/2d/assets/ParticleAssetEmitter.cc

@@ -20,10 +20,10 @@
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
 
-#include "2d/assets/particleAssetEmitter.h"
+#include "2d/assets/ParticleAssetEmitter.h"
 
 #ifndef _PARTICLE_ASSET_H_
-#include "2d/assets/particleAsset.h"
+#include "2d/assets/ParticleAsset.h"
 #endif
 
 #ifndef _CONSOLETYPES_H_

engine/source/2d/assets/ParticleAssetEmitter.h

@@ -24,7 +24,7 @@
 #define _PARTICLE_ASSET_EMITTER_H_
 
 #ifndef _PARTICLE_ASSET_FIELD_H_
-#include "2d/assets/particleAssetFieldCollection.h"
+#include "2d/assets/ParticleAssetFieldCollection.h"
 #endif
 
 #ifndef _IMAGE_ASSET_H_
@@ -36,7 +36,7 @@
 #endif
 
 #ifndef _SCENE_OBJECT_H_
-#include "2d/sceneobject/sceneObject.h"
+#include "2d/sceneobject/SceneObject.h"
 #endif
 
 //-----------------------------------------------------------------------------

engine/source/2d/assets/ParticleAssetField.cc

@@ -23,7 +23,7 @@
 #include "2d/assets/ParticleAssetField.h"
 
 #ifndef _CORE_MATH_H_
-#include "2d/core/coreMath.h"
+#include "2d/core/CoreMath.h"
 #endif
 
 #ifndef _MMATH_H_

engine/source/2d/assets/SkeletonAsset.h

@@ -28,7 +28,7 @@
 #endif
 
 #ifndef _IMAGE_ASSET_H_
-#include "2d/assets/imageAsset.h"
+#include "2d/assets/ImageAsset.h"
 #endif
 
 #ifndef SPINE_SPINE_H_

engine/source/2d/controllers/BuoyancyController.h

@@ -24,7 +24,7 @@
 #define _BUOYANCY_CONTROLLER_H_
 
 #ifndef _PICKING_SCENE_CONTROLLER_H_
-#include "2d/controllers/core/pickingSceneController.h"
+#include "2d/controllers/core/PickingSceneController.h"
 #endif
 
 #ifndef _VECTOR2_H_

engine/source/2d/controllers/PointForceController.h

@@ -24,7 +24,7 @@
 #define _ATTRACTOR_CONTROLLER_H_
 
 #ifndef _PICKING_SCENE_CONTROLLER_H_
-#include "2d/controllers/core/pickingSceneController.h"
+#include "2d/controllers/core/PickingSceneController.h"
 #endif
 
 #ifndef _VECTOR2_H_

engine/source/2d/controllers/core/GroupedSceneController.h

@@ -28,15 +28,15 @@
 #endif
 
 #ifndef _SCENE_OBJECT_SET_H_
-#include "2d/sceneObject/sceneObjectSet.h"
+#include "2d/sceneobject/SceneObjectSet.h"
 #endif
 
 #ifndef _SCENE_OBJECT_H_
-#include "2d/sceneObject/sceneObject.h"
+#include "2d/sceneobject/SceneObject.h"
 #endif
 
 #ifndef _SCENE_CONTROLLER_H_
-#include "2d/controllers/core/sceneController.h"
+#include "2d/controllers/core/SceneController.h"
 #endif
 
 //------------------------------------------------------------------------------

engine/source/2d/controllers/core/PickingSceneController.h

@@ -28,15 +28,15 @@
 #endif
 
 #ifndef _SCENE_H_
-#include "2d/scene/scene.h"
+#include "2d/scene/Scene.h"
 #endif
 
 #ifndef _SCENE_OBJECT_H_
-#include "2d/sceneObject/sceneObject.h"
+#include "2d/sceneobject/SceneObject.h"
 #endif
 
 #ifndef _SCENE_CONTROLLER_H_
-#include "2d/controllers/core/sceneController.h"
+#include "2d/controllers/core/SceneController.h"
 #endif
 
 //------------------------------------------------------------------------------

engine/source/2d/core/CoreMath.h

@@ -32,7 +32,7 @@
 #endif
 
 #ifndef B2_COLLISION_H
-#include "box2d/Collision/b2Collision.h"
+#include "Box2D/Collision/b2Collision.h"
 #endif
 
 #ifndef _PLATFORM_H_

engine/source/2d/core/ImageFrameProvider.cc

@@ -20,7 +20,7 @@
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
 
-#include "2d/core/imageFrameProvider.h"
+#include "2d/core/ImageFrameProvider.h"
 
 //-----------------------------------------------------------------------------
 

engine/source/2d/core/ImageFrameProvider.h

@@ -24,7 +24,7 @@
 #define _IMAGE_FRAME_PROVIDER_H
 
 #ifndef _IMAGE_FRAME_PROVIDER_CORE_H
-#include "2d/core/imageFrameProviderCore.h"
+#include "2d/core/ImageFrameProviderCore.h"
 #endif
 
 ///-----------------------------------------------------------------------------

engine/source/2d/core/ImageFrameProviderCore.cc

@@ -20,7 +20,7 @@
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
 
-#include "2d/core/imageFrameProviderCore.h"
+#include "2d/core/ImageFrameProviderCore.h"
 
 #ifndef _SCENE_OBJECT_H_
 #include "2d/sceneobject/SceneObject.h"
@@ -39,7 +39,7 @@
 #endif
 
 #ifndef _RENDER_PROXY_H_
-#include "2d/core/renderProxy.h"
+#include "2d/core/RenderProxy.h"
 #endif
 
 // Debug Profiling.

engine/source/2d/core/ParticleSystem.cc

@@ -20,7 +20,7 @@
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
 
-#include "2d/core/particleSystem.h"
+#include "2d/core/ParticleSystem.h"
 
 //------------------------------------------------------------------------------
 

engine/source/2d/core/ParticleSystem.h

@@ -24,7 +24,7 @@
 #define _PARTICLE_SYSTEM_H_
 
 #ifndef _IMAGE_FRAME_PROVIDER_H
-#include "2d/core/imageFrameProvider.h"
+#include "2d/core/ImageFrameProvider.h"
 #endif
 
 //-----------------------------------------------------------------------------
@@ -101,4 +101,4 @@ public:
     inline U32 getAllocatedParticleCount( void ) const { return (U32)mParticlePool.size() * mParticlePoolBlockSize; }
 };
 
-#endif // _PARTICLE_SYSTEM_H_
+#endif // _PARTICLE_SYSTEM_H_

engine/source/2d/core/RenderProxy.h

@@ -24,7 +24,7 @@
 #define _RENDER_PROXY_H_
 
 #ifndef _IMAGE_FRAME_PROVIDER_H
-#include "2d/core/imageFrameProvider.h"
+#include "2d/core/ImageFrameProvider.h"
 #endif
 
 //------------------------------------------------------------------------------

engine/source/2d/core/SpriteBase.h

@@ -28,7 +28,7 @@
 #endif
 
 #ifndef _IMAGE_FRAME_PROVIDER_H
-#include "2d/core/imageFrameProvider.h"
+#include "2d/core/ImageFrameProvider.h"
 #endif
 
 //------------------------------------------------------------------------------

engine/source/2d/core/SpriteBatch.cc

@@ -25,7 +25,7 @@
 #endif
 
 #ifndef _SPRITE_BATCH_QUERY_H_
-#include "2d/core/spriteBatchQuery.h"
+#include "2d/core/SpriteBatchQuery.h"
 #endif
 
 #ifndef _SCENE_RENDER_OBJECT_H_
@@ -1440,4 +1440,4 @@ void SpriteBatch::WriteCustomTamlSchema( const AbstractClassRep* pClassRep, TiXm
 
     // Write sprite batch item.
     SpriteBatchItem::WriteCustomTamlSchema( pClassRep, pBatchNodeChoiceElement );
-}
+}

engine/source/2d/core/SpriteBatchItem.h

@@ -24,7 +24,7 @@
 #define _SPRITE_BATCH_ITEM_H_
 
 #ifndef _IMAGE_FRAME_PROVIDER_H
-#include "2d/core/imageFrameProvider.h"
+#include "2d/core/ImageFrameProvider.h"
 #endif
 
 //------------------------------------------------------------------------------  

engine/source/2d/core/SpriteBatchQuery.cc

@@ -23,11 +23,11 @@
 #include "2d/core/SpriteBatchQuery.h"
 
 #ifndef _SPRITE_BATCH_H_
-#include "2d/core/spriteBatch.h"
+#include "2d/core/SpriteBatch.h"
 #endif
 
 #ifndef _SPRITE_BATCH_ITEM_H_
-#include "2d/core/spriteBatchItem.h"
+#include "2d/core/SpriteBatchItem.h"
 #endif
 
 // Debug Profiling.

engine/source/2d/core/Vector2.h

@@ -40,7 +40,7 @@
 #endif
 
 #ifndef BOX2D_H
-#include "box2d/Box2D.h"
+#include "Box2D/Box2D.h"
 #endif
 
 ///-----------------------------------------------------------------------------
@@ -152,4 +152,4 @@ struct Vector2 : b2Vec2
     inline const char* scriptThis(void) const                           { char* pBuffer = Con::getReturnBuffer(32); dSprintf(pBuffer, 32, "%.5g %.5g", x, y ); return pBuffer; }
 };
 
-#endif // _VECTOR2_H_
+#endif // _VECTOR2_H_

engine/source/2d/experimental/composites/WaveComposite.h

@@ -24,7 +24,7 @@
 #define _WAVE_COMPOSITE_H_
 
 #ifndef _COMPOSITE_SPRITE_H_
-#include "2d/sceneObject/CompositeSprite.h"
+#include "2d/sceneobject/CompositeSprite.h"
 #endif
 
 //------------------------------------------------------------------------------  

engine/source/2d/gui/SceneWindow.h

@@ -148,7 +148,7 @@ private:
     void sendWindowInputEvent( StringTableEntry name, const GuiEvent& event );
     void sendObjectInputEvent( StringTableEntry, const GuiEvent& event );
 
-    inline void calculateCameraView( CameraView* pCameraView );
+    void calculateCameraView( CameraView* pCameraView );
 
 public:
 

engine/source/2d/gui/guiImageButtonCtrl.cc

@@ -21,7 +21,7 @@
 //-----------------------------------------------------------------------------
 
 #ifndef _GUIIMAGEBUTTON_H_
-#include "2d/gui/GuiImageButtonCtrl.h"
+#include "2d/gui/guiImageButtonCtrl.h"
 #endif
 
 #ifndef _RENDER_PROXY_H_
@@ -289,4 +289,4 @@ void GuiImageButtonCtrl::renderButton( ImageAsset* pImageAsset, const U32 frame,
 
     // Update the control.
     setUpdate();
-}
+}

engine/source/2d/gui/guiSceneObjectCtrl.cc

@@ -23,7 +23,7 @@
 #include "graphics/dgl.h"
 #include "console/consoleTypes.h"
 #include "gui/guiDefaultControlRender.h"
-#include "GuiSceneObjectCtrl.h"
+#include "guiSceneObjectCtrl.h"
 #include "debug/profiler.h"
 
 // -----------------------------------------------------------------------------

engine/source/2d/gui/guiSpriteCtrl.h

@@ -24,7 +24,7 @@
 #define _GUISPRITECTRL_H_
 
 #ifndef _IMAGE_FRAME_PROVIDER_H
-#include "2d/core/imageFrameProvider.h"
+#include "2d/core/ImageFrameProvider.h"
 #endif
 
 //-----------------------------------------------------------------------------

engine/source/2d/scene/ContactFilter.h

@@ -24,7 +24,7 @@
 #define _CONTACT_FILTER_H_
 
 #ifndef BOX2D_H
-#include "box2d/Box2D.h"
+#include "Box2D/Box2D.h"
 #endif
 
 //-----------------------------------------------------------------------------

engine/source/2d/scene/DebugDraw.h

@@ -24,7 +24,7 @@
 #define _DEBUG_DRAW_H_
 
 #ifndef BOX2D_H
-#include "box2d/Box2D.h"
+#include "Box2D/Box2D.h"
 #endif
 
 #ifndef _MMATH_H_

engine/source/2d/scene/DebugStats.h

@@ -36,7 +36,7 @@
 #endif
 
 #ifndef BOX2D_H
-#include "box2d/Box2D.h"
+#include "Box2D/Box2D.h"
 #endif
 
 //-----------------------------------------------------------------------------

engine/source/2d/scene/Scene.cc

@@ -53,7 +53,7 @@
 #endif
 
 #ifndef _PARTICLE_SYSTEM_H_
-#include "2d/core/particleSystem.h"
+#include "2d/core/ParticleSystem.h"
 #endif
 
 // Script bindings.

engine/source/2d/sceneobject/CompositeSprite.cc

@@ -25,7 +25,7 @@
 #endif
 
 #ifndef _SPRITE_BATCH_QUERY_H_
-#include "2d/core/spriteBatchQuery.h"
+#include "2d/core/SpriteBatchQuery.h"
 #endif
 
 #ifndef _RENDER_PROXY_H_

engine/source/2d/sceneobject/ParticlePlayer.cc

@@ -20,10 +20,10 @@
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
 
-#include "2d/sceneobject/particlePlayer.h"
+#include "2d/sceneobject/ParticlePlayer.h"
 
 // Script bindings.
-#include "2d/sceneobject/particlePlayer_ScriptBinding.h"
+#include "2d/sceneobject/ParticlePlayer_ScriptBinding.h"
 
 
 //------------------------------------------------------------------------------
@@ -1567,4 +1567,4 @@ void ParticlePlayer::destroyParticleAsset( void )
         mEmitters.pop_back();
     }
     mEmitters.clear();
-}
+}

engine/source/2d/sceneobject/ParticlePlayer.h

@@ -24,11 +24,11 @@
 #define _PARTICLE_PLAYER_H_
 
 #ifndef _PARTICLE_ASSET_H_
-#include "2d/assets/particleAsset.h"
+#include "2d/assets/ParticleAsset.h"
 #endif
 
 #ifndef _PARTICLE_SYSTEM_H_
-#include "2d/core/particleSystem.h"
+#include "2d/core/ParticleSystem.h"
 #endif
 
 //-----------------------------------------------------------------------------
@@ -211,4 +211,4 @@ private:
     void destroyParticleAsset( void );
 };
 
-#endif // _PARTICLE_PLAYER_H_
+#endif // _PARTICLE_PLAYER_H_

engine/source/2d/sceneobject/SceneObjectList.cc

@@ -20,8 +20,8 @@
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
 
-#include "sceneObjectList.h"
-#include "2d/sceneObject/sceneObject.h"
+#include "SceneObjectList.h"
+#include "2d/sceneobject/SceneObject.h"
 #include "collection/findIterator.h"
 
 //-----------------------------------------------------------------------------
@@ -89,4 +89,4 @@ S32 QSORT_CALLBACK SceneObjectList::compareId(const void* a,const void* b)
 {
    return (*reinterpret_cast<const SceneObject* const*>(a))->getId() -
       (*reinterpret_cast<const SceneObject* const*>(b))->getId();
-}
+}

engine/source/2d/sceneobject/SceneObjectSet.cc

@@ -30,14 +30,14 @@
 #include "io/fileObject.h"
 #include "console/consoleInternal.h"
 #include "debug/profiler.h"
-#include "console/consoleTypeValidators.h"
+#include "console/ConsoleTypeValidators.h"
 #include "memory/frameAllocator.h"
 
-#include "2d/sceneObject/sceneObject.h"
-#include "2d/sceneObject/sceneObjectSet.h"
+#include "2d/sceneobject/SceneObject.h"
+#include "2d/sceneobject/SceneObjectSet.h"
 
 // Script bindings.
-#include "2d/sceneObject/sceneObjectSet_ScriptBinding.h"
+#include "2d/sceneobject/SceneObjectSet_ScriptBinding.h"
 
 //-----------------------------------------------------------------------------
 

engine/source/2d/sceneobject/SceneObjectSet.h

@@ -24,7 +24,7 @@
 #define _SCENE_OBJECT_SET_H_
 
 #ifndef _SCENE_OBJECT_LIST_H_
-#include "2d/sceneObject/sceneObjectList.h"
+#include "2d/sceneobject/SceneObjectList.h"
 #endif
 
 #ifndef _FIND_ITERATOR_H_