Browse Source

Ok, project generation didn't really work out. Reverted.

rude 16 years ago
parent
commit
dd420d68a3
68 changed files with 4083 additions and 4143 deletions
  1. 0 339
      platform/msvc2008/audio.vcproj
  2. 91 119
      platform/msvc2008/audio/audio.vcproj
  3. 27 30
      platform/msvc2008/common/common.vcproj
  4. 51 43
      platform/msvc2008/event/event.vcproj
  5. 0 249
      platform/msvc2008/filesystem.vcproj
  6. 68 46
      platform/msvc2008/filesystem/filesystem.vcproj
  7. 0 267
      platform/msvc2008/font.vcproj
  8. 307 0
      platform/msvc2008/font/font.vcproj
  9. 0 267
      platform/msvc2008/gen-project.lua
  10. 0 355
      platform/msvc2008/graphics.vcproj
  11. 460 0
      platform/msvc2008/graphics/graphics.vcproj
  12. 0 239
      platform/msvc2008/image.vcproj
  13. 263 0
      platform/msvc2008/image/image.vcproj
  14. 49 43
      platform/msvc2008/joystick/joystick.vcproj
  15. 49 43
      platform/msvc2008/keyboard/keyboard.vcproj
  16. 73 79
      platform/msvc2008/love.sln
  17. 0 0
      platform/msvc2008/lua/lua.c
  18. 3 6
      platform/msvc2008/lua/lua.vcproj
  19. 49 43
      platform/msvc2008/mouse/mouse.vcproj
  20. 0 217
      platform/msvc2008/native.vcproj
  21. 244 0
      platform/msvc2008/native/native.vcproj
  22. 0 827
      platform/msvc2008/physics.vcproj
  23. 1031 0
      platform/msvc2008/physics/physics.vcproj
  24. 359 0
      platform/msvc2008/sound/sound.vcproj
  25. 48 17
      platform/msvc2008/timer/timer.vcproj
  26. 2 2
      src/common/runtime.cpp
  27. 2 0
      src/modules/audio/openal/Audio.cpp
  28. 29 29
      src/modules/audio/wrap_Audio.cpp
  29. 3 5
      src/modules/audio/wrap_Music.cpp
  30. 4 4
      src/modules/audio/wrap_Sound.cpp
  31. 10 10
      src/modules/audio/wrap_Source.cpp
  32. 22 21
      src/modules/event/sdl/wrap_Event.cpp
  33. 4 4
      src/modules/filesystem/physfs/Filesystem.cpp
  34. 10 10
      src/modules/filesystem/physfs/wrap_FileData.cpp
  35. 1 1
      src/modules/filesystem/physfs/wrap_FileData.h
  36. 39 39
      src/modules/filesystem/physfs/wrap_Filesystem.cpp
  37. 13 13
      src/modules/font/freetype/wrap_Font.cpp
  38. 6 6
      src/modules/font/wrap_GlyphData.cpp
  39. 7 7
      src/modules/font/wrap_Rasterizer.cpp
  40. 8 8
      src/modules/graphics/opengl/wrap_Font.cpp
  41. 2 3
      src/modules/graphics/opengl/wrap_Frame.cpp
  42. 3 3
      src/modules/graphics/opengl/wrap_Glyph.cpp
  43. 133 133
      src/modules/graphics/opengl/wrap_Graphics.cpp
  44. 3 4
      src/modules/graphics/opengl/wrap_Image.cpp
  45. 9 9
      src/modules/graphics/opengl/wrap_SpriteBatch.cpp
  46. 11 11
      src/modules/image/wrap_Image.cpp
  47. 16 16
      src/modules/image/wrap_ImageData.cpp
  48. 39 39
      src/modules/joystick/sdl/wrap_Joystick.cpp
  49. 152 152
      src/modules/keyboard/sdl/wrap_Keyboard.cpp
  50. 26 31
      src/modules/mouse/sdl/wrap_Mouse.cpp
  51. 8 8
      src/modules/native/tcc/wrap_Native.cpp
  52. 44 43
      src/modules/physics/box2d/wrap_Body.cpp
  53. 22 22
      src/modules/physics/box2d/wrap_CircleShape.cpp
  54. 17 17
      src/modules/physics/box2d/wrap_DistanceJoint.cpp
  55. 13 12
      src/modules/physics/box2d/wrap_GearJoint.cpp
  56. 10 10
      src/modules/physics/box2d/wrap_Joint.cpp
  57. 15 15
      src/modules/physics/box2d/wrap_MouseJoint.cpp
  58. 45 45
      src/modules/physics/box2d/wrap_Physics.cpp
  59. 22 21
      src/modules/physics/box2d/wrap_PolygonShape.cpp
  60. 30 30
      src/modules/physics/box2d/wrap_PrismaticJoint.cpp
  61. 20 19
      src/modules/physics/box2d/wrap_PulleyJoint.cpp
  62. 28 27
      src/modules/physics/box2d/wrap_RevoluteJoint.cpp
  63. 22 22
      src/modules/physics/box2d/wrap_Shape.cpp
  64. 16 16
      src/modules/physics/box2d/wrap_World.cpp
  65. 8 8
      src/modules/sound/wrap_Decoder.cpp
  66. 13 14
      src/modules/sound/wrap_Sound.cpp
  67. 12 14
      src/modules/sound/wrap_SoundData.cpp
  68. 12 11
      src/modules/timer/sdl/wrap_Timer.cpp

+ 0 - 339
platform/msvc2008/audio.vcproj

@@ -1,339 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="audio"
-	ProjectGUID="{748D2825-CD99-2CE1-5460-82B2C74017F3}"
-	RootNamespace="audio"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="include;../../src;../../src/modules;include/SDL"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;AUDIO_EXPORTS;"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="lua5.1.lib SDL.lib openal32.lib"
-				OutputFile="$(OutDir)\love\$(ProjectName).dll"
-				LinkIncremental="2"
-				AdditionalLibraryDirectories="lib"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="include;../../src;../../src/modules;include/SDL"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;AUDIO_EXPORTS;"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="lua5.1.lib SDL.lib openal32.lib"
-				OutputFile="$(OutDir)\love\$(ProjectName).dll"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="lib"
-				GenerateDebugInformation="false"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-
-<!-- Generated stuff begins -->
-<Files>
-<File RelativePath="..\..\src\modules\audio\Audible.h">
-</File>
-<File RelativePath="..\..\src\modules\audio\Audio.h">
-</File>
-<File RelativePath="..\..\src\modules\audio\Music.h">
-</File>
-<File RelativePath="..\..\src\modules\audio\Sound.h">
-</File>
-<File RelativePath="..\..\src\modules\audio\Source.cpp">
-<FileConfiguration Name="Debug|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\audio\" />
-</FileConfiguration>
-<FileConfiguration Name="Release|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\audio\" />
-</FileConfiguration>
-</File>
-<File RelativePath="..\..\src\modules\audio\Source.h">
-</File>
-<File RelativePath="..\..\src\modules\audio\wrap_Audio.cpp">
-<FileConfiguration Name="Debug|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\audio\" />
-</FileConfiguration>
-<FileConfiguration Name="Release|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\audio\" />
-</FileConfiguration>
-</File>
-<File RelativePath="..\..\src\modules\audio\wrap_Audio.h">
-</File>
-<File RelativePath="..\..\src\modules\audio\wrap_Music.cpp">
-<FileConfiguration Name="Debug|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\audio\" />
-</FileConfiguration>
-<FileConfiguration Name="Release|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\audio\" />
-</FileConfiguration>
-</File>
-<File RelativePath="..\..\src\modules\audio\wrap_Music.h">
-</File>
-<File RelativePath="..\..\src\modules\audio\wrap_Sound.cpp">
-<FileConfiguration Name="Debug|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\audio\" />
-</FileConfiguration>
-<FileConfiguration Name="Release|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\audio\" />
-</FileConfiguration>
-</File>
-<File RelativePath="..\..\src\modules\audio\wrap_Sound.h">
-</File>
-<File RelativePath="..\..\src\modules\audio\wrap_Source.cpp">
-<FileConfiguration Name="Debug|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\audio\" />
-</FileConfiguration>
-<FileConfiguration Name="Release|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\audio\" />
-</FileConfiguration>
-</File>
-<File RelativePath="..\..\src\modules\audio\wrap_Source.h">
-</File>
-
-<Filter Name="null">
-<File RelativePath="..\..\src\modules\audio\null\Audio.cpp">
-<FileConfiguration Name="Debug|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\audio\null\" />
-</FileConfiguration>
-<FileConfiguration Name="Release|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\audio\null\" />
-</FileConfiguration>
-</File>
-<File RelativePath="..\..\src\modules\audio\null\Audio.h">
-</File>
-<File RelativePath="..\..\src\modules\audio\null\Music.cpp">
-<FileConfiguration Name="Debug|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\audio\null\" />
-</FileConfiguration>
-<FileConfiguration Name="Release|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\audio\null\" />
-</FileConfiguration>
-</File>
-<File RelativePath="..\..\src\modules\audio\null\Music.h">
-</File>
-<File RelativePath="..\..\src\modules\audio\null\Sound.cpp">
-<FileConfiguration Name="Debug|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\audio\null\" />
-</FileConfiguration>
-<FileConfiguration Name="Release|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\audio\null\" />
-</FileConfiguration>
-</File>
-<File RelativePath="..\..\src\modules\audio\null\Sound.h">
-</File>
-<File RelativePath="..\..\src\modules\audio\null\Source.cpp">
-<FileConfiguration Name="Debug|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\audio\null\" />
-</FileConfiguration>
-<FileConfiguration Name="Release|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\audio\null\" />
-</FileConfiguration>
-</File>
-<File RelativePath="..\..\src\modules\audio\null\Source.h">
-</File>
-</Filter>
-
-
-<Filter Name="openal">
-<File RelativePath="..\..\src\modules\audio\openal\Audio.cpp">
-<FileConfiguration Name="Debug|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\audio\openal\" />
-</FileConfiguration>
-<FileConfiguration Name="Release|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\audio\openal\" />
-</FileConfiguration>
-</File>
-<File RelativePath="..\..\src\modules\audio\openal\Audio.h">
-</File>
-<File RelativePath="..\..\src\modules\audio\openal\Music.cpp">
-<FileConfiguration Name="Debug|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\audio\openal\" />
-</FileConfiguration>
-<FileConfiguration Name="Release|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\audio\openal\" />
-</FileConfiguration>
-</File>
-<File RelativePath="..\..\src\modules\audio\openal\Music.h">
-</File>
-<File RelativePath="..\..\src\modules\audio\openal\Pool.cpp">
-<FileConfiguration Name="Debug|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\audio\openal\" />
-</FileConfiguration>
-<FileConfiguration Name="Release|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\audio\openal\" />
-</FileConfiguration>
-</File>
-<File RelativePath="..\..\src\modules\audio\openal\Pool.h">
-</File>
-<File RelativePath="..\..\src\modules\audio\openal\Sound.cpp">
-<FileConfiguration Name="Debug|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\audio\openal\" />
-</FileConfiguration>
-<FileConfiguration Name="Release|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\audio\openal\" />
-</FileConfiguration>
-</File>
-<File RelativePath="..\..\src\modules\audio\openal\Sound.h">
-</File>
-<File RelativePath="..\..\src\modules\audio\openal\Source.cpp">
-<FileConfiguration Name="Debug|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\audio\openal\" />
-</FileConfiguration>
-<FileConfiguration Name="Release|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\audio\openal\" />
-</FileConfiguration>
-</File>
-<File RelativePath="..\..\src\modules\audio\openal\Source.h">
-</File>
-</Filter>
-
-</Files>
-<!-- Generated stuff ends -->
-	
-	<Globals>
-	</Globals>
-</VisualStudioProject>

+ 91 - 119
platform/msvc2008/sound.vcproj → platform/msvc2008/audio/audio.vcproj

@@ -2,9 +2,9 @@
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="9,00"
-	Name="sound"
-	ProjectGUID="{1ADE4D43-4F17-3395-1427-E19944F1AE41}"
-	RootNamespace="sound"
+	Name="audio"
+	ProjectGUID="{1E405CDD-5FD7-42E0-BCF1-147305DA3EA0}"
+	RootNamespace="audio"
 	Keyword="Win32Proj"
 	TargetFrameworkVersion="196613"
 	>
@@ -41,8 +41,8 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="include;../../src;../../src/modules;"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;SOUND_EXPORTS;FLAC__NO_DLL;"
+				AdditionalIncludeDirectories="../include;../../../src;../../../src/modules;../include/SDL"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;AUDIO_EXPORTS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -61,10 +61,10 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="lua5.1.lib libmodplug.lib libmpg123.lib libogg.lib libvorbis.lib libvorbisfile.lib libFLAC_static.lib libFLAC++_static.lib"
+				AdditionalDependencies="openal32.lib SDL.lib"
 				OutputFile="$(OutDir)\love\$(ProjectName).dll"
 				LinkIncremental="2"
-				AdditionalLibraryDirectories="lib"
+				AdditionalLibraryDirectories="..\lib"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				TargetMachine="1"
@@ -118,9 +118,8 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="include;../../src;../../src/modules;"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;SOUND_EXPORTS;FLAC__NO_DLL;"
-				RuntimeLibrary="0"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;AUDIO_EXPORTS"
+				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@@ -137,11 +136,8 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="lua5.1.lib libmodplug.lib libmpg123.lib libogg.lib libvorbis.lib libvorbisfile.lib libFLAC_static.lib libFLAC++_static.lib"
-				OutputFile="$(OutDir)\love\$(ProjectName).dll"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="lib"
-				GenerateDebugInformation="false"
+				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
@@ -174,275 +170,251 @@
 	</References>
 	<Files>
 		<Filter
-			Name="lullaby"
+			Name="openal"
 			>
 			<File
-				RelativePath="..\..\src\modules\sound\lullaby\Decoder.cpp"
+				RelativePath="..\..\..\src\modules\audio\openal\Audio.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\modules\sound\lullaby\"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\modules\sound\lullaby\"
+						ObjectFile="$(IntDir)\audio\openal\"
 					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\src\modules\sound\lullaby\Decoder.h"
+				RelativePath="..\..\..\src\modules\audio\openal\Audio.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\modules\sound\lullaby\FLACDecoder.cpp"
+				RelativePath="..\..\..\src\modules\audio\openal\Music.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\modules\sound\lullaby\"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\modules\sound\lullaby\"
+						ObjectFile="$(IntDir)\audio\openal\"
 					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\src\modules\sound\lullaby\FLACDecoder.h"
+				RelativePath="..\..\..\src\modules\audio\openal\Music.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\modules\sound\lullaby\ModPlugDecoder.cpp"
+				RelativePath="..\..\..\src\modules\audio\openal\Pool.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\modules\sound\lullaby\"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\modules\sound\lullaby\"
+						ObjectFile="$(IntDir)\audio\openal\"
 					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\src\modules\sound\lullaby\ModPlugDecoder.h"
+				RelativePath="..\..\..\src\modules\audio\openal\Pool.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\modules\sound\lullaby\Mpg123Decoder.cpp"
+				RelativePath="..\..\..\src\modules\audio\openal\Sound.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\modules\sound\lullaby\"
+						ObjectFile="$(IntDir)\audio\openal\"
 					/>
 				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\audio\openal\Sound.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\audio\openal\Source.cpp"
+				>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\modules\sound\lullaby\"
+						ObjectFile="$(IntDir)\audio\openal\"
 					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\src\modules\sound\lullaby\Mpg123Decoder.h"
+				RelativePath="..\..\..\src\modules\audio\openal\Source.h"
 				>
 			</File>
+		</Filter>
+		<Filter
+			Name="null"
+			>
 			<File
-				RelativePath="..\..\src\modules\sound\lullaby\Sound.cpp"
+				RelativePath="..\..\..\src\modules\audio\null\Audio.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\modules\sound\lullaby\"
+						ObjectFile="$(IntDir)\audio\null\"
 					/>
 				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\audio\null\Audio.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\audio\null\Music.cpp"
+				>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\modules\sound\lullaby\"
+						ObjectFile="$(IntDir)\audio\null\"
 					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\src\modules\sound\lullaby\Sound.h"
+				RelativePath="..\..\..\src\modules\audio\null\Music.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\modules\sound\lullaby\VorbisDecoder.cpp"
+				RelativePath="..\..\..\src\modules\audio\null\Sound.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\modules\sound\lullaby\"
+						ObjectFile="$(IntDir)\audio\null\"
 					/>
 				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\audio\null\Sound.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\audio\null\Source.cpp"
+				>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\modules\sound\lullaby\"
+						ObjectFile="$(IntDir)\audio\null\"
 					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\src\modules\sound\lullaby\VorbisDecoder.h"
+				RelativePath="..\..\..\src\modules\audio\null\Source.h"
 				>
 			</File>
 		</Filter>
 		<File
-			RelativePath="..\..\src\modules\sound\Decoder.h"
+			RelativePath="..\..\..\src\modules\audio\Audible.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\..\src\modules\audio\Audio.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\..\src\modules\audio\Music.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\..\src\modules\audio\Sound.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\src\modules\sound\Sound.cpp"
+			RelativePath="..\..\..\src\modules\audio\Source.cpp"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
 				>
 				<Tool
 					Name="VCCLCompilerTool"
-					ObjectFile="$(IntDir)\modules\sound\"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					ObjectFile="$(IntDir)\modules\sound\"
+					ObjectFile="$(IntDir)\audio\"
 				/>
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\modules\sound\Sound.h"
+			RelativePath="..\..\..\src\modules\audio\Source.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\src\modules\sound\SoundData.cpp"
+			RelativePath="..\..\..\src\modules\audio\wrap_Audio.cpp"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
 				>
 				<Tool
 					Name="VCCLCompilerTool"
-					ObjectFile="$(IntDir)\modules\sound\"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					ObjectFile="$(IntDir)\modules\sound\"
+					ObjectFile="$(IntDir)\audio\"
 				/>
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\modules\sound\SoundData.h"
+			RelativePath="..\..\..\src\modules\audio\wrap_Audio.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\src\modules\sound\wrap_Decoder.cpp"
+			RelativePath="..\..\..\src\modules\audio\wrap_Music.cpp"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
 				>
 				<Tool
 					Name="VCCLCompilerTool"
-					ObjectFile="$(IntDir)\modules\sound\"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					ObjectFile="$(IntDir)\modules\sound\"
+					ObjectFile="$(IntDir)\audio\"
 				/>
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\modules\sound\wrap_Decoder.h"
+			RelativePath="..\..\..\src\modules\audio\wrap_Music.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\src\modules\sound\wrap_Sound.cpp"
+			RelativePath="..\..\..\src\modules\audio\wrap_Sound.cpp"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
 				>
 				<Tool
 					Name="VCCLCompilerTool"
-					ObjectFile="$(IntDir)\modules\sound\"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					ObjectFile="$(IntDir)\modules\sound\"
+					ObjectFile="$(IntDir)\audio\"
 				/>
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\modules\sound\wrap_Sound.h"
+			RelativePath="..\..\..\src\modules\audio\wrap_Sound.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\src\modules\sound\wrap_SoundData.cpp"
+			RelativePath="..\..\..\src\modules\audio\wrap_Source.cpp"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
 				>
 				<Tool
 					Name="VCCLCompilerTool"
-					ObjectFile="$(IntDir)\modules\sound\"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					ObjectFile="$(IntDir)\modules\sound\"
+					ObjectFile="$(IntDir)\audio\"
 				/>
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\modules\sound\wrap_SoundData.h"
+			RelativePath="..\..\..\src\modules\audio\wrap_Source.h"
 			>
 		</File>
 	</Files>

+ 27 - 30
platform/msvc2008/common.vcproj → platform/msvc2008/common/common.vcproj

@@ -41,8 +41,8 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;"
+				AdditionalIncludeDirectories="../include"
+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -62,7 +62,7 @@
 			<Tool
 				Name="VCLibrarianTool"
 				AdditionalDependencies="lua5.1.lib"
-				AdditionalLibraryDirectories="lib"
+				AdditionalLibraryDirectories="..\lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -107,9 +107,8 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;"
-				RuntimeLibrary="0"
+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
+				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@@ -126,8 +125,6 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				AdditionalDependencies="lua5.1.lib"
-				AdditionalLibraryDirectories="lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -150,91 +147,91 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\..\src\common\config.h"
+			RelativePath="..\..\..\src\common\config.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\src\common\Data.h"
+			RelativePath="..\..\..\src\common\Data.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\src\common\Exception.cpp"
+			RelativePath="..\..\..\src\common\Exception.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\src\common\Exception.h"
+			RelativePath="..\..\..\src\common\Exception.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\src\common\math.h"
+			RelativePath="..\..\..\src\common\math.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\src\common\Matrix.cpp"
+			RelativePath="..\..\..\src\common\Matrix.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\src\common\Matrix.h"
+			RelativePath="..\..\..\src\common\Matrix.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\src\common\MemoryData.cpp"
+			RelativePath="..\..\..\src\common\MemoryData.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\src\common\MemoryData.h"
+			RelativePath="..\..\..\src\common\MemoryData.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\src\common\Module.h"
+			RelativePath="..\..\..\src\common\Module.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\src\common\Object.cpp"
+			RelativePath="..\..\..\src\common\Object.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\src\common\Object.h"
+			RelativePath="..\..\..\src\common\Object.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\src\common\Reference.cpp"
+			RelativePath="..\..\..\src\common\Reference.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\src\common\Reference.h"
+			RelativePath="..\..\..\src\common\Reference.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\src\common\runtime.cpp"
+			RelativePath="..\..\..\src\common\runtime.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\src\common\runtime.h"
+			RelativePath="..\..\..\src\common\runtime.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\src\common\types.h"
+			RelativePath="..\..\..\src\common\types.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\src\common\Vector.cpp"
+			RelativePath="..\..\..\src\common\Vector.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\src\common\Vector.h"
+			RelativePath="..\..\..\src\common\Vector.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\src\common\version.h"
+			RelativePath="..\..\..\src\common\version.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\src\common\wrap_Data.cpp"
+			RelativePath="..\..\..\src\common\wrap_Data.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\src\common\wrap_Data.h"
+			RelativePath="..\..\..\src\common\wrap_Data.h"
 			>
 		</File>
 	</Files>

+ 51 - 43
platform/msvc2008/timer.vcproj → platform/msvc2008/event/event.vcproj

@@ -2,9 +2,9 @@
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="9,00"
-	Name="timer"
-	ProjectGUID="{49828534-328F-F253-C0DA-85A691B4312E}"
-	RootNamespace="timer"
+	Name="event"
+	ProjectGUID="{62C66448-36CB-4350-9D6E-02F49F05EDB4}"
+	RootNamespace="event"
 	Keyword="Win32Proj"
 	TargetFrameworkVersion="196613"
 	>
@@ -41,8 +41,8 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="include;../../src;../../src/modules;include/SDL"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;TIMER_EXPORTS;"
+				AdditionalIncludeDirectories="../include;../../../src;../../../src/modules;../include/SDL"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;EVENT_EXPORTS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -64,7 +64,7 @@
 				AdditionalDependencies="lua5.1.lib SDL.lib"
 				OutputFile="$(OutDir)\love\$(ProjectName).dll"
 				LinkIncremental="2"
-				AdditionalLibraryDirectories="lib"
+				AdditionalLibraryDirectories="..\lib"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				TargetMachine="1"
@@ -118,9 +118,8 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="include;../../src;../../src/modules;include/SDL"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;TIMER_EXPORTS;"
-				RuntimeLibrary="0"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;EVENT_EXPORTS"
+				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@@ -137,11 +136,8 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="lua5.1.lib SDL.lib"
-				OutputFile="$(OutDir)\love\$(ProjectName).dll"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="lib"
-				GenerateDebugInformation="false"
+				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
@@ -172,36 +168,48 @@
 	</Configurations>
 	<References>
 	</References>
-
-<!-- Generated stuff begins -->
-<Files>
-
-<Filter Name="sdl">
-<File RelativePath="..\..\src\modules\timer\sdl\Timer.cpp">
-<FileConfiguration Name="Debug|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\timer\sdl\" />
-</FileConfiguration>
-<FileConfiguration Name="Release|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\timer\sdl\" />
-</FileConfiguration>
-</File>
-<File RelativePath="..\..\src\modules\timer\sdl\Timer.h">
-</File>
-<File RelativePath="..\..\src\modules\timer\sdl\wrap_Timer.cpp">
-<FileConfiguration Name="Debug|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\timer\sdl\" />
-</FileConfiguration>
-<FileConfiguration Name="Release|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\timer\sdl\" />
-</FileConfiguration>
-</File>
-<File RelativePath="..\..\src\modules\timer\sdl\wrap_Timer.h">
-</File>
-</Filter>
-
-</Files>
-<!-- Generated stuff ends -->
-	
+	<Files>
+		<Filter
+			Name="sdl"
+			>
+			<File
+				RelativePath="..\..\..\src\modules\event\sdl\Event.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)\event\sdl\"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\event\sdl\Event.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\event\sdl\wrap_Event.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)\event\sdl\"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\event\sdl\wrap_Event.h"
+				>
+			</File>
+		</Filter>
+		<File
+			RelativePath="..\..\..\src\modules\event\Event.h"
+			>
+		</File>
+	</Files>
 	<Globals>
 	</Globals>
 </VisualStudioProject>

+ 0 - 249
platform/msvc2008/filesystem.vcproj

@@ -1,249 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="filesystem"
-	ProjectGUID="{CBAD7A48-38A2-A59C-94DF-610079E1BF09}"
-	RootNamespace="filesystem"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="include;../../src;../../src/modules;"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;FILESYSTEM_EXPORTS;"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="lua5.1.lib physfs.lib"
-				OutputFile="$(OutDir)\love\$(ProjectName).dll"
-				LinkIncremental="2"
-				AdditionalLibraryDirectories="lib"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="include;../../src;../../src/modules;"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;FILESYSTEM_EXPORTS;"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="lua5.1.lib physfs.lib"
-				OutputFile="$(OutDir)\love\$(ProjectName).dll"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="lib"
-				GenerateDebugInformation="false"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-
-<!-- Generated stuff begins -->
-<Files>
-<File RelativePath="..\..\src\modules\filesystem\File.h">
-</File>
-<File RelativePath="..\..\src\modules\filesystem\FileData.cpp">
-<FileConfiguration Name="Debug|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\filesystem\" />
-</FileConfiguration>
-<FileConfiguration Name="Release|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\filesystem\" />
-</FileConfiguration>
-</File>
-<File RelativePath="..\..\src\modules\filesystem\FileData.h">
-</File>
-
-<Filter Name="physfs">
-<File RelativePath="..\..\src\modules\filesystem\physfs\File.cpp">
-<FileConfiguration Name="Debug|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\filesystem\physfs\" />
-</FileConfiguration>
-<FileConfiguration Name="Release|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\filesystem\physfs\" />
-</FileConfiguration>
-</File>
-<File RelativePath="..\..\src\modules\filesystem\physfs\File.h">
-</File>
-<File RelativePath="..\..\src\modules\filesystem\physfs\Filesystem.cpp">
-<FileConfiguration Name="Debug|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\filesystem\physfs\" />
-</FileConfiguration>
-<FileConfiguration Name="Release|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\filesystem\physfs\" />
-</FileConfiguration>
-</File>
-<File RelativePath="..\..\src\modules\filesystem\physfs\Filesystem.h">
-</File>
-<File RelativePath="..\..\src\modules\filesystem\physfs\wrap_File.cpp">
-<FileConfiguration Name="Debug|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\filesystem\physfs\" />
-</FileConfiguration>
-<FileConfiguration Name="Release|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\filesystem\physfs\" />
-</FileConfiguration>
-</File>
-<File RelativePath="..\..\src\modules\filesystem\physfs\wrap_File.h">
-</File>
-<File RelativePath="..\..\src\modules\filesystem\physfs\wrap_FileData.cpp">
-<FileConfiguration Name="Debug|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\filesystem\physfs\" />
-</FileConfiguration>
-<FileConfiguration Name="Release|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\filesystem\physfs\" />
-</FileConfiguration>
-</File>
-<File RelativePath="..\..\src\modules\filesystem\physfs\wrap_FileData.h">
-</File>
-<File RelativePath="..\..\src\modules\filesystem\physfs\wrap_Filesystem.cpp">
-<FileConfiguration Name="Debug|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\filesystem\physfs\" />
-</FileConfiguration>
-<FileConfiguration Name="Release|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\filesystem\physfs\" />
-</FileConfiguration>
-</File>
-<File RelativePath="..\..\src\modules\filesystem\physfs\wrap_Filesystem.h">
-</File>
-</Filter>
-
-</Files>
-<!-- Generated stuff ends -->
-	
-	<Globals>
-	</Globals>
-</VisualStudioProject>

+ 68 - 46
platform/msvc2008/event.vcproj → platform/msvc2008/filesystem/filesystem.vcproj

@@ -2,9 +2,9 @@
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="9,00"
-	Name="event"
-	ProjectGUID="{BFE86F17-5EDC-6666-E655-9FDF3BFC78DE}"
-	RootNamespace="event"
+	Name="filesystem"
+	ProjectGUID="{0A2BDA60-43BB-4837-921A-2E4955FD8AEC}"
+	RootNamespace="filesystem"
 	Keyword="Win32Proj"
 	TargetFrameworkVersion="196613"
 	>
@@ -41,8 +41,8 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="include;../../src;../../src/modules;include/SDL"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;EVENT_EXPORTS;"
+				AdditionalIncludeDirectories="../include;../../../src;../../../src/modules"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LOVE_FILESYSTEM_EXPORTS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -61,10 +61,10 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="lua5.1.lib SDL.lib"
+				AdditionalDependencies="lua5.1.lib physfs.lib"
 				OutputFile="$(OutDir)\love\$(ProjectName).dll"
 				LinkIncremental="2"
-				AdditionalLibraryDirectories="lib"
+				AdditionalLibraryDirectories="..\lib"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				TargetMachine="1"
@@ -118,9 +118,8 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="include;../../src;../../src/modules;include/SDL"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;EVENT_EXPORTS;"
-				RuntimeLibrary="0"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FILESYSTEM_EXPORTS"
+				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@@ -137,11 +136,8 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="lua5.1.lib SDL.lib"
-				OutputFile="$(OutDir)\love\$(ProjectName).dll"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="lib"
-				GenerateDebugInformation="false"
+				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
@@ -172,38 +168,64 @@
 	</Configurations>
 	<References>
 	</References>
-
-<!-- Generated stuff begins -->
-<Files>
-<File RelativePath="..\..\src\modules\event\Event.h">
-</File>
-
-<Filter Name="sdl">
-<File RelativePath="..\..\src\modules\event\sdl\Event.cpp">
-<FileConfiguration Name="Debug|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\event\sdl\" />
-</FileConfiguration>
-<FileConfiguration Name="Release|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\event\sdl\" />
-</FileConfiguration>
-</File>
-<File RelativePath="..\..\src\modules\event\sdl\Event.h">
-</File>
-<File RelativePath="..\..\src\modules\event\sdl\wrap_Event.cpp">
-<FileConfiguration Name="Debug|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\event\sdl\" />
-</FileConfiguration>
-<FileConfiguration Name="Release|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\event\sdl\" />
-</FileConfiguration>
-</File>
-<File RelativePath="..\..\src\modules\event\sdl\wrap_Event.h">
-</File>
-</Filter>
-
-</Files>
-<!-- Generated stuff ends -->
-	
+	<Files>
+		<Filter
+			Name="filesystem"
+			>
+			<File
+				RelativePath="..\..\..\src\modules\filesystem\physfs\File.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\filesystem\physfs\File.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\filesystem\physfs\Filesystem.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\filesystem\physfs\Filesystem.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\filesystem\physfs\wrap_File.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\filesystem\physfs\wrap_File.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\filesystem\physfs\wrap_FileData.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\filesystem\physfs\wrap_FileData.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\filesystem\physfs\wrap_Filesystem.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\filesystem\physfs\wrap_Filesystem.h"
+				>
+			</File>
+		</Filter>
+		<File
+			RelativePath="..\..\..\src\modules\filesystem\File.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\..\src\modules\filesystem\FileData.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\..\src\modules\filesystem\FileData.h"
+			>
+		</File>
+	</Files>
 	<Globals>
 	</Globals>
 </VisualStudioProject>

+ 0 - 267
platform/msvc2008/font.vcproj

@@ -1,267 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="font"
-	ProjectGUID="{4ECA919A-7534-771E-6F96-A2E081696733}"
-	RootNamespace="font"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="include;../../src;../../src/modules;"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;FONT_EXPORTS;"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="lua5.1.lib freetype.lib"
-				OutputFile="$(OutDir)\love\$(ProjectName).dll"
-				LinkIncremental="2"
-				AdditionalLibraryDirectories="lib"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="include;../../src;../../src/modules;"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;FONT_EXPORTS;"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="lua5.1.lib freetype.lib"
-				OutputFile="$(OutDir)\love\$(ProjectName).dll"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="lib"
-				GenerateDebugInformation="false"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-
-<!-- Generated stuff begins -->
-<Files>
-<File RelativePath="..\..\src\modules\font\GlyphData.cpp">
-<FileConfiguration Name="Debug|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\font\" />
-</FileConfiguration>
-<FileConfiguration Name="Release|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\font\" />
-</FileConfiguration>
-</File>
-<File RelativePath="..\..\src\modules\font\GlyphData.h">
-</File>
-<File RelativePath="..\..\src\modules\font\ImageRasterizer.cpp">
-<FileConfiguration Name="Debug|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\font\" />
-</FileConfiguration>
-<FileConfiguration Name="Release|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\font\" />
-</FileConfiguration>
-</File>
-<File RelativePath="..\..\src\modules\font\ImageRasterizer.h">
-</File>
-<File RelativePath="..\..\src\modules\font\Rasterizer.cpp">
-<FileConfiguration Name="Debug|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\font\" />
-</FileConfiguration>
-<FileConfiguration Name="Release|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\font\" />
-</FileConfiguration>
-</File>
-<File RelativePath="..\..\src\modules\font\Rasterizer.h">
-</File>
-<File RelativePath="..\..\src\modules\font\wrap_GlyphData.cpp">
-<FileConfiguration Name="Debug|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\font\" />
-</FileConfiguration>
-<FileConfiguration Name="Release|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\font\" />
-</FileConfiguration>
-</File>
-<File RelativePath="..\..\src\modules\font\wrap_GlyphData.h">
-</File>
-<File RelativePath="..\..\src\modules\font\wrap_Rasterizer.cpp">
-<FileConfiguration Name="Debug|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\font\" />
-</FileConfiguration>
-<FileConfiguration Name="Release|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\font\" />
-</FileConfiguration>
-</File>
-<File RelativePath="..\..\src\modules\font\wrap_Rasterizer.h">
-</File>
-
-<Filter Name="freetype">
-<File RelativePath="..\..\src\modules\font\freetype\Font.cpp">
-<FileConfiguration Name="Debug|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\font\freetype\" />
-</FileConfiguration>
-<FileConfiguration Name="Release|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\font\freetype\" />
-</FileConfiguration>
-</File>
-<File RelativePath="..\..\src\modules\font\freetype\Font.h">
-</File>
-<File RelativePath="..\..\src\modules\font\freetype\TrueTypeRasterizer.cpp">
-<FileConfiguration Name="Debug|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\font\freetype\" />
-</FileConfiguration>
-<FileConfiguration Name="Release|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\font\freetype\" />
-</FileConfiguration>
-</File>
-<File RelativePath="..\..\src\modules\font\freetype\TrueTypeRasterizer.h">
-</File>
-<File RelativePath="..\..\src\modules\font\freetype\wrap_Font.cpp">
-<FileConfiguration Name="Debug|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\font\freetype\" />
-</FileConfiguration>
-<FileConfiguration Name="Release|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\font\freetype\" />
-</FileConfiguration>
-</File>
-<File RelativePath="..\..\src\modules\font\freetype\wrap_Font.h">
-</File>
-</Filter>
-
-</Files>
-<!-- Generated stuff ends -->
-	
-	<Globals>
-	</Globals>
-</VisualStudioProject>

+ 307 - 0
platform/msvc2008/font/font.vcproj

@@ -0,0 +1,307 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9,00"
+	Name="font"
+	ProjectGUID="{0E3ACF52-EEB5-4E35-8631-43B3E9F4577E}"
+	RootNamespace="font"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="196613"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="2"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="../include;../../../src;../../../src/modules"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FONT_EXPORTS"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="freetype.lib"
+				OutputFile="$(OutDir)\love\$(ProjectName).dll"
+				LinkIncremental="2"
+				AdditionalLibraryDirectories="..\lib"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="2"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				EnableIntrinsicFunctions="true"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FONT_EXPORTS"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="freetype"
+			>
+			<File
+				RelativePath="..\..\..\src\modules\font\freetype\Font.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)\font\freetype\"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\font\freetype\Font.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\font\freetype\TrueTypeRasterizer.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)\font\freetype\"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\font\freetype\TrueTypeRasterizer.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\font\freetype\wrap_Font.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)\font\freetype\"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\font\freetype\wrap_Font.h"
+				>
+			</File>
+		</Filter>
+		<File
+			RelativePath="..\..\..\src\modules\font\GlyphData.cpp"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					ObjectFile="$(IntDir)\font\freetype\"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\..\src\modules\font\GlyphData.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\..\src\modules\font\ImageRasterizer.cpp"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					ObjectFile="$(IntDir)\font\freetype\"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\..\src\modules\font\ImageRasterizer.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\..\src\modules\font\Rasterizer.cpp"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					ObjectFile="$(IntDir)\font\freetype\"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\..\src\modules\font\Rasterizer.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\..\src\modules\font\wrap_GlyphData.cpp"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					ObjectFile="$(IntDir)\font\freetype\"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\..\src\modules\font\wrap_GlyphData.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\..\src\modules\font\wrap_Rasterizer.cpp"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					ObjectFile="$(IntDir)\font\freetype\"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\..\src\modules\font\wrap_Rasterizer.h"
+			>
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>

+ 0 - 267
platform/msvc2008/gen-project.lua

@@ -1,267 +0,0 @@
--- Generates some MSVC2008 project files.
-
-require("lfs")
-
-math.randomseed(5000)
-
-function scan(path)
-	local files = {}
-	local dirs = {}
-	for f in lfs.dir(path) do
-		if f ~= "." and f ~= ".."  then
-			local a = lfs.attributes(path.."/"..f)
-			if a and a.mode == "directory" then
-				table.insert(dirs, f)
-			else
-				table.insert(files, f)
-			end
-		end
-	end
-	return files, dirs
-end
-
-function ignore(path)
-	
-	if string.find(path, "libtcc") then
-		if string.find(path, "libtcc%.c") then
-			return false
-		else
-			print("NO", path)
-			return true
-		end
-	end
-	
-	return false
-end
-
-function traverse(path, p, t)
-	
-	if not p then p = path end
-	if not t then t = {} end
-	
-	local f, d = scan(path)
-	
-	for i,v in ipairs(f) do
-		if not ignore(path.."/"..v) then
-			table.insert(t, path.."/"..v)
-		end
-	end
-	
-	for i,v in ipairs(d) do
-		t[v] = traverse(path.."/"..v, v, {})
-	end
-	
-	return t
-end
-
-function winslash(s)
-	return string.gsub(s, "/", "\\")
-end
-
-function addfolder(name, t, out)
-	-- Build the data.
-	for i,v in pairs(t) do
-		if type(v) == "table" then
-			table.insert(out, "\n<Filter Name=\""..i.."\">")
-			addfolder(i, v, out)
-			table.insert(out, "</Filter>\n")
-		else
-			table.insert(out, "<File RelativePath=\""..winslash(v).."\">")
-			if string.find(v, "%.cpp") then
-				table.insert(out, "<FileConfiguration Name=\"Debug|Win32\">")
-				local u1,u2,obj = string.find(v, "(/modules/.*/)")
-				table.insert(out, "<Tool Name=\"VCCLCompilerTool\" ObjectFile=\"$(IntDir)"..winslash(obj).."\" />")
-				table.insert(out, "</FileConfiguration>")
-				table.insert(out, "<FileConfiguration Name=\"Release|Win32\">")
-				table.insert(out, "<Tool Name=\"VCCLCompilerTool\" ObjectFile=\"$(IntDir)"..winslash(obj).."\" />")
-				table.insert(out, "</FileConfiguration>")
-			end
-			table.insert(out, "</File>")
-		end
-	end
-end
-
-function contains(haystack, needle)
-	for i,v in ipairs(haystack) do
-		if v == needle then return true end
-	end
-	return false
-end
-
-guid = {}
-guid.chars = {'0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F'}
-
-function guid.gen()
-	local g = {"{"}
-	for i=1,8 do table.insert(g, guid.chars[math.random(1,16)]) end
-	table.insert(g, "-")
-	for j=1,3 do
-		for i=1,4 do table.insert(g, guid.chars[math.random(1,16)]) end
-		table.insert(g, "-")
-	end
-	for i=1,12 do table.insert(g, guid.chars[math.random(1,16)]) end
-	table.insert(g, "}")
-	return table.concat(g)
-end
-
-filter = {}
-
-function filter.guid(data)
-	local g = guid.gen()
-	print(" GUID: " .. g)
-	return string.gsub(data, "{GUID}", g)
-end
-
-function filter.name(data, module)
-	print(" Name: " .. module)
-	return string.gsub(data, "{MODULE}", module)
-end
-
-function filter.includes(data, module)
-
-	local incstr = "include;../../src;../../src/modules;"
-	local sdlstr = "include/SDL"
-
-	local sdlmod = {"audio", "event", "graphics", "joystick", "keyboard", "mouse", "timer"}
-	
-	if contains(sdlmod, module) then
-		incstr = incstr .. sdlstr
-	end
-
-	print(" Include: " .. incstr)
-	return string.gsub(data, "{INCLUDES}", incstr)
-end
-
-function filter.defines(data, module)
-
-	local unique = string.upper(module) .."_EXPORTS;"
-	local release = "WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;".. unique
-	local dbg = "WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;".. unique
-	
-	print(" Defines:")
-	print("  Debug: "..dbg)
-	print("  Release: "..release)
-	
-	if module == "sound" then
-		dbg = dbg .. "FLAC__NO_DLL;"
-		release = release .. "FLAC__NO_DLL;"
-	end
-	
-	local data = string.gsub(data, "{DEFINES_RELEASE}", release)
-	
-	return string.gsub(data, "{DEFINES_DEBUG}", dbg)
-end
-
-function filter.libdir(data, module)
-	local dir = "lib"
-	print(" Libdir: " .. dir)
-	return string.gsub(data, "{LIBDIR}", dir)
-end
-
-libconf = {
-	audio = "lua5.1.lib SDL.lib openal32.lib",
-	event = "lua5.1.lib SDL.lib",
-	filesystem = "lua5.1.lib physfs.lib",
-	font = "lua5.1.lib freetype.lib",
-	graphics = "lua5.1.lib SDL.lib freetype.lib opengl32.lib",
-	image = "lua5.1.lib DevIL.lib",
-	joystick = "lua5.1.lib SDL.lib",
-	keyboard = "lua5.1.lib SDL.lib",
-	mouse = "lua5.1.lib SDL.lib",
-	native = "lua5.1.lib",
-	physics = "lua5.1.lib",
-	sound = "lua5.1.lib libmodplug.lib libmpg123.lib libogg.lib libvorbis.lib libvorbisfile.lib libFLAC_static.lib libFLAC++_static.lib",
-	timer = "lua5.1.lib SDL.lib",
-}
-
-function filter.libs(data, module)
-	print(" Libs: " .. libconf[module])
-	return string.gsub(data, "{LIBS}", libconf[module])
-end
-
-filter.filters = {
-	filter.name,
-	filter.guid,
-	filter.includes,
-	filter.defines,
-	filter.libdir,
-	filter.libs,
-}
-
-function update(module, t)
-
-	print("Updating "..module.." ...")
-
-	local infile = "master.vct"
-	local outfile = module..".vcproj"
-
-	-- Get the template.
-	local f = io.open(infile, "r")
-	if not f then print("Warning, file "..infile.." not found."); return end
-	local data = f:read("*a")
-	io.close(f)
-	
-	for i,v in ipairs(filter.filters) do
-		data = v(data, module)
-	end
-	
-	local out = {}
-	
-	table.insert(out, "<!-- Generated stuff begins -->")
-	table.insert(out, "<Files>")
-	
-	-- Build the data.
-	addfolder(module, t.modules[module], out)
-	
-	table.insert(out, "</Files>")
-	table.insert(out, "<!-- Generated stuff ends -->")
-	
-	-- Insert into file.
-	data = string.gsub(data, "{FILES}", table.concat(out, "\n"))
-	
-	-- Write the file.
-	f = io.open(outfile, "w")
-	f:write(data)
-	io.close(f)
-end
-
-t = traverse("../../src")
-
-print("")
-print("------------------")
-print("")
-
-function printr(t, tab)
-	if not tab then tab = 0 end
-	for i,v in pairs(t) do
-		if type(v) == "table" then
-			print(string.rep("\t", tab)..i.." => {")
-			printr(v, tab+1)
-			print(string.rep("\t", tab).."}")
-		else
-			print(string.rep("\t", tab)..i.." => " .. v)
-		end
-	end
-end
-
---printr(t)
-
-local mods = {
-	"audio",
-	"event",
-	"filesystem",
-	"font",
-	"graphics",
-	"image",
-	"joystick",
-	"keyboard",
-	"mouse",
-	"native",
-	"physics",
-	"sound",
-	"timer",
-}
-
-for i,v in ipairs(mods) do
-	update(v, t)
-end

+ 0 - 355
platform/msvc2008/graphics.vcproj

@@ -1,355 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="graphics"
-	ProjectGUID="{997E4E23-3ADA-7DC0-272E-AD605DAA78C1}"
-	RootNamespace="graphics"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="include;../../src;../../src/modules;include/SDL"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;GRAPHICS_EXPORTS;"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="lua5.1.lib SDL.lib freetype.lib opengl32.lib"
-				OutputFile="$(OutDir)\love\$(ProjectName).dll"
-				LinkIncremental="2"
-				AdditionalLibraryDirectories="lib"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="include;../../src;../../src/modules;include/SDL"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;GRAPHICS_EXPORTS;"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="lua5.1.lib SDL.lib freetype.lib opengl32.lib"
-				OutputFile="$(OutDir)\love\$(ProjectName).dll"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="lib"
-				GenerateDebugInformation="false"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-
-<!-- Generated stuff begins -->
-<Files>
-<File RelativePath="..\..\src\modules\graphics\Drawable.cpp">
-<FileConfiguration Name="Debug|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\graphics\" />
-</FileConfiguration>
-<FileConfiguration Name="Release|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\graphics\" />
-</FileConfiguration>
-</File>
-<File RelativePath="..\..\src\modules\graphics\Drawable.h">
-</File>
-<File RelativePath="..\..\src\modules\graphics\Graphics.h">
-</File>
-<File RelativePath="..\..\src\modules\graphics\Image.h">
-</File>
-<File RelativePath="..\..\src\modules\graphics\Volatile.cpp">
-<FileConfiguration Name="Debug|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\graphics\" />
-</FileConfiguration>
-<FileConfiguration Name="Release|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\graphics\" />
-</FileConfiguration>
-</File>
-<File RelativePath="..\..\src\modules\graphics\Volatile.h">
-</File>
-
-<Filter Name="opengl">
-<File RelativePath="..\..\src\modules\graphics\opengl\Font.cpp">
-<FileConfiguration Name="Debug|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\graphics\opengl\" />
-</FileConfiguration>
-<FileConfiguration Name="Release|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\graphics\opengl\" />
-</FileConfiguration>
-</File>
-<File RelativePath="..\..\src\modules\graphics\opengl\Font.h">
-</File>
-<File RelativePath="..\..\src\modules\graphics\opengl\Frame.cpp">
-<FileConfiguration Name="Debug|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\graphics\opengl\" />
-</FileConfiguration>
-<FileConfiguration Name="Release|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\graphics\opengl\" />
-</FileConfiguration>
-</File>
-<File RelativePath="..\..\src\modules\graphics\opengl\Frame.h">
-</File>
-<File RelativePath="..\..\src\modules\graphics\opengl\GLee.c">
-</File>
-<File RelativePath="..\..\src\modules\graphics\opengl\GLee.h">
-</File>
-<File RelativePath="..\..\src\modules\graphics\opengl\Glyph.cpp">
-<FileConfiguration Name="Debug|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\graphics\opengl\" />
-</FileConfiguration>
-<FileConfiguration Name="Release|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\graphics\opengl\" />
-</FileConfiguration>
-</File>
-<File RelativePath="..\..\src\modules\graphics\opengl\Glyph.h">
-</File>
-<File RelativePath="..\..\src\modules\graphics\opengl\Graphics.cpp">
-<FileConfiguration Name="Debug|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\graphics\opengl\" />
-</FileConfiguration>
-<FileConfiguration Name="Release|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\graphics\opengl\" />
-</FileConfiguration>
-</File>
-<File RelativePath="..\..\src\modules\graphics\opengl\Graphics.h">
-</File>
-<File RelativePath="..\..\src\modules\graphics\opengl\Image.cpp">
-<FileConfiguration Name="Debug|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\graphics\opengl\" />
-</FileConfiguration>
-<FileConfiguration Name="Release|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\graphics\opengl\" />
-</FileConfiguration>
-</File>
-<File RelativePath="..\..\src\modules\graphics\opengl\Image.h">
-</File>
-<File RelativePath="..\..\src\modules\graphics\opengl\ImageFont.cpp">
-<FileConfiguration Name="Debug|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\graphics\opengl\" />
-</FileConfiguration>
-<FileConfiguration Name="Release|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\graphics\opengl\" />
-</FileConfiguration>
-</File>
-<File RelativePath="..\..\src\modules\graphics\opengl\ImageFont.h">
-</File>
-<File RelativePath="..\..\src\modules\graphics\opengl\SpriteBatch.cpp">
-<FileConfiguration Name="Debug|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\graphics\opengl\" />
-</FileConfiguration>
-<FileConfiguration Name="Release|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\graphics\opengl\" />
-</FileConfiguration>
-</File>
-<File RelativePath="..\..\src\modules\graphics\opengl\SpriteBatch.h">
-</File>
-<File RelativePath="..\..\src\modules\graphics\opengl\TrueTypeFont.cpp">
-<FileConfiguration Name="Debug|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\graphics\opengl\" />
-</FileConfiguration>
-<FileConfiguration Name="Release|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\graphics\opengl\" />
-</FileConfiguration>
-</File>
-<File RelativePath="..\..\src\modules\graphics\opengl\TrueTypeFont.h">
-</File>
-<File RelativePath="..\..\src\modules\graphics\opengl\wrap_Font.cpp">
-<FileConfiguration Name="Debug|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\graphics\opengl\" />
-</FileConfiguration>
-<FileConfiguration Name="Release|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\graphics\opengl\" />
-</FileConfiguration>
-</File>
-<File RelativePath="..\..\src\modules\graphics\opengl\wrap_Font.h">
-</File>
-<File RelativePath="..\..\src\modules\graphics\opengl\wrap_Frame.cpp">
-<FileConfiguration Name="Debug|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\graphics\opengl\" />
-</FileConfiguration>
-<FileConfiguration Name="Release|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\graphics\opengl\" />
-</FileConfiguration>
-</File>
-<File RelativePath="..\..\src\modules\graphics\opengl\wrap_Frame.h">
-</File>
-<File RelativePath="..\..\src\modules\graphics\opengl\wrap_Glyph.cpp">
-<FileConfiguration Name="Debug|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\graphics\opengl\" />
-</FileConfiguration>
-<FileConfiguration Name="Release|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\graphics\opengl\" />
-</FileConfiguration>
-</File>
-<File RelativePath="..\..\src\modules\graphics\opengl\wrap_Glyph.h">
-</File>
-<File RelativePath="..\..\src\modules\graphics\opengl\wrap_Graphics.cpp">
-<FileConfiguration Name="Debug|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\graphics\opengl\" />
-</FileConfiguration>
-<FileConfiguration Name="Release|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\graphics\opengl\" />
-</FileConfiguration>
-</File>
-<File RelativePath="..\..\src\modules\graphics\opengl\wrap_Graphics.h">
-</File>
-<File RelativePath="..\..\src\modules\graphics\opengl\wrap_Image.cpp">
-<FileConfiguration Name="Debug|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\graphics\opengl\" />
-</FileConfiguration>
-<FileConfiguration Name="Release|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\graphics\opengl\" />
-</FileConfiguration>
-</File>
-<File RelativePath="..\..\src\modules\graphics\opengl\wrap_Image.h">
-</File>
-<File RelativePath="..\..\src\modules\graphics\opengl\wrap_SpriteBatch.cpp">
-<FileConfiguration Name="Debug|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\graphics\opengl\" />
-</FileConfiguration>
-<FileConfiguration Name="Release|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\graphics\opengl\" />
-</FileConfiguration>
-</File>
-<File RelativePath="..\..\src\modules\graphics\opengl\wrap_SpriteBatch.h">
-</File>
-</Filter>
-
-</Files>
-<!-- Generated stuff ends -->
-	
-	<Globals>
-	</Globals>
-</VisualStudioProject>

+ 460 - 0
platform/msvc2008/graphics/graphics.vcproj

@@ -0,0 +1,460 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9,00"
+	Name="graphics"
+	ProjectGUID="{8A97E9E7-8C48-4C33-A3ED-31487FE58E9E}"
+	RootNamespace="graphics"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="196613"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="2"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="../include;../../../src;../../../src/modules;../include/SDL"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;GRAPHICS_EXPORTS"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="opengl32.lib glu32.lib SDL.lib freetype.lib"
+				OutputFile="$(OutDir)\love\$(ProjectName).dll"
+				LinkIncremental="2"
+				AdditionalLibraryDirectories="..\lib"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="2"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				EnableIntrinsicFunctions="true"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;GRAPHICS_EXPORTS"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="opengl"
+			>
+			<File
+				RelativePath="..\..\..\src\modules\graphics\opengl\Font.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)\graphics\opengl\"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\graphics\opengl\Font.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\graphics\opengl\Frame.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)\graphics\opengl\"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\graphics\opengl\Frame.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\graphics\opengl\GLee.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)\graphics\opengl\"
+						WarningLevel="0"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\graphics\opengl\GLee.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\graphics\opengl\Glyph.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)\graphics\opengl\"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\graphics\opengl\Glyph.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\graphics\opengl\Graphics.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)\graphics\opengl\"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\graphics\opengl\Graphics.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\graphics\opengl\Image.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)\graphics\opengl\"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\graphics\opengl\Image.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\graphics\opengl\ImageFont.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)\graphics\opengl\"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\graphics\opengl\ImageFont.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\graphics\opengl\SpriteBatch.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)\graphics\opengl\"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\graphics\opengl\SpriteBatch.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\graphics\opengl\TrueTypeFont.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)\graphics\opengl\"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\graphics\opengl\TrueTypeFont.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\graphics\opengl\wrap_Font.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)\graphics\opengl\"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\graphics\opengl\wrap_Font.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\graphics\opengl\wrap_Frame.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)\graphics\opengl\"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\graphics\opengl\wrap_Frame.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\graphics\opengl\wrap_Glyph.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)\graphics\opengl\"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\graphics\opengl\wrap_Glyph.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\graphics\opengl\wrap_Graphics.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)\graphics\opengl\"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\graphics\opengl\wrap_Graphics.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\graphics\opengl\wrap_Image.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)\graphics\opengl\"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\graphics\opengl\wrap_Image.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\graphics\opengl\wrap_SpriteBatch.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)\graphics\opengl\"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\graphics\opengl\wrap_SpriteBatch.h"
+				>
+			</File>
+		</Filter>
+		<File
+			RelativePath="..\..\..\src\modules\graphics\Drawable.cpp"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					ObjectFile="$(IntDir)\graphics\"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\..\src\modules\graphics\Drawable.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\..\src\modules\graphics\Graphics.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\..\src\modules\graphics\Image.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\..\src\modules\graphics\Volatile.cpp"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					ObjectFile="$(IntDir)\graphics\"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\..\src\modules\graphics\Volatile.h"
+			>
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>

+ 0 - 239
platform/msvc2008/image.vcproj

@@ -1,239 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="image"
-	ProjectGUID="{E7C66EE0-27CA-CB59-843C-D22A74FBF081}"
-	RootNamespace="image"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="include;../../src;../../src/modules;"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;IMAGE_EXPORTS;"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="lua5.1.lib DevIL.lib"
-				OutputFile="$(OutDir)\love\$(ProjectName).dll"
-				LinkIncremental="2"
-				AdditionalLibraryDirectories="lib"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="include;../../src;../../src/modules;"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;IMAGE_EXPORTS;"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="lua5.1.lib DevIL.lib"
-				OutputFile="$(OutDir)\love\$(ProjectName).dll"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="lib"
-				GenerateDebugInformation="false"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-
-<!-- Generated stuff begins -->
-<Files>
-<File RelativePath="..\..\src\modules\image\Image.h">
-</File>
-<File RelativePath="..\..\src\modules\image\ImageData.cpp">
-<FileConfiguration Name="Debug|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\image\" />
-</FileConfiguration>
-<FileConfiguration Name="Release|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\image\" />
-</FileConfiguration>
-</File>
-<File RelativePath="..\..\src\modules\image\ImageData.h">
-</File>
-<File RelativePath="..\..\src\modules\image\wrap_Image.cpp">
-<FileConfiguration Name="Debug|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\image\" />
-</FileConfiguration>
-<FileConfiguration Name="Release|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\image\" />
-</FileConfiguration>
-</File>
-<File RelativePath="..\..\src\modules\image\wrap_Image.h">
-</File>
-<File RelativePath="..\..\src\modules\image\wrap_ImageData.cpp">
-<FileConfiguration Name="Debug|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\image\" />
-</FileConfiguration>
-<FileConfiguration Name="Release|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\image\" />
-</FileConfiguration>
-</File>
-<File RelativePath="..\..\src\modules\image\wrap_ImageData.h">
-</File>
-
-<Filter Name="devil">
-<File RelativePath="..\..\src\modules\image\devil\Image.cpp">
-<FileConfiguration Name="Debug|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\image\devil\" />
-</FileConfiguration>
-<FileConfiguration Name="Release|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\image\devil\" />
-</FileConfiguration>
-</File>
-<File RelativePath="..\..\src\modules\image\devil\Image.h">
-</File>
-<File RelativePath="..\..\src\modules\image\devil\ImageData.cpp">
-<FileConfiguration Name="Debug|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\image\devil\" />
-</FileConfiguration>
-<FileConfiguration Name="Release|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\image\devil\" />
-</FileConfiguration>
-</File>
-<File RelativePath="..\..\src\modules\image\devil\ImageData.h">
-</File>
-</Filter>
-
-</Files>
-<!-- Generated stuff ends -->
-	
-	<Globals>
-	</Globals>
-</VisualStudioProject>

+ 263 - 0
platform/msvc2008/image/image.vcproj

@@ -0,0 +1,263 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9,00"
+	Name="image"
+	ProjectGUID="{55F35AEA-2D84-4A39-BF98-505106A15FF7}"
+	RootNamespace="image"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="196613"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="2"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="../include;../../../src;../../../src/modules"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;IMAGE_EXPORTS"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="lua5.1.lib DevIL.lib"
+				OutputFile="$(OutDir)\love\$(ProjectName).dll"
+				LinkIncremental="2"
+				AdditionalLibraryDirectories="..\lib"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="2"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				EnableIntrinsicFunctions="true"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;IMAGE_EXPORTS"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="devil"
+			>
+			<File
+				RelativePath="..\..\..\src\modules\image\devil\Image.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)\image\devil\"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\image\devil\Image.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\image\devil\ImageData.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)\image\devil\"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\image\devil\ImageData.h"
+				>
+			</File>
+		</Filter>
+		<File
+			RelativePath="..\..\..\src\modules\image\Image.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\..\src\modules\image\ImageData.cpp"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					ObjectFile="$(IntDir)\image\"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\..\src\modules\image\ImageData.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\..\src\modules\image\wrap_Image.cpp"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					ObjectFile="$(IntDir)\image\"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\..\src\modules\image\wrap_Image.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\..\src\modules\image\wrap_ImageData.cpp"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					ObjectFile="$(IntDir)\image\"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\..\src\modules\image\wrap_ImageData.h"
+			>
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>

+ 49 - 43
platform/msvc2008/joystick.vcproj → platform/msvc2008/joystick/joystick.vcproj

@@ -3,7 +3,7 @@
 	ProjectType="Visual C++"
 	Version="9,00"
 	Name="joystick"
-	ProjectGUID="{3DEEF125-C64B-88DB-B874-E03C54BF6ED4}"
+	ProjectGUID="{C6C174AC-B339-4A39-A353-CFF523327B53}"
 	RootNamespace="joystick"
 	Keyword="Win32Proj"
 	TargetFrameworkVersion="196613"
@@ -41,8 +41,8 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="include;../../src;../../src/modules;include/SDL"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;JOYSTICK_EXPORTS;"
+				AdditionalIncludeDirectories="../include;../../../src;../../../src/modules;../include/SDL"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;EVENT_EXPORTS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -64,7 +64,7 @@
 				AdditionalDependencies="lua5.1.lib SDL.lib"
 				OutputFile="$(OutDir)\love\$(ProjectName).dll"
 				LinkIncremental="2"
-				AdditionalLibraryDirectories="lib"
+				AdditionalLibraryDirectories="..\lib"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				TargetMachine="1"
@@ -118,9 +118,8 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="include;../../src;../../src/modules;include/SDL"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;JOYSTICK_EXPORTS;"
-				RuntimeLibrary="0"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;EVENT_EXPORTS"
+				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@@ -137,11 +136,8 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="lua5.1.lib SDL.lib"
-				OutputFile="$(OutDir)\love\$(ProjectName).dll"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="lib"
-				GenerateDebugInformation="false"
+				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
@@ -172,38 +168,48 @@
 	</Configurations>
 	<References>
 	</References>
-
-<!-- Generated stuff begins -->
-<Files>
-<File RelativePath="..\..\src\modules\joystick\Joystick.h">
-</File>
-
-<Filter Name="sdl">
-<File RelativePath="..\..\src\modules\joystick\sdl\Joystick.cpp">
-<FileConfiguration Name="Debug|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\joystick\sdl\" />
-</FileConfiguration>
-<FileConfiguration Name="Release|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\joystick\sdl\" />
-</FileConfiguration>
-</File>
-<File RelativePath="..\..\src\modules\joystick\sdl\Joystick.h">
-</File>
-<File RelativePath="..\..\src\modules\joystick\sdl\wrap_Joystick.cpp">
-<FileConfiguration Name="Debug|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\joystick\sdl\" />
-</FileConfiguration>
-<FileConfiguration Name="Release|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\joystick\sdl\" />
-</FileConfiguration>
-</File>
-<File RelativePath="..\..\src\modules\joystick\sdl\wrap_Joystick.h">
-</File>
-</Filter>
-
-</Files>
-<!-- Generated stuff ends -->
-	
+	<Files>
+		<Filter
+			Name="sdl"
+			>
+			<File
+				RelativePath="..\..\..\src\modules\joystick\sdl\Joystick.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)\joystick\sdl\"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\joystick\sdl\Joystick.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\joystick\sdl\wrap_Joystick.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)\joystick\sdl\"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\joystick\sdl\wrap_Joystick.h"
+				>
+			</File>
+		</Filter>
+		<File
+			RelativePath="..\..\..\src\modules\joystick\Joystick.h"
+			>
+		</File>
+	</Files>
 	<Globals>
 	</Globals>
 </VisualStudioProject>

+ 49 - 43
platform/msvc2008/keyboard.vcproj → platform/msvc2008/keyboard/keyboard.vcproj

@@ -3,7 +3,7 @@
 	ProjectType="Visual C++"
 	Version="9,00"
 	Name="keyboard"
-	ProjectGUID="{4D206ABC-7DBF-7BD9-E1A6-DB4B482A6594}"
+	ProjectGUID="{F84CE42B-BBA4-4E32-824B-1F2CAD9236C3}"
 	RootNamespace="keyboard"
 	Keyword="Win32Proj"
 	TargetFrameworkVersion="196613"
@@ -41,8 +41,8 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="include;../../src;../../src/modules;include/SDL"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;KEYBOARD_EXPORTS;"
+				AdditionalIncludeDirectories="../include;../../../src;../../../src/modules;../include/SDL"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;KEYBOARD_EXPORTS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -64,7 +64,7 @@
 				AdditionalDependencies="lua5.1.lib SDL.lib"
 				OutputFile="$(OutDir)\love\$(ProjectName).dll"
 				LinkIncremental="2"
-				AdditionalLibraryDirectories="lib"
+				AdditionalLibraryDirectories="..\lib"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				TargetMachine="1"
@@ -118,9 +118,8 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="include;../../src;../../src/modules;include/SDL"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;KEYBOARD_EXPORTS;"
-				RuntimeLibrary="0"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;KEYBOARD_EXPORTS"
+				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@@ -137,11 +136,8 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="lua5.1.lib SDL.lib"
-				OutputFile="$(OutDir)\love\$(ProjectName).dll"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="lib"
-				GenerateDebugInformation="false"
+				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
@@ -172,38 +168,48 @@
 	</Configurations>
 	<References>
 	</References>
-
-<!-- Generated stuff begins -->
-<Files>
-<File RelativePath="..\..\src\modules\keyboard\Keyboard.h">
-</File>
-
-<Filter Name="sdl">
-<File RelativePath="..\..\src\modules\keyboard\sdl\Keyboard.cpp">
-<FileConfiguration Name="Debug|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\keyboard\sdl\" />
-</FileConfiguration>
-<FileConfiguration Name="Release|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\keyboard\sdl\" />
-</FileConfiguration>
-</File>
-<File RelativePath="..\..\src\modules\keyboard\sdl\Keyboard.h">
-</File>
-<File RelativePath="..\..\src\modules\keyboard\sdl\wrap_Keyboard.cpp">
-<FileConfiguration Name="Debug|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\keyboard\sdl\" />
-</FileConfiguration>
-<FileConfiguration Name="Release|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\keyboard\sdl\" />
-</FileConfiguration>
-</File>
-<File RelativePath="..\..\src\modules\keyboard\sdl\wrap_Keyboard.h">
-</File>
-</Filter>
-
-</Files>
-<!-- Generated stuff ends -->
-	
+	<Files>
+		<Filter
+			Name="sdl"
+			>
+			<File
+				RelativePath="..\..\..\src\modules\keyboard\sdl\Keyboard.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)\keyboard\sdlkeyboard\"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\keyboard\sdl\Keyboard.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\keyboard\sdl\wrap_Keyboard.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)\keyboard\sdlkeyboard\"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\keyboard\sdl\wrap_Keyboard.h"
+				>
+			</File>
+		</Filter>
+		<File
+			RelativePath="..\..\..\src\modules\keyboard\Keyboard.h"
+			>
+		</File>
+	</Files>
 	<Globals>
 	</Globals>
 </VisualStudioProject>

+ 73 - 79
platform/msvc2008/love.sln

@@ -1,152 +1,146 @@
 
 Microsoft Visual Studio Solution File, Format Version 10.00
 # Visual C++ Express 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "audio", "audio.vcproj", "{748D2825-CD99-2CE1-5460-82B2C74017F3}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "audio", "audio\audio.vcproj", "{1E405CDD-5FD7-42E0-BCF1-147305DA3EA0}"
 	ProjectSection(ProjectDependencies) = postProject
 		{8273822F-45A4-4BE3-82F3-B8B3223C578C} = {8273822F-45A4-4BE3-82F3-B8B3223C578C}
+		{3D59D1E2-2682-4317-BB8D-D85E9BBC02E3} = {3D59D1E2-2682-4317-BB8D-D85E9BBC02E3}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "common", "common.vcproj", "{8273822F-45A4-4BE3-82F3-B8B3223C578C}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "common", "common\common.vcproj", "{8273822F-45A4-4BE3-82F3-B8B3223C578C}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "filesystem", "filesystem.vcproj", "{CBAD7A48-38A2-A59C-94DF-610079E1BF09}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "filesystem", "filesystem\filesystem.vcproj", "{0A2BDA60-43BB-4837-921A-2E4955FD8AEC}"
 	ProjectSection(ProjectDependencies) = postProject
 		{8273822F-45A4-4BE3-82F3-B8B3223C578C} = {8273822F-45A4-4BE3-82F3-B8B3223C578C}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "event", "event.vcproj", "{BFE86F17-5EDC-6666-E655-9FDF3BFC78DE}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "event", "event\event.vcproj", "{62C66448-36CB-4350-9D6E-02F49F05EDB4}"
 	ProjectSection(ProjectDependencies) = postProject
 		{8273822F-45A4-4BE3-82F3-B8B3223C578C} = {8273822F-45A4-4BE3-82F3-B8B3223C578C}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "font", "font.vcproj", "{4ECA919A-7534-771E-6F96-A2E081696733}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "image", "image\image.vcproj", "{55F35AEA-2D84-4A39-BF98-505106A15FF7}"
 	ProjectSection(ProjectDependencies) = postProject
 		{8273822F-45A4-4BE3-82F3-B8B3223C578C} = {8273822F-45A4-4BE3-82F3-B8B3223C578C}
-		{CBAD7A48-38A2-A59C-94DF-610079E1BF09} = {CBAD7A48-38A2-A59C-94DF-610079E1BF09}
+		{0A2BDA60-43BB-4837-921A-2E4955FD8AEC} = {0A2BDA60-43BB-4837-921A-2E4955FD8AEC}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "image", "image.vcproj", "{E7C66EE0-27CA-CB59-843C-D22A74FBF081}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "joystick", "joystick\joystick.vcproj", "{C6C174AC-B339-4A39-A353-CFF523327B53}"
 	ProjectSection(ProjectDependencies) = postProject
 		{8273822F-45A4-4BE3-82F3-B8B3223C578C} = {8273822F-45A4-4BE3-82F3-B8B3223C578C}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "joystick", "joystick.vcproj", "{3DEEF125-C64B-88DB-B874-E03C54BF6ED4}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "keyboard", "keyboard\keyboard.vcproj", "{F84CE42B-BBA4-4E32-824B-1F2CAD9236C3}"
 	ProjectSection(ProjectDependencies) = postProject
 		{8273822F-45A4-4BE3-82F3-B8B3223C578C} = {8273822F-45A4-4BE3-82F3-B8B3223C578C}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "keyboard", "keyboard.vcproj", "{4D206ABC-7DBF-7BD9-E1A6-DB4B482A6594}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lua", "lua\lua.vcproj", "{892D9BD8-F38E-40BC-B4E1-FAEBD59AECDE}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mouse", "mouse\mouse.vcproj", "{88881251-6818-485E-A262-DE1283096589}"
 	ProjectSection(ProjectDependencies) = postProject
 		{8273822F-45A4-4BE3-82F3-B8B3223C578C} = {8273822F-45A4-4BE3-82F3-B8B3223C578C}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mouse", "mouse.vcproj", "{90A56CF7-4A89-4192-1781-088524DE0821}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "native", "native\native.vcproj", "{CCAD89EC-2C3C-4F69-BF71-D9DA230FE109}"
 	ProjectSection(ProjectDependencies) = postProject
 		{8273822F-45A4-4BE3-82F3-B8B3223C578C} = {8273822F-45A4-4BE3-82F3-B8B3223C578C}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "native", "native.vcproj", "{7DB2DEFC-2719-36B7-ECD5-F18CC7098E90}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "physics", "physics\physics.vcproj", "{39CDF8C8-016D-423E-94BA-7DD798CF0E15}"
 	ProjectSection(ProjectDependencies) = postProject
 		{8273822F-45A4-4BE3-82F3-B8B3223C578C} = {8273822F-45A4-4BE3-82F3-B8B3223C578C}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "physics", "physics.vcproj", "{02BEFB19-AACF-9B73-CE6E-9FA8BB4B714F}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sound", "sound\sound.vcproj", "{3D59D1E2-2682-4317-BB8D-D85E9BBC02E3}"
 	ProjectSection(ProjectDependencies) = postProject
 		{8273822F-45A4-4BE3-82F3-B8B3223C578C} = {8273822F-45A4-4BE3-82F3-B8B3223C578C}
+		{0A2BDA60-43BB-4837-921A-2E4955FD8AEC} = {0A2BDA60-43BB-4837-921A-2E4955FD8AEC}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "graphics", "graphics.vcproj", "{997E4E23-3ADA-7DC0-272E-AD605DAA78C1}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "timer", "timer\timer.vcproj", "{3DFF2849-C47D-4251-B2AC-E60EDBC29511}"
 	ProjectSection(ProjectDependencies) = postProject
 		{8273822F-45A4-4BE3-82F3-B8B3223C578C} = {8273822F-45A4-4BE3-82F3-B8B3223C578C}
-		{4ECA919A-7534-771E-6F96-A2E081696733} = {4ECA919A-7534-771E-6F96-A2E081696733}
-		{E7C66EE0-27CA-CB59-843C-D22A74FBF081} = {E7C66EE0-27CA-CB59-843C-D22A74FBF081}
-		{CBAD7A48-38A2-A59C-94DF-610079E1BF09} = {CBAD7A48-38A2-A59C-94DF-610079E1BF09}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sound", "sound.vcproj", "{1ADE4D43-4F17-3395-1427-E19944F1AE41}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "graphics", "graphics\graphics.vcproj", "{8A97E9E7-8C48-4C33-A3ED-31487FE58E9E}"
 	ProjectSection(ProjectDependencies) = postProject
 		{8273822F-45A4-4BE3-82F3-B8B3223C578C} = {8273822F-45A4-4BE3-82F3-B8B3223C578C}
-		{CBAD7A48-38A2-A59C-94DF-610079E1BF09} = {CBAD7A48-38A2-A59C-94DF-610079E1BF09}
+		{55F35AEA-2D84-4A39-BF98-505106A15FF7} = {55F35AEA-2D84-4A39-BF98-505106A15FF7}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "timer", "timer.vcproj", "{49828534-328F-F253-C0DA-85A691B4312E}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "font", "font\font.vcproj", "{0E3ACF52-EEB5-4E35-8631-43B3E9F4577E}"
 	ProjectSection(ProjectDependencies) = postProject
 		{8273822F-45A4-4BE3-82F3-B8B3223C578C} = {8273822F-45A4-4BE3-82F3-B8B3223C578C}
+		{0A2BDA60-43BB-4837-921A-2E4955FD8AEC} = {0A2BDA60-43BB-4837-921A-2E4955FD8AEC}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lua", "lua.vcproj", "{892D9BD8-F38E-40BC-B4E1-FAEBD59AECDE}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "love", "love.vcproj", "{F2FDC53D-1ECD-4CF1-BA3F-3E59A2484DB9}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
 		Release|Win32 = Release|Win32
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{748D2825-CD99-2CE1-5460-82B2C74017F3}.Debug|Win32.ActiveCfg = Debug|Win32
-		{748D2825-CD99-2CE1-5460-82B2C74017F3}.Debug|Win32.Build.0 = Debug|Win32
-		{748D2825-CD99-2CE1-5460-82B2C74017F3}.Release|Win32.ActiveCfg = Release|Win32
-		{748D2825-CD99-2CE1-5460-82B2C74017F3}.Release|Win32.Build.0 = Release|Win32
+		{1E405CDD-5FD7-42E0-BCF1-147305DA3EA0}.Debug|Win32.ActiveCfg = Debug|Win32
+		{1E405CDD-5FD7-42E0-BCF1-147305DA3EA0}.Debug|Win32.Build.0 = Debug|Win32
+		{1E405CDD-5FD7-42E0-BCF1-147305DA3EA0}.Release|Win32.ActiveCfg = Release|Win32
+		{1E405CDD-5FD7-42E0-BCF1-147305DA3EA0}.Release|Win32.Build.0 = Release|Win32
 		{8273822F-45A4-4BE3-82F3-B8B3223C578C}.Debug|Win32.ActiveCfg = Debug|Win32
 		{8273822F-45A4-4BE3-82F3-B8B3223C578C}.Debug|Win32.Build.0 = Debug|Win32
 		{8273822F-45A4-4BE3-82F3-B8B3223C578C}.Release|Win32.ActiveCfg = Release|Win32
 		{8273822F-45A4-4BE3-82F3-B8B3223C578C}.Release|Win32.Build.0 = Release|Win32
-		{CBAD7A48-38A2-A59C-94DF-610079E1BF09}.Debug|Win32.ActiveCfg = Debug|Win32
-		{CBAD7A48-38A2-A59C-94DF-610079E1BF09}.Debug|Win32.Build.0 = Debug|Win32
-		{CBAD7A48-38A2-A59C-94DF-610079E1BF09}.Release|Win32.ActiveCfg = Release|Win32
-		{CBAD7A48-38A2-A59C-94DF-610079E1BF09}.Release|Win32.Build.0 = Release|Win32
-		{BFE86F17-5EDC-6666-E655-9FDF3BFC78DE}.Debug|Win32.ActiveCfg = Debug|Win32
-		{BFE86F17-5EDC-6666-E655-9FDF3BFC78DE}.Debug|Win32.Build.0 = Debug|Win32
-		{BFE86F17-5EDC-6666-E655-9FDF3BFC78DE}.Release|Win32.ActiveCfg = Release|Win32
-		{BFE86F17-5EDC-6666-E655-9FDF3BFC78DE}.Release|Win32.Build.0 = Release|Win32
-		{4ECA919A-7534-771E-6F96-A2E081696733}.Debug|Win32.ActiveCfg = Debug|Win32
-		{4ECA919A-7534-771E-6F96-A2E081696733}.Debug|Win32.Build.0 = Debug|Win32
-		{4ECA919A-7534-771E-6F96-A2E081696733}.Release|Win32.ActiveCfg = Release|Win32
-		{4ECA919A-7534-771E-6F96-A2E081696733}.Release|Win32.Build.0 = Release|Win32
-		{E7C66EE0-27CA-CB59-843C-D22A74FBF081}.Debug|Win32.ActiveCfg = Debug|Win32
-		{E7C66EE0-27CA-CB59-843C-D22A74FBF081}.Debug|Win32.Build.0 = Debug|Win32
-		{E7C66EE0-27CA-CB59-843C-D22A74FBF081}.Release|Win32.ActiveCfg = Release|Win32
-		{E7C66EE0-27CA-CB59-843C-D22A74FBF081}.Release|Win32.Build.0 = Release|Win32
-		{3DEEF125-C64B-88DB-B874-E03C54BF6ED4}.Debug|Win32.ActiveCfg = Debug|Win32
-		{3DEEF125-C64B-88DB-B874-E03C54BF6ED4}.Debug|Win32.Build.0 = Debug|Win32
-		{3DEEF125-C64B-88DB-B874-E03C54BF6ED4}.Release|Win32.ActiveCfg = Release|Win32
-		{3DEEF125-C64B-88DB-B874-E03C54BF6ED4}.Release|Win32.Build.0 = Release|Win32
-		{4D206ABC-7DBF-7BD9-E1A6-DB4B482A6594}.Debug|Win32.ActiveCfg = Debug|Win32
-		{4D206ABC-7DBF-7BD9-E1A6-DB4B482A6594}.Debug|Win32.Build.0 = Debug|Win32
-		{4D206ABC-7DBF-7BD9-E1A6-DB4B482A6594}.Release|Win32.ActiveCfg = Release|Win32
-		{4D206ABC-7DBF-7BD9-E1A6-DB4B482A6594}.Release|Win32.Build.0 = Release|Win32
-		{90A56CF7-4A89-4192-1781-088524DE0821}.Debug|Win32.ActiveCfg = Debug|Win32
-		{90A56CF7-4A89-4192-1781-088524DE0821}.Debug|Win32.Build.0 = Debug|Win32
-		{90A56CF7-4A89-4192-1781-088524DE0821}.Release|Win32.ActiveCfg = Release|Win32
-		{90A56CF7-4A89-4192-1781-088524DE0821}.Release|Win32.Build.0 = Release|Win32
-		{7DB2DEFC-2719-36B7-ECD5-F18CC7098E90}.Debug|Win32.ActiveCfg = Debug|Win32
-		{7DB2DEFC-2719-36B7-ECD5-F18CC7098E90}.Debug|Win32.Build.0 = Debug|Win32
-		{7DB2DEFC-2719-36B7-ECD5-F18CC7098E90}.Release|Win32.ActiveCfg = Release|Win32
-		{7DB2DEFC-2719-36B7-ECD5-F18CC7098E90}.Release|Win32.Build.0 = Release|Win32
-		{02BEFB19-AACF-9B73-CE6E-9FA8BB4B714F}.Debug|Win32.ActiveCfg = Debug|Win32
-		{02BEFB19-AACF-9B73-CE6E-9FA8BB4B714F}.Debug|Win32.Build.0 = Debug|Win32
-		{02BEFB19-AACF-9B73-CE6E-9FA8BB4B714F}.Release|Win32.ActiveCfg = Release|Win32
-		{02BEFB19-AACF-9B73-CE6E-9FA8BB4B714F}.Release|Win32.Build.0 = Release|Win32
-		{997E4E23-3ADA-7DC0-272E-AD605DAA78C1}.Debug|Win32.ActiveCfg = Debug|Win32
-		{997E4E23-3ADA-7DC0-272E-AD605DAA78C1}.Debug|Win32.Build.0 = Debug|Win32
-		{997E4E23-3ADA-7DC0-272E-AD605DAA78C1}.Release|Win32.ActiveCfg = Release|Win32
-		{997E4E23-3ADA-7DC0-272E-AD605DAA78C1}.Release|Win32.Build.0 = Release|Win32
-		{1ADE4D43-4F17-3395-1427-E19944F1AE41}.Debug|Win32.ActiveCfg = Debug|Win32
-		{1ADE4D43-4F17-3395-1427-E19944F1AE41}.Debug|Win32.Build.0 = Debug|Win32
-		{1ADE4D43-4F17-3395-1427-E19944F1AE41}.Release|Win32.ActiveCfg = Release|Win32
-		{1ADE4D43-4F17-3395-1427-E19944F1AE41}.Release|Win32.Build.0 = Release|Win32
-		{49828534-328F-F253-C0DA-85A691B4312E}.Debug|Win32.ActiveCfg = Debug|Win32
-		{49828534-328F-F253-C0DA-85A691B4312E}.Debug|Win32.Build.0 = Debug|Win32
-		{49828534-328F-F253-C0DA-85A691B4312E}.Release|Win32.ActiveCfg = Release|Win32
-		{49828534-328F-F253-C0DA-85A691B4312E}.Release|Win32.Build.0 = Release|Win32
+		{0A2BDA60-43BB-4837-921A-2E4955FD8AEC}.Debug|Win32.ActiveCfg = Debug|Win32
+		{0A2BDA60-43BB-4837-921A-2E4955FD8AEC}.Debug|Win32.Build.0 = Debug|Win32
+		{0A2BDA60-43BB-4837-921A-2E4955FD8AEC}.Release|Win32.ActiveCfg = Release|Win32
+		{0A2BDA60-43BB-4837-921A-2E4955FD8AEC}.Release|Win32.Build.0 = Release|Win32
+		{62C66448-36CB-4350-9D6E-02F49F05EDB4}.Debug|Win32.ActiveCfg = Debug|Win32
+		{62C66448-36CB-4350-9D6E-02F49F05EDB4}.Debug|Win32.Build.0 = Debug|Win32
+		{62C66448-36CB-4350-9D6E-02F49F05EDB4}.Release|Win32.ActiveCfg = Release|Win32
+		{62C66448-36CB-4350-9D6E-02F49F05EDB4}.Release|Win32.Build.0 = Release|Win32
+		{55F35AEA-2D84-4A39-BF98-505106A15FF7}.Debug|Win32.ActiveCfg = Debug|Win32
+		{55F35AEA-2D84-4A39-BF98-505106A15FF7}.Debug|Win32.Build.0 = Debug|Win32
+		{55F35AEA-2D84-4A39-BF98-505106A15FF7}.Release|Win32.ActiveCfg = Release|Win32
+		{55F35AEA-2D84-4A39-BF98-505106A15FF7}.Release|Win32.Build.0 = Release|Win32
+		{C6C174AC-B339-4A39-A353-CFF523327B53}.Debug|Win32.ActiveCfg = Debug|Win32
+		{C6C174AC-B339-4A39-A353-CFF523327B53}.Debug|Win32.Build.0 = Debug|Win32
+		{C6C174AC-B339-4A39-A353-CFF523327B53}.Release|Win32.ActiveCfg = Release|Win32
+		{C6C174AC-B339-4A39-A353-CFF523327B53}.Release|Win32.Build.0 = Release|Win32
+		{F84CE42B-BBA4-4E32-824B-1F2CAD9236C3}.Debug|Win32.ActiveCfg = Debug|Win32
+		{F84CE42B-BBA4-4E32-824B-1F2CAD9236C3}.Debug|Win32.Build.0 = Debug|Win32
+		{F84CE42B-BBA4-4E32-824B-1F2CAD9236C3}.Release|Win32.ActiveCfg = Release|Win32
+		{F84CE42B-BBA4-4E32-824B-1F2CAD9236C3}.Release|Win32.Build.0 = Release|Win32
 		{892D9BD8-F38E-40BC-B4E1-FAEBD59AECDE}.Debug|Win32.ActiveCfg = Debug|Win32
 		{892D9BD8-F38E-40BC-B4E1-FAEBD59AECDE}.Debug|Win32.Build.0 = Debug|Win32
 		{892D9BD8-F38E-40BC-B4E1-FAEBD59AECDE}.Release|Win32.ActiveCfg = Release|Win32
 		{892D9BD8-F38E-40BC-B4E1-FAEBD59AECDE}.Release|Win32.Build.0 = Release|Win32
-		{F2FDC53D-1ECD-4CF1-BA3F-3E59A2484DB9}.Debug|Win32.ActiveCfg = Debug|Win32
-		{F2FDC53D-1ECD-4CF1-BA3F-3E59A2484DB9}.Debug|Win32.Build.0 = Debug|Win32
-		{F2FDC53D-1ECD-4CF1-BA3F-3E59A2484DB9}.Release|Win32.ActiveCfg = Release|Win32
-		{F2FDC53D-1ECD-4CF1-BA3F-3E59A2484DB9}.Release|Win32.Build.0 = Release|Win32
+		{88881251-6818-485E-A262-DE1283096589}.Debug|Win32.ActiveCfg = Debug|Win32
+		{88881251-6818-485E-A262-DE1283096589}.Debug|Win32.Build.0 = Debug|Win32
+		{88881251-6818-485E-A262-DE1283096589}.Release|Win32.ActiveCfg = Release|Win32
+		{88881251-6818-485E-A262-DE1283096589}.Release|Win32.Build.0 = Release|Win32
+		{CCAD89EC-2C3C-4F69-BF71-D9DA230FE109}.Debug|Win32.ActiveCfg = Debug|Win32
+		{CCAD89EC-2C3C-4F69-BF71-D9DA230FE109}.Debug|Win32.Build.0 = Debug|Win32
+		{CCAD89EC-2C3C-4F69-BF71-D9DA230FE109}.Release|Win32.ActiveCfg = Release|Win32
+		{CCAD89EC-2C3C-4F69-BF71-D9DA230FE109}.Release|Win32.Build.0 = Release|Win32
+		{39CDF8C8-016D-423E-94BA-7DD798CF0E15}.Debug|Win32.ActiveCfg = Debug|Win32
+		{39CDF8C8-016D-423E-94BA-7DD798CF0E15}.Debug|Win32.Build.0 = Debug|Win32
+		{39CDF8C8-016D-423E-94BA-7DD798CF0E15}.Release|Win32.ActiveCfg = Release|Win32
+		{39CDF8C8-016D-423E-94BA-7DD798CF0E15}.Release|Win32.Build.0 = Release|Win32
+		{3D59D1E2-2682-4317-BB8D-D85E9BBC02E3}.Debug|Win32.ActiveCfg = Debug|Win32
+		{3D59D1E2-2682-4317-BB8D-D85E9BBC02E3}.Debug|Win32.Build.0 = Debug|Win32
+		{3D59D1E2-2682-4317-BB8D-D85E9BBC02E3}.Release|Win32.ActiveCfg = Release|Win32
+		{3D59D1E2-2682-4317-BB8D-D85E9BBC02E3}.Release|Win32.Build.0 = Release|Win32
+		{3DFF2849-C47D-4251-B2AC-E60EDBC29511}.Debug|Win32.ActiveCfg = Debug|Win32
+		{3DFF2849-C47D-4251-B2AC-E60EDBC29511}.Debug|Win32.Build.0 = Debug|Win32
+		{3DFF2849-C47D-4251-B2AC-E60EDBC29511}.Release|Win32.ActiveCfg = Release|Win32
+		{3DFF2849-C47D-4251-B2AC-E60EDBC29511}.Release|Win32.Build.0 = Release|Win32
+		{8A97E9E7-8C48-4C33-A3ED-31487FE58E9E}.Debug|Win32.ActiveCfg = Debug|Win32
+		{8A97E9E7-8C48-4C33-A3ED-31487FE58E9E}.Debug|Win32.Build.0 = Debug|Win32
+		{8A97E9E7-8C48-4C33-A3ED-31487FE58E9E}.Release|Win32.ActiveCfg = Release|Win32
+		{8A97E9E7-8C48-4C33-A3ED-31487FE58E9E}.Release|Win32.Build.0 = Release|Win32
+		{0E3ACF52-EEB5-4E35-8631-43B3E9F4577E}.Debug|Win32.ActiveCfg = Debug|Win32
+		{0E3ACF52-EEB5-4E35-8631-43B3E9F4577E}.Debug|Win32.Build.0 = Debug|Win32
+		{0E3ACF52-EEB5-4E35-8631-43B3E9F4577E}.Release|Win32.ActiveCfg = Release|Win32
+		{0E3ACF52-EEB5-4E35-8631-43B3E9F4577E}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

+ 0 - 0
platform/msvc2008/lua.c → platform/msvc2008/lua/lua.c


+ 3 - 6
platform/msvc2008/lua.vcproj → platform/msvc2008/lua/lua.vcproj

@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="include"
+				AdditionalIncludeDirectories="../include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -63,7 +63,7 @@
 				Name="VCLinkerTool"
 				AdditionalDependencies="lua5.1.lib"
 				LinkIncremental="2"
-				AdditionalLibraryDirectories="lib"
+				AdditionalLibraryDirectories="..\lib"
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				TargetMachine="1"
@@ -117,8 +117,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
@@ -136,9 +135,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="lua5.1.lib"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="lib"
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				OptimizeReferences="2"

+ 49 - 43
platform/msvc2008/mouse.vcproj → platform/msvc2008/mouse/mouse.vcproj

@@ -3,7 +3,7 @@
 	ProjectType="Visual C++"
 	Version="9,00"
 	Name="mouse"
-	ProjectGUID="{90A56CF7-4A89-4192-1781-088524DE0821}"
+	ProjectGUID="{88881251-6818-485E-A262-DE1283096589}"
 	RootNamespace="mouse"
 	Keyword="Win32Proj"
 	TargetFrameworkVersion="196613"
@@ -41,8 +41,8 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="include;../../src;../../src/modules;include/SDL"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;MOUSE_EXPORTS;"
+				AdditionalIncludeDirectories="../include;../../../src;../../../src/modules;../include/SDL"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOUSE_EXPORTS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -64,7 +64,7 @@
 				AdditionalDependencies="lua5.1.lib SDL.lib"
 				OutputFile="$(OutDir)\love\$(ProjectName).dll"
 				LinkIncremental="2"
-				AdditionalLibraryDirectories="lib"
+				AdditionalLibraryDirectories="..\lib"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				TargetMachine="1"
@@ -118,9 +118,8 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="include;../../src;../../src/modules;include/SDL"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;MOUSE_EXPORTS;"
-				RuntimeLibrary="0"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOUSE_EXPORTS"
+				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@@ -137,11 +136,8 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="lua5.1.lib SDL.lib"
-				OutputFile="$(OutDir)\love\$(ProjectName).dll"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="lib"
-				GenerateDebugInformation="false"
+				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
@@ -172,38 +168,48 @@
 	</Configurations>
 	<References>
 	</References>
-
-<!-- Generated stuff begins -->
-<Files>
-<File RelativePath="..\..\src\modules\mouse\Mouse.h">
-</File>
-
-<Filter Name="sdl">
-<File RelativePath="..\..\src\modules\mouse\sdl\Mouse.cpp">
-<FileConfiguration Name="Debug|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\mouse\sdl\" />
-</FileConfiguration>
-<FileConfiguration Name="Release|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\mouse\sdl\" />
-</FileConfiguration>
-</File>
-<File RelativePath="..\..\src\modules\mouse\sdl\Mouse.h">
-</File>
-<File RelativePath="..\..\src\modules\mouse\sdl\wrap_Mouse.cpp">
-<FileConfiguration Name="Debug|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\mouse\sdl\" />
-</FileConfiguration>
-<FileConfiguration Name="Release|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\mouse\sdl\" />
-</FileConfiguration>
-</File>
-<File RelativePath="..\..\src\modules\mouse\sdl\wrap_Mouse.h">
-</File>
-</Filter>
-
-</Files>
-<!-- Generated stuff ends -->
-	
+	<Files>
+		<Filter
+			Name="sdl"
+			>
+			<File
+				RelativePath="..\..\..\src\modules\mouse\sdl\Mouse.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)\mouse\sdlmouse\"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\mouse\sdl\Mouse.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\mouse\sdl\wrap_Mouse.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)\mouse\sdlmouse\"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\mouse\sdl\wrap_Mouse.h"
+				>
+			</File>
+		</Filter>
+		<File
+			RelativePath="..\..\..\src\modules\mouse\Mouse.h"
+			>
+		</File>
+	</Files>
 	<Globals>
 	</Globals>
 </VisualStudioProject>

+ 0 - 217
platform/msvc2008/native.vcproj

@@ -1,217 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="native"
-	ProjectGUID="{7DB2DEFC-2719-36B7-ECD5-F18CC7098E90}"
-	RootNamespace="native"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="include;../../src;../../src/modules;"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;NATIVE_EXPORTS;"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="lua5.1.lib"
-				OutputFile="$(OutDir)\love\$(ProjectName).dll"
-				LinkIncremental="2"
-				AdditionalLibraryDirectories="lib"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="include;../../src;../../src/modules;"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;NATIVE_EXPORTS;"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="lua5.1.lib"
-				OutputFile="$(OutDir)\love\$(ProjectName).dll"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="lib"
-				GenerateDebugInformation="false"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-
-<!-- Generated stuff begins -->
-<Files>
-
-<Filter Name="tcc">
-<File RelativePath="..\..\src\modules\native\tcc\api.c">
-</File>
-<File RelativePath="..\..\src\modules\native\tcc\api.h">
-</File>
-<File RelativePath="..\..\src\modules\native\tcc\Native.cpp">
-<FileConfiguration Name="Debug|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\native\tcc\" />
-</FileConfiguration>
-<FileConfiguration Name="Release|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\native\tcc\" />
-</FileConfiguration>
-</File>
-<File RelativePath="..\..\src\modules\native\tcc\Native.h">
-</File>
-<File RelativePath="..\..\src\modules\native\tcc\wrap_Native.cpp">
-<FileConfiguration Name="Debug|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\native\tcc\" />
-</FileConfiguration>
-<FileConfiguration Name="Release|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\native\tcc\" />
-</FileConfiguration>
-</File>
-<File RelativePath="..\..\src\modules\native\tcc\wrap_Native.h">
-</File>
-
-<Filter Name="libtcc">
-<File RelativePath="..\..\src\modules\native\tcc\libtcc\libtcc.c">
-</File>
-</Filter>
-
-</Filter>
-
-</Files>
-<!-- Generated stuff ends -->
-	
-	<Globals>
-	</Globals>
-</VisualStudioProject>

+ 244 - 0
platform/msvc2008/native/native.vcproj

@@ -0,0 +1,244 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9,00"
+	Name="native"
+	ProjectGUID="{CCAD89EC-2C3C-4F69-BF71-D9DA230FE109}"
+	RootNamespace="native"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="196613"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="2"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="../include;../../../src;../../../src/modules;../include/SDL"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;EVENT_EXPORTS;_CRT_SECURE_NO_WARNINGS"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="lua5.1.lib SDL.lib"
+				OutputFile="$(OutDir)\love\$(ProjectName).dll"
+				LinkIncremental="2"
+				AdditionalLibraryDirectories="..\lib"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="2"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				EnableIntrinsicFunctions="true"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;EVENT_EXPORTS"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="tcc"
+			>
+			<File
+				RelativePath="..\..\..\src\modules\native\tcc\api.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)\native\tcc\"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\native\tcc\api.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\native\tcc\Native.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)\native\tcc\"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\native\tcc\Native.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\native\tcc\wrap_Native.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)\native\tcc\"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\native\tcc\wrap_Native.h"
+				>
+			</File>
+			<Filter
+				Name="libtcc"
+				>
+				<File
+					RelativePath="..\..\..\src\modules\native\tcc\libtcc\libtcc.c"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\native\tcc\libtcc\"
+							WarningLevel="0"
+						/>
+					</FileConfiguration>
+				</File>
+			</Filter>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>

+ 0 - 827
platform/msvc2008/physics.vcproj

@@ -1,827 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="physics"
-	ProjectGUID="{02BEFB19-AACF-9B73-CE6E-9FA8BB4B714F}"
-	RootNamespace="physics"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="include;../../src;../../src/modules;"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;PHYSICS_EXPORTS;"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="lua5.1.lib"
-				OutputFile="$(OutDir)\love\$(ProjectName).dll"
-				LinkIncremental="2"
-				AdditionalLibraryDirectories="lib"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="include;../../src;../../src/modules;"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;PHYSICS_EXPORTS;"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="lua5.1.lib"
-				OutputFile="$(OutDir)\love\$(ProjectName).dll"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="lib"
-				GenerateDebugInformation="false"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-
-<!-- Generated stuff begins -->
-<Files>
-<File RelativePath="..\..\src\modules\physics\Joint.h">
-</File>
-<File RelativePath="..\..\src\modules\physics\Shape.h">
-</File>
-
-<Filter Name="box2d">
-<File RelativePath="..\..\src\modules\physics\box2d\Body.cpp">
-<FileConfiguration Name="Debug|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\physics\box2d\" />
-</FileConfiguration>
-<FileConfiguration Name="Release|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\physics\box2d\" />
-</FileConfiguration>
-</File>
-<File RelativePath="..\..\src\modules\physics\box2d\Body.h">
-</File>
-<File RelativePath="..\..\src\modules\physics\box2d\CircleShape.cpp">
-<FileConfiguration Name="Debug|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\physics\box2d\" />
-</FileConfiguration>
-<FileConfiguration Name="Release|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\physics\box2d\" />
-</FileConfiguration>
-</File>
-<File RelativePath="..\..\src\modules\physics\box2d\CircleShape.h">
-</File>
-<File RelativePath="..\..\src\modules\physics\box2d\Contact.cpp">
-<FileConfiguration Name="Debug|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\physics\box2d\" />
-</FileConfiguration>
-<FileConfiguration Name="Release|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\physics\box2d\" />
-</FileConfiguration>
-</File>
-<File RelativePath="..\..\src\modules\physics\box2d\Contact.h">
-</File>
-<File RelativePath="..\..\src\modules\physics\box2d\DistanceJoint.cpp">
-<FileConfiguration Name="Debug|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\physics\box2d\" />
-</FileConfiguration>
-<FileConfiguration Name="Release|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\physics\box2d\" />
-</FileConfiguration>
-</File>
-<File RelativePath="..\..\src\modules\physics\box2d\DistanceJoint.h">
-</File>
-<File RelativePath="..\..\src\modules\physics\box2d\GearJoint.cpp">
-<FileConfiguration Name="Debug|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\physics\box2d\" />
-</FileConfiguration>
-<FileConfiguration Name="Release|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\physics\box2d\" />
-</FileConfiguration>
-</File>
-<File RelativePath="..\..\src\modules\physics\box2d\GearJoint.h">
-</File>
-<File RelativePath="..\..\src\modules\physics\box2d\Joint.cpp">
-<FileConfiguration Name="Debug|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\physics\box2d\" />
-</FileConfiguration>
-<FileConfiguration Name="Release|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\physics\box2d\" />
-</FileConfiguration>
-</File>
-<File RelativePath="..\..\src\modules\physics\box2d\Joint.h">
-</File>
-<File RelativePath="..\..\src\modules\physics\box2d\MouseJoint.cpp">
-<FileConfiguration Name="Debug|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\physics\box2d\" />
-</FileConfiguration>
-<FileConfiguration Name="Release|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\physics\box2d\" />
-</FileConfiguration>
-</File>
-<File RelativePath="..\..\src\modules\physics\box2d\MouseJoint.h">
-</File>
-<File RelativePath="..\..\src\modules\physics\box2d\Physics.cpp">
-<FileConfiguration Name="Debug|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\physics\box2d\" />
-</FileConfiguration>
-<FileConfiguration Name="Release|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\physics\box2d\" />
-</FileConfiguration>
-</File>
-<File RelativePath="..\..\src\modules\physics\box2d\Physics.h">
-</File>
-<File RelativePath="..\..\src\modules\physics\box2d\PolygonShape.cpp">
-<FileConfiguration Name="Debug|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\physics\box2d\" />
-</FileConfiguration>
-<FileConfiguration Name="Release|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\physics\box2d\" />
-</FileConfiguration>
-</File>
-<File RelativePath="..\..\src\modules\physics\box2d\PolygonShape.h">
-</File>
-<File RelativePath="..\..\src\modules\physics\box2d\PrismaticJoint.cpp">
-<FileConfiguration Name="Debug|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\physics\box2d\" />
-</FileConfiguration>
-<FileConfiguration Name="Release|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\physics\box2d\" />
-</FileConfiguration>
-</File>
-<File RelativePath="..\..\src\modules\physics\box2d\PrismaticJoint.h">
-</File>
-<File RelativePath="..\..\src\modules\physics\box2d\PulleyJoint.cpp">
-<FileConfiguration Name="Debug|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\physics\box2d\" />
-</FileConfiguration>
-<FileConfiguration Name="Release|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\physics\box2d\" />
-</FileConfiguration>
-</File>
-<File RelativePath="..\..\src\modules\physics\box2d\PulleyJoint.h">
-</File>
-<File RelativePath="..\..\src\modules\physics\box2d\RevoluteJoint.cpp">
-<FileConfiguration Name="Debug|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\physics\box2d\" />
-</FileConfiguration>
-<FileConfiguration Name="Release|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\physics\box2d\" />
-</FileConfiguration>
-</File>
-<File RelativePath="..\..\src\modules\physics\box2d\RevoluteJoint.h">
-</File>
-<File RelativePath="..\..\src\modules\physics\box2d\Shape.cpp">
-<FileConfiguration Name="Debug|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\physics\box2d\" />
-</FileConfiguration>
-<FileConfiguration Name="Release|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\physics\box2d\" />
-</FileConfiguration>
-</File>
-<File RelativePath="..\..\src\modules\physics\box2d\Shape.h">
-</File>
-<File RelativePath="..\..\src\modules\physics\box2d\World.cpp">
-<FileConfiguration Name="Debug|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\physics\box2d\" />
-</FileConfiguration>
-<FileConfiguration Name="Release|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\physics\box2d\" />
-</FileConfiguration>
-</File>
-<File RelativePath="..\..\src\modules\physics\box2d\World.h">
-</File>
-<File RelativePath="..\..\src\modules\physics\box2d\wrap_Body.cpp">
-<FileConfiguration Name="Debug|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\physics\box2d\" />
-</FileConfiguration>
-<FileConfiguration Name="Release|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\physics\box2d\" />
-</FileConfiguration>
-</File>
-<File RelativePath="..\..\src\modules\physics\box2d\wrap_Body.h">
-</File>
-<File RelativePath="..\..\src\modules\physics\box2d\wrap_CircleShape.cpp">
-<FileConfiguration Name="Debug|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\physics\box2d\" />
-</FileConfiguration>
-<FileConfiguration Name="Release|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\physics\box2d\" />
-</FileConfiguration>
-</File>
-<File RelativePath="..\..\src\modules\physics\box2d\wrap_CircleShape.h">
-</File>
-<File RelativePath="..\..\src\modules\physics\box2d\wrap_Contact.cpp">
-<FileConfiguration Name="Debug|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\physics\box2d\" />
-</FileConfiguration>
-<FileConfiguration Name="Release|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\physics\box2d\" />
-</FileConfiguration>
-</File>
-<File RelativePath="..\..\src\modules\physics\box2d\wrap_Contact.h">
-</File>
-<File RelativePath="..\..\src\modules\physics\box2d\wrap_DistanceJoint.cpp">
-<FileConfiguration Name="Debug|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\physics\box2d\" />
-</FileConfiguration>
-<FileConfiguration Name="Release|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\physics\box2d\" />
-</FileConfiguration>
-</File>
-<File RelativePath="..\..\src\modules\physics\box2d\wrap_DistanceJoint.h">
-</File>
-<File RelativePath="..\..\src\modules\physics\box2d\wrap_GearJoint.cpp">
-<FileConfiguration Name="Debug|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\physics\box2d\" />
-</FileConfiguration>
-<FileConfiguration Name="Release|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\physics\box2d\" />
-</FileConfiguration>
-</File>
-<File RelativePath="..\..\src\modules\physics\box2d\wrap_GearJoint.h">
-</File>
-<File RelativePath="..\..\src\modules\physics\box2d\wrap_Joint.cpp">
-<FileConfiguration Name="Debug|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\physics\box2d\" />
-</FileConfiguration>
-<FileConfiguration Name="Release|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\physics\box2d\" />
-</FileConfiguration>
-</File>
-<File RelativePath="..\..\src\modules\physics\box2d\wrap_Joint.h">
-</File>
-<File RelativePath="..\..\src\modules\physics\box2d\wrap_MouseJoint.cpp">
-<FileConfiguration Name="Debug|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\physics\box2d\" />
-</FileConfiguration>
-<FileConfiguration Name="Release|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\physics\box2d\" />
-</FileConfiguration>
-</File>
-<File RelativePath="..\..\src\modules\physics\box2d\wrap_MouseJoint.h">
-</File>
-<File RelativePath="..\..\src\modules\physics\box2d\wrap_Physics.cpp">
-<FileConfiguration Name="Debug|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\physics\box2d\" />
-</FileConfiguration>
-<FileConfiguration Name="Release|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\physics\box2d\" />
-</FileConfiguration>
-</File>
-<File RelativePath="..\..\src\modules\physics\box2d\wrap_Physics.h">
-</File>
-<File RelativePath="..\..\src\modules\physics\box2d\wrap_PolygonShape.cpp">
-<FileConfiguration Name="Debug|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\physics\box2d\" />
-</FileConfiguration>
-<FileConfiguration Name="Release|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\physics\box2d\" />
-</FileConfiguration>
-</File>
-<File RelativePath="..\..\src\modules\physics\box2d\wrap_PolygonShape.h">
-</File>
-<File RelativePath="..\..\src\modules\physics\box2d\wrap_PrismaticJoint.cpp">
-<FileConfiguration Name="Debug|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\physics\box2d\" />
-</FileConfiguration>
-<FileConfiguration Name="Release|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\physics\box2d\" />
-</FileConfiguration>
-</File>
-<File RelativePath="..\..\src\modules\physics\box2d\wrap_PrismaticJoint.h">
-</File>
-<File RelativePath="..\..\src\modules\physics\box2d\wrap_PulleyJoint.cpp">
-<FileConfiguration Name="Debug|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\physics\box2d\" />
-</FileConfiguration>
-<FileConfiguration Name="Release|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\physics\box2d\" />
-</FileConfiguration>
-</File>
-<File RelativePath="..\..\src\modules\physics\box2d\wrap_PulleyJoint.h">
-</File>
-<File RelativePath="..\..\src\modules\physics\box2d\wrap_RevoluteJoint.cpp">
-<FileConfiguration Name="Debug|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\physics\box2d\" />
-</FileConfiguration>
-<FileConfiguration Name="Release|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\physics\box2d\" />
-</FileConfiguration>
-</File>
-<File RelativePath="..\..\src\modules\physics\box2d\wrap_RevoluteJoint.h">
-</File>
-<File RelativePath="..\..\src\modules\physics\box2d\wrap_Shape.cpp">
-<FileConfiguration Name="Debug|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\physics\box2d\" />
-</FileConfiguration>
-<FileConfiguration Name="Release|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\physics\box2d\" />
-</FileConfiguration>
-</File>
-<File RelativePath="..\..\src\modules\physics\box2d\wrap_Shape.h">
-</File>
-<File RelativePath="..\..\src\modules\physics\box2d\wrap_World.cpp">
-<FileConfiguration Name="Debug|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\physics\box2d\" />
-</FileConfiguration>
-<FileConfiguration Name="Release|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\physics\box2d\" />
-</FileConfiguration>
-</File>
-<File RelativePath="..\..\src\modules\physics\box2d\wrap_World.h">
-</File>
-
-<Filter Name="Include">
-<File RelativePath="..\..\src\modules\physics\box2d\Include\Box2D.h">
-</File>
-</Filter>
-
-
-<Filter Name="Source">
-
-<Filter Name="Dynamics">
-<File RelativePath="..\..\src\modules\physics\box2d\Source\Dynamics\b2Body.cpp">
-<FileConfiguration Name="Debug|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\physics\box2d\Source\Dynamics\" />
-</FileConfiguration>
-<FileConfiguration Name="Release|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\physics\box2d\Source\Dynamics\" />
-</FileConfiguration>
-</File>
-<File RelativePath="..\..\src\modules\physics\box2d\Source\Dynamics\b2Body.h">
-</File>
-<File RelativePath="..\..\src\modules\physics\box2d\Source\Dynamics\b2ContactManager.cpp">
-<FileConfiguration Name="Debug|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\physics\box2d\Source\Dynamics\" />
-</FileConfiguration>
-<FileConfiguration Name="Release|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\physics\box2d\Source\Dynamics\" />
-</FileConfiguration>
-</File>
-<File RelativePath="..\..\src\modules\physics\box2d\Source\Dynamics\b2ContactManager.h">
-</File>
-<File RelativePath="..\..\src\modules\physics\box2d\Source\Dynamics\b2Island.cpp">
-<FileConfiguration Name="Debug|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\physics\box2d\Source\Dynamics\" />
-</FileConfiguration>
-<FileConfiguration Name="Release|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\physics\box2d\Source\Dynamics\" />
-</FileConfiguration>
-</File>
-<File RelativePath="..\..\src\modules\physics\box2d\Source\Dynamics\b2Island.h">
-</File>
-<File RelativePath="..\..\src\modules\physics\box2d\Source\Dynamics\b2World.cpp">
-<FileConfiguration Name="Debug|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\physics\box2d\Source\Dynamics\" />
-</FileConfiguration>
-<FileConfiguration Name="Release|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\physics\box2d\Source\Dynamics\" />
-</FileConfiguration>
-</File>
-<File RelativePath="..\..\src\modules\physics\box2d\Source\Dynamics\b2World.h">
-</File>
-<File RelativePath="..\..\src\modules\physics\box2d\Source\Dynamics\b2WorldCallbacks.cpp">
-<FileConfiguration Name="Debug|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\physics\box2d\Source\Dynamics\" />
-</FileConfiguration>
-<FileConfiguration Name="Release|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\physics\box2d\Source\Dynamics\" />
-</FileConfiguration>
-</File>
-<File RelativePath="..\..\src\modules\physics\box2d\Source\Dynamics\b2WorldCallbacks.h">
-</File>
-
-<Filter Name="Joints">
-<File RelativePath="..\..\src\modules\physics\box2d\Source\Dynamics\Joints\b2DistanceJoint.cpp">
-<FileConfiguration Name="Debug|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\physics\box2d\Source\Dynamics\Joints\" />
-</FileConfiguration>
-<FileConfiguration Name="Release|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\physics\box2d\Source\Dynamics\Joints\" />
-</FileConfiguration>
-</File>
-<File RelativePath="..\..\src\modules\physics\box2d\Source\Dynamics\Joints\b2DistanceJoint.h">
-</File>
-<File RelativePath="..\..\src\modules\physics\box2d\Source\Dynamics\Joints\b2GearJoint.cpp">
-<FileConfiguration Name="Debug|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\physics\box2d\Source\Dynamics\Joints\" />
-</FileConfiguration>
-<FileConfiguration Name="Release|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\physics\box2d\Source\Dynamics\Joints\" />
-</FileConfiguration>
-</File>
-<File RelativePath="..\..\src\modules\physics\box2d\Source\Dynamics\Joints\b2GearJoint.h">
-</File>
-<File RelativePath="..\..\src\modules\physics\box2d\Source\Dynamics\Joints\b2Joint.cpp">
-<FileConfiguration Name="Debug|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\physics\box2d\Source\Dynamics\Joints\" />
-</FileConfiguration>
-<FileConfiguration Name="Release|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\physics\box2d\Source\Dynamics\Joints\" />
-</FileConfiguration>
-</File>
-<File RelativePath="..\..\src\modules\physics\box2d\Source\Dynamics\Joints\b2Joint.h">
-</File>
-<File RelativePath="..\..\src\modules\physics\box2d\Source\Dynamics\Joints\b2MouseJoint.cpp">
-<FileConfiguration Name="Debug|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\physics\box2d\Source\Dynamics\Joints\" />
-</FileConfiguration>
-<FileConfiguration Name="Release|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\physics\box2d\Source\Dynamics\Joints\" />
-</FileConfiguration>
-</File>
-<File RelativePath="..\..\src\modules\physics\box2d\Source\Dynamics\Joints\b2MouseJoint.h">
-</File>
-<File RelativePath="..\..\src\modules\physics\box2d\Source\Dynamics\Joints\b2PrismaticJoint.cpp">
-<FileConfiguration Name="Debug|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\physics\box2d\Source\Dynamics\Joints\" />
-</FileConfiguration>
-<FileConfiguration Name="Release|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\physics\box2d\Source\Dynamics\Joints\" />
-</FileConfiguration>
-</File>
-<File RelativePath="..\..\src\modules\physics\box2d\Source\Dynamics\Joints\b2PrismaticJoint.h">
-</File>
-<File RelativePath="..\..\src\modules\physics\box2d\Source\Dynamics\Joints\b2PulleyJoint.cpp">
-<FileConfiguration Name="Debug|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\physics\box2d\Source\Dynamics\Joints\" />
-</FileConfiguration>
-<FileConfiguration Name="Release|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\physics\box2d\Source\Dynamics\Joints\" />
-</FileConfiguration>
-</File>
-<File RelativePath="..\..\src\modules\physics\box2d\Source\Dynamics\Joints\b2PulleyJoint.h">
-</File>
-<File RelativePath="..\..\src\modules\physics\box2d\Source\Dynamics\Joints\b2RevoluteJoint.cpp">
-<FileConfiguration Name="Debug|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\physics\box2d\Source\Dynamics\Joints\" />
-</FileConfiguration>
-<FileConfiguration Name="Release|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\physics\box2d\Source\Dynamics\Joints\" />
-</FileConfiguration>
-</File>
-<File RelativePath="..\..\src\modules\physics\box2d\Source\Dynamics\Joints\b2RevoluteJoint.h">
-</File>
-</Filter>
-
-
-<Filter Name="Contacts">
-<File RelativePath="..\..\src\modules\physics\box2d\Source\Dynamics\Contacts\b2CircleContact.cpp">
-<FileConfiguration Name="Debug|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\physics\box2d\Source\Dynamics\Contacts\" />
-</FileConfiguration>
-<FileConfiguration Name="Release|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\physics\box2d\Source\Dynamics\Contacts\" />
-</FileConfiguration>
-</File>
-<File RelativePath="..\..\src\modules\physics\box2d\Source\Dynamics\Contacts\b2CircleContact.h">
-</File>
-<File RelativePath="..\..\src\modules\physics\box2d\Source\Dynamics\Contacts\b2Contact.cpp">
-<FileConfiguration Name="Debug|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\physics\box2d\Source\Dynamics\Contacts\" />
-</FileConfiguration>
-<FileConfiguration Name="Release|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\physics\box2d\Source\Dynamics\Contacts\" />
-</FileConfiguration>
-</File>
-<File RelativePath="..\..\src\modules\physics\box2d\Source\Dynamics\Contacts\b2Contact.h">
-</File>
-<File RelativePath="..\..\src\modules\physics\box2d\Source\Dynamics\Contacts\b2ContactSolver.cpp">
-<FileConfiguration Name="Debug|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\physics\box2d\Source\Dynamics\Contacts\" />
-</FileConfiguration>
-<FileConfiguration Name="Release|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\physics\box2d\Source\Dynamics\Contacts\" />
-</FileConfiguration>
-</File>
-<File RelativePath="..\..\src\modules\physics\box2d\Source\Dynamics\Contacts\b2ContactSolver.h">
-</File>
-<File RelativePath="..\..\src\modules\physics\box2d\Source\Dynamics\Contacts\b2NullContact.h">
-</File>
-<File RelativePath="..\..\src\modules\physics\box2d\Source\Dynamics\Contacts\b2PolyAndCircleContact.cpp">
-<FileConfiguration Name="Debug|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\physics\box2d\Source\Dynamics\Contacts\" />
-</FileConfiguration>
-<FileConfiguration Name="Release|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\physics\box2d\Source\Dynamics\Contacts\" />
-</FileConfiguration>
-</File>
-<File RelativePath="..\..\src\modules\physics\box2d\Source\Dynamics\Contacts\b2PolyAndCircleContact.h">
-</File>
-<File RelativePath="..\..\src\modules\physics\box2d\Source\Dynamics\Contacts\b2PolyContact.cpp">
-<FileConfiguration Name="Debug|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\physics\box2d\Source\Dynamics\Contacts\" />
-</FileConfiguration>
-<FileConfiguration Name="Release|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\physics\box2d\Source\Dynamics\Contacts\" />
-</FileConfiguration>
-</File>
-<File RelativePath="..\..\src\modules\physics\box2d\Source\Dynamics\Contacts\b2PolyContact.h">
-</File>
-</Filter>
-
-</Filter>
-
-
-<Filter Name="Collision">
-<File RelativePath="..\..\src\modules\physics\box2d\Source\Collision\b2BroadPhase.cpp">
-<FileConfiguration Name="Debug|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\physics\box2d\Source\Collision\" />
-</FileConfiguration>
-<FileConfiguration Name="Release|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\physics\box2d\Source\Collision\" />
-</FileConfiguration>
-</File>
-<File RelativePath="..\..\src\modules\physics\box2d\Source\Collision\b2BroadPhase.h">
-</File>
-<File RelativePath="..\..\src\modules\physics\box2d\Source\Collision\b2CollideCircle.cpp">
-<FileConfiguration Name="Debug|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\physics\box2d\Source\Collision\" />
-</FileConfiguration>
-<FileConfiguration Name="Release|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\physics\box2d\Source\Collision\" />
-</FileConfiguration>
-</File>
-<File RelativePath="..\..\src\modules\physics\box2d\Source\Collision\b2CollidePoly.cpp">
-<FileConfiguration Name="Debug|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\physics\box2d\Source\Collision\" />
-</FileConfiguration>
-<FileConfiguration Name="Release|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\physics\box2d\Source\Collision\" />
-</FileConfiguration>
-</File>
-<File RelativePath="..\..\src\modules\physics\box2d\Source\Collision\b2Collision.cpp">
-<FileConfiguration Name="Debug|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\physics\box2d\Source\Collision\" />
-</FileConfiguration>
-<FileConfiguration Name="Release|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\physics\box2d\Source\Collision\" />
-</FileConfiguration>
-</File>
-<File RelativePath="..\..\src\modules\physics\box2d\Source\Collision\b2Collision.h">
-</File>
-<File RelativePath="..\..\src\modules\physics\box2d\Source\Collision\b2Distance.cpp">
-<FileConfiguration Name="Debug|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\physics\box2d\Source\Collision\" />
-</FileConfiguration>
-<FileConfiguration Name="Release|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\physics\box2d\Source\Collision\" />
-</FileConfiguration>
-</File>
-<File RelativePath="..\..\src\modules\physics\box2d\Source\Collision\b2PairManager.cpp">
-<FileConfiguration Name="Debug|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\physics\box2d\Source\Collision\" />
-</FileConfiguration>
-<FileConfiguration Name="Release|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\physics\box2d\Source\Collision\" />
-</FileConfiguration>
-</File>
-<File RelativePath="..\..\src\modules\physics\box2d\Source\Collision\b2PairManager.h">
-</File>
-<File RelativePath="..\..\src\modules\physics\box2d\Source\Collision\b2TimeOfImpact.cpp">
-<FileConfiguration Name="Debug|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\physics\box2d\Source\Collision\" />
-</FileConfiguration>
-<FileConfiguration Name="Release|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\physics\box2d\Source\Collision\" />
-</FileConfiguration>
-</File>
-
-<Filter Name="Shapes">
-<File RelativePath="..\..\src\modules\physics\box2d\Source\Collision\Shapes\b2CircleShape.cpp">
-<FileConfiguration Name="Debug|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\physics\box2d\Source\Collision\Shapes\" />
-</FileConfiguration>
-<FileConfiguration Name="Release|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\physics\box2d\Source\Collision\Shapes\" />
-</FileConfiguration>
-</File>
-<File RelativePath="..\..\src\modules\physics\box2d\Source\Collision\Shapes\b2CircleShape.h">
-</File>
-<File RelativePath="..\..\src\modules\physics\box2d\Source\Collision\Shapes\b2PolygonShape.cpp">
-<FileConfiguration Name="Debug|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\physics\box2d\Source\Collision\Shapes\" />
-</FileConfiguration>
-<FileConfiguration Name="Release|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\physics\box2d\Source\Collision\Shapes\" />
-</FileConfiguration>
-</File>
-<File RelativePath="..\..\src\modules\physics\box2d\Source\Collision\Shapes\b2PolygonShape.h">
-</File>
-<File RelativePath="..\..\src\modules\physics\box2d\Source\Collision\Shapes\b2Shape.cpp">
-<FileConfiguration Name="Debug|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\physics\box2d\Source\Collision\Shapes\" />
-</FileConfiguration>
-<FileConfiguration Name="Release|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\physics\box2d\Source\Collision\Shapes\" />
-</FileConfiguration>
-</File>
-<File RelativePath="..\..\src\modules\physics\box2d\Source\Collision\Shapes\b2Shape.h">
-</File>
-</Filter>
-
-</Filter>
-
-
-<Filter Name="Common">
-<File RelativePath="..\..\src\modules\physics\box2d\Source\Common\b2BlockAllocator.cpp">
-<FileConfiguration Name="Debug|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\physics\box2d\Source\Common\" />
-</FileConfiguration>
-<FileConfiguration Name="Release|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\physics\box2d\Source\Common\" />
-</FileConfiguration>
-</File>
-<File RelativePath="..\..\src\modules\physics\box2d\Source\Common\b2BlockAllocator.h">
-</File>
-<File RelativePath="..\..\src\modules\physics\box2d\Source\Common\b2Math.cpp">
-<FileConfiguration Name="Debug|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\physics\box2d\Source\Common\" />
-</FileConfiguration>
-<FileConfiguration Name="Release|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\physics\box2d\Source\Common\" />
-</FileConfiguration>
-</File>
-<File RelativePath="..\..\src\modules\physics\box2d\Source\Common\b2Math.h">
-</File>
-<File RelativePath="..\..\src\modules\physics\box2d\Source\Common\b2Settings.cpp">
-<FileConfiguration Name="Debug|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\physics\box2d\Source\Common\" />
-</FileConfiguration>
-<FileConfiguration Name="Release|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\physics\box2d\Source\Common\" />
-</FileConfiguration>
-</File>
-<File RelativePath="..\..\src\modules\physics\box2d\Source\Common\b2Settings.h">
-</File>
-<File RelativePath="..\..\src\modules\physics\box2d\Source\Common\b2StackAllocator.cpp">
-<FileConfiguration Name="Debug|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\physics\box2d\Source\Common\" />
-</FileConfiguration>
-<FileConfiguration Name="Release|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\physics\box2d\Source\Common\" />
-</FileConfiguration>
-</File>
-<File RelativePath="..\..\src\modules\physics\box2d\Source\Common\b2StackAllocator.h">
-</File>
-<File RelativePath="..\..\src\modules\physics\box2d\Source\Common\Fixed.h">
-</File>
-<File RelativePath="..\..\src\modules\physics\box2d\Source\Common\jtypes.h">
-</File>
-</Filter>
-
-</Filter>
-
-
-<Filter Name="graham">
-<File RelativePath="..\..\src\modules\physics\box2d\graham\GrahamScanConvexHull.cpp">
-<FileConfiguration Name="Debug|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\physics\box2d\graham\" />
-</FileConfiguration>
-<FileConfiguration Name="Release|Win32">
-<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\modules\physics\box2d\graham\" />
-</FileConfiguration>
-</File>
-<File RelativePath="..\..\src\modules\physics\box2d\graham\GrahamScanConvexHull.h">
-</File>
-</Filter>
-
-</Filter>
-
-</Files>
-<!-- Generated stuff ends -->
-	
-	<Globals>
-	</Globals>
-</VisualStudioProject>

+ 1031 - 0
platform/msvc2008/physics/physics.vcproj

@@ -0,0 +1,1031 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9,00"
+	Name="physics"
+	ProjectGUID="{39CDF8C8-016D-423E-94BA-7DD798CF0E15}"
+	RootNamespace="physics"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="196613"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="2"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="../include;../../../src;../../../src/modules;"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;PHYSICS_EXPORTS"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="lua5.1.lib"
+				OutputFile="$(OutDir)\love\$(ProjectName).dll"
+				LinkIncremental="2"
+				AdditionalLibraryDirectories="..\lib"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="2"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				EnableIntrinsicFunctions="true"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PHYSICS_EXPORTS"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="box2d"
+			>
+			<File
+				RelativePath="..\..\..\src\modules\physics\box2d\Body.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)\physics\box2d\"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\physics\box2d\Body.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\physics\box2d\CircleShape.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)\physics\box2d\"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\physics\box2d\CircleShape.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\physics\box2d\Contact.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)\physics\box2d\"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\physics\box2d\Contact.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\physics\box2d\DistanceJoint.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)\physics\box2d\"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\physics\box2d\DistanceJoint.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\physics\box2d\GearJoint.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)\physics\box2d\"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\physics\box2d\GearJoint.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\physics\box2d\Joint.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)\physics\box2d\"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\physics\box2d\Joint.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\physics\box2d\MouseJoint.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)\physics\box2d\"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\physics\box2d\MouseJoint.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\physics\box2d\Physics.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)\physics\box2d\"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\physics\box2d\Physics.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\physics\box2d\PolygonShape.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)\physics\box2d\"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\physics\box2d\PolygonShape.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\physics\box2d\PrismaticJoint.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)\physics\box2d\"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\physics\box2d\PrismaticJoint.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\physics\box2d\PulleyJoint.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)\physics\box2d\"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\physics\box2d\PulleyJoint.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\physics\box2d\RevoluteJoint.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)\physics\box2d\"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\physics\box2d\RevoluteJoint.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\physics\box2d\Shape.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)\physics\box2d\"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\physics\box2d\Shape.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\physics\box2d\World.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)\physics\box2d\"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\physics\box2d\World.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\physics\box2d\wrap_Body.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)\physics\box2d\"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\physics\box2d\wrap_Body.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\physics\box2d\wrap_CircleShape.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)\physics\box2d\"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\physics\box2d\wrap_CircleShape.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\physics\box2d\wrap_Contact.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)\physics\box2d\"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\physics\box2d\wrap_Contact.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\physics\box2d\wrap_DistanceJoint.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)\physics\box2d\"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\physics\box2d\wrap_DistanceJoint.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\physics\box2d\wrap_GearJoint.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)\physics\box2d\"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\physics\box2d\wrap_GearJoint.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\physics\box2d\wrap_Joint.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)\physics\box2d\"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\physics\box2d\wrap_Joint.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\physics\box2d\wrap_MouseJoint.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)\physics\box2d\"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\physics\box2d\wrap_MouseJoint.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\physics\box2d\wrap_Physics.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)\physics\box2d\"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\physics\box2d\wrap_Physics.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\physics\box2d\wrap_PolygonShape.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)\physics\box2d\"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\physics\box2d\wrap_PolygonShape.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\physics\box2d\wrap_PrismaticJoint.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)\physics\box2d\"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\physics\box2d\wrap_PrismaticJoint.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\physics\box2d\wrap_PulleyJoint.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)\physics\box2d\"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\physics\box2d\wrap_PulleyJoint.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\physics\box2d\wrap_RevoluteJoint.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)\physics\box2d\"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\physics\box2d\wrap_RevoluteJoint.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\physics\box2d\wrap_Shape.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)\physics\box2d\"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\physics\box2d\wrap_Shape.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\physics\box2d\wrap_World.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)\physics\box2d\"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\physics\box2d\wrap_World.h"
+				>
+			</File>
+			<Filter
+				Name="lib"
+				>
+				<File
+					RelativePath="..\..\..\src\modules\physics\box2d\Source\Common\b2BlockAllocator.cpp"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\physics\box2d\lib\"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\..\..\src\modules\physics\box2d\Source\Dynamics\b2Body.cpp"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\physics\box2d\lib\"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\..\..\src\modules\physics\box2d\Source\Collision\b2BroadPhase.cpp"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\physics\box2d\lib\"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\..\..\src\modules\physics\box2d\Source\Dynamics\Contacts\b2CircleContact.cpp"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\physics\box2d\lib\"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\..\..\src\modules\physics\box2d\Source\Collision\Shapes\b2CircleShape.cpp"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\physics\box2d\lib\"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\..\..\src\modules\physics\box2d\Source\Collision\b2CollideCircle.cpp"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\physics\box2d\lib\"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\..\..\src\modules\physics\box2d\Source\Collision\b2CollidePoly.cpp"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\physics\box2d\lib\"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\..\..\src\modules\physics\box2d\Source\Collision\b2Collision.cpp"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\physics\box2d\lib\"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\..\..\src\modules\physics\box2d\Source\Dynamics\Contacts\b2Contact.cpp"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\physics\box2d\lib\"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\..\..\src\modules\physics\box2d\Source\Dynamics\b2ContactManager.cpp"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\physics\box2d\lib\"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\..\..\src\modules\physics\box2d\Source\Dynamics\Contacts\b2ContactSolver.cpp"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\physics\box2d\lib\"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\..\..\src\modules\physics\box2d\Source\Collision\b2Distance.cpp"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\physics\box2d\lib\"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\..\..\src\modules\physics\box2d\Source\Dynamics\Joints\b2DistanceJoint.cpp"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\physics\box2d\lib\"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\..\..\src\modules\physics\box2d\Source\Dynamics\Joints\b2GearJoint.cpp"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\physics\box2d\lib\"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\..\..\src\modules\physics\box2d\Source\Dynamics\b2Island.cpp"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\physics\box2d\lib\"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\..\..\src\modules\physics\box2d\Source\Dynamics\Joints\b2Joint.cpp"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\physics\box2d\lib\"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\..\..\src\modules\physics\box2d\Source\Common\b2Math.cpp"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\physics\box2d\lib\"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\..\..\src\modules\physics\box2d\Source\Dynamics\Joints\b2MouseJoint.cpp"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\physics\box2d\lib\"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\..\..\src\modules\physics\box2d\Source\Collision\b2PairManager.cpp"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\physics\box2d\lib\"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\..\..\src\modules\physics\box2d\Source\Dynamics\Contacts\b2PolyAndCircleContact.cpp"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\physics\box2d\lib\"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\..\..\src\modules\physics\box2d\Source\Dynamics\Contacts\b2PolyContact.cpp"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\physics\box2d\lib\"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\..\..\src\modules\physics\box2d\Source\Collision\Shapes\b2PolygonShape.cpp"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\physics\box2d\lib\"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\..\..\src\modules\physics\box2d\Source\Dynamics\Joints\b2PrismaticJoint.cpp"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\physics\box2d\lib\"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\..\..\src\modules\physics\box2d\Source\Dynamics\Joints\b2PulleyJoint.cpp"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\physics\box2d\lib\"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\..\..\src\modules\physics\box2d\Source\Dynamics\Joints\b2RevoluteJoint.cpp"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\physics\box2d\lib\"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\..\..\src\modules\physics\box2d\Source\Common\b2Settings.cpp"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\physics\box2d\lib\"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\..\..\src\modules\physics\box2d\Source\Collision\Shapes\b2Shape.cpp"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\physics\box2d\lib\"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\..\..\src\modules\physics\box2d\Source\Common\b2StackAllocator.cpp"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\physics\box2d\lib\"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\..\..\src\modules\physics\box2d\Source\Collision\b2TimeOfImpact.cpp"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\physics\box2d\lib\"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\..\..\src\modules\physics\box2d\Source\Dynamics\b2World.cpp"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\physics\box2d\lib\"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\..\..\src\modules\physics\box2d\Source\Dynamics\b2WorldCallbacks.cpp"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\physics\box2d\lib\"
+						/>
+					</FileConfiguration>
+				</File>
+			</Filter>
+			<Filter
+				Name="graham"
+				>
+				<File
+					RelativePath="..\..\..\src\modules\physics\box2d\graham\GrahamScanConvexHull.cpp"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\physics\box2d\graham\"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\..\..\src\modules\physics\box2d\graham\GrahamScanConvexHull.h"
+					>
+				</File>
+			</Filter>
+		</Filter>
+		<File
+			RelativePath="..\..\..\src\modules\physics\Joint.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\..\src\modules\physics\Shape.h"
+			>
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>

+ 359 - 0
platform/msvc2008/sound/sound.vcproj

@@ -0,0 +1,359 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9,00"
+	Name="sound"
+	ProjectGUID="{3D59D1E2-2682-4317-BB8D-D85E9BBC02E3}"
+	RootNamespace="sound"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="196613"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="2"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="../include;../../../src;../../../src/modules"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SOUND_EXPORTS"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="libmodplug.lib libmpg123.lib libogg.lib libvorbis.lib libvorbisfile.lib libFLAC_static_d.lib libFLAC++_static_d.lib"
+				OutputFile="$(OutDir)\love\$(ProjectName).dll"
+				LinkIncremental="2"
+				AdditionalLibraryDirectories="..\lib"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="2"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				EnableIntrinsicFunctions="true"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SOUND_EXPORTS"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="lullaby"
+			>
+			<File
+				RelativePath="..\..\..\src\modules\sound\lullaby\Decoder.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)\sound\lullaby\"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\sound\lullaby\Decoder.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\sound\lullaby\FLACDecoder.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)\sound\lullaby\"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\sound\lullaby\FLACDecoder.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\sound\lullaby\ModPlugDecoder.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)\sound\lullaby\"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\sound\lullaby\ModPlugDecoder.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\sound\lullaby\Mpg123Decoder.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)\sound\lullaby\"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\sound\lullaby\Mpg123Decoder.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\sound\lullaby\Sound.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)\sound\lullaby\"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\sound\lullaby\Sound.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\sound\lullaby\VorbisDecoder.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)\sound\lullaby\"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\sound\lullaby\VorbisDecoder.h"
+				>
+			</File>
+		</Filter>
+		<File
+			RelativePath="..\..\..\src\modules\sound\Decoder.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\..\src\modules\sound\Sound.cpp"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					ObjectFile="$(IntDir)\sound\"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\..\src\modules\sound\Sound.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\..\src\modules\sound\SoundData.cpp"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					ObjectFile="$(IntDir)\sound\"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\..\src\modules\sound\SoundData.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\..\src\modules\sound\wrap_Decoder.cpp"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					ObjectFile="$(IntDir)\sound\"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\..\src\modules\sound\wrap_Decoder.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\..\src\modules\sound\wrap_Sound.cpp"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					ObjectFile="$(IntDir)\sound\"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\..\src\modules\sound\wrap_Sound.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\..\src\modules\sound\wrap_SoundData.cpp"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					ObjectFile="$(IntDir)\sound\"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\..\src\modules\sound\wrap_SoundData.h"
+			>
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>

+ 48 - 17
platform/msvc2008/master.vct → platform/msvc2008/timer/timer.vcproj

@@ -2,9 +2,9 @@
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="9,00"
-	Name="{MODULE}"
-	ProjectGUID="{GUID}"
-	RootNamespace="{MODULE}"
+	Name="timer"
+	ProjectGUID="{3DFF2849-C47D-4251-B2AC-E60EDBC29511}"
+	RootNamespace="timer"
 	Keyword="Win32Proj"
 	TargetFrameworkVersion="196613"
 	>
@@ -41,8 +41,8 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="{INCLUDES}"
-				PreprocessorDefinitions="{DEFINES_DEBUG}"
+				AdditionalIncludeDirectories="../include;../../../src;../../../src/modules;../include/SDL"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;EVENT_EXPORTS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -61,10 +61,10 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="{LIBS}"
+				AdditionalDependencies="lua5.1.lib SDL.lib"
 				OutputFile="$(OutDir)\love\$(ProjectName).dll"
 				LinkIncremental="2"
-				AdditionalLibraryDirectories="{LIBDIR}"
+				AdditionalLibraryDirectories="..\lib"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				TargetMachine="1"
@@ -118,9 +118,8 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="{INCLUDES}"
-				PreprocessorDefinitions="{DEFINES_RELEASE}"
-				RuntimeLibrary="0"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;EVENT_EXPORTS"
+				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@@ -137,11 +136,8 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="{LIBS}"
-				OutputFile="$(OutDir)\love\$(ProjectName).dll"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="{LIBDIR}"
-				GenerateDebugInformation="false"
+				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
@@ -172,9 +168,44 @@
 	</Configurations>
 	<References>
 	</References>
-
-{FILES}
-	
+	<Files>
+		<Filter
+			Name="sdl"
+			>
+			<File
+				RelativePath="..\..\..\src\modules\timer\sdl\Timer.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)\timer\sdl\"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\timer\sdl\Timer.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\timer\sdl\wrap_Timer.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)\timer\sdl\"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\..\src\modules\timer\sdl\wrap_Timer.h"
+				>
+			</File>
+		</Filter>
+	</Files>
 	<Globals>
 	</Globals>
 </VisualStudioProject>

+ 2 - 2
src/common/runtime.cpp

@@ -105,7 +105,7 @@ namespace love
 	{
 		luax_getregistry(L, REGISTRY_GC);
 
-		UserData * u = (UserData *)lua_touserdata(L, sizeof(UserData));
+		UserData * u = (UserData *)lua_newuserdata(L, sizeof(UserData));
 		u->own = true;
 		u->data = m;
 
@@ -203,7 +203,7 @@ namespace love
 
 	void luax_newtype(lua_State * L, const char * name, bits flags, void * data, bool own)
 	{
-		UserData * u = (UserData *)lua_touserdata(L, sizeof(UserData));
+		UserData * u = (UserData *)lua_newuserdata(L, sizeof(UserData));
 
 		u->data = data;
 		u->flags = flags;

+ 2 - 0
src/modules/audio/openal/Audio.cpp

@@ -54,6 +54,8 @@ namespace openal
 	{
 		SDL_KillThread(thread);
 
+		pool->stop();
+
 		delete pool;
 		
 		alcMakeContextCurrent(0);

+ 29 - 29
src/modules/audio/wrap_Audio.cpp

@@ -206,37 +206,37 @@ namespace audio
 		return 3;
 	}
 
+	// List of functions to wrap.
+	static const luaL_Reg functions[] = {
+		{ "getNumSources", w_getNumSources },
+		{ "newSound", w_newSound },
+		{ "newMusic", w_newMusic },
+		{ "newSource", w_newSource },
+		{ "play", w_play },
+		{ "stop", w_stop },
+		{ "pause", w_pause },
+		{ "resume", w_resume },
+		{ "rewind", w_rewind },
+		{ "setVolume", w_setVolume },
+		{ "getVolume", w_getVolume },
+		{ "setPosition", w_setPosition },
+		{ "getPosition", w_getPosition },
+		{ "setOrientation", w_setOrientation },
+		{ "getOrientation", w_getOrientation },
+		{ "setVelocity", w_setVelocity },
+		{ "getVelocity", w_getVelocity },
+		{ 0, 0 }
+	};
+
+	static const lua_CFunction types[] = {
+		luaopen_source,
+		luaopen_music,
+		luaopen_sound,
+		0
+	};	
+
 	int luaopen_love_audio(lua_State * L)
 	{
-		// List of functions to wrap.
-		static const luaL_Reg functions[] = {
-			{ "getNumSources", w_getNumSources },
-			{ "newSound", w_newSound },
-			{ "newMusic", w_newMusic },
-			{ "newSource", w_newSource },
-			{ "play", w_play },
-			{ "stop", w_stop },
-			{ "pause", w_pause },
-			{ "resume", w_resume },
-			{ "rewind", w_rewind },
-			{ "setVolume", w_setVolume },
-			{ "getVolume", w_getVolume },
-			{ "setPosition", w_setPosition },
-			{ "getPosition", w_getPosition },
-			{ "setOrientation", w_setOrientation },
-			{ "getOrientation", w_getOrientation },
-			{ "setVelocity", w_setVelocity },
-			{ "getVelocity", w_getVelocity },
-			{ 0, 0 }
-		};
-
-		static const lua_CFunction types[] = {
-			luaopen_source,
-			luaopen_music,
-			luaopen_sound,
-			0
-		};
-
 		if(instance == 0)
 		{
 			// Try OpenAL first.

+ 3 - 5
src/modules/audio/wrap_Music.cpp

@@ -29,14 +29,12 @@ namespace audio
 		return luax_checktype<Music>(L, idx, "Music", AUDIO_MUSIC_T);
 	}
 
-
+	static const luaL_Reg functions[] = {
+		{ 0, 0 }
+	};
 
 	int luaopen_music(lua_State * L)
 	{
-		static const luaL_Reg functions[] = {
-			{ 0, 0 }
-		};
-
 		return luax_register_type(L, "Music", functions);
 	}
 

+ 4 - 4
src/modules/audio/wrap_Sound.cpp

@@ -29,12 +29,12 @@ namespace audio
 		return luax_checktype<Sound>(L, idx, "Sound", AUDIO_SOUND_T);
 	}
 
+	static const luaL_Reg functions[] = {
+		{ 0, 0 }
+	};
+
 	int luaopen_sound(lua_State * L)
 	{
-		static const luaL_Reg functions[] = {
-			{ 0, 0 }
-		};
-
 		return luax_register_type(L, "Sound", functions);
 	}
 

+ 10 - 10
src/modules/audio/wrap_Source.cpp

@@ -139,18 +139,18 @@ namespace audio
 		return 1;
 	}
 
+	static const luaL_Reg functions[] = {
+		{ "setPitch", w_Source_setPitch },
+		{ "getPitch", w_Source_getPitch },
+		{ "setVolume", w_Source_setVolume },
+		{ "getVolume", w_Source_getVolume },
+		{ "setLooping", w_Source_setLooping },
+		{ "isLooping", w_Source_isLooping },
+		{ 0, 0 }
+	};
+
 	int luaopen_source(lua_State * L)
 	{
-		static const luaL_Reg functions[] = {
-			{ "setPitch", w_Source_setPitch },
-			{ "getPitch", w_Source_getPitch },
-			{ "setVolume", w_Source_setVolume },
-			{ "getVolume", w_Source_getVolume },
-			{ "setLooping", w_Source_setLooping },
-			{ "isLooping", w_Source_isLooping },
-			{ 0, 0 }
-		};
-
 		return luax_register_type(L, "Source", functions);
 	}
 

+ 22 - 21
src/modules/event/sdl/wrap_Event.cpp

@@ -61,29 +61,30 @@ namespace sdl
 		return instance->push(L);
 	}
 
+	// List of functions to wrap.
+	static const luaL_Reg functions[] = {
+		{ "pump", w_pump }, 
+		{ "poll", w_poll }, 
+		{ "wait", w_wait }, 
+		{ "quit", w_quit }, 
+		{ "push", w_push }, 
+		{ 0, 0 }
+	};
+
+	// List of constants.
+	static const LuaConstant constants[] = {
+		{ "event_keypressed", Event::EVENT_KEYDOWN },
+		{ "event_keyreleased", Event::EVENT_KEYUP },
+		{ "event_mousepressed", Event::EVENT_MOUSEBUTTONDOWN },
+		{ "event_mousereleased", Event::EVENT_MOUSEBUTTONUP },
+		{ "event_joystickpressed", Event::EVENT_JOYBUTTONDOWN },
+		{ "event_joystickreleased", Event::EVENT_JOYBUTTONUP },
+		{ "event_quit", Event::EVENT_QUIT },
+		{ 0, 0 }
+	};
+
 	int luaopen_love_event(lua_State * L)
 	{
-		// List of functions to wrap.
-		static const luaL_Reg functions[] = {
-			{ "pump", w_pump }, 
-			{ "poll", w_poll }, 
-			{ "wait", w_wait }, 
-			{ "quit", w_quit }, 
-			{ "push", w_push }, 
-			{ 0, 0 }
-		};
-
-		// List of constants.
-		static const LuaConstant constants[] = {
-			{ "event_keypressed", Event::EVENT_KEYDOWN },
-			{ "event_keyreleased", Event::EVENT_KEYUP },
-			{ "event_mousepressed", Event::EVENT_MOUSEBUTTONDOWN },
-			{ "event_mousereleased", Event::EVENT_MOUSEBUTTONUP },
-			{ "event_joystickpressed", Event::EVENT_JOYBUTTONDOWN },
-			{ "event_joystickreleased", Event::EVENT_JOYBUTTONUP },
-			{ "event_quit", Event::EVENT_QUIT },
-			{ 0, 0 }
-		};
 		if(instance == 0)
 		{
 			try 

+ 4 - 4
src/modules/filesystem/physfs/Filesystem.cpp

@@ -64,10 +64,10 @@ namespace physfs
 		save_identity = std::string(ident);
 
 		// Generate the relative path to the game save folder.
-		save_path_relative = std::string(APPDATA_FOLDER PATH_SEPARATOR) + save_identity;
+		save_path_relative = std::string(LOVE_APPDATA_FOLDER LOVE_PATH_SEPARATOR) + save_identity;
 
 		// Generate the full path to the game save folder.
-		save_path_full = std::string(getAppdataDirectory()) + std::string(PATH_SEPARATOR);
+		save_path_full = std::string(getAppdataDirectory()) + std::string(LOVE_PATH_SEPARATOR);
 		save_path_full += save_path_relative;
 
 		std::cout << save_path_full << std::endl;
@@ -155,10 +155,10 @@ namespace physfs
 
 	const char * Filesystem::getWorkingDirectory()
 	{
-		#ifdef WINDOWS
+		#ifdef LOVE_WINDOWS
 				_getcwd(cwdbuffer, _MAX_PATH);
 		#else
-				char * temp = getcwd(cwdbuffer, MAXPATHLEN);
+				char * temp = getcwd(cwdbuffer, LOVE_MAXPATHLEN);
 				if(temp == 0)
 					return 0;
 		#endif

+ 10 - 10
src/modules/filesystem/physfs/wrap_FileData.cpp

@@ -47,20 +47,20 @@ namespace physfs
 		return 1;
 	}
 
-	int w_FileData_open(lua_State * L)
-	{
-		static const luaL_Reg w_FileData_functions[] = {
+	static const luaL_Reg w_FileData_functions[] = {
 
-			// Data
-			{ "getPointer", w_Data_getPointer },
-			{ "getSize", w_Data_getSize },
+		// Data
+		{ "getPointer", w_Data_getPointer },
+		{ "getSize", w_Data_getSize },
 
-			{ "getFilename", w_FileData_getFilename },
-			{ "getExtension", w_FileData_getExtension },
+		{ "getFilename", w_FileData_getFilename },
+		{ "getExtension", w_FileData_getExtension },
 
-			{ 0, 0 }
-		};
+		{ 0, 0 }
+	};
 
+	int luaopen_filedata(lua_State * L)
+	{
 		return luax_register_type(L, "FileData", w_FileData_functions);
 	}
 	

+ 1 - 1
src/modules/filesystem/physfs/wrap_FileData.h

@@ -35,7 +35,7 @@ namespace physfs
 	FileData * luax_checkfiledata(lua_State * L, int idx);
 	int w_FileData_getFilename(lua_State * L);
 	int w_FileData_getExtension(lua_State * L);
-	int w_FileData_open(lua_State * L);
+	int luaopen_filedata(lua_State * L);
 } // physfs
 } // filesystem
 } // love

+ 39 - 39
src/modules/filesystem/physfs/wrap_Filesystem.cpp

@@ -214,46 +214,46 @@ namespace physfs
 		return instance->load(L);
 	}
 
-	int w_Filesystem_open(lua_State * L)
+	// List of functions to wrap.
+	static const luaL_Reg functions[] = {
+		{ "init",  w_init },
+		{ "setIdentity",  w_setIdentity },
+		{ "setSource",  w_setSource },
+		{ "newFile",  w_newFile },
+		{ "getWorkingDirectory",  w_getWorkingDirectory },
+		{ "getUserDirectory",  w_getUserDirectory },
+		{ "getAppdataDirectory",  w_getAppdataDirectory },
+		{ "getSaveDirectory",  w_getSaveDirectory },
+		{ "exists",  w_exists },
+		{ "isDirectory",  w_isDirectory },
+		{ "isFile",  w_isFile },
+		{ "mkdir",  w_mkdir },
+		{ "remove",  w_remove },
+		{ "read",  w_read },
+		{ "write",  w_write },
+		{ "enumerate",  w_enumerate },
+		{ "lines",  w_lines },
+		{ "load",  w_load },
+		{ 0, 0 }
+	};
+
+	static const lua_CFunction types[] = {
+		luaopen_file,
+		luaopen_filedata,
+		0
+	};
+
+	// List of constants.
+	static const LuaConstant constants[] = {
+		{ "file_closed", File::CLOSED },
+		{ "file_read", File::READ },
+		{ "file_write", File::WRITE },
+		{ "file_append", File::APPEND },
+		{ 0, 0 }
+	};
+
+	int luaopen_love_filesystem(lua_State * L)
 	{
-		// List of functions to wrap.
-		static const luaL_Reg functions[] = {
-			{ "init",  w_init },
-			{ "setIdentity",  w_setIdentity },
-			{ "setSource",  w_setSource },
-			{ "newFile",  w_newFile },
-			{ "getWorkingDirectory",  w_getWorkingDirectory },
-			{ "getUserDirectory",  w_getUserDirectory },
-			{ "getAppdataDirectory",  w_getAppdataDirectory },
-			{ "getSaveDirectory",  w_getSaveDirectory },
-			{ "exists",  w_exists },
-			{ "isDirectory",  w_isDirectory },
-			{ "isFile",  w_isFile },
-			{ "mkdir",  w_mkdir },
-			{ "remove",  w_remove },
-			{ "read",  w_read },
-			{ "write",  w_write },
-			{ "enumerate",  w_enumerate },
-			{ "lines",  w_lines },
-			{ "load",  w_load },
-			{ 0, 0 }
-		};
-
-		static const lua_CFunction types[] = {
-			luaopen_file,
-			luaopen_filedata,
-			0
-		};
-
-		// List of constants.
-		static const LuaConstant constants[] = {
-			{ "file_closed", File::CLOSED },
-			{ "file_read", File::READ },
-			{ "file_write", File::WRITE },
-			{ "file_append", File::APPEND },
-			{ 0, 0 }
-		};
-
 		if(instance == 0)
 		{
 			try 

+ 13 - 13
src/modules/font/freetype/wrap_Font.cpp

@@ -53,21 +53,21 @@ namespace freetype
 		return 1;
 	}
 
-	int luaopen_font(lua_State * L)
-	{
-		// List of functions to wrap.
-		static const luaL_Reg functions[] = {
-			{ "newRasterizer",  w_newRasterizer },
-			{ "newGlyphData",  w_newGlyphData },
-			{ 0, 0 }
-		};
+	// List of functions to wrap.
+	static const luaL_Reg functions[] = {
+		{ "newRasterizer",  w_newRasterizer },
+		{ "newGlyphData",  w_newGlyphData },
+		{ 0, 0 }
+	};
 
-		static const lua_CFunction types[] = {
-			luaopen_glyphdata,
-			luaopen_rasterizer,
-			0
-		};
+	static const lua_CFunction types[] = {
+		luaopen_glyphdata,
+		luaopen_rasterizer,
+		0
+	};
 
+	int luaopen_love_font(lua_State * L)
+	{
 		if(instance == 0)
 		{
 			try

+ 6 - 6
src/modules/font/wrap_GlyphData.cpp

@@ -29,14 +29,14 @@ namespace font
 		return luax_checktype<GlyphData>(L, idx, "GlyphData", FONT_GLYPH_DATA_T);
 	}
 	
+	static const luaL_Reg functions[] = {
+		{ "getPointer", w_Data_getPointer },
+		{ "getSize", w_Data_getSize },
+		{ 0, 0 }
+	};
+
 	int luaopen_glyphdata(lua_State * L)
 	{
-		static const luaL_Reg functions[] = {
-			{ "getPointer", w_Data_getPointer },
-			{ "getSize", w_Data_getSize },
-			{ 0, 0 }
-		};
-
 		return luax_register_type(L, "GlyphData", functions);
 	}
 

+ 7 - 7
src/modules/font/wrap_Rasterizer.cpp

@@ -31,15 +31,15 @@ namespace font
 		return luax_checktype<Rasterizer>(L, idx, "Rasterizer", FONT_RASTERIZER_T);
 	}
 
+	static const luaL_Reg functions[] = {
+		// Data
+		{ "getPointer", w_Data_getPointer },
+		{ "getSize", w_Data_getSize },
+		{ 0, 0 }
+	};
+
 	int luaopen_rasterizer(lua_State * L)
 	{
-		static const luaL_Reg functions[] = {
-			// Data
-			{ "getPointer", w_Data_getPointer },
-			{ "getSize", w_Data_getSize },
-			{ 0, 0 }
-		};
-
 		return luax_register_type(L, "Rasterizer", functions);
 	}
 

+ 8 - 8
src/modules/graphics/opengl/wrap_Font.cpp

@@ -62,16 +62,16 @@ namespace opengl
 		return 1;
 	}
 
+	static const luaL_Reg functions[] = {
+		{ "getHeight", w_Font_getHeight },
+		{ "getWidth", w_Font_getWidth },
+		{ "setLineHeight", w_Font_setLineHeight },
+		{ "getLineHeight", w_Font_getLineHeight },
+		{ 0, 0 }
+	};
+
 	int luaopen_font(lua_State * L)
 	{
-		static const luaL_Reg functions[] = {
-			{ "getHeight", w_Font_getHeight },
-			{ "getWidth", w_Font_getWidth },
-			{ "setLineHeight", w_Font_setLineHeight },
-			{ "getLineHeight", w_Font_getLineHeight },
-			{ 0, 0 }
-		};
-
 		return luax_register_type(L, "Font", functions);
 	}
 

+ 2 - 3
src/modules/graphics/opengl/wrap_Frame.cpp

@@ -44,10 +44,9 @@ namespace opengl
 		{ 0, 0 }
 	};
 
-	int w_Frame_open(lua_State * L)
+	int luaopen_frame(lua_State * L)
 	{
-		luax_register_type(L, "Frame", w_Frame_functions);
-		return 0;
+		return luax_register_type(L, "Frame", w_Frame_functions);
 	}
 
 } // opengl

+ 3 - 3
src/modules/graphics/opengl/wrap_Glyph.cpp

@@ -32,13 +32,13 @@ namespace opengl
 		return luax_checktype<Glyph>(L, idx, "Glyph", GRAPHICS_GLYPH_T);
 	}
 
-	static const luaL_Reg w_Glyph_functions[] = {
+	static const luaL_Reg functions[] = {
 		{ 0, 0 }
 	};
 
-	int w_Glyph_open(lua_State * L)
+	int luaopen_glyph(lua_State * L)
 	{
-		luax_register_type(L, "Glyph", w_Glyph_functions);
+		luax_register_type(L, "Glyph", functions);
 		return 0;
 	}
 

+ 133 - 133
src/modules/graphics/opengl/wrap_Graphics.cpp

@@ -703,153 +703,153 @@ namespace opengl
 		return 0;
 	}
 
-	int luaopen_love_graphics(lua_State * L)
-	{
 
-		// List of functions to wrap.
-		static const luaL_Reg functions[] = {
-			{ "checkMode", w_checkMode },
-			{ "setMode", w_setMode },
-			{ "toggleFullscreen", w_toggleFullscreen },
-			{ "reset", w_reset },
-			{ "clear", w_clear },
-			{ "present", w_present },
-
-			{ "newImage", w_newImage },
-			{ "newGlyph", w_newGlyph },
-			{ "newFrame", w_newFrame },
-			{ "newFont", w_newFont },
-			{ "newImageFont", w_newImageFont },
-			{ "newSpriteBatch", w_newSpriteBatch },
-
-			{ "setColor", w_setColor },
-			{ "getColor", w_getColor },
-			{ "setBackgroundColor", w_setBackgroundColor },
-			{ "getBackgroundColor", w_getBackgroundColor },
-
-			{ "setFont", w_setFont },
-			{ "getFont", w_getFont },
-
-			{ "setBlendMode", w_setBlendMode },
-			{ "setColorMode", w_setColorMode },
-			{ "getBlendMode", w_getBlendMode },
-			{ "getColorMode", w_getColorMode },
-			{ "setLineWidth", w_setLineWidth },
-			{ "setLineStyle", w_setLineStyle },
-			{ "setLine", w_setLine },
-			{ "setLineStipple", w_setLineStipple },
-			{ "getLineWidth", w_getLineWidth },
-			{ "getLineStyle", w_getLineStyle },
-			{ "getLineStipple", w_getLineStipple },
-			{ "setPointSize", w_setPointSize },
-			{ "setPointStyle", w_setPointStyle },
-			{ "setPoint", w_setPoint },
-			{ "getPointSize", w_getPointSize },
-			{ "getPointStyle", w_getPointStyle },
-			{ "getMaxPointSize", w_getMaxPointSize },
-
-			{ "draw", w_draw },
-			{ "draws", w_draws },
-			{ "drawf", w_drawf },
-			{ "drawTest", w_drawTest },
-
-			{ "print1", w_print1 },
-			{ "printf1", w_printf1 },
-
-			{ "setCaption", w_setCaption },
-			{ "getCaption", w_getCaption },
-
-			{ "getWidth", w_getWidth },
-			{ "getHeight", w_getHeight },
-
-			{ "isCreated", w_isCreated },
-
-			{ "getModes", w_getModes },
-
-			{ "setScissor", w_setScissor },
-			{ "getScissor", w_getScissor },
-
-			{ "point", w_point },
-			{ "line", w_line },
-			{ "triangle", w_triangle },
-			{ "rectangle", w_rectangle },
-			{ "quad", w_quad },
-			{ "circle", w_circle },
-
-			{ "polygon", w_polygon },
-
-			{ "push", w_push },
-			{ "pop", w_pop },
-			{ "rotate", w_rotate },
-			{ "scale", w_scale },
-
-			{ "translate", w_translate },
-
-			{ 0, 0 }
-		};
-
-		// Types for this module.
-		static const lua_CFunction types[] = {
-			luaopen_font, 
-			luaopen_image, 
-			luaopen_glyph,
-			luaopen_frame, 
-			luaopen_spritebatch, 
-			0		
-		};
-
-		// List of constants.
-		static const LuaConstant constants[] = {
-
-			{ "align_left", Graphics::ALIGN_LEFT },
-			{ "align_right", Graphics::ALIGN_RIGHT },
-			{ "align_center", Graphics::ALIGN_CENTER },
+	// List of functions to wrap.
+	static const luaL_Reg functions[] = {
+		{ "checkMode", w_checkMode },
+		{ "setMode", w_setMode },
+		{ "toggleFullscreen", w_toggleFullscreen },
+		{ "reset", w_reset },
+		{ "clear", w_clear },
+		{ "present", w_present },
+
+		{ "newImage", w_newImage },
+		{ "newGlyph", w_newGlyph },
+		{ "newFrame", w_newFrame },
+		{ "newFont", w_newFont },
+		{ "newImageFont", w_newImageFont },
+		{ "newSpriteBatch", w_newSpriteBatch },
+
+		{ "setColor", w_setColor },
+		{ "getColor", w_getColor },
+		{ "setBackgroundColor", w_setBackgroundColor },
+		{ "getBackgroundColor", w_getBackgroundColor },
+
+		{ "setFont", w_setFont },
+		{ "getFont", w_getFont },
+
+		{ "setBlendMode", w_setBlendMode },
+		{ "setColorMode", w_setColorMode },
+		{ "getBlendMode", w_getBlendMode },
+		{ "getColorMode", w_getColorMode },
+		{ "setLineWidth", w_setLineWidth },
+		{ "setLineStyle", w_setLineStyle },
+		{ "setLine", w_setLine },
+		{ "setLineStipple", w_setLineStipple },
+		{ "getLineWidth", w_getLineWidth },
+		{ "getLineStyle", w_getLineStyle },
+		{ "getLineStipple", w_getLineStipple },
+		{ "setPointSize", w_setPointSize },
+		{ "setPointStyle", w_setPointStyle },
+		{ "setPoint", w_setPoint },
+		{ "getPointSize", w_getPointSize },
+		{ "getPointStyle", w_getPointStyle },
+		{ "getMaxPointSize", w_getMaxPointSize },
+
+		{ "draw", w_draw },
+		{ "draws", w_draws },
+		{ "drawf", w_drawf },
+		{ "drawTest", w_drawTest },
+
+		{ "print1", w_print1 },
+		{ "printf1", w_printf1 },
+
+		{ "setCaption", w_setCaption },
+		{ "getCaption", w_getCaption },
+
+		{ "getWidth", w_getWidth },
+		{ "getHeight", w_getHeight },
+
+		{ "isCreated", w_isCreated },
+
+		{ "getModes", w_getModes },
+
+		{ "setScissor", w_setScissor },
+		{ "getScissor", w_getScissor },
+
+		{ "point", w_point },
+		{ "line", w_line },
+		{ "triangle", w_triangle },
+		{ "rectangle", w_rectangle },
+		{ "quad", w_quad },
+		{ "circle", w_circle },
+
+		{ "polygon", w_polygon },
+
+		{ "push", w_push },
+		{ "pop", w_pop },
+		{ "rotate", w_rotate },
+		{ "scale", w_scale },
+
+		{ "translate", w_translate },
+
+		{ 0, 0 }
+	};
+
+	// Types for this module.
+	static const lua_CFunction types[] = {
+		luaopen_font, 
+		luaopen_image, 
+		luaopen_glyph,
+		luaopen_frame, 
+		luaopen_spritebatch, 
+		0		
+	};
+
+	// List of constants.
+	static const LuaConstant constants[] = {
+
+		{ "align_left", Graphics::ALIGN_LEFT },
+		{ "align_right", Graphics::ALIGN_RIGHT },
+		{ "align_center", Graphics::ALIGN_CENTER },
 
-			{ "blend_alpha", Graphics::BLEND_ALPHA },
-			{ "blend_additive", Graphics::BLEND_ADDITIVE },
-			{ "color_replace", Graphics::COLOR_REPLACE },
-			{ "color_modulate", Graphics::COLOR_MODULATE },
+		{ "blend_alpha", Graphics::BLEND_ALPHA },
+		{ "blend_additive", Graphics::BLEND_ADDITIVE },
+		{ "color_replace", Graphics::COLOR_REPLACE },
+		{ "color_modulate", Graphics::COLOR_MODULATE },
 
-			{ "draw_line", Graphics::DRAW_LINE },
-			{ "draw_fill", Graphics::DRAW_FILL },
+		{ "draw_line", Graphics::DRAW_LINE },
+		{ "draw_fill", Graphics::DRAW_FILL },
 
-			{ "line_smooth", Graphics::LINE_SMOOTH },
-			{ "line_rough", Graphics::LINE_ROUGH },
+		{ "line_smooth", Graphics::LINE_SMOOTH },
+		{ "line_rough", Graphics::LINE_ROUGH },
 
-			{ "point_smooth", Graphics::POINT_SMOOTH },
-			{ "point_rough", Graphics::POINT_ROUGH },
+		{ "point_smooth", Graphics::POINT_SMOOTH },
+		{ "point_rough", Graphics::POINT_ROUGH },
 
-			{ "filter_linear", Image::FILTER_LINEAR },
-			{ "filter_nearest", Image::FILTER_NEAREST },
+		{ "filter_linear", Image::FILTER_LINEAR },
+		{ "filter_nearest", Image::FILTER_NEAREST },
 
-			{ "wrap_clamp", Image::WRAP_CLAMP },
-			{ "wrap_repeat", Image::WRAP_REPEAT },
+		{ "wrap_clamp", Image::WRAP_CLAMP },
+		{ "wrap_repeat", Image::WRAP_REPEAT },
 
-			/**
+		/**
 
-			// Vertex buffer geometry types.
+		// Vertex buffer geometry types.
 
-			{ "type_points", TYPE_POINTS },
-			{ "type_lines", TYPE_LINES },
-			{ "type_line_strip", TYPE_LINE_STRIP },
-			{ "type_triangles", TYPE_TRIANGLES },
-			{ "type_triangle_strip", TYPE_TRIANGLE_STRIP },
-			{ "type_triangle_fan", TYPE_TRIANGLE_FAN },
-			{ "type_num", TYPE_NUM },
-			
-			// Vertex buffer usage hints.
+		{ "type_points", TYPE_POINTS },
+		{ "type_lines", TYPE_LINES },
+		{ "type_line_strip", TYPE_LINE_STRIP },
+		{ "type_triangles", TYPE_TRIANGLES },
+		{ "type_triangle_strip", TYPE_TRIANGLE_STRIP },
+		{ "type_triangle_fan", TYPE_TRIANGLE_FAN },
+		{ "type_num", TYPE_NUM },
+		
+		// Vertex buffer usage hints.
 
-			{ "usage_array", USAGE_ARRAY },
-			{ "usage_dynamic", USAGE_DYNAMIC },
-			{ "usage_static", USAGE_STATIC },
-			{ "usage_stream", USAGE_STREAM },
-			{ "usage_num", USAGE_NUM },
-			**/
+		{ "usage_array", USAGE_ARRAY },
+		{ "usage_dynamic", USAGE_DYNAMIC },
+		{ "usage_static", USAGE_STATIC },
+		{ "usage_stream", USAGE_STREAM },
+		{ "usage_num", USAGE_NUM },
+		**/
 
 
-			{ 0, 0 }
-		};
+		{ 0, 0 }
+	};
 
+	int luaopen_love_graphics(lua_State * L)
+	{
 		if(instance == 0)
 		{
 			try 

+ 3 - 4
src/modules/graphics/opengl/wrap_Image.cpp

@@ -84,7 +84,7 @@ namespace opengl
 		return 2;
 	}
 
-	static const luaL_Reg w_Image_functions[] = {
+	static const luaL_Reg functions[] = {
 		{ "getWidth", w_Image_getWidth },
 		{ "getHeight", w_Image_getHeight },
 		{ "setFilter", w_Image_setFilter },
@@ -94,10 +94,9 @@ namespace opengl
 		{ 0, 0 }
 	};
 
-	int w_Image_open(lua_State * L)
+	int luaopen_image(lua_State * L)
 	{
-		luax_register_type(L, "Image", w_Image_functions);
-		return 0;
+		return luax_register_type(L, "Image", functions);
 	}
 
 } // opengl

+ 9 - 9
src/modules/graphics/opengl/wrap_SpriteBatch.cpp

@@ -66,16 +66,16 @@ namespace opengl
 		return 0;
 	}
 
-	int w_SpriteBatch_open(lua_State * L)
-	{
-		static const luaL_Reg functions[] = {
-			{ "add", w_SpriteBatch_add },
-			{ "clear", w_SpriteBatch_clear },
-			{ "lock", w_SpriteBatch_lock },
-			{ "unlock", w_SpriteBatch_unlock },
-			{ 0, 0 }
-		};
+	static const luaL_Reg functions[] = {
+		{ "add", w_SpriteBatch_add },
+		{ "clear", w_SpriteBatch_clear },
+		{ "lock", w_SpriteBatch_lock },
+		{ "unlock", w_SpriteBatch_unlock },
+		{ 0, 0 }
+	};
 
+	int luaopen_spritebatch(lua_State * L)
+	{
 		return luax_register_type(L, "SpriteBatch", functions);
 	}
 

+ 11 - 11
src/modules/image/wrap_Image.cpp

@@ -52,19 +52,19 @@ namespace image
 		return 1;
 	}
 
-	int w_Image_open(lua_State * L)
-	{
-		// List of functions to wrap.
-		static const luaL_Reg functions[] = {
-			{ "newImageData",  w_newImageData },
-			{ 0, 0 }
-		};
+	// List of functions to wrap.
+	static const luaL_Reg functions[] = {
+		{ "newImageData",  w_newImageData },
+		{ 0, 0 }
+	};
 
-		static const lua_CFunction types[] = {
-			luaopen_imagedata,
-			0
-		};
+	static const lua_CFunction types[] = {
+		luaopen_imagedata,
+		0
+	};
 
+	int luaopen_love_image(lua_State * L)
+	{
 		if(instance == 0)
 		{
 			try 

+ 16 - 16
src/modules/image/wrap_ImageData.cpp

@@ -127,24 +127,24 @@ namespace image
 		return 0;
 	}
 
+	static const luaL_Reg functions[] = {
+
+		// Data
+		{ "getPointer", w_Data_getPointer },
+		{ "getSize", w_Data_getSize },
+
+		{ "getWidth", w_ImageData_getWidth },
+		{ "getHeight", w_ImageData_getHeight },
+		{ "getPixel", w_ImageData_getPixel },
+		{ "setPixel", w_ImageData_setPixel },
+		{ "mapPixel", w_ImageData_mapPixel },
+		{ "getString", w_ImageData_getString },
+		{ "paste", w_ImageData_paste },
+		{ 0, 0 }
+	};
+
 	int luaopen_imagedata(lua_State * L)
 	{
-		static const luaL_Reg functions[] = {
-
-			// Data
-			{ "getPointer", w_Data_getPointer },
-			{ "getSize", w_Data_getSize },
-
-			{ "getWidth", w_ImageData_getWidth },
-			{ "getHeight", w_ImageData_getHeight },
-			{ "getPixel", w_ImageData_getPixel },
-			{ "setPixel", w_ImageData_setPixel },
-			{ "mapPixel", w_ImageData_mapPixel },
-			{ "getString", w_ImageData_getString },
-			{ "paste", w_ImageData_paste },
-			{ 0, 0 }
-		};
-
 		return luax_register_type(L, "ImageData", functions);
 	}
 

+ 39 - 39
src/modules/joystick/sdl/wrap_Joystick.cpp

@@ -124,46 +124,46 @@ namespace sdl
 		return 0;
 	}
 
-	int luaopen_joystick(lua_State * L)
-	{
-		// List of functions to wrap.
-		static const luaL_Reg functions[] = {
-			{ "getNumJoysticks", w_getNumJoysticks },
-			{ "getName", w_getName },
-			{ "open", w_open },
-			{ "isOpen", w_isOpen },
-			{ "getNumAxes", w_getNumAxes },
-			{ "getNumBalls", w_getNumBalls },
-			{ "getNumButtons", w_getNumButtons },
-			{ "getNumHats", w_getNumHats },
-			{ "getAxis", w_getAxis },
-
-			{ "getAxes", w_getAxes },
-			{ "getBall", w_getBall },
-
-			{ "isDown", w_isDown },
-			{ "getHat", w_getHat },
-			{ "close", w_close },
-			{ 0, 0 }
-		};
-
-		// List of constants.
-		static const LuaConstant constants[] = {
-			{ "joystick_axis_horizontal", Joystick::JOYSTICK_AXIS_HORIZONTAL },
-			{ "joystick_axis_vertical", Joystick::JOYSTICK_AXIS_VERITCAL },
+	// List of functions to wrap.
+	static const luaL_Reg functions[] = {
+		{ "getNumJoysticks", w_getNumJoysticks },
+		{ "getName", w_getName },
+		{ "open", w_open },
+		{ "isOpen", w_isOpen },
+		{ "getNumAxes", w_getNumAxes },
+		{ "getNumBalls", w_getNumBalls },
+		{ "getNumButtons", w_getNumButtons },
+		{ "getNumHats", w_getNumHats },
+		{ "getAxis", w_getAxis },
+
+		{ "getAxes", w_getAxes },
+		{ "getBall", w_getBall },
+
+		{ "isDown", w_isDown },
+		{ "getHat", w_getHat },
+		{ "close", w_close },
+		{ 0, 0 }
+	};
+
+	// List of constants.
+	static const LuaConstant constants[] = {
+		{ "joystick_axis_horizontal", Joystick::JOYSTICK_AXIS_HORIZONTAL },
+		{ "joystick_axis_vertical", Joystick::JOYSTICK_AXIS_VERITCAL },
 
-			{ "joystick_hat_centered", Joystick::JOYSTICK_HAT_CENTERED },
-			{ "joystick_hat_up", Joystick::JOYSTICK_HAT_UP },
-			{ "joystick_hat_right", Joystick::JOYSTICK_HAT_RIGHT },
-			{ "joystick_hat_down", Joystick::JOYSTICK_HAT_DOWN },
-			{ "joystick_hat_left", Joystick::JOYSTICK_HAT_LEFT },
-			{ "joystick_hat_rightup", Joystick::JOYSTICK_HAT_RIGHTUP },
-			{ "joystick_hat_rightdown", Joystick::JOYSTICK_HAT_RIGHTDOWN },
-			{ "joystick_hat_leftup", Joystick::JOYSTICK_HAT_LEFTUP },
-			{ "joystick_hat_leftdown", Joystick::JOYSTICK_HAT_LEFTDOWN },
-			{ 0, 0 }
-		};
-
+		{ "joystick_hat_centered", Joystick::JOYSTICK_HAT_CENTERED },
+		{ "joystick_hat_up", Joystick::JOYSTICK_HAT_UP },
+		{ "joystick_hat_right", Joystick::JOYSTICK_HAT_RIGHT },
+		{ "joystick_hat_down", Joystick::JOYSTICK_HAT_DOWN },
+		{ "joystick_hat_left", Joystick::JOYSTICK_HAT_LEFT },
+		{ "joystick_hat_rightup", Joystick::JOYSTICK_HAT_RIGHTUP },
+		{ "joystick_hat_rightdown", Joystick::JOYSTICK_HAT_RIGHTDOWN },
+		{ "joystick_hat_leftup", Joystick::JOYSTICK_HAT_LEFTUP },
+		{ "joystick_hat_leftdown", Joystick::JOYSTICK_HAT_LEFTDOWN },
+		{ 0, 0 }
+	};
+
+	int luaopen_love_joystick(lua_State * L)
+	{
 		if(instance == 0)
 		{
 			try 

+ 152 - 152
src/modules/keyboard/sdl/wrap_Keyboard.cpp

@@ -56,170 +56,170 @@ namespace sdl
 		return 2;
 	}
 
-	int luaopen_love_keyboard(lua_State * L)
-	{
-		// List of functions to wrap.
-		static const luaL_Reg functions[] = {
-			{ "isDown", w_isDown },
-			{ "setKeyRepeat", w_setKeyRepeat },
-			{ "getKeyRepeat", w_getKeyRepeat },
-			{ 0, 0 }
-		};
+	// List of functions to wrap.
+	static const luaL_Reg functions[] = {
+		{ "isDown", w_isDown },
+		{ "setKeyRepeat", w_setKeyRepeat },
+		{ "getKeyRepeat", w_getKeyRepeat },
+		{ 0, 0 }
+	};
 
-		// List of constants.
-		static const LuaConstant constants[] = {
-			{ "key_unknown", 0 },
-			{ "key_first", 0 },
-			{ "key_backspace", 8 },
-			{ "key_tab", 9 },
-			{ "key_clear", 12 },
-			{ "key_return", 13 },
-			{ "key_pause", 19 },
-			{ "key_escape", 27 },
-			{ "key_space", 32 },
-			{ "key_exclaim", 33 },
-			{ "key_quotedbl", 34 },
-			{ "key_hash", 35 },
-			{ "key_dollar", 36 },
-			{ "key_ampersand", 38 },
-			{ "key_quote", 39 },
-			{ "key_leftparen", 40 },
-			{ "key_rightparen", 41 },
-			{ "key_asterisk", 42 },
-			{ "key_plus", 43 },
-			{ "key_comma", 44 },
-			{ "key_minus", 45 },
-			{ "key_period", 46 },
-			{ "key_slash", 47 },
+	// List of constants.
+	static const LuaConstant constants[] = {
+		{ "key_unknown", 0 },
+		{ "key_first", 0 },
+		{ "key_backspace", 8 },
+		{ "key_tab", 9 },
+		{ "key_clear", 12 },
+		{ "key_return", 13 },
+		{ "key_pause", 19 },
+		{ "key_escape", 27 },
+		{ "key_space", 32 },
+		{ "key_exclaim", 33 },
+		{ "key_quotedbl", 34 },
+		{ "key_hash", 35 },
+		{ "key_dollar", 36 },
+		{ "key_ampersand", 38 },
+		{ "key_quote", 39 },
+		{ "key_leftparen", 40 },
+		{ "key_rightparen", 41 },
+		{ "key_asterisk", 42 },
+		{ "key_plus", 43 },
+		{ "key_comma", 44 },
+		{ "key_minus", 45 },
+		{ "key_period", 46 },
+		{ "key_slash", 47 },
 
-			{ "key_0", 48 },
-			{ "key_1", 49 },
-			{ "key_2", 50 },
-			{ "key_3", 51 },
-			{ "key_4", 52 },
-			{ "key_5", 53 },
-			{ "key_6", 54 },
-			{ "key_7", 55 },
-			{ "key_8", 56 },
-			{ "key_9", 57 },
+		{ "key_0", 48 },
+		{ "key_1", 49 },
+		{ "key_2", 50 },
+		{ "key_3", 51 },
+		{ "key_4", 52 },
+		{ "key_5", 53 },
+		{ "key_6", 54 },
+		{ "key_7", 55 },
+		{ "key_8", 56 },
+		{ "key_9", 57 },
 
-			{ "key_colon", 58 },
-			{ "key_semicolon", 59 },
-			{ "key_less", 60 },
-			{ "key_equals", 61 },
-			{ "key_greater", 62 },
-			{ "key_question", 63 },
-			{ "key_at", 64 },
+		{ "key_colon", 58 },
+		{ "key_semicolon", 59 },
+		{ "key_less", 60 },
+		{ "key_equals", 61 },
+		{ "key_greater", 62 },
+		{ "key_question", 63 },
+		{ "key_at", 64 },
 
-			{ "key_leftbracket", 91 },
-			{ "key_backslash", 92 },
-			{ "key_rightbracket", 93 },
-			{ "key_caret", 94 },
-			{ "key_underscore", 95 },
-			{ "key_backquote", 96 },
+		{ "key_leftbracket", 91 },
+		{ "key_backslash", 92 },
+		{ "key_rightbracket", 93 },
+		{ "key_caret", 94 },
+		{ "key_underscore", 95 },
+		{ "key_backquote", 96 },
 
-			{ "key_a", 97 },
-			{ "key_b", 98 },
-			{ "key_c", 99 },
-			{ "key_d", 100 },
-			{ "key_e", 101 },
-			{ "key_f", 102 },
-			{ "key_g", 103 },
-			{ "key_h", 104 },
-			{ "key_i", 105 },
-			{ "key_j", 106 },
-			{ "key_k", 107 },
-			{ "key_l", 108 },
-			{ "key_m", 109 },
-			{ "key_n", 110 },
-			{ "key_o", 111 },
-			{ "key_p", 112 },
-			{ "key_q", 113 },
-			{ "key_r", 114 },
-			{ "key_s", 115 },
-			{ "key_t", 116 },
-			{ "key_u", 117 },
-			{ "key_v", 118 },
-			{ "key_w", 119 },
-			{ "key_x", 120 },
-			{ "key_y", 121 },
-			{ "key_z", 122 },
-			{ "key_delete", 127 },
+		{ "key_a", 97 },
+		{ "key_b", 98 },
+		{ "key_c", 99 },
+		{ "key_d", 100 },
+		{ "key_e", 101 },
+		{ "key_f", 102 },
+		{ "key_g", 103 },
+		{ "key_h", 104 },
+		{ "key_i", 105 },
+		{ "key_j", 106 },
+		{ "key_k", 107 },
+		{ "key_l", 108 },
+		{ "key_m", 109 },
+		{ "key_n", 110 },
+		{ "key_o", 111 },
+		{ "key_p", 112 },
+		{ "key_q", 113 },
+		{ "key_r", 114 },
+		{ "key_s", 115 },
+		{ "key_t", 116 },
+		{ "key_u", 117 },
+		{ "key_v", 118 },
+		{ "key_w", 119 },
+		{ "key_x", 120 },
+		{ "key_y", 121 },
+		{ "key_z", 122 },
+		{ "key_delete", 127 },
 
-			{ "key_kp0", 256 },
-			{ "key_kp1", 257 },
-			{ "key_kp2", 258 },
-			{ "key_kp3", 259 },
-			{ "key_kp4", 260 },
-			{ "key_kp5", 261 },
-			{ "key_kp6", 262 },
-			{ "key_kp7", 263 },
-			{ "key_kp8", 264 },
-			{ "key_kp9", 265 },
-			{ "key_kp_period", 266 },
-			{ "key_kp_divide", 267 },
-			{ "key_kp_multiply", 268 },
-			{ "key_kp_minus", 269 },
-			{ "key_kp_plus", 270 },
-			{ "key_kp_enter", 271 },
-			{ "key_kp_equals", 272 },
+		{ "key_kp0", 256 },
+		{ "key_kp1", 257 },
+		{ "key_kp2", 258 },
+		{ "key_kp3", 259 },
+		{ "key_kp4", 260 },
+		{ "key_kp5", 261 },
+		{ "key_kp6", 262 },
+		{ "key_kp7", 263 },
+		{ "key_kp8", 264 },
+		{ "key_kp9", 265 },
+		{ "key_kp_period", 266 },
+		{ "key_kp_divide", 267 },
+		{ "key_kp_multiply", 268 },
+		{ "key_kp_minus", 269 },
+		{ "key_kp_plus", 270 },
+		{ "key_kp_enter", 271 },
+		{ "key_kp_equals", 272 },
 
-			{ "key_up", 273 },
-			{ "key_down", 274 },
-			{ "key_right", 275 },
-			{ "key_left", 276 },
-			{ "key_insert", 277 },
-			{ "key_home", 278 },
-			{ "key_end", 279 },
-			{ "key_pageup", 280 },
-			{ "key_pagedown", 281 },
+		{ "key_up", 273 },
+		{ "key_down", 274 },
+		{ "key_right", 275 },
+		{ "key_left", 276 },
+		{ "key_insert", 277 },
+		{ "key_home", 278 },
+		{ "key_end", 279 },
+		{ "key_pageup", 280 },
+		{ "key_pagedown", 281 },
 
-			{ "key_f1", 282 },
-			{ "key_f2", 283 },
-			{ "key_f3", 284 },
-			{ "key_f4", 285 },
-			{ "key_f5", 286 },
-			{ "key_f6", 287 },
-			{ "key_f7", 288 },
-			{ "key_f8", 289 },
-			{ "key_f9", 290 },
-			{ "key_f10", 291 },
-			{ "key_f11", 292 },
-			{ "key_f12", 293 },
-			{ "key_f13", 294 },
-			{ "key_f14", 295 },
-			{ "key_f15", 296 },
+		{ "key_f1", 282 },
+		{ "key_f2", 283 },
+		{ "key_f3", 284 },
+		{ "key_f4", 285 },
+		{ "key_f5", 286 },
+		{ "key_f6", 287 },
+		{ "key_f7", 288 },
+		{ "key_f8", 289 },
+		{ "key_f9", 290 },
+		{ "key_f10", 291 },
+		{ "key_f11", 292 },
+		{ "key_f12", 293 },
+		{ "key_f13", 294 },
+		{ "key_f14", 295 },
+		{ "key_f15", 296 },
 
-			{ "key_numlock", 300 },
-			{ "key_capslock", 301 },
-			{ "key_scrollock", 302 },
-			{ "key_rshift", 303 },
-			{ "key_lshift", 304 },
-			{ "key_rctrl", 305 },
-			{ "key_lctrl", 306 },
-			{ "key_ralt", 307 },
-			{ "key_lalt", 308 },
-			{ "key_rmeta", 309 },
-			{ "key_lmeta", 310 },
-			{ "key_lsuper", 311 },
-			{ "key_rsuper", 312 },
-			{ "key_mode", 313 },
-			{ "key_compose", 314 },
+		{ "key_numlock", 300 },
+		{ "key_capslock", 301 },
+		{ "key_scrollock", 302 },
+		{ "key_rshift", 303 },
+		{ "key_lshift", 304 },
+		{ "key_rctrl", 305 },
+		{ "key_lctrl", 306 },
+		{ "key_ralt", 307 },
+		{ "key_lalt", 308 },
+		{ "key_rmeta", 309 },
+		{ "key_lmeta", 310 },
+		{ "key_lsuper", 311 },
+		{ "key_rsuper", 312 },
+		{ "key_mode", 313 },
+		{ "key_compose", 314 },
 
-			{ "key_help", 315 },
-			{ "key_print", 316 },
-			{ "key_sysreq", 317 },
-			{ "key_break", 318 },
-			{ "key_menu", 319 },
-			{ "key_power", 320 },
-			{ "key_euro", 321 },
-			{ "key_undo", 322 },
+		{ "key_help", 315 },
+		{ "key_print", 316 },
+		{ "key_sysreq", 317 },
+		{ "key_break", 318 },
+		{ "key_menu", 319 },
+		{ "key_power", 320 },
+		{ "key_euro", 321 },
+		{ "key_undo", 322 },
 
-			{ "key_repeat_delay", Keyboard::KEY_REPEAT_DELAY },
-			{ "key_repeat_interval", Keyboard::KEY_REPEAT_INTERVAL },
-			{ 0, 0 }
-		};
+		{ "key_repeat_delay", Keyboard::KEY_REPEAT_DELAY },
+		{ "key_repeat_interval", Keyboard::KEY_REPEAT_INTERVAL },
+		{ 0, 0 }
+	};
 
+	int luaopen_love_keyboard(lua_State * L)
+	{
 		if(instance == 0)
 		{
 			try 

+ 26 - 31
src/modules/mouse/sdl/wrap_Mouse.cpp

@@ -90,33 +90,33 @@ namespace sdl
 		return 1;
 	}
 	
-
-	int w_Mouse_open(lua_State * L)
+	// List of functions to wrap.
+	static const luaL_Reg functions[] = {
+		{ "getX", w_getX },
+		{ "getY", w_getY },
+		{ "setPosition", w_setPosition },
+		{ "isDown", w_isDown },
+		{ "setVisible", w_setVisible },
+		{ "isVisible", w_isVisible },
+		{ "getPosition", w_getPosition },
+		{ "setGrab", w_setGrap },
+		{ "isGrabbed", w_isGrabbed },
+		{ 0, 0 }
+	};
+
+	// List of constants.
+	static const LuaConstant constants[] = {
+		{ "mouse_left", Mouse::MOUSE_LEFT },
+		{ "mouse_middle", Mouse::MOUSE_MIDDLE },
+		{ "mouse_right", Mouse::MOUSE_RIGHT },
+		{ "mouse_wheelup", Mouse::MOUSE_WHEELUP },
+		{ "mouse_wheeldown", Mouse::MOUSE_WHEELDOWN },
+		{ 0, 0 }
+	};
+
+
+	int luaopen_love_mouse(lua_State * L)
 	{
-		// List of functions to wrap.
-		static const luaL_Reg functions[] = {
-			{ "getX", w_getX },
-			{ "getY", w_getY },
-			{ "setPosition", w_setPosition },
-			{ "isDown", w_isDown },
-			{ "setVisible", w_setVisible },
-			{ "isVisible", w_isVisible },
-			{ "getPosition", w_getPosition },
-			{ "setGrab", w_setGrap },
-			{ "isGrabbed", w_isGrabbed },
-			{ 0, 0 }
-		};
-
-		// List of constants.
-		static const LuaConstant constants[] = {
-			{ "mouse_left", Mouse::MOUSE_LEFT },
-			{ "mouse_middle", Mouse::MOUSE_MIDDLE },
-			{ "mouse_right", Mouse::MOUSE_RIGHT },
-			{ "mouse_wheelup", Mouse::MOUSE_WHEELUP },
-			{ "mouse_wheeldown", Mouse::MOUSE_WHEELDOWN },
-			{ 0, 0 }
-		};
-
 		if(instance == 0)
 		{
 			try 
@@ -137,8 +137,3 @@ namespace sdl
 } // sdl
 } // mouse
 } // love
-
-int luaopen_love_mouse(lua_State * L)
-{
-	return love::mouse::sdl::w_Mouse_open(L);
-}

+ 8 - 8
src/modules/native/tcc/wrap_Native.cpp

@@ -114,15 +114,15 @@ namespace tcc
 		return 1;
 	}
 
-	int luaopen_native(lua_State * L)
+	// List of functions to wrap.
+	static const luaL_Reg functions[] = {
+		{ "compile", w_compile },
+		{ "getSymbol", w_getSymbol },
+		{ 0, 0 }
+	};
+
+	int luaopen_love_native(lua_State * L)
 	{
-		// List of functions to wrap.
-		static const luaL_Reg functions[] = {
-			{ "compile", w_compile },
-			{ "getSymbol", w_getSymbol },
-			{ 0, 0 }
-		};
-
 		if(instance == 0)
 		{
 			try 

+ 44 - 43
src/modules/physics/box2d/wrap_Body.cpp

@@ -326,51 +326,52 @@ namespace box2d
 		return 0;
 	}
 
+	static const luaL_Reg functions[] = {
+		{ "getX", w_Body_getX },
+		{ "getY", w_Body_getY },
+		{ "getAngle", w_Body_getAngle },
+		{ "getPosition", w_Body_getPosition },
+		{ "getLinearVelocity", w_Body_getLinearVelocity },
+		{ "getWorldCenter", w_Body_getWorldCenter },
+		{ "getLocalCenter", w_Body_getLocalCenter },
+		{ "getAngularVelocity", w_Body_getAngularVelocity },
+		{ "getMass", w_Body_getMass },
+		{ "getInertia", w_Body_getInertia },
+		{ "getAngularDamping", w_Body_getAngularDamping },
+		{ "getLinearDamping", w_Body_getLinearDamping },
+		{ "applyImpulse", w_Body_applyImpulse },
+		{ "applyTorque", w_Body_applyTorque },
+		{ "applyForce", w_Body_applyForce },
+		{ "setX", w_Body_setX },
+		{ "setY", w_Body_setY },
+		{ "setLinearVelocity", w_Body_setLinearVelocity },
+		{ "setAngle", w_Body_setAngle },
+		{ "setAngularVelocity", w_Body_setAngularVelocity },
+		{ "setPosition", w_Body_setPosition },
+		{ "setMassFromShapes", w_Body_setMassFromShapes },
+		{ "setMass", w_Body_setMass },
+		{ "setAngularDamping", w_Body_setAngularDamping },
+		{ "setLinearDamping", w_Body_setLinearDamping },
+		{ "getWorldPoint", w_Body_getWorldPoint },
+		{ "getWorldVector", w_Body_getWorldVector },
+		{ "getLocalPoint", w_Body_getLocalPoint },
+		{ "getLocalVector", w_Body_getLocalVector },
+		{ "getLinearVelocityFromWorldPoint", w_Body_getLinearVelocityFromWorldPoint },
+		{ "getLinearVelocityFromLocalPoint", w_Body_getLinearVelocityFromLocalPoint },
+		{ "isBullet", w_Body_isBullet },
+		{ "setBullet", w_Body_setBullet },
+		{ "isStatic", w_Body_isStatic },
+		{ "isDynamic", w_Body_isDynamic },
+		{ "isFrozen", w_Body_isFrozen },
+		{ "isSleeping", w_Body_isSleeping },
+		{ "setAllowSleeping", w_Body_setAllowSleeping },
+		{ "putToSleep", w_Body_putToSleep },
+		{ "wakeUp", w_Body_wakeUp },
+		{ 0, 0 }
+	};
+
 	int luaopen_body(lua_State * L)
 	{
-		static const luaL_Reg functions[] = {
-			{ "getX", w_Body_getX },
-			{ "getY", w_Body_getY },
-			{ "getAngle", w_Body_getAngle },
-			{ "getPosition", w_Body_getPosition },
-			{ "getLinearVelocity", w_Body_getLinearVelocity },
-			{ "getWorldCenter", w_Body_getWorldCenter },
-			{ "getLocalCenter", w_Body_getLocalCenter },
-			{ "getAngularVelocity", w_Body_getAngularVelocity },
-			{ "getMass", w_Body_getMass },
-			{ "getInertia", w_Body_getInertia },
-			{ "getAngularDamping", w_Body_getAngularDamping },
-			{ "getLinearDamping", w_Body_getLinearDamping },
-			{ "applyImpulse", w_Body_applyImpulse },
-			{ "applyTorque", w_Body_applyTorque },
-			{ "applyForce", w_Body_applyForce },
-			{ "setX", w_Body_setX },
-			{ "setY", w_Body_setY },
-			{ "setLinearVelocity", w_Body_setLinearVelocity },
-			{ "setAngle", w_Body_setAngle },
-			{ "setAngularVelocity", w_Body_setAngularVelocity },
-			{ "setPosition", w_Body_setPosition },
-			{ "setMassFromShapes", w_Body_setMassFromShapes },
-			{ "setMass", w_Body_setMass },
-			{ "setAngularDamping", w_Body_setAngularDamping },
-			{ "setLinearDamping", w_Body_setLinearDamping },
-			{ "getWorldPoint", w_Body_getWorldPoint },
-			{ "getWorldVector", w_Body_getWorldVector },
-			{ "getLocalPoint", w_Body_getLocalPoint },
-			{ "getLocalVector", w_Body_getLocalVector },
-			{ "getLinearVelocityFromWorldPoint", w_Body_getLinearVelocityFromWorldPoint },
-			{ "getLinearVelocityFromLocalPoint", w_Body_getLinearVelocityFromLocalPoint },
-			{ "isBullet", w_Body_isBullet },
-			{ "setBullet", w_Body_setBullet },
-			{ "isStatic", w_Body_isStatic },
-			{ "isDynamic", w_Body_isDynamic },
-			{ "isFrozen", w_Body_isFrozen },
-			{ "isSleeping", w_Body_isSleeping },
-			{ "setAllowSleeping", w_Body_setAllowSleeping },
-			{ "putToSleep", w_Body_putToSleep },
-			{ "wakeUp", w_Body_wakeUp },
-			{ 0, 0 }
-		};
 		return luax_register_type(L, "Body", functions);
 	}
 

+ 22 - 22
src/modules/physics/box2d/wrap_CircleShape.cpp

@@ -38,30 +38,30 @@ namespace box2d
 		return 1;
 	}
 
+	static const luaL_Reg functions[] = {
+		{ "getRadius", w_CircleShape_getRadius },
+		// From Shape.
+		{ "getType", w_Shape_getType },
+		{ "setFriction", w_Shape_setFriction },
+		{ "setRestitution", w_Shape_setRestitution },
+		{ "setDensity", w_Shape_setDensity },
+		{ "setSensor", w_Shape_setSensor },
+		{ "getFriction", w_Shape_getFriction },
+		{ "getRestituion", w_Shape_getRestituion },
+		{ "getDensity", w_Shape_getDensity },
+		{ "isSensor", w_Shape_isSensor },
+		{ "testPoint", w_Shape_testPoint },
+		{ "testSegment", w_Shape_testSegment },
+		{ "setFilterData", w_Shape_setFilterData },
+		{ "getFilterData", w_Shape_getFilterData },
+		{ "setData", w_Shape_setData },
+		{ "getData", w_Shape_getData },
+		{ "getBoundingBox", w_Shape_getBoundingBox },
+		{ 0, 0 }
+	};
+
 	int luaopen_circleshape(lua_State * L)
 	{
-		static const luaL_Reg functions[] = {
-			{ "getRadius", w_CircleShape_getRadius },
-			// From Shape.
-			{ "getType", w_Shape_getType },
-			{ "setFriction", w_Shape_setFriction },
-			{ "setRestitution", w_Shape_setRestitution },
-			{ "setDensity", w_Shape_setDensity },
-			{ "setSensor", w_Shape_setSensor },
-			{ "getFriction", w_Shape_getFriction },
-			{ "getRestituion", w_Shape_getRestituion },
-			{ "getDensity", w_Shape_getDensity },
-			{ "isSensor", w_Shape_isSensor },
-			{ "testPoint", w_Shape_testPoint },
-			{ "testSegment", w_Shape_testSegment },
-			{ "setFilterData", w_Shape_setFilterData },
-			{ "getFilterData", w_Shape_getFilterData },
-			{ "setData", w_Shape_setData },
-			{ "getData", w_Shape_getData },
-			{ "getBoundingBox", w_Shape_getBoundingBox },
-			{ 0, 0 }
-		};
-
 		return luax_register_type(L, "CircleShape", functions);
 	}
 

+ 17 - 17
src/modules/physics/box2d/wrap_DistanceJoint.cpp

@@ -76,25 +76,25 @@ namespace box2d
 		return 1;
 	}
 
+	static const luaL_Reg functions[] = {
+		{ "setLength", w_DistanceJoint_setLength },
+		{ "getLength", w_DistanceJoint_getLength },
+		{ "setFrequency", w_DistanceJoint_setFrequency },
+		{ "getFrequency", w_DistanceJoint_getFrequency },
+		{ "setDamping", w_DistanceJoint_setDampingRatio },
+		{ "getDamping", w_DistanceJoint_getDampingRatio },
+		// From Joint.
+		{ "getType", w_Joint_getType },
+		{ "getAnchors", w_Joint_getAnchors },
+		{ "getReactionForce", w_Joint_getReactionForce },
+		{ "getReactionTorque", w_Joint_getReactionTorque },
+		{ "setCollideConnected", w_Joint_setCollideConnected },
+		{ "getCollideConnected", w_Joint_getCollideConnected },
+		{ 0, 0 }
+	};
+
 	int luaopen_distancejoint(lua_State * L)
 	{
-		static const luaL_Reg functions[] = {
-			{ "setLength", w_DistanceJoint_setLength },
-			{ "getLength", w_DistanceJoint_getLength },
-			{ "setFrequency", w_DistanceJoint_setFrequency },
-			{ "getFrequency", w_DistanceJoint_getFrequency },
-			{ "setDamping", w_DistanceJoint_setDampingRatio },
-			{ "getDamping", w_DistanceJoint_getDampingRatio },
-			// From Joint.
-			{ "getType", w_Joint_getType },
-			{ "getAnchors", w_Joint_getAnchors },
-			{ "getReactionForce", w_Joint_getReactionForce },
-			{ "getReactionTorque", w_Joint_getReactionTorque },
-			{ "setCollideConnected", w_Joint_setCollideConnected },
-			{ "getCollideConnected", w_Joint_getCollideConnected },
-			{ 0, 0 }
-		};
-
 		return luax_register_type(L, "DistanceJoint", functions);
 	}
 

+ 13 - 12
src/modules/physics/box2d/wrap_GearJoint.cpp

@@ -46,20 +46,21 @@ namespace box2d
 		return 1;
 	}
 
+	static const luaL_Reg functions[] = {
+		{ "setRatio", w_GearJoint_setRatio },
+		{ "getRatio", w_GearJoint_getRatio },
+		// From Joint.
+		{ "getType", w_Joint_getType },
+		{ "getAnchors", w_Joint_getAnchors },
+		{ "getReactionForce", w_Joint_getReactionForce },
+		{ "getReactionTorque", w_Joint_getReactionTorque },
+		{ "setCollideConnected", w_Joint_setCollideConnected },
+		{ "getCollideConnected", w_Joint_getCollideConnected },
+		{ 0, 0 }
+	};
+
 	int luaopen_gearjoint(lua_State * L)
 	{
-		static const luaL_Reg functions[] = {
-			{ "setRatio", w_GearJoint_setRatio },
-			{ "getRatio", w_GearJoint_getRatio },
-			// From Joint.
-			{ "getType", w_Joint_getType },
-			{ "getAnchors", w_Joint_getAnchors },
-			{ "getReactionForce", w_Joint_getReactionForce },
-			{ "getReactionTorque", w_Joint_getReactionTorque },
-			{ "setCollideConnected", w_Joint_setCollideConnected },
-			{ "getCollideConnected", w_Joint_getCollideConnected },
-			{ 0, 0 }
-		};
 		return luax_register_type(L, "GearJoint", functions);
 	}
 

+ 10 - 10
src/modules/physics/box2d/wrap_Joint.cpp

@@ -75,18 +75,18 @@ namespace box2d
 		return 1;
 	}
 
+	static const luaL_Reg functions[] = {
+		{ "getType", w_Joint_getType },
+		{ "getAnchors", w_Joint_getAnchors },
+		{ "getReactionForce", w_Joint_getReactionForce },
+		{ "getReactionTorque", w_Joint_getReactionTorque },
+		{ "setCollideConnected", w_Joint_setCollideConnected },
+		{ "getCollideConnected", w_Joint_getCollideConnected },
+		{ 0, 0 }
+	};
+
 	int luaopen_joint(lua_State * L)
 	{
-		static const luaL_Reg functions[] = {
-			{ "getType", w_Joint_getType },
-			{ "getAnchors", w_Joint_getAnchors },
-			{ "getReactionForce", w_Joint_getReactionForce },
-			{ "getReactionTorque", w_Joint_getReactionTorque },
-			{ "setCollideConnected", w_Joint_setCollideConnected },
-			{ "getCollideConnected", w_Joint_getCollideConnected },
-			{ 0, 0 }
-		};
-
 		return luax_register_type(L, "Joint", functions);
 	}
 

+ 15 - 15
src/modules/physics/box2d/wrap_MouseJoint.cpp

@@ -62,23 +62,23 @@ namespace box2d
 		return 1;
 	}
 
+	static const luaL_Reg functions[] = {
+		{ "setTarget", w_MouseJoint_setTarget },
+		{ "getTarget", w_MouseJoint_getTarget },
+		{ "setMaxForce", w_MouseJoint_setMaxForce },
+		{ "getMaxForce", w_MouseJoint_getMaxForce },
+		// From Joint.
+		{ "getType", w_Joint_getType },
+		{ "getAnchors", w_Joint_getAnchors },
+		{ "getReactionForce", w_Joint_getReactionForce },
+		{ "getReactionTorque", w_Joint_getReactionTorque },
+		{ "setCollideConnected", w_Joint_setCollideConnected },
+		{ "getCollideConnected", w_Joint_getCollideConnected },
+		{ 0, 0 }
+	};
+
 	int luaopen_mousejoint(lua_State * L)
 	{
-		static const luaL_Reg functions[] = {
-			{ "setTarget", w_MouseJoint_setTarget },
-			{ "getTarget", w_MouseJoint_getTarget },
-			{ "setMaxForce", w_MouseJoint_setMaxForce },
-			{ "getMaxForce", w_MouseJoint_getMaxForce },
-			// From Joint.
-			{ "getType", w_Joint_getType },
-			{ "getAnchors", w_Joint_getAnchors },
-			{ "getReactionForce", w_Joint_getReactionForce },
-			{ "getReactionTorque", w_Joint_getReactionTorque },
-			{ "setCollideConnected", w_Joint_setCollideConnected },
-			{ "getCollideConnected", w_Joint_getCollideConnected },
-			{ 0, 0 }
-		};
-
 		return luax_register_type(L, "MouseJoint", functions);
 	}
 

+ 45 - 45
src/modules/physics/box2d/wrap_Physics.cpp

@@ -203,55 +203,55 @@ namespace box2d
 		return 1;
 	}
 
-	int luaopen_love_physics(lua_State * L)
-	{
-		// List of functions to wrap.
-		static const luaL_Reg functions[] = {
-			{ "newWorld", w_newWorld },
-			{ "newBody", w_newBody },
-			{ "newCircleShape", w_newCircleShape },
-			{ "newRectangleShape", w_newRectangleShape },
-			{ "newPolygonShape", w_newPolygonShape },
-			{ "newDistanceJoint", w_newDistanceJoint },
-			{ "newMouseJoint", w_newMouseJoint },
-			{ "newRevoluteJoint", w_newRevoluteJoint },
-			{ "newPrismaticJoint", w_newPrismaticJoint },
-			{ "newPulleyJoint", w_newPulleyJoint },
-			{ "newGearJoint", w_newGearJoint },
-			{ 0, 0 },
-		};
+	// List of functions to wrap.
+	static const luaL_Reg functions[] = {
+		{ "newWorld", w_newWorld },
+		{ "newBody", w_newBody },
+		{ "newCircleShape", w_newCircleShape },
+		{ "newRectangleShape", w_newRectangleShape },
+		{ "newPolygonShape", w_newPolygonShape },
+		{ "newDistanceJoint", w_newDistanceJoint },
+		{ "newMouseJoint", w_newMouseJoint },
+		{ "newRevoluteJoint", w_newRevoluteJoint },
+		{ "newPrismaticJoint", w_newPrismaticJoint },
+		{ "newPulleyJoint", w_newPulleyJoint },
+		{ "newGearJoint", w_newGearJoint },
+		{ 0, 0 },
+	};
 
-		static const lua_CFunction types[] = {
-			luaopen_world,
-			luaopen_contact,
-			luaopen_body,
-			luaopen_shape,
-			luaopen_circleshape,
-			luaopen_polygonshape,
-			luaopen_joint,
-			luaopen_mousejoint,
-			luaopen_distancejoint,
-			luaopen_prismaticjoint,
-			luaopen_revolutejoint,
-			luaopen_pulleyjoint,
-			luaopen_gearjoint,
-			0
-		};
+	static const lua_CFunction types[] = {
+		luaopen_world,
+		luaopen_contact,
+		luaopen_body,
+		luaopen_shape,
+		luaopen_circleshape,
+		luaopen_polygonshape,
+		luaopen_joint,
+		luaopen_mousejoint,
+		luaopen_distancejoint,
+		luaopen_prismaticjoint,
+		luaopen_revolutejoint,
+		luaopen_pulleyjoint,
+		luaopen_gearjoint,
+		0
+	};
 
-		// List of constants.
-		static const LuaConstant constants[] = {
-			{ "shape_circle", Shape::SHAPE_CIRCLE },
-			{ "shape_polygon", Shape::SHAPE_POLYGON },
+	// List of constants.
+	static const LuaConstant constants[] = {
+		{ "shape_circle", Shape::SHAPE_CIRCLE },
+		{ "shape_polygon", Shape::SHAPE_POLYGON },
 
-			{ "joint_distance", Joint::JOINT_DISTANCE },
-			{ "joint_revolute", Joint::JOINT_REVOLUTE },
-			{ "joint_prismatic", Joint::JOINT_PRISMATIC },
-			{ "joint_mouse", Joint::JOINT_MOUSE },	
-			{ "joint_pulley", Joint::JOINT_PULLEY },	
-			{ "joint_gear", Joint::JOINT_GEAR },
-			{ 0, 0 }
-		};
+		{ "joint_distance", Joint::JOINT_DISTANCE },
+		{ "joint_revolute", Joint::JOINT_REVOLUTE },
+		{ "joint_prismatic", Joint::JOINT_PRISMATIC },
+		{ "joint_mouse", Joint::JOINT_MOUSE },	
+		{ "joint_pulley", Joint::JOINT_PULLEY },	
+		{ "joint_gear", Joint::JOINT_GEAR },
+		{ 0, 0 }
+	};
 
+	int luaopen_love_physics(lua_State * L)
+	{
 		if(instance == 0)
 		{
 			try

+ 22 - 21
src/modules/physics/box2d/wrap_PolygonShape.cpp

@@ -38,29 +38,30 @@ namespace box2d
 		return t->getPoints(L);
 	}
 
+	static const luaL_Reg functions[] = {
+		{ "getPoints", w_PolygonShape_getPoints },
+		// From Shape.
+		{ "getType", w_Shape_getType },
+		{ "setFriction", w_Shape_setFriction },
+		{ "setRestitution", w_Shape_setRestitution },
+		{ "setDensity", w_Shape_setDensity },
+		{ "setSensor", w_Shape_setSensor },
+		{ "getFriction", w_Shape_getFriction },
+		{ "getRestituion", w_Shape_getRestituion },
+		{ "getDensity", w_Shape_getDensity },
+		{ "isSensor", w_Shape_isSensor },
+		{ "testPoint", w_Shape_testPoint },
+		{ "testSegment", w_Shape_testSegment },
+		{ "setFilterData", w_Shape_setFilterData },
+		{ "getFilterData", w_Shape_getFilterData },
+		{ "setData", w_Shape_setData },
+		{ "getData", w_Shape_getData },
+		{ "getBoundingBox", w_Shape_getBoundingBox },
+		{ 0, 0 }
+	};
+
 	int luaopen_polygonshape(lua_State * L)
 	{
-		static const luaL_Reg functions[] = {
-			{ "getPoints", w_PolygonShape_getPoints },
-			// From Shape.
-			{ "getType", w_Shape_getType },
-			{ "setFriction", w_Shape_setFriction },
-			{ "setRestitution", w_Shape_setRestitution },
-			{ "setDensity", w_Shape_setDensity },
-			{ "setSensor", w_Shape_setSensor },
-			{ "getFriction", w_Shape_getFriction },
-			{ "getRestituion", w_Shape_getRestituion },
-			{ "getDensity", w_Shape_getDensity },
-			{ "isSensor", w_Shape_isSensor },
-			{ "testPoint", w_Shape_testPoint },
-			{ "testSegment", w_Shape_testSegment },
-			{ "setFilterData", w_Shape_setFilterData },
-			{ "getFilterData", w_Shape_getFilterData },
-			{ "setData", w_Shape_setData },
-			{ "getData", w_Shape_getData },
-			{ "getBoundingBox", w_Shape_getBoundingBox },
-			{ 0, 0 }
-		};
 		return luax_register_type(L, "PolygonShape", functions);
 	}
 

+ 30 - 30
src/modules/physics/box2d/wrap_PrismaticJoint.cpp

@@ -158,36 +158,36 @@ namespace box2d
 		return t->getLimits(L);
 	}
 
-	int w_PrismaticJoint_open(lua_State * L)
-	{
-		static const luaL_Reg functions[] = {
-			{ "getJointTranslation", w_PrismaticJoint_getJointTranslation },
-			{ "getJointSpeed", w_PrismaticJoint_getJointSpeed },
-			{ "setMotorEnabled", w_PrismaticJoint_setMotorEnabled },
-			{ "isMotorEnabled", w_PrismaticJoint_isMotorEnabled },
-			{ "setMaxMotorForce", w_PrismaticJoint_setMaxMotorForce },
-			{ "getMaxMotorForce", w_PrismaticJoint_getMaxMotorForce },
-			{ "setMotorSpeed", w_PrismaticJoint_setMotorSpeed },
-			{ "getMotorSpeed", w_PrismaticJoint_getMotorSpeed },
-			{ "getMotorForce", w_PrismaticJoint_getMotorForce },
-			{ "setLimitsEnabled", w_PrismaticJoint_setLimitsEnabled },
-			{ "isLimitsEnabled", w_PrismaticJoint_isLimitsEnabled },
-			{ "setUpperLimit", w_PrismaticJoint_setUpperLimit },
-			{ "setLowerLimit", w_PrismaticJoint_setLowerLimit },
-			{ "setLimits", w_PrismaticJoint_setLimits },
-			{ "getLowerLimit", w_PrismaticJoint_getLowerLimit },
-			{ "getUpperLimit", w_PrismaticJoint_getUpperLimit },
-			{ "getLimits", w_PrismaticJoint_getLimits },
-			// From Joint.
-			{ "getType", w_Joint_getType },
-			{ "getAnchors", w_Joint_getAnchors },
-			{ "getReactionForce", w_Joint_getReactionForce },
-			{ "getReactionTorque", w_Joint_getReactionTorque },
-			{ "setCollideConnected", w_Joint_setCollideConnected },
-			{ "getCollideConnected", w_Joint_getCollideConnected },
-			{ 0, 0 }
-		};
-
+	static const luaL_Reg functions[] = {
+		{ "getJointTranslation", w_PrismaticJoint_getJointTranslation },
+		{ "getJointSpeed", w_PrismaticJoint_getJointSpeed },
+		{ "setMotorEnabled", w_PrismaticJoint_setMotorEnabled },
+		{ "isMotorEnabled", w_PrismaticJoint_isMotorEnabled },
+		{ "setMaxMotorForce", w_PrismaticJoint_setMaxMotorForce },
+		{ "getMaxMotorForce", w_PrismaticJoint_getMaxMotorForce },
+		{ "setMotorSpeed", w_PrismaticJoint_setMotorSpeed },
+		{ "getMotorSpeed", w_PrismaticJoint_getMotorSpeed },
+		{ "getMotorForce", w_PrismaticJoint_getMotorForce },
+		{ "setLimitsEnabled", w_PrismaticJoint_setLimitsEnabled },
+		{ "isLimitsEnabled", w_PrismaticJoint_isLimitsEnabled },
+		{ "setUpperLimit", w_PrismaticJoint_setUpperLimit },
+		{ "setLowerLimit", w_PrismaticJoint_setLowerLimit },
+		{ "setLimits", w_PrismaticJoint_setLimits },
+		{ "getLowerLimit", w_PrismaticJoint_getLowerLimit },
+		{ "getUpperLimit", w_PrismaticJoint_getUpperLimit },
+		{ "getLimits", w_PrismaticJoint_getLimits },
+		// From Joint.
+		{ "getType", w_Joint_getType },
+		{ "getAnchors", w_Joint_getAnchors },
+		{ "getReactionForce", w_Joint_getReactionForce },
+		{ "getReactionTorque", w_Joint_getReactionTorque },
+		{ "setCollideConnected", w_Joint_setCollideConnected },
+		{ "getCollideConnected", w_Joint_getCollideConnected },
+		{ 0, 0 }
+	};
+
+	int luaopen_prismaticjoint(lua_State * L)
+	{
 		return luax_register_type(L, "PrismaticJoint", functions);
 	}
 

+ 20 - 19
src/modules/physics/box2d/wrap_PulleyJoint.cpp

@@ -98,27 +98,28 @@ namespace box2d
 		return 1;
 	}
 
+	static const luaL_Reg functions[] = {
+		{ "getGroundAnchors", w_PulleyJoint_getGroundAnchors },
+		{ "setMaxLengths", w_PulleyJoint_setMaxLengths },
+		{ "getMaxLengths", w_PulleyJoint_getMaxLengths },
+		{ "setConstant", w_PulleyJoint_setConstant },
+		{ "getConstant", w_PulleyJoint_getConstant },
+		{ "getLength1", w_PulleyJoint_getLength1 },
+		{ "getLength2", w_PulleyJoint_getLength2 },
+		{ "setRatio", w_PulleyJoint_setRatio },
+		{ "getRatio", w_PulleyJoint_getRatio },
+		// From Joint.
+		{ "getType", w_Joint_getType },
+		{ "getAnchors", w_Joint_getAnchors },
+		{ "getReactionForce", w_Joint_getReactionForce },
+		{ "getReactionTorque", w_Joint_getReactionTorque },
+		{ "setCollideConnected", w_Joint_setCollideConnected },
+		{ "getCollideConnected", w_Joint_getCollideConnected },
+		{ 0, 0 }
+	};
+
 	int luaopen_pulleyjoint(lua_State * L)
 	{
-		static const luaL_Reg functions[] = {
-			{ "getGroundAnchors", w_PulleyJoint_getGroundAnchors },
-			{ "setMaxLengths", w_PulleyJoint_setMaxLengths },
-			{ "getMaxLengths", w_PulleyJoint_getMaxLengths },
-			{ "setConstant", w_PulleyJoint_setConstant },
-			{ "getConstant", w_PulleyJoint_getConstant },
-			{ "getLength1", w_PulleyJoint_getLength1 },
-			{ "getLength2", w_PulleyJoint_getLength2 },
-			{ "setRatio", w_PulleyJoint_setRatio },
-			{ "getRatio", w_PulleyJoint_getRatio },
-			// From Joint.
-			{ "getType", w_Joint_getType },
-			{ "getAnchors", w_Joint_getAnchors },
-			{ "getReactionForce", w_Joint_getReactionForce },
-			{ "getReactionTorque", w_Joint_getReactionTorque },
-			{ "setCollideConnected", w_Joint_setCollideConnected },
-			{ "getCollideConnected", w_Joint_getCollideConnected },
-			{ 0, 0 }
-		};
 		return luax_register_type(L, "PulleyJoint", functions);
 	}
 

+ 28 - 27
src/modules/physics/box2d/wrap_RevoluteJoint.cpp

@@ -158,35 +158,36 @@ namespace box2d
 		return t->getLimits(L);
 	}
 
+	static const luaL_Reg functions[] = {
+		{ "getJointAngle", w_RevoluteJoint_getJointAngle },
+		{ "getJointSpeed", w_RevoluteJoint_getJointSpeed },
+		{ "setMotorEnabled", w_RevoluteJoint_setMotorEnabled },
+		{ "isMotorEnabled", w_RevoluteJoint_isMotorEnabled },
+		{ "setMaxMotorTorque", w_RevoluteJoint_setMaxMotorTorque },
+		{ "getMaxMotorTorque", w_RevoluteJoint_getMaxMotorTorque },
+		{ "setMotorSpeed", w_RevoluteJoint_setMotorSpeed },
+		{ "getMotorSpeed", w_RevoluteJoint_getMotorSpeed },
+		{ "getMotorTorque", w_RevoluteJoint_getMotorTorque },
+		{ "setLimitsEnabled", w_RevoluteJoint_setLimitsEnabled },
+		{ "isLimitsEnabled", w_RevoluteJoint_isLimitsEnabled },
+		{ "setUpperLimit", w_RevoluteJoint_setUpperLimit },
+		{ "setLowerLimit", w_RevoluteJoint_setLowerLimit },
+		{ "setLimits", w_RevoluteJoint_setLimits },
+		{ "getLowerLimit", w_RevoluteJoint_getLowerLimit },
+		{ "getUpperLimit", w_RevoluteJoint_getUpperLimit },
+		{ "getLimits", w_RevoluteJoint_getLimits },
+		// From Joint.
+		{ "getType", w_Joint_getType },
+		{ "getAnchors", w_Joint_getAnchors },
+		{ "getReactionForce", w_Joint_getReactionForce },
+		{ "getReactionTorque", w_Joint_getReactionTorque },
+		{ "setCollideConnected", w_Joint_setCollideConnected },
+		{ "getCollideConnected", w_Joint_getCollideConnected },
+		{ 0, 0 }
+	};
+
 	int luaopen_revolutejoint(lua_State * L)
 	{
-		static const luaL_Reg functions[] = {
-			{ "getJointAngle", w_RevoluteJoint_getJointAngle },
-			{ "getJointSpeed", w_RevoluteJoint_getJointSpeed },
-			{ "setMotorEnabled", w_RevoluteJoint_setMotorEnabled },
-			{ "isMotorEnabled", w_RevoluteJoint_isMotorEnabled },
-			{ "setMaxMotorTorque", w_RevoluteJoint_setMaxMotorTorque },
-			{ "getMaxMotorTorque", w_RevoluteJoint_getMaxMotorTorque },
-			{ "setMotorSpeed", w_RevoluteJoint_setMotorSpeed },
-			{ "getMotorSpeed", w_RevoluteJoint_getMotorSpeed },
-			{ "getMotorTorque", w_RevoluteJoint_getMotorTorque },
-			{ "setLimitsEnabled", w_RevoluteJoint_setLimitsEnabled },
-			{ "isLimitsEnabled", w_RevoluteJoint_isLimitsEnabled },
-			{ "setUpperLimit", w_RevoluteJoint_setUpperLimit },
-			{ "setLowerLimit", w_RevoluteJoint_setLowerLimit },
-			{ "setLimits", w_RevoluteJoint_setLimits },
-			{ "getLowerLimit", w_RevoluteJoint_getLowerLimit },
-			{ "getUpperLimit", w_RevoluteJoint_getUpperLimit },
-			{ "getLimits", w_RevoluteJoint_getLimits },
-			// From Joint.
-			{ "getType", w_Joint_getType },
-			{ "getAnchors", w_Joint_getAnchors },
-			{ "getReactionForce", w_Joint_getReactionForce },
-			{ "getReactionTorque", w_Joint_getReactionTorque },
-			{ "setCollideConnected", w_Joint_setCollideConnected },
-			{ "getCollideConnected", w_Joint_getCollideConnected },
-			{ 0, 0 }
-		};
 		return luax_register_type(L, "RevoluteJoint", functions);
 	}
 

+ 22 - 22
src/modules/physics/box2d/wrap_Shape.cpp

@@ -166,28 +166,28 @@ namespace box2d
 		return t->getBoundingBox(L);
 	}
 
-	int w_Shape_open(lua_State * L)
-	{
-		static const luaL_Reg functions[] = {
-			{ "getType", w_Shape_getType },
-			{ "setFriction", w_Shape_setFriction },
-			{ "setRestitution", w_Shape_setRestitution },
-			{ "setDensity", w_Shape_setDensity },
-			{ "setSensor", w_Shape_setSensor },
-			{ "getFriction", w_Shape_getFriction },
-			{ "getRestituion", w_Shape_getRestituion },
-			{ "getDensity", w_Shape_getDensity },
-			{ "isSensor", w_Shape_isSensor },
-			{ "testPoint", w_Shape_testPoint },
-			{ "testSegment", w_Shape_testSegment },
-			{ "setFilterData", w_Shape_setFilterData },
-			{ "getFilterData", w_Shape_getFilterData },
-			{ "setData", w_Shape_setData },
-			{ "getData", w_Shape_getData },
-			{ "getBoundingBox", w_Shape_getBoundingBox },
-			{ 0, 0 }
-		};
-
+	static const luaL_Reg functions[] = {
+		{ "getType", w_Shape_getType },
+		{ "setFriction", w_Shape_setFriction },
+		{ "setRestitution", w_Shape_setRestitution },
+		{ "setDensity", w_Shape_setDensity },
+		{ "setSensor", w_Shape_setSensor },
+		{ "getFriction", w_Shape_getFriction },
+		{ "getRestituion", w_Shape_getRestituion },
+		{ "getDensity", w_Shape_getDensity },
+		{ "isSensor", w_Shape_isSensor },
+		{ "testPoint", w_Shape_testPoint },
+		{ "testSegment", w_Shape_testSegment },
+		{ "setFilterData", w_Shape_setFilterData },
+		{ "getFilterData", w_Shape_getFilterData },
+		{ "setData", w_Shape_setData },
+		{ "getData", w_Shape_getData },
+		{ "getBoundingBox", w_Shape_getBoundingBox },
+		{ 0, 0 }
+	};
+
+	int luaopen_shape(lua_State * L)
+	{
 		return luax_register_type(L, "Shape", functions);
 	}
 

+ 16 - 16
src/modules/physics/box2d/wrap_World.cpp

@@ -113,24 +113,24 @@ namespace box2d
 		lua_pushinteger(L, t->getMeter());
 		return 1;
 	}
-	
+
+	static const luaL_Reg functions[] = {
+		{ "update", w_World_update },
+		{ "setCallback", w_World_setCallback },
+		{ "getCallback", w_World_getCallback },
+		{ "setGravity", w_World_setGravity },
+		{ "getGravity", w_World_getGravity },
+		{ "setAllowSleep", w_World_setAllowSleep },
+		{ "isAllowSleep", w_World_isAllowSleep },
+		{ "getBodyCount", w_World_getBodyCount },
+		{ "getJointCount", w_World_getJointCount },
+		{ "setMeter", w_World_setMeter },
+		{ "getMeter", w_World_getMeter },
+		{ 0, 0 }
+	};
+
 	int luaopen_world(lua_State * L)
 	{
-		static const luaL_Reg functions[] = {
-			{ "update", w_World_update },
-			{ "setCallback", w_World_setCallback },
-			{ "getCallback", w_World_getCallback },
-			{ "setGravity", w_World_setGravity },
-			{ "getGravity", w_World_getGravity },
-			{ "setAllowSleep", w_World_setAllowSleep },
-			{ "isAllowSleep", w_World_isAllowSleep },
-			{ "getBodyCount", w_World_getBodyCount },
-			{ "getJointCount", w_World_getJointCount },
-			{ "setMeter", w_World_setMeter },
-			{ "getMeter", w_World_getMeter },
-			{ 0, 0 }
-		};
-
 		return luax_register_type(L, "World", functions);
 	}
 

+ 8 - 8
src/modules/sound/wrap_Decoder.cpp

@@ -49,16 +49,16 @@ namespace sound
 		lua_pushinteger(L, t->getSampleRate());
 		return 1;
 	}
-	
+
+	static const luaL_Reg functions[] = {
+		{ "getChannels", w_Decoder_getChannels },
+		{ "getBits", w_Decoder_getBits },
+		{ "getSampleRate", w_Decoder_getSampleRate },
+		{ 0, 0 }
+	};
+
 	int luaopen_decoder(lua_State * L)
 	{
-		static const luaL_Reg functions[] = {
-			{ "getChannels", w_Decoder_getChannels },
-			{ "getBits", w_Decoder_getBits },
-			{ "getSampleRate", w_Decoder_getSampleRate },
-			{ 0, 0 }
-		};
-
 		return luax_register_type(L, "Decoder", functions);
 	}
 

+ 13 - 14
src/modules/sound/wrap_Sound.cpp

@@ -101,22 +101,21 @@ namespace sound
 		return 1;
 	}
 
+	// List of functions to wrap.
+	static const luaL_Reg functions[] = {
+		{ "newSoundData",  w_newSoundData },
+		{ "newDecoder",  w_newDecoder },
+		{ 0, 0 }
+	};
+
+	static const lua_CFunction types[] = {
+		luaopen_sounddata,
+		luaopen_decoder,
+		0
+	};
+
 	int luaopen_love_sound(lua_State * L)
 	{
-		// List of functions to wrap.
-		static const luaL_Reg functions[] = {
-			{ "newSoundData",  w_newSoundData },
-			{ "newDecoder",  w_newDecoder },
-			{ 0, 0 }
-		};
-
-		static const lua_CFunction types[] = {
-			luaopen_sounddata,
-			luaopen_decoder,
-			0
-		};
-
-
 		if(instance == 0)
 		{
 			try

+ 12 - 14
src/modules/sound/wrap_SoundData.cpp

@@ -69,24 +69,22 @@ namespace sound
 		return 1;
 	}
 
+	static const luaL_Reg functions[] = {
 
+		// Data
+		{ "getPointer", w_Data_getPointer },
+		{ "getSize", w_Data_getSize },
+
+		{ "getChannels", w_SoundData_getChannels },
+		{ "getBits", w_SoundData_getBits },
+		{ "getSampleRate", w_SoundData_getSampleRate },
+		{ "setSample", w_SoundData_setSample },
+		{ "getSample", w_SoundData_getSample },
+		{ 0, 0 }
+	};
 	
 	int luaopen_sounddata(lua_State * L)
 	{
-		static const luaL_Reg functions[] = {
-
-			// Data
-			{ "getPointer", w_Data_getPointer },
-			{ "getSize", w_Data_getSize },
-
-			{ "getChannels", w_SoundData_getChannels },
-			{ "getBits", w_SoundData_getBits },
-			{ "getSampleRate", w_SoundData_getSampleRate },
-			{ "setSample", w_SoundData_setSample },
-			{ "getSample", w_SoundData_getSample },
-			{ 0, 0 }
-		};
-
 		return luax_register_type(L, "SoundData", functions);
 	}
 

+ 12 - 11
src/modules/timer/sdl/wrap_Timer.cpp

@@ -60,18 +60,19 @@ namespace sdl
 		return 1;
 	}
 
-	int w_Timer_open(lua_State * L)
-	{
-		// List of functions to wrap.
-		static const luaL_Reg functions[] = {
-			{ "step", w_step },
-			{ "getDelta", w_getDelta },
-			{ "getFPS", w_getFPS },
-			{ "sleep", w_sleep },
-			{ "getTime", w_getTime },
-			{ 0, 0 }
-		};
+	// List of functions to wrap.
+	static const luaL_Reg functions[] = {
+		{ "step", w_step },
+		{ "getDelta", w_getDelta },
+		{ "getFPS", w_getFPS },
+		{ "sleep", w_sleep },
+		{ "getTime", w_getTime },
+		{ 0, 0 }
+	};
+
 
+	int luaopen_love_timer(lua_State * L)
+	{
 		if(instance == 0)
 		{
 			try