diff --git a/config/linux2-config.py b/config/linux2-config.py
index b2f4066e0ed27b565c8d34fdd07d6306bd14145a..5bd9a4c80849eb94148eb4d84b7267ffe82ea345 100644
--- a/config/linux2-config.py
+++ b/config/linux2-config.py
@@ -144,7 +144,7 @@ BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'
 WITH_BF_OGG = False  # -DWITH_OGG 
 BF_OGG = '/usr'
 BF_OGG_INC = '${BF_OGG}/include'
-BF_OGG_LIB = 'ogg vorbis theoraenc theoradec'
+BF_OGG_LIB = 'ogg vorbis vorbisenc theoraenc theoradec'
 
 WITH_BF_OPENJPEG = True 
 BF_OPENJPEG = '#extern/libopenjpeg'
diff --git a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.cpp b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.cpp
index d4e29882d376d2c59bfca3fc0d3494426d88068e..eecf927ee1051bfaef29674968531028b29a5e7d 100644
--- a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.cpp
+++ b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.cpp
@@ -172,6 +172,9 @@ int btPersistentManifold::addManifoldPoint(const btManifoldPoint& newPoint)
 #if MANIFOLD_CACHE_SIZE >= 4
 		//sort cache so best points come first, based on area
 		insertIndex = sortCachedPoints(newPoint);
+		
+		if (insertIndex<0)
+			insertIndex=0;
 #else
 		insertIndex = 0;
 #endif
@@ -180,11 +183,7 @@ int btPersistentManifold::addManifoldPoint(const btManifoldPoint& newPoint)
 	} else
 	{
 		m_cachedPoints++;
-
-		
 	}
-	if (insertIndex<0)
-		insertIndex=0;
 
 	btAssert(m_pointCache[insertIndex].m_userPersistentData==0);
 	m_pointCache[insertIndex] = newPoint;
diff --git a/intern/SoundSystem/make/msvc_6_0/SoundSystem.dsp b/intern/SoundSystem/make/msvc_6_0/SoundSystem.dsp
index c7ce7aa7a70b46d237a89fdecad83cfd98c9d0be..1bd973dfb6c713153a0d289cc6441120794c53fa 100644
--- a/intern/SoundSystem/make/msvc_6_0/SoundSystem.dsp
+++ b/intern/SoundSystem/make/msvc_6_0/SoundSystem.dsp
@@ -1,206 +1,206 @@
-# Microsoft Developer Studio Project File - Name="SoundSystem" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=SoundSystem - Win32 Release
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "SoundSystem.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "SoundSystem.mak" CFG="SoundSystem - Win32 Release"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "SoundSystem - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "SoundSystem - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "SoundSystem - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\..\obj\windows\intern\soundsystem"
-# PROP Intermediate_Dir "..\..\..\..\obj\windows\intern\soundsystem"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c 
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /I "../../../../../lib/windows/string/include" /I "../../../../../lib/windows/moto/include" /I "../../dummy" /I "../../openal" /I "..\..\..\string" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\intern\soundsystem\libSoundSystem.lib"
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PostBuild_Cmds=ECHO Copying header files	XCOPY /Y ..\..\*.h ..\..\..\..\..\lib\windows\SoundSystem\include\*.h	ECHO Copying lib	XCOPY /Y ..\..\..\..\obj\windows\intern\soundsystem\*.lib ..\..\..\..\..\lib\windows\SoundSystem\lib\*.a	ECHO Done
-# End Special Build Tool
-
-!ELSEIF  "$(CFG)" == "SoundSystem - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "SoundSystem___Win32_Debug"
-# PROP BASE Intermediate_Dir "SoundSystem___Win32_Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\..\obj\windows\intern\soundsystem\debug"
-# PROP Intermediate_Dir "..\..\..\..\obj\windows\intern\soundsystem\debug"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /I "../../../../../lib/windows/string/include" /I "../../../../../lib/windows/moto/include" /I "../../dummy" /I "../../openal" /I "..\..\..\string" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\intern\soundsystem\debug\libSoundSystem.lib"
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PostBuild_Cmds=ECHO Copying header files	XCOPY /Y ..\..\*.h ..\..\..\..\..\lib\windows\SoundSystem\include\*.h	ECHO Copying lib	XCOPY /Y ..\..\..\..\obj\windows\intern\soundsystem\debug\*.lib ..\..\..\..\..\lib\windows\SoundSystem\lib\debug\*.a	ECHO Done
-# End Special Build Tool
-
-!ENDIF 
-
-# Begin Target
-
-# Name "SoundSystem - Win32 Release"
-# Name "SoundSystem - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\intern\SND_AudioDevice.cpp
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\intern\SND_C-api.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\SND_CDObject.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\SND_DeviceManager.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\SND_IdObject.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\SND_Scene.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\SND_SoundListener.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\SND_SoundObject.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\SND_Utils.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\SND_WaveCache.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\SND_WaveSlot.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\..\intern\SND_AudioDevice.h
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\SND_C-api.h"
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\SND_CDObject.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\SND_DependKludge.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\SND_DeviceManager.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\SND_IAudioDevice.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\SND_IdObject.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\SND_Object.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\SND_Scene.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\SND_SoundListener.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\SND_SoundObject.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\SND_Utils.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\SND_WaveCache.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\SND_WaveSlot.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\SoundDefines.h
-# End Source File
-# End Group
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="SoundSystem" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=SoundSystem - Win32 Release
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "SoundSystem.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "SoundSystem.mak" CFG="SoundSystem - Win32 Release"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "SoundSystem - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "SoundSystem - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "SoundSystem - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\..\..\obj\windows\intern\soundsystem"
+# PROP Intermediate_Dir "..\..\..\..\obj\windows\intern\soundsystem"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c 
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /I "../../../../../lib/windows/string/include" /I "../../../../../lib/windows/moto/include" /I "../../dummy" /I "../../openal" /I "..\..\..\string" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\intern\soundsystem\libSoundSystem.lib"
+# Begin Special Build Tool
+SOURCE="$(InputPath)"
+PostBuild_Cmds=ECHO Copying header files	XCOPY /Y ..\..\*.h ..\..\..\..\..\lib\windows\SoundSystem\include\*.h	ECHO Copying lib	XCOPY /Y ..\..\..\..\obj\windows\intern\soundsystem\*.lib ..\..\..\..\..\lib\windows\SoundSystem\lib\*.a	ECHO Done
+# End Special Build Tool
+
+!ELSEIF  "$(CFG)" == "SoundSystem - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "SoundSystem___Win32_Debug"
+# PROP BASE Intermediate_Dir "SoundSystem___Win32_Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\..\..\obj\windows\intern\soundsystem\debug"
+# PROP Intermediate_Dir "..\..\..\..\obj\windows\intern\soundsystem\debug"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /I "../../../../../lib/windows/string/include" /I "../../../../../lib/windows/moto/include" /I "../../dummy" /I "../../openal" /I "..\..\..\string" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\intern\soundsystem\debug\libSoundSystem.lib"
+# Begin Special Build Tool
+SOURCE="$(InputPath)"
+PostBuild_Cmds=ECHO Copying header files	XCOPY /Y ..\..\*.h ..\..\..\..\..\lib\windows\SoundSystem\include\*.h	ECHO Copying lib	XCOPY /Y ..\..\..\..\obj\windows\intern\soundsystem\debug\*.lib ..\..\..\..\..\lib\windows\SoundSystem\lib\debug\*.a	ECHO Done
+# End Special Build Tool
+
+!ENDIF 
+
+# Begin Target
+
+# Name "SoundSystem - Win32 Release"
+# Name "SoundSystem - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\..\intern\SND_AudioDevice.cpp
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\intern\SND_C-api.cpp"
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\SND_CDObject.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\SND_DeviceManager.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\SND_IdObject.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\SND_Scene.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\SND_SoundListener.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\SND_SoundObject.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\SND_Utils.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\SND_WaveCache.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\SND_WaveSlot.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=..\..\intern\SND_AudioDevice.h
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\SND_C-api.h"
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\SND_CDObject.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\SND_DependKludge.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\SND_DeviceManager.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\SND_IAudioDevice.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\SND_IdObject.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\SND_Object.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\SND_Scene.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\SND_SoundListener.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\SND_SoundObject.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\SND_Utils.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\SND_WaveCache.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\SND_WaveSlot.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\SoundDefines.h
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/intern/SoundSystem/make/msvc_6_0/dummy/DummySoundSystem.dsp b/intern/SoundSystem/make/msvc_6_0/dummy/DummySoundSystem.dsp
index 4a27fdfa6e3b2392f0b25621071f56cf66e3b5ae..2bf372d038216cf7dac141f1cedf8b022edc099e 100644
--- a/intern/SoundSystem/make/msvc_6_0/dummy/DummySoundSystem.dsp
+++ b/intern/SoundSystem/make/msvc_6_0/dummy/DummySoundSystem.dsp
@@ -1,103 +1,103 @@
-# Microsoft Developer Studio Project File - Name="DummySoundSystem" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=DummySoundSystem - Win32 Release
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "DummySoundSystem.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "DummySoundSystem.mak" CFG="DummySoundSystem - Win32 Release"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "DummySoundSystem - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "DummySoundSystem - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "DummySoundSystem - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\..\..\obj\windows\intern\soundsystem\dummy"
-# PROP Intermediate_Dir "..\..\..\..\..\obj\windows\intern\soundsystem\dummy"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\..\intern" /I "..\..\..\..\SoundSystem" /I "..\..\..\..\moto\include" /I "..\..\..\..\string" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /J /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\..\..\..\obj\windows\intern\soundsystem\dummy\libDummySoundSystem.lib"
-
-!ELSEIF  "$(CFG)" == "DummySoundSystem - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\..\..\obj\windows\intern\soundsystem\dummy\debug"
-# PROP Intermediate_Dir "..\..\..\..\..\obj\windows\intern\soundsystem\dummy\debug"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\..\..\intern" /I "..\..\..\..\SoundSystem" /I "..\..\..\..\moto\include" /I "..\..\..\..\string" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /J /FD /c
-# SUBTRACT CPP /Fr
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\..\..\..\obj\windows\intern\soundsystem\dummy\debug\libDummySoundSystem.lib"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "DummySoundSystem - Win32 Release"
-# Name "DummySoundSystem - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\..\dummy\SND_DummyDevice.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\..\..\dummy\SND_DummyDevice.h
-# End Source File
-# End Group
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="DummySoundSystem" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=DummySoundSystem - Win32 Release
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "DummySoundSystem.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "DummySoundSystem.mak" CFG="DummySoundSystem - Win32 Release"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "DummySoundSystem - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "DummySoundSystem - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "DummySoundSystem - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\..\..\..\obj\windows\intern\soundsystem\dummy"
+# PROP Intermediate_Dir "..\..\..\..\..\obj\windows\intern\soundsystem\dummy"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\..\intern" /I "..\..\..\..\SoundSystem" /I "..\..\..\..\moto\include" /I "..\..\..\..\string" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /J /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\..\..\..\..\obj\windows\intern\soundsystem\dummy\libDummySoundSystem.lib"
+
+!ELSEIF  "$(CFG)" == "DummySoundSystem - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\..\..\..\obj\windows\intern\soundsystem\dummy\debug"
+# PROP Intermediate_Dir "..\..\..\..\..\obj\windows\intern\soundsystem\dummy\debug"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\..\..\intern" /I "..\..\..\..\SoundSystem" /I "..\..\..\..\moto\include" /I "..\..\..\..\string" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /J /FD /c
+# SUBTRACT CPP /Fr
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\..\..\..\..\obj\windows\intern\soundsystem\dummy\debug\libDummySoundSystem.lib"
+
+!ENDIF 
+
+# Begin Target
+
+# Name "DummySoundSystem - Win32 Release"
+# Name "DummySoundSystem - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\..\..\dummy\SND_DummyDevice.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=..\..\..\dummy\SND_DummyDevice.h
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/intern/SoundSystem/make/msvc_6_0/openal/OpenALSoundSystem.dsp b/intern/SoundSystem/make/msvc_6_0/openal/OpenALSoundSystem.dsp
index 67a6bd0bb5a773e9601877590bdf16ce36336946..ef0c10e8eff028b16223a945dabfeee30d14f1eb 100644
--- a/intern/SoundSystem/make/msvc_6_0/openal/OpenALSoundSystem.dsp
+++ b/intern/SoundSystem/make/msvc_6_0/openal/OpenALSoundSystem.dsp
@@ -1,106 +1,106 @@
-# Microsoft Developer Studio Project File - Name="OpenALSoundSystem" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=OpenALSoundSystem - Win32 Release
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "OpenALSoundSystem.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "OpenALSoundSystem.mak" CFG="OpenALSoundSystem - Win32 Release"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "OpenALSoundSystem - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "OpenALSoundSystem - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "OpenALSoundSystem - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\..\..\obj\windows\intern\soundsystem\openal"
-# PROP Intermediate_Dir "..\..\..\..\..\obj\windows\intern\soundsystem\openal"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\..\intern" /I "..\..\..\..\SoundSystem" /I "..\..\..\..\SoundSystem\sdl" /I "..\..\..\..\moto\include" /I "..\..\..\..\string" /I "..\..\..\..\..\..\lib\windows\openal\include" /I "..\..\..\..\..\..\lib\windows\sdl\include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\..\..\..\obj\windows\intern\soundsystem\openal\libOpenALSoundSystem.lib"
-
-!ELSEIF  "$(CFG)" == "OpenALSoundSystem - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "OpenALSoundSystem___Win32_Debug"
-# PROP BASE Intermediate_Dir "OpenALSoundSystem___Win32_Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\..\..\obj\windows\intern\soundsystem\openal\debug"
-# PROP Intermediate_Dir "..\..\..\..\..\obj\windows\intern\soundsystem\openal\debug"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\..\..\intern" /I "..\..\..\..\SoundSystem" /I "..\..\..\..\SoundSystem\sdl" /I "..\..\..\..\moto\include" /I "..\..\..\..\string" /I "..\..\..\..\..\..\lib\windows\sdl\include" /I "..\..\..\..\..\..\lib\windows\openal\include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\..\..\..\obj\windows\intern\soundsystem\openal\debug\libOpenALSoundSystem.lib"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "OpenALSoundSystem - Win32 Release"
-# Name "OpenALSoundSystem - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\..\openal\SND_OpenALDevice.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\sdl\SND_SDLCDDevice.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\..\..\openal\SND_OpenALDevice.h
-# End Source File
-# End Group
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="OpenALSoundSystem" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=OpenALSoundSystem - Win32 Release
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "OpenALSoundSystem.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "OpenALSoundSystem.mak" CFG="OpenALSoundSystem - Win32 Release"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "OpenALSoundSystem - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "OpenALSoundSystem - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "OpenALSoundSystem - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\..\..\..\obj\windows\intern\soundsystem\openal"
+# PROP Intermediate_Dir "..\..\..\..\..\obj\windows\intern\soundsystem\openal"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\..\intern" /I "..\..\..\..\SoundSystem" /I "..\..\..\..\SoundSystem\sdl" /I "..\..\..\..\moto\include" /I "..\..\..\..\string" /I "..\..\..\..\..\..\lib\windows\openal\include" /I "..\..\..\..\..\..\lib\windows\sdl\include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\..\..\..\..\obj\windows\intern\soundsystem\openal\libOpenALSoundSystem.lib"
+
+!ELSEIF  "$(CFG)" == "OpenALSoundSystem - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "OpenALSoundSystem___Win32_Debug"
+# PROP BASE Intermediate_Dir "OpenALSoundSystem___Win32_Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\..\..\..\obj\windows\intern\soundsystem\openal\debug"
+# PROP Intermediate_Dir "..\..\..\..\..\obj\windows\intern\soundsystem\openal\debug"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\..\..\intern" /I "..\..\..\..\SoundSystem" /I "..\..\..\..\SoundSystem\sdl" /I "..\..\..\..\moto\include" /I "..\..\..\..\string" /I "..\..\..\..\..\..\lib\windows\sdl\include" /I "..\..\..\..\..\..\lib\windows\openal\include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\..\..\..\..\obj\windows\intern\soundsystem\openal\debug\libOpenALSoundSystem.lib"
+
+!ENDIF 
+
+# Begin Target
+
+# Name "OpenALSoundSystem - Win32 Release"
+# Name "OpenALSoundSystem - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\..\..\openal\SND_OpenALDevice.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\sdl\SND_SDLCDDevice.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=..\..\..\openal\SND_OpenALDevice.h
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/intern/bmfont/make/msvc_6_0/bmfont.dsp b/intern/bmfont/make/msvc_6_0/bmfont.dsp
index a9d2d9722e1f668d44e4396be10244244970600b..b7ff7774fa1ba780577a2ee30368eb0cf3bef975 100644
--- a/intern/bmfont/make/msvc_6_0/bmfont.dsp
+++ b/intern/bmfont/make/msvc_6_0/bmfont.dsp
@@ -1,176 +1,176 @@
-# Microsoft Developer Studio Project File - Name="bmfont" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=bmfont - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "bmfont.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "bmfont.mak" CFG="bmfont - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "bmfont - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "bmfont - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "bmfont - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\..\obj\windows\intern\bmfont"
-# PROP Intermediate_Dir "..\..\..\..\obj\windows\intern\bmfont"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../.." /I "../../intern" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\intern\bmfont\libbmfont.lib"
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PostBuild_Desc=Copying BMFONT files library (release target) to lib tree.
-PostBuild_Cmds=ECHO Copying header files	XCOPY /Y ..\..\*.h ..\..\..\..\..\lib\windows\bmfont\include\	ECHO Copying lib	XCOPY /Y ..\..\..\..\obj\windows\intern\bmfont\*.lib ..\..\..\..\..\lib\windows\bmfont\lib\*.a	ECHO Done
-# End Special Build Tool
-
-!ELSEIF  "$(CFG)" == "bmfont - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\..\obj\windows\intern\bmfont\debug"
-# PROP Intermediate_Dir "..\..\..\..\obj\windows\intern\bmfont\debug"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../.." /I "../../intern" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\intern\bmfont\debug\libbmfont.lib"
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PostBuild_Desc=Copying BMFONT files library (debug target) to lib tree.
-PostBuild_Cmds=ECHO Copying header files	XCOPY /Y ..\..\*.h ..\..\..\..\..\lib\windows\bmfont\include\	ECHO Copying lib	XCOPY /Y ..\..\..\..\obj\windows\intern\bmfont\debug\*.lib ..\..\..\..\..\lib\windows\bmfont\lib\debug\*.a	ECHO Done
-# End Special Build Tool
-
-!ENDIF 
-
-# Begin Target
-
-# Name "bmfont - Win32 Release"
-# Name "bmfont - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\intern\BMF_Api.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\BMF_BitmapFont.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\BMF_font_helv10.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\BMF_font_helv12.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\BMF_font_helvb10.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\BMF_font_helvb12.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\BMF_font_helvb14.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\BMF_font_helvb8.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\BMF_font_scr12.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\BMF_font_scr14.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\BMF_font_scr15.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Group "intern"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\intern\BMF_BitmapFont.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\BMF_FontData.h
-# End Source File
-# End Group
-# Begin Group "extern"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\BMF_Api.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\BMF_Fonts.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\BMF_Settings.h
-# End Source File
-# End Group
-# End Group
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="bmfont" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=bmfont - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "bmfont.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "bmfont.mak" CFG="bmfont - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "bmfont - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "bmfont - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "bmfont - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\..\..\obj\windows\intern\bmfont"
+# PROP Intermediate_Dir "..\..\..\..\obj\windows\intern\bmfont"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../.." /I "../../intern" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\intern\bmfont\libbmfont.lib"
+# Begin Special Build Tool
+SOURCE="$(InputPath)"
+PostBuild_Desc=Copying BMFONT files library (release target) to lib tree.
+PostBuild_Cmds=ECHO Copying header files	XCOPY /Y ..\..\*.h ..\..\..\..\..\lib\windows\bmfont\include\	ECHO Copying lib	XCOPY /Y ..\..\..\..\obj\windows\intern\bmfont\*.lib ..\..\..\..\..\lib\windows\bmfont\lib\*.a	ECHO Done
+# End Special Build Tool
+
+!ELSEIF  "$(CFG)" == "bmfont - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\..\..\obj\windows\intern\bmfont\debug"
+# PROP Intermediate_Dir "..\..\..\..\obj\windows\intern\bmfont\debug"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../.." /I "../../intern" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\intern\bmfont\debug\libbmfont.lib"
+# Begin Special Build Tool
+SOURCE="$(InputPath)"
+PostBuild_Desc=Copying BMFONT files library (debug target) to lib tree.
+PostBuild_Cmds=ECHO Copying header files	XCOPY /Y ..\..\*.h ..\..\..\..\..\lib\windows\bmfont\include\	ECHO Copying lib	XCOPY /Y ..\..\..\..\obj\windows\intern\bmfont\debug\*.lib ..\..\..\..\..\lib\windows\bmfont\lib\debug\*.a	ECHO Done
+# End Special Build Tool
+
+!ENDIF 
+
+# Begin Target
+
+# Name "bmfont - Win32 Release"
+# Name "bmfont - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\..\intern\BMF_Api.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\BMF_BitmapFont.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\BMF_font_helv10.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\BMF_font_helv12.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\BMF_font_helvb10.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\BMF_font_helvb12.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\BMF_font_helvb14.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\BMF_font_helvb8.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\BMF_font_scr12.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\BMF_font_scr14.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\BMF_font_scr15.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Group "intern"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\intern\BMF_BitmapFont.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\BMF_FontData.h
+# End Source File
+# End Group
+# Begin Group "extern"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\BMF_Api.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\BMF_Fonts.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\BMF_Settings.h
+# End Source File
+# End Group
+# End Group
+# End Target
+# End Project
diff --git a/intern/bmfont/make/msvc_6_0/bmfont.dsw b/intern/bmfont/make/msvc_6_0/bmfont.dsw
index d2e2f94cd0bdf861a2bec6d7e945bfa2917c900c..265738bc0fe41d903ac8314a1acbbb60c5d7ae32 100644
--- a/intern/bmfont/make/msvc_6_0/bmfont.dsw
+++ b/intern/bmfont/make/msvc_6_0/bmfont.dsw
@@ -1,29 +1,29 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "bmfont"=.\bmfont.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "bmfont"=.\bmfont.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
diff --git a/intern/bmfont/test/make/msvc_6_0/BMF_Test.dsp b/intern/bmfont/test/make/msvc_6_0/BMF_Test.dsp
index 13e6e65f70601eeb534a24946e21c3e0a69703a4..d178f5b4dc1217dd4d85d0f280b48351b43e8d56 100644
--- a/intern/bmfont/test/make/msvc_6_0/BMF_Test.dsp
+++ b/intern/bmfont/test/make/msvc_6_0/BMF_Test.dsp
@@ -1,109 +1,109 @@
-# Microsoft Developer Studio Project File - Name="BMF_Test" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=BMF_Test - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "BMF_Test.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "BMF_Test.mak" CFG="BMF_Test - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "BMF_Test - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "BMF_Test - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "BMF_Test - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../../../../obj/windows/intern/BMF_bmfont/test"
-# PROP Intermediate_Dir "../../../../../../obj/windows/intern/BMF_bmfont/test"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "../../../" /I "../../../../../lib/windows/string/include" /I "../../../../../lib/windows/ghost/include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libstring.a libghost.a glu32.lib opengl32.lib user32.lib gdi32.lib /nologo /subsystem:console /machine:I386 /libpath:"../../../../../lib/windows/string/lib" /libpath:"../../../../../lib/windows/ghost/lib"
-
-!ELSEIF  "$(CFG)" == "BMF_Test - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../../../../obj/windows/intern/BMF_bmfont/test/debug"
-# PROP Intermediate_Dir "../../../../../../obj/windows/intern/BMF_bmfont/test/debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "../../../" /I "../../../../../lib/windows/string/include" /I "../../../../../lib/windows/ghost/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 glu32.lib opengl32.lib libstring.a libghost.a user32.lib gdi32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"../../../../../lib/windows/string/lib" /libpath:"../../../../../lib/windows/ghost/lib"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "BMF_Test - Win32 Release"
-# Name "BMF_Test - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\..\intern\BMF_glut_helb8.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\intern\BMF_glut_helb8.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\BMF_Test.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="BMF_Test" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=BMF_Test - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "BMF_Test.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "BMF_Test.mak" CFG="BMF_Test - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "BMF_Test - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "BMF_Test - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "BMF_Test - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "../../../../../../obj/windows/intern/BMF_bmfont/test"
+# PROP Intermediate_Dir "../../../../../../obj/windows/intern/BMF_bmfont/test"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /I "../../../" /I "../../../../../lib/windows/string/include" /I "../../../../../lib/windows/ghost/include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 kernel32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libstring.a libghost.a glu32.lib opengl32.lib user32.lib gdi32.lib /nologo /subsystem:console /machine:I386 /libpath:"../../../../../lib/windows/string/lib" /libpath:"../../../../../lib/windows/ghost/lib"
+
+!ELSEIF  "$(CFG)" == "BMF_Test - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "../../../../../../obj/windows/intern/BMF_bmfont/test/debug"
+# PROP Intermediate_Dir "../../../../../../obj/windows/intern/BMF_bmfont/test/debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "../../../" /I "../../../../../lib/windows/string/include" /I "../../../../../lib/windows/ghost/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 glu32.lib opengl32.lib libstring.a libghost.a user32.lib gdi32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"../../../../../lib/windows/string/lib" /libpath:"../../../../../lib/windows/ghost/lib"
+
+!ENDIF 
+
+# Begin Target
+
+# Name "BMF_Test - Win32 Release"
+# Name "BMF_Test - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\..\..\intern\BMF_glut_helb8.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\intern\BMF_glut_helb8.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\BMF_Test.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project
diff --git a/intern/bmfont/test/make/msvc_6_0/BMF_Test.dsw b/intern/bmfont/test/make/msvc_6_0/BMF_Test.dsw
index 5baacb9adf7b32b03819c87891e5f1218ddeb98b..321de4972242dec0ec305ee222bae73784cebcca 100644
--- a/intern/bmfont/test/make/msvc_6_0/BMF_Test.dsw
+++ b/intern/bmfont/test/make/msvc_6_0/BMF_Test.dsw
@@ -1,44 +1,44 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "BMF_Test"=.\BMF_Test.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name BMF_bmfont
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "BMF_bmfont"=..\..\..\make\msvc_6_0\BMF_bmfont.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "BMF_Test"=.\BMF_Test.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name BMF_bmfont
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "BMF_bmfont"=..\..\..\make\msvc_6_0\BMF_bmfont.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
diff --git a/intern/boolop/intern/BOP_Merge2.cpp b/intern/boolop/intern/BOP_Merge2.cpp
index bbf3f8ba702a5e803666e9c3d21a6c130bc7dcac..2dc182289b390c282e969dd1875d99ce79b7a5e3 100644
--- a/intern/boolop/intern/BOP_Merge2.cpp
+++ b/intern/boolop/intern/BOP_Merge2.cpp
@@ -1,6 +1,6 @@
 /**
  *
- * $Id: BOP_Merge22.cpp 14444 2008-04-16 22:40:48Z hos $
+ * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
diff --git a/intern/boolop/intern/BOP_Misc.h b/intern/boolop/intern/BOP_Misc.h
index d021579d1619cf718234df74bef893194c82a932..ce963b5ce9229855baa69e87636d0cf479233272 100644
--- a/intern/boolop/intern/BOP_Misc.h
+++ b/intern/boolop/intern/BOP_Misc.h
@@ -1,6 +1,6 @@
 /**
  *
- * $Id: BOP_Misc.h 14444 2008-04-16 22:40:48Z khughes $
+ * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
diff --git a/intern/boolop/make/msvc_6_0/boolop.dsp b/intern/boolop/make/msvc_6_0/boolop.dsp
index f8a072b453180b384908e6fc0216a6cd883544f7..d4e0025adc277b67fafade6c2d8a5bbe94e4d20e 100644
--- a/intern/boolop/make/msvc_6_0/boolop.dsp
+++ b/intern/boolop/make/msvc_6_0/boolop.dsp
@@ -1,222 +1,222 @@
-# Microsoft Developer Studio Project File - Name="boolop" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=boolop - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "boolop.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "boolop.mak" CFG="boolop - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "boolop - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "boolop - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "boolop - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\..\source\blender\makesdna" /I "..\..\..\..\source\blender\makesdna\\" /I "..\..\..\..\..\lib\windows\moto\include\\" /I "..\..\..\..\..\lib\windows\container\include\\" /I "..\..\..\..\..\lib\windows\memutil\include\\" /I "../../extern" /I "..\..\..\..\..\lib\windows\guardedalloc\include\\" /I "..\..\..\..\source\blender\blenlib\\" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD BASE RSC /l 0x407 /d "NDEBUG"
-# ADD RSC /l 0x407 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PostBuild_Cmds=ECHO copy to lib folder	XCOPY /Y .\release\*.lib ..\..\..\..\..\lib\windows\boolop\lib\*.lib
-# End Special Build Tool
-
-!ELSEIF  "$(CFG)" == "boolop - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\..\source\blender\makesdna\\" /I "..\..\..\..\..\lib\windows\moto\include\\" /I "..\..\..\..\..\lib\windows\container\include\\" /I "..\..\..\..\..\lib\windows\memutil\include\\" /I "../../extern" /I "..\..\..\..\..\lib\windows\guardedalloc\include\\" /I "..\..\..\..\source\blender\blenlib\\" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x407 /d "_DEBUG"
-# ADD RSC /l 0x407 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ENDIF 
-
-# Begin Target
-
-# Name "boolop - Win32 Release"
-# Name "boolop - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\intern\BOP_BBox.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\BOP_BSPNode.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\BOP_BSPTree.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\BOP_Edge.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\BOP_Face.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\BOP_Face2Face.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\BOP_Interface.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\BOP_MathUtils.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\BOP_Merge.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\BOP_Mesh.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\BOP_Segment.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\BOP_Splitter.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\BOP_Tag.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\BOP_Triangulator.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\BOP_Vertex.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\..\intern\BOP_BBox.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\BOP_BSPNode.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\BOP_BSPTree.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\BOP_Chrono.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\BOP_Edge.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\BOP_Face.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\BOP_Face2Face.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\BOP_Indexs.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\BOP_MathUtils.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\BOP_Merge.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\BOP_Mesh.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\BOP_Segment.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\BOP_Splitter.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\BOP_Tag.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\BOP_Triangulator.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\BOP_Vertex.h
-# End Source File
-# End Group
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="boolop" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=boolop - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "boolop.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "boolop.mak" CFG="boolop - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "boolop - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "boolop - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "boolop - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\..\source\blender\makesdna" /I "..\..\..\..\source\blender\makesdna\\" /I "..\..\..\..\..\lib\windows\moto\include\\" /I "..\..\..\..\..\lib\windows\container\include\\" /I "..\..\..\..\..\lib\windows\memutil\include\\" /I "../../extern" /I "..\..\..\..\..\lib\windows\guardedalloc\include\\" /I "..\..\..\..\source\blender\blenlib\\" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD BASE RSC /l 0x407 /d "NDEBUG"
+# ADD RSC /l 0x407 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+# Begin Special Build Tool
+SOURCE="$(InputPath)"
+PostBuild_Cmds=ECHO copy to lib folder	XCOPY /Y .\release\*.lib ..\..\..\..\..\lib\windows\boolop\lib\*.lib
+# End Special Build Tool
+
+!ELSEIF  "$(CFG)" == "boolop - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\..\source\blender\makesdna\\" /I "..\..\..\..\..\lib\windows\moto\include\\" /I "..\..\..\..\..\lib\windows\container\include\\" /I "..\..\..\..\..\lib\windows\memutil\include\\" /I "../../extern" /I "..\..\..\..\..\lib\windows\guardedalloc\include\\" /I "..\..\..\..\source\blender\blenlib\\" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD BASE RSC /l 0x407 /d "_DEBUG"
+# ADD RSC /l 0x407 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ENDIF 
+
+# Begin Target
+
+# Name "boolop - Win32 Release"
+# Name "boolop - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\..\intern\BOP_BBox.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\BOP_BSPNode.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\BOP_BSPTree.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\BOP_Edge.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\BOP_Face.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\BOP_Face2Face.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\BOP_Interface.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\BOP_MathUtils.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\BOP_Merge.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\BOP_Mesh.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\BOP_Segment.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\BOP_Splitter.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\BOP_Tag.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\BOP_Triangulator.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\BOP_Vertex.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=..\..\intern\BOP_BBox.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\BOP_BSPNode.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\BOP_BSPTree.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\BOP_Chrono.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\BOP_Edge.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\BOP_Face.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\BOP_Face2Face.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\BOP_Indexs.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\BOP_MathUtils.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\BOP_Merge.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\BOP_Mesh.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\BOP_Segment.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\BOP_Splitter.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\BOP_Tag.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\BOP_Triangulator.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\BOP_Vertex.h
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/intern/bsp/make/msvc6_0/bsplib.dsp b/intern/bsp/make/msvc6_0/bsplib.dsp
index 00bac9672218602e2532bb74c29fde7813acd2d0..703a6326d3aa9a572a29d27a81c0a0a94110eaed 100644
--- a/intern/bsp/make/msvc6_0/bsplib.dsp
+++ b/intern/bsp/make/msvc6_0/bsplib.dsp
@@ -1,138 +1,138 @@
-# Microsoft Developer Studio Project File - Name="bsplib" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=bsplib - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "bsplib.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "bsplib.mak" CFG="bsplib - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "bsplib - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "bsplib - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "bsplib - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\..\obj\windows\intern\bsp\"
-# PROP Intermediate_Dir "..\..\..\..\obj\windows\intern\bsp\"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /Ob2 /I "../../../../../lib/windows/memutil/include" /I "../.." /I "../../../../../lib/windows/moto/include" /I "../../../../../lib/windows/container/include" /I "..\..\..\container" /I "..\..\..\moto\include" /I "..\..\..\memutil" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD BASE RSC /l 0x413 /d "NDEBUG"
-# ADD RSC /l 0x413 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\intern\bsp\libbsp.lib"
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PostBuild_Cmds=ECHO Copying header files	XCOPY /Y ..\..\extern\*.h ..\..\..\..\..\lib\windows\bsp\include\	ECHO Copying lib	XCOPY /Y ..\..\..\..\obj\windows\intern\bsp\*.lib ..\..\..\..\..\lib\windows\bsp\lib\*.a	ECHO Done
-# End Special Build Tool
-
-!ELSEIF  "$(CFG)" == "bsplib - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\..\obj\windows\intern\bsp\debug"
-# PROP Intermediate_Dir "..\..\..\..\obj\windows\intern\bsp\debug"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../../../../lib/windows/memutil" /I "../.." /I "../../../../../lib/windows/moto/include" /I "../../../../../lib/windows/container/include" /I "../../../../../lib/windows/memutil/include" /I "..\..\..\container" /I "..\..\..\moto\include" /I "..\..\..\memutil" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FD /GZ /c
-# ADD BASE RSC /l 0x413 /d "_DEBUG"
-# ADD RSC /l 0x413 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\intern\bsp\debug\libbsp.lib"
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PostBuild_Cmds=ECHO Copying header files	XCOPY /Y ..\..\extern\*.h ..\..\..\..\..\lib\windows\bsp\include\	ECHO Copying lib	XCOPY /Y ..\..\..\..\obj\windows\intern\bsp\debug\*.lib ..\..\..\..\..\lib\windows\bsp\lib\debug\*.a	ECHO Copying Debug info.	XCOPY /Y ..\..\..\..\obj\windows\intern\bsp\debug\vc60.* ..\..\..\..\..\lib\windows\bsp\lib\debug\	ECHO Done
-# End Special Build Tool
-
-!ENDIF 
-
-# Begin Target
-
-# Name "bsplib - Win32 Release"
-# Name "bsplib - Win32 Debug"
-# Begin Group "intern"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\intern\BSP_CSGException.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\BSP_CSGISplitter.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\BSP_CSGMesh.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\BSP_CSGMesh.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\BSP_CSGMesh_CFIterator.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\BSP_MeshPrimitives.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\BSP_MeshPrimitives.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\CSG_BooleanOps.cpp
-# End Source File
-# End Group
-# Begin Group "extern"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\extern\CSG_BooleanOps.h
-# End Source File
-# End Group
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="bsplib" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=bsplib - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "bsplib.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "bsplib.mak" CFG="bsplib - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "bsplib - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "bsplib - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "bsplib - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\..\..\obj\windows\intern\bsp\"
+# PROP Intermediate_Dir "..\..\..\..\obj\windows\intern\bsp\"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /Ob2 /I "../../../../../lib/windows/memutil/include" /I "../.." /I "../../../../../lib/windows/moto/include" /I "../../../../../lib/windows/container/include" /I "..\..\..\container" /I "..\..\..\moto\include" /I "..\..\..\memutil" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD BASE RSC /l 0x413 /d "NDEBUG"
+# ADD RSC /l 0x413 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\intern\bsp\libbsp.lib"
+# Begin Special Build Tool
+SOURCE="$(InputPath)"
+PostBuild_Cmds=ECHO Copying header files	XCOPY /Y ..\..\extern\*.h ..\..\..\..\..\lib\windows\bsp\include\	ECHO Copying lib	XCOPY /Y ..\..\..\..\obj\windows\intern\bsp\*.lib ..\..\..\..\..\lib\windows\bsp\lib\*.a	ECHO Done
+# End Special Build Tool
+
+!ELSEIF  "$(CFG)" == "bsplib - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\..\..\obj\windows\intern\bsp\debug"
+# PROP Intermediate_Dir "..\..\..\..\obj\windows\intern\bsp\debug"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../../../../lib/windows/memutil" /I "../.." /I "../../../../../lib/windows/moto/include" /I "../../../../../lib/windows/container/include" /I "../../../../../lib/windows/memutil/include" /I "..\..\..\container" /I "..\..\..\moto\include" /I "..\..\..\memutil" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FD /GZ /c
+# ADD BASE RSC /l 0x413 /d "_DEBUG"
+# ADD RSC /l 0x413 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\intern\bsp\debug\libbsp.lib"
+# Begin Special Build Tool
+SOURCE="$(InputPath)"
+PostBuild_Cmds=ECHO Copying header files	XCOPY /Y ..\..\extern\*.h ..\..\..\..\..\lib\windows\bsp\include\	ECHO Copying lib	XCOPY /Y ..\..\..\..\obj\windows\intern\bsp\debug\*.lib ..\..\..\..\..\lib\windows\bsp\lib\debug\*.a	ECHO Copying Debug info.	XCOPY /Y ..\..\..\..\obj\windows\intern\bsp\debug\vc60.* ..\..\..\..\..\lib\windows\bsp\lib\debug\	ECHO Done
+# End Special Build Tool
+
+!ENDIF 
+
+# Begin Target
+
+# Name "bsplib - Win32 Release"
+# Name "bsplib - Win32 Debug"
+# Begin Group "intern"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\intern\BSP_CSGException.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\BSP_CSGISplitter.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\BSP_CSGMesh.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\BSP_CSGMesh.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\BSP_CSGMesh_CFIterator.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\BSP_MeshPrimitives.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\BSP_MeshPrimitives.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\CSG_BooleanOps.cpp
+# End Source File
+# End Group
+# Begin Group "extern"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\extern\CSG_BooleanOps.h
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/intern/bsp/make/msvc6_0/bsplib.dsw b/intern/bsp/make/msvc6_0/bsplib.dsw
index 1827dc3746e072aa7c3096a00d624db13bdc2aa8..de8cdcd1d33e05ab6d0926e7e89123d39466ba9b 100644
--- a/intern/bsp/make/msvc6_0/bsplib.dsw
+++ b/intern/bsp/make/msvc6_0/bsplib.dsw
@@ -1,29 +1,29 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "bsplib"=.\bsplib.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "bsplib"=.\bsplib.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
diff --git a/intern/bsp/test/BSP_GhostTest/BSP_GhostTest.dsp b/intern/bsp/test/BSP_GhostTest/BSP_GhostTest.dsp
index aaa4527384505d77ff431a20ed6b54d7690f9170..4474eaa5d90a876bc903ef9835a586cc7789624f 100644
--- a/intern/bsp/test/BSP_GhostTest/BSP_GhostTest.dsp
+++ b/intern/bsp/test/BSP_GhostTest/BSP_GhostTest.dsp
@@ -1,126 +1,126 @@
-# Microsoft Developer Studio Project File - Name="BSP_GhostTest" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=BSP_GhostTest - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "BSP_GhostTest.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "BSP_GhostTest.mak" CFG="BSP_GhostTest - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "BSP_GhostTest - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "BSP_GhostTest - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "BSP_GhostTest - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /G6 /MT /W3 /GX /O2 /Ob2 /I "../../extern/" /I "../../../../lib/windows/string/include" /I "../../../../lib/windows/ghost/include" /I "../../../../lib/windows/moto/include" /I "../../../../lib/windows/memutil/include" /I "../../../../lib/windows/container/include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x413 /d "NDEBUG"
-# ADD RSC /l 0x413 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 glu32.lib opengl32.lib kernel32.lib user32.lib gdi32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\lib\windows\glut-3.7\lib\\"
-
-!ELSEIF  "$(CFG)" == "BSP_GhostTest - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../extern/" /I "../../../../lib/windows/string/include" /I "../../../../lib/windows/ghost/include" /I "../../../../lib/windows/moto/include" /I "../../../../lib/windows/memutil/include" /I "../../../../lib/windows/container/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x413 /d "_DEBUG"
-# ADD RSC /l 0x413 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 glu32.lib opengl32.lib user32.lib gdi32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\lib\windows\glut-3.7\lib\\"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "BSP_GhostTest - Win32 Release"
-# Name "BSP_GhostTest - Win32 Debug"
-# Begin Source File
-
-SOURCE=.\BSP_GhostTest3D.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\BSP_GhostTest3D.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\BSP_MeshDrawer.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\BSP_MeshDrawer.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\BSP_PlyLoader.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\BSP_PlyLoader.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\BSP_TMesh.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\main.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\ply.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\plyfile.c
-# End Source File
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="BSP_GhostTest" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=BSP_GhostTest - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "BSP_GhostTest.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "BSP_GhostTest.mak" CFG="BSP_GhostTest - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "BSP_GhostTest - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "BSP_GhostTest - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "BSP_GhostTest - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /G6 /MT /W3 /GX /O2 /Ob2 /I "../../extern/" /I "../../../../lib/windows/string/include" /I "../../../../lib/windows/ghost/include" /I "../../../../lib/windows/moto/include" /I "../../../../lib/windows/memutil/include" /I "../../../../lib/windows/container/include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE RSC /l 0x413 /d "NDEBUG"
+# ADD RSC /l 0x413 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 glu32.lib opengl32.lib kernel32.lib user32.lib gdi32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\lib\windows\glut-3.7\lib\\"
+
+!ELSEIF  "$(CFG)" == "BSP_GhostTest - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../extern/" /I "../../../../lib/windows/string/include" /I "../../../../lib/windows/ghost/include" /I "../../../../lib/windows/moto/include" /I "../../../../lib/windows/memutil/include" /I "../../../../lib/windows/container/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD BASE RSC /l 0x413 /d "_DEBUG"
+# ADD RSC /l 0x413 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 glu32.lib opengl32.lib user32.lib gdi32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\lib\windows\glut-3.7\lib\\"
+
+!ENDIF 
+
+# Begin Target
+
+# Name "BSP_GhostTest - Win32 Release"
+# Name "BSP_GhostTest - Win32 Debug"
+# Begin Source File
+
+SOURCE=.\BSP_GhostTest3D.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\BSP_GhostTest3D.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\BSP_MeshDrawer.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\BSP_MeshDrawer.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\BSP_PlyLoader.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\BSP_PlyLoader.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\BSP_TMesh.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\main.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\ply.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\plyfile.c
+# End Source File
+# End Target
+# End Project
diff --git a/intern/bsp/test/BSP_GhostTest/BSP_GhostTest.dsw b/intern/bsp/test/BSP_GhostTest/BSP_GhostTest.dsw
index 802fba84befc472c2b1dcef0e7977b503c06d146..0d9ca3d2b08cc2bacb6207a559a91b92dc721c8a 100644
--- a/intern/bsp/test/BSP_GhostTest/BSP_GhostTest.dsw
+++ b/intern/bsp/test/BSP_GhostTest/BSP_GhostTest.dsw
@@ -1,125 +1,125 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "BSP_GhostTest"=.\BSP_GhostTest.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name bsplib
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name ghost
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name string
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name MoTo
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "MoTo"=..\..\..\moto\make\msvc_6_0\MoTo.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "bsplib"=..\..\make\msvc6_0\bsplib.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name container
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name memutil
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name MoTo
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "container"=..\..\..\container\make\msvc_6_0\container.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name memutil
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "ghost"=..\..\..\ghost\make\msvc\ghost.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "memutil"=..\..\..\memutil\make\msvc_60\memutil.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "string"=..\..\..\string\make\msvc_6_0\string.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "BSP_GhostTest"=.\BSP_GhostTest.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name bsplib
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name ghost
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name string
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name MoTo
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "MoTo"=..\..\..\moto\make\msvc_6_0\MoTo.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "bsplib"=..\..\make\msvc6_0\bsplib.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name container
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name memutil
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name MoTo
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "container"=..\..\..\container\make\msvc_6_0\container.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name memutil
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "ghost"=..\..\..\ghost\make\msvc\ghost.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "memutil"=..\..\..\memutil\make\msvc_60\memutil.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "string"=..\..\..\string\make\msvc_6_0\string.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
diff --git a/intern/container/make/msvc_6_0/container.dsp b/intern/container/make/msvc_6_0/container.dsp
index 2ccf1f0a3846fc0a853b1dcd14988db6ca986faa..ac565c4c1ecc88b1c6f211a6bc62228844fa28d1 100644
--- a/intern/container/make/msvc_6_0/container.dsp
+++ b/intern/container/make/msvc_6_0/container.dsp
@@ -1,133 +1,133 @@
-# Microsoft Developer Studio Project File - Name="container" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=container - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "container.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "container.mak" CFG="container - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "container - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "container - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "container - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\..\obj\windows\intern\container"
-# PROP Intermediate_Dir "..\..\..\..\obj\windows\intern\container"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /Ob2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD BASE RSC /l 0x413 /d "NDEBUG"
-# ADD RSC /l 0x413 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"../../../../obj/windows/intern/container/libcontainer.lib"
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PostBuild_Cmds=ECHO Copying header files	XCOPY /Y ..\..\*.h ..\..\..\..\..\lib\windows\container\include\	ECHO Copying lib	XCOPY /Y ..\..\..\..\obj\windows\intern\container\*.lib ..\..\..\..\..\lib\windows\container\lib\*.a	ECHO Done
-# End Special Build Tool
-
-!ELSEIF  "$(CFG)" == "container - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\..\obj\windows\intern\container\debug"
-# PROP Intermediate_Dir "..\..\..\..\obj\windows\intern\container\debug"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x413 /d "_DEBUG"
-# ADD RSC /l 0x413 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\intern\container\debug\libcontainer.lib"
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PostBuild_Cmds=ECHO Copying header files	XCOPY /Y ..\..\*.h ..\..\..\..\..\lib\windows\container\include\	ECHO Copying lib	XCOPY /Y ..\..\..\..\obj\windows\intern\container\debug\*.lib ..\..\..\..\..\lib\windows\container\lib\debug\*.a	ECHO Copying Debug info.	XCOPY /Y ..\..\..\..\obj\windows\intern\container\debug\vc60.* ..\..\..\..\..\lib\windows\container\lib\debug\	ECHO Done
-# End Special Build Tool
-
-!ENDIF 
-
-# Begin Target
-
-# Name "container - Win32 Release"
-# Name "container - Win32 Debug"
-# Begin Group "intern"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\intern\CTR_List.cpp
-
-!IF  "$(CFG)" == "container - Win32 Release"
-
-# ADD CPP /I "../extern" /I "../../"
-
-!ELSEIF  "$(CFG)" == "container - Win32 Debug"
-
-# ADD CPP /I "../../"
-
-!ENDIF 
-
-# End Source File
-# End Group
-# Begin Source File
-
-SOURCE=..\..\CTR_List.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\CTR_Map.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\CTR_TaggedIndex.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\CTR_TaggedSetOps.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\CTR_UHeap.h
-# End Source File
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="container" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=container - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "container.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "container.mak" CFG="container - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "container - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "container - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "container - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\..\..\obj\windows\intern\container"
+# PROP Intermediate_Dir "..\..\..\..\obj\windows\intern\container"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /Ob2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD BASE RSC /l 0x413 /d "NDEBUG"
+# ADD RSC /l 0x413 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"../../../../obj/windows/intern/container/libcontainer.lib"
+# Begin Special Build Tool
+SOURCE="$(InputPath)"
+PostBuild_Cmds=ECHO Copying header files	XCOPY /Y ..\..\*.h ..\..\..\..\..\lib\windows\container\include\	ECHO Copying lib	XCOPY /Y ..\..\..\..\obj\windows\intern\container\*.lib ..\..\..\..\..\lib\windows\container\lib\*.a	ECHO Done
+# End Special Build Tool
+
+!ELSEIF  "$(CFG)" == "container - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\..\..\obj\windows\intern\container\debug"
+# PROP Intermediate_Dir "..\..\..\..\obj\windows\intern\container\debug"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD BASE RSC /l 0x413 /d "_DEBUG"
+# ADD RSC /l 0x413 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\intern\container\debug\libcontainer.lib"
+# Begin Special Build Tool
+SOURCE="$(InputPath)"
+PostBuild_Cmds=ECHO Copying header files	XCOPY /Y ..\..\*.h ..\..\..\..\..\lib\windows\container\include\	ECHO Copying lib	XCOPY /Y ..\..\..\..\obj\windows\intern\container\debug\*.lib ..\..\..\..\..\lib\windows\container\lib\debug\*.a	ECHO Copying Debug info.	XCOPY /Y ..\..\..\..\obj\windows\intern\container\debug\vc60.* ..\..\..\..\..\lib\windows\container\lib\debug\	ECHO Done
+# End Special Build Tool
+
+!ENDIF 
+
+# Begin Target
+
+# Name "container - Win32 Release"
+# Name "container - Win32 Debug"
+# Begin Group "intern"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\intern\CTR_List.cpp
+
+!IF  "$(CFG)" == "container - Win32 Release"
+
+# ADD CPP /I "../extern" /I "../../"
+
+!ELSEIF  "$(CFG)" == "container - Win32 Debug"
+
+# ADD CPP /I "../../"
+
+!ENDIF 
+
+# End Source File
+# End Group
+# Begin Source File
+
+SOURCE=..\..\CTR_List.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\CTR_Map.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\CTR_TaggedIndex.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\CTR_TaggedSetOps.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\CTR_UHeap.h
+# End Source File
+# End Target
+# End Project
diff --git a/intern/container/make/msvc_6_0/container.dsw b/intern/container/make/msvc_6_0/container.dsw
index 13092e3c427cc70400af609846bc1f3dfdd19484..ed9604641fbead2a695c541afcd1669eade22fe8 100644
--- a/intern/container/make/msvc_6_0/container.dsw
+++ b/intern/container/make/msvc_6_0/container.dsw
@@ -1,29 +1,29 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "container"=.\container.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "container"=.\container.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
diff --git a/intern/decimation/make/msvc_6_0/decimation.dsp b/intern/decimation/make/msvc_6_0/decimation.dsp
index 013e9e077fb8a0ace5e9c23ca34ad30960a8d7a0..40b65a032dba2c68840a0f849ccf473acf5781fd 100644
--- a/intern/decimation/make/msvc_6_0/decimation.dsp
+++ b/intern/decimation/make/msvc_6_0/decimation.dsp
@@ -1,186 +1,186 @@
-# Microsoft Developer Studio Project File - Name="decimation" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=decimation - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "decimation.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "decimation.mak" CFG="decimation - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "decimation - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "decimation - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "decimation - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\..\obj\windows\intern\decimation"
-# PROP Intermediate_Dir "..\..\..\..\obj\windows\intern\decimation"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\lib\windows\container\include\\" /I "..\..\..\..\..\lib\windows\memutil\include\\" /I "..\..\..\..\..\lib\windows\moto\include\\" /I"..\..\..\moto\include" /I"..\..\..\memutil" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /FD /c
-# ADD BASE RSC /l 0x413 /d "NDEBUG"
-# ADD RSC /l 0x413 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\intern\decimation\libdecimation.lib"
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PostBuild_Cmds=ECHO Copying header files	XCOPY /Y ..\..\extern\*.h ..\..\..\..\..\lib\windows\decimation\include\	ECHO Copying lib	XCOPY /Y ..\..\..\..\obj\windows\intern\decimation\*.lib ..\..\..\..\..\lib\windows\decimation\lib\*.a	ECHO Done
-# End Special Build Tool
-
-!ELSEIF  "$(CFG)" == "decimation - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\..\obj\windows\intern\decimation\debug"
-# PROP Intermediate_Dir "..\..\..\..\obj\windows\intern\decimation\debug"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /W4 /Gm /GX /ZI /Od /I "..\..\..\..\..\lib\windows\container\include\\" /I "..\..\..\..\..\lib\windows\memutil\include\\" /I "..\..\..\..\..\lib\windows\moto\include\\" /I"..\..\..\moto\include" /I"..\..\..\memutil" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FD /GZ /c
-# ADD BASE RSC /l 0x413 /d "_DEBUG"
-# ADD RSC /l 0x413 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\intern\decimation\debug\libdecimation.lib"
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PostBuild_Cmds=ECHO Copying header files	XCOPY /Y ..\..\extern\*.h ..\..\..\..\..\lib\windows\decimation\include\	ECHO Copying lib	XCOPY /Y ..\..\..\..\obj\windows\intern\decimation\debug\*.lib ..\..\..\..\..\lib\windows\decimation\lib\debug\*.a	ECHO Copying Debug info.	XCOPY /Y ..\..\..\..\obj\windows\intern\decimation\debug\vc60.* ..\..\..\..\..\lib\windows\decimation\lib\debug\	ECHO Done
-# End Special Build Tool
-
-!ENDIF 
-
-# Begin Target
-
-# Name "decimation - Win32 Release"
-# Name "decimation - Win32 Debug"
-# Begin Group "intern"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\intern\LOD_decimation.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\LOD_DecimationClass.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\LOD_EdgeCollapser.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\LOD_EdgeCollapser.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\LOD_ExternBufferEditor.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\LOD_ExternNormalEditor.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\LOD_ExternNormalEditor.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\LOD_FaceNormalEditor.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\LOD_FaceNormalEditor.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\LOD_ManMesh2.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\LOD_ManMesh2.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\LOD_MeshBounds.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\LOD_MeshException.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\LOD_MeshPrimitives.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\LOD_MeshPrimitives.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\LOD_QSDecimator.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\LOD_QSDecimator.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\LOD_Quadric.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\LOD_QuadricEditor.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\LOD_QuadricEditor.h
-# End Source File
-# End Group
-# Begin Group "extern"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\extern\LOD_decimation.h
-# End Source File
-# End Group
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="decimation" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=decimation - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "decimation.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "decimation.mak" CFG="decimation - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "decimation - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "decimation - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "decimation - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\..\..\obj\windows\intern\decimation"
+# PROP Intermediate_Dir "..\..\..\..\obj\windows\intern\decimation"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\lib\windows\container\include\\" /I "..\..\..\..\..\lib\windows\memutil\include\\" /I "..\..\..\..\..\lib\windows\moto\include\\" /I"..\..\..\moto\include" /I"..\..\..\memutil" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /FD /c
+# ADD BASE RSC /l 0x413 /d "NDEBUG"
+# ADD RSC /l 0x413 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\intern\decimation\libdecimation.lib"
+# Begin Special Build Tool
+SOURCE="$(InputPath)"
+PostBuild_Cmds=ECHO Copying header files	XCOPY /Y ..\..\extern\*.h ..\..\..\..\..\lib\windows\decimation\include\	ECHO Copying lib	XCOPY /Y ..\..\..\..\obj\windows\intern\decimation\*.lib ..\..\..\..\..\lib\windows\decimation\lib\*.a	ECHO Done
+# End Special Build Tool
+
+!ELSEIF  "$(CFG)" == "decimation - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\..\..\obj\windows\intern\decimation\debug"
+# PROP Intermediate_Dir "..\..\..\..\obj\windows\intern\decimation\debug"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /W4 /Gm /GX /ZI /Od /I "..\..\..\..\..\lib\windows\container\include\\" /I "..\..\..\..\..\lib\windows\memutil\include\\" /I "..\..\..\..\..\lib\windows\moto\include\\" /I"..\..\..\moto\include" /I"..\..\..\memutil" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FD /GZ /c
+# ADD BASE RSC /l 0x413 /d "_DEBUG"
+# ADD RSC /l 0x413 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\intern\decimation\debug\libdecimation.lib"
+# Begin Special Build Tool
+SOURCE="$(InputPath)"
+PostBuild_Cmds=ECHO Copying header files	XCOPY /Y ..\..\extern\*.h ..\..\..\..\..\lib\windows\decimation\include\	ECHO Copying lib	XCOPY /Y ..\..\..\..\obj\windows\intern\decimation\debug\*.lib ..\..\..\..\..\lib\windows\decimation\lib\debug\*.a	ECHO Copying Debug info.	XCOPY /Y ..\..\..\..\obj\windows\intern\decimation\debug\vc60.* ..\..\..\..\..\lib\windows\decimation\lib\debug\	ECHO Done
+# End Special Build Tool
+
+!ENDIF 
+
+# Begin Target
+
+# Name "decimation - Win32 Release"
+# Name "decimation - Win32 Debug"
+# Begin Group "intern"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\intern\LOD_decimation.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\LOD_DecimationClass.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\LOD_EdgeCollapser.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\LOD_EdgeCollapser.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\LOD_ExternBufferEditor.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\LOD_ExternNormalEditor.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\LOD_ExternNormalEditor.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\LOD_FaceNormalEditor.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\LOD_FaceNormalEditor.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\LOD_ManMesh2.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\LOD_ManMesh2.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\LOD_MeshBounds.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\LOD_MeshException.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\LOD_MeshPrimitives.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\LOD_MeshPrimitives.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\LOD_QSDecimator.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\LOD_QSDecimator.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\LOD_Quadric.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\LOD_QuadricEditor.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\LOD_QuadricEditor.h
+# End Source File
+# End Group
+# Begin Group "extern"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\extern\LOD_decimation.h
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/intern/decimation/make/msvc_6_0/decimation.dsw b/intern/decimation/make/msvc_6_0/decimation.dsw
index f874b32472597ec6e980467bd34e37bc51460202..d46268c2545a4270ede9bda0b8ec6bdf9253beb4 100644
--- a/intern/decimation/make/msvc_6_0/decimation.dsw
+++ b/intern/decimation/make/msvc_6_0/decimation.dsw
@@ -1,33 +1,33 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "decimation"=.\decimation.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
-
-
-
-
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "decimation"=.\decimation.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
+
+
+
+
diff --git a/intern/elbeem/make/msvc_6_0/elbeem.dsp b/intern/elbeem/make/msvc_6_0/elbeem.dsp
index ef5daa29fa47675d2f2378b760c72126cedf4dee..652687ca82b625428bd2b3957a70750cfa5b39b9 100644
--- a/intern/elbeem/make/msvc_6_0/elbeem.dsp
+++ b/intern/elbeem/make/msvc_6_0/elbeem.dsp
@@ -1,290 +1,290 @@
-# Microsoft Developer Studio Project File - Name="elbeem" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=elbeem - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "elbeem.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "elbeem.mak" CFG="elbeem - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "elbeem - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "elbeem - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "elbeem - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /I "../../../../../lib/windows/sdl/include" /I "../../../../../lib/windows/zlib/include" /I "../../../../../lib/windows/png/include" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "NOGUI" /D "ELBEEM_BLENDER" /YX /FD /c
-# ADD BASE RSC /l 0x407 /d "NDEBUG"
-# ADD RSC /l 0x407 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"Release\blender_elbeem.lib"
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PostBuild_Cmds=ECHO copy to lib ...	xcopy /Y .\release\blender_elbeem.lib ..\..\..\..\..\lib\windows\elbeem\lib\*.*
-# End Special Build Tool
-
-!ELSEIF  "$(CFG)" == "elbeem - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../../../../lib/windows/sdl/include" /I "../../../../../lib/windows/zlib/include" /I "../../../../../lib/windows/png/include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "NOGUI" /D "ELBEEM_BLENDER" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x407 /d "_DEBUG"
-# ADD RSC /l 0x407 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"Debug\blender_elbeem.lib"
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PostBuild_Cmds=ECHO copy to lib ...	xcopy /Y .\debug\blender_elbeem.lib ..\..\..\..\..\lib\windows\elbeem\lib\debug\*.*
-# End Special Build Tool
-
-!ENDIF 
-
-# Begin Target
-
-# Name "elbeem - Win32 Release"
-# Name "elbeem - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\intern\attributes.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\elbeem.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\isosurface.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\ntl_blenderdumper.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\ntl_bsptree.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\ntl_geometrymodel.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\ntl_geometryobject.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\ntl_lighting.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\ntl_ray.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\ntl_world.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\parametrizer.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\particletracer.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\simulation_object.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\solver_adap.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\solver_init.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\solver_interface.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\solver_main.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\solver_util.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\utilities.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\..\intern\attributes.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\isosurface.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\mcubes_tables.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\ntl_blenderdumper.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\ntl_bsptree.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\ntl_geometryclass.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\ntl_geometrymodel.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\ntl_geometryobject.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\ntl_geometryshader.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\ntl_lighting.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\ntl_lightobject.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\ntl_material.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\ntl_matrices.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\ntl_ray.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\ntl_renderglobals.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\ntl_rndstream.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\ntl_scene.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\ntl_triangle.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\ntl_vector3dim.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\ntl_world.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\parametrizer.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\particletracer.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\simulation_object.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\solver_class.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\solver_dimenions.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\solver_interface.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\solver_relax.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\utilities.h
-# End Source File
-# End Group
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="elbeem" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=elbeem - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "elbeem.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "elbeem.mak" CFG="elbeem - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "elbeem - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "elbeem - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "elbeem - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /I "../../../../../lib/windows/sdl/include" /I "../../../../../lib/windows/zlib/include" /I "../../../../../lib/windows/png/include" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "NOGUI" /D "ELBEEM_BLENDER" /YX /FD /c
+# ADD BASE RSC /l 0x407 /d "NDEBUG"
+# ADD RSC /l 0x407 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"Release\blender_elbeem.lib"
+# Begin Special Build Tool
+SOURCE="$(InputPath)"
+PostBuild_Cmds=ECHO copy to lib ...	xcopy /Y .\release\blender_elbeem.lib ..\..\..\..\..\lib\windows\elbeem\lib\*.*
+# End Special Build Tool
+
+!ELSEIF  "$(CFG)" == "elbeem - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../../../../lib/windows/sdl/include" /I "../../../../../lib/windows/zlib/include" /I "../../../../../lib/windows/png/include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "NOGUI" /D "ELBEEM_BLENDER" /YX /FD /GZ /c
+# ADD BASE RSC /l 0x407 /d "_DEBUG"
+# ADD RSC /l 0x407 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"Debug\blender_elbeem.lib"
+# Begin Special Build Tool
+SOURCE="$(InputPath)"
+PostBuild_Cmds=ECHO copy to lib ...	xcopy /Y .\debug\blender_elbeem.lib ..\..\..\..\..\lib\windows\elbeem\lib\debug\*.*
+# End Special Build Tool
+
+!ENDIF 
+
+# Begin Target
+
+# Name "elbeem - Win32 Release"
+# Name "elbeem - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\..\intern\attributes.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\elbeem.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\isosurface.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\ntl_blenderdumper.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\ntl_bsptree.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\ntl_geometrymodel.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\ntl_geometryobject.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\ntl_lighting.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\ntl_ray.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\ntl_world.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\parametrizer.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\particletracer.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\simulation_object.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\solver_adap.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\solver_init.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\solver_interface.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\solver_main.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\solver_util.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\utilities.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=..\..\intern\attributes.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\isosurface.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\mcubes_tables.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\ntl_blenderdumper.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\ntl_bsptree.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\ntl_geometryclass.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\ntl_geometrymodel.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\ntl_geometryobject.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\ntl_geometryshader.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\ntl_lighting.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\ntl_lightobject.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\ntl_material.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\ntl_matrices.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\ntl_ray.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\ntl_renderglobals.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\ntl_rndstream.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\ntl_scene.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\ntl_triangle.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\ntl_vector3dim.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\ntl_world.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\parametrizer.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\particletracer.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\simulation_object.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\solver_class.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\solver_dimenions.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\solver_interface.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\solver_relax.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\utilities.h
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/intern/ghost/make/msvc/ghost.dsp b/intern/ghost/make/msvc/ghost.dsp
index fd287488b5672ef41efe70ea6243327beb3f0ce0..741d1c3a2478e4e29a107e0410000e51304c0680 100644
--- a/intern/ghost/make/msvc/ghost.dsp
+++ b/intern/ghost/make/msvc/ghost.dsp
@@ -1,292 +1,292 @@
-# Microsoft Developer Studio Project File - Name="ghost" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=ghost - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "ghost.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "ghost.mak" CFG="ghost - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "ghost - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "ghost - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "ghost - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\..\obj\windows\intern\ghost"
-# PROP Intermediate_Dir "..\..\..\..\obj\windows\intern\ghost"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../.." /I "../../../../../lib/windows/string/include" /I "..\..\..\..\intern\string" /I "../../../../../lib/windows/wintab/include" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\intern\ghost\libghost.lib"
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PostBuild_Desc=Copying GHOST files library (release target) to lib tree.
-PostBuild_Cmds=ECHO Copying header files	XCOPY /Y ..\..\*.h ..\..\..\..\..\lib\windows\ghost\include\	ECHO Copying lib	XCOPY /Y ..\..\..\..\obj\windows\intern\ghost\*.lib ..\..\..\..\..\lib\windows\ghost\lib\*.a	ECHO Done
-# End Special Build Tool
-
-!ELSEIF  "$(CFG)" == "ghost - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\..\obj\windows\intern\ghost\debug"
-# PROP Intermediate_Dir "..\..\..\..\obj\windows\intern\ghost\debug"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../.." /I "../../../../../lib/windows/string/include" /I "..\..\..\..\intern\string" /I "../../../../../lib/windows/wintab/include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FR /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\intern\ghost\debug\libghost.lib"
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PostBuild_Desc=Copying GHOST files library (debug target) to lib tree.
-PostBuild_Cmds=ECHO Copying header files	XCOPY /Y ..\..\*.h ..\..\..\..\..\lib\windows\ghost\include\	ECHO Copying lib	XCOPY /Y ..\..\..\..\obj\windows\intern\ghost\debug\*.lib ..\..\..\..\..\lib\windows\ghost\lib\debug\*.a	ECHO Done
-# End Special Build Tool
-
-!ENDIF 
-
-# Begin Target
-
-# Name "ghost - Win32 Release"
-# Name "ghost - Win32 Debug"
-# Begin Group "Header Files"
-
-# PROP Default_Filter ""
-# Begin Group "intern"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\intern\GHOST_Buttons.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\GHOST_CallbackEventConsumer.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\GHOST_Debug.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\GHOST_DisplayManager.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\GHOST_DisplayManagerWin32.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\GHOST_Event.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\GHOST_EventButton.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\GHOST_EventCursor.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\GHOST_EventKey.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\GHOST_EventManager.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\GHOST_EventPrinter.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\GHOST_EventWheel.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\GHOST_EventWindow.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\GHOST_ModifierKeys.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\GHOST_System.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\GHOST_SystemWin32.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\GHOST_TimerManager.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\GHOST_TimerTask.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\GHOST_Window.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\GHOST_WindowManager.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\GHOST_WindowWin32.h
-# End Source File
-# End Group
-# Begin Group "extern"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE="..\..\GHOST_C-api.h"
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\GHOST_IEvent.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\GHOST_IEventConsumer.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\GHOST_ISystem.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\GHOST_ITimerTask.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\GHOST_IWindow.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\GHOST_Rect.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\GHOST_Types.h
-# End Source File
-# End Group
-# End Group
-# Begin Group "Source Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\intern\GHOST_Buttons.cpp
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\intern\GHOST_C-api.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\GHOST_CallbackEventConsumer.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\GHOST_DisplayManager.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\GHOST_DisplayManagerWin32.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\GHOST_EventManager.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\GHOST_EventPrinter.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\GHOST_ISystem.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\GHOST_ModifierKeys.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\GHOST_Rect.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\GHOST_System.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\GHOST_SystemWin32.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\GHOST_TimerManager.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\GHOST_Window.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\GHOST_WindowManager.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\GHOST_WindowWin32.cpp
-# End Source File
-# End Group
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="ghost" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=ghost - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "ghost.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "ghost.mak" CFG="ghost - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "ghost - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "ghost - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "ghost - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\..\..\obj\windows\intern\ghost"
+# PROP Intermediate_Dir "..\..\..\..\obj\windows\intern\ghost"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../.." /I "../../../../../lib/windows/string/include" /I "..\..\..\..\intern\string" /I "../../../../../lib/windows/wintab/include" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\intern\ghost\libghost.lib"
+# Begin Special Build Tool
+SOURCE="$(InputPath)"
+PostBuild_Desc=Copying GHOST files library (release target) to lib tree.
+PostBuild_Cmds=ECHO Copying header files	XCOPY /Y ..\..\*.h ..\..\..\..\..\lib\windows\ghost\include\	ECHO Copying lib	XCOPY /Y ..\..\..\..\obj\windows\intern\ghost\*.lib ..\..\..\..\..\lib\windows\ghost\lib\*.a	ECHO Done
+# End Special Build Tool
+
+!ELSEIF  "$(CFG)" == "ghost - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\..\..\obj\windows\intern\ghost\debug"
+# PROP Intermediate_Dir "..\..\..\..\obj\windows\intern\ghost\debug"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../.." /I "../../../../../lib/windows/string/include" /I "..\..\..\..\intern\string" /I "../../../../../lib/windows/wintab/include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FR /YX /FD /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\intern\ghost\debug\libghost.lib"
+# Begin Special Build Tool
+SOURCE="$(InputPath)"
+PostBuild_Desc=Copying GHOST files library (debug target) to lib tree.
+PostBuild_Cmds=ECHO Copying header files	XCOPY /Y ..\..\*.h ..\..\..\..\..\lib\windows\ghost\include\	ECHO Copying lib	XCOPY /Y ..\..\..\..\obj\windows\intern\ghost\debug\*.lib ..\..\..\..\..\lib\windows\ghost\lib\debug\*.a	ECHO Done
+# End Special Build Tool
+
+!ENDIF 
+
+# Begin Target
+
+# Name "ghost - Win32 Release"
+# Name "ghost - Win32 Debug"
+# Begin Group "Header Files"
+
+# PROP Default_Filter ""
+# Begin Group "intern"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\intern\GHOST_Buttons.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\GHOST_CallbackEventConsumer.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\GHOST_Debug.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\GHOST_DisplayManager.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\GHOST_DisplayManagerWin32.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\GHOST_Event.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\GHOST_EventButton.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\GHOST_EventCursor.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\GHOST_EventKey.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\GHOST_EventManager.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\GHOST_EventPrinter.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\GHOST_EventWheel.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\GHOST_EventWindow.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\GHOST_ModifierKeys.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\GHOST_System.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\GHOST_SystemWin32.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\GHOST_TimerManager.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\GHOST_TimerTask.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\GHOST_Window.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\GHOST_WindowManager.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\GHOST_WindowWin32.h
+# End Source File
+# End Group
+# Begin Group "extern"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE="..\..\GHOST_C-api.h"
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\GHOST_IEvent.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\GHOST_IEventConsumer.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\GHOST_ISystem.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\GHOST_ITimerTask.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\GHOST_IWindow.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\GHOST_Rect.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\GHOST_Types.h
+# End Source File
+# End Group
+# End Group
+# Begin Group "Source Files"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\intern\GHOST_Buttons.cpp
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\intern\GHOST_C-api.cpp"
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\GHOST_CallbackEventConsumer.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\GHOST_DisplayManager.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\GHOST_DisplayManagerWin32.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\GHOST_EventManager.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\GHOST_EventPrinter.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\GHOST_ISystem.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\GHOST_ModifierKeys.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\GHOST_Rect.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\GHOST_System.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\GHOST_SystemWin32.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\GHOST_TimerManager.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\GHOST_Window.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\GHOST_WindowManager.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\GHOST_WindowWin32.cpp
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/intern/ghost/make/msvc/ghost.dsw b/intern/ghost/make/msvc/ghost.dsw
index 807a6ec31570f9093ed44e89d5f4be4f3da2eeac..a98e7644c11d421a61a3ae60fdf9349c46d45bb1 100644
--- a/intern/ghost/make/msvc/ghost.dsw
+++ b/intern/ghost/make/msvc/ghost.dsw
@@ -1,29 +1,29 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "ghost"=".\ghost.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "ghost"=".\ghost.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
diff --git a/intern/ghost/test/make/msvc_6_0/gears.dsp b/intern/ghost/test/make/msvc_6_0/gears.dsp
index 3e809a6b60490e4a67962e59556fc814a94734d6..e068231bf327cc28e066633f873526706fb5c006 100644
--- a/intern/ghost/test/make/msvc_6_0/gears.dsp
+++ b/intern/ghost/test/make/msvc_6_0/gears.dsp
@@ -1,102 +1,102 @@
-# Microsoft Developer Studio Project File - Name="gears" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=gears - Win32 Release
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "gears.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "gears.mak" CFG="gears - Win32 Release"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "gears - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "gears - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "gears - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../../../../obj/windows/intern/ghost/test/"
-# PROP Intermediate_Dir "../../../../../../obj/windows/intern/ghost/test/"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../.." /I "../../../../string" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 glu32.lib opengl32.lib user32.lib gdi32.lib /nologo /subsystem:console /machine:I386
-
-!ELSEIF  "$(CFG)" == "gears - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../../../../obj/windows/intern/ghost/test/debug"
-# PROP Intermediate_Dir "../../../../../../obj/windows/intern/ghost/test/debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../.." /I "../../../../string" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 glu32.lib opengl32.lib user32.lib gdi32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "gears - Win32 Release"
-# Name "gears - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\gears\GHOST_Test.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="gears" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=gears - Win32 Release
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "gears.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "gears.mak" CFG="gears - Win32 Release"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "gears - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "gears - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "gears - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "../../../../../../obj/windows/intern/ghost/test/"
+# PROP Intermediate_Dir "../../../../../../obj/windows/intern/ghost/test/"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../.." /I "../../../../string" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 glu32.lib opengl32.lib user32.lib gdi32.lib /nologo /subsystem:console /machine:I386
+
+!ELSEIF  "$(CFG)" == "gears - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "../../../../../../obj/windows/intern/ghost/test/debug"
+# PROP Intermediate_Dir "../../../../../../obj/windows/intern/ghost/test/debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../.." /I "../../../../string" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 glu32.lib opengl32.lib user32.lib gdi32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+
+!ENDIF 
+
+# Begin Target
+
+# Name "gears - Win32 Release"
+# Name "gears - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\..\gears\GHOST_Test.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project
diff --git a/intern/ghost/test/make/msvc_6_0/gears_C.dsp b/intern/ghost/test/make/msvc_6_0/gears_C.dsp
index 5972d12326849d1fc1d2a1be7a268347be7ac517..df0ae0448fdba40a31d31b6ab2dd1ccb4d309d00 100644
--- a/intern/ghost/test/make/msvc_6_0/gears_C.dsp
+++ b/intern/ghost/test/make/msvc_6_0/gears_C.dsp
@@ -1,102 +1,102 @@
-# Microsoft Developer Studio Project File - Name="gears_C" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=gears_C - Win32 Release
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "gears_C.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "gears_C.mak" CFG="gears_C - Win32 Release"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "gears_C - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "gears_C - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "gears_C - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../../../../obj/windows/intern/ghost/test/"
-# PROP Intermediate_Dir "../../../../../../obj/windows/intern/ghost/test/"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../.." /I "../../../../string" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 glu32.lib opengl32.lib user32.lib gdi32.lib /nologo /subsystem:console /machine:I386
-
-!ELSEIF  "$(CFG)" == "gears_C - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../../../../obj/windows/intern/ghost/test/debug"
-# PROP Intermediate_Dir "../../../../../../obj/windows/intern/ghost/test/debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../.." /I "../../../../string" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 glu32.lib opengl32.lib user32.lib gdi32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "gears_C - Win32 Release"
-# Name "gears_C - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE="..\..\gears\GHOST_C-Test.c"
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="gears_C" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=gears_C - Win32 Release
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "gears_C.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "gears_C.mak" CFG="gears_C - Win32 Release"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "gears_C - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "gears_C - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "gears_C - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "../../../../../../obj/windows/intern/ghost/test/"
+# PROP Intermediate_Dir "../../../../../../obj/windows/intern/ghost/test/"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../.." /I "../../../../string" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 glu32.lib opengl32.lib user32.lib gdi32.lib /nologo /subsystem:console /machine:I386
+
+!ELSEIF  "$(CFG)" == "gears_C - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "../../../../../../obj/windows/intern/ghost/test/debug"
+# PROP Intermediate_Dir "../../../../../../obj/windows/intern/ghost/test/debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../.." /I "../../../../string" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 glu32.lib opengl32.lib user32.lib gdi32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+
+!ENDIF 
+
+# Begin Target
+
+# Name "gears_C - Win32 Release"
+# Name "gears_C - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE="..\..\gears\GHOST_C-Test.c"
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project
diff --git a/intern/ghost/test/make/msvc_6_0/ghost_test.dsw b/intern/ghost/test/make/msvc_6_0/ghost_test.dsw
index 03bf5eb5c9ade2f015a0bc7f514cf8853f03b36f..7a56a3b5ef1c25a605337eac4fe2186f03936009 100644
--- a/intern/ghost/test/make/msvc_6_0/ghost_test.dsw
+++ b/intern/ghost/test/make/msvc_6_0/ghost_test.dsw
@@ -1,77 +1,77 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "gears"=.\gears.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name ghost
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name string
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "gears_C"=.\gears_C.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name ghost
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name string
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "ghost"=..\..\..\make\msvc\ghost.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "string"=..\..\..\..\string\make\msvc_6_0\string.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "gears"=.\gears.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name ghost
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name string
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "gears_C"=.\gears_C.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name ghost
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name string
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "ghost"=..\..\..\make\msvc\ghost.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "string"=..\..\..\..\string\make\msvc_6_0\string.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
diff --git a/intern/guardedalloc/intern/mmap_win.c b/intern/guardedalloc/intern/mmap_win.c
index 642cc16296ef147e2dbd43638cc034f87bb575b0..5c59640200f4f71310c0f9252b0aaa7ddc259180 100644
--- a/intern/guardedalloc/intern/mmap_win.c
+++ b/intern/guardedalloc/intern/mmap_win.c
@@ -1,5 +1,5 @@
 /**
- * $Id: $
+ * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
diff --git a/intern/guardedalloc/make/msvc_6_0/guardedalloc.dsp b/intern/guardedalloc/make/msvc_6_0/guardedalloc.dsp
index 21cc20e14f1e5a5d9bc95293db6b7a1000115ec9..1c02b639a30686bf78407f538922d4dc79b512bb 100644
--- a/intern/guardedalloc/make/msvc_6_0/guardedalloc.dsp
+++ b/intern/guardedalloc/make/msvc_6_0/guardedalloc.dsp
@@ -1,114 +1,114 @@
-# Microsoft Developer Studio Project File - Name="guardedalloc" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=guardedalloc - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "guardedalloc.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "guardedalloc.mak" CFG="guardedalloc - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "guardedalloc - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "guardedalloc - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "guardedalloc - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\..\obj\windows\intern\guardedalloc\"
-# PROP Intermediate_Dir "..\..\..\..\obj\windows\intern\guardedalloc\"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\.." /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\intern\guardedalloc\libguardedalloc.lib"
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PostBuild_Cmds=ECHO Copying header files	XCOPY /Y ..\..\*.h ..\..\..\..\..\lib\windows\guardedalloc\include\	ECHO Copying lib	XCOPY /Y ..\..\..\..\obj\windows\intern\guardedalloc\*.lib ..\..\..\..\..\lib\windows\guardedalloc\lib\*.a	ECHO Done
-# End Special Build Tool
-
-!ELSEIF  "$(CFG)" == "guardedalloc - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\..\obj\windows\intern\guardedalloc\debug"
-# PROP Intermediate_Dir "..\..\..\..\obj\windows\intern\guardedalloc\debug"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\.." /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\intern\guardedalloc\debug\libguardedalloc.lib"
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PostBuild_Cmds=ECHO Copying header files	XCOPY /Y ..\..\*.h ..\..\..\..\..\lib\windows\guardedalloc\include\	ECHO Copying lib	XCOPY /Y ..\..\..\..\obj\windows\intern\guardedalloc\debug\*.lib ..\..\..\..\..\lib\windows\guardedalloc\lib\debug\*.a	ECHO Done
-# End Special Build Tool
-
-!ENDIF 
-
-# Begin Target
-
-# Name "guardedalloc - Win32 Release"
-# Name "guardedalloc - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\intern\mallocn.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Group "extern"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\MEM_guardedalloc.h
-# End Source File
-# End Group
-# End Group
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="guardedalloc" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=guardedalloc - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "guardedalloc.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "guardedalloc.mak" CFG="guardedalloc - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "guardedalloc - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "guardedalloc - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "guardedalloc - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\..\..\obj\windows\intern\guardedalloc\"
+# PROP Intermediate_Dir "..\..\..\..\obj\windows\intern\guardedalloc\"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /I "..\.." /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\intern\guardedalloc\libguardedalloc.lib"
+# Begin Special Build Tool
+SOURCE="$(InputPath)"
+PostBuild_Cmds=ECHO Copying header files	XCOPY /Y ..\..\*.h ..\..\..\..\..\lib\windows\guardedalloc\include\	ECHO Copying lib	XCOPY /Y ..\..\..\..\obj\windows\intern\guardedalloc\*.lib ..\..\..\..\..\lib\windows\guardedalloc\lib\*.a	ECHO Done
+# End Special Build Tool
+
+!ELSEIF  "$(CFG)" == "guardedalloc - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\..\..\obj\windows\intern\guardedalloc\debug"
+# PROP Intermediate_Dir "..\..\..\..\obj\windows\intern\guardedalloc\debug"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\.." /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\intern\guardedalloc\debug\libguardedalloc.lib"
+# Begin Special Build Tool
+SOURCE="$(InputPath)"
+PostBuild_Cmds=ECHO Copying header files	XCOPY /Y ..\..\*.h ..\..\..\..\..\lib\windows\guardedalloc\include\	ECHO Copying lib	XCOPY /Y ..\..\..\..\obj\windows\intern\guardedalloc\debug\*.lib ..\..\..\..\..\lib\windows\guardedalloc\lib\debug\*.a	ECHO Done
+# End Special Build Tool
+
+!ENDIF 
+
+# Begin Target
+
+# Name "guardedalloc - Win32 Release"
+# Name "guardedalloc - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\..\intern\mallocn.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Group "extern"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\MEM_guardedalloc.h
+# End Source File
+# End Group
+# End Group
+# End Target
+# End Project
diff --git a/intern/guardedalloc/mmap_win.h b/intern/guardedalloc/mmap_win.h
index 443c3b6f4ceb69eebfe527cc927079a61547a06a..855c46c08da5b05dc070b8418d72f74385a5bb6b 100644
--- a/intern/guardedalloc/mmap_win.h
+++ b/intern/guardedalloc/mmap_win.h
@@ -1,5 +1,5 @@
 /**
- * $Id: $
+ * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
diff --git a/intern/iksolver/make/msvc_6_0/iksolver.dsp b/intern/iksolver/make/msvc_6_0/iksolver.dsp
index c5e842bdd04e8d287b59198ef284c4d615ff8667..f40ef72a62aab23b8d186cf8f8df55a250b561d1 100644
--- a/intern/iksolver/make/msvc_6_0/iksolver.dsp
+++ b/intern/iksolver/make/msvc_6_0/iksolver.dsp
@@ -1,260 +1,260 @@
-# Microsoft Developer Studio Project File - Name="iksolver" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=iksolver - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "iksolver.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "iksolver.mak" CFG="iksolver - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "iksolver - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "iksolver - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "iksolver - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\..\obj\windows\intern\iksolver"
-# PROP Intermediate_Dir "..\..\..\..\obj\windows\intern\iksolver"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /Ob2 /I "..\..\..\..\intern\moto\include" /I "..\..\..\..\intern\memutil" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x413 /d "NDEBUG"
-# ADD RSC /l 0x413 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\intern\iksolver\libiksolver.lib"
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PostBuild_Cmds=ECHO Copying header files	XCOPY /Y ..\..\extern\*.h ..\..\..\..\..\lib\windows\iksolver\include\	ECHO Copying lib	XCOPY /Y ..\..\..\..\obj\windows\intern\iksolver\*.lib ..\..\..\..\..\lib\windows\iksolver\lib\*.a	ECHO Done
-# End Special Build Tool
-
-!ELSEIF  "$(CFG)" == "iksolver - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\..\obj\windows\intern\iksolver\debug"
-# PROP Intermediate_Dir "..\..\..\..\obj\windows\intern\iksolver\debug"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\..\intern\moto\include" /I "..\..\..\..\intern\memutil" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FD /GZ /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x413 /d "_DEBUG"
-# ADD RSC /l 0x413 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\intern\iksolver\debug\libiksolver.lib"
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PostBuild_Cmds=ECHO Copying header files	XCOPY /Y ..\..\extern\*.h ..\..\..\..\..\lib\windows\iksolver\include\	ECHO Copying lib	XCOPY /Y ..\..\..\..\obj\windows\intern\iksolver\debug\*.lib ..\..\..\..\..\lib\windows\iksolver\lib\debug\*.a	ECHO Done
-# End Special Build Tool
-
-!ENDIF 
-
-# Begin Target
-
-# Name "iksolver - Win32 Release"
-# Name "iksolver - Win32 Debug"
-# Begin Group "intern"
-
-# PROP Default_Filter ""
-# Begin Group "common"
-
-# PROP Default_Filter ""
-# End Group
-# Begin Group "TNT"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\intern\TNT\cholesky.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\TNT\cmat.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\TNT\fcscmat.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\TNT\fmat.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\TNT\fortran.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\TNT\fspvec.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\TNT\index.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\TNT\lapack.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\TNT\lu.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\TNT\qr.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\TNT\region1d.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\TNT\region2d.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\TNT\stopwatch.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\TNT\subscript.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\TNT\svd.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\TNT\tnt.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\TNT\tntmath.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\TNT\tntreqs.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\TNT\transv.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\TNT\triang.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\TNT\trisolve.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\TNT\vec.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\TNT\vecadaptor.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\TNT\version.h
-# End Source File
-# End Group
-# Begin Source File
-
-SOURCE=..\..\intern\IK_QJacobian.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\IK_QJacobian.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\IK_QJacobianSolver.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\IK_QJacobianSolver.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\IK_QSegment.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\IK_QSegment.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\IK_QSolver_Class.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\IK_QTask.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\IK_QTask.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\IK_Solver.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\MT_ExpMap.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\MT_ExpMap.h
-# End Source File
-# End Group
-# Begin Group "extern"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\extern\IK_solver.h
-# End Source File
-# End Group
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="iksolver" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=iksolver - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "iksolver.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "iksolver.mak" CFG="iksolver - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "iksolver - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "iksolver - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "iksolver - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\..\..\obj\windows\intern\iksolver"
+# PROP Intermediate_Dir "..\..\..\..\obj\windows\intern\iksolver"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /Ob2 /I "..\..\..\..\intern\moto\include" /I "..\..\..\..\intern\memutil" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x413 /d "NDEBUG"
+# ADD RSC /l 0x413 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\intern\iksolver\libiksolver.lib"
+# Begin Special Build Tool
+SOURCE="$(InputPath)"
+PostBuild_Cmds=ECHO Copying header files	XCOPY /Y ..\..\extern\*.h ..\..\..\..\..\lib\windows\iksolver\include\	ECHO Copying lib	XCOPY /Y ..\..\..\..\obj\windows\intern\iksolver\*.lib ..\..\..\..\..\lib\windows\iksolver\lib\*.a	ECHO Done
+# End Special Build Tool
+
+!ELSEIF  "$(CFG)" == "iksolver - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\..\..\obj\windows\intern\iksolver\debug"
+# PROP Intermediate_Dir "..\..\..\..\obj\windows\intern\iksolver\debug"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\..\intern\moto\include" /I "..\..\..\..\intern\memutil" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FD /GZ /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x413 /d "_DEBUG"
+# ADD RSC /l 0x413 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\intern\iksolver\debug\libiksolver.lib"
+# Begin Special Build Tool
+SOURCE="$(InputPath)"
+PostBuild_Cmds=ECHO Copying header files	XCOPY /Y ..\..\extern\*.h ..\..\..\..\..\lib\windows\iksolver\include\	ECHO Copying lib	XCOPY /Y ..\..\..\..\obj\windows\intern\iksolver\debug\*.lib ..\..\..\..\..\lib\windows\iksolver\lib\debug\*.a	ECHO Done
+# End Special Build Tool
+
+!ENDIF 
+
+# Begin Target
+
+# Name "iksolver - Win32 Release"
+# Name "iksolver - Win32 Debug"
+# Begin Group "intern"
+
+# PROP Default_Filter ""
+# Begin Group "common"
+
+# PROP Default_Filter ""
+# End Group
+# Begin Group "TNT"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\intern\TNT\cholesky.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\TNT\cmat.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\TNT\fcscmat.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\TNT\fmat.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\TNT\fortran.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\TNT\fspvec.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\TNT\index.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\TNT\lapack.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\TNT\lu.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\TNT\qr.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\TNT\region1d.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\TNT\region2d.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\TNT\stopwatch.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\TNT\subscript.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\TNT\svd.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\TNT\tnt.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\TNT\tntmath.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\TNT\tntreqs.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\TNT\transv.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\TNT\triang.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\TNT\trisolve.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\TNT\vec.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\TNT\vecadaptor.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\TNT\version.h
+# End Source File
+# End Group
+# Begin Source File
+
+SOURCE=..\..\intern\IK_QJacobian.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\IK_QJacobian.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\IK_QJacobianSolver.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\IK_QJacobianSolver.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\IK_QSegment.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\IK_QSegment.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\IK_QSolver_Class.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\IK_QTask.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\IK_QTask.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\IK_Solver.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\MT_ExpMap.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\MT_ExpMap.h
+# End Source File
+# End Group
+# Begin Group "extern"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\extern\IK_solver.h
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/intern/iksolver/make/msvc_6_0/iksolver.dsw b/intern/iksolver/make/msvc_6_0/iksolver.dsw
index 90a123d9ce86ea6e16c3f74660a05eed6873cb08..9771088c42d4dc424d4d71ed32ca136afe676aef 100644
--- a/intern/iksolver/make/msvc_6_0/iksolver.dsw
+++ b/intern/iksolver/make/msvc_6_0/iksolver.dsw
@@ -1,35 +1,35 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "iksolver"=.\iksolver.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
-
-
-
-
-
-
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "iksolver"=.\iksolver.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
+
+
+
+
+
+
diff --git a/intern/iksolver/test/ik_glut_test/make/msvc_6_0/ik_glut_test.dsp b/intern/iksolver/test/ik_glut_test/make/msvc_6_0/ik_glut_test.dsp
index 8688b2fcc2cddf1dffd86b7e2d545c0f83de13f0..2de994d12e34d1d774dfcd5fe851ed09d977c658 100644
--- a/intern/iksolver/test/ik_glut_test/make/msvc_6_0/ik_glut_test.dsp
+++ b/intern/iksolver/test/ik_glut_test/make/msvc_6_0/ik_glut_test.dsp
@@ -1,130 +1,130 @@
-# Microsoft Developer Studio Project File - Name="ik_glut_test" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=ik_glut_test - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "ik_glut_test.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "ik_glut_test.mak" CFG="ik_glut_test - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "ik_glut_test - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "ik_glut_test - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "ik_glut_test - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\..\..\extern" /I "..\..\..\..\..\..\lib\windows\glut-3.7\include" /I "..\..\..\..\..\..\lib\windows\moto\include" /I "..\..\..\..\..\..\lib\windows\memutil\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x413 /d "NDEBUG"
-# ADD RSC /l 0x413 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 iksolver_rmtd.lib libmoto.a /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\lib\windows\release" /libpath:"..\..\..\..\..\..\lib\windows\glut-3.7\lib" /libpath:"..\..\..\..\..\..\lib\windows\moto\lib"
-
-!ELSEIF  "$(CFG)" == "ik_glut_test - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\..\extern" /I "..\..\..\..\..\..\lib\windows\glut-3.7\include" /I "..\..\..\..\..\..\lib\windows\moto\include" /I "..\..\..\..\..\..\lib\windows\memutil\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x413 /d "_DEBUG"
-# ADD RSC /l 0x413 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 iksolver_dmtd.lib libmoto.a /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"LIBCMTD.lib" /pdbtype:sept /libpath:"..\..\..\..\lib\windows\debug" /libpath:"..\..\..\..\..\..\lib\windows\glut-3.7\lib" /libpath:"..\..\..\..\..\..\lib\windows\moto\lib\debug"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "ik_glut_test - Win32 Release"
-# Name "ik_glut_test - Win32 Debug"
-# Begin Group "common"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\common\GlutDrawer.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\common\GlutDrawer.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\common\GlutKeyboardManager.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\common\GlutKeyboardManager.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\common\GlutMouseManager.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\common\GlutMouseManager.h
-# End Source File
-# End Group
-# Begin Source File
-
-SOURCE=..\..\intern\ChainDrawer.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\main.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\MyGlutKeyHandler.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\MyGlutMouseHandler.h
-# End Source File
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="ik_glut_test" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=ik_glut_test - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "ik_glut_test.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "ik_glut_test.mak" CFG="ik_glut_test - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "ik_glut_test - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "ik_glut_test - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "ik_glut_test - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\..\..\extern" /I "..\..\..\..\..\..\lib\windows\glut-3.7\include" /I "..\..\..\..\..\..\lib\windows\moto\include" /I "..\..\..\..\..\..\lib\windows\memutil\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE RSC /l 0x413 /d "NDEBUG"
+# ADD RSC /l 0x413 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 iksolver_rmtd.lib libmoto.a /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\lib\windows\release" /libpath:"..\..\..\..\..\..\lib\windows\glut-3.7\lib" /libpath:"..\..\..\..\..\..\lib\windows\moto\lib"
+
+!ELSEIF  "$(CFG)" == "ik_glut_test - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\..\extern" /I "..\..\..\..\..\..\lib\windows\glut-3.7\include" /I "..\..\..\..\..\..\lib\windows\moto\include" /I "..\..\..\..\..\..\lib\windows\memutil\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD BASE RSC /l 0x413 /d "_DEBUG"
+# ADD RSC /l 0x413 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 iksolver_dmtd.lib libmoto.a /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"LIBCMTD.lib" /pdbtype:sept /libpath:"..\..\..\..\lib\windows\debug" /libpath:"..\..\..\..\..\..\lib\windows\glut-3.7\lib" /libpath:"..\..\..\..\..\..\lib\windows\moto\lib\debug"
+
+!ENDIF 
+
+# Begin Target
+
+# Name "ik_glut_test - Win32 Release"
+# Name "ik_glut_test - Win32 Debug"
+# Begin Group "common"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\common\GlutDrawer.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\common\GlutDrawer.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\common\GlutKeyboardManager.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\common\GlutKeyboardManager.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\common\GlutMouseManager.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\common\GlutMouseManager.h
+# End Source File
+# End Group
+# Begin Source File
+
+SOURCE=..\..\intern\ChainDrawer.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\main.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\MyGlutKeyHandler.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\MyGlutMouseHandler.h
+# End Source File
+# End Target
+# End Project
diff --git a/intern/iksolver/test/ik_glut_test/make/msvc_6_0/ik_glut_test.dsw b/intern/iksolver/test/ik_glut_test/make/msvc_6_0/ik_glut_test.dsw
index 09b7094137b775f9ea5b4b68ea190807c4e6412c..84915beaeb2138ffb602be70471a8e9c1ab29ef3 100644
--- a/intern/iksolver/test/ik_glut_test/make/msvc_6_0/ik_glut_test.dsw
+++ b/intern/iksolver/test/ik_glut_test/make/msvc_6_0/ik_glut_test.dsw
@@ -1,49 +1,49 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "ik_glut_test"=.\ik_glut_test.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name iksolver
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "iksolver"=..\..\..\..\make\msvc_6_0\iksolver.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
-
-
-
-
-
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "ik_glut_test"=.\ik_glut_test.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name iksolver
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "iksolver"=..\..\..\..\make\msvc_6_0\iksolver.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
+
+
+
+
+
diff --git a/intern/make/msvc_6_0/build_install_all.dsp b/intern/make/msvc_6_0/build_install_all.dsp
index 110c28ddeaca4bc3bd8dd0b08e91ef862f3a6584..714c30fc5cf6480e6982b8fde16f3c2423078f18 100644
--- a/intern/make/msvc_6_0/build_install_all.dsp
+++ b/intern/make/msvc_6_0/build_install_all.dsp
@@ -1,68 +1,68 @@
-# Microsoft Developer Studio Project File - Name="Build_install_all" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Generic Project" 0x010a
-
-CFG=Build_install_all - Win32 Debug
-!MESSAGE This is not a valid makefile. To Build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "Build_install_all.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "Build_install_all.mak" CFG="Build_install_all - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "Build_install_all - Win32 Release" (based on "Win32 (x86) Generic Project")
-!MESSAGE "Build_install_all - Win32 Debug" (based on "Win32 (x86) Generic Project")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-MTL=midl.exe
-
-!IF  "$(CFG)" == "Build_install_all - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-
-!ELSEIF  "$(CFG)" == "Build_install_all - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PostBuild_Desc=Python freeze
-PostBuild_Cmds=ECHO Freezing Blender Python code	..\..\python\freeze\freeze.bat
-# End Special Build Tool
-
-!ENDIF 
-
-# Begin Target
-
-# Name "Build_install_all - Win32 Release"
-# Name "Build_install_all - Win32 Debug"
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="Build_install_all" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Generic Project" 0x010a
+
+CFG=Build_install_all - Win32 Debug
+!MESSAGE This is not a valid makefile. To Build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "Build_install_all.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "Build_install_all.mak" CFG="Build_install_all - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "Build_install_all - Win32 Release" (based on "Win32 (x86) Generic Project")
+!MESSAGE "Build_install_all - Win32 Debug" (based on "Win32 (x86) Generic Project")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+MTL=midl.exe
+
+!IF  "$(CFG)" == "Build_install_all - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Target_Dir ""
+
+!ELSEIF  "$(CFG)" == "Build_install_all - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Target_Dir ""
+# Begin Special Build Tool
+SOURCE="$(InputPath)"
+PostBuild_Desc=Python freeze
+PostBuild_Cmds=ECHO Freezing Blender Python code	..\..\python\freeze\freeze.bat
+# End Special Build Tool
+
+!ENDIF 
+
+# Begin Target
+
+# Name "Build_install_all - Win32 Release"
+# Name "Build_install_all - Win32 Debug"
+# End Target
+# End Project
diff --git a/intern/make/msvc_6_0/intern.dsw b/intern/make/msvc_6_0/intern.dsw
index 2818636c1c6e3ba2b7d61b3fe7b186a82a0780fc..1f37f3c618a5a8c8170af86f7961190ce0ef6631 100644
--- a/intern/make/msvc_6_0/intern.dsw
+++ b/intern/make/msvc_6_0/intern.dsw
@@ -1,302 +1,302 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "Build_install_all"=.\build_install_all.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name OpenNL
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name bmfont
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name bsplib
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name container
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name decimation
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name DummySoundSystem
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name ghost
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name guardedalloc
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name iksolver
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name memutil
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name MoTo
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name SoundSystem
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name string
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name elbeem
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name boolop
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name OpenALSoundSystem
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "DummySoundSystem"=..\..\SoundSystem\make\msvc_6_0\dummy\DummySoundSystem.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "MoTo"=..\..\moto\make\msvc_6_0\MoTo.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "OpenALSoundSystem"=..\..\SoundSystem\make\msvc_6_0\openal\OpenALSoundSystem.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "OpenNL"=..\..\opennl\make\msvc_6_0\OpenNL.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "SoundSystem"=..\..\SoundSystem\make\msvc_6_0\SoundSystem.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "bmfont"=..\..\bmfont\make\msvc_6_0\bmfont.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "boolop"=..\..\boolop\make\msvc_6_0\boolop.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "bsplib"=..\..\bsp\make\msvc6_0\bsplib.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name container
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name memutil
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name MoTo
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "container"=..\..\container\make\msvc_6_0\container.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "csg"=..\..\csg\make\msvc60\csg.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "decimation"=..\..\decimation\make\msvc_6_0\decimation.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name memutil
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name MoTo
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name container
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "elbeem"=..\..\elbeem\make\msvc_6_0\elbeem.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "ghost"=..\..\ghost\make\msvc\ghost.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name string
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "guardedalloc"=..\..\guardedalloc\make\msvc_6_0\guardedalloc.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "iksolver"=..\..\iksolver\make\msvc_6_0\iksolver.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "memutil"=..\..\memutil\make\msvc_60\memutil.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "string"=..\..\string\make\msvc_6_0\string.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "Build_install_all"=.\build_install_all.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name OpenNL
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name bmfont
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name bsplib
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name container
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name decimation
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name DummySoundSystem
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name ghost
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name guardedalloc
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name iksolver
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name memutil
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name MoTo
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name SoundSystem
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name string
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name elbeem
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name boolop
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name OpenALSoundSystem
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "DummySoundSystem"=..\..\SoundSystem\make\msvc_6_0\dummy\DummySoundSystem.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "MoTo"=..\..\moto\make\msvc_6_0\MoTo.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "OpenALSoundSystem"=..\..\SoundSystem\make\msvc_6_0\openal\OpenALSoundSystem.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "OpenNL"=..\..\opennl\make\msvc_6_0\OpenNL.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "SoundSystem"=..\..\SoundSystem\make\msvc_6_0\SoundSystem.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "bmfont"=..\..\bmfont\make\msvc_6_0\bmfont.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "boolop"=..\..\boolop\make\msvc_6_0\boolop.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "bsplib"=..\..\bsp\make\msvc6_0\bsplib.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name container
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name memutil
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name MoTo
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "container"=..\..\container\make\msvc_6_0\container.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "csg"=..\..\csg\make\msvc60\csg.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "decimation"=..\..\decimation\make\msvc_6_0\decimation.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name memutil
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name MoTo
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name container
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "elbeem"=..\..\elbeem\make\msvc_6_0\elbeem.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "ghost"=..\..\ghost\make\msvc\ghost.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name string
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "guardedalloc"=..\..\guardedalloc\make\msvc_6_0\guardedalloc.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "iksolver"=..\..\iksolver\make\msvc_6_0\iksolver.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "memutil"=..\..\memutil\make\msvc_60\memutil.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "string"=..\..\string\make\msvc_6_0\string.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
diff --git a/intern/memutil/make/msvc_60/memutil.dsp b/intern/memutil/make/msvc_60/memutil.dsp
index 62b7efba9d8183db6ff6fbd34686ed3c60e7fc5d..b7e7904e9bf96327070e411684609244ada3373d 100644
--- a/intern/memutil/make/msvc_60/memutil.dsp
+++ b/intern/memutil/make/msvc_60/memutil.dsp
@@ -1,150 +1,150 @@
-# Microsoft Developer Studio Project File - Name="memutil" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=memutil - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "memutil.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "memutil.mak" CFG="memutil - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "memutil - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "memutil - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "memutil - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\..\obj\windows\intern\memutil\"
-# PROP Intermediate_Dir "..\..\..\..\obj\windows\intern\memutil\"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /Ob2 /I "../../" /I "../../../" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PostBuild_Cmds=ECHO Copying header files	XCOPY /Y ..\..\*.h ..\..\..\..\..\lib\windows\memutil\include\	ECHO Copying lib	XCOPY /Y ..\..\..\..\obj\windows\intern\memutil\*.lib ..\..\..\..\..\lib\windows\memutil\lib\*.a	ECHO Done
-# End Special Build Tool
-
-!ELSEIF  "$(CFG)" == "memutil - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\..\obj\windows\intern\memutil\debug"
-# PROP Intermediate_Dir "..\..\..\..\obj\windows\intern\memutil\debug"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../" /I "../../../" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PostBuild_Cmds=ECHO Copying header files	XCOPY /Y ..\..\*.h ..\..\..\..\..\lib\windows\memutil\include\	ECHO Copying lib	XCOPY /Y ..\..\..\..\obj\windows\intern\memutil\debug\*.lib ..\..\..\..\..\lib\windows\memutil\lib\debug\*.a	ECHO Copying Debug info.	XCOPY /Y ..\..\..\..\obj\windows\intern\memutil\debug\vc60.* ..\..\..\..\..\lib\windows\memutil\lib\debug\	ECHO Done
-# End Special Build Tool
-
-!ENDIF 
-
-# Begin Target
-
-# Name "memutil - Win32 Release"
-# Name "memutil - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\MEM_Allocator.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\MEM_CacheLimiter.h
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\intern\MEM_CacheLimiterC-Api.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\guardedalloc\MEM_guardedalloc.h
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\intern\MEM_RefCountedC-Api.cpp"
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Group "intern"
-
-# PROP Default_Filter ""
-# End Group
-# Begin Group "extern"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\MEM_NonCopyable.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\MEM_RefCounted.h
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\MEM_RefCountedC-Api.h"
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\MEM_RefCountPtr.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\MEM_SmartPtr.h
-# End Source File
-# End Group
-# End Group
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="memutil" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=memutil - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "memutil.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "memutil.mak" CFG="memutil - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "memutil - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "memutil - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "memutil - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\..\..\obj\windows\intern\memutil\"
+# PROP Intermediate_Dir "..\..\..\..\obj\windows\intern\memutil\"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /Ob2 /I "../../" /I "../../../" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+# Begin Special Build Tool
+SOURCE="$(InputPath)"
+PostBuild_Cmds=ECHO Copying header files	XCOPY /Y ..\..\*.h ..\..\..\..\..\lib\windows\memutil\include\	ECHO Copying lib	XCOPY /Y ..\..\..\..\obj\windows\intern\memutil\*.lib ..\..\..\..\..\lib\windows\memutil\lib\*.a	ECHO Done
+# End Special Build Tool
+
+!ELSEIF  "$(CFG)" == "memutil - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\..\..\obj\windows\intern\memutil\debug"
+# PROP Intermediate_Dir "..\..\..\..\obj\windows\intern\memutil\debug"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../" /I "../../../" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+# Begin Special Build Tool
+SOURCE="$(InputPath)"
+PostBuild_Cmds=ECHO Copying header files	XCOPY /Y ..\..\*.h ..\..\..\..\..\lib\windows\memutil\include\	ECHO Copying lib	XCOPY /Y ..\..\..\..\obj\windows\intern\memutil\debug\*.lib ..\..\..\..\..\lib\windows\memutil\lib\debug\*.a	ECHO Copying Debug info.	XCOPY /Y ..\..\..\..\obj\windows\intern\memutil\debug\vc60.* ..\..\..\..\..\lib\windows\memutil\lib\debug\	ECHO Done
+# End Special Build Tool
+
+!ENDIF 
+
+# Begin Target
+
+# Name "memutil - Win32 Release"
+# Name "memutil - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\..\MEM_Allocator.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\MEM_CacheLimiter.h
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\intern\MEM_CacheLimiterC-Api.cpp"
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\guardedalloc\MEM_guardedalloc.h
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\intern\MEM_RefCountedC-Api.cpp"
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Group "intern"
+
+# PROP Default_Filter ""
+# End Group
+# Begin Group "extern"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\MEM_NonCopyable.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\MEM_RefCounted.h
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\MEM_RefCountedC-Api.h"
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\MEM_RefCountPtr.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\MEM_SmartPtr.h
+# End Source File
+# End Group
+# End Group
+# End Target
+# End Project
diff --git a/intern/memutil/make/msvc_60/memutil.dsw b/intern/memutil/make/msvc_60/memutil.dsw
index bba4cbcdafd9bb0561da4ae4c2d45c642e1c8474..3c19a94c7012ec36e69af591f359b18561bec645 100644
--- a/intern/memutil/make/msvc_60/memutil.dsw
+++ b/intern/memutil/make/msvc_60/memutil.dsw
@@ -1,29 +1,29 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "memutil"=".\memutil.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "memutil"=".\memutil.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
diff --git a/intern/moto/make/msvc_6_0/MoTo.dsp b/intern/moto/make/msvc_6_0/MoTo.dsp
index 23224fc7fa8f45333381f3c0ddedfb740c01366c..541c4aa47744e0a0fe8d6936eeb822eaf673cec2 100644
--- a/intern/moto/make/msvc_6_0/MoTo.dsp
+++ b/intern/moto/make/msvc_6_0/MoTo.dsp
@@ -1,379 +1,379 @@
-# Microsoft Developer Studio Project File - Name="MoTo" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=MoTo - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "MoTo.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "MoTo.mak" CFG="MoTo - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "MoTo - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "MoTo - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "MoTo - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\..\obj\windows\intern\moto\"
-# PROP Intermediate_Dir "..\..\..\..\obj\windows\intern\moto\"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MT /W4 /GX /O2 /Ob2 /I "..\..\include\\" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x413 /d "NDEBUG"
-# ADD RSC /l 0x413 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\intern\moto\libmoto.lib"
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PostBuild_Cmds=ECHO Copying header files	XCOPY /Y ..\..\include\*.h ..\..\..\..\..\lib\windows\moto\include\	ECHO Copying lib	XCOPY /Y ..\..\..\..\obj\windows\intern\moto\*.lib ..\..\..\..\..\lib\windows\moto\lib\*.a	ECHO Done
-# End Special Build Tool
-
-!ELSEIF  "$(CFG)" == "MoTo - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\..\obj\windows\intern\moto\debug"
-# PROP Intermediate_Dir "..\..\..\..\obj\windows\intern\moto\debug"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\..\include\\" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FD /GZ /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x413 /d "_DEBUG"
-# ADD RSC /l 0x413 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\intern\moto\debug\libmoto.lib"
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PostBuild_Cmds=ECHO Copying header files	XCOPY /Y ..\..\include\*.h ..\..\..\..\..\lib\windows\moto\include\	ECHO Copying lib	XCOPY /Y ..\..\..\..\obj\windows\intern\moto\debug\*.lib ..\..\..\..\..\lib\windows\moto\lib\debug\*.a	ECHO Copying Debug info.	XCOPY /Y ..\..\..\..\obj\windows\intern\moto\debug\vc60.* ..\..\..\..\..\lib\windows\moto\lib\debug\	ECHO Done
-# End Special Build Tool
-
-!ENDIF 
-
-# Begin Target
-
-# Name "MoTo - Win32 Release"
-# Name "MoTo - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\intern\MT_CmMatrix4x4.cpp
-
-!IF  "$(CFG)" == "MoTo - Win32 Release"
-
-# ADD CPP /W3 /I "../../include"
-
-!ELSEIF  "$(CFG)" == "MoTo - Win32 Debug"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\MT_Matrix3x3.cpp
-
-!IF  "$(CFG)" == "MoTo - Win32 Release"
-
-# ADD CPP /W3 /I "../../include"
-
-!ELSEIF  "$(CFG)" == "MoTo - Win32 Debug"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\MT_Matrix4x4.cpp
-
-!IF  "$(CFG)" == "MoTo - Win32 Release"
-
-# ADD CPP /W3 /I "../../include"
-
-!ELSEIF  "$(CFG)" == "MoTo - Win32 Debug"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\MT_Plane3.cpp
-
-!IF  "$(CFG)" == "MoTo - Win32 Release"
-
-# ADD CPP /W3
-
-!ELSEIF  "$(CFG)" == "MoTo - Win32 Debug"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\MT_Point3.cpp
-
-!IF  "$(CFG)" == "MoTo - Win32 Release"
-
-# ADD CPP /W3 /I "../../include"
-
-!ELSEIF  "$(CFG)" == "MoTo - Win32 Debug"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\MT_Quaternion.cpp
-
-!IF  "$(CFG)" == "MoTo - Win32 Release"
-
-# ADD CPP /W3 /I "../../include"
-
-!ELSEIF  "$(CFG)" == "MoTo - Win32 Debug"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\MT_random.cpp
-
-!IF  "$(CFG)" == "MoTo - Win32 Release"
-
-# ADD CPP /W3 /I "../../include"
-
-!ELSEIF  "$(CFG)" == "MoTo - Win32 Debug"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\MT_Transform.cpp
-
-!IF  "$(CFG)" == "MoTo - Win32 Release"
-
-# ADD CPP /W3 /I "../../include"
-
-!ELSEIF  "$(CFG)" == "MoTo - Win32 Debug"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\MT_Vector2.cpp
-
-!IF  "$(CFG)" == "MoTo - Win32 Release"
-
-# ADD CPP /W3 /I "../../include"
-
-!ELSEIF  "$(CFG)" == "MoTo - Win32 Debug"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\MT_Vector3.cpp
-
-!IF  "$(CFG)" == "MoTo - Win32 Release"
-
-# ADD CPP /W3 /I "../../include"
-
-!ELSEIF  "$(CFG)" == "MoTo - Win32 Debug"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\MT_Vector4.cpp
-
-!IF  "$(CFG)" == "MoTo - Win32 Release"
-
-# ADD CPP /W3 /I "../../include"
-
-!ELSEIF  "$(CFG)" == "MoTo - Win32 Debug"
-
-!ENDIF 
-
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Group "inlines"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\include\MT_Matrix3x3.inl
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\MT_Matrix4x4.inl
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\MT_Plane3.inl
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\MT_Point2.inl
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\MT_Point3.inl
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\MT_Quaternion.inl
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\MT_Vector2.inl
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\MT_Vector3.inl
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\MT_Vector4.inl
-# End Source File
-# End Group
-# Begin Source File
-
-SOURCE=..\..\include\GEN_List.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\GEN_Map.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\MT_assert.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\MT_CmMatrix4x4.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\MT_Matrix3x3.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\MT_Matrix4x4.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\MT_MinMax.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\MT_Optimize.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\MT_Plane3.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\MT_Point2.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\MT_Point3.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\MT_Quaternion.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\MT_random.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\MT_Scalar.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\MT_Stream.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\MT_Transform.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\MT_Tuple2.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\MT_Tuple3.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\MT_Tuple4.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\MT_Vector2.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\MT_Vector3.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\MT_Vector4.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\NM_Scalar.h
-# End Source File
-# End Group
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="MoTo" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=MoTo - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "MoTo.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "MoTo.mak" CFG="MoTo - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "MoTo - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "MoTo - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "MoTo - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\..\..\obj\windows\intern\moto\"
+# PROP Intermediate_Dir "..\..\..\..\obj\windows\intern\moto\"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /MT /W4 /GX /O2 /Ob2 /I "..\..\include\\" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x413 /d "NDEBUG"
+# ADD RSC /l 0x413 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\intern\moto\libmoto.lib"
+# Begin Special Build Tool
+SOURCE="$(InputPath)"
+PostBuild_Cmds=ECHO Copying header files	XCOPY /Y ..\..\include\*.h ..\..\..\..\..\lib\windows\moto\include\	ECHO Copying lib	XCOPY /Y ..\..\..\..\obj\windows\intern\moto\*.lib ..\..\..\..\..\lib\windows\moto\lib\*.a	ECHO Done
+# End Special Build Tool
+
+!ELSEIF  "$(CFG)" == "MoTo - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\..\..\obj\windows\intern\moto\debug"
+# PROP Intermediate_Dir "..\..\..\..\obj\windows\intern\moto\debug"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\..\include\\" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FD /GZ /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x413 /d "_DEBUG"
+# ADD RSC /l 0x413 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\intern\moto\debug\libmoto.lib"
+# Begin Special Build Tool
+SOURCE="$(InputPath)"
+PostBuild_Cmds=ECHO Copying header files	XCOPY /Y ..\..\include\*.h ..\..\..\..\..\lib\windows\moto\include\	ECHO Copying lib	XCOPY /Y ..\..\..\..\obj\windows\intern\moto\debug\*.lib ..\..\..\..\..\lib\windows\moto\lib\debug\*.a	ECHO Copying Debug info.	XCOPY /Y ..\..\..\..\obj\windows\intern\moto\debug\vc60.* ..\..\..\..\..\lib\windows\moto\lib\debug\	ECHO Done
+# End Special Build Tool
+
+!ENDIF 
+
+# Begin Target
+
+# Name "MoTo - Win32 Release"
+# Name "MoTo - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\..\intern\MT_CmMatrix4x4.cpp
+
+!IF  "$(CFG)" == "MoTo - Win32 Release"
+
+# ADD CPP /W3 /I "../../include"
+
+!ELSEIF  "$(CFG)" == "MoTo - Win32 Debug"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\MT_Matrix3x3.cpp
+
+!IF  "$(CFG)" == "MoTo - Win32 Release"
+
+# ADD CPP /W3 /I "../../include"
+
+!ELSEIF  "$(CFG)" == "MoTo - Win32 Debug"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\MT_Matrix4x4.cpp
+
+!IF  "$(CFG)" == "MoTo - Win32 Release"
+
+# ADD CPP /W3 /I "../../include"
+
+!ELSEIF  "$(CFG)" == "MoTo - Win32 Debug"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\MT_Plane3.cpp
+
+!IF  "$(CFG)" == "MoTo - Win32 Release"
+
+# ADD CPP /W3
+
+!ELSEIF  "$(CFG)" == "MoTo - Win32 Debug"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\MT_Point3.cpp
+
+!IF  "$(CFG)" == "MoTo - Win32 Release"
+
+# ADD CPP /W3 /I "../../include"
+
+!ELSEIF  "$(CFG)" == "MoTo - Win32 Debug"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\MT_Quaternion.cpp
+
+!IF  "$(CFG)" == "MoTo - Win32 Release"
+
+# ADD CPP /W3 /I "../../include"
+
+!ELSEIF  "$(CFG)" == "MoTo - Win32 Debug"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\MT_random.cpp
+
+!IF  "$(CFG)" == "MoTo - Win32 Release"
+
+# ADD CPP /W3 /I "../../include"
+
+!ELSEIF  "$(CFG)" == "MoTo - Win32 Debug"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\MT_Transform.cpp
+
+!IF  "$(CFG)" == "MoTo - Win32 Release"
+
+# ADD CPP /W3 /I "../../include"
+
+!ELSEIF  "$(CFG)" == "MoTo - Win32 Debug"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\MT_Vector2.cpp
+
+!IF  "$(CFG)" == "MoTo - Win32 Release"
+
+# ADD CPP /W3 /I "../../include"
+
+!ELSEIF  "$(CFG)" == "MoTo - Win32 Debug"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\MT_Vector3.cpp
+
+!IF  "$(CFG)" == "MoTo - Win32 Release"
+
+# ADD CPP /W3 /I "../../include"
+
+!ELSEIF  "$(CFG)" == "MoTo - Win32 Debug"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\MT_Vector4.cpp
+
+!IF  "$(CFG)" == "MoTo - Win32 Release"
+
+# ADD CPP /W3 /I "../../include"
+
+!ELSEIF  "$(CFG)" == "MoTo - Win32 Debug"
+
+!ENDIF 
+
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Group "inlines"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\include\MT_Matrix3x3.inl
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\MT_Matrix4x4.inl
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\MT_Plane3.inl
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\MT_Point2.inl
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\MT_Point3.inl
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\MT_Quaternion.inl
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\MT_Vector2.inl
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\MT_Vector3.inl
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\MT_Vector4.inl
+# End Source File
+# End Group
+# Begin Source File
+
+SOURCE=..\..\include\GEN_List.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\GEN_Map.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\MT_assert.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\MT_CmMatrix4x4.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\MT_Matrix3x3.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\MT_Matrix4x4.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\MT_MinMax.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\MT_Optimize.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\MT_Plane3.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\MT_Point2.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\MT_Point3.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\MT_Quaternion.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\MT_random.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\MT_Scalar.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\MT_Stream.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\MT_Transform.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\MT_Tuple2.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\MT_Tuple3.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\MT_Tuple4.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\MT_Vector2.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\MT_Vector3.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\MT_Vector4.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\NM_Scalar.h
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/intern/moto/make/msvc_6_0/MoTo.dsw b/intern/moto/make/msvc_6_0/MoTo.dsw
index bc76539dd6c30f6f54d51ffb8e6588ee0ca641ac..e45520d5c72cd880bf346bdd7375b6dc4d65f5f4 100644
--- a/intern/moto/make/msvc_6_0/MoTo.dsw
+++ b/intern/moto/make/msvc_6_0/MoTo.dsw
@@ -1,29 +1,29 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "MoTo"=.\MoTo.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "MoTo"=.\MoTo.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
diff --git a/intern/opennl/make/msvc_6_0/OpenNL.dsp b/intern/opennl/make/msvc_6_0/OpenNL.dsp
index bce93059e504e6a0928635b72f44a99d229148f0..aaf8f0298c1c45cb1b42b9362f54066039f45d60 100644
--- a/intern/opennl/make/msvc_6_0/OpenNL.dsp
+++ b/intern/opennl/make/msvc_6_0/OpenNL.dsp
@@ -1,252 +1,252 @@
-# Microsoft Developer Studio Project File - Name="OpenNL" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=OpenNL - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "OpenNL.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "OpenNL.mak" CFG="OpenNL - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "OpenNL - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "OpenNL - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "OpenNL - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../../obj/windows/intern/opennl"
-# PROP Intermediate_Dir "../../../../obj/windows/intern/opennl/imf"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "../../extern" /I "../../superlu" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD BASE RSC /l 0x407 /d "NDEBUG"
-# ADD RSC /l 0x407 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"../../../../obj/windows/intern/opennl\blender_ONL.lib"
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PostBuild_Cmds=ECHO copy header files	XCOPY /Y ..\..\extern\*.h ..\..\..\..\..\lib\windows\opennl\include\*.h	ECHO copy library	XCOPY /Y ..\..\..\..\obj\windows\intern\openNL\*.lib ..\..\..\..\..\lib\windows\openNL\*.lib
-# End Special Build Tool
-
-!ELSEIF  "$(CFG)" == "OpenNL - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../../obj/windows/intern/opennl/Debug/"
-# PROP Intermediate_Dir "../../../../obj/windows/intern/opennl/imf/Debug"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "../../extern" /I "../../superlu" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x407 /d "_DEBUG"
-# ADD RSC /l 0x407 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"../../../../obj/windows/intern/opennl/Debug/blender_ONL.lib"
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PostBuild_Cmds=ECHO copy header files	XCOPY /Y ..\..\extern\*.h ..\..\..\..\..\lib\windows\opennl\include\*.h	ECHO copy library	XCOPY /Y ..\..\..\..\obj\windows\intern\openNL\debug\*.lib ..\..\..\..\..\lib\windows\openNL\debug\*.lib
-# End Special Build Tool
-
-!ENDIF 
-
-# Begin Target
-
-# Name "OpenNL - Win32 Release"
-# Name "OpenNL - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\superlu\colamd.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\superlu\get_perm_c.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\superlu\heap_relax_snode.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\superlu\lsame.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\superlu\memory.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\superlu\mmd.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\opennl.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\superlu\relax_snode.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\superlu\scolumn_bmod.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\superlu\scolumn_dfs.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\superlu\scopy_to_ucol.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\superlu\sgssv.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\superlu\sgstrf.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\superlu\sgstrs.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\superlu\smemory.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\superlu\smyblas2.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\superlu\sp_coletree.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\superlu\sp_ienv.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\superlu\sp_preorder.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\superlu\spanel_bmod.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\superlu\spanel_dfs.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\superlu\spivotL.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\superlu\spruneL.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\superlu\ssnode_bmod.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\superlu\ssnode_dfs.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\superlu\ssp_blas2.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\superlu\ssp_blas3.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\superlu\strsv.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\superlu\superlu_timer.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\superlu\sutil.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\superlu\util.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\superlu\xerbla.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\..\superlu\Cnames.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\superlu\colamd.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\extern\ONL_opennl.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\superlu\ssp_defs.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\superlu\supermatrix.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\superlu\util.h
-# End Source File
-# End Group
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="OpenNL" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=OpenNL - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "OpenNL.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "OpenNL.mak" CFG="OpenNL - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "OpenNL - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "OpenNL - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "OpenNL - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "../../../../obj/windows/intern/opennl"
+# PROP Intermediate_Dir "../../../../obj/windows/intern/opennl/imf"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /I "../../extern" /I "../../superlu" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD BASE RSC /l 0x407 /d "NDEBUG"
+# ADD RSC /l 0x407 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"../../../../obj/windows/intern/opennl\blender_ONL.lib"
+# Begin Special Build Tool
+SOURCE="$(InputPath)"
+PostBuild_Cmds=ECHO copy header files	XCOPY /Y ..\..\extern\*.h ..\..\..\..\..\lib\windows\opennl\include\*.h	ECHO copy library	XCOPY /Y ..\..\..\..\obj\windows\intern\openNL\*.lib ..\..\..\..\..\lib\windows\openNL\*.lib
+# End Special Build Tool
+
+!ELSEIF  "$(CFG)" == "OpenNL - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "../../../../obj/windows/intern/opennl/Debug/"
+# PROP Intermediate_Dir "../../../../obj/windows/intern/opennl/imf/Debug"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "../../extern" /I "../../superlu" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD BASE RSC /l 0x407 /d "_DEBUG"
+# ADD RSC /l 0x407 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"../../../../obj/windows/intern/opennl/Debug/blender_ONL.lib"
+# Begin Special Build Tool
+SOURCE="$(InputPath)"
+PostBuild_Cmds=ECHO copy header files	XCOPY /Y ..\..\extern\*.h ..\..\..\..\..\lib\windows\opennl\include\*.h	ECHO copy library	XCOPY /Y ..\..\..\..\obj\windows\intern\openNL\debug\*.lib ..\..\..\..\..\lib\windows\openNL\debug\*.lib
+# End Special Build Tool
+
+!ENDIF 
+
+# Begin Target
+
+# Name "OpenNL - Win32 Release"
+# Name "OpenNL - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\..\superlu\colamd.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\superlu\get_perm_c.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\superlu\heap_relax_snode.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\superlu\lsame.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\superlu\memory.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\superlu\mmd.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\intern\opennl.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\superlu\relax_snode.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\superlu\scolumn_bmod.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\superlu\scolumn_dfs.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\superlu\scopy_to_ucol.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\superlu\sgssv.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\superlu\sgstrf.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\superlu\sgstrs.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\superlu\smemory.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\superlu\smyblas2.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\superlu\sp_coletree.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\superlu\sp_ienv.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\superlu\sp_preorder.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\superlu\spanel_bmod.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\superlu\spanel_dfs.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\superlu\spivotL.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\superlu\spruneL.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\superlu\ssnode_bmod.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\superlu\ssnode_dfs.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\superlu\ssp_blas2.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\superlu\ssp_blas3.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\superlu\strsv.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\superlu\superlu_timer.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\superlu\sutil.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\superlu\util.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\superlu\xerbla.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=..\..\superlu\Cnames.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\superlu\colamd.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\extern\ONL_opennl.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\superlu\ssp_defs.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\superlu\supermatrix.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\superlu\util.h
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/intern/opennl/make/msvc_6_0/OpenNL.dsw b/intern/opennl/make/msvc_6_0/OpenNL.dsw
index 407aeb006fdcaac9e15bb740fcd081d1c4b28d7b..5b7c9138c97a85ca27a5fb05e4390f8b0dbbef82 100644
--- a/intern/opennl/make/msvc_6_0/OpenNL.dsw
+++ b/intern/opennl/make/msvc_6_0/OpenNL.dsw
@@ -1,29 +1,29 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "OpenNL"=.\OpenNL.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "OpenNL"=.\OpenNL.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
diff --git a/intern/string/make/msvc_6_0/string.dsp b/intern/string/make/msvc_6_0/string.dsp
index c6ac70e193a83457737d40f1069d4591ae842f18..38250e441701050567890d37047a146250f86688 100644
--- a/intern/string/make/msvc_6_0/string.dsp
+++ b/intern/string/make/msvc_6_0/string.dsp
@@ -1,122 +1,122 @@
-# Microsoft Developer Studio Project File - Name="string" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=string - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "string.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "string.mak" CFG="string - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "string - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "string - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "string - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\..\obj\windows\intern\string"
-# PROP Intermediate_Dir "..\..\..\..\obj\windows\intern\string"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../.." /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\intern\string\libstring.lib"
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PostBuild_Cmds=ECHO Copying header files	XCOPY /Y ..\..\*.h  ..\..\..\..\..\lib\windows\string\include\	ECHO Copying lib	XCOPY /Y ..\..\..\..\obj\windows\intern\string\*.lib ..\..\..\..\..\lib\windows\string\lib\*.a	ECHO Done
-# End Special Build Tool
-
-!ELSEIF  "$(CFG)" == "string - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../../obj/windows/intern/string/debug"
-# PROP Intermediate_Dir "../../../../obj/windows/intern/string/debug"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../.." /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"../../../../obj/windows/intern/string/debug\libstring.lib"
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PostBuild_Cmds=ECHO Copying header files	XCOPY /Y ..\..\*.h  ..\..\..\..\..\lib\windows\string\include\	ECHO Copying lib	XCOPY /Y ..\..\..\..\obj\windows\intern\string\debug\*.lib ..\..\..\..\..\lib\windows\string\lib\debug\*.a	ECHO Done
-# End Special Build Tool
-
-!ENDIF 
-
-# Begin Target
-
-# Name "string - Win32 Release"
-# Name "string - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\intern\STR_String.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Group "intern"
-
-# PROP Default_Filter ""
-# End Group
-# Begin Group "extern"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\STR_HashedString.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\STR_String.h
-# End Source File
-# End Group
-# End Group
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="string" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=string - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "string.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "string.mak" CFG="string - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "string - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "string - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "string - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\..\..\obj\windows\intern\string"
+# PROP Intermediate_Dir "..\..\..\..\obj\windows\intern\string"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../.." /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\intern\string\libstring.lib"
+# Begin Special Build Tool
+SOURCE="$(InputPath)"
+PostBuild_Cmds=ECHO Copying header files	XCOPY /Y ..\..\*.h  ..\..\..\..\..\lib\windows\string\include\	ECHO Copying lib	XCOPY /Y ..\..\..\..\obj\windows\intern\string\*.lib ..\..\..\..\..\lib\windows\string\lib\*.a	ECHO Done
+# End Special Build Tool
+
+!ELSEIF  "$(CFG)" == "string - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "../../../../obj/windows/intern/string/debug"
+# PROP Intermediate_Dir "../../../../obj/windows/intern/string/debug"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../.." /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"../../../../obj/windows/intern/string/debug\libstring.lib"
+# Begin Special Build Tool
+SOURCE="$(InputPath)"
+PostBuild_Cmds=ECHO Copying header files	XCOPY /Y ..\..\*.h  ..\..\..\..\..\lib\windows\string\include\	ECHO Copying lib	XCOPY /Y ..\..\..\..\obj\windows\intern\string\debug\*.lib ..\..\..\..\..\lib\windows\string\lib\debug\*.a	ECHO Done
+# End Special Build Tool
+
+!ENDIF 
+
+# Begin Target
+
+# Name "string - Win32 Release"
+# Name "string - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\..\intern\STR_String.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Group "intern"
+
+# PROP Default_Filter ""
+# End Group
+# Begin Group "extern"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\STR_HashedString.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\STR_String.h
+# End Source File
+# End Group
+# End Group
+# End Target
+# End Project
diff --git a/intern/string/make/msvc_6_0/string.dsw b/intern/string/make/msvc_6_0/string.dsw
index b599b6407c558dbab7421688a8c4f8d80168ec86..238866814387e7e79b985d5db3eef56b48fbd460 100644
--- a/intern/string/make/msvc_6_0/string.dsw
+++ b/intern/string/make/msvc_6_0/string.dsw
@@ -1,29 +1,29 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "string"=".\string.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "string"=".\string.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
diff --git a/projectfiles/blender/BLO_readblenfile/BLO_readblenfile.dsp b/projectfiles/blender/BLO_readblenfile/BLO_readblenfile.dsp
index 8e478f425d99ce0f0442ab61f6b375895c72baa0..2cfb77b61aaf61ee248e8160da0250c118184104 100644
--- a/projectfiles/blender/BLO_readblenfile/BLO_readblenfile.dsp
+++ b/projectfiles/blender/BLO_readblenfile/BLO_readblenfile.dsp
@@ -1,155 +1,155 @@
-# Microsoft Developer Studio Project File - Name="BLO_readblenfile" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=BLO_readblenfile - Win32 Release
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "BLO_readblenfile.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "BLO_readblenfile.mak" CFG="BLO_readblenfile - Win32 Release"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "BLO_readblenfile - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "BLO_readblenfile - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "BLO_readblenfile - Win32 MT DLL Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "BLO_readblenfile - Win32 MT DLL Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "BLO_readblenfile - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\obj\windows\blender\readblenfile"
-# PROP Intermediate_Dir "..\..\..\obj\windows\blender\readblenfile"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\..\source\blender\streamglue\\" /I "..\..\..\source\blender\blenloader\\" /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\kernel\gen_messaging" /I "..\..\..\source\blender\readblenfile\\" /I "..\..\..\source\blender\deflate\\" /I "..\..\..\source\blender\inflate\\" /I "..\..\..\..\lib\windows\zlib\include" /I "..\..\..\source\blender\readstreamglue" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD BASE RSC /l 0x413 /d "NDEBUG"
-# ADD RSC /l 0x413 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "BLO_readblenfile - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\obj\windows\blender\readblenfile\debug"
-# PROP Intermediate_Dir "..\..\..\obj\windows\blender\readblenfile\debug"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\..\..\source\blender\readstreamglue\\" /I "..\..\..\source\blender\blenloader\\" /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\kernel\gen_messaging" /I "..\..\..\source\blender\readblenfile\\" /I "..\..\..\source\blender\deflate\\" /I "..\..\..\source\blender\inflate\\" /I "..\..\..\..\lib\windows\zlib\include" /I "..\..\..\source\blender\readstreamglue" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# SUBTRACT CPP /Fr
-# ADD BASE RSC /l 0x413 /d "_DEBUG"
-# ADD RSC /l 0x413 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "BLO_readblenfile - Win32 MT DLL Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "BLO_readblenfile___Win32_MT_DLL_Release"
-# PROP BASE Intermediate_Dir "BLO_readblenfile___Win32_MT_DLL_Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\obj\windows\blender\readblenfile\mtdll"
-# PROP Intermediate_Dir "..\..\..\obj\windows\blender\readblenfile\mtdll"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /GX /O2 /I "..\..\..\source\blender\streamglue\\" /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\kernel\gen_messaging" /I "..\..\..\source\blender\readblenfile\\" /I "..\..\..\source\blender\deflate\\" /I "..\..\..\source\blender\inflate\\" /I "..\..\..\..\lib\windows\zlib\include" /I "..\..\..\source\blender\readstreamglue" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\source\blender\streamglue\\" /I "..\..\..\source\blender\blenloader\\" /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\kernel\gen_messaging" /I "..\..\..\source\blender\readblenfile\\" /I "..\..\..\source\blender\deflate\\" /I "..\..\..\source\blender\inflate\\" /I "..\..\..\..\lib\windows\zlib\include" /I "..\..\..\source\blender\readstreamglue" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD BASE RSC /l 0x413 /d "NDEBUG"
-# ADD RSC /l 0x413 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "BLO_readblenfile - Win32 MT DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "BLO_readblenfile___Win32_MT_DLL_Debug"
-# PROP BASE Intermediate_Dir "BLO_readblenfile___Win32_MT_DLL_Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\obj\windows\blender\readblenfile\mtdll_debug"
-# PROP Intermediate_Dir "..\..\..\obj\windows\blender\readblenfile\mtdll_debug"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\readstreamglue\\" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\kernel\gen_messaging" /I "..\..\..\source\blender\readblenfile\\" /I "..\..\..\source\blender\deflate\\" /I "..\..\..\source\blender\inflate\\" /I "..\..\..\..\lib\windows\zlib\include" /I "..\..\..\source\blender\readstreamglue" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\source\blender\readstreamglue\\" /I "..\..\..\source\blender\blenloader\\" /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\kernel\gen_messaging" /I "..\..\..\source\blender\readblenfile\\" /I "..\..\..\source\blender\deflate\\" /I "..\..\..\source\blender\inflate\\" /I "..\..\..\..\lib\windows\zlib\include" /I "..\..\..\source\blender\readstreamglue" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x413 /d "_DEBUG"
-# ADD RSC /l 0x413 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ENDIF 
-
-# Begin Target
-
-# Name "BLO_readblenfile - Win32 Release"
-# Name "BLO_readblenfile - Win32 Debug"
-# Name "BLO_readblenfile - Win32 MT DLL Release"
-# Name "BLO_readblenfile - Win32 MT DLL Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\readblenfile\intern\BLO_readblenfile.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\readblenfile\BLO_readblenfile.h
-# End Source File
-# End Group
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="BLO_readblenfile" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=BLO_readblenfile - Win32 Release
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "BLO_readblenfile.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "BLO_readblenfile.mak" CFG="BLO_readblenfile - Win32 Release"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "BLO_readblenfile - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "BLO_readblenfile - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "BLO_readblenfile - Win32 MT DLL Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "BLO_readblenfile - Win32 MT DLL Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "BLO_readblenfile - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\..\obj\windows\blender\readblenfile"
+# PROP Intermediate_Dir "..\..\..\obj\windows\blender\readblenfile"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\..\source\blender\streamglue\\" /I "..\..\..\source\blender\blenloader\\" /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\kernel\gen_messaging" /I "..\..\..\source\blender\readblenfile\\" /I "..\..\..\source\blender\deflate\\" /I "..\..\..\source\blender\inflate\\" /I "..\..\..\..\lib\windows\zlib\include" /I "..\..\..\source\blender\readstreamglue" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD BASE RSC /l 0x413 /d "NDEBUG"
+# ADD RSC /l 0x413 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "BLO_readblenfile - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\..\obj\windows\blender\readblenfile\debug"
+# PROP Intermediate_Dir "..\..\..\obj\windows\blender\readblenfile\debug"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\..\..\source\blender\readstreamglue\\" /I "..\..\..\source\blender\blenloader\\" /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\kernel\gen_messaging" /I "..\..\..\source\blender\readblenfile\\" /I "..\..\..\source\blender\deflate\\" /I "..\..\..\source\blender\inflate\\" /I "..\..\..\..\lib\windows\zlib\include" /I "..\..\..\source\blender\readstreamglue" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# SUBTRACT CPP /Fr
+# ADD BASE RSC /l 0x413 /d "_DEBUG"
+# ADD RSC /l 0x413 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "BLO_readblenfile - Win32 MT DLL Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "BLO_readblenfile___Win32_MT_DLL_Release"
+# PROP BASE Intermediate_Dir "BLO_readblenfile___Win32_MT_DLL_Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\..\obj\windows\blender\readblenfile\mtdll"
+# PROP Intermediate_Dir "..\..\..\obj\windows\blender\readblenfile\mtdll"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /W3 /GX /O2 /I "..\..\..\source\blender\streamglue\\" /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\kernel\gen_messaging" /I "..\..\..\source\blender\readblenfile\\" /I "..\..\..\source\blender\deflate\\" /I "..\..\..\source\blender\inflate\\" /I "..\..\..\..\lib\windows\zlib\include" /I "..\..\..\source\blender\readstreamglue" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\source\blender\streamglue\\" /I "..\..\..\source\blender\blenloader\\" /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\kernel\gen_messaging" /I "..\..\..\source\blender\readblenfile\\" /I "..\..\..\source\blender\deflate\\" /I "..\..\..\source\blender\inflate\\" /I "..\..\..\..\lib\windows\zlib\include" /I "..\..\..\source\blender\readstreamglue" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD BASE RSC /l 0x413 /d "NDEBUG"
+# ADD RSC /l 0x413 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "BLO_readblenfile - Win32 MT DLL Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "BLO_readblenfile___Win32_MT_DLL_Debug"
+# PROP BASE Intermediate_Dir "BLO_readblenfile___Win32_MT_DLL_Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\..\obj\windows\blender\readblenfile\mtdll_debug"
+# PROP Intermediate_Dir "..\..\..\obj\windows\blender\readblenfile\mtdll_debug"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\readstreamglue\\" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\kernel\gen_messaging" /I "..\..\..\source\blender\readblenfile\\" /I "..\..\..\source\blender\deflate\\" /I "..\..\..\source\blender\inflate\\" /I "..\..\..\..\lib\windows\zlib\include" /I "..\..\..\source\blender\readstreamglue" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\source\blender\readstreamglue\\" /I "..\..\..\source\blender\blenloader\\" /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\kernel\gen_messaging" /I "..\..\..\source\blender\readblenfile\\" /I "..\..\..\source\blender\deflate\\" /I "..\..\..\source\blender\inflate\\" /I "..\..\..\..\lib\windows\zlib\include" /I "..\..\..\source\blender\readstreamglue" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD BASE RSC /l 0x413 /d "_DEBUG"
+# ADD RSC /l 0x413 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ENDIF 
+
+# Begin Target
+
+# Name "BLO_readblenfile - Win32 Release"
+# Name "BLO_readblenfile - Win32 Debug"
+# Name "BLO_readblenfile - Win32 MT DLL Release"
+# Name "BLO_readblenfile - Win32 MT DLL Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\readblenfile\intern\BLO_readblenfile.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\readblenfile\BLO_readblenfile.h
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/projectfiles/blender/BPY_python/BPY_python.dsp b/projectfiles/blender/BPY_python/BPY_python.dsp
index e122f0ffe904d1375d49c81b603bc6d8fb23a404..2cbb9e05717a379b46f312360fd78ed6191fa7e0 100644
--- a/projectfiles/blender/BPY_python/BPY_python.dsp
+++ b/projectfiles/blender/BPY_python/BPY_python.dsp
@@ -1,588 +1,588 @@
-# Microsoft Developer Studio Project File - Name="BPY_python" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=BPY_python - Win32 Release
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "BPY_python.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "BPY_python.mak" CFG="BPY_python - Win32 Release"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "BPY_python - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "BPY_python - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "BPY_python - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\obj\windows\blender\bpython"
-# PROP Intermediate_Dir "..\..\..\obj\windows\blender\bpython"
-# PROP Target_Dir ""
-MTL=midl.exe
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\..\..\lib\windows\python\include\python2.4" /I "..\..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\blender\include" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\imbuf" /I "..\..\..\source\blender\img" /I "..\..\..\source\blender\radiosity\extern\include" /I "..\..\..\..\lib\windows\bmfont\include" /I "..\..\source\blender\misc" /I "..\..\..\lib\windows\guardedalloc\include" /I "..\..\source\blender\blenlib" /I "..\..\source\kernel\gen_messaging" /I "..\..\source\blender\include" /I "..\..\source\blender" /I "..\..\source\blender\makesdna" /I "..\..\source\blender\blenkernel" /I "..\..\source\blender\blenloader" /I "..\..\source\blender\bpython\include" /I "..\..\source\blender\imbuf" /I "..\..\source\blender\render\extern\include" /I "..\..\source\blender\radiosity\extern\include" /I "..\..\source\kernel\gen_system" /I "..\..\source\blender\renderconverter\\" /I "..\..\source\blender\renderui\\" /I "..\..\source\blender\python" /I "../../../../lib/windows/bsp/include" /I "..\..\..\source\blender\renderconverter" /I "..\..\..\source\blender\render\extern\include" /I "..\..\..\source\blender\avi" /I "..\..\..\source\kernel\gen_system" /I "..\..\..\source\blender\blenloader" /I "..\..\..\source\blender" /I "..\..\..\source\blender\bpython\include" /I "../../../source/gameengine\SoundSystem\\" /I "../../../../lib/windows/iksolver/include" /I "..\..\..\source\blender\python" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /J /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "BPY_python - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\obj\windows\blender\bpython\debug"
-# PROP Intermediate_Dir "..\..\..\obj\windows\blender\bpython\debug"
-# PROP Target_Dir ""
-MTL=midl.exe
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /w /W0 /Gm /GX /Zi /Od /I "..\..\..\..\lib\windows\python\include\python2.4" /I "..\..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\blender\include" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\imbuf" /I "..\..\..\source\blender\img" /I "..\..\..\..\lib\windows\bmfont\include" /I "..\..\source\blender\misc" /I "..\..\..\lib\windows\guardedalloc\include" /I "..\..\source\blender\blenlib" /I "..\..\source\kernel\gen_messaging" /I "..\..\source\blender\include" /I "..\..\source\blender" /I "..\..\source\blender\makesdna" /I "..\..\source\blender\blenkernel" /I "..\..\source\blender\blenloader" /I "..\..\..\source\blender\radiosity\extern\include" /I "..\..\source\blender\bpython\include" /I "..\..\source\blender\imbuf" /I "..\..\source\blender\render\extern\include" /I "..\..\source\kernel\gen_system" /I "..\..\source\blender\renderconverter\\" /I "..\..\source\blender\renderui\\" /I "..\..\source\blender\python" /I "../../../../lib/windows/bsp/include" /I "..\..\..\source\blender\renderconverter" /I "..\..\..\source\blender\render\extern\include" /I "..\..\..\source\blender\avi" /I "..\..\..\source\kernel\gen_system" /I "..\..\..\source\blender\blenloader" /I "..\..\..\source\blender" /I "..\..\..\source\blender\bpython\include" /I "../../../source/gameengine\SoundSystem\\" /I "../../../../lib/windows/iksolver/include" /I "..\..\..\source\blender\python" /D "WIN32" /D "_MBCS" /D "_LIB" /U "_DEBUG" /YX /J /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ENDIF 
-
-# Begin Target
-
-# Name "BPY_python - Win32 Release"
-# Name "BPY_python - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\python\api2_2x\Armature.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\python\api2_2x\BezTriple.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\python\api2_2x\BGL.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\python\api2_2x\Blender.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\python\api2_2x\Bone.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\python\BPY_interface.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\python\BPY_menus.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\python\api2_2x\Camera.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\python\api2_2x\charRGBA.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\python\api2_2x\constant.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\python\api2_2x\Constraint.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\python\api2_2x\CurNurb.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\python\api2_2x\Curve.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\python\api2_2x\Draw.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\python\api2_2x\Effect.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\python\api2_2x\euler.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\python\api2_2x\EXPP_interface.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\python\api2_2x\Font.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\python\api2_2x\gen_utils.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\python\api2_2x\Geometry.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\python\api2_2x\Group.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\python\api2_2x\IDProp.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\python\api2_2x\Image.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\python\api2_2x\Ipo.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\python\api2_2x\Ipocurve.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\python\api2_2x\Key.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\python\api2_2x\Lamp.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\python\api2_2x\Lattice.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\python\api2_2x\Library.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\python\api2_2x\logic.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\python\api2_2x\Material.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\python\api2_2x\Mathutils.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\python\api2_2x\matrix.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\python\api2_2x\Mesh.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\python\api2_2x\meshPrimitive.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\python\api2_2x\Metaball.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\python\api2_2x\Modifier.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\python\api2_2x\MTex.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\python\api2_2x\NLA.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\python\api2_2x\NMesh.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\python\api2_2x\Noise.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\python\api2_2x\Object.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\python\api2_2x\Particle.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\python\api2_2x\point.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\python\api2_2x\Pose.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\python\api2_2x\quat.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\python\api2_2x\Registry.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\python\api2_2x\rgbTuple.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\python\api2_2x\Scene.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\python\api2_2x\sceneRadio.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\python\api2_2x\sceneRender.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\python\api2_2x\sceneTimeLine.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\python\api2_2x\Sound.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\python\api2_2x\SurfNurb.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\python\api2_2x\Sys.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\python\api2_2x\Text.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\python\api2_2x\Text3d.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\python\api2_2x\Texture.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\python\api2_2x\Types.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\python\api2_2x\vector.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\python\api2_2x\Window.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\python\api2_2x\windowTheme.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\python\api2_2x\World.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\python\api2_2x\Armature.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\python\api2_2x\BezTriple.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\python\api2_2x\BGL.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\python\api2_2x\Blender.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\python\api2_2x\Bone.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\python\BPY_extern.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\python\BPY_menus.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\python\api2_2x\bpy_types.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\python\api2_2x\Camera.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\python\api2_2x\charRGBA.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\python\api2_2x\constant.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\python\api2_2x\Constraint.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\python\api2_2x\CurNurb.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\python\api2_2x\Curve.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\python\api2_2x\Draw.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\python\api2_2x\Effect.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\python\api2_2x\euler.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\python\api2_2x\EXPP_interface.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\python\api2_2x\Font.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\python\api2_2x\gen_utils.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\python\api2_2x\Geometry.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\python\api2_2x\Group.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\python\api2_2x\Image.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\python\api2_2x\Ipo.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\python\api2_2x\Ipocurve.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\python\api2_2x\Key.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\python\api2_2x\Lamp.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\python\api2_2x\Lattice.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\python\api2_2x\Material.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\python\api2_2x\Mathutils.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\python\api2_2x\matrix.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\python\api2_2x\Mesh.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\python\api2_2x\meshPrimitive.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\python\api2_2x\Metaball.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\python\api2_2x\Modifier.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\python\api2_2x\modules.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\python\api2_2x\MTex.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\python\api2_2x\NLA.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\python\api2_2x\NMesh.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\python\api2_2x\Object.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\python\api2_2x\Particle.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\python\api2_2x\point.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\python\api2_2x\quat.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\python\api2_2x\Registry.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\python\api2_2x\rgbTuple.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\python\api2_2x\Scene.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\python\api2_2x\sceneRadio.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\python\api2_2x\sceneRender.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\python\api2_2x\sceneTimeLine.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\python\api2_2x\Sound.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\python\api2_2x\SurfNurb.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\python\api2_2x\Sys.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\python\api2_2x\Text.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\python\api2_2x\Text3d.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\python\api2_2x\Texture.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\python\api2_2x\Types.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\python\api2_2x\vector.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\python\api2_2x\Window.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\python\api2_2x\windowTheme.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\python\api2_2x\World.h
-# End Source File
-# End Group
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="BPY_python" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=BPY_python - Win32 Release
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "BPY_python.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "BPY_python.mak" CFG="BPY_python - Win32 Release"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "BPY_python - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "BPY_python - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "BPY_python - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\..\obj\windows\blender\bpython"
+# PROP Intermediate_Dir "..\..\..\obj\windows\blender\bpython"
+# PROP Target_Dir ""
+MTL=midl.exe
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\..\..\lib\windows\python\include\python2.4" /I "..\..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\blender\include" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\imbuf" /I "..\..\..\source\blender\img" /I "..\..\..\source\blender\radiosity\extern\include" /I "..\..\..\..\lib\windows\bmfont\include" /I "..\..\source\blender\misc" /I "..\..\..\lib\windows\guardedalloc\include" /I "..\..\source\blender\blenlib" /I "..\..\source\kernel\gen_messaging" /I "..\..\source\blender\include" /I "..\..\source\blender" /I "..\..\source\blender\makesdna" /I "..\..\source\blender\blenkernel" /I "..\..\source\blender\blenloader" /I "..\..\source\blender\bpython\include" /I "..\..\source\blender\imbuf" /I "..\..\source\blender\render\extern\include" /I "..\..\source\blender\radiosity\extern\include" /I "..\..\source\kernel\gen_system" /I "..\..\source\blender\renderconverter\\" /I "..\..\source\blender\renderui\\" /I "..\..\source\blender\python" /I "../../../../lib/windows/bsp/include" /I "..\..\..\source\blender\renderconverter" /I "..\..\..\source\blender\render\extern\include" /I "..\..\..\source\blender\avi" /I "..\..\..\source\kernel\gen_system" /I "..\..\..\source\blender\blenloader" /I "..\..\..\source\blender" /I "..\..\..\source\blender\bpython\include" /I "../../../source/gameengine\SoundSystem\\" /I "../../../../lib/windows/iksolver/include" /I "..\..\..\source\blender\python" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /J /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "BPY_python - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\..\obj\windows\blender\bpython\debug"
+# PROP Intermediate_Dir "..\..\..\obj\windows\blender\bpython\debug"
+# PROP Target_Dir ""
+MTL=midl.exe
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /w /W0 /Gm /GX /Zi /Od /I "..\..\..\..\lib\windows\python\include\python2.4" /I "..\..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\blender\include" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\imbuf" /I "..\..\..\source\blender\img" /I "..\..\..\..\lib\windows\bmfont\include" /I "..\..\source\blender\misc" /I "..\..\..\lib\windows\guardedalloc\include" /I "..\..\source\blender\blenlib" /I "..\..\source\kernel\gen_messaging" /I "..\..\source\blender\include" /I "..\..\source\blender" /I "..\..\source\blender\makesdna" /I "..\..\source\blender\blenkernel" /I "..\..\source\blender\blenloader" /I "..\..\..\source\blender\radiosity\extern\include" /I "..\..\source\blender\bpython\include" /I "..\..\source\blender\imbuf" /I "..\..\source\blender\render\extern\include" /I "..\..\source\kernel\gen_system" /I "..\..\source\blender\renderconverter\\" /I "..\..\source\blender\renderui\\" /I "..\..\source\blender\python" /I "../../../../lib/windows/bsp/include" /I "..\..\..\source\blender\renderconverter" /I "..\..\..\source\blender\render\extern\include" /I "..\..\..\source\blender\avi" /I "..\..\..\source\kernel\gen_system" /I "..\..\..\source\blender\blenloader" /I "..\..\..\source\blender" /I "..\..\..\source\blender\bpython\include" /I "../../../source/gameengine\SoundSystem\\" /I "../../../../lib/windows/iksolver/include" /I "..\..\..\source\blender\python" /D "WIN32" /D "_MBCS" /D "_LIB" /U "_DEBUG" /YX /J /FD /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ENDIF 
+
+# Begin Target
+
+# Name "BPY_python - Win32 Release"
+# Name "BPY_python - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\python\api2_2x\Armature.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\python\api2_2x\BezTriple.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\python\api2_2x\BGL.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\python\api2_2x\Blender.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\python\api2_2x\Bone.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\python\BPY_interface.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\python\BPY_menus.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\python\api2_2x\Camera.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\python\api2_2x\charRGBA.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\python\api2_2x\constant.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\python\api2_2x\Constraint.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\python\api2_2x\CurNurb.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\python\api2_2x\Curve.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\python\api2_2x\Draw.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\python\api2_2x\Effect.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\python\api2_2x\euler.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\python\api2_2x\EXPP_interface.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\python\api2_2x\Font.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\python\api2_2x\gen_utils.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\python\api2_2x\Geometry.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\python\api2_2x\Group.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\python\api2_2x\IDProp.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\python\api2_2x\Image.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\python\api2_2x\Ipo.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\python\api2_2x\Ipocurve.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\python\api2_2x\Key.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\python\api2_2x\Lamp.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\python\api2_2x\Lattice.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\python\api2_2x\Library.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\python\api2_2x\logic.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\python\api2_2x\Material.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\python\api2_2x\Mathutils.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\python\api2_2x\matrix.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\python\api2_2x\Mesh.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\python\api2_2x\meshPrimitive.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\python\api2_2x\Metaball.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\python\api2_2x\Modifier.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\python\api2_2x\MTex.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\python\api2_2x\NLA.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\python\api2_2x\NMesh.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\python\api2_2x\Noise.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\python\api2_2x\Object.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\python\api2_2x\Particle.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\python\api2_2x\point.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\python\api2_2x\Pose.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\python\api2_2x\quat.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\python\api2_2x\Registry.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\python\api2_2x\rgbTuple.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\python\api2_2x\Scene.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\python\api2_2x\sceneRadio.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\python\api2_2x\sceneRender.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\python\api2_2x\sceneTimeLine.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\python\api2_2x\Sound.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\python\api2_2x\SurfNurb.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\python\api2_2x\Sys.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\python\api2_2x\Text.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\python\api2_2x\Text3d.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\python\api2_2x\Texture.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\python\api2_2x\Types.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\python\api2_2x\vector.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\python\api2_2x\Window.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\python\api2_2x\windowTheme.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\python\api2_2x\World.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\python\api2_2x\Armature.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\python\api2_2x\BezTriple.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\python\api2_2x\BGL.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\python\api2_2x\Blender.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\python\api2_2x\Bone.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\python\BPY_extern.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\python\BPY_menus.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\python\api2_2x\bpy_types.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\python\api2_2x\Camera.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\python\api2_2x\charRGBA.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\python\api2_2x\constant.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\python\api2_2x\Constraint.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\python\api2_2x\CurNurb.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\python\api2_2x\Curve.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\python\api2_2x\Draw.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\python\api2_2x\Effect.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\python\api2_2x\euler.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\python\api2_2x\EXPP_interface.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\python\api2_2x\Font.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\python\api2_2x\gen_utils.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\python\api2_2x\Geometry.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\python\api2_2x\Group.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\python\api2_2x\Image.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\python\api2_2x\Ipo.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\python\api2_2x\Ipocurve.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\python\api2_2x\Key.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\python\api2_2x\Lamp.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\python\api2_2x\Lattice.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\python\api2_2x\Material.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\python\api2_2x\Mathutils.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\python\api2_2x\matrix.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\python\api2_2x\Mesh.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\python\api2_2x\meshPrimitive.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\python\api2_2x\Metaball.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\python\api2_2x\Modifier.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\python\api2_2x\modules.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\python\api2_2x\MTex.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\python\api2_2x\NLA.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\python\api2_2x\NMesh.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\python\api2_2x\Object.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\python\api2_2x\Particle.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\python\api2_2x\point.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\python\api2_2x\quat.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\python\api2_2x\Registry.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\python\api2_2x\rgbTuple.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\python\api2_2x\Scene.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\python\api2_2x\sceneRadio.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\python\api2_2x\sceneRender.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\python\api2_2x\sceneTimeLine.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\python\api2_2x\Sound.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\python\api2_2x\SurfNurb.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\python\api2_2x\Sys.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\python\api2_2x\Text.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\python\api2_2x\Text3d.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\python\api2_2x\Texture.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\python\api2_2x\Types.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\python\api2_2x\vector.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\python\api2_2x\Window.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\python\api2_2x\windowTheme.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\python\api2_2x\World.h
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/projectfiles/blender/avi/BL_avi.dsp b/projectfiles/blender/avi/BL_avi.dsp
index 1237ddcec476cee18bca6c2098c496bf29727b73..4aafde508c00c7e2b4c0487a3ae66c5351158490 100644
--- a/projectfiles/blender/avi/BL_avi.dsp
+++ b/projectfiles/blender/avi/BL_avi.dsp
@@ -1,199 +1,199 @@
-# Microsoft Developer Studio Project File - Name="BL_avi" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=BL_avi - Win32 Release
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "BL_avi.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "BL_avi.mak" CFG="BL_avi - Win32 Release"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "BL_avi - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "BL_avi - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "BL_avi - Win32 MT DLL Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "BL_avi - Win32 MT DLL Release" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "BL_avi - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\obj\windows\blender\avi"
-# PROP Intermediate_Dir "..\..\..\obj\windows\blender\avi"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\avi" /I "..\..\..\source\blender\include" /I "..\..\..\..\lib\windows\jpeg\include" /I "..\..\..\source\blender\makesdna" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "DWORDS_LITTLEENDIAN" /YX /J /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "BL_avi - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\obj\windows\blender\avi\debug"
-# PROP Intermediate_Dir "..\..\..\obj\windows\blender\avi\debug"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\avi" /I "..\..\..\source\blender\include" /I "..\..\..\..\lib\windows\jpeg\include" /I "..\..\..\source\blender\makesdna" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "DWORDS_LITTLEENDIAN" /YX /J /FD /GZ /c
-# SUBTRACT CPP /Fr
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "BL_avi - Win32 MT DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "BL_avi___Win32_MT_DLL_Debug"
-# PROP BASE Intermediate_Dir "BL_avi___Win32_MT_DLL_Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\obj\windows\blender\avi\mtdll_debug"
-# PROP Intermediate_Dir "..\..\..\obj\windows\blender\avi\mtdll_debug"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /Gm /GX /ZI /Od /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\avi" /I "..\..\..\source\blender\include" /I "..\..\..\..\lib\windows\jpeg\include" /I "..\..\..\source\blender\makesdna" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "DWORDS_LITTLEENDIAN" /YX /J /FD /GZ /c
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "..\..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\avi" /I "..\..\..\source\blender\include" /I "..\..\..\..\lib\windows\jpeg\include" /I "..\..\..\source\blender\makesdna" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "DWORDS_LITTLEENDIAN" /YX /J /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\..\..\..\obj\windows\blender\avi\debug\BL_avi.lib"
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "BL_avi - Win32 MT DLL Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "BL_avi___Win32_MT_DLL_Release"
-# PROP BASE Intermediate_Dir "BL_avi___Win32_MT_DLL_Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\obj\windows\blender\avi\mtdll"
-# PROP Intermediate_Dir "..\..\..\obj\windows\blender\avi\mtdll"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /GX /O2 /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\avi" /I "..\..\..\source\blender\include" /I "..\..\..\..\lib\windows\jpeg\include" /I "..\..\..\source\blender\makesdna" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "DWORDS_LITTLEENDIAN" /YX /J /FD /c
-# ADD CPP /nologo /MD /GX /O2 /I "..\..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\avi" /I "..\..\..\source\blender\include" /I "..\..\..\..\lib\windows\jpeg\include" /I "..\..\..\source\blender\makesdna" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "DWORDS_LITTLEENDIAN" /YX /J /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\..\..\..\obj\windows\blender\avi\BL_avi.lib"
-# ADD LIB32 /nologo
-
-!ENDIF 
-
-# Begin Target
-
-# Name "BL_avi - Win32 Release"
-# Name "BL_avi - Win32 Debug"
-# Name "BL_avi - Win32 MT DLL Debug"
-# Name "BL_avi - Win32 MT DLL Release"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\avi\intern\avi.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\avi\intern\avirgb.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\avi\intern\codecs.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\avi\intern\endian.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\avi\intern\mjpeg.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\avi\intern\options.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\avi\intern\rgb32.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\avi\AVI_avi.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\avi\intern\avi_intern.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\avi\intern\avirgb.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\avi\intern\endian.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\avi\intern\mjpeg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\avi\intern\rgb32.h
-# End Source File
-# End Group
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="BL_avi" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=BL_avi - Win32 Release
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "BL_avi.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "BL_avi.mak" CFG="BL_avi - Win32 Release"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "BL_avi - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "BL_avi - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "BL_avi - Win32 MT DLL Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "BL_avi - Win32 MT DLL Release" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "BL_avi - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\..\obj\windows\blender\avi"
+# PROP Intermediate_Dir "..\..\..\obj\windows\blender\avi"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\avi" /I "..\..\..\source\blender\include" /I "..\..\..\..\lib\windows\jpeg\include" /I "..\..\..\source\blender\makesdna" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "DWORDS_LITTLEENDIAN" /YX /J /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "BL_avi - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\..\obj\windows\blender\avi\debug"
+# PROP Intermediate_Dir "..\..\..\obj\windows\blender\avi\debug"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\avi" /I "..\..\..\source\blender\include" /I "..\..\..\..\lib\windows\jpeg\include" /I "..\..\..\source\blender\makesdna" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "DWORDS_LITTLEENDIAN" /YX /J /FD /GZ /c
+# SUBTRACT CPP /Fr
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "BL_avi - Win32 MT DLL Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "BL_avi___Win32_MT_DLL_Debug"
+# PROP BASE Intermediate_Dir "BL_avi___Win32_MT_DLL_Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\..\obj\windows\blender\avi\mtdll_debug"
+# PROP Intermediate_Dir "..\..\..\obj\windows\blender\avi\mtdll_debug"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /Gm /GX /ZI /Od /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\avi" /I "..\..\..\source\blender\include" /I "..\..\..\..\lib\windows\jpeg\include" /I "..\..\..\source\blender\makesdna" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "DWORDS_LITTLEENDIAN" /YX /J /FD /GZ /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "..\..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\avi" /I "..\..\..\source\blender\include" /I "..\..\..\..\lib\windows\jpeg\include" /I "..\..\..\source\blender\makesdna" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "DWORDS_LITTLEENDIAN" /YX /J /FD /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\..\..\..\obj\windows\blender\avi\debug\BL_avi.lib"
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "BL_avi - Win32 MT DLL Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "BL_avi___Win32_MT_DLL_Release"
+# PROP BASE Intermediate_Dir "BL_avi___Win32_MT_DLL_Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\..\obj\windows\blender\avi\mtdll"
+# PROP Intermediate_Dir "..\..\..\obj\windows\blender\avi\mtdll"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /GX /O2 /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\avi" /I "..\..\..\source\blender\include" /I "..\..\..\..\lib\windows\jpeg\include" /I "..\..\..\source\blender\makesdna" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "DWORDS_LITTLEENDIAN" /YX /J /FD /c
+# ADD CPP /nologo /MD /GX /O2 /I "..\..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\avi" /I "..\..\..\source\blender\include" /I "..\..\..\..\lib\windows\jpeg\include" /I "..\..\..\source\blender\makesdna" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "DWORDS_LITTLEENDIAN" /YX /J /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\..\..\..\obj\windows\blender\avi\BL_avi.lib"
+# ADD LIB32 /nologo
+
+!ENDIF 
+
+# Begin Target
+
+# Name "BL_avi - Win32 Release"
+# Name "BL_avi - Win32 Debug"
+# Name "BL_avi - Win32 MT DLL Debug"
+# Name "BL_avi - Win32 MT DLL Release"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\avi\intern\avi.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\avi\intern\avirgb.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\avi\intern\codecs.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\avi\intern\endian.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\avi\intern\mjpeg.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\avi\intern\options.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\avi\intern\rgb32.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\avi\AVI_avi.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\avi\intern\avi_intern.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\avi\intern\avirgb.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\avi\intern\endian.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\avi\intern\mjpeg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\avi\intern\rgb32.h
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/projectfiles/blender/blender.dsp b/projectfiles/blender/blender.dsp
index 17cd7022d825ba6c4966f592bae00a3ec1c53b73..48bc7b4b41e7676468adcd550912016e3d6302ad 100644
--- a/projectfiles/blender/blender.dsp
+++ b/projectfiles/blender/blender.dsp
@@ -1,124 +1,124 @@
-# Microsoft Developer Studio Project File - Name="blender" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=blender - Win32 Release
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "blender.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "blender.mak" CFG="blender - Win32 Release"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "blender - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "blender - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "blender - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\obj\windows\blender"
-# PROP Intermediate_Dir "..\..\obj\windows\blender"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\source\blender\misc" /I "..\..\..\lib\windows\guardedalloc\include" /I "..\..\source\blender\blenlib" /I "..\..\source\kernel\gen_messaging" /I "..\..\source\blender\include" /I "..\..\source\blender" /I "..\..\source\blender\makesdna" /I "..\..\source\blender\blenkernel" /I "..\..\source\blender\blenloader" /I "..\..\source\blender\python" /I "..\..\source\blender\imbuf" /I "..\..\source\blender\render\extern\include" /I "..\..\source\blender\radiosity\extern\include" /I "..\..\source\kernel\gen_system" /I "..\..\source\blender\renderconverter\\" /I "..\..\source\blender\renderui\\" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "WITH_QUICKTIME" /YX /FD /c
-# ADD BASE RSC /l 0x413 /d "NDEBUG"
-# ADD RSC /l 0x413 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 solid.lib SDL.lib freetype2ST.lib ftgl_static_ST.lib gnu_gettext.lib qtmlClient.lib openal_static.lib libsoundsystem.a libopenalsoundsystem.lib libdummysoundsystem.lib libguardedalloc.a libbsp.a libbmfont.a libghost.a libstring.a ws2_32.lib dxguid.lib opengl32.lib libjpeg.a glu32.lib user32.lib shell32.lib gdi32.lib vfw32.lib advapi32.lib winmm.lib ole32.lib libdecimation.a libiksolver.a libpng.a zlib.lib libmoto.a blender_ONL.lib blender_elbeem.lib boolop.lib BLI_bullet.lib pthreadVC2.lib /nologo /subsystem:console /machine:I386 /nodefaultlib:"msvcprt.lib" /nodefaultlib:"msvcrt.lib" /nodefaultlib:"glut32.lib" /nodefaultlib:"libcd.lib" /nodefaultlib:"libc.lib" /nodefaultlib:"libcpd.lib" /nodefaultlib:"libcp.lib" /nodefaultlib:"libcmtd.lib" /out:"..\..\bin\blender.exe" /libpath:"..\..\..\lib\windows\sdl\lib" /libpath:"..\..\..\lib\windows\freetype\lib" /libpath:"..\..\..\lib\windows\ftgl\lib" /libpath:"..\..\..\lib\windows\gettext\lib" /libpath:"..\..\..\lib\windows\ode\lib" /libpath:"..\..\..\lib\windows\bsp\lib" /libpath:"..\..\..\lib\windows\moto\lib" /libpath:"..\..\..\lib\windows\bmfont\lib" /libpath:"..\..\..\lib\windows\ghost\lib" /libpath:"..\..\..\lib\windows\python\frozen" /libpath:"..\..\..\lib\windows\guardedalloc\lib" /libpath:"..\..\..\lib\windows\string\lib" /libpath:"..\..\..\lib\windows\solid\lib" /libpath:"..\..\..\lib\windows\python\lib" /libpath:"..\..\..\lib\windows\iksolver\lib" /libpath:"..\..\..\lib\windows\decimation\lib" /libpath:"..\..\..\lib\windows\openal\lib" /libpath:"..\..\..\lib\windows\jpeg\lib" /libpath:"..\..\..\lib\windows\blenkey\lib" /libpath:"..\..\..\lib\windows\openssl\lib" /libpath:"..\..\obj\windows\intern\soundsystem\dummy" /libpath:"..\..\obj\windows\intern\soundsystem\openal" /libpath:"..\..\..\lib\windows\soundsystem\lib\\" /libpath:"..\..\..\lib\windows\zlib\lib\\" /libpath:"..\..\..\lib\windows\png\lib\\" /libpath:"..\..\..\lib\windows\opennl" /libpath:"..\..\..\lib\windows\elbeem\lib" /libpath:"..\..\..\lib\windows\boolop\lib" /libpath:"..\..\..\lib\windows\bullet\lib" /libpath:"..\..\..\lib\windows\pthreads\lib"
-# SUBTRACT LINK32 /pdb:none
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PostBuild_Cmds=ECHO Copying required 3rd party dlls...	XCOPY /Y ..\..\..\lib\windows\gettext\lib\*.dll ..\..\bin\	XCOPY /Y ..\..\..\lib\windows\sdl\lib\*dll ..\..\bin\	ECHO Done
-# End Special Build Tool
-
-!ELSEIF  "$(CFG)" == "blender - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\obj\windows\blender\debug"
-# PROP Intermediate_Dir "..\..\obj\windows\blender\debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\..\source\blender\misc" /I "..\..\..\lib\windows\guardedalloc\include" /I "..\..\source\blender\blenlib" /I "..\..\source\kernel\gen_messaging" /I "..\..\source\blender\include" /I "..\..\source\blender" /I "..\..\source\blender\makesdna" /I "..\..\source\blender\blenkernel" /I "..\..\source\blender\blenloader" /I "..\..\source\blender\python" /I "..\..\source\blender\imbuf" /I "..\..\source\blender\render\extern\include" /I "..\..\source\blender\radiosity\extern\include" /I "..\..\source\kernel\gen_system" /I "..\..\source\blender\renderconverter\\" /I "..\..\source\blender\renderui" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "WITH_QUICKTIME" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x413 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 solid.lib SDL.lib freetype2ST.lib ftgl_static_ST.lib gnu_gettext.lib qtmlClient.lib openal_static.lib libsoundsystem.a libopenalsoundsystem.lib libdummysoundsystem.lib libguardedalloc.a libbsp.a libbmfont.a libghost.a libstring.a ws2_32.lib dxguid.lib opengl32.lib libjpeg.a glu32.lib user32.lib gdi32.lib shell32.lib vfw32.lib advapi32.lib winmm.lib ole32.lib libdecimation.a libiksolver.a libpng.a zlib.lib libmoto.a blender_ONL.lib blender_elbeem.lib boolop.lib BLI_bullet_d.lib pthreadVC2.lib /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"glut32.lib" /nodefaultlib:"libcd.lib" /nodefaultlib:"libc.lib" /nodefaultlib:"libcpd.lib" /nodefaultlib:"libcp.lib" /nodefaultlib:"libcmt.lib" /nodefaultlib:"libcpmtd.lib" /nodefaultlib:"msvcprtd.lib" /out:"..\..\bin\debug\blender.exe" /pdbtype:sept /libpath:"..\..\..\lib\windows\sdl\lib" /libpath:"..\..\..\lib\windows\freetype\lib" /libpath:"..\..\..\lib\windows\ftgl\lib" /libpath:"..\..\..\lib\windows\gettext\lib" /libpath:"..\..\..\lib\windows\ode\lib" /libpath:"..\..\..\lib\windows\bsp\lib\debug" /libpath:"..\..\..\lib\windows\moto\lib\debug" /libpath:"..\..\..\lib\windows\bmfont\lib\debug" /libpath:"..\..\..\lib\windows\ghost\lib\debug" /libpath:"..\..\..\lib\windows\python\frozen" /libpath:"..\..\..\lib\windows\guardedalloc\lib\debug" /libpath:"..\..\..\lib\windows\string\lib\debug" /libpath:"..\..\..\lib\windows\solid\lib\\" /libpath:"..\..\..\lib\windows\python\lib" /libpath:"..\..\..\lib\windows\iksolver\lib\debug" /libpath:"..\..\..\lib\windows\decimation\lib\debug" /libpath:"..\..\..\lib\windows\openal\lib" /libpath:"..\..\obj\windows\intern\soundsystem\dummy\debug" /libpath:"..\..\obj\windows\intern\soundsystem\openal\debug" /libpath:"..\..\..\lib\windows\soundsystem\lib\debug\\" /libpath:"..\..\..\lib\windows\jpeg\lib" /libpath:"..\..\..\lib\windows\blenkey\lib\debug" /libpath:"..\..\..\lib\windows\openssl\lib" /libpath:"..\..\..\lib\windows\zlib\lib\\" /libpath:"..\..\..\lib\windows\png\lib\\" /libpath:"..\..\..\lib\windows\opennl\debug" /libpath:"..\..\..\lib\windows\elbeem\lib\debug" /libpath:"..\..\..\lib\windows\boolop\lib" /libpath:"..\..\..\lib\windows\bullet\lib" /libpath:"..\..\..\lib\windows\elbeem\lib" /libpath:"..\..\..\lib\windows\pthreads\lib"
-# SUBTRACT LINK32 /pdb:none
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PostBuild_Cmds=ECHO Copying required 3rd party dlls...	XCOPY /Y ..\..\..\lib\windows\gettext\lib\*.dll ..\..\bin\	ECHO Done
-# End Special Build Tool
-
-!ENDIF 
-
-# Begin Target
-
-# Name "blender - Win32 Release"
-# Name "blender - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\source\creator\creator.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\icons\winblender.rc
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# Begin Source File
-
-SOURCE=..\..\source\icons\winblender.ico
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\icons\winblenderfile.ico
-# End Source File
-# End Group
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="blender" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=blender - Win32 Release
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "blender.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "blender.mak" CFG="blender - Win32 Release"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "blender - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "blender - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "blender - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\obj\windows\blender"
+# PROP Intermediate_Dir "..\..\obj\windows\blender"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\source\blender\misc" /I "..\..\..\lib\windows\guardedalloc\include" /I "..\..\source\blender\blenlib" /I "..\..\source\kernel\gen_messaging" /I "..\..\source\blender\include" /I "..\..\source\blender" /I "..\..\source\blender\makesdna" /I "..\..\source\blender\blenkernel" /I "..\..\source\blender\blenloader" /I "..\..\source\blender\python" /I "..\..\source\blender\imbuf" /I "..\..\source\blender\render\extern\include" /I "..\..\source\blender\radiosity\extern\include" /I "..\..\source\kernel\gen_system" /I "..\..\source\blender\renderconverter\\" /I "..\..\source\blender\renderui\\" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "WITH_QUICKTIME" /YX /FD /c
+# ADD BASE RSC /l 0x413 /d "NDEBUG"
+# ADD RSC /l 0x413 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 solid.lib SDL.lib freetype2ST.lib ftgl_static_ST.lib gnu_gettext.lib qtmlClient.lib openal_static.lib libsoundsystem.a libopenalsoundsystem.lib libdummysoundsystem.lib libguardedalloc.a libbsp.a libbmfont.a libghost.a libstring.a ws2_32.lib dxguid.lib opengl32.lib libjpeg.a glu32.lib user32.lib shell32.lib gdi32.lib vfw32.lib advapi32.lib winmm.lib ole32.lib libdecimation.a libiksolver.a libpng.a zlib.lib libmoto.a blender_ONL.lib blender_elbeem.lib boolop.lib BLI_bullet.lib pthreadVC2.lib /nologo /subsystem:console /machine:I386 /nodefaultlib:"msvcprt.lib" /nodefaultlib:"msvcrt.lib" /nodefaultlib:"glut32.lib" /nodefaultlib:"libcd.lib" /nodefaultlib:"libc.lib" /nodefaultlib:"libcpd.lib" /nodefaultlib:"libcp.lib" /nodefaultlib:"libcmtd.lib" /out:"..\..\bin\blender.exe" /libpath:"..\..\..\lib\windows\sdl\lib" /libpath:"..\..\..\lib\windows\freetype\lib" /libpath:"..\..\..\lib\windows\ftgl\lib" /libpath:"..\..\..\lib\windows\gettext\lib" /libpath:"..\..\..\lib\windows\ode\lib" /libpath:"..\..\..\lib\windows\bsp\lib" /libpath:"..\..\..\lib\windows\moto\lib" /libpath:"..\..\..\lib\windows\bmfont\lib" /libpath:"..\..\..\lib\windows\ghost\lib" /libpath:"..\..\..\lib\windows\python\frozen" /libpath:"..\..\..\lib\windows\guardedalloc\lib" /libpath:"..\..\..\lib\windows\string\lib" /libpath:"..\..\..\lib\windows\solid\lib" /libpath:"..\..\..\lib\windows\python\lib" /libpath:"..\..\..\lib\windows\iksolver\lib" /libpath:"..\..\..\lib\windows\decimation\lib" /libpath:"..\..\..\lib\windows\openal\lib" /libpath:"..\..\..\lib\windows\jpeg\lib" /libpath:"..\..\..\lib\windows\blenkey\lib" /libpath:"..\..\..\lib\windows\openssl\lib" /libpath:"..\..\obj\windows\intern\soundsystem\dummy" /libpath:"..\..\obj\windows\intern\soundsystem\openal" /libpath:"..\..\..\lib\windows\soundsystem\lib\\" /libpath:"..\..\..\lib\windows\zlib\lib\\" /libpath:"..\..\..\lib\windows\png\lib\\" /libpath:"..\..\..\lib\windows\opennl" /libpath:"..\..\..\lib\windows\elbeem\lib" /libpath:"..\..\..\lib\windows\boolop\lib" /libpath:"..\..\..\lib\windows\bullet\lib" /libpath:"..\..\..\lib\windows\pthreads\lib"
+# SUBTRACT LINK32 /pdb:none
+# Begin Special Build Tool
+SOURCE="$(InputPath)"
+PostBuild_Cmds=ECHO Copying required 3rd party dlls...	XCOPY /Y ..\..\..\lib\windows\gettext\lib\*.dll ..\..\bin\	XCOPY /Y ..\..\..\lib\windows\sdl\lib\*dll ..\..\bin\	ECHO Done
+# End Special Build Tool
+
+!ELSEIF  "$(CFG)" == "blender - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\obj\windows\blender\debug"
+# PROP Intermediate_Dir "..\..\obj\windows\blender\debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\..\source\blender\misc" /I "..\..\..\lib\windows\guardedalloc\include" /I "..\..\source\blender\blenlib" /I "..\..\source\kernel\gen_messaging" /I "..\..\source\blender\include" /I "..\..\source\blender" /I "..\..\source\blender\makesdna" /I "..\..\source\blender\blenkernel" /I "..\..\source\blender\blenloader" /I "..\..\source\blender\python" /I "..\..\source\blender\imbuf" /I "..\..\source\blender\render\extern\include" /I "..\..\source\blender\radiosity\extern\include" /I "..\..\source\kernel\gen_system" /I "..\..\source\blender\renderconverter\\" /I "..\..\source\blender\renderui" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "WITH_QUICKTIME" /YX /FD /GZ /c
+# ADD BASE RSC /l 0x413 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 solid.lib SDL.lib freetype2ST.lib ftgl_static_ST.lib gnu_gettext.lib qtmlClient.lib openal_static.lib libsoundsystem.a libopenalsoundsystem.lib libdummysoundsystem.lib libguardedalloc.a libbsp.a libbmfont.a libghost.a libstring.a ws2_32.lib dxguid.lib opengl32.lib libjpeg.a glu32.lib user32.lib gdi32.lib shell32.lib vfw32.lib advapi32.lib winmm.lib ole32.lib libdecimation.a libiksolver.a libpng.a zlib.lib libmoto.a blender_ONL.lib blender_elbeem.lib boolop.lib BLI_bullet_d.lib pthreadVC2.lib /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"glut32.lib" /nodefaultlib:"libcd.lib" /nodefaultlib:"libc.lib" /nodefaultlib:"libcpd.lib" /nodefaultlib:"libcp.lib" /nodefaultlib:"libcmt.lib" /nodefaultlib:"libcpmtd.lib" /nodefaultlib:"msvcprtd.lib" /out:"..\..\bin\debug\blender.exe" /pdbtype:sept /libpath:"..\..\..\lib\windows\sdl\lib" /libpath:"..\..\..\lib\windows\freetype\lib" /libpath:"..\..\..\lib\windows\ftgl\lib" /libpath:"..\..\..\lib\windows\gettext\lib" /libpath:"..\..\..\lib\windows\ode\lib" /libpath:"..\..\..\lib\windows\bsp\lib\debug" /libpath:"..\..\..\lib\windows\moto\lib\debug" /libpath:"..\..\..\lib\windows\bmfont\lib\debug" /libpath:"..\..\..\lib\windows\ghost\lib\debug" /libpath:"..\..\..\lib\windows\python\frozen" /libpath:"..\..\..\lib\windows\guardedalloc\lib\debug" /libpath:"..\..\..\lib\windows\string\lib\debug" /libpath:"..\..\..\lib\windows\solid\lib\\" /libpath:"..\..\..\lib\windows\python\lib" /libpath:"..\..\..\lib\windows\iksolver\lib\debug" /libpath:"..\..\..\lib\windows\decimation\lib\debug" /libpath:"..\..\..\lib\windows\openal\lib" /libpath:"..\..\obj\windows\intern\soundsystem\dummy\debug" /libpath:"..\..\obj\windows\intern\soundsystem\openal\debug" /libpath:"..\..\..\lib\windows\soundsystem\lib\debug\\" /libpath:"..\..\..\lib\windows\jpeg\lib" /libpath:"..\..\..\lib\windows\blenkey\lib\debug" /libpath:"..\..\..\lib\windows\openssl\lib" /libpath:"..\..\..\lib\windows\zlib\lib\\" /libpath:"..\..\..\lib\windows\png\lib\\" /libpath:"..\..\..\lib\windows\opennl\debug" /libpath:"..\..\..\lib\windows\elbeem\lib\debug" /libpath:"..\..\..\lib\windows\boolop\lib" /libpath:"..\..\..\lib\windows\bullet\lib" /libpath:"..\..\..\lib\windows\elbeem\lib" /libpath:"..\..\..\lib\windows\pthreads\lib"
+# SUBTRACT LINK32 /pdb:none
+# Begin Special Build Tool
+SOURCE="$(InputPath)"
+PostBuild_Cmds=ECHO Copying required 3rd party dlls...	XCOPY /Y ..\..\..\lib\windows\gettext\lib\*.dll ..\..\bin\	ECHO Done
+# End Special Build Tool
+
+!ENDIF 
+
+# Begin Target
+
+# Name "blender - Win32 Release"
+# Name "blender - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\..\source\creator\creator.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\source\icons\winblender.rc
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# Begin Source File
+
+SOURCE=..\..\source\icons\winblender.ico
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\source\icons\winblenderfile.ico
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/projectfiles/blender/blender.dsw b/projectfiles/blender/blender.dsw
index 3a69055807edf8385069020c176349fa69829003..c7369f9df6cd9850763bd8af8b38562166a4517e 100644
--- a/projectfiles/blender/blender.dsw
+++ b/projectfiles/blender/blender.dsw
@@ -1,743 +1,743 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "BKE_blenkernel"=.\blenkernel\BKE_blenkernel.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "BLI_blenlib"=.\blenlib\BLI_blenlib.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "BLO_loader"=.\loader\BLO_loader.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "BLO_readblenfile"=.\BLO_readblenfile\BLO_readblenfile.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "BL_avi"=.\avi\BL_avi.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "BL_imbuf"=.\imbuf\BL_imbuf.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "BL_src"=.\src\BL_src.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "BL_src_cre"=.\src\BL_src_cre.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "BPY_python"=.\BPY_python\BPY_python.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "BRA_radiosity"=.\radiosity\BRA_radiosity.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "BRE_render"=.\render\BRE_render.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name BRE_yafray
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "BRE_renderconverter"=.\renderconverter\BRE_renderconverter.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "BRE_yafray"=.\yafray\BRE_yafray.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "Bullet"=..\..\extern\bullet\Bullet\BLI_Bullet.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "BulletDynamics"=..\..\extern\bullet\BulletDynamics\BLI_BulletDynamics.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "DNA_makesdna"=.\makesdna\DNA_makesdna.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "EXP_expressions"=..\gameengine\expression\EXP_expressions.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "FTF_ftfont"=.\ftfont\FTF_ftfont.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "GP_axctl"=..\gameengine\gameplayer\axctl\GP_axctl.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name KX_converter
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name EXP_expressions
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name SCA_GameLogic
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name KX_ketsji
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name SG_SceneGraph
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name RAS_openglrasterizer
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name RAS_rasterizer
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name SYS_system
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name GP_common
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name KX_network
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name NG_loopbacknetwork
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name NG_network
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name DNA_makesdna
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name gen_messaging
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name BLO_verify
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name BLO_decrypt
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name BLO_loader
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name BLO_readblenfile
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name BKE_blenkernel
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name BL_avi
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name BL_imbuf
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name BLI_blenlib
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name SND_OpenAL
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name PHY_Physics
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name PHY_Ode
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name PHY_Dummy
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "GP_common"=..\gameengine\gameplayer\common\GP_common.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "GP_ghost"=..\gameengine\gameplayer\ghost\GP_ghost.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name BKE_blenkernel
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name BL_avi
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name BL_imbuf
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name BLI_blenlib
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name BLO_loader
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name DNA_makesdna
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name EXP_expressions
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name KX_converter
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name KX_ketsji
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name KX_network
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name NG_loopbacknetwork
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name NG_network
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name RAS_openglrasterizer
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name RAS_rasterizer
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name SCA_GameLogic
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name SG_SceneGraph
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name SYS_system
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name gen_messaging
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name BLO_readblenfile
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name BLO_decrypt
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name BLO_verify
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name SND_OpenAL
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name GP_common
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name PHY_Physics
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name PHY_Dummy
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name PHY_Sumo
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "KX_blenderhook"=..\gameengine\blenderhook\KX_blenderhook.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "KX_converter"=..\gameengine\converter\KX_converter.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "KX_ketsji"=..\gameengine\ketsji\KX_ketsji.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "KX_network"=..\gameengine\ketsji\network\KX_network.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "NG_loopbacknetwork"=..\gameengine\network\loopbacknetwork\NG_loopbacknetwork.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "NG_network"=..\gameengine\network\network\NG_network.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "PHY_Dummy"=..\GAMEENGINE\PHYSICS\PHY_PHYSICS\PHY_Dummy\PHY_Dummy.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "PHY_Ode"=..\gameengine\physics\PHY_Physics\PHY_Ode\PHY_Ode.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "PHY_Physics"=..\gameengine\physics\PHY_Physics\PHY_Physics.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "PHY_Sumo"=..\gameengine\physics\PHY_Physics\PHY_Sumo\PHY_Sumo.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "RAS_openglrasterizer"=..\gameengine\rasterizer\openglrasterizer\RAS_openglrasterizer.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "RAS_rasterizer"=..\gameengine\rasterizer\RAS_rasterizer.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "SCA_GameLogic"=..\gameengine\gamelogic\SCA_GameLogic.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "SG_SceneGraph"=..\gameengine\scenegraph\SG_SceneGraph.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "SYS_system"=..\kernel\system\SYS_system.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "blender"=.\blender.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name BKE_blenkernel
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name BL_avi
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name BL_imbuf
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name BLI_blenlib
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name BLO_decrypt
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name BLO_encrypt
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name BLO_loader
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name BLO_sign
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name BLO_verify
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name BRA_radiosity
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name BRE_render
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name DNA_makesdna
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name EXP_expressions
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name gen_messaging
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name NG_loopbacknetwork
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name NG_network
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name RAS_openglrasterizer
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name RAS_rasterizer
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name SCA_GameLogic
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name SG_SceneGraph
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name SYS_system
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name BL_src_pub
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name blenpluginapi
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name BL_src
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name SND_OpenAL
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name PHY_Dummy
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name PHY_Physics
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name FTF_ftfont
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name BPY_python
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name PHY_Sumo
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name BLO_readblenfile
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name Bullet
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name BulletDynamics
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "blenpluginapi"=.\blenpluginapi\blenpluginapi\blenpluginapi.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "gen_messaging"=..\KERNEL\gen_messaging\gen_messaging.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "BKE_blenkernel"=.\blenkernel\BKE_blenkernel.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "BLI_blenlib"=.\blenlib\BLI_blenlib.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "BLO_loader"=.\loader\BLO_loader.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "BLO_readblenfile"=.\BLO_readblenfile\BLO_readblenfile.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "BL_avi"=.\avi\BL_avi.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "BL_imbuf"=.\imbuf\BL_imbuf.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "BL_src"=.\src\BL_src.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "BL_src_cre"=.\src\BL_src_cre.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "BPY_python"=.\BPY_python\BPY_python.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "BRA_radiosity"=.\radiosity\BRA_radiosity.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "BRE_render"=.\render\BRE_render.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name BRE_yafray
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "BRE_renderconverter"=.\renderconverter\BRE_renderconverter.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "BRE_yafray"=.\yafray\BRE_yafray.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "Bullet"=..\..\extern\bullet\Bullet\BLI_Bullet.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "BulletDynamics"=..\..\extern\bullet\BulletDynamics\BLI_BulletDynamics.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "DNA_makesdna"=.\makesdna\DNA_makesdna.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "EXP_expressions"=..\gameengine\expression\EXP_expressions.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "FTF_ftfont"=.\ftfont\FTF_ftfont.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "GP_axctl"=..\gameengine\gameplayer\axctl\GP_axctl.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name KX_converter
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name EXP_expressions
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name SCA_GameLogic
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name KX_ketsji
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name SG_SceneGraph
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name RAS_openglrasterizer
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name RAS_rasterizer
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name SYS_system
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name GP_common
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name KX_network
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name NG_loopbacknetwork
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name NG_network
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name DNA_makesdna
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name gen_messaging
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name BLO_verify
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name BLO_decrypt
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name BLO_loader
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name BLO_readblenfile
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name BKE_blenkernel
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name BL_avi
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name BL_imbuf
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name BLI_blenlib
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name SND_OpenAL
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name PHY_Physics
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name PHY_Ode
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name PHY_Dummy
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "GP_common"=..\gameengine\gameplayer\common\GP_common.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "GP_ghost"=..\gameengine\gameplayer\ghost\GP_ghost.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name BKE_blenkernel
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name BL_avi
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name BL_imbuf
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name BLI_blenlib
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name BLO_loader
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name DNA_makesdna
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name EXP_expressions
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name KX_converter
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name KX_ketsji
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name KX_network
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name NG_loopbacknetwork
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name NG_network
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name RAS_openglrasterizer
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name RAS_rasterizer
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name SCA_GameLogic
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name SG_SceneGraph
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name SYS_system
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name gen_messaging
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name BLO_readblenfile
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name BLO_decrypt
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name BLO_verify
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name SND_OpenAL
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name GP_common
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name PHY_Physics
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name PHY_Dummy
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name PHY_Sumo
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "KX_blenderhook"=..\gameengine\blenderhook\KX_blenderhook.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "KX_converter"=..\gameengine\converter\KX_converter.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "KX_ketsji"=..\gameengine\ketsji\KX_ketsji.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "KX_network"=..\gameengine\ketsji\network\KX_network.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "NG_loopbacknetwork"=..\gameengine\network\loopbacknetwork\NG_loopbacknetwork.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "NG_network"=..\gameengine\network\network\NG_network.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "PHY_Dummy"=..\GAMEENGINE\PHYSICS\PHY_PHYSICS\PHY_Dummy\PHY_Dummy.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "PHY_Ode"=..\gameengine\physics\PHY_Physics\PHY_Ode\PHY_Ode.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "PHY_Physics"=..\gameengine\physics\PHY_Physics\PHY_Physics.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "PHY_Sumo"=..\gameengine\physics\PHY_Physics\PHY_Sumo\PHY_Sumo.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "RAS_openglrasterizer"=..\gameengine\rasterizer\openglrasterizer\RAS_openglrasterizer.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "RAS_rasterizer"=..\gameengine\rasterizer\RAS_rasterizer.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "SCA_GameLogic"=..\gameengine\gamelogic\SCA_GameLogic.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "SG_SceneGraph"=..\gameengine\scenegraph\SG_SceneGraph.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "SYS_system"=..\kernel\system\SYS_system.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "blender"=.\blender.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name BKE_blenkernel
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name BL_avi
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name BL_imbuf
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name BLI_blenlib
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name BLO_decrypt
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name BLO_encrypt
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name BLO_loader
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name BLO_sign
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name BLO_verify
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name BRA_radiosity
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name BRE_render
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name DNA_makesdna
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name EXP_expressions
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name gen_messaging
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name NG_loopbacknetwork
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name NG_network
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name RAS_openglrasterizer
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name RAS_rasterizer
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name SCA_GameLogic
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name SG_SceneGraph
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name SYS_system
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name BL_src_pub
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name blenpluginapi
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name BL_src
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name SND_OpenAL
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name PHY_Dummy
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name PHY_Physics
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name FTF_ftfont
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name BPY_python
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name PHY_Sumo
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name BLO_readblenfile
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name Bullet
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name BulletDynamics
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "blenpluginapi"=.\blenpluginapi\blenpluginapi\blenpluginapi.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "gen_messaging"=..\KERNEL\gen_messaging\gen_messaging.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
diff --git a/projectfiles/blender/blenkernel/BKE_blenkernel.dsp b/projectfiles/blender/blenkernel/BKE_blenkernel.dsp
index 171bfab7dad310ed1fe0623ab45c0594c077609f..d430498d44d68f72f4ab6798c53a8aa0c0f5056c 100644
--- a/projectfiles/blender/blenkernel/BKE_blenkernel.dsp
+++ b/projectfiles/blender/blenkernel/BKE_blenkernel.dsp
@@ -1,564 +1,564 @@
-# Microsoft Developer Studio Project File - Name="BKE_blenkernel" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=BKE_blenkernel - Win32 Release
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "BKE_blenkernel.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "BKE_blenkernel.mak" CFG="BKE_blenkernel - Win32 Release"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "BKE_blenkernel - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "BKE_blenkernel - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "BKE_blenkernel - Win32 MT DLL Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "BKE_blenkernel - Win32 MT DLL Release" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "BKE_blenkernel - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\obj\windows\blender\blenkernel"
-# PROP Intermediate_Dir "..\..\..\obj\windows\blender\blenkernel"
-# PROP Target_Dir ""
-MTL=midl.exe
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\..\..\lib\windows\decimation\include" /I "../../../../lib/windows/zlib/include" /I "..\..\..\intern\elbeem\extern" /I "..\..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\source\blender\renderconverter" /I "..\..\..\source\blender\render\extern\include" /I "..\..\..\source\blender\avi" /I "..\..\..\source\blender\imbuf" /I "..\..\..\source\kernel\gen_system" /I "..\..\..\source\blender\blenloader" /I "..\..\..\source\blender" /I "..\..\..\source\blender\include" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\blender\python" /I "..\..\..\source\blender\blenlib" /I "../../../source/gameengine\SoundSystem\\" /I "../../../../lib/windows/iksolver/include" /I "../../../../lib/windows/bsp/include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "WITH_FREETYPE2" /D "USE_CCGSUBSURFLIB" /YX /J /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "BKE_blenkernel - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\obj\windows\blender\blenkernel\debug"
-# PROP Intermediate_Dir "..\..\..\obj\windows\blender\blenkernel\debug"
-# PROP Target_Dir ""
-MTL=midl.exe
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\lib\windows\decimation\include" /I "../../../../lib/windows/zlib/include" /I "..\..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\source\blender\renderconverter" /I "..\..\..\source\blender\render\extern\include" /I "..\..\..\source\blender\avi" /I "..\..\..\source\blender\imbuf" /I "..\..\..\source\kernel\gen_system" /I "..\..\..\source\blender\blenloader" /I "..\..\..\source\blender" /I "..\..\..\source\blender\include" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\blender\python" /I "..\..\..\source\blender\blenlib" /I "../../../source/gameengine\SoundSystem\\" /I "../../../../lib/windows/iksolver/include" /I "../../../../lib/windows/bsp/include" /I "..\..\..\intern\elbeem\extern" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "WITH_FREETYPE2" /YX /J /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "BKE_blenkernel - Win32 MT DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "BKE_blenkernel___Win32_MT_DLL_Debug"
-# PROP BASE Intermediate_Dir "BKE_blenkernel___Win32_MT_DLL_Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\obj\windows\blender\blenkernel\mtdll_debug"
-# PROP Intermediate_Dir "..\..\..\obj\windows\blender\blenkernel\mtdll_debug"
-# PROP Target_Dir ""
-MTL=midl.exe
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /Gm /GX /ZI /Od /I "..\..\..\source\blender\render\extern\include" /I "..\..\..\source\blender\avi" /I "..\..\..\source\blender\imbuf" /I "..\..\..\source\kernel\gen_system" /I "..\..\..\source\gameengine\soundsystem" /I "..\..\..\source\gameengine\soundsystem\snd_openal" /I "..\..\..\source\blender\blenloader" /I "..\..\..\source\blender" /I "..\..\..\source\blender\include" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\blender\python" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\gameengine\soundsystem\snd_blenderwavecache" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /GZ /c
-# SUBTRACT BASE CPP /WX
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "..\..\..\source\blenloader" /I "..\..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\source\blender\renderconverter" /I "..\..\..\source\blender\render\extern\include" /I "..\..\..\source\blender\avi" /I "..\..\..\source\blender\imbuf" /I "..\..\..\source\kernel\gen_system" /I "..\..\..\source\blender\blenloader" /I "..\..\..\source\blender" /I "..\..\..\source\blender\include" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\blender\python" /I "..\..\..\source\blender\blenlib" /I "../../../source/gameengine\SoundSystem\\" /I "../../../../lib/windows/iksolver/include" /I "../../../../lib/windows/bsp/include" /I "..\..\..\intern\elbeem\extern" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /GZ /c
-# SUBTRACT CPP /WX
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\..\..\..\obj\windows\blender\blenkernel\debug\BKE_blenkernel.lib"
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "BKE_blenkernel - Win32 MT DLL Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "BKE_blenkernel___Win32_MT_DLL_Release"
-# PROP BASE Intermediate_Dir "BKE_blenkernel___Win32_MT_DLL_Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\obj\windows\blender\blenkernel\mtdll"
-# PROP Intermediate_Dir "..\..\..\obj\windows\blender\blenkernel\mtdll"
-# PROP Target_Dir ""
-MTL=midl.exe
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /GX /O2 /I "..\..\..\source\blender\render\extern\include" /I "..\..\..\source\blender\avi" /I "..\..\..\source\blender\imbuf" /I "..\..\..\source\kernel\gen_system" /I "..\..\..\source\gameengine\soundsystem" /I "..\..\..\source\gameengine\soundsystem\snd_openal" /I "..\..\..\source\blender\blenloader" /I "..\..\..\source\blender" /I "..\..\..\source\blender\include" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\blender\python" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\gameengine\soundsystem\snd_blenderwavecache" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
-# ADD CPP /nologo /MD /GX /O2 /I "..\..\..\source\gameengine\soundsystem" /I "..\..\..\source\gameengine\soundsystem\snd_openal" /I "..\..\..\source\gameengine\soundsystem\snd_blenderwavecache" /I "..\..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\source\blender\renderconverter" /I "..\..\..\source\blender\render\extern\include" /I "..\..\..\source\blender\avi" /I "..\..\..\source\blender\imbuf" /I "..\..\..\source\kernel\gen_system" /I "..\..\..\source\blender\blenloader" /I "..\..\..\source\blender" /I "..\..\..\source\blender\include" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\blender\python" /I "..\..\..\source\blender\blenlib" /I "../../../source/gameengine\SoundSystem\\" /I "../../../../lib/windows/iksolver/include" /I "../../../../lib/windows/bsp/include" /I "..\..\..\intern\elbeem\extern" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\..\..\..\obj\windows\blender\blenkernel\BKE_blenkernel.lib"
-# ADD LIB32 /nologo
-
-!ENDIF 
-
-# Begin Target
-
-# Name "BKE_blenkernel - Win32 Release"
-# Name "BKE_blenkernel - Win32 Debug"
-# Name "BKE_blenkernel - Win32 MT DLL Debug"
-# Name "BKE_blenkernel - Win32 MT DLL Release"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenkernel\intern\action.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenkernel\intern\idprop.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenkernel\intern\anim.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenkernel\intern\armature.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenkernel\intern\blender.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenkernel\intern\bmfont.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenkernel\intern\brush.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenkernel\intern\CCGSubSurf.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenkernel\intern\cdderivedmesh.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenkernel\intern\colortools.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenkernel\intern\constraint.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenkernel\intern\curve.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenkernel\intern\customdata.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenkernel\intern\deform.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenkernel\intern\depsgraph.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenkernel\intern\DerivedMesh.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenkernel\intern\displist.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenkernel\intern\effect.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenkernel\intern\exotic.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenkernel\intern\font.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenkernel\intern\group.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenkernel\intern\icons.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenkernel\intern\image.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenkernel\intern\ipo.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenkernel\intern\key.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenkernel\intern\lattice.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenkernel\intern\library.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenkernel\intern\material.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenkernel\intern\mball.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenkernel\intern\mesh.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenkernel\intern\modifier.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenkernel\intern\nla.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenkernel\intern\node.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenkernel\intern\node_composite.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenkernel\intern\node_shaders.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenkernel\intern\object.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenkernel\intern\packedFile.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenkernel\intern\property.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenkernel\intern\sca.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenkernel\intern\scene.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenkernel\intern\screen.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenkernel\intern\script.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenkernel\intern\softbody.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenkernel\intern\sound.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenkernel\intern\subsurf_ccg.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenkernel\intern\text.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenkernel\intern\texture.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenkernel\intern\world.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenkernel\intern\writeavi.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenkernel\intern\writeframeserver.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenkernel\BKE_action.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenkernel\BKE_anim.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenkernel\BKE_armature.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenkernel\BKE_bad_level_calls.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenkernel\BKE_blender.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenkernel\BKE_bmfont.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenkernel\BKE_bmfont_types.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenkernel\BKE_booleanops.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenkernel\BKE_booleanops_mesh.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenkernel\BKE_brush.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenkernel\BKE_cdderivedmesh.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenkernel\BKE_constraint.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenkernel\BKE_curve.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenkernel\BKE_customdata.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenkernel\BKE_deform.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenkernel\BKE_depsgraph.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenkernel\BKE_DerivedMesh.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenkernel\BKE_displist.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenkernel\BKE_effect.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenkernel\BKE_endian.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenkernel\BKE_exotic.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenkernel\BKE_font.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenkernel\BKE_global.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenkernel\BKE_group.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenkernel\BKE_image.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenkernel\BKE_ipo.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenkernel\BKE_key.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenkernel\BKE_lattice.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenkernel\BKE_library.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenkernel\BKE_main.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenkernel\BKE_material.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenkernel\BKE_mball.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenkernel\BKE_mesh.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenkernel\BKE_modifier.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenkernel\BKE_nla.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenkernel\BKE_object.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenkernel\BKE_packedFile.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenkernel\BKE_plugin_types.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenkernel\BKE_property.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenkernel\BKE_sca.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenkernel\BKE_scene.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenkernel\BKE_screen.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenkernel\BKE_script.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenkernel\BKE_softbody.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenkernel\BKE_sound.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenkernel\BKE_subsurf.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenkernel\BKE_text.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenkernel\BKE_texture.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenkernel\BKE_utildefines.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenkernel\BKE_world.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenkernel\BKE_writeavi.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenkernel\intern\CCGSubSurf.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenkernel\depsgraph_private.h
-# End Source File
-# End Group
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="BKE_blenkernel" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=BKE_blenkernel - Win32 Release
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "BKE_blenkernel.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "BKE_blenkernel.mak" CFG="BKE_blenkernel - Win32 Release"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "BKE_blenkernel - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "BKE_blenkernel - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "BKE_blenkernel - Win32 MT DLL Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "BKE_blenkernel - Win32 MT DLL Release" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "BKE_blenkernel - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\..\obj\windows\blender\blenkernel"
+# PROP Intermediate_Dir "..\..\..\obj\windows\blender\blenkernel"
+# PROP Target_Dir ""
+MTL=midl.exe
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\..\..\lib\windows\decimation\include" /I "../../../../lib/windows/zlib/include" /I "..\..\..\intern\elbeem\extern" /I "..\..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\source\blender\renderconverter" /I "..\..\..\source\blender\render\extern\include" /I "..\..\..\source\blender\avi" /I "..\..\..\source\blender\imbuf" /I "..\..\..\source\kernel\gen_system" /I "..\..\..\source\blender\blenloader" /I "..\..\..\source\blender" /I "..\..\..\source\blender\include" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\blender\python" /I "..\..\..\source\blender\blenlib" /I "../../../source/gameengine\SoundSystem\\" /I "../../../../lib/windows/iksolver/include" /I "../../../../lib/windows/bsp/include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "WITH_FREETYPE2" /D "USE_CCGSUBSURFLIB" /YX /J /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "BKE_blenkernel - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\..\obj\windows\blender\blenkernel\debug"
+# PROP Intermediate_Dir "..\..\..\obj\windows\blender\blenkernel\debug"
+# PROP Target_Dir ""
+MTL=midl.exe
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\lib\windows\decimation\include" /I "../../../../lib/windows/zlib/include" /I "..\..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\source\blender\renderconverter" /I "..\..\..\source\blender\render\extern\include" /I "..\..\..\source\blender\avi" /I "..\..\..\source\blender\imbuf" /I "..\..\..\source\kernel\gen_system" /I "..\..\..\source\blender\blenloader" /I "..\..\..\source\blender" /I "..\..\..\source\blender\include" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\blender\python" /I "..\..\..\source\blender\blenlib" /I "../../../source/gameengine\SoundSystem\\" /I "../../../../lib/windows/iksolver/include" /I "../../../../lib/windows/bsp/include" /I "..\..\..\intern\elbeem\extern" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "WITH_FREETYPE2" /YX /J /FD /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "BKE_blenkernel - Win32 MT DLL Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "BKE_blenkernel___Win32_MT_DLL_Debug"
+# PROP BASE Intermediate_Dir "BKE_blenkernel___Win32_MT_DLL_Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\..\obj\windows\blender\blenkernel\mtdll_debug"
+# PROP Intermediate_Dir "..\..\..\obj\windows\blender\blenkernel\mtdll_debug"
+# PROP Target_Dir ""
+MTL=midl.exe
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /Gm /GX /ZI /Od /I "..\..\..\source\blender\render\extern\include" /I "..\..\..\source\blender\avi" /I "..\..\..\source\blender\imbuf" /I "..\..\..\source\kernel\gen_system" /I "..\..\..\source\gameengine\soundsystem" /I "..\..\..\source\gameengine\soundsystem\snd_openal" /I "..\..\..\source\blender\blenloader" /I "..\..\..\source\blender" /I "..\..\..\source\blender\include" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\blender\python" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\gameengine\soundsystem\snd_blenderwavecache" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /GZ /c
+# SUBTRACT BASE CPP /WX
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "..\..\..\source\blenloader" /I "..\..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\source\blender\renderconverter" /I "..\..\..\source\blender\render\extern\include" /I "..\..\..\source\blender\avi" /I "..\..\..\source\blender\imbuf" /I "..\..\..\source\kernel\gen_system" /I "..\..\..\source\blender\blenloader" /I "..\..\..\source\blender" /I "..\..\..\source\blender\include" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\blender\python" /I "..\..\..\source\blender\blenlib" /I "../../../source/gameengine\SoundSystem\\" /I "../../../../lib/windows/iksolver/include" /I "../../../../lib/windows/bsp/include" /I "..\..\..\intern\elbeem\extern" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /GZ /c
+# SUBTRACT CPP /WX
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\..\..\..\obj\windows\blender\blenkernel\debug\BKE_blenkernel.lib"
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "BKE_blenkernel - Win32 MT DLL Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "BKE_blenkernel___Win32_MT_DLL_Release"
+# PROP BASE Intermediate_Dir "BKE_blenkernel___Win32_MT_DLL_Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\..\obj\windows\blender\blenkernel\mtdll"
+# PROP Intermediate_Dir "..\..\..\obj\windows\blender\blenkernel\mtdll"
+# PROP Target_Dir ""
+MTL=midl.exe
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /GX /O2 /I "..\..\..\source\blender\render\extern\include" /I "..\..\..\source\blender\avi" /I "..\..\..\source\blender\imbuf" /I "..\..\..\source\kernel\gen_system" /I "..\..\..\source\gameengine\soundsystem" /I "..\..\..\source\gameengine\soundsystem\snd_openal" /I "..\..\..\source\blender\blenloader" /I "..\..\..\source\blender" /I "..\..\..\source\blender\include" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\blender\python" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\gameengine\soundsystem\snd_blenderwavecache" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
+# ADD CPP /nologo /MD /GX /O2 /I "..\..\..\source\gameengine\soundsystem" /I "..\..\..\source\gameengine\soundsystem\snd_openal" /I "..\..\..\source\gameengine\soundsystem\snd_blenderwavecache" /I "..\..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\source\blender\renderconverter" /I "..\..\..\source\blender\render\extern\include" /I "..\..\..\source\blender\avi" /I "..\..\..\source\blender\imbuf" /I "..\..\..\source\kernel\gen_system" /I "..\..\..\source\blender\blenloader" /I "..\..\..\source\blender" /I "..\..\..\source\blender\include" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\blender\python" /I "..\..\..\source\blender\blenlib" /I "../../../source/gameengine\SoundSystem\\" /I "../../../../lib/windows/iksolver/include" /I "../../../../lib/windows/bsp/include" /I "..\..\..\intern\elbeem\extern" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\..\..\..\obj\windows\blender\blenkernel\BKE_blenkernel.lib"
+# ADD LIB32 /nologo
+
+!ENDIF 
+
+# Begin Target
+
+# Name "BKE_blenkernel - Win32 Release"
+# Name "BKE_blenkernel - Win32 Debug"
+# Name "BKE_blenkernel - Win32 MT DLL Debug"
+# Name "BKE_blenkernel - Win32 MT DLL Release"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenkernel\intern\action.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenkernel\intern\idprop.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenkernel\intern\anim.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenkernel\intern\armature.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenkernel\intern\blender.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenkernel\intern\bmfont.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenkernel\intern\brush.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenkernel\intern\CCGSubSurf.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenkernel\intern\cdderivedmesh.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenkernel\intern\colortools.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenkernel\intern\constraint.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenkernel\intern\curve.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenkernel\intern\customdata.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenkernel\intern\deform.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenkernel\intern\depsgraph.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenkernel\intern\DerivedMesh.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenkernel\intern\displist.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenkernel\intern\effect.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenkernel\intern\exotic.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenkernel\intern\font.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenkernel\intern\group.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenkernel\intern\icons.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenkernel\intern\image.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenkernel\intern\ipo.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenkernel\intern\key.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenkernel\intern\lattice.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenkernel\intern\library.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenkernel\intern\material.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenkernel\intern\mball.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenkernel\intern\mesh.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenkernel\intern\modifier.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenkernel\intern\nla.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenkernel\intern\node.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenkernel\intern\node_composite.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenkernel\intern\node_shaders.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenkernel\intern\object.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenkernel\intern\packedFile.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenkernel\intern\property.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenkernel\intern\sca.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenkernel\intern\scene.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenkernel\intern\screen.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenkernel\intern\script.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenkernel\intern\softbody.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenkernel\intern\sound.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenkernel\intern\subsurf_ccg.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenkernel\intern\text.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenkernel\intern\texture.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenkernel\intern\world.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenkernel\intern\writeavi.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenkernel\intern\writeframeserver.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenkernel\BKE_action.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenkernel\BKE_anim.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenkernel\BKE_armature.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenkernel\BKE_bad_level_calls.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenkernel\BKE_blender.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenkernel\BKE_bmfont.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenkernel\BKE_bmfont_types.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenkernel\BKE_booleanops.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenkernel\BKE_booleanops_mesh.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenkernel\BKE_brush.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenkernel\BKE_cdderivedmesh.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenkernel\BKE_constraint.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenkernel\BKE_curve.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenkernel\BKE_customdata.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenkernel\BKE_deform.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenkernel\BKE_depsgraph.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenkernel\BKE_DerivedMesh.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenkernel\BKE_displist.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenkernel\BKE_effect.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenkernel\BKE_endian.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenkernel\BKE_exotic.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenkernel\BKE_font.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenkernel\BKE_global.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenkernel\BKE_group.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenkernel\BKE_image.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenkernel\BKE_ipo.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenkernel\BKE_key.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenkernel\BKE_lattice.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenkernel\BKE_library.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenkernel\BKE_main.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenkernel\BKE_material.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenkernel\BKE_mball.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenkernel\BKE_mesh.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenkernel\BKE_modifier.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenkernel\BKE_nla.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenkernel\BKE_object.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenkernel\BKE_packedFile.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenkernel\BKE_plugin_types.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenkernel\BKE_property.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenkernel\BKE_sca.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenkernel\BKE_scene.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenkernel\BKE_screen.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenkernel\BKE_script.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenkernel\BKE_softbody.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenkernel\BKE_sound.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenkernel\BKE_subsurf.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenkernel\BKE_text.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenkernel\BKE_texture.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenkernel\BKE_utildefines.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenkernel\BKE_world.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenkernel\BKE_writeavi.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenkernel\intern\CCGSubSurf.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenkernel\depsgraph_private.h
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/projectfiles/blender/blenlib/BLI_blenlib.dsp b/projectfiles/blender/blenlib/BLI_blenlib.dsp
index 137725d3f7f2fb666891b3a2512c70e81a42a6c3..0a5ed2c4d9d4aa9315b1251dad4069f5075aab10 100644
--- a/projectfiles/blender/blenlib/BLI_blenlib.dsp
+++ b/projectfiles/blender/blenlib/BLI_blenlib.dsp
@@ -1,318 +1,318 @@
-# Microsoft Developer Studio Project File - Name="BLI_blenlib" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=BLI_blenlib - Win32 Release
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "BLI_blenlib.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "BLI_blenlib.mak" CFG="BLI_blenlib - Win32 Release"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "BLI_blenlib - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "BLI_blenlib - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "BLI_blenlib - Win32 MT DLL Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "BLI_blenlib - Win32 MT DLL Release" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "BLI_blenlib - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\obj\windows\blender\blenlib"
-# PROP Intermediate_Dir "..\..\..\obj\windows\blender\blenlib"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-MTL=midl.exe
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\..\lib\windows\freetype\include" /I "..\..\..\source\blender\include" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\python" /I "..\..\..\source\blender\makesdna" /I "../../../../lib/windows/zlib/include" /I "..\..\..\..\lib\windows\sdl\include" /I "..\..\..\..\lib\windows\pthreads\include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "WITH_FREETYPE2" /J /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "BLI_blenlib - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\obj\windows\blender\blenlib\debug"
-# PROP Intermediate_Dir "..\..\..\obj\windows\blender\blenlib\debug"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-MTL=midl.exe
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\..\lib\windows\freetype\include" /I "..\..\..\source\blender\include" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\python" /I "..\..\..\source\blender\makesdna" /I "../../../../lib/windows/zlib/include" /I "..\..\..\..\lib\windows\sdl\include" /I "..\..\..\..\lib\windows\pthreads\include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "WITH_FREETYPE2" /J /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "BLI_blenlib - Win32 MT DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "BLI_blenlib___Win32_MT_DLL_Debug"
-# PROP BASE Intermediate_Dir "BLI_blenlib___Win32_MT_DLL_Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\obj\windows\blender\blenlib\mtdll_debug"
-# PROP Intermediate_Dir "..\..\..\obj\windows\blender\blenlib\mtdll_debug"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-MTL=midl.exe
-# ADD BASE CPP /nologo /Gm /GX /ZI /Od /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\python" /I "..\..\..\source\blender\makesdna" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /GZ /c
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "..\..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\python" /I "..\..\..\source\blender\makesdna" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\..\..\..\obj\windows\blender\blenlib\debug\BLI_blenlib.lib"
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "BLI_blenlib - Win32 MT DLL Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "BLI_blenlib___Win32_MT_DLL_Release"
-# PROP BASE Intermediate_Dir "BLI_blenlib___Win32_MT_DLL_Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\obj\windows\blender\blenlib\mtdll"
-# PROP Intermediate_Dir "..\..\..\obj\windows\blender\blenlib\mtdll"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-MTL=midl.exe
-# ADD BASE CPP /nologo /GX /O2 /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\python" /I "..\..\..\source\blender\makesdna" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
-# ADD CPP /nologo /MD /GX /O2 /I "..\..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\python" /I "..\..\..\source\blender\makesdna" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\..\..\..\obj\windows\blender\blenlib\BLI_blenlib.lib"
-# ADD LIB32 /nologo
-
-!ENDIF 
-
-# Begin Target
-
-# Name "BLI_blenlib - Win32 Release"
-# Name "BLI_blenlib - Win32 Debug"
-# Name "BLI_blenlib - Win32 MT DLL Debug"
-# Name "BLI_blenlib - Win32 MT DLL Release"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenlib\intern\arithb.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenlib\intern\BLI_dynstr.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenlib\intern\BLI_ghash.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenlib\intern\BLI_heap.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenlib\intern\BLI_linklist.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenlib\intern\BLI_memarena.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenlib\intern\dynlib.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenlib\intern\edgehash.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenlib\intern\fileops.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenlib\intern\freetypefont.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenlib\intern\gsqueue.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenlib\intern\jitter.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenlib\intern\matrixops.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenlib\intern\noise.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenlib\intern\psfont.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenlib\intern\rand.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenlib\intern\rct.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenlib\intern\scanfill.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenlib\intern\storage.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenlib\intern\threads.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenlib\intern\time.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenlib\intern\util.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenlib\intern\vectorops.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenlib\intern\winstuff.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenlib\BLI_arithb.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenlib\BLI_blenlib.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenlib\intern\BLI_callbacks.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenlib\BLI_edgehash.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenlib\BLI_editVert.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenlib\intern\BLI_fileops.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenlib\BLI_ghash.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenlib\BLI_linklist.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenlib\BLI_memarena.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenlib\intern\BLI_scanfill.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenlib\intern\BLI_storage.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenlib\BLI_storage_types.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenlib\intern\BLI_util.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenlib\BLI_winstuff.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenlib\MTC_matrixops.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenlib\MTC_vectorops.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenlib\PIL_dynlib.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenlib\PIL_time.h
-# End Source File
-# End Group
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="BLI_blenlib" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=BLI_blenlib - Win32 Release
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "BLI_blenlib.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "BLI_blenlib.mak" CFG="BLI_blenlib - Win32 Release"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "BLI_blenlib - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "BLI_blenlib - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "BLI_blenlib - Win32 MT DLL Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "BLI_blenlib - Win32 MT DLL Release" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "BLI_blenlib - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\..\obj\windows\blender\blenlib"
+# PROP Intermediate_Dir "..\..\..\obj\windows\blender\blenlib"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+MTL=midl.exe
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\..\lib\windows\freetype\include" /I "..\..\..\source\blender\include" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\python" /I "..\..\..\source\blender\makesdna" /I "../../../../lib/windows/zlib/include" /I "..\..\..\..\lib\windows\sdl\include" /I "..\..\..\..\lib\windows\pthreads\include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "WITH_FREETYPE2" /J /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "BLI_blenlib - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\..\obj\windows\blender\blenlib\debug"
+# PROP Intermediate_Dir "..\..\..\obj\windows\blender\blenlib\debug"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+MTL=midl.exe
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\..\lib\windows\freetype\include" /I "..\..\..\source\blender\include" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\python" /I "..\..\..\source\blender\makesdna" /I "../../../../lib/windows/zlib/include" /I "..\..\..\..\lib\windows\sdl\include" /I "..\..\..\..\lib\windows\pthreads\include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "WITH_FREETYPE2" /J /FD /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "BLI_blenlib - Win32 MT DLL Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "BLI_blenlib___Win32_MT_DLL_Debug"
+# PROP BASE Intermediate_Dir "BLI_blenlib___Win32_MT_DLL_Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\..\obj\windows\blender\blenlib\mtdll_debug"
+# PROP Intermediate_Dir "..\..\..\obj\windows\blender\blenlib\mtdll_debug"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+MTL=midl.exe
+# ADD BASE CPP /nologo /Gm /GX /ZI /Od /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\python" /I "..\..\..\source\blender\makesdna" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /GZ /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "..\..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\python" /I "..\..\..\source\blender\makesdna" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\..\..\..\obj\windows\blender\blenlib\debug\BLI_blenlib.lib"
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "BLI_blenlib - Win32 MT DLL Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "BLI_blenlib___Win32_MT_DLL_Release"
+# PROP BASE Intermediate_Dir "BLI_blenlib___Win32_MT_DLL_Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\..\obj\windows\blender\blenlib\mtdll"
+# PROP Intermediate_Dir "..\..\..\obj\windows\blender\blenlib\mtdll"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+MTL=midl.exe
+# ADD BASE CPP /nologo /GX /O2 /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\python" /I "..\..\..\source\blender\makesdna" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
+# ADD CPP /nologo /MD /GX /O2 /I "..\..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\python" /I "..\..\..\source\blender\makesdna" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\..\..\..\obj\windows\blender\blenlib\BLI_blenlib.lib"
+# ADD LIB32 /nologo
+
+!ENDIF 
+
+# Begin Target
+
+# Name "BLI_blenlib - Win32 Release"
+# Name "BLI_blenlib - Win32 Debug"
+# Name "BLI_blenlib - Win32 MT DLL Debug"
+# Name "BLI_blenlib - Win32 MT DLL Release"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenlib\intern\arithb.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenlib\intern\BLI_dynstr.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenlib\intern\BLI_ghash.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenlib\intern\BLI_heap.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenlib\intern\BLI_linklist.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenlib\intern\BLI_memarena.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenlib\intern\dynlib.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenlib\intern\edgehash.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenlib\intern\fileops.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenlib\intern\freetypefont.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenlib\intern\gsqueue.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenlib\intern\jitter.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenlib\intern\matrixops.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenlib\intern\noise.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenlib\intern\psfont.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenlib\intern\rand.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenlib\intern\rct.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenlib\intern\scanfill.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenlib\intern\storage.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenlib\intern\threads.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenlib\intern\time.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenlib\intern\util.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenlib\intern\vectorops.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenlib\intern\winstuff.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenlib\BLI_arithb.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenlib\BLI_blenlib.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenlib\intern\BLI_callbacks.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenlib\BLI_edgehash.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenlib\BLI_editVert.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenlib\intern\BLI_fileops.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenlib\BLI_ghash.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenlib\BLI_linklist.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenlib\BLI_memarena.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenlib\intern\BLI_scanfill.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenlib\intern\BLI_storage.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenlib\BLI_storage_types.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenlib\intern\BLI_util.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenlib\BLI_winstuff.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenlib\MTC_matrixops.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenlib\MTC_vectorops.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenlib\PIL_dynlib.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenlib\PIL_time.h
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/projectfiles/blender/blenpluginapi/blenpluginapi/blenpluginapi.dsp b/projectfiles/blender/blenpluginapi/blenpluginapi/blenpluginapi.dsp
index 6b219ffad199356577ce310b64fcffa7a92e7c45..935335448a4aedc31f874b7cac84b0011a755752 100644
--- a/projectfiles/blender/blenpluginapi/blenpluginapi/blenpluginapi.dsp
+++ b/projectfiles/blender/blenpluginapi/blenpluginapi/blenpluginapi.dsp
@@ -1,119 +1,119 @@
-# Microsoft Developer Studio Project File - Name="blenpluginapi" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=blenpluginapi - Win32 Release
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "blenpluginapi.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "blenpluginapi.mak" CFG="blenpluginapi - Win32 Release"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "blenpluginapi - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "blenpluginapi - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "blenpluginapi - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\..\obj\windows\blender\blenpluginapi"
-# PROP Intermediate_Dir "..\..\..\..\obj\windows\blender\blenpluginapi"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\..\source\blender" /I "..\..\..\..\source\blender\blenpluginapi" /I "..\..\..\..\source\blender\blenlib" /I "..\..\..\..\source\blender\imbuf" /I "..\..\..\..\source\blender\makesdna" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\blender\blenpluginapi.lib"
-
-!ELSEIF  "$(CFG)" == "blenpluginapi - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\..\obj\windows\blender\blenpluginapi\debug"
-# PROP Intermediate_Dir "..\..\..\..\obj\windows\blender\blenpluginapi\debug"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\..\source\blender" /I "..\..\..\..\source\blender\blenpluginapi" /I "..\..\..\..\source\blender\blenlib" /I "..\..\..\..\source\blender\imbuf" /I "..\..\..\..\source\blender\makesdna" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# SUBTRACT CPP /X
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\blender\debug\blenpluginapi.lib"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "blenpluginapi - Win32 Release"
-# Name "blenpluginapi - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\..\..\source\blender\blenpluginapi\intern\pluginapi.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\..\..\..\source\blender\blenpluginapi\documentation.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\blender\blenpluginapi\floatpatch.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\blender\blenpluginapi\iff.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\blender\blenpluginapi\plugin.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\blender\blenpluginapi\util.h
-# End Source File
-# End Group
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="blenpluginapi" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=blenpluginapi - Win32 Release
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "blenpluginapi.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "blenpluginapi.mak" CFG="blenpluginapi - Win32 Release"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "blenpluginapi - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "blenpluginapi - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "blenpluginapi - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\..\..\obj\windows\blender\blenpluginapi"
+# PROP Intermediate_Dir "..\..\..\..\obj\windows\blender\blenpluginapi"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\..\source\blender" /I "..\..\..\..\source\blender\blenpluginapi" /I "..\..\..\..\source\blender\blenlib" /I "..\..\..\..\source\blender\imbuf" /I "..\..\..\..\source\blender\makesdna" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\blender\blenpluginapi.lib"
+
+!ELSEIF  "$(CFG)" == "blenpluginapi - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\..\..\obj\windows\blender\blenpluginapi\debug"
+# PROP Intermediate_Dir "..\..\..\..\obj\windows\blender\blenpluginapi\debug"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\..\source\blender" /I "..\..\..\..\source\blender\blenpluginapi" /I "..\..\..\..\source\blender\blenlib" /I "..\..\..\..\source\blender\imbuf" /I "..\..\..\..\source\blender\makesdna" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# SUBTRACT CPP /X
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\blender\debug\blenpluginapi.lib"
+
+!ENDIF 
+
+# Begin Target
+
+# Name "blenpluginapi - Win32 Release"
+# Name "blenpluginapi - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\..\..\..\source\blender\blenpluginapi\intern\pluginapi.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=..\..\..\..\source\blender\blenpluginapi\documentation.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\blender\blenpluginapi\floatpatch.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\blender\blenpluginapi\iff.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\blender\blenpluginapi\plugin.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\blender\blenpluginapi\util.h
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/projectfiles/blender/ftfont/FTF_ftfont.dsp b/projectfiles/blender/ftfont/FTF_ftfont.dsp
index 7ecd50aa75fe9fcfeb83ff6d5f4e3218857fa1d8..9a90df08483f932b0a5f81e54fa75c88033dac33 100644
--- a/projectfiles/blender/ftfont/FTF_ftfont.dsp
+++ b/projectfiles/blender/ftfont/FTF_ftfont.dsp
@@ -1,118 +1,118 @@
-# Microsoft Developer Studio Project File - Name="FTF_ftfont" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=FTF_ftfont - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "FTF_ftfont.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "FTF_ftfont.mak" CFG="FTF_ftfont - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "FTF_ftfont - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "FTF_ftfont - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "FTF_ftfont - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\obj\windows\blender\ftfont"
-# PROP Intermediate_Dir "..\..\..\obj\windows\blender\ftfont"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "../../../source\blender\makesdna" /I "../../../source\blender\blenloader" /I "../../../source\blender\blenlib" /I "../../../../lib/windows/ftgl/include" /I "../../../../lib/windows/freetype/include" /I "../../../lib/windows/iconv/include" /I "../../../../lib/windows/gettext/include" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "WCHAR_T16" /D "HAVE_LC_MESSAGES" /YX /FD /c
-# ADD BASE RSC /l 0x411 /d "NDEBUG"
-# ADD RSC /l 0x411 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "FTF_ftfont - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\obj\windows\blender\ftfont"
-# PROP Intermediate_Dir "..\..\..\obj\windows\blender\ftfont"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "../../../source\blender\blenlib" /I "../../../source\blender\makesdna" /I "../../../../lib/windows/ftgl/include" /I "../../../../lib/windows/freetype/include" /I "../../../lib/windows/iconv/include" /I "../../../../lib/windows/gettext/include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "WCHAR_T16" /D "HAVE_LC_MESSAGES" /D "FTGL_LIBRARY_STATIC" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x411 /d "_DEBUG"
-# ADD RSC /l 0x411 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ENDIF 
-
-# Begin Target
-
-# Name "FTF_ftfont - Win32 Release"
-# Name "FTF_ftfont - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\ftfont\intern\FTF_Api.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\ftfont\intern\FTF_TTFont.cpp
-# End Source File
-# End Group
-# Begin Group "extern"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\ftfont\FTF_Api.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\ftfont\FTF_Settings.h
-# End Source File
-# End Group
-# Begin Group "intern"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\ftfont\intern\FTF_TTFont.h
-# End Source File
-# End Group
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="FTF_ftfont" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=FTF_ftfont - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "FTF_ftfont.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "FTF_ftfont.mak" CFG="FTF_ftfont - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "FTF_ftfont - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "FTF_ftfont - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "FTF_ftfont - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\..\obj\windows\blender\ftfont"
+# PROP Intermediate_Dir "..\..\..\obj\windows\blender\ftfont"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /I "../../../source\blender\makesdna" /I "../../../source\blender\blenloader" /I "../../../source\blender\blenlib" /I "../../../../lib/windows/ftgl/include" /I "../../../../lib/windows/freetype/include" /I "../../../lib/windows/iconv/include" /I "../../../../lib/windows/gettext/include" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "WCHAR_T16" /D "HAVE_LC_MESSAGES" /YX /FD /c
+# ADD BASE RSC /l 0x411 /d "NDEBUG"
+# ADD RSC /l 0x411 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "FTF_ftfont - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\..\obj\windows\blender\ftfont"
+# PROP Intermediate_Dir "..\..\..\obj\windows\blender\ftfont"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "../../../source\blender\blenlib" /I "../../../source\blender\makesdna" /I "../../../../lib/windows/ftgl/include" /I "../../../../lib/windows/freetype/include" /I "../../../lib/windows/iconv/include" /I "../../../../lib/windows/gettext/include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "WCHAR_T16" /D "HAVE_LC_MESSAGES" /D "FTGL_LIBRARY_STATIC" /YX /FD /GZ /c
+# ADD BASE RSC /l 0x411 /d "_DEBUG"
+# ADD RSC /l 0x411 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ENDIF 
+
+# Begin Target
+
+# Name "FTF_ftfont - Win32 Release"
+# Name "FTF_ftfont - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\ftfont\intern\FTF_Api.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\ftfont\intern\FTF_TTFont.cpp
+# End Source File
+# End Group
+# Begin Group "extern"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\ftfont\FTF_Api.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\ftfont\FTF_Settings.h
+# End Source File
+# End Group
+# Begin Group "intern"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\ftfont\intern\FTF_TTFont.h
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/projectfiles/blender/glut/BL_glut.dsp b/projectfiles/blender/glut/BL_glut.dsp
index 2e351603e6700fb25cf9177b58f99b600f6a4fcf..a4f1573ab382e72749b3373d74d2868c215c694b 100644
--- a/projectfiles/blender/glut/BL_glut.dsp
+++ b/projectfiles/blender/glut/BL_glut.dsp
@@ -1,324 +1,324 @@
-# Microsoft Developer Studio Project File - Name="BL_glut" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=BL_glut - Win32 Profile
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "BL_glut.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "BL_glut.mak" CFG="BL_glut - Win32 Profile"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "BL_glut - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "BL_glut - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "BL_glut - Win32 Profile" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "BL_glut - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "..\..\..\..\obj\windows\blender\glut"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\source\blender\\" /I "..\..\..\..\lib\windows\glut-3.7\include" /I "..\..\..\source\blender\glut-win" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\blender\glut\BL_glut.lib"
-
-!ELSEIF  "$(CFG)" == "BL_glut - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "..\..\..\..\obj\windows\blender\glut\debug"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "..\..\..\..\lib\windows\glut-3.7\include" /I "..\..\..\source\blender\glut-win" /I "..\..\..\source\blender\\" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /FR /YX /J /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\blender\glut\debug\BL_glut.lib"
-
-!ELSEIF  "$(CFG)" == "BL_glut - Win32 Profile"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "BL_glut___Win32_Profile"
-# PROP BASE Intermediate_Dir "BL_glut___Win32_Profile"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "BL_glut___Win32_Profile"
-# PROP Intermediate_Dir "BL_glut___Win32_Profile"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\..\lib\windows\glut-3.7\include" /I "..\..\..\source\blender\glut-win" /I "..\..\..\source\blender\\" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /Zi /O2 /I "..\..\..\..\lib\windows\glut-3.7\include" /I "..\..\..\source\blender\glut-win" /I "..\..\..\source\blender\\" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\..\..\obj\windows\blender\glut\debug\BL_glut.lib"
-# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\blender\glut\profile\BL_glut.lib"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "BL_glut - Win32 Release"
-# Name "BL_glut - Win32 Debug"
-# Name "BL_glut - Win32 Profile"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE="..\..\..\source\blender\glut-win\glut_8x13.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\blender\glut-win\glut_9x15.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\blender\glut-win\glut_bitmap.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\blender\glut-win\glut_blender.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\blender\glut-win\glut_bwidth.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\blender\glut-win\glut_cindex.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\blender\glut-win\glut_cmap.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\blender\glut-win\glut_cursor.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\blender\glut-win\glut_dials.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\blender\glut-win\glut_draw.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\blender\glut-win\glut_dstr.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\blender\glut-win\glut_event.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\blender\glut-win\glut_ext.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\blender\glut-win\glut_fullscrn.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\blender\glut-win\glut_get.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\blender\glut-win\glut_hel10.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\blender\glut-win\glut_hel12.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\blender\glut-win\glut_hel18.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\blender\glut-win\glut_helb10.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\blender\glut-win\glut_helb12.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\blender\glut-win\glut_helb14.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\blender\glut-win\glut_helb8.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\blender\glut-win\glut_init.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\blender\glut-win\glut_input.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\blender\glut-win\glut_mesa.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\blender\glut-win\glut_modifier.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\blender\glut-win\glut_mroman.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\blender\glut-win\glut_overlay.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\blender\glut-win\glut_roman.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\blender\glut-win\glut_scr12.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\blender\glut-win\glut_scr14.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\blender\glut-win\glut_scr15.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\blender\glut-win\glut_shapes.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\blender\glut-win\glut_space.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\blender\glut-win\glut_stroke.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\blender\glut-win\glut_swap.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\blender\glut-win\glut_swidth.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\blender\glut-win\glut_tablet.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\blender\glut-win\glut_teapot.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\blender\glut-win\glut_tr10.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\blender\glut-win\glut_tr24.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\blender\glut-win\glut_util.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\blender\glut-win\glut_vidresize.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\blender\glut-win\glut_warp.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\blender\glut-win\glut_win.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\blender\glut-win\glut_winmisc.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\blender\glut-win\win32_glx.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\blender\glut-win\win32_menu.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\blender\glut-win\win32_util.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\blender\glut-win\win32_x11.c"
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\glut\blenderglut.h
-# End Source File
-# End Group
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="BL_glut" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=BL_glut - Win32 Profile
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "BL_glut.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "BL_glut.mak" CFG="BL_glut - Win32 Profile"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "BL_glut - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "BL_glut - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "BL_glut - Win32 Profile" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "BL_glut - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "..\..\..\..\obj\windows\blender\glut"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\source\blender\\" /I "..\..\..\..\lib\windows\glut-3.7\include" /I "..\..\..\source\blender\glut-win" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\blender\glut\BL_glut.lib"
+
+!ELSEIF  "$(CFG)" == "BL_glut - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "..\..\..\..\obj\windows\blender\glut\debug"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "..\..\..\..\lib\windows\glut-3.7\include" /I "..\..\..\source\blender\glut-win" /I "..\..\..\source\blender\\" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /FR /YX /J /FD /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\blender\glut\debug\BL_glut.lib"
+
+!ELSEIF  "$(CFG)" == "BL_glut - Win32 Profile"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "BL_glut___Win32_Profile"
+# PROP BASE Intermediate_Dir "BL_glut___Win32_Profile"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "BL_glut___Win32_Profile"
+# PROP Intermediate_Dir "BL_glut___Win32_Profile"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\..\lib\windows\glut-3.7\include" /I "..\..\..\source\blender\glut-win" /I "..\..\..\source\blender\\" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GX /Zi /O2 /I "..\..\..\..\lib\windows\glut-3.7\include" /I "..\..\..\source\blender\glut-win" /I "..\..\..\source\blender\\" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\..\..\obj\windows\blender\glut\debug\BL_glut.lib"
+# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\blender\glut\profile\BL_glut.lib"
+
+!ENDIF 
+
+# Begin Target
+
+# Name "BL_glut - Win32 Release"
+# Name "BL_glut - Win32 Debug"
+# Name "BL_glut - Win32 Profile"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE="..\..\..\source\blender\glut-win\glut_8x13.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\blender\glut-win\glut_9x15.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\blender\glut-win\glut_bitmap.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\blender\glut-win\glut_blender.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\blender\glut-win\glut_bwidth.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\blender\glut-win\glut_cindex.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\blender\glut-win\glut_cmap.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\blender\glut-win\glut_cursor.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\blender\glut-win\glut_dials.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\blender\glut-win\glut_draw.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\blender\glut-win\glut_dstr.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\blender\glut-win\glut_event.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\blender\glut-win\glut_ext.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\blender\glut-win\glut_fullscrn.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\blender\glut-win\glut_get.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\blender\glut-win\glut_hel10.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\blender\glut-win\glut_hel12.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\blender\glut-win\glut_hel18.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\blender\glut-win\glut_helb10.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\blender\glut-win\glut_helb12.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\blender\glut-win\glut_helb14.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\blender\glut-win\glut_helb8.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\blender\glut-win\glut_init.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\blender\glut-win\glut_input.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\blender\glut-win\glut_mesa.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\blender\glut-win\glut_modifier.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\blender\glut-win\glut_mroman.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\blender\glut-win\glut_overlay.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\blender\glut-win\glut_roman.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\blender\glut-win\glut_scr12.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\blender\glut-win\glut_scr14.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\blender\glut-win\glut_scr15.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\blender\glut-win\glut_shapes.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\blender\glut-win\glut_space.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\blender\glut-win\glut_stroke.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\blender\glut-win\glut_swap.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\blender\glut-win\glut_swidth.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\blender\glut-win\glut_tablet.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\blender\glut-win\glut_teapot.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\blender\glut-win\glut_tr10.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\blender\glut-win\glut_tr24.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\blender\glut-win\glut_util.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\blender\glut-win\glut_vidresize.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\blender\glut-win\glut_warp.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\blender\glut-win\glut_win.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\blender\glut-win\glut_winmisc.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\blender\glut-win\win32_glx.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\blender\glut-win\win32_menu.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\blender\glut-win\win32_util.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\blender\glut-win\win32_x11.c"
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\glut\blenderglut.h
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/projectfiles/blender/imbuf/BL_imbuf.dsp b/projectfiles/blender/imbuf/BL_imbuf.dsp
index 002426124b6f48c73739df2f2e685cc914cbad4c..04d81d8229c747e938488163c89c4bba84d883dc 100644
--- a/projectfiles/blender/imbuf/BL_imbuf.dsp
+++ b/projectfiles/blender/imbuf/BL_imbuf.dsp
@@ -1,438 +1,438 @@
-# Microsoft Developer Studio Project File - Name="BL_imbuf" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=BL_imbuf - Win32 Release
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "BL_imbuf.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "BL_imbuf.mak" CFG="BL_imbuf - Win32 Release"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "BL_imbuf - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "BL_imbuf - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "BL_imbuf - Win32 MT DLL Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "BL_imbuf - Win32 MT DLL Release" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "BL_imbuf - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\obj\windows\blender\imbuf"
-# PROP Intermediate_Dir "..\..\..\obj\windows\blender\imbuf"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-MTL=midl.exe
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\..\source\blender\imbuf\intern" /I "..\..\..\source\blender\quicktime" /I "..\..\..\source\blender\blenloader" /I "..\..\..\source\blender\render\extern\include" /I "..\..\..\source\blender\makesdna" /I "..\..\..\..\lib\windows\memutil\include" /I "..\..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\source\blender\avi" /I "..\..\..\source\blender\imbuf" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\include" /I "..\..\..\..\lib\windows\jpeg\include" /I "..\..\..\..\lib\windows\zlib\include" /I "..\..\..\..\lib\windows\png\include" /I "..\..\..\..\lib\windows\tiff\include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "WITH_QUICKTIME" /YX /J /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "BL_imbuf - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\obj\windows\blender\imbuf\debug"
-# PROP Intermediate_Dir "..\..\..\obj\windows\blender\imbuf\debug"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-MTL=midl.exe
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\..\..\source\blender\imbuf\intern" /I "..\..\..\source\blender\quicktime" /I "..\..\..\source\blender\blenloader" /I "..\..\..\source\blender\render\extern\include" /I "..\..\..\source\blender\makesdna" /I "..\..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\source\blender\avi" /I "..\..\..\source\blender\imbuf" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\include" /I "..\..\..\..\lib\windows\jpeg\include" /I "..\..\..\..\lib\windows\zlib\include" /I "..\..\..\..\lib\windows\png\include" /I "..\..\..\..\lib\windows\memutil\include" /I "..\..\..\..\lib\windows\tiff\include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "WITH_QUICKTIME" /YX /FD /I /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "BL_imbuf - Win32 MT DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "BL_imbuf___Win32_MT_DLL_Debug"
-# PROP BASE Intermediate_Dir "BL_imbuf___Win32_MT_DLL_Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\obj\windows\blender\imbuf\mtdll_debug"
-# PROP Intermediate_Dir "..\..\..\obj\windows\blender\imbuf\mtdll_debug"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-MTL=midl.exe
-# ADD BASE CPP /nologo /Gm /GX /ZI /Od /I "..\..\..\source\blender\avi" /I "..\..\..\source\blender\imbuf" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\include" /I "..\..\..\..\lib\windows\jpeg\include" /I "..\..\..\source\blender\makesdna" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "..\..\..\source\blender\makesdna..\..\..\lib\windows\\" /I "..\..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\source\blender\avi" /I "..\..\..\source\blender\imbuf" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\include" /I "..\..\..\..\lib\windows\jpeg\include" /I "..\..\..\..\lib\windows\zlib\include" /I "..\..\..\..\lib\windows\png\include" /I "..\..\..\..\lib\windows\memutil\include" /I "..\..\..\..\lib\windows\tiff\include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\..\..\..\obj\windows\blender\imbuf\debug\BL_imbuf.lib"
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "BL_imbuf - Win32 MT DLL Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "BL_imbuf___Win32_MT_DLL_Release"
-# PROP BASE Intermediate_Dir "BL_imbuf___Win32_MT_DLL_Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\obj\windows\blender\imbuf\mtdll"
-# PROP Intermediate_Dir "..\..\..\obj\windows\blender\imbuf\mtdll"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-MTL=midl.exe
-# ADD BASE CPP /nologo /GX /O2 /I "..\..\..\source\blender\avi" /I "..\..\..\source\blender\imbuf" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\include" /I "..\..\..\..\lib\windows\jpeg\include" /I "..\..\..\source\blender\makesdna" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
-# ADD CPP /nologo /MD /GX /O2 /I "..\..\..\source\blender\makesdna..\..\..\lib\windows\\" /I "..\..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\source\blender\avi" /I "..\..\..\source\blender\imbuf" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\include" /I "..\..\..\..\lib\windows\jpeg\include" /I "..\..\..\..\lib\windows\zlib\include" /I "..\..\..\..\lib\windows\png\include" /I "..\..\..\..\lib\windows\memutil\include" /I "..\..\..\..\lib\windows\tiff\include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\..\..\..\obj\windows\blender\imbuf\BL_imbuf.lib"
-# ADD LIB32 /nologo
-
-!ENDIF 
-
-# Begin Target
-
-# Name "BL_imbuf - Win32 Release"
-# Name "BL_imbuf - Win32 Debug"
-# Name "BL_imbuf - Win32 MT DLL Debug"
-# Name "BL_imbuf - Win32 MT DLL Release"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\imbuf\intern\allocimbuf.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\imbuf\intern\amiga.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\imbuf\intern\anim.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\imbuf\intern\anim5.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\imbuf\intern\antialias.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\imbuf\intern\bitplanes.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\imbuf\intern\bmp.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\imbuf\intern\cineon\cineon_dpx.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\imbuf\intern\cineon\cineonlib.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\imbuf\intern\cmap.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\imbuf\intern\cspace.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\imbuf\intern\data.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\imbuf\intern\dither.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\imbuf\intern\divers.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\imbuf\intern\cineon\dpxlib.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\imbuf\intern\dynlibtiff.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\imbuf\intern\filter.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\imbuf\intern\ham.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\imbuf\intern\hamx.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\imbuf\intern\iff.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\imbuf\intern\imageprocess.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\imbuf\intern\iris.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\imbuf\intern\jpeg.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\imbuf\intern\cineon\logImageCore.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\imbuf\intern\cineon\logImageLib.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\imbuf\intern\cineon\logmemfile.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\imbuf\intern\png.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\quicktime\apple\quicktime_export.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\quicktime\apple\quicktime_import.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\imbuf\intern\radiance_hdr.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\imbuf\intern\readimage.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\imbuf\intern\rectop.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\imbuf\intern\rotate.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\imbuf\intern\scaling.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\imbuf\intern\targa.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\imbuf\intern\tiff.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\imbuf\intern\util.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\imbuf\intern\writeimage.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\imbuf\intern\cineon\cin_debug_stuff.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\imbuf\intern\cineon\cineonfile.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\imbuf\intern\cineon\cineonlib.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\imbuf\intern\cineon\dpxfile.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\imbuf\intern\cineon\dpxlib.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\imbuf\intern\dynlibtiff.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\imbuf\intern\IMB_allocimbuf.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\imbuf\intern\IMB_amiga.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\imbuf\intern\IMB_anim.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\imbuf\intern\IMB_anim5.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\imbuf\intern\IMB_bitplanes.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\imbuf\intern\IMB_bmp.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\imbuf\intern\IMB_cmap.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\imbuf\intern\IMB_divers.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\imbuf\intern\IMB_filter.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\imbuf\intern\IMB_ham.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\imbuf\intern\IMB_hamx.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\imbuf\intern\IMB_iff.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\imbuf\IMB_imbuf.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\imbuf\IMB_imbuf_types.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\imbuf\intern\IMB_iris.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\imbuf\intern\IMB_jpeg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\imbuf\intern\IMB_png.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\imbuf\intern\IMB_radiance_hdr.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\imbuf\intern\IMB_targa.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\imbuf\intern\IMB_tiff.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\imbuf\intern\imbuf.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\imbuf\intern\imbuf_patch.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\imbuf\intern\cineon\logImageCore.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\imbuf\intern\cineon\logImageLib.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\imbuf\intern\cineon\logmemfile.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\imbuf\intern\matrix.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\quicktime\quicktime_export.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\quicktime\quicktime_import.h
-# End Source File
-# End Group
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="BL_imbuf" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=BL_imbuf - Win32 Release
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "BL_imbuf.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "BL_imbuf.mak" CFG="BL_imbuf - Win32 Release"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "BL_imbuf - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "BL_imbuf - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "BL_imbuf - Win32 MT DLL Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "BL_imbuf - Win32 MT DLL Release" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "BL_imbuf - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\..\obj\windows\blender\imbuf"
+# PROP Intermediate_Dir "..\..\..\obj\windows\blender\imbuf"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+MTL=midl.exe
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\..\source\blender\imbuf\intern" /I "..\..\..\source\blender\quicktime" /I "..\..\..\source\blender\blenloader" /I "..\..\..\source\blender\render\extern\include" /I "..\..\..\source\blender\makesdna" /I "..\..\..\..\lib\windows\memutil\include" /I "..\..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\source\blender\avi" /I "..\..\..\source\blender\imbuf" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\include" /I "..\..\..\..\lib\windows\jpeg\include" /I "..\..\..\..\lib\windows\zlib\include" /I "..\..\..\..\lib\windows\png\include" /I "..\..\..\..\lib\windows\tiff\include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "WITH_QUICKTIME" /YX /J /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "BL_imbuf - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\..\obj\windows\blender\imbuf\debug"
+# PROP Intermediate_Dir "..\..\..\obj\windows\blender\imbuf\debug"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+MTL=midl.exe
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\..\..\source\blender\imbuf\intern" /I "..\..\..\source\blender\quicktime" /I "..\..\..\source\blender\blenloader" /I "..\..\..\source\blender\render\extern\include" /I "..\..\..\source\blender\makesdna" /I "..\..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\source\blender\avi" /I "..\..\..\source\blender\imbuf" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\include" /I "..\..\..\..\lib\windows\jpeg\include" /I "..\..\..\..\lib\windows\zlib\include" /I "..\..\..\..\lib\windows\png\include" /I "..\..\..\..\lib\windows\memutil\include" /I "..\..\..\..\lib\windows\tiff\include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "WITH_QUICKTIME" /YX /FD /I /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "BL_imbuf - Win32 MT DLL Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "BL_imbuf___Win32_MT_DLL_Debug"
+# PROP BASE Intermediate_Dir "BL_imbuf___Win32_MT_DLL_Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\..\obj\windows\blender\imbuf\mtdll_debug"
+# PROP Intermediate_Dir "..\..\..\obj\windows\blender\imbuf\mtdll_debug"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+MTL=midl.exe
+# ADD BASE CPP /nologo /Gm /GX /ZI /Od /I "..\..\..\source\blender\avi" /I "..\..\..\source\blender\imbuf" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\include" /I "..\..\..\..\lib\windows\jpeg\include" /I "..\..\..\source\blender\makesdna" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "..\..\..\source\blender\makesdna..\..\..\lib\windows\\" /I "..\..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\source\blender\avi" /I "..\..\..\source\blender\imbuf" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\include" /I "..\..\..\..\lib\windows\jpeg\include" /I "..\..\..\..\lib\windows\zlib\include" /I "..\..\..\..\lib\windows\png\include" /I "..\..\..\..\lib\windows\memutil\include" /I "..\..\..\..\lib\windows\tiff\include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\..\..\..\obj\windows\blender\imbuf\debug\BL_imbuf.lib"
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "BL_imbuf - Win32 MT DLL Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "BL_imbuf___Win32_MT_DLL_Release"
+# PROP BASE Intermediate_Dir "BL_imbuf___Win32_MT_DLL_Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\..\obj\windows\blender\imbuf\mtdll"
+# PROP Intermediate_Dir "..\..\..\obj\windows\blender\imbuf\mtdll"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+MTL=midl.exe
+# ADD BASE CPP /nologo /GX /O2 /I "..\..\..\source\blender\avi" /I "..\..\..\source\blender\imbuf" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\include" /I "..\..\..\..\lib\windows\jpeg\include" /I "..\..\..\source\blender\makesdna" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
+# ADD CPP /nologo /MD /GX /O2 /I "..\..\..\source\blender\makesdna..\..\..\lib\windows\\" /I "..\..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\source\blender\avi" /I "..\..\..\source\blender\imbuf" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\include" /I "..\..\..\..\lib\windows\jpeg\include" /I "..\..\..\..\lib\windows\zlib\include" /I "..\..\..\..\lib\windows\png\include" /I "..\..\..\..\lib\windows\memutil\include" /I "..\..\..\..\lib\windows\tiff\include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\..\..\..\obj\windows\blender\imbuf\BL_imbuf.lib"
+# ADD LIB32 /nologo
+
+!ENDIF 
+
+# Begin Target
+
+# Name "BL_imbuf - Win32 Release"
+# Name "BL_imbuf - Win32 Debug"
+# Name "BL_imbuf - Win32 MT DLL Debug"
+# Name "BL_imbuf - Win32 MT DLL Release"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\imbuf\intern\allocimbuf.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\imbuf\intern\amiga.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\imbuf\intern\anim.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\imbuf\intern\anim5.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\imbuf\intern\antialias.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\imbuf\intern\bitplanes.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\imbuf\intern\bmp.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\imbuf\intern\cineon\cineon_dpx.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\imbuf\intern\cineon\cineonlib.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\imbuf\intern\cmap.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\imbuf\intern\cspace.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\imbuf\intern\data.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\imbuf\intern\dither.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\imbuf\intern\divers.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\imbuf\intern\cineon\dpxlib.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\imbuf\intern\dynlibtiff.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\imbuf\intern\filter.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\imbuf\intern\ham.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\imbuf\intern\hamx.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\imbuf\intern\iff.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\imbuf\intern\imageprocess.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\imbuf\intern\iris.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\imbuf\intern\jpeg.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\imbuf\intern\cineon\logImageCore.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\imbuf\intern\cineon\logImageLib.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\imbuf\intern\cineon\logmemfile.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\imbuf\intern\png.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\quicktime\apple\quicktime_export.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\quicktime\apple\quicktime_import.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\imbuf\intern\radiance_hdr.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\imbuf\intern\readimage.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\imbuf\intern\rectop.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\imbuf\intern\rotate.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\imbuf\intern\scaling.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\imbuf\intern\targa.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\imbuf\intern\tiff.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\imbuf\intern\util.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\imbuf\intern\writeimage.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\imbuf\intern\cineon\cin_debug_stuff.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\imbuf\intern\cineon\cineonfile.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\imbuf\intern\cineon\cineonlib.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\imbuf\intern\cineon\dpxfile.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\imbuf\intern\cineon\dpxlib.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\imbuf\intern\dynlibtiff.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\imbuf\intern\IMB_allocimbuf.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\imbuf\intern\IMB_amiga.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\imbuf\intern\IMB_anim.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\imbuf\intern\IMB_anim5.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\imbuf\intern\IMB_bitplanes.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\imbuf\intern\IMB_bmp.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\imbuf\intern\IMB_cmap.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\imbuf\intern\IMB_divers.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\imbuf\intern\IMB_filter.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\imbuf\intern\IMB_ham.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\imbuf\intern\IMB_hamx.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\imbuf\intern\IMB_iff.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\imbuf\IMB_imbuf.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\imbuf\IMB_imbuf_types.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\imbuf\intern\IMB_iris.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\imbuf\intern\IMB_jpeg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\imbuf\intern\IMB_png.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\imbuf\intern\IMB_radiance_hdr.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\imbuf\intern\IMB_targa.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\imbuf\intern\IMB_tiff.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\imbuf\intern\imbuf.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\imbuf\intern\imbuf_patch.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\imbuf\intern\cineon\logImageCore.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\imbuf\intern\cineon\logImageLib.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\imbuf\intern\cineon\logmemfile.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\imbuf\intern\matrix.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\quicktime\quicktime_export.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\quicktime\quicktime_import.h
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/projectfiles/blender/img/BL_img.dsp b/projectfiles/blender/img/BL_img.dsp
index 16f0827fbe91f714f8c92155e4d4ad65378f4fb9..465db34f4da442c2307538c61eb3c3b851632cf7 100644
--- a/projectfiles/blender/img/BL_img.dsp
+++ b/projectfiles/blender/img/BL_img.dsp
@@ -1,171 +1,171 @@
-# Microsoft Developer Studio Project File - Name="BL_img" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=BL_IMG - WIN32 DEBUG
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "BL_img.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "BL_img.mak" CFG="BL_IMG - WIN32 DEBUG"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "BL_img - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "BL_img - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "BL_img - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\obj\windows\blender\img"
-# PROP Intermediate_Dir "..\..\..\obj\windows\blender\img"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "BL_img - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\obj\windows\blender\img\debug"
-# PROP Intermediate_Dir "..\..\..\obj\windows\blender\img\debug"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /GZ /c
-# SUBTRACT CPP /Fr
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ENDIF 
-
-# Begin Target
-
-# Name "BL_img - Win32 Release"
-# Name "BL_img - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\img\intern\IMG_Api.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\img\intern\IMG_BrushRGBA32.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\img\intern\IMG_CanvasRGBA32.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\img\intern\IMG_Line.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\img\intern\IMG_Pixmap.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\img\intern\IMG_PixmapRGBA32.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\img\intern\IMG_Rect.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Group "intern"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\img\intern\IMG_BrushRGBA32.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\img\intern\IMG_CanvasRGBA32.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\img\intern\IMG_Color.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\img\intern\IMG_Line.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\img\intern\IMG_MemPtr.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\img\intern\IMG_Pixmap.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\img\intern\IMG_PixmapRGBA32.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\img\intern\IMG_Rect.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\img\intern\IMG_Types.h
-# End Source File
-# End Group
-# Begin Group "extern"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\img\IMG_Api.h
-# End Source File
-# End Group
-# End Group
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="BL_img" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=BL_IMG - WIN32 DEBUG
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "BL_img.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "BL_img.mak" CFG="BL_IMG - WIN32 DEBUG"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "BL_img - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "BL_img - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "BL_img - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\..\obj\windows\blender\img"
+# PROP Intermediate_Dir "..\..\..\obj\windows\blender\img"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "BL_img - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\..\obj\windows\blender\img\debug"
+# PROP Intermediate_Dir "..\..\..\obj\windows\blender\img\debug"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /GZ /c
+# SUBTRACT CPP /Fr
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ENDIF 
+
+# Begin Target
+
+# Name "BL_img - Win32 Release"
+# Name "BL_img - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\img\intern\IMG_Api.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\img\intern\IMG_BrushRGBA32.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\img\intern\IMG_CanvasRGBA32.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\img\intern\IMG_Line.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\img\intern\IMG_Pixmap.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\img\intern\IMG_PixmapRGBA32.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\img\intern\IMG_Rect.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Group "intern"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\img\intern\IMG_BrushRGBA32.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\img\intern\IMG_CanvasRGBA32.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\img\intern\IMG_Color.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\img\intern\IMG_Line.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\img\intern\IMG_MemPtr.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\img\intern\IMG_Pixmap.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\img\intern\IMG_PixmapRGBA32.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\img\intern\IMG_Rect.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\img\intern\IMG_Types.h
+# End Source File
+# End Group
+# Begin Group "extern"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\img\IMG_Api.h
+# End Source File
+# End Group
+# End Group
+# End Target
+# End Project
diff --git a/projectfiles/blender/loader/BLO_loader.dsp b/projectfiles/blender/loader/BLO_loader.dsp
index 13b3224665279d14139f03c6727658c6ade54c18..6671f256bc9f12a405c988ef8c0033a220611f8e 100644
--- a/projectfiles/blender/loader/BLO_loader.dsp
+++ b/projectfiles/blender/loader/BLO_loader.dsp
@@ -1,186 +1,186 @@
-# Microsoft Developer Studio Project File - Name="BLO_loader" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=BLO_loader - Win32 Release
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "BLO_loader.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "BLO_loader.mak" CFG="BLO_loader - Win32 Release"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "BLO_loader - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "BLO_loader - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "BLO_loader - Win32 MT DLL Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "BLO_loader - Win32 MT DLL Release" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "BLO_loader - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\obj\windows\blender\loader"
-# PROP Intermediate_Dir "..\..\..\obj\windows\blender\loader"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\..\source\blender\blenloader" /I "..\..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\source\blender\include" /I "..\..\..\source\blender\streamglue\\" /I "..\..\..\source\blender\readblenfile\\" /I "..\..\..\source\blender\writeblenfile\\" /I "..\..\..\source\blender\deflate\\" /I "..\..\..\source\blender\inflate\\" /I "..\..\..\..\lib\windows\zlib\include" /I "..\..\..\source\blender\readblenfile" /I "..\..\..\source\kernel\gen_messaging" /I "..\..\..\source\blender\readstreamglue" /I "..\..\..\source\blender\writestreamglue" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\blender\render\extern\include" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\python" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "BLO_loader - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\obj\windows\blender\loader\debug"
-# PROP Intermediate_Dir "..\..\..\obj\windows\blender\loader\debug"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\source\blender\include" /I "..\..\..\source\blender\blenloader" /I "..\..\..\source\blender\streamglue\\" /I "..\..\..\source\blender\readblenfile\\" /I "..\..\..\source\blender\writeblenfile\\" /I "..\..\..\source\blender\deflate\\" /I "..\..\..\source\blender\inflate\\" /I "..\..\..\..\lib\windows\zlib\include" /I "..\..\..\source\blender\readblenfile" /I "..\..\..\source\kernel\gen_messaging" /I "..\..\..\source\blender\readstreamglue" /I "..\..\..\source\blender\writestreamglue" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\blender\render\extern\include" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\python" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /GZ /c
-# SUBTRACT CPP /Fr
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "BLO_loader - Win32 MT DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "BLO_loader___Win32_MT_DLL_Debug"
-# PROP BASE Intermediate_Dir "BLO_loader___Win32_MT_DLL_Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\obj\windows\blender\loader\mtdll_debug"
-# PROP Intermediate_Dir "..\..\..\obj\windows\blender\loader\mtdll_debug"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /Gm /GX /ZI /Od /I "..\..\..\source\blender\render\extern\include" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\python" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /GZ /c
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "..\..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\source\blender\include" /I "..\..\..\source\blender\blenloader" /I "..\..\..\source\blender\streamglue\\" /I "..\..\..\source\blender\readblenfile\\" /I "..\..\..\source\blender\writeblenfile\\" /I "..\..\..\source\blender\deflate\\" /I "..\..\..\source\blender\inflate\\" /I "..\..\..\..\lib\windows\zlib\include" /I "..\..\..\source\blender\readblenfile" /I "..\..\..\source\kernel\gen_messaging" /I "..\..\..\source\blender\readstreamglue" /I "..\..\..\source\blender\writestreamglue" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\blender\render\extern\include" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\python" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\..\..\..\obj\windows\blender\loader\debug\BLO_loader.lib"
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "BLO_loader - Win32 MT DLL Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "BLO_loader___Win32_MT_DLL_Release"
-# PROP BASE Intermediate_Dir "BLO_loader___Win32_MT_DLL_Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\obj\windows\blender\loader\mtdll"
-# PROP Intermediate_Dir "..\..\..\obj\windows\blender\loader\mtdll"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /GX /O2 /I "..\..\..\source\blender\render\extern\include" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\python" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
-# ADD CPP /nologo /MD /GX /O2 /I "..\..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\source\blender\include" /I "..\..\..\source\blender\blenloader" /I "..\..\..\source\blender\streamglue\\" /I "..\..\..\source\blender\readblenfile\\" /I "..\..\..\source\blender\writeblenfile\\" /I "..\..\..\source\blender\deflate\\" /I "..\..\..\source\blender\inflate\\" /I "..\..\..\..\lib\windows\zlib\include" /I "..\..\..\source\blender\readblenfile" /I "..\..\..\source\kernel\gen_messaging" /I "..\..\..\source\blender\readstreamglue" /I "..\..\..\source\blender\writestreamglue" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\blender\render\extern\include" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\python" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\..\..\..\obj\windows\blender\loader\BLO_loader.lib"
-# ADD LIB32 /nologo
-
-!ENDIF 
-
-# Begin Target
-
-# Name "BLO_loader - Win32 Release"
-# Name "BLO_loader - Win32 Debug"
-# Name "BLO_loader - Win32 MT DLL Debug"
-# Name "BLO_loader - Win32 MT DLL Release"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenloader\intern\genfile.c
-# ADD CPP /I "..\..\..\source\blender"
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenloader\intern\readblenentry.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenloader\intern\readfile.c
-# ADD CPP /I "..\..\..\source\blender"
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenloader\intern\undofile.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenloader\intern\writefile.c
-# ADD CPP /I "..\..\..\source\blender"
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenloader\BLO_genfile.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenloader\BLO_readfile.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenloader\BLO_soundfile.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenloader\BLO_undofile.h
-# End Source File
-# End Group
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="BLO_loader" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=BLO_loader - Win32 Release
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "BLO_loader.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "BLO_loader.mak" CFG="BLO_loader - Win32 Release"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "BLO_loader - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "BLO_loader - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "BLO_loader - Win32 MT DLL Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "BLO_loader - Win32 MT DLL Release" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "BLO_loader - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\..\obj\windows\blender\loader"
+# PROP Intermediate_Dir "..\..\..\obj\windows\blender\loader"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\..\source\blender\blenloader" /I "..\..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\source\blender\include" /I "..\..\..\source\blender\streamglue\\" /I "..\..\..\source\blender\readblenfile\\" /I "..\..\..\source\blender\writeblenfile\\" /I "..\..\..\source\blender\deflate\\" /I "..\..\..\source\blender\inflate\\" /I "..\..\..\..\lib\windows\zlib\include" /I "..\..\..\source\blender\readblenfile" /I "..\..\..\source\kernel\gen_messaging" /I "..\..\..\source\blender\readstreamglue" /I "..\..\..\source\blender\writestreamglue" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\blender\render\extern\include" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\python" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "BLO_loader - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\..\obj\windows\blender\loader\debug"
+# PROP Intermediate_Dir "..\..\..\obj\windows\blender\loader\debug"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\source\blender\include" /I "..\..\..\source\blender\blenloader" /I "..\..\..\source\blender\streamglue\\" /I "..\..\..\source\blender\readblenfile\\" /I "..\..\..\source\blender\writeblenfile\\" /I "..\..\..\source\blender\deflate\\" /I "..\..\..\source\blender\inflate\\" /I "..\..\..\..\lib\windows\zlib\include" /I "..\..\..\source\blender\readblenfile" /I "..\..\..\source\kernel\gen_messaging" /I "..\..\..\source\blender\readstreamglue" /I "..\..\..\source\blender\writestreamglue" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\blender\render\extern\include" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\python" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /GZ /c
+# SUBTRACT CPP /Fr
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "BLO_loader - Win32 MT DLL Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "BLO_loader___Win32_MT_DLL_Debug"
+# PROP BASE Intermediate_Dir "BLO_loader___Win32_MT_DLL_Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\..\obj\windows\blender\loader\mtdll_debug"
+# PROP Intermediate_Dir "..\..\..\obj\windows\blender\loader\mtdll_debug"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /Gm /GX /ZI /Od /I "..\..\..\source\blender\render\extern\include" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\python" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /GZ /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "..\..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\source\blender\include" /I "..\..\..\source\blender\blenloader" /I "..\..\..\source\blender\streamglue\\" /I "..\..\..\source\blender\readblenfile\\" /I "..\..\..\source\blender\writeblenfile\\" /I "..\..\..\source\blender\deflate\\" /I "..\..\..\source\blender\inflate\\" /I "..\..\..\..\lib\windows\zlib\include" /I "..\..\..\source\blender\readblenfile" /I "..\..\..\source\kernel\gen_messaging" /I "..\..\..\source\blender\readstreamglue" /I "..\..\..\source\blender\writestreamglue" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\blender\render\extern\include" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\python" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\..\..\..\obj\windows\blender\loader\debug\BLO_loader.lib"
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "BLO_loader - Win32 MT DLL Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "BLO_loader___Win32_MT_DLL_Release"
+# PROP BASE Intermediate_Dir "BLO_loader___Win32_MT_DLL_Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\..\obj\windows\blender\loader\mtdll"
+# PROP Intermediate_Dir "..\..\..\obj\windows\blender\loader\mtdll"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /GX /O2 /I "..\..\..\source\blender\render\extern\include" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\python" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
+# ADD CPP /nologo /MD /GX /O2 /I "..\..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\source\blender\include" /I "..\..\..\source\blender\blenloader" /I "..\..\..\source\blender\streamglue\\" /I "..\..\..\source\blender\readblenfile\\" /I "..\..\..\source\blender\writeblenfile\\" /I "..\..\..\source\blender\deflate\\" /I "..\..\..\source\blender\inflate\\" /I "..\..\..\..\lib\windows\zlib\include" /I "..\..\..\source\blender\readblenfile" /I "..\..\..\source\kernel\gen_messaging" /I "..\..\..\source\blender\readstreamglue" /I "..\..\..\source\blender\writestreamglue" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\blender\render\extern\include" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\python" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\..\..\..\obj\windows\blender\loader\BLO_loader.lib"
+# ADD LIB32 /nologo
+
+!ENDIF 
+
+# Begin Target
+
+# Name "BLO_loader - Win32 Release"
+# Name "BLO_loader - Win32 Debug"
+# Name "BLO_loader - Win32 MT DLL Debug"
+# Name "BLO_loader - Win32 MT DLL Release"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenloader\intern\genfile.c
+# ADD CPP /I "..\..\..\source\blender"
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenloader\intern\readblenentry.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenloader\intern\readfile.c
+# ADD CPP /I "..\..\..\source\blender"
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenloader\intern\undofile.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenloader\intern\writefile.c
+# ADD CPP /I "..\..\..\source\blender"
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenloader\BLO_genfile.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenloader\BLO_readfile.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenloader\BLO_soundfile.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenloader\BLO_undofile.h
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/projectfiles/blender/makesdna/DNA_makesdna.dsp b/projectfiles/blender/makesdna/DNA_makesdna.dsp
index 993968c2f6d728815e01745c407d7ca02fb59738..e08d44ade7c854663edcefbb8232f58cc35c6b45 100644
--- a/projectfiles/blender/makesdna/DNA_makesdna.dsp
+++ b/projectfiles/blender/makesdna/DNA_makesdna.dsp
@@ -1,373 +1,373 @@
-# Microsoft Developer Studio Project File - Name="DNA_makesdna" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=DNA_makesdna - Win32 Release
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "DNA_makesdna.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "DNA_makesdna.mak" CFG="DNA_makesdna - Win32 Release"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "DNA_makesdna - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "DNA_makesdna - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "DNA_makesdna - Win32 MT DLL Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "DNA_makesdna - Win32 MT DLL Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "DNA_makesdna - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\source\blender\makesdna\intern"
-# PROP Intermediate_Dir "..\..\..\obj\windows\blender\makesdna"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /YX /J /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo /o"DNA_makesdna.bsc"
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 libguardedalloc.a BLI_blenlib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /pdb:"DNA_makesdna.pdb" /machine:I386 /nodefaultlib:"libc.lib" /libpath:"..\..\..\..\lib\windows\guardedalloc\lib" /libpath:"..\..\..\obj\windows\blender\blenlib"
-# SUBTRACT LINK32 /pdb:none
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PostBuild_Desc=Building DNA
-PostBuild_Cmds=CD ..\..\..\source\blender\makesdna\intern\	DNA_makesdna.exe dna.c
-# End Special Build Tool
-
-!ELSEIF  "$(CFG)" == "DNA_makesdna - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\source\blender\makesdna\intern"
-# PROP Intermediate_Dir "..\..\..\obj\windows\blender\makesdna\debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /YX /J /FD /GZ /c
-# SUBTRACT CPP /Fr
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo /o"DNA_makesdna.bsc"
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 libguardedalloc.a BLI_blenlib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /pdb:"DNA_makesdna.pdb" /debug /machine:I386 /nodefaultlib:"libc.lib" /pdbtype:sept /libpath:"..\..\..\..\lib\windows\guardedalloc\lib\debug" /libpath:"..\..\..\obj\windows\blender\blenlib\debug"
-# SUBTRACT LINK32 /pdb:none
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PostBuild_Desc=Building DNA
-PostBuild_Cmds=CD ..\..\..\source\blender\makesdna\intern\	DNA_makesdna.exe dna.c
-# End Special Build Tool
-
-!ELSEIF  "$(CFG)" == "DNA_makesdna - Win32 MT DLL Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "DNA_makesdna___Win32_MT_DLL_Release"
-# PROP BASE Intermediate_Dir "DNA_makesdna___Win32_MT_DLL_Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\source\blender\makesdna\intern"
-# PROP Intermediate_Dir "..\..\..\obj\windows\blender\makesdna\mtdll"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /YX /J /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /YX /J /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo /o"DNA_makesdna.bsc"
-# ADD BSC32 /nologo /o"DNA_makesdna.bsc"
-LINK32=link.exe
-# ADD BASE LINK32 BLI_blenlib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /pdb:"DNA_makesdna.pdb" /machine:I386 /out:"..\..\..\source\blender\makesdna\intern\DNA_makesdna.exe" /libpath:"..\..\..\..\obj\windows\blender\blenlib"
-# SUBTRACT BASE LINK32 /pdb:none
-# ADD LINK32 libguardedalloc.a /nologo /subsystem:console /pdb:"DNA_makesdna.pdb" /machine:I386 /libpath:"..\..\..\..\lib\windows\guardedalloc\lib" /libpath:"..\..\..\..\obj\windows\blender\blenlib"
-# SUBTRACT LINK32 /pdb:none
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PostBuild_Cmds=CD ..\..\..\source\blender\makesdna\intern\	DNA_makesdna.exe dna.c
-# End Special Build Tool
-
-!ELSEIF  "$(CFG)" == "DNA_makesdna - Win32 MT DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "DNA_makesdna___Win32_MT_DLL_Debug"
-# PROP BASE Intermediate_Dir "DNA_makesdna___Win32_MT_DLL_Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\source\blender\makesdna\intern"
-# PROP Intermediate_Dir "..\..\..\obj\windows\blender\makesdna\mtdll_debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /YX /J /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /YX /J /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo /o"DNA_makesdna.bsc"
-# ADD BSC32 /nologo /o"DNA_makesdna.bsc"
-LINK32=link.exe
-# ADD BASE LINK32 BLI_blenlib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /pdb:"DNA_makesdna.pdb" /debug /machine:I386 /out:"..\..\..\source\blender\makesdna\debug\DNA_makesdna.exe" /pdbtype:sept /libpath:"..\..\..\..\obj\windows\blender\blenlib\debug"
-# SUBTRACT BASE LINK32 /pdb:none
-# ADD LINK32 libguardedalloc.a /nologo /subsystem:console /pdb:"DNA_makesdna.pdb" /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\lib\windows\guardedalloc\lib"
-# SUBTRACT LINK32 /pdb:none
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PostBuild_Cmds=CD ..\..\..\source\blender\makesdna\intern\	DNA_makesdna.exe dna.c
-# End Special Build Tool
-
-!ENDIF 
-
-# Begin Target
-
-# Name "DNA_makesdna - Win32 Release"
-# Name "DNA_makesdna - Win32 Debug"
-# Name "DNA_makesdna - Win32 MT DLL Release"
-# Name "DNA_makesdna - Win32 MT DLL Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\makesdna\intern\makesdna.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\makesdna\DNA_action_types.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\makesdna\DNA_actuator_types.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\makesdna\DNA_armature_types.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\makesdna\DNA_camera_types.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\makesdna\DNA_constraint_types.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\makesdna\DNA_controller_types.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\makesdna\DNA_curve_types.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\makesdna\DNA_customdata_types.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\makesdna\DNA_documentation.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\makesdna\DNA_effect_types.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\makesdna\DNA_fileglobal_types.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\makesdna\DNA_group_types.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\makesdna\DNA_ID.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\makesdna\DNA_image_types.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\makesdna\DNA_ipo_types.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\makesdna\DNA_key_types.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\makesdna\DNA_lamp_types.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\makesdna\DNA_lattice_types.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\makesdna\DNA_listBase.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\makesdna\DNA_material_types.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\makesdna\DNA_mesh_types.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\makesdna\DNA_meshdata_types.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\makesdna\DNA_meta_types.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\makesdna\DNA_modifier_types.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\makesdna\DNA_nla_types.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\makesdna\DNA_object_force.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\makesdna\DNA_object_types.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\makesdna\DNA_oops_types.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\makesdna\DNA_packedFile_types.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\makesdna\DNA_property_types.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\makesdna\DNA_radio_types.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\makesdna\DNA_scene_types.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\makesdna\DNA_screen_types.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\makesdna\DNA_scriptlink_types.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\makesdna\DNA_sdna_types.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\makesdna\DNA_sensor_types.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\makesdna\DNA_sequence_types.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\makesdna\DNA_sound_types.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\makesdna\DNA_space_types.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\makesdna\DNA_text_types.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\makesdna\DNA_texture_types.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\makesdna\DNA_userdef_types.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\makesdna\DNA_vec_types.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\makesdna\DNA_vfont_types.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\makesdna\DNA_view2d_types.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\makesdna\DNA_view3d_types.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\makesdna\DNA_wave_types.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\makesdna\DNA_world_types.h
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="DNA_makesdna" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=DNA_makesdna - Win32 Release
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "DNA_makesdna.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "DNA_makesdna.mak" CFG="DNA_makesdna - Win32 Release"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "DNA_makesdna - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "DNA_makesdna - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "DNA_makesdna - Win32 MT DLL Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "DNA_makesdna - Win32 MT DLL Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "DNA_makesdna - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\..\source\blender\makesdna\intern"
+# PROP Intermediate_Dir "..\..\..\obj\windows\blender\makesdna"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /YX /J /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo /o"DNA_makesdna.bsc"
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 libguardedalloc.a BLI_blenlib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /pdb:"DNA_makesdna.pdb" /machine:I386 /nodefaultlib:"libc.lib" /libpath:"..\..\..\..\lib\windows\guardedalloc\lib" /libpath:"..\..\..\obj\windows\blender\blenlib"
+# SUBTRACT LINK32 /pdb:none
+# Begin Special Build Tool
+SOURCE="$(InputPath)"
+PostBuild_Desc=Building DNA
+PostBuild_Cmds=CD ..\..\..\source\blender\makesdna\intern\	DNA_makesdna.exe dna.c
+# End Special Build Tool
+
+!ELSEIF  "$(CFG)" == "DNA_makesdna - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\..\source\blender\makesdna\intern"
+# PROP Intermediate_Dir "..\..\..\obj\windows\blender\makesdna\debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /YX /J /FD /GZ /c
+# SUBTRACT CPP /Fr
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo /o"DNA_makesdna.bsc"
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 libguardedalloc.a BLI_blenlib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /pdb:"DNA_makesdna.pdb" /debug /machine:I386 /nodefaultlib:"libc.lib" /pdbtype:sept /libpath:"..\..\..\..\lib\windows\guardedalloc\lib\debug" /libpath:"..\..\..\obj\windows\blender\blenlib\debug"
+# SUBTRACT LINK32 /pdb:none
+# Begin Special Build Tool
+SOURCE="$(InputPath)"
+PostBuild_Desc=Building DNA
+PostBuild_Cmds=CD ..\..\..\source\blender\makesdna\intern\	DNA_makesdna.exe dna.c
+# End Special Build Tool
+
+!ELSEIF  "$(CFG)" == "DNA_makesdna - Win32 MT DLL Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "DNA_makesdna___Win32_MT_DLL_Release"
+# PROP BASE Intermediate_Dir "DNA_makesdna___Win32_MT_DLL_Release"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\..\source\blender\makesdna\intern"
+# PROP Intermediate_Dir "..\..\..\obj\windows\blender\makesdna\mtdll"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /YX /J /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /YX /J /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo /o"DNA_makesdna.bsc"
+# ADD BSC32 /nologo /o"DNA_makesdna.bsc"
+LINK32=link.exe
+# ADD BASE LINK32 BLI_blenlib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /pdb:"DNA_makesdna.pdb" /machine:I386 /out:"..\..\..\source\blender\makesdna\intern\DNA_makesdna.exe" /libpath:"..\..\..\..\obj\windows\blender\blenlib"
+# SUBTRACT BASE LINK32 /pdb:none
+# ADD LINK32 libguardedalloc.a /nologo /subsystem:console /pdb:"DNA_makesdna.pdb" /machine:I386 /libpath:"..\..\..\..\lib\windows\guardedalloc\lib" /libpath:"..\..\..\..\obj\windows\blender\blenlib"
+# SUBTRACT LINK32 /pdb:none
+# Begin Special Build Tool
+SOURCE="$(InputPath)"
+PostBuild_Cmds=CD ..\..\..\source\blender\makesdna\intern\	DNA_makesdna.exe dna.c
+# End Special Build Tool
+
+!ELSEIF  "$(CFG)" == "DNA_makesdna - Win32 MT DLL Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "DNA_makesdna___Win32_MT_DLL_Debug"
+# PROP BASE Intermediate_Dir "DNA_makesdna___Win32_MT_DLL_Debug"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\..\source\blender\makesdna\intern"
+# PROP Intermediate_Dir "..\..\..\obj\windows\blender\makesdna\mtdll_debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /YX /J /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /YX /J /FD /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo /o"DNA_makesdna.bsc"
+# ADD BSC32 /nologo /o"DNA_makesdna.bsc"
+LINK32=link.exe
+# ADD BASE LINK32 BLI_blenlib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /pdb:"DNA_makesdna.pdb" /debug /machine:I386 /out:"..\..\..\source\blender\makesdna\debug\DNA_makesdna.exe" /pdbtype:sept /libpath:"..\..\..\..\obj\windows\blender\blenlib\debug"
+# SUBTRACT BASE LINK32 /pdb:none
+# ADD LINK32 libguardedalloc.a /nologo /subsystem:console /pdb:"DNA_makesdna.pdb" /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\lib\windows\guardedalloc\lib"
+# SUBTRACT LINK32 /pdb:none
+# Begin Special Build Tool
+SOURCE="$(InputPath)"
+PostBuild_Cmds=CD ..\..\..\source\blender\makesdna\intern\	DNA_makesdna.exe dna.c
+# End Special Build Tool
+
+!ENDIF 
+
+# Begin Target
+
+# Name "DNA_makesdna - Win32 Release"
+# Name "DNA_makesdna - Win32 Debug"
+# Name "DNA_makesdna - Win32 MT DLL Release"
+# Name "DNA_makesdna - Win32 MT DLL Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\makesdna\intern\makesdna.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\makesdna\DNA_action_types.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\makesdna\DNA_actuator_types.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\makesdna\DNA_armature_types.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\makesdna\DNA_camera_types.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\makesdna\DNA_constraint_types.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\makesdna\DNA_controller_types.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\makesdna\DNA_curve_types.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\makesdna\DNA_customdata_types.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\makesdna\DNA_documentation.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\makesdna\DNA_effect_types.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\makesdna\DNA_fileglobal_types.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\makesdna\DNA_group_types.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\makesdna\DNA_ID.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\makesdna\DNA_image_types.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\makesdna\DNA_ipo_types.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\makesdna\DNA_key_types.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\makesdna\DNA_lamp_types.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\makesdna\DNA_lattice_types.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\makesdna\DNA_listBase.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\makesdna\DNA_material_types.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\makesdna\DNA_mesh_types.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\makesdna\DNA_meshdata_types.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\makesdna\DNA_meta_types.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\makesdna\DNA_modifier_types.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\makesdna\DNA_nla_types.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\makesdna\DNA_object_force.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\makesdna\DNA_object_types.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\makesdna\DNA_oops_types.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\makesdna\DNA_packedFile_types.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\makesdna\DNA_property_types.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\makesdna\DNA_radio_types.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\makesdna\DNA_scene_types.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\makesdna\DNA_screen_types.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\makesdna\DNA_scriptlink_types.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\makesdna\DNA_sdna_types.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\makesdna\DNA_sensor_types.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\makesdna\DNA_sequence_types.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\makesdna\DNA_sound_types.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\makesdna\DNA_space_types.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\makesdna\DNA_text_types.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\makesdna\DNA_texture_types.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\makesdna\DNA_userdef_types.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\makesdna\DNA_vec_types.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\makesdna\DNA_vfont_types.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\makesdna\DNA_view2d_types.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\makesdna\DNA_view3d_types.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\makesdna\DNA_wave_types.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\makesdna\DNA_world_types.h
+# End Source File
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project
diff --git a/projectfiles/blender/radiosity/BRA_radiosity.dsp b/projectfiles/blender/radiosity/BRA_radiosity.dsp
index be9e33e311f2116f38f3df6029f782261f98e127..4bae7c4e50f5a2c9660c9a273463c95dac133c3d 100644
--- a/projectfiles/blender/radiosity/BRA_radiosity.dsp
+++ b/projectfiles/blender/radiosity/BRA_radiosity.dsp
@@ -1,133 +1,133 @@
-# Microsoft Developer Studio Project File - Name="BRA_radiosity" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=BRA_radiosity - Win32 Release
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "BRA_radiosity.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "BRA_radiosity.mak" CFG="BRA_radiosity - Win32 Release"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "BRA_radiosity - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "BRA_radiosity - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "BRA_radiosity - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\obj\windows\blender\radiosity"
-# PROP Intermediate_Dir "..\..\..\obj\windows\blender\radiosity"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-MTL=midl.exe
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\source\blender\imbuf" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\render\extern\include" /I "..\..\..\source\blender\radiosity\extern\include" /I "..\..\..\source\blender" /I "..\..\..\source\blender\include" /I "..\..\..\source\blender\misc" /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\blender\render\intern\include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "BRA_radiosity - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\obj\windows\blender\radiosity\debug"
-# PROP Intermediate_Dir "..\..\..\obj\windows\blender\radiosity\debug"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-MTL=midl.exe
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\source\blender\imbuf" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\render\extern\include" /I "..\..\..\source\blender\radiosity\extern\include" /I "..\..\..\source\blender" /I "..\..\..\source\blender\include" /I "..\..\..\source\blender\misc" /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\blender\render\intern\include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /GZ /c
-# SUBTRACT CPP /Fr
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ENDIF 
-
-# Begin Target
-
-# Name "BRA_radiosity - Win32 Release"
-# Name "BRA_radiosity - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\radiosity\intern\source\raddisplay.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\radiosity\intern\source\radfactors.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\radiosity\intern\source\radio.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\radiosity\intern\source\radnode.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\radiosity\intern\source\radpostprocess.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\radiosity\intern\source\radpreprocess.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\radiosity\intern\source\radrender.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\radiosity\extern\include\radio.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\radiosity\extern\include\radio_types.h
-# End Source File
-# End Group
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="BRA_radiosity" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=BRA_radiosity - Win32 Release
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "BRA_radiosity.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "BRA_radiosity.mak" CFG="BRA_radiosity - Win32 Release"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "BRA_radiosity - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "BRA_radiosity - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "BRA_radiosity - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\..\obj\windows\blender\radiosity"
+# PROP Intermediate_Dir "..\..\..\obj\windows\blender\radiosity"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+MTL=midl.exe
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\source\blender\imbuf" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\render\extern\include" /I "..\..\..\source\blender\radiosity\extern\include" /I "..\..\..\source\blender" /I "..\..\..\source\blender\include" /I "..\..\..\source\blender\misc" /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\blender\render\intern\include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "BRA_radiosity - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\..\obj\windows\blender\radiosity\debug"
+# PROP Intermediate_Dir "..\..\..\obj\windows\blender\radiosity\debug"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+MTL=midl.exe
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\source\blender\imbuf" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\render\extern\include" /I "..\..\..\source\blender\radiosity\extern\include" /I "..\..\..\source\blender" /I "..\..\..\source\blender\include" /I "..\..\..\source\blender\misc" /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\blender\render\intern\include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /GZ /c
+# SUBTRACT CPP /Fr
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ENDIF 
+
+# Begin Target
+
+# Name "BRA_radiosity - Win32 Release"
+# Name "BRA_radiosity - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\radiosity\intern\source\raddisplay.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\radiosity\intern\source\radfactors.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\radiosity\intern\source\radio.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\radiosity\intern\source\radnode.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\radiosity\intern\source\radpostprocess.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\radiosity\intern\source\radpreprocess.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\radiosity\intern\source\radrender.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\radiosity\extern\include\radio.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\radiosity\extern\include\radio_types.h
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/projectfiles/blender/render/BRE_render.dsp b/projectfiles/blender/render/BRE_render.dsp
index 7d29bce934c0ad9bf557810db6c187ecd4a561ed..2e41812071fa5548a042cef8cd2455c5c4f95369 100644
--- a/projectfiles/blender/render/BRE_render.dsp
+++ b/projectfiles/blender/render/BRE_render.dsp
@@ -1,192 +1,192 @@
-# Microsoft Developer Studio Project File - Name="BRE_render" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=BRE_render - Win32 Release
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "BRE_render.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "BRE_render.mak" CFG="BRE_render - Win32 Release"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "BRE_render - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "BRE_render - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "BRE_render - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\obj\windows\blender\render"
-# PROP Intermediate_Dir "..\..\..\obj\windows\blender\render"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-MTL=midl.exe
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\..\lib\windows\sdl\include" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\kernel\gen_messaging" /I "..\..\..\source\blender\imbuf" /I "..\..\..\source\blender\quicktime" /I "..\..\..\source\blender\blenloader" /I "..\..\..\source\blender\include" /I "..\..\..\source\blender\misc" /I "..\..\..\source\kernel" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\radiosity\extern\include" /I "..\..\..\source\blender\render\intern\include" /I "..\..\..\source\blender\render\extern\include" /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\blender\python" /I "..\..\..\source\blender" /I "..\..\..\source\blender\yafray" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "WITH_QUICKTIME" /YX /J /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "BRE_render - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\obj\windows\blender\render\debug"
-# PROP Intermediate_Dir "..\..\..\obj\windows\blender\render\debug"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-MTL=midl.exe
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\..\lib\windows\sdl\include" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\kernel\gen_messaging" /I "..\..\..\source\blender\imbuf" /I "..\..\..\source\blender\quicktime" /I "..\..\..\source\blender\blenloader" /I "..\..\..\source\blender\include" /I "..\..\..\source\blender\misc" /I "..\..\..\source\kernel" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\radiosity\extern\include" /I "..\..\..\source\blender\render\intern\include" /I "..\..\..\source\blender\render\extern\include" /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\blender\python" /I "..\..\..\source\blender" /I "..\..\..\source\blender\yafray" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "WITH_QUICKTIME" /YX /J /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ENDIF 
-
-# Begin Target
-
-# Name "BRE_render - Win32 Release"
-# Name "BRE_render - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\render\intern\source\convertblender.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\render\intern\source\envmap.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\render\intern\source\gammaCorrectionTables.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\render\intern\source\imagetexture.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\render\intern\source\initrender.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\render\intern\source\pipeline.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\render\intern\source\pixelblending.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\render\intern\source\pixelshading.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\render\intern\source\ray.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\render\intern\source\rendercore.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\render\intern\source\renderdatabase.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\render\intern\source\shadbuf.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\render\intern\source\texture.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\render\intern\source\zbuf.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\render\intern\include\edgeRender.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\render\intern\include\envmap.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\render\intern\include\gammaCorrectionTables.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\render\intern\include\initrender.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\render\intern\include\pixelblending.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\render\intern\include\pixelshading.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\render\intern\include\rendercore.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\render\intern\include\shadbuf.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\render\intern\include\texture.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\render\intern\include\zbuf.h
-# End Source File
-# End Group
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="BRE_render" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=BRE_render - Win32 Release
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "BRE_render.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "BRE_render.mak" CFG="BRE_render - Win32 Release"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "BRE_render - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "BRE_render - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "BRE_render - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\..\obj\windows\blender\render"
+# PROP Intermediate_Dir "..\..\..\obj\windows\blender\render"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+MTL=midl.exe
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\..\lib\windows\sdl\include" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\kernel\gen_messaging" /I "..\..\..\source\blender\imbuf" /I "..\..\..\source\blender\quicktime" /I "..\..\..\source\blender\blenloader" /I "..\..\..\source\blender\include" /I "..\..\..\source\blender\misc" /I "..\..\..\source\kernel" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\radiosity\extern\include" /I "..\..\..\source\blender\render\intern\include" /I "..\..\..\source\blender\render\extern\include" /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\blender\python" /I "..\..\..\source\blender" /I "..\..\..\source\blender\yafray" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "WITH_QUICKTIME" /YX /J /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "BRE_render - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\..\obj\windows\blender\render\debug"
+# PROP Intermediate_Dir "..\..\..\obj\windows\blender\render\debug"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+MTL=midl.exe
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\..\lib\windows\sdl\include" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\kernel\gen_messaging" /I "..\..\..\source\blender\imbuf" /I "..\..\..\source\blender\quicktime" /I "..\..\..\source\blender\blenloader" /I "..\..\..\source\blender\include" /I "..\..\..\source\blender\misc" /I "..\..\..\source\kernel" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\radiosity\extern\include" /I "..\..\..\source\blender\render\intern\include" /I "..\..\..\source\blender\render\extern\include" /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\blender\python" /I "..\..\..\source\blender" /I "..\..\..\source\blender\yafray" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "WITH_QUICKTIME" /YX /J /FD /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ENDIF 
+
+# Begin Target
+
+# Name "BRE_render - Win32 Release"
+# Name "BRE_render - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\render\intern\source\convertblender.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\render\intern\source\envmap.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\render\intern\source\gammaCorrectionTables.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\render\intern\source\imagetexture.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\render\intern\source\initrender.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\render\intern\source\pipeline.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\render\intern\source\pixelblending.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\render\intern\source\pixelshading.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\render\intern\source\ray.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\render\intern\source\rendercore.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\render\intern\source\renderdatabase.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\render\intern\source\shadbuf.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\render\intern\source\texture.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\render\intern\source\zbuf.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\render\intern\include\edgeRender.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\render\intern\include\envmap.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\render\intern\include\gammaCorrectionTables.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\render\intern\include\initrender.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\render\intern\include\pixelblending.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\render\intern\include\pixelshading.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\render\intern\include\rendercore.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\render\intern\include\shadbuf.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\render\intern\include\texture.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\render\intern\include\zbuf.h
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/projectfiles/blender/renderconverter/BRE_renderconverter.dsp b/projectfiles/blender/renderconverter/BRE_renderconverter.dsp
index 4b3729061a84073a665a23fb110debc6198fe045..6f07a365069806c23971cc9c11448a1af1ffa1da 100644
--- a/projectfiles/blender/renderconverter/BRE_renderconverter.dsp
+++ b/projectfiles/blender/renderconverter/BRE_renderconverter.dsp
@@ -1,102 +1,102 @@
-# Microsoft Developer Studio Project File - Name="BRE_renderconverter" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=BRE_renderconverter - Win32 Release
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "BRE_renderconverter.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "BRE_renderconverter.mak" CFG="BRE_renderconverter - Win32 Release"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "BRE_renderconverter - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "BRE_renderconverter - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "BRE_renderconverter - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\obj\windows\blender\renderconverter"
-# PROP Intermediate_Dir "..\..\..\obj\windows\blender\renderconverter"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\source\blender\python" /I "..\..\..\source\blender\yafray" /I "..\..\..\source\blender\radiosity\extern\include" /I "..\..\..\source\blender\misc" /I "..\..\..\source\blender\renderconverter" /I "..\..\..\source\blender\include" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\render\extern\include" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /J /FD /c
-# ADD BASE RSC /l 0x413 /d "NDEBUG"
-# ADD RSC /l 0x413 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "BRE_renderconverter - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "BRE_renderconverter___Win32_Debug"
-# PROP BASE Intermediate_Dir "BRE_renderconverter___Win32_Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\obj\windows\blender\render\debug"
-# PROP Intermediate_Dir "..\..\..\obj\windows\blender\render\debug"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\source\blender\python" /I "..\..\..\source\blender\yafray" /I "..\..\..\source\blender\radiosity\extern\include" /I "..\..\..\source\blender\misc" /I "..\..\..\source\blender\renderconverter" /I "..\..\..\source\blender\include" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\render\extern\include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /J /FD /GZ /c
-# ADD BASE RSC /l 0x413 /d "_DEBUG"
-# ADD RSC /l 0x413 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\..\obj\windows\blender\renderconverter\debug\BRE_renderconverter.lib"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "BRE_renderconverter - Win32 Release"
-# Name "BRE_renderconverter - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\renderconverter\intern\convertBlenderScene.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\renderconverter\RE_renderconverter.h
-# End Source File
-# End Group
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="BRE_renderconverter" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=BRE_renderconverter - Win32 Release
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "BRE_renderconverter.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "BRE_renderconverter.mak" CFG="BRE_renderconverter - Win32 Release"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "BRE_renderconverter - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "BRE_renderconverter - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "BRE_renderconverter - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\..\obj\windows\blender\renderconverter"
+# PROP Intermediate_Dir "..\..\..\obj\windows\blender\renderconverter"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\source\blender\python" /I "..\..\..\source\blender\yafray" /I "..\..\..\source\blender\radiosity\extern\include" /I "..\..\..\source\blender\misc" /I "..\..\..\source\blender\renderconverter" /I "..\..\..\source\blender\include" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\render\extern\include" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /J /FD /c
+# ADD BASE RSC /l 0x413 /d "NDEBUG"
+# ADD RSC /l 0x413 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "BRE_renderconverter - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "BRE_renderconverter___Win32_Debug"
+# PROP BASE Intermediate_Dir "BRE_renderconverter___Win32_Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\..\obj\windows\blender\render\debug"
+# PROP Intermediate_Dir "..\..\..\obj\windows\blender\render\debug"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\source\blender\python" /I "..\..\..\source\blender\yafray" /I "..\..\..\source\blender\radiosity\extern\include" /I "..\..\..\source\blender\misc" /I "..\..\..\source\blender\renderconverter" /I "..\..\..\source\blender\include" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\render\extern\include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /J /FD /GZ /c
+# ADD BASE RSC /l 0x413 /d "_DEBUG"
+# ADD RSC /l 0x413 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\..\..\obj\windows\blender\renderconverter\debug\BRE_renderconverter.lib"
+
+!ENDIF 
+
+# Begin Target
+
+# Name "BRE_renderconverter - Win32 Release"
+# Name "BRE_renderconverter - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\renderconverter\intern\convertBlenderScene.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\renderconverter\RE_renderconverter.h
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/projectfiles/blender/src/BL_src.dsp b/projectfiles/blender/src/BL_src.dsp
index d6a1c3945e9ca575cd724c5249e73018bbcaec74..82bc14bc0a8f624f0765c289b23f193b34f5af2e 100644
--- a/projectfiles/blender/src/BL_src.dsp
+++ b/projectfiles/blender/src/BL_src.dsp
@@ -1,1040 +1,1040 @@
-# Microsoft Developer Studio Project File - Name="BL_src" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=BL_SRC - WIN32 DEBUG
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "BL_src.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "BL_src.mak" CFG="BL_SRC - WIN32 DEBUG"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "BL_src - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "BL_src - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "BL_src - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\obj\windows\blender\src"
-# PROP Intermediate_Dir "..\..\..\obj\windows\blender\src"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-MTL=midl.exe
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\..\..\lib\windows\sdl\include\\" /I "..\..\..\source\blender\img" /I "..\..\..\source\blender\renderui" /I "..\..\..\..\lib\windows\soundsystem\include\\" /I "..\..\..\..\lib\windows\python\include\python2.0\\" /I "..\..\..\..\lib\windows\bmfont\include" /I "..\..\..\source\blender\ftfont" /I "..\..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\source\blender\renderconverter" /I "..\..\..\source\blender\verify" /I "..\..\..\source\blender\readstreamglue" /I "..\..\..\source\gameengine\soundsystem\snd_openal" /I "..\..\..\source\blender\imbuf" /I "..\..\..\source\blender\blenloader" /I "..\..\..\source\blender\quicktime" /I "..\..\..\source\kernel\gen_system" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\misc" /I "..\..\..\source\blender\python" /I "..\..\..\source\blender\radiosity\extern\include" /I "..\..\..\source\blender\render\extern\include" /I "..\..\..\source\blender\include" /I "..\..\..\source\blender" /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\gameengine\network" /I "..\..\..\..\lib\windows\decimation\include" /I "..\..\..\source\blender\blenpluginapi\\" /I "..\..\..\..\lib\windows\blenkey\include" /I "..\..\..\..\lib\windows\ghost\include" /I "..\..\..\..\lib\windows\bsp\include" /I "..\..\..\..\lib\windows\opennl\include" /I "..\..\..\intern\elbeem\extern" /I "..\..\..\..\lib\windows\memutil\include" /I "..\..\..\..\lib\windows\pthreads\include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "_CONSOLE" /D "xGAMEBLENDER" /D "WITH_QUICKTIME" /D "INTERNATIONAL" /FR /J /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "BL_src - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\obj\windows\blender\src\debug"
-# PROP Intermediate_Dir "..\..\..\obj\windows\blender\src\debug"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-MTL=midl.exe
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\lib\windows\sdl\include\\" /I "..\..\..\source\blender\img" /I "..\..\..\source\blender\renderui" /I "..\..\..\..\lib\windows\soundsystem\include\\" /I "..\..\..\..\lib\windows\python\include\python2.0\\" /I "..\..\..\..\lib\windows\bmfont\include" /I "..\..\..\source\blender\ftfont" /I "..\..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\source\blender\renderconverter" /I "..\..\..\source\blender\verify" /I "..\..\..\source\blender\readstreamglue" /I "..\..\..\source\gameengine\soundsystem\snd_openal" /I "..\..\..\source\blender\imbuf" /I "..\..\..\source\blender\blenloader" /I "..\..\..\source\blender\quicktime" /I "..\..\..\source\kernel\gen_system" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\misc" /I "..\..\..\source\blender\python" /I "..\..\..\source\blender\radiosity\extern\include" /I "..\..\..\source\blender\render\extern\include" /I "..\..\..\source\blender\include" /I "..\..\..\source\blender" /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\gameengine\network" /I "..\..\..\..\lib\windows\decimation\include" /I "..\..\..\source\blender\blenpluginapi\\" /I "..\..\..\..\lib\windows\blenkey\include" /I "..\..\..\..\lib\windows\ghost\include" /I "..\..\..\..\lib\windows\bsp\include" /I "..\..\..\..\lib\windows\opennl\include" /I "..\..\..\intern\elbeem\extern" /I "..\..\..\..\lib\windows\memutil\include" /I "..\..\..\..\lib\windows\pthreads\include" /D "WIN32" /D "_MBCS" /D "_LIB" /D "_CONSOLE" /D "xGAMEBLENDER" /D "WITH_QUICKTIME" /D "INTERNATIONAL" /U "_DEBUG" /J /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ENDIF 
-
-# Begin Target
-
-# Name "BL_src - Win32 Release"
-# Name "BL_src - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\B.blend.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\Bfont.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\bfont.ttf.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\blenderbuttons.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\booleanops.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\booleanops_mesh.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\butspace.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\buttons_editing.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\buttons_logic.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\buttons_object.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\buttons_scene.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\buttons_script.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\buttons_shading.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\cmap.tga.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\cmovie.tga.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\cursors.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\makesdna\intern\dna.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\drawaction.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\drawarmature.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\drawdeps.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\drawimage.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\drawimasel.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\drawipo.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\drawmesh.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\drawnla.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\drawnode.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\drawobject.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\drawoops.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\drawscene.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\drawscript.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\drawseq.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\drawsound.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\drawtext.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\drawtime.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\drawview.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\edit.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\editaction.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\editarmature.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\editconstraint.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\editcurve.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\editdeform.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\editface.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\editfont.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\editgroup.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\editimasel.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\editipo.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\editipo_lib.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\editipo_mods.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\editkey.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\editlattice.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\editmball.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\editmesh.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\editmesh_add.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\editmesh_lib.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\editmesh_loop.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\editmesh_mods.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\editmesh_tools.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\editmode_undo.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\editnla.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\editnode.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\editobject.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\editoops.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\editscreen.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\editseq.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\editsima.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\editsound.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\edittime.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\editview.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\eventdebug.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\filesel.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\fluidsim.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\ghostwinlay.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\glutil.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\hddaudio.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\header_action.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\header_buttonswin.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\header_filesel.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\header_image.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\header_imasel.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\header_info.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\header_ipo.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\header_nla.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\header_node.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\header_oops.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\header_script.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\header_seq.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\header_sound.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\header_text.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\header_time.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\header_view3d.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\headerbuttons.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\imagepaint.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\imasel.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\interface.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\interface_draw.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\interface_icons.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\interface_panel.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\keyval.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\language.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\lorem.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\mainqueue.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\meshtools.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\multires.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\mywindow.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\oops.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\outliner.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\parametrizer.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\playanim.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\blenpluginapi\intern\pluginapi.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\poseobject.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\preview.blend.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\previewrender.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\renderwin.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\resources.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\retopo.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\scrarea.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\screendump.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\sculptmode.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\seqaudio.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\seqeffects.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\seqscopes.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\sequence.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\space.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\spacetypes.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\splash.jpg.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\swapbuffers.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\toets.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\toolbox.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\transform.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\transform_constraints.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\transform_conversions.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\transform_generics.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\transform_manipulator.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\transform_numinput.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\transform_snap.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\unwrapper.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\usiblender.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\view.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\vpaint.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\writeavicodec.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\writeimage.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\writemovie.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\include\BDR_drawaction.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\include\BDR_drawmesh.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\include\BDR_drawobject.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\include\BDR_editcurve.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\include\BDR_editface.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\include\BDR_editmball.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\include\BDR_editobject.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\include\BDR_sculptmode.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\include\BDR_unwrapper.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\include\BDR_vpaint.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\include\BIF_butspace.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\include\BIF_cursors.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\include\BIF_drawimage.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\include\BIF_drawoops.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\include\BIF_drawscene.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\include\BIF_drawscript.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\include\BIF_drawseq.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\include\BIF_drawtext.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\include\BIF_editaction.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\include\BIF_editarmature.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\include\BIF_editconstraint.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\include\BIF_editdeform.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\include\BIF_editfont.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\include\BIF_editgroup.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\include\BIF_editkey.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\include\BIF_editlattice.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\include\BIF_editmesh.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\include\BIF_editmode_undo.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\include\BIF_editnla.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\include\BIF_editoops.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\include\BIF_editsca.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\include\BIF_editseq.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\include\BIF_editsima.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\include\BIF_editsound.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\include\BIF_editview.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\include\BIF_fsmenu.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\include\BIF_gl.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\include\BIF_glutil.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\include\BIF_graphics.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\include\BIF_imasel.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\include\BIF_interface.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\include\BIF_keyval.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\include\BIF_language.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\include\BIF_mainqueue.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\include\BIF_meshtools.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\include\BIF_mywindow.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\include\BIF_oops.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\include\BIF_outliner.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\include\BIF_poseobject.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\include\BIF_previewrender.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\include\BIF_renderwin.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\include\BIF_resources.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\include\BIF_retopo.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\include\BIF_scrarea.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\include\BIF_screen.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\include\BIF_space.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\include\BIF_spacetypes.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\include\BIF_tbcallback.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\include\BIF_toets.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\include\BIF_toolbox.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\include\BIF_transform.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\include\BIF_usiblender.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\include\BIF_writeavicodec.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\include\BIF_writeimage.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\include\BIF_writemovie.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\include\blendef.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\include\BPI_script.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\include\BSE_buttons.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\include\BSE_drawimasel.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\include\BSE_drawipo.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\include\BSE_drawnla.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\include\BSE_drawoops.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\include\BSE_drawview.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\include\BSE_edit.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\include\BSE_editaction.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\include\BSE_editaction_types.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\include\BSE_editipo.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\include\BSE_editipo_types.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\include\BSE_editnla_types.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\include\BSE_filesel.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\include\BSE_headerbuttons.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\include\BSE_seqaudio.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\include\BSE_sequence.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\include\BSE_time.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\include\BSE_trans_types.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\include\BSE_types.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\include\BSE_view.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\include\butspace.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\include\editmesh.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\include\multires.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\parametrizer.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\parametrizer_intern.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\include\transform.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\winlay.h
-# End Source File
-# End Group
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="BL_src" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=BL_SRC - WIN32 DEBUG
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "BL_src.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "BL_src.mak" CFG="BL_SRC - WIN32 DEBUG"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "BL_src - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "BL_src - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "BL_src - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\..\obj\windows\blender\src"
+# PROP Intermediate_Dir "..\..\..\obj\windows\blender\src"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+MTL=midl.exe
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\..\..\lib\windows\sdl\include\\" /I "..\..\..\source\blender\img" /I "..\..\..\source\blender\renderui" /I "..\..\..\..\lib\windows\soundsystem\include\\" /I "..\..\..\..\lib\windows\python\include\python2.0\\" /I "..\..\..\..\lib\windows\bmfont\include" /I "..\..\..\source\blender\ftfont" /I "..\..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\source\blender\renderconverter" /I "..\..\..\source\blender\verify" /I "..\..\..\source\blender\readstreamglue" /I "..\..\..\source\gameengine\soundsystem\snd_openal" /I "..\..\..\source\blender\imbuf" /I "..\..\..\source\blender\blenloader" /I "..\..\..\source\blender\quicktime" /I "..\..\..\source\kernel\gen_system" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\misc" /I "..\..\..\source\blender\python" /I "..\..\..\source\blender\radiosity\extern\include" /I "..\..\..\source\blender\render\extern\include" /I "..\..\..\source\blender\include" /I "..\..\..\source\blender" /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\gameengine\network" /I "..\..\..\..\lib\windows\decimation\include" /I "..\..\..\source\blender\blenpluginapi\\" /I "..\..\..\..\lib\windows\blenkey\include" /I "..\..\..\..\lib\windows\ghost\include" /I "..\..\..\..\lib\windows\bsp\include" /I "..\..\..\..\lib\windows\opennl\include" /I "..\..\..\intern\elbeem\extern" /I "..\..\..\..\lib\windows\memutil\include" /I "..\..\..\..\lib\windows\pthreads\include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "_CONSOLE" /D "xGAMEBLENDER" /D "WITH_QUICKTIME" /D "INTERNATIONAL" /FR /J /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "BL_src - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\..\obj\windows\blender\src\debug"
+# PROP Intermediate_Dir "..\..\..\obj\windows\blender\src\debug"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+MTL=midl.exe
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\lib\windows\sdl\include\\" /I "..\..\..\source\blender\img" /I "..\..\..\source\blender\renderui" /I "..\..\..\..\lib\windows\soundsystem\include\\" /I "..\..\..\..\lib\windows\python\include\python2.0\\" /I "..\..\..\..\lib\windows\bmfont\include" /I "..\..\..\source\blender\ftfont" /I "..\..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\source\blender\renderconverter" /I "..\..\..\source\blender\verify" /I "..\..\..\source\blender\readstreamglue" /I "..\..\..\source\gameengine\soundsystem\snd_openal" /I "..\..\..\source\blender\imbuf" /I "..\..\..\source\blender\blenloader" /I "..\..\..\source\blender\quicktime" /I "..\..\..\source\kernel\gen_system" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\misc" /I "..\..\..\source\blender\python" /I "..\..\..\source\blender\radiosity\extern\include" /I "..\..\..\source\blender\render\extern\include" /I "..\..\..\source\blender\include" /I "..\..\..\source\blender" /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\gameengine\network" /I "..\..\..\..\lib\windows\decimation\include" /I "..\..\..\source\blender\blenpluginapi\\" /I "..\..\..\..\lib\windows\blenkey\include" /I "..\..\..\..\lib\windows\ghost\include" /I "..\..\..\..\lib\windows\bsp\include" /I "..\..\..\..\lib\windows\opennl\include" /I "..\..\..\intern\elbeem\extern" /I "..\..\..\..\lib\windows\memutil\include" /I "..\..\..\..\lib\windows\pthreads\include" /D "WIN32" /D "_MBCS" /D "_LIB" /D "_CONSOLE" /D "xGAMEBLENDER" /D "WITH_QUICKTIME" /D "INTERNATIONAL" /U "_DEBUG" /J /FD /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ENDIF 
+
+# Begin Target
+
+# Name "BL_src - Win32 Release"
+# Name "BL_src - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\B.blend.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\Bfont.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\bfont.ttf.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\blenderbuttons.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\booleanops.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\booleanops_mesh.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\butspace.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\buttons_editing.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\buttons_logic.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\buttons_object.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\buttons_scene.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\buttons_script.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\buttons_shading.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\cmap.tga.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\cmovie.tga.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\cursors.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\makesdna\intern\dna.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\drawaction.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\drawarmature.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\drawdeps.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\drawimage.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\drawimasel.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\drawipo.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\drawmesh.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\drawnla.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\drawnode.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\drawobject.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\drawoops.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\drawscene.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\drawscript.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\drawseq.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\drawsound.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\drawtext.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\drawtime.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\drawview.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\edit.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\editaction.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\editarmature.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\editconstraint.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\editcurve.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\editdeform.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\editface.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\editfont.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\editgroup.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\editimasel.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\editipo.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\editipo_lib.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\editipo_mods.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\editkey.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\editlattice.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\editmball.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\editmesh.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\editmesh_add.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\editmesh_lib.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\editmesh_loop.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\editmesh_mods.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\editmesh_tools.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\editmode_undo.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\editnla.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\editnode.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\editobject.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\editoops.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\editscreen.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\editseq.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\editsima.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\editsound.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\edittime.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\editview.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\eventdebug.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\filesel.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\fluidsim.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\ghostwinlay.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\glutil.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\hddaudio.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\header_action.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\header_buttonswin.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\header_filesel.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\header_image.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\header_imasel.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\header_info.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\header_ipo.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\header_nla.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\header_node.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\header_oops.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\header_script.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\header_seq.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\header_sound.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\header_text.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\header_time.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\header_view3d.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\headerbuttons.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\imagepaint.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\imasel.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\interface.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\interface_draw.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\interface_icons.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\interface_panel.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\keyval.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\language.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\lorem.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\mainqueue.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\meshtools.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\multires.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\mywindow.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\oops.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\outliner.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\parametrizer.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\playanim.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\blenpluginapi\intern\pluginapi.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\poseobject.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\preview.blend.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\previewrender.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\renderwin.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\resources.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\retopo.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\scrarea.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\screendump.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\sculptmode.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\seqaudio.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\seqeffects.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\seqscopes.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\sequence.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\space.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\spacetypes.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\splash.jpg.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\swapbuffers.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\toets.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\toolbox.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\transform.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\transform_constraints.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\transform_conversions.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\transform_generics.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\transform_manipulator.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\transform_numinput.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\transform_snap.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\unwrapper.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\usiblender.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\view.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\vpaint.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\writeavicodec.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\writeimage.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\writemovie.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\include\BDR_drawaction.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\include\BDR_drawmesh.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\include\BDR_drawobject.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\include\BDR_editcurve.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\include\BDR_editface.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\include\BDR_editmball.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\include\BDR_editobject.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\include\BDR_sculptmode.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\include\BDR_unwrapper.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\include\BDR_vpaint.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\include\BIF_butspace.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\include\BIF_cursors.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\include\BIF_drawimage.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\include\BIF_drawoops.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\include\BIF_drawscene.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\include\BIF_drawscript.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\include\BIF_drawseq.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\include\BIF_drawtext.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\include\BIF_editaction.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\include\BIF_editarmature.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\include\BIF_editconstraint.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\include\BIF_editdeform.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\include\BIF_editfont.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\include\BIF_editgroup.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\include\BIF_editkey.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\include\BIF_editlattice.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\include\BIF_editmesh.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\include\BIF_editmode_undo.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\include\BIF_editnla.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\include\BIF_editoops.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\include\BIF_editsca.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\include\BIF_editseq.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\include\BIF_editsima.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\include\BIF_editsound.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\include\BIF_editview.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\include\BIF_fsmenu.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\include\BIF_gl.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\include\BIF_glutil.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\include\BIF_graphics.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\include\BIF_imasel.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\include\BIF_interface.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\include\BIF_keyval.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\include\BIF_language.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\include\BIF_mainqueue.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\include\BIF_meshtools.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\include\BIF_mywindow.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\include\BIF_oops.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\include\BIF_outliner.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\include\BIF_poseobject.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\include\BIF_previewrender.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\include\BIF_renderwin.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\include\BIF_resources.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\include\BIF_retopo.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\include\BIF_scrarea.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\include\BIF_screen.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\include\BIF_space.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\include\BIF_spacetypes.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\include\BIF_tbcallback.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\include\BIF_toets.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\include\BIF_toolbox.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\include\BIF_transform.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\include\BIF_usiblender.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\include\BIF_writeavicodec.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\include\BIF_writeimage.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\include\BIF_writemovie.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\include\blendef.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\include\BPI_script.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\include\BSE_buttons.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\include\BSE_drawimasel.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\include\BSE_drawipo.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\include\BSE_drawnla.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\include\BSE_drawoops.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\include\BSE_drawview.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\include\BSE_edit.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\include\BSE_editaction.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\include\BSE_editaction_types.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\include\BSE_editipo.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\include\BSE_editipo_types.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\include\BSE_editnla_types.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\include\BSE_filesel.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\include\BSE_headerbuttons.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\include\BSE_seqaudio.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\include\BSE_sequence.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\include\BSE_time.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\include\BSE_trans_types.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\include\BSE_types.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\include\BSE_view.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\include\butspace.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\include\editmesh.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\include\multires.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\parametrizer.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\parametrizer_intern.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\include\transform.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\winlay.h
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/projectfiles/blender/src/BL_src_cre.dsp b/projectfiles/blender/src/BL_src_cre.dsp
index 1705b45a96fb92ad470a5e2502820471513b3042..448f0962dcf1857a35a787f8939d54563adc52cb 100644
--- a/projectfiles/blender/src/BL_src_cre.dsp
+++ b/projectfiles/blender/src/BL_src_cre.dsp
@@ -1,102 +1,102 @@
-# Microsoft Developer Studio Project File - Name="BL_src_cre" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=BL_src_cre - Win32 Release
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "BL_src_cre.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "BL_src_cre.mak" CFG="BL_src_cre - Win32 Release"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "BL_src_cre - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "BL_src_cre - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "BL_src_cre - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\obj\windows\blender\src_cre"
-# PROP Intermediate_Dir "..\..\..\obj\windows\blender\src_cre"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\source\blender\renderui" /I "..\..\..\source\gameengine\soundsystem\\" /I "..\..\..\..\lib\windows\python\include\python2.2\\" /I "..\..\..\source\blender\renderconverter" /I "..\..\..\source\blender\verify" /I "..\..\..\source\blender\readstreamglue" /I "..\..\..\source\gameengine\soundsystem\snd_openal" /I "..\..\..\source\blender\imbuf" /I "..\..\..\source\blender\blenloader" /I "..\..\..\source\kernel\gen_system" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\misc" /I "..\..\..\source\blender\python" /I "..\..\..\source\blender\radiosity\extern\include" /I "..\..\..\source\blender\render\extern\include" /I "..\..\..\source\blender\include" /I "..\..\..\source\blender" /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\gameengine\network" /I "..\..\..\..\lib\windows\decimation\include" /I "..\..\..\source\blender\blenpluginapi\\" /I "..\..\..\..\lib\windows\blenkey\include" /I "..\..\..\..\lib\windows\pthreads\include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "_CONSOLE" /D "NAN_GAME" /D "GAME" /J /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\..\obj\windows\blender\src\BL_src_cre.lib"
-
-!ELSEIF  "$(CFG)" == "BL_src_cre - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\obj\windows\blender\src_cre\debug"
-# PROP Intermediate_Dir "..\..\..\obj\windows\blender\src_cre\debug"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\source\blender\renderui" /I "..\..\..\source\gameengine\soundsystem\\" /I "..\..\..\..\lib\windows\python\include\python2.2\\" /I "..\..\..\source\blender\renderconverter" /I "..\..\..\source\blender\verify" /I "..\..\..\source\blender\readstreamglue" /I "..\..\..\source\gameengine\soundsystem\snd_openal" /I "..\..\..\source\blender\imbuf" /I "..\..\..\source\blender\blenloader" /I "..\..\..\source\kernel\gen_system" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\misc" /I "..\..\..\source\blender\python" /I "..\..\..\source\blender\radiosity\extern\include" /I "..\..\..\source\blender\render\extern\include" /I "..\..\..\source\blender\include" /I "..\..\..\source\blender" /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\gameengine\network" /I "..\..\..\..\lib\windows\decimation\include" /I "..\..\..\source\blender\blenpluginapi\\" /I "..\..\..\..\lib\windows\blenkey\include" /I "..\..\..\..\lib\windows\pthreads\include" /D "WIN32" /D "_MBCS" /D "_LIB" /D "_CONSOLE" /D "NAN_GAME" /D "GAME" /U "_DEBUG" /J /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\..\obj\windows\blender\src\debug\BL_src_cre.lib"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "BL_src_cre - Win32 Release"
-# Name "BL_src_cre - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\cre\license.jpeg.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\cre\license_key.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# End Group
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="BL_src_cre" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=BL_src_cre - Win32 Release
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "BL_src_cre.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "BL_src_cre.mak" CFG="BL_src_cre - Win32 Release"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "BL_src_cre - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "BL_src_cre - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "BL_src_cre - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\..\obj\windows\blender\src_cre"
+# PROP Intermediate_Dir "..\..\..\obj\windows\blender\src_cre"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\source\blender\renderui" /I "..\..\..\source\gameengine\soundsystem\\" /I "..\..\..\..\lib\windows\python\include\python2.2\\" /I "..\..\..\source\blender\renderconverter" /I "..\..\..\source\blender\verify" /I "..\..\..\source\blender\readstreamglue" /I "..\..\..\source\gameengine\soundsystem\snd_openal" /I "..\..\..\source\blender\imbuf" /I "..\..\..\source\blender\blenloader" /I "..\..\..\source\kernel\gen_system" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\misc" /I "..\..\..\source\blender\python" /I "..\..\..\source\blender\radiosity\extern\include" /I "..\..\..\source\blender\render\extern\include" /I "..\..\..\source\blender\include" /I "..\..\..\source\blender" /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\gameengine\network" /I "..\..\..\..\lib\windows\decimation\include" /I "..\..\..\source\blender\blenpluginapi\\" /I "..\..\..\..\lib\windows\blenkey\include" /I "..\..\..\..\lib\windows\pthreads\include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "_CONSOLE" /D "NAN_GAME" /D "GAME" /J /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\..\..\obj\windows\blender\src\BL_src_cre.lib"
+
+!ELSEIF  "$(CFG)" == "BL_src_cre - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\..\obj\windows\blender\src_cre\debug"
+# PROP Intermediate_Dir "..\..\..\obj\windows\blender\src_cre\debug"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\source\blender\renderui" /I "..\..\..\source\gameengine\soundsystem\\" /I "..\..\..\..\lib\windows\python\include\python2.2\\" /I "..\..\..\source\blender\renderconverter" /I "..\..\..\source\blender\verify" /I "..\..\..\source\blender\readstreamglue" /I "..\..\..\source\gameengine\soundsystem\snd_openal" /I "..\..\..\source\blender\imbuf" /I "..\..\..\source\blender\blenloader" /I "..\..\..\source\kernel\gen_system" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\misc" /I "..\..\..\source\blender\python" /I "..\..\..\source\blender\radiosity\extern\include" /I "..\..\..\source\blender\render\extern\include" /I "..\..\..\source\blender\include" /I "..\..\..\source\blender" /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\gameengine\network" /I "..\..\..\..\lib\windows\decimation\include" /I "..\..\..\source\blender\blenpluginapi\\" /I "..\..\..\..\lib\windows\blenkey\include" /I "..\..\..\..\lib\windows\pthreads\include" /D "WIN32" /D "_MBCS" /D "_LIB" /D "_CONSOLE" /D "NAN_GAME" /D "GAME" /U "_DEBUG" /J /FD /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\..\..\obj\windows\blender\src\debug\BL_src_cre.lib"
+
+!ENDIF 
+
+# Begin Target
+
+# Name "BL_src_cre - Win32 Release"
+# Name "BL_src_cre - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\cre\license.jpeg.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\blender\src\cre\license_key.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# End Group
+# End Target
+# End Project
diff --git a/projectfiles/datatoc/datatoc.dsp b/projectfiles/datatoc/datatoc.dsp
index 4e55182bb2cf98a01064d0206650e2df422856c5..f5dd5348fdaf1a216aea1f8ba665629a838ac889 100644
--- a/projectfiles/datatoc/datatoc.dsp
+++ b/projectfiles/datatoc/datatoc.dsp
@@ -1,100 +1,100 @@
-# Microsoft Developer Studio Project File - Name="datatoc" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=datatoc - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "datatoc.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "datatoc.mak" CFG="datatoc - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "datatoc - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "datatoc - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "datatoc - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-
-!ELSEIF  "$(CFG)" == "datatoc - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "datatoc - Win32 Release"
-# Name "datatoc - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\release\datafiles\datatoc.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="datatoc" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=datatoc - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "datatoc.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "datatoc.mak" CFG="datatoc - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "datatoc - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "datatoc - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "datatoc - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+
+!ELSEIF  "$(CFG)" == "datatoc - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+
+!ENDIF 
+
+# Begin Target
+
+# Name "datatoc - Win32 Release"
+# Name "datatoc - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\..\release\datafiles\datatoc.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project
diff --git a/projectfiles/gameengine/blenderhook/KX_blenderhook.dsp b/projectfiles/gameengine/blenderhook/KX_blenderhook.dsp
index c3657ed30c5bf0de293a3c3645b28b1e48710a79..f43db4bf02badc0cb9927cdf0f510705b275e5a8 100644
--- a/projectfiles/gameengine/blenderhook/KX_blenderhook.dsp
+++ b/projectfiles/gameengine/blenderhook/KX_blenderhook.dsp
@@ -1,161 +1,161 @@
-# Microsoft Developer Studio Project File - Name="KX_blenderhook" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=KX_blenderhook - Win32 Release
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "KX_blenderhook.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "KX_blenderhook.mak" CFG="KX_blenderhook - Win32 Release"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "KX_blenderhook - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "KX_blenderhook - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "KX_blenderhook - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\obj\windows\gameengine\blenderhook"
-# PROP Intermediate_Dir "..\..\..\obj\windows\gameengine\blenderhook"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "..\..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\extern\solid" /I "..\..\..\source\gameengine\physics\sumo" /I "..\..\..\source\gameengine\physics\common" /I "..\..\..\source\gameengine\rasterizer\ras_openglrasterizer" /I "..\..\..\..\lib\windows\python\include\python2.4" /I "..\..\..\..\lib\windows\string\include" /I "..\..\..\..\lib\windows\bmfont\include" /I "..\..\..\source\gameengine\Converter\\" /I "..\..\..\source\blender\imbuf" /I "..\..\..\..\lib\windows\moto\include" /I "..\..\..\source\gameengine\ketsji" /I "..\..\..\source\gameengine\physics\sumo\fuzzics\include" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender" /I "..\..\..\source\blender\include" /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\gameengine\rasterizer" /I "..\..\..\source\gameengine\gamelogic" /I "..\..\..\source\kernel\gen_system" /I "..\..\..\source\gameengine\expressions" /I "..\..\..\source\gameengine\network" /I "..\..\..\source\gameengine\scenegraph" /I "..\..\..\source\sumo\include" /I "..\..\..\source\sumo\fuzzics\include" /I "..\..\..\source\gameengine\network\loopbacknetwork" /I "..\..\..\..\lib\windows\soundsystem\include" /I "..\..\..\source\blender\misc" /I "..\..\..\source\blender\blenloader" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "KX_blenderhook - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\obj\windows\gameengine\blenderhook\debug"
-# PROP Intermediate_Dir "..\..\..\obj\windows\gameengine\blenderhook\debug"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD CPP /nologo /MTd /W3 /Gm /GR /GX /Zi /Od /I "..\..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\extern\solid" /I "..\..\..\source\gameengine\physics\sumo" /I "..\..\..\source\gameengine\physics\common" /I "..\..\..\source\gameengine\rasterizer\ras_openglrasterizer" /I "..\..\..\..\lib\windows\python\include\python2.4" /I "..\..\..\..\lib\windows\string\include" /I "..\..\..\..\lib\windows\bmfont\include" /I "..\..\..\source\gameengine\Converter\\" /I "..\..\..\source\blender\imbuf" /I "..\..\..\..\lib\windows\moto\include" /I "..\..\..\source\gameengine\ketsji" /I "..\..\..\source\gameengine\physics\sumo\fuzzics\include" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender" /I "..\..\..\source\blender\include" /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\gameengine\rasterizer" /I "..\..\..\source\gameengine\gamelogic" /I "..\..\..\source\kernel\gen_system" /I "..\..\..\source\gameengine\expressions" /I "..\..\..\source\gameengine\network" /I "..\..\..\source\gameengine\scenegraph" /I "..\..\..\source\sumo\include" /I "..\..\..\source\sumo\fuzzics\include" /I "..\..\..\source\gameengine\network\loopbacknetwork" /I "..\..\..\..\lib\windows\soundsystem\include" /I "..\..\..\source\blender\misc" /I "..\..\..\source\blender\blenloader" /D "WIN32" /D "_MBCS" /D "_LIB" /U "_DEBUG" /YX /J /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ENDIF 
-
-# Begin Target
-
-# Name "KX_blenderhook - Win32 Release"
-# Name "KX_blenderhook - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\BlenderRoutines\BL_KetsjiEmbedStart.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\BlenderRoutines\KX_BlenderCanvas.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\BlenderRoutines\KX_BlenderGL.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\BlenderRoutines\KX_BlenderInputDevice.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\BlenderRoutines\KX_BlenderKeyboardDevice.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\BlenderRoutines\KX_BlenderMouseDevice.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\BlenderRoutines\KX_BlenderPolyMaterial.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\BlenderRoutines\KX_BlenderRenderTools.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\BlenderRoutines\KX_BlenderSystem.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\BlenderRoutines\KX_BlenderCanvas.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\BlenderRoutines\KX_BlenderGL.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\BlenderRoutines\KX_BlenderInputDevice.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\BlenderRoutines\KX_BlenderKeyboardDevice.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\BlenderRoutines\KX_BlenderMouseDevice.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\BlenderRoutines\KX_BlenderPolyMaterial.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\BlenderRoutines\KX_BlenderRenderTools.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\BlenderRoutines\KX_BlenderSystem.h
-# End Source File
-# End Group
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="KX_blenderhook" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=KX_blenderhook - Win32 Release
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "KX_blenderhook.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "KX_blenderhook.mak" CFG="KX_blenderhook - Win32 Release"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "KX_blenderhook - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "KX_blenderhook - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "KX_blenderhook - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\..\obj\windows\gameengine\blenderhook"
+# PROP Intermediate_Dir "..\..\..\obj\windows\gameengine\blenderhook"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "..\..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\extern\solid" /I "..\..\..\source\gameengine\physics\sumo" /I "..\..\..\source\gameengine\physics\common" /I "..\..\..\source\gameengine\rasterizer\ras_openglrasterizer" /I "..\..\..\..\lib\windows\python\include\python2.4" /I "..\..\..\..\lib\windows\string\include" /I "..\..\..\..\lib\windows\bmfont\include" /I "..\..\..\source\gameengine\Converter\\" /I "..\..\..\source\blender\imbuf" /I "..\..\..\..\lib\windows\moto\include" /I "..\..\..\source\gameengine\ketsji" /I "..\..\..\source\gameengine\physics\sumo\fuzzics\include" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender" /I "..\..\..\source\blender\include" /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\gameengine\rasterizer" /I "..\..\..\source\gameengine\gamelogic" /I "..\..\..\source\kernel\gen_system" /I "..\..\..\source\gameengine\expressions" /I "..\..\..\source\gameengine\network" /I "..\..\..\source\gameengine\scenegraph" /I "..\..\..\source\sumo\include" /I "..\..\..\source\sumo\fuzzics\include" /I "..\..\..\source\gameengine\network\loopbacknetwork" /I "..\..\..\..\lib\windows\soundsystem\include" /I "..\..\..\source\blender\misc" /I "..\..\..\source\blender\blenloader" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "KX_blenderhook - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\..\obj\windows\gameengine\blenderhook\debug"
+# PROP Intermediate_Dir "..\..\..\obj\windows\gameengine\blenderhook\debug"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD CPP /nologo /MTd /W3 /Gm /GR /GX /Zi /Od /I "..\..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\extern\solid" /I "..\..\..\source\gameengine\physics\sumo" /I "..\..\..\source\gameengine\physics\common" /I "..\..\..\source\gameengine\rasterizer\ras_openglrasterizer" /I "..\..\..\..\lib\windows\python\include\python2.4" /I "..\..\..\..\lib\windows\string\include" /I "..\..\..\..\lib\windows\bmfont\include" /I "..\..\..\source\gameengine\Converter\\" /I "..\..\..\source\blender\imbuf" /I "..\..\..\..\lib\windows\moto\include" /I "..\..\..\source\gameengine\ketsji" /I "..\..\..\source\gameengine\physics\sumo\fuzzics\include" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender" /I "..\..\..\source\blender\include" /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\gameengine\rasterizer" /I "..\..\..\source\gameengine\gamelogic" /I "..\..\..\source\kernel\gen_system" /I "..\..\..\source\gameengine\expressions" /I "..\..\..\source\gameengine\network" /I "..\..\..\source\gameengine\scenegraph" /I "..\..\..\source\sumo\include" /I "..\..\..\source\sumo\fuzzics\include" /I "..\..\..\source\gameengine\network\loopbacknetwork" /I "..\..\..\..\lib\windows\soundsystem\include" /I "..\..\..\source\blender\misc" /I "..\..\..\source\blender\blenloader" /D "WIN32" /D "_MBCS" /D "_LIB" /U "_DEBUG" /YX /J /FD /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ENDIF 
+
+# Begin Target
+
+# Name "KX_blenderhook - Win32 Release"
+# Name "KX_blenderhook - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\BlenderRoutines\BL_KetsjiEmbedStart.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\BlenderRoutines\KX_BlenderCanvas.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\BlenderRoutines\KX_BlenderGL.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\BlenderRoutines\KX_BlenderInputDevice.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\BlenderRoutines\KX_BlenderKeyboardDevice.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\BlenderRoutines\KX_BlenderMouseDevice.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\BlenderRoutines\KX_BlenderPolyMaterial.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\BlenderRoutines\KX_BlenderRenderTools.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\BlenderRoutines\KX_BlenderSystem.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\BlenderRoutines\KX_BlenderCanvas.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\BlenderRoutines\KX_BlenderGL.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\BlenderRoutines\KX_BlenderInputDevice.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\BlenderRoutines\KX_BlenderKeyboardDevice.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\BlenderRoutines\KX_BlenderMouseDevice.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\BlenderRoutines\KX_BlenderPolyMaterial.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\BlenderRoutines\KX_BlenderRenderTools.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\BlenderRoutines\KX_BlenderSystem.h
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/projectfiles/gameengine/converter/KX_converter.dsp b/projectfiles/gameengine/converter/KX_converter.dsp
index 96826d3004b5b3db022610d275b31a8db2ae1aec..5eb80f58305f32f5574cdf85c038405acf99edde 100644
--- a/projectfiles/gameengine/converter/KX_converter.dsp
+++ b/projectfiles/gameengine/converter/KX_converter.dsp
@@ -1,278 +1,278 @@
-# Microsoft Developer Studio Project File - Name="KX_converter" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=KX_converter - Win32 Release
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "KX_converter.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "KX_converter.mak" CFG="KX_converter - Win32 Release"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "KX_converter - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "KX_converter - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "KX_converter - Win32 MT DLL Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "KX_converter - Win32 MT DLL Release" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "KX_converter - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\obj\windows\gameengine\converter"
-# PROP Intermediate_Dir "..\..\..\obj\windows\gameengine\converter"
-# PROP Target_Dir ""
-MTL=midl.exe
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "..\..\..\..\lib\windows\python\include\python2.4" /I "..\..\..\source\gameengine\physics\common" /I "..\..\..\source\gameengine\physics\BlOde" /I "..\..\..\source\gameengine\physics\Dummy" /I "..\..\..\extern\solid" /I "..\..\..\..\lib\windows\string\include" /I "..\..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\source\blender\imbuf" /I "..\..\..\source\kernel\gen_system" /I "..\..\..\source\gameengine\expressions" /I "..\..\..\source\gameengine\BlenderRoutines" /I "..\..\..\source\sumo\include" /I "..\..\..\..\lib\windows\moto\include" /I "..\..\..\source\\gameengine\physics\sumo\Fuzzics\include" /I "..\..\..\source\gameengine\Ketsji" /I "..\..\..\source\gameengine\SceneGraph" /I "..\..\..\source\gameengine\rasterizer" /I "..\..\..\source\gameengine\rasterizer\ras_openglrasterizer" /I "..\..\..\source\gameengine\gamelogic" /I "..\..\..\..\lib\windows\soundsystem\include" /I "..\..\..\source\gameengine\soundsystem\snd_openal" /I "..\..\..\source\gameengine\soundsystem\snd_blenderwavecache" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\include" /I "..\..\..\source\blender" /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\gameengine\network" /I "..\..\..\source\gameengine\ketsji\kxnetwork" /I "..\..\..\source\gameengine\physics" /I "..\..\..\source\gameengine\physics\ode" /I "..\..\..\source\gameengine\physics\dummy" /I "..\..\..\source\gameengine\physics\sumo" /I "..\..\..\source\gameengine\physics\bullet" /I "..\..\..\extern\bullet\linearmath" /I "..\..\..\extern\bullet\Bulletdynamics" /I "..\..\..\extern\bullet\Bullet" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "USE_SUMO_SOLID" /YX /J /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "KX_converter - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\obj\windows\gameengine\converter\debug"
-# PROP Intermediate_Dir "..\..\..\obj\windows\gameengine\converter\debug"
-# PROP Target_Dir ""
-MTL=midl.exe
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GR /GX /Zi /Od /I "..\..\..\..\lib\windows\python\include\python2.4" /I "..\..\..\source\gameengine\physics\common" /I "..\..\..\source\gameengine\physics\BlOde" /I "..\..\..\source\gameengine\physics\Dummy" /I "..\..\..\extern\solid" /I "..\..\..\..\lib\windows\string\include" /I "..\..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\source\blender\imbuf" /I "..\..\..\source\kernel\gen_system" /I "..\..\..\source\gameengine\expressions" /I "..\..\..\source\gameengine\BlenderRoutines" /I "..\..\..\source\sumo\include" /I "..\..\..\..\lib\windows\moto\include" /I "..\..\..\source\\gameengine\physics\sumo\Fuzzics\include" /I "..\..\..\source\gameengine\Ketsji" /I "..\..\..\source\gameengine\SceneGraph" /I "..\..\..\source\gameengine\rasterizer" /I "..\..\..\source\gameengine\rasterizer\ras_openglrasterizer" /I "..\..\..\source\gameengine\gamelogic" /I "..\..\..\..\lib\windows\soundsystem\include" /I "..\..\..\source\gameengine\soundsystem\snd_openal" /I "..\..\..\source\gameengine\soundsystem\snd_blenderwavecache" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\include" /I "..\..\..\source\blender" /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\gameengine\network" /I "..\..\..\source\gameengine\ketsji\kxnetwork" /I "..\..\..\source\gameengine\physics" /I "..\..\..\source\gameengine\physics\ode" /I "..\..\..\source\gameengine\physics\dummy" /I "..\..\..\source\gameengine\physics\sumo" /I "..\..\..\source\gameengine\physics\bullet" /I "..\..\..\extern\bullet\linearmath" /I "..\..\..\extern\bullet\Bulletdynamics" /I "..\..\..\extern\bullet\Bullet" /D "WIN32" /D "_MBCS" /D "_LIB" /D "USE_SUMO_SOLID" /U "_DEBUG" /YX /J /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "KX_converter - Win32 MT DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "KX_converter___Win32_MT_DLL_Debug"
-# PROP BASE Intermediate_Dir "KX_converter___Win32_MT_DLL_Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\obj\windows\gameengine\converter\mtdll_debug"
-# PROP Intermediate_Dir "..\..\..\obj\windows\gameengine\converter\mtdll_debug"
-# PROP Target_Dir ""
-MTL=midl.exe
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /Gm /GX /ZI /Od /I "..\..\..\source\blender\imbuf" /I "..\..\..\source\kernel\gen_system" /I "..\..\..\source\gameengine\expressions" /I "..\..\..\source\gameengine\BlenderRoutines" /I "..\..\..\source\sumo\include" /I "..\..\..\..\lib\windows\moto\include" /I "..\..\..\source\sumo\Fuzzics\include" /I "..\..\..\source\gameengine\Ketsji" /I "..\..\..\source\gameengine\SceneGraph" /I "..\..\..\source\gameengine\rasterizer" /I "..\..\..\source\gameengine\rasterizer\ras_openglrasterizer" /I "..\..\..\source\gameengine\gamelogic" /I "..\..\..\source\gameengine\soundsystem" /I "..\..\..\source\gameengine\soundsystem\snd_openal" /I "..\..\..\source\gameengine\soundsystem\snd_blenderwavecache" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\include" /I "..\..\..\source\blender" /I "..\..\..\source\blender\makesdna" /I "..\..\..\..\lib\windows\python\include\python1.5" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /GZ /c
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "..\..\..\..\lib\windows\python\include\python2.0" /I "..\..\..\source\gameengine\physics" /I "..\..\..\source\gameengine\physics\ode" /I "..\..\..\source\gameengine\physics\dummy" /I "..\..\..\source\gameengine\physics\sumo\include" /I "..\..\..\..\lib\windows\python\include\python2.2" /I "..\..\..\..\lib\windows\string\include" /I "..\..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\source\blender\imbuf" /I "..\..\..\source\kernel\gen_system" /I "..\..\..\source\gameengine\expressions" /I "..\..\..\source\gameengine\BlenderRoutines" /I "..\..\..\source\sumo\include" /I "..\..\..\..\lib\windows\moto\include" /I "..\..\..\source\sumo\Fuzzics\include" /I "..\..\..\source\gameengine\Ketsji" /I "..\..\..\source\gameengine\SceneGraph" /I "..\..\..\source\gameengine\rasterizer" /I "..\..\..\source\gameengine\rasterizer\ras_openglrasterizer" /I "..\..\..\source\gameengine\gamelogic" /I "..\..\..\source\gameengine\soundsystem" /I "..\..\..\source\gameengine\soundsystem\snd_openal" /I "..\..\..\source\gameengine\soundsystem\snd_blenderwavecache" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\include" /I "..\..\..\source\blender" /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\gameengine\network" /I "..\..\..\source\gameengine\ketsji\kxnetwork" /I "..\..\..\source\gameengine\physics\sumo" /I "..\..\..\source\gameengine\physics\sumo\fuzzics\include" /I "..\..\..\source\gameengine\physics\common" /I "..\..\..\source\gameengine\physics\BlOde" /D "WIN32" /D "_MBCS" /D "_LIB" /U "_DEBUG" /YX /J /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\..\..\..\obj\windows\gameengine\converter\debug\KX_converter.lib"
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "KX_converter - Win32 MT DLL Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "KX_converter___Win32_MT_DLL_Release"
-# PROP BASE Intermediate_Dir "KX_converter___Win32_MT_DLL_Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\obj\windows\gameengine\converter\mtdll"
-# PROP Intermediate_Dir "..\..\..\obj\windows\gameengine\converter\mtdll"
-# PROP Target_Dir ""
-MTL=midl.exe
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /GX /O2 /I "..\..\..\source\blender\imbuf" /I "..\..\..\source\kernel\gen_system" /I "..\..\..\source\gameengine\expressions" /I "..\..\..\source\gameengine\BlenderRoutines" /I "..\..\..\source\sumo\include" /I "..\..\..\..\lib\windows\moto\include" /I "..\..\..\source\sumo\Fuzzics\include" /I "..\..\..\source\gameengine\Ketsji" /I "..\..\..\source\gameengine\SceneGraph" /I "..\..\..\source\gameengine\rasterizer" /I "..\..\..\source\gameengine\rasterizer\ras_openglrasterizer" /I "..\..\..\source\gameengine\gamelogic" /I "..\..\..\source\gameengine\soundsystem" /I "..\..\..\source\gameengine\soundsystem\snd_openal" /I "..\..\..\source\gameengine\soundsystem\snd_blenderwavecache" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\include" /I "..\..\..\source\blender" /I "..\..\..\source\blender\makesdna" /I "..\..\..\..\lib\windows\python\include\python2.0" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
-# ADD CPP /nologo /MD /GX /O2 /I "..\..\..\..\lib\windows\python\include\python2.0" /I "..\..\..\source\gameengine\physics" /I "..\..\..\source\gameengine\physics\ode" /I "..\..\..\source\gameengine\physics\dummy" /I "..\..\..\source\gameengine\physics\sumo\include" /I "..\..\..\..\lib\windows\python\include\python2.2" /I "..\..\..\..\lib\windows\string\include" /I "..\..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\source\blender\imbuf" /I "..\..\..\source\kernel\gen_system" /I "..\..\..\source\gameengine\expressions" /I "..\..\..\source\gameengine\BlenderRoutines" /I "..\..\..\source\sumo\include" /I "..\..\..\..\lib\windows\moto\include" /I "..\..\..\source\sumo\Fuzzics\include" /I "..\..\..\source\gameengine\Ketsji" /I "..\..\..\source\gameengine\SceneGraph" /I "..\..\..\source\gameengine\rasterizer" /I "..\..\..\source\gameengine\rasterizer\ras_openglrasterizer" /I "..\..\..\source\gameengine\gamelogic" /I "..\..\..\source\gameengine\soundsystem" /I "..\..\..\source\gameengine\soundsystem\snd_openal" /I "..\..\..\source\gameengine\soundsystem\snd_blenderwavecache" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\include" /I "..\..\..\source\blender" /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\gameengine\network" /I "..\..\..\source\gameengine\ketsji\kxnetwork" /I "..\..\..\source\gameengine\physics\sumo" /I "..\..\..\source\gameengine\physics\sumo\fuzzics\include" /I "..\..\..\source\gameengine\physics\common" /I "..\..\..\source\gameengine\physics\BlOde" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\..\..\..\obj\windows\gameengine\converter\KX_converter.lib"
-# ADD LIB32 /nologo
-
-!ENDIF 
-
-# Begin Target
-
-# Name "KX_converter - Win32 Release"
-# Name "KX_converter - Win32 Debug"
-# Name "KX_converter - Win32 MT DLL Debug"
-# Name "KX_converter - Win32 MT DLL Release"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Converter\BL_ActionActuator.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Converter\BL_ArmatureObject.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Converter\BL_BlenderDataConversion.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Converter\BL_DeformableGameObject.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Converter\BL_MeshDeformer.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Converter\BL_SkinDeformer.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Converter\BL_SkinMeshObject.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Converter\BlenderWorldInfo.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Physics\Bullet\CcdPhysicsController.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Physics\Bullet\CcdPhysicsEnvironment.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Converter\KX_BlenderScalarInterpolator.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Converter\KX_BlenderSceneConverter.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Converter\KX_ConvertActuators.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Converter\KX_ConvertControllers.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Converter\KX_ConvertProperties.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Converter\KX_ConvertSensors.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Converter\KX_IpoConvert.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Converter\BL_ActionActuator.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Converter\BL_ArmatureObject.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Converter\BL_BlenderDataConversion.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Converter\BL_DeformableGameObject.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Converter\BL_MeshDeformer.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Converter\BL_SkinDeformer.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Converter\BL_SkinMeshObject.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Converter\BlenderWorldInfo.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Converter\KX_BlenderScalarInterpolator.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Converter\KX_BlenderSceneConverter.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Converter\KX_ConvertActuators.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Converter\KX_ConvertControllers.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Converter\KX_ConvertProperties.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Converter\KX_ConvertSensors.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Converter\KX_IpoConvert.h
-# End Source File
-# End Group
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="KX_converter" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=KX_converter - Win32 Release
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "KX_converter.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "KX_converter.mak" CFG="KX_converter - Win32 Release"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "KX_converter - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "KX_converter - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "KX_converter - Win32 MT DLL Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "KX_converter - Win32 MT DLL Release" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "KX_converter - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\..\obj\windows\gameengine\converter"
+# PROP Intermediate_Dir "..\..\..\obj\windows\gameengine\converter"
+# PROP Target_Dir ""
+MTL=midl.exe
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "..\..\..\..\lib\windows\python\include\python2.4" /I "..\..\..\source\gameengine\physics\common" /I "..\..\..\source\gameengine\physics\BlOde" /I "..\..\..\source\gameengine\physics\Dummy" /I "..\..\..\extern\solid" /I "..\..\..\..\lib\windows\string\include" /I "..\..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\source\blender\imbuf" /I "..\..\..\source\kernel\gen_system" /I "..\..\..\source\gameengine\expressions" /I "..\..\..\source\gameengine\BlenderRoutines" /I "..\..\..\source\sumo\include" /I "..\..\..\..\lib\windows\moto\include" /I "..\..\..\source\\gameengine\physics\sumo\Fuzzics\include" /I "..\..\..\source\gameengine\Ketsji" /I "..\..\..\source\gameengine\SceneGraph" /I "..\..\..\source\gameengine\rasterizer" /I "..\..\..\source\gameengine\rasterizer\ras_openglrasterizer" /I "..\..\..\source\gameengine\gamelogic" /I "..\..\..\..\lib\windows\soundsystem\include" /I "..\..\..\source\gameengine\soundsystem\snd_openal" /I "..\..\..\source\gameengine\soundsystem\snd_blenderwavecache" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\include" /I "..\..\..\source\blender" /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\gameengine\network" /I "..\..\..\source\gameengine\ketsji\kxnetwork" /I "..\..\..\source\gameengine\physics" /I "..\..\..\source\gameengine\physics\ode" /I "..\..\..\source\gameengine\physics\dummy" /I "..\..\..\source\gameengine\physics\sumo" /I "..\..\..\source\gameengine\physics\bullet" /I "..\..\..\extern\bullet\linearmath" /I "..\..\..\extern\bullet\Bulletdynamics" /I "..\..\..\extern\bullet\Bullet" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "USE_SUMO_SOLID" /YX /J /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "KX_converter - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\..\obj\windows\gameengine\converter\debug"
+# PROP Intermediate_Dir "..\..\..\obj\windows\gameengine\converter\debug"
+# PROP Target_Dir ""
+MTL=midl.exe
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GR /GX /Zi /Od /I "..\..\..\..\lib\windows\python\include\python2.4" /I "..\..\..\source\gameengine\physics\common" /I "..\..\..\source\gameengine\physics\BlOde" /I "..\..\..\source\gameengine\physics\Dummy" /I "..\..\..\extern\solid" /I "..\..\..\..\lib\windows\string\include" /I "..\..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\source\blender\imbuf" /I "..\..\..\source\kernel\gen_system" /I "..\..\..\source\gameengine\expressions" /I "..\..\..\source\gameengine\BlenderRoutines" /I "..\..\..\source\sumo\include" /I "..\..\..\..\lib\windows\moto\include" /I "..\..\..\source\\gameengine\physics\sumo\Fuzzics\include" /I "..\..\..\source\gameengine\Ketsji" /I "..\..\..\source\gameengine\SceneGraph" /I "..\..\..\source\gameengine\rasterizer" /I "..\..\..\source\gameengine\rasterizer\ras_openglrasterizer" /I "..\..\..\source\gameengine\gamelogic" /I "..\..\..\..\lib\windows\soundsystem\include" /I "..\..\..\source\gameengine\soundsystem\snd_openal" /I "..\..\..\source\gameengine\soundsystem\snd_blenderwavecache" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\include" /I "..\..\..\source\blender" /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\gameengine\network" /I "..\..\..\source\gameengine\ketsji\kxnetwork" /I "..\..\..\source\gameengine\physics" /I "..\..\..\source\gameengine\physics\ode" /I "..\..\..\source\gameengine\physics\dummy" /I "..\..\..\source\gameengine\physics\sumo" /I "..\..\..\source\gameengine\physics\bullet" /I "..\..\..\extern\bullet\linearmath" /I "..\..\..\extern\bullet\Bulletdynamics" /I "..\..\..\extern\bullet\Bullet" /D "WIN32" /D "_MBCS" /D "_LIB" /D "USE_SUMO_SOLID" /U "_DEBUG" /YX /J /FD /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "KX_converter - Win32 MT DLL Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "KX_converter___Win32_MT_DLL_Debug"
+# PROP BASE Intermediate_Dir "KX_converter___Win32_MT_DLL_Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\..\obj\windows\gameengine\converter\mtdll_debug"
+# PROP Intermediate_Dir "..\..\..\obj\windows\gameengine\converter\mtdll_debug"
+# PROP Target_Dir ""
+MTL=midl.exe
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /Gm /GX /ZI /Od /I "..\..\..\source\blender\imbuf" /I "..\..\..\source\kernel\gen_system" /I "..\..\..\source\gameengine\expressions" /I "..\..\..\source\gameengine\BlenderRoutines" /I "..\..\..\source\sumo\include" /I "..\..\..\..\lib\windows\moto\include" /I "..\..\..\source\sumo\Fuzzics\include" /I "..\..\..\source\gameengine\Ketsji" /I "..\..\..\source\gameengine\SceneGraph" /I "..\..\..\source\gameengine\rasterizer" /I "..\..\..\source\gameengine\rasterizer\ras_openglrasterizer" /I "..\..\..\source\gameengine\gamelogic" /I "..\..\..\source\gameengine\soundsystem" /I "..\..\..\source\gameengine\soundsystem\snd_openal" /I "..\..\..\source\gameengine\soundsystem\snd_blenderwavecache" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\include" /I "..\..\..\source\blender" /I "..\..\..\source\blender\makesdna" /I "..\..\..\..\lib\windows\python\include\python1.5" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /GZ /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "..\..\..\..\lib\windows\python\include\python2.0" /I "..\..\..\source\gameengine\physics" /I "..\..\..\source\gameengine\physics\ode" /I "..\..\..\source\gameengine\physics\dummy" /I "..\..\..\source\gameengine\physics\sumo\include" /I "..\..\..\..\lib\windows\python\include\python2.2" /I "..\..\..\..\lib\windows\string\include" /I "..\..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\source\blender\imbuf" /I "..\..\..\source\kernel\gen_system" /I "..\..\..\source\gameengine\expressions" /I "..\..\..\source\gameengine\BlenderRoutines" /I "..\..\..\source\sumo\include" /I "..\..\..\..\lib\windows\moto\include" /I "..\..\..\source\sumo\Fuzzics\include" /I "..\..\..\source\gameengine\Ketsji" /I "..\..\..\source\gameengine\SceneGraph" /I "..\..\..\source\gameengine\rasterizer" /I "..\..\..\source\gameengine\rasterizer\ras_openglrasterizer" /I "..\..\..\source\gameengine\gamelogic" /I "..\..\..\source\gameengine\soundsystem" /I "..\..\..\source\gameengine\soundsystem\snd_openal" /I "..\..\..\source\gameengine\soundsystem\snd_blenderwavecache" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\include" /I "..\..\..\source\blender" /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\gameengine\network" /I "..\..\..\source\gameengine\ketsji\kxnetwork" /I "..\..\..\source\gameengine\physics\sumo" /I "..\..\..\source\gameengine\physics\sumo\fuzzics\include" /I "..\..\..\source\gameengine\physics\common" /I "..\..\..\source\gameengine\physics\BlOde" /D "WIN32" /D "_MBCS" /D "_LIB" /U "_DEBUG" /YX /J /FD /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\..\..\..\obj\windows\gameengine\converter\debug\KX_converter.lib"
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "KX_converter - Win32 MT DLL Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "KX_converter___Win32_MT_DLL_Release"
+# PROP BASE Intermediate_Dir "KX_converter___Win32_MT_DLL_Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\..\obj\windows\gameengine\converter\mtdll"
+# PROP Intermediate_Dir "..\..\..\obj\windows\gameengine\converter\mtdll"
+# PROP Target_Dir ""
+MTL=midl.exe
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /GX /O2 /I "..\..\..\source\blender\imbuf" /I "..\..\..\source\kernel\gen_system" /I "..\..\..\source\gameengine\expressions" /I "..\..\..\source\gameengine\BlenderRoutines" /I "..\..\..\source\sumo\include" /I "..\..\..\..\lib\windows\moto\include" /I "..\..\..\source\sumo\Fuzzics\include" /I "..\..\..\source\gameengine\Ketsji" /I "..\..\..\source\gameengine\SceneGraph" /I "..\..\..\source\gameengine\rasterizer" /I "..\..\..\source\gameengine\rasterizer\ras_openglrasterizer" /I "..\..\..\source\gameengine\gamelogic" /I "..\..\..\source\gameengine\soundsystem" /I "..\..\..\source\gameengine\soundsystem\snd_openal" /I "..\..\..\source\gameengine\soundsystem\snd_blenderwavecache" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\include" /I "..\..\..\source\blender" /I "..\..\..\source\blender\makesdna" /I "..\..\..\..\lib\windows\python\include\python2.0" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
+# ADD CPP /nologo /MD /GX /O2 /I "..\..\..\..\lib\windows\python\include\python2.0" /I "..\..\..\source\gameengine\physics" /I "..\..\..\source\gameengine\physics\ode" /I "..\..\..\source\gameengine\physics\dummy" /I "..\..\..\source\gameengine\physics\sumo\include" /I "..\..\..\..\lib\windows\python\include\python2.2" /I "..\..\..\..\lib\windows\string\include" /I "..\..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\source\blender\imbuf" /I "..\..\..\source\kernel\gen_system" /I "..\..\..\source\gameengine\expressions" /I "..\..\..\source\gameengine\BlenderRoutines" /I "..\..\..\source\sumo\include" /I "..\..\..\..\lib\windows\moto\include" /I "..\..\..\source\sumo\Fuzzics\include" /I "..\..\..\source\gameengine\Ketsji" /I "..\..\..\source\gameengine\SceneGraph" /I "..\..\..\source\gameengine\rasterizer" /I "..\..\..\source\gameengine\rasterizer\ras_openglrasterizer" /I "..\..\..\source\gameengine\gamelogic" /I "..\..\..\source\gameengine\soundsystem" /I "..\..\..\source\gameengine\soundsystem\snd_openal" /I "..\..\..\source\gameengine\soundsystem\snd_blenderwavecache" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\include" /I "..\..\..\source\blender" /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\gameengine\network" /I "..\..\..\source\gameengine\ketsji\kxnetwork" /I "..\..\..\source\gameengine\physics\sumo" /I "..\..\..\source\gameengine\physics\sumo\fuzzics\include" /I "..\..\..\source\gameengine\physics\common" /I "..\..\..\source\gameengine\physics\BlOde" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\..\..\..\obj\windows\gameengine\converter\KX_converter.lib"
+# ADD LIB32 /nologo
+
+!ENDIF 
+
+# Begin Target
+
+# Name "KX_converter - Win32 Release"
+# Name "KX_converter - Win32 Debug"
+# Name "KX_converter - Win32 MT DLL Debug"
+# Name "KX_converter - Win32 MT DLL Release"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Converter\BL_ActionActuator.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Converter\BL_ArmatureObject.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Converter\BL_BlenderDataConversion.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Converter\BL_DeformableGameObject.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Converter\BL_MeshDeformer.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Converter\BL_SkinDeformer.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Converter\BL_SkinMeshObject.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Converter\BlenderWorldInfo.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Physics\Bullet\CcdPhysicsController.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Physics\Bullet\CcdPhysicsEnvironment.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Converter\KX_BlenderScalarInterpolator.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Converter\KX_BlenderSceneConverter.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Converter\KX_ConvertActuators.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Converter\KX_ConvertControllers.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Converter\KX_ConvertProperties.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Converter\KX_ConvertSensors.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Converter\KX_IpoConvert.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Converter\BL_ActionActuator.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Converter\BL_ArmatureObject.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Converter\BL_BlenderDataConversion.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Converter\BL_DeformableGameObject.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Converter\BL_MeshDeformer.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Converter\BL_SkinDeformer.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Converter\BL_SkinMeshObject.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Converter\BlenderWorldInfo.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Converter\KX_BlenderScalarInterpolator.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Converter\KX_BlenderSceneConverter.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Converter\KX_ConvertActuators.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Converter\KX_ConvertControllers.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Converter\KX_ConvertProperties.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Converter\KX_ConvertSensors.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Converter\KX_IpoConvert.h
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/projectfiles/gameengine/expression/EXP_expressions.dsp b/projectfiles/gameengine/expression/EXP_expressions.dsp
index 94ded903d416c69d2ff787c8abbc96bf91af73d1..7fa6e9da45ec916894f087059c65b65f41539888 100644
--- a/projectfiles/gameengine/expression/EXP_expressions.dsp
+++ b/projectfiles/gameengine/expression/EXP_expressions.dsp
@@ -1,302 +1,302 @@
-# Microsoft Developer Studio Project File - Name="EXP_expressions" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=EXP_expressions - Win32 Release
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "EXP_expressions.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "EXP_expressions.mak" CFG="EXP_expressions - Win32 Release"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "EXP_expressions - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "EXP_expressions - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "EXP_expressions - Win32 MT DLL Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "EXP_expressions - Win32 MT DLL Release" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "EXP_expressions - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\obj\windows\gameengine\expressions"
-# PROP Intermediate_Dir "..\..\..\obj\windows\gameengine\expressions"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "..\..\..\intern\moto\include" /I "..\..\..\..\lib\windows\python\include\python2.4" /I "..\..\..\..\lib\windows\string\include" /I "..\..\..\source\kernel\gen_system" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "EXP_PYTHON_EMBEDDING" /YX /J /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "EXP_expressions - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\obj\windows\gameengine\expressions\debug"
-# PROP Intermediate_Dir "..\..\..\obj\windows\gameengine\expressions\debug"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GR /GX /Zi /Od /I "..\..\..\intern\moto\include" /I "..\..\..\..\lib\windows\python\include\python2.4" /I "..\..\..\..\lib\windows\string\include" /I "..\..\..\source\kernel\gen_system" /D "WIN32" /D "_MBCS" /D "_LIB" /D "EXP_PYTHON_EMBEDDING" /U "_DEBUG" /YX /J /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "EXP_expressions - Win32 MT DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "EXP_expressions___Win32_MT_DLL_Debug"
-# PROP BASE Intermediate_Dir "EXP_expressions___Win32_MT_DLL_Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\obj\windows\gameengine\expressions\mtdll_debug"
-# PROP Intermediate_Dir "..\..\..\obj\windows\gameengine\expressions\mtdll_debug"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /MDd /Gm /GX /ZI /Od /I "..\..\..\source\kernel\gen_system" /I "..\..\..\..\lib\windows\python\include\python1.5" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "EXP_PYTHON_EMBEDDING" /YX /J /FD /GZ /c
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "..\..\..\..\lib\windows\python\include\python2.0" /I "..\..\..\..\..\lib\windows\python\include\python2.0" /I "..\..\..\..\lib\windows\python\include\python2.2" /I "..\..\..\..\lib\windows\string\include" /I "..\..\..\source\kernel\gen_system" /D "WIN32" /D "_MBCS" /D "_LIB" /D "EXP_PYTHON_EMBEDDING" /U "_DEBUG" /YX /J /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\..\..\..\obj\windows\gameengine\expressions\debug\EXP_expressions.lib"
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "EXP_expressions - Win32 MT DLL Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "EXP_expressions___Win32_MT_DLL_Release"
-# PROP BASE Intermediate_Dir "EXP_expressions___Win32_MT_DLL_Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\obj\windows\gameengine\expressions\mtdll"
-# PROP Intermediate_Dir "..\..\..\obj\windows\gameengine\expressions\mtdll"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /GX /O2 /I "..\..\..\source\kernel\gen_system" /I "..\..\..\..\lib\windows\python\include\python2.0" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "EXP_PYTHON_EMBEDDING" /YX /J /FD /c
-# ADD CPP /nologo /MD /GX /O2 /I "..\..\..\..\lib\windows\python\include\python2.0" /I "..\..\..\..\..\lib\windows\python\include\python2.0" /I "..\..\..\..\lib\windows\python\include\python2.2" /I "..\..\..\..\lib\windows\string\include" /I "..\..\..\source\kernel\gen_system" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "EXP_PYTHON_EMBEDDING" /YX /J /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\..\..\..\obj\windows\gameengine\expressions\EXP_expressions.lib"
-# ADD LIB32 /nologo
-
-!ENDIF 
-
-# Begin Target
-
-# Name "EXP_expressions - Win32 Release"
-# Name "EXP_expressions - Win32 Debug"
-# Name "EXP_expressions - Win32 MT DLL Debug"
-# Name "EXP_expressions - Win32 MT DLL Release"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Expressions\BoolValue.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Expressions\ConstExpr.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Expressions\EmptyValue.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Expressions\ErrorValue.cpp
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\gameengine\Expressions\EXP_C-Api.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Expressions\Expression.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Expressions\FloatValue.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Expressions\IdentifierExpr.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Expressions\IfExpr.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Expressions\InputParser.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Expressions\IntValue.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Expressions\KX_HashedPtr.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Expressions\ListValue.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Expressions\Operator1Expr.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Expressions\Operator2Expr.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Expressions\PyObjectPlus.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Expressions\StringValue.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Expressions\Value.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Expressions\VectorValue.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Expressions\BoolValue.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Expressions\ConstExpr.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Expressions\EmptyValue.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Expressions\ErrorValue.h
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\gameengine\Expressions\EXP_C-Api.h"
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Expressions\Expression.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Expressions\FloatValue.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Expressions\IdentifierExpr.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Expressions\IfExpr.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Expressions\InputParser.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Expressions\IntValue.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Expressions\KX_HashedPtr.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Expressions\ListValue.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Expressions\Operator1Expr.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Expressions\Operator2Expr.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Expressions\PyObjectPlus.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Expressions\StringValue.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Expressions\Value.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Expressions\VectorValue.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Expressions\VoidValue.h
-# End Source File
-# End Group
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="EXP_expressions" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=EXP_expressions - Win32 Release
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "EXP_expressions.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "EXP_expressions.mak" CFG="EXP_expressions - Win32 Release"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "EXP_expressions - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "EXP_expressions - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "EXP_expressions - Win32 MT DLL Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "EXP_expressions - Win32 MT DLL Release" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "EXP_expressions - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\..\obj\windows\gameengine\expressions"
+# PROP Intermediate_Dir "..\..\..\obj\windows\gameengine\expressions"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "..\..\..\intern\moto\include" /I "..\..\..\..\lib\windows\python\include\python2.4" /I "..\..\..\..\lib\windows\string\include" /I "..\..\..\source\kernel\gen_system" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "EXP_PYTHON_EMBEDDING" /YX /J /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "EXP_expressions - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\..\obj\windows\gameengine\expressions\debug"
+# PROP Intermediate_Dir "..\..\..\obj\windows\gameengine\expressions\debug"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GR /GX /Zi /Od /I "..\..\..\intern\moto\include" /I "..\..\..\..\lib\windows\python\include\python2.4" /I "..\..\..\..\lib\windows\string\include" /I "..\..\..\source\kernel\gen_system" /D "WIN32" /D "_MBCS" /D "_LIB" /D "EXP_PYTHON_EMBEDDING" /U "_DEBUG" /YX /J /FD /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "EXP_expressions - Win32 MT DLL Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "EXP_expressions___Win32_MT_DLL_Debug"
+# PROP BASE Intermediate_Dir "EXP_expressions___Win32_MT_DLL_Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\..\obj\windows\gameengine\expressions\mtdll_debug"
+# PROP Intermediate_Dir "..\..\..\obj\windows\gameengine\expressions\mtdll_debug"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /MDd /Gm /GX /ZI /Od /I "..\..\..\source\kernel\gen_system" /I "..\..\..\..\lib\windows\python\include\python1.5" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "EXP_PYTHON_EMBEDDING" /YX /J /FD /GZ /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "..\..\..\..\lib\windows\python\include\python2.0" /I "..\..\..\..\..\lib\windows\python\include\python2.0" /I "..\..\..\..\lib\windows\python\include\python2.2" /I "..\..\..\..\lib\windows\string\include" /I "..\..\..\source\kernel\gen_system" /D "WIN32" /D "_MBCS" /D "_LIB" /D "EXP_PYTHON_EMBEDDING" /U "_DEBUG" /YX /J /FD /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\..\..\..\obj\windows\gameengine\expressions\debug\EXP_expressions.lib"
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "EXP_expressions - Win32 MT DLL Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "EXP_expressions___Win32_MT_DLL_Release"
+# PROP BASE Intermediate_Dir "EXP_expressions___Win32_MT_DLL_Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\..\obj\windows\gameengine\expressions\mtdll"
+# PROP Intermediate_Dir "..\..\..\obj\windows\gameengine\expressions\mtdll"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /GX /O2 /I "..\..\..\source\kernel\gen_system" /I "..\..\..\..\lib\windows\python\include\python2.0" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "EXP_PYTHON_EMBEDDING" /YX /J /FD /c
+# ADD CPP /nologo /MD /GX /O2 /I "..\..\..\..\lib\windows\python\include\python2.0" /I "..\..\..\..\..\lib\windows\python\include\python2.0" /I "..\..\..\..\lib\windows\python\include\python2.2" /I "..\..\..\..\lib\windows\string\include" /I "..\..\..\source\kernel\gen_system" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "EXP_PYTHON_EMBEDDING" /YX /J /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\..\..\..\obj\windows\gameengine\expressions\EXP_expressions.lib"
+# ADD LIB32 /nologo
+
+!ENDIF 
+
+# Begin Target
+
+# Name "EXP_expressions - Win32 Release"
+# Name "EXP_expressions - Win32 Debug"
+# Name "EXP_expressions - Win32 MT DLL Debug"
+# Name "EXP_expressions - Win32 MT DLL Release"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Expressions\BoolValue.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Expressions\ConstExpr.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Expressions\EmptyValue.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Expressions\ErrorValue.cpp
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\gameengine\Expressions\EXP_C-Api.cpp"
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Expressions\Expression.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Expressions\FloatValue.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Expressions\IdentifierExpr.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Expressions\IfExpr.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Expressions\InputParser.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Expressions\IntValue.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Expressions\KX_HashedPtr.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Expressions\ListValue.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Expressions\Operator1Expr.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Expressions\Operator2Expr.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Expressions\PyObjectPlus.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Expressions\StringValue.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Expressions\Value.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Expressions\VectorValue.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Expressions\BoolValue.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Expressions\ConstExpr.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Expressions\EmptyValue.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Expressions\ErrorValue.h
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\gameengine\Expressions\EXP_C-Api.h"
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Expressions\Expression.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Expressions\FloatValue.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Expressions\IdentifierExpr.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Expressions\IfExpr.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Expressions\InputParser.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Expressions\IntValue.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Expressions\KX_HashedPtr.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Expressions\ListValue.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Expressions\Operator1Expr.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Expressions\Operator2Expr.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Expressions\PyObjectPlus.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Expressions\StringValue.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Expressions\Value.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Expressions\VectorValue.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Expressions\VoidValue.h
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/projectfiles/gameengine/gamelogic/SCA_gamelogic.dsp b/projectfiles/gameengine/gamelogic/SCA_gamelogic.dsp
index 45be1cf277273b16b742038a1380f8f6153f6e67..fcdbf33a80ca17ded271d62ed0f4af703a87fdba 100644
--- a/projectfiles/gameengine/gamelogic/SCA_gamelogic.dsp
+++ b/projectfiles/gameengine/gamelogic/SCA_gamelogic.dsp
@@ -1,406 +1,406 @@
-# Microsoft Developer Studio Project File - Name="SCA_GameLogic" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=SCA_GameLogic - Win32 Release
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "SCA_GameLogic.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "SCA_GameLogic.mak" CFG="SCA_GameLogic - Win32 Release"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "SCA_GameLogic - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "SCA_GameLogic - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "SCA_GameLogic - Win32 MT DLL Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "SCA_GameLogic - Win32 MT DLL Release" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "SCA_GameLogic - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\obj\windows\gameengine\gamelogic"
-# PROP Intermediate_Dir "..\..\..\obj\windows\gameengine\gamelogic"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "..\..\..\..\lib\windows\python\include\python2.4" /I "..\..\..\..\lib\windows\string\include" /I "..\..\..\..\lib\windows\sdl\include" /I "..\..\..\source\kernel\gen_system" /I "..\..\..\source\gameengine\expressions" /I "..\..\..\..\lib\windows\moto\include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "EXP_PYTHON_EMBEDDING" /YX /J /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "SCA_GameLogic - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "SCA_GameLogic___Win32_Debug"
-# PROP BASE Intermediate_Dir "SCA_GameLogic___Win32_Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\obj\windows\gameengine\gamelogic\debug"
-# PROP Intermediate_Dir "..\..\..\obj\windows\gameengine\gamelogic\debug"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GR /GX /Zi /Od /I "..\..\..\..\lib\windows\python\include\python2.4" /I "..\..\..\..\lib\windows\string\include" /I "..\..\..\..\lib\windows\sdl\include" /I "..\..\..\source\kernel\gen_system" /I "..\..\..\source\gameengine\expressions" /I "..\..\..\..\lib\windows\moto\include" /D "WIN32" /D "_MBCS" /D "_LIB" /D "EXP_PYTHON_EMBEDDING" /U "_DEBUG" /YX /J /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "SCA_GameLogic - Win32 MT DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "SCA_GameLogic___Win32_MT_DLL_Debug"
-# PROP BASE Intermediate_Dir "SCA_GameLogic___Win32_MT_DLL_Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\obj\windows\gameengine\gamelogic\mtdll_debug"
-# PROP Intermediate_Dir "..\..\..\obj\windows\gameengine\gamelogic\mtdll_debug"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /Gm /GX /ZI /Od /I "..\..\..\source\kernel\gen_system" /I "..\..\..\source\gameengine\expressions" /I "..\..\..\..\lib\windows\moto\include" /I "..\..\..\..\lib\windows\python\include\python1.5" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "EXP_PYTHON_EMBEDDING" /YX /J /FD /GZ /c
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "..\..\..\..\lib\windows\python\include\python2.4" /I "..\..\..\..\lib\windows\string\include" /I "..\..\..\..\lib\windows\sdl\include" /I "..\..\..\source\kernel\gen_system" /I "..\..\..\source\gameengine\expressions" /I "..\..\..\..\lib\windows\moto\include" /D "WIN32" /D "_MBCS" /D "_LIB" /D "EXP_PYTHON_EMBEDDING" /U "_DEBUG" /YX /J /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\..\..\..\obj\windows\gameengine\gamelogic\debug\SCA_GameLogic.lib"
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "SCA_GameLogic - Win32 MT DLL Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "SCA_GameLogic___Win32_MT_DLL_Release"
-# PROP BASE Intermediate_Dir "SCA_GameLogic___Win32_MT_DLL_Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\obj\windows\gameengine\gamelogic\mtdll"
-# PROP Intermediate_Dir "..\..\..\obj\windows\gameengine\gamelogic\mtdll"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /GX /O2 /I "..\..\..\source\kernel\gen_system" /I "..\..\..\source\gameengine\expressions" /I "..\..\..\..\lib\windows\moto\include" /I "..\..\..\..\lib\windows\python\include\python2.0" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "EXP_PYTHON_EMBEDDING" /YX /J /FD /c
-# ADD CPP /nologo /MD /GX /O2 /I "..\..\..\..\lib\windows\python\include\python2.4" /I "..\..\..\..\lib\windows\string\include" /I "..\..\..\..\lib\windows\sdl\include" /I "..\..\..\source\kernel\gen_system" /I "..\..\..\source\gameengine\expressions" /I "..\..\..\..\lib\windows\moto\include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "EXP_PYTHON_EMBEDDING" /YX /J /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\..\..\..\obj\windows\gameengine\gamelogic\SCA_GameLogic.lib"
-# ADD LIB32 /nologo
-
-!ENDIF 
-
-# Begin Target
-
-# Name "SCA_GameLogic - Win32 Release"
-# Name "SCA_GameLogic - Win32 Debug"
-# Name "SCA_GameLogic - Win32 MT DLL Debug"
-# Name "SCA_GameLogic - Win32 MT DLL Release"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Group "JoystickImp"
-
-# PROP Default_Filter "cpp"
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\GameLogic\Joystick\SCA_Joystick.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\GameLogic\Joystick\SCA_JoystickEvents.cpp
-# End Source File
-# End Group
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\GameLogic\SCA_AlwaysEventManager.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\GameLogic\SCA_AlwaysSensor.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\GameLogic\SCA_ANDController.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\GameLogic\SCA_EventManager.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\GameLogic\SCA_ExpressionController.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\GameLogic\SCA_IActuator.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\GameLogic\SCA_IController.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\GameLogic\SCA_IInputDevice.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\GameLogic\SCA_ILogicBrick.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\GameLogic\SCA_IObject.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\GameLogic\SCA_IScene.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\GameLogic\SCA_ISensor.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\GameLogic\SCA_JoystickManager.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\GameLogic\SCA_JoystickSensor.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\GameLogic\SCA_KeyboardManager.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\GameLogic\SCA_KeyboardSensor.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\GameLogic\SCA_LogicManager.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\GameLogic\SCA_MouseManager.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\GameLogic\SCA_MouseSensor.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\GameLogic\SCA_ORController.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\GameLogic\SCA_PropertyActuator.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\GameLogic\SCA_PropertyEventManager.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\GameLogic\SCA_PropertySensor.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\GameLogic\SCA_PythonController.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\GameLogic\SCA_RandomActuator.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\GameLogic\SCA_RandomEventManager.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\GameLogic\SCA_RandomNumberGenerator.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\GameLogic\SCA_RandomSensor.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\GameLogic\SCA_TimeEventManager.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Group "Joystick"
-
-# PROP Default_Filter "h"
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\GameLogic\Joystick\SCA_Joystick.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\GameLogic\Joystick\SCA_JoystickDefines.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\GameLogic\Joystick\SCA_JoystickPrivate.h
-# End Source File
-# End Group
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\GameLogic\SCA_AlwaysEventManager.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\GameLogic\SCA_AlwaysSensor.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\GameLogic\SCA_ANDController.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\GameLogic\SCA_EventManager.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\GameLogic\SCA_ExpressionController.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\GameLogic\SCA_IActuator.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\GameLogic\SCA_IController.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\GameLogic\SCA_IInputDevice.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\GameLogic\SCA_ILogicBrick.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\GameLogic\SCA_IObject.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\GameLogic\SCA_IScene.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\GameLogic\SCA_ISensor.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\GameLogic\SCA_JoystickManager.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\GameLogic\SCA_JoystickSensor.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\GameLogic\SCA_KeyboardManager.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\GameLogic\SCA_KeyboardSensor.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\GameLogic\SCA_LogicManager.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\GameLogic\SCA_MouseManager.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\GameLogic\SCA_MouseSensor.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\GameLogic\SCA_ORController.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\GameLogic\SCA_PropertyActuator.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\GameLogic\SCA_PropertyEventManager.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\GameLogic\SCA_PropertySensor.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\GameLogic\SCA_PythonController.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\GameLogic\SCA_RandomActuator.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\GameLogic\SCA_RandomEventManager.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\GameLogic\SCA_RandomNumberGenerator.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\GameLogic\SCA_RandomSensor.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\GameLogic\SCA_TimeEventManager.h
-# End Source File
-# End Group
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="SCA_GameLogic" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=SCA_GameLogic - Win32 Release
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "SCA_GameLogic.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "SCA_GameLogic.mak" CFG="SCA_GameLogic - Win32 Release"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "SCA_GameLogic - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "SCA_GameLogic - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "SCA_GameLogic - Win32 MT DLL Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "SCA_GameLogic - Win32 MT DLL Release" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "SCA_GameLogic - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\..\obj\windows\gameengine\gamelogic"
+# PROP Intermediate_Dir "..\..\..\obj\windows\gameengine\gamelogic"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "..\..\..\..\lib\windows\python\include\python2.4" /I "..\..\..\..\lib\windows\string\include" /I "..\..\..\..\lib\windows\sdl\include" /I "..\..\..\source\kernel\gen_system" /I "..\..\..\source\gameengine\expressions" /I "..\..\..\..\lib\windows\moto\include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "EXP_PYTHON_EMBEDDING" /YX /J /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "SCA_GameLogic - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "SCA_GameLogic___Win32_Debug"
+# PROP BASE Intermediate_Dir "SCA_GameLogic___Win32_Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\..\obj\windows\gameengine\gamelogic\debug"
+# PROP Intermediate_Dir "..\..\..\obj\windows\gameengine\gamelogic\debug"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GR /GX /Zi /Od /I "..\..\..\..\lib\windows\python\include\python2.4" /I "..\..\..\..\lib\windows\string\include" /I "..\..\..\..\lib\windows\sdl\include" /I "..\..\..\source\kernel\gen_system" /I "..\..\..\source\gameengine\expressions" /I "..\..\..\..\lib\windows\moto\include" /D "WIN32" /D "_MBCS" /D "_LIB" /D "EXP_PYTHON_EMBEDDING" /U "_DEBUG" /YX /J /FD /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "SCA_GameLogic - Win32 MT DLL Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "SCA_GameLogic___Win32_MT_DLL_Debug"
+# PROP BASE Intermediate_Dir "SCA_GameLogic___Win32_MT_DLL_Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\..\obj\windows\gameengine\gamelogic\mtdll_debug"
+# PROP Intermediate_Dir "..\..\..\obj\windows\gameengine\gamelogic\mtdll_debug"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /Gm /GX /ZI /Od /I "..\..\..\source\kernel\gen_system" /I "..\..\..\source\gameengine\expressions" /I "..\..\..\..\lib\windows\moto\include" /I "..\..\..\..\lib\windows\python\include\python1.5" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "EXP_PYTHON_EMBEDDING" /YX /J /FD /GZ /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "..\..\..\..\lib\windows\python\include\python2.4" /I "..\..\..\..\lib\windows\string\include" /I "..\..\..\..\lib\windows\sdl\include" /I "..\..\..\source\kernel\gen_system" /I "..\..\..\source\gameengine\expressions" /I "..\..\..\..\lib\windows\moto\include" /D "WIN32" /D "_MBCS" /D "_LIB" /D "EXP_PYTHON_EMBEDDING" /U "_DEBUG" /YX /J /FD /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\..\..\..\obj\windows\gameengine\gamelogic\debug\SCA_GameLogic.lib"
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "SCA_GameLogic - Win32 MT DLL Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "SCA_GameLogic___Win32_MT_DLL_Release"
+# PROP BASE Intermediate_Dir "SCA_GameLogic___Win32_MT_DLL_Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\..\obj\windows\gameengine\gamelogic\mtdll"
+# PROP Intermediate_Dir "..\..\..\obj\windows\gameengine\gamelogic\mtdll"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /GX /O2 /I "..\..\..\source\kernel\gen_system" /I "..\..\..\source\gameengine\expressions" /I "..\..\..\..\lib\windows\moto\include" /I "..\..\..\..\lib\windows\python\include\python2.0" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "EXP_PYTHON_EMBEDDING" /YX /J /FD /c
+# ADD CPP /nologo /MD /GX /O2 /I "..\..\..\..\lib\windows\python\include\python2.4" /I "..\..\..\..\lib\windows\string\include" /I "..\..\..\..\lib\windows\sdl\include" /I "..\..\..\source\kernel\gen_system" /I "..\..\..\source\gameengine\expressions" /I "..\..\..\..\lib\windows\moto\include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "EXP_PYTHON_EMBEDDING" /YX /J /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\..\..\..\obj\windows\gameengine\gamelogic\SCA_GameLogic.lib"
+# ADD LIB32 /nologo
+
+!ENDIF 
+
+# Begin Target
+
+# Name "SCA_GameLogic - Win32 Release"
+# Name "SCA_GameLogic - Win32 Debug"
+# Name "SCA_GameLogic - Win32 MT DLL Debug"
+# Name "SCA_GameLogic - Win32 MT DLL Release"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Group "JoystickImp"
+
+# PROP Default_Filter "cpp"
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\GameLogic\Joystick\SCA_Joystick.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\GameLogic\Joystick\SCA_JoystickEvents.cpp
+# End Source File
+# End Group
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\GameLogic\SCA_AlwaysEventManager.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\GameLogic\SCA_AlwaysSensor.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\GameLogic\SCA_ANDController.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\GameLogic\SCA_EventManager.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\GameLogic\SCA_ExpressionController.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\GameLogic\SCA_IActuator.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\GameLogic\SCA_IController.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\GameLogic\SCA_IInputDevice.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\GameLogic\SCA_ILogicBrick.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\GameLogic\SCA_IObject.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\GameLogic\SCA_IScene.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\GameLogic\SCA_ISensor.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\GameLogic\SCA_JoystickManager.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\GameLogic\SCA_JoystickSensor.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\GameLogic\SCA_KeyboardManager.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\GameLogic\SCA_KeyboardSensor.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\GameLogic\SCA_LogicManager.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\GameLogic\SCA_MouseManager.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\GameLogic\SCA_MouseSensor.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\GameLogic\SCA_ORController.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\GameLogic\SCA_PropertyActuator.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\GameLogic\SCA_PropertyEventManager.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\GameLogic\SCA_PropertySensor.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\GameLogic\SCA_PythonController.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\GameLogic\SCA_RandomActuator.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\GameLogic\SCA_RandomEventManager.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\GameLogic\SCA_RandomNumberGenerator.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\GameLogic\SCA_RandomSensor.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\GameLogic\SCA_TimeEventManager.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Group "Joystick"
+
+# PROP Default_Filter "h"
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\GameLogic\Joystick\SCA_Joystick.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\GameLogic\Joystick\SCA_JoystickDefines.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\GameLogic\Joystick\SCA_JoystickPrivate.h
+# End Source File
+# End Group
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\GameLogic\SCA_AlwaysEventManager.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\GameLogic\SCA_AlwaysSensor.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\GameLogic\SCA_ANDController.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\GameLogic\SCA_EventManager.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\GameLogic\SCA_ExpressionController.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\GameLogic\SCA_IActuator.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\GameLogic\SCA_IController.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\GameLogic\SCA_IInputDevice.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\GameLogic\SCA_ILogicBrick.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\GameLogic\SCA_IObject.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\GameLogic\SCA_IScene.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\GameLogic\SCA_ISensor.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\GameLogic\SCA_JoystickManager.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\GameLogic\SCA_JoystickSensor.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\GameLogic\SCA_KeyboardManager.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\GameLogic\SCA_KeyboardSensor.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\GameLogic\SCA_LogicManager.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\GameLogic\SCA_MouseManager.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\GameLogic\SCA_MouseSensor.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\GameLogic\SCA_ORController.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\GameLogic\SCA_PropertyActuator.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\GameLogic\SCA_PropertyEventManager.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\GameLogic\SCA_PropertySensor.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\GameLogic\SCA_PythonController.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\GameLogic\SCA_RandomActuator.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\GameLogic\SCA_RandomEventManager.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\GameLogic\SCA_RandomNumberGenerator.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\GameLogic\SCA_RandomSensor.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\GameLogic\SCA_TimeEventManager.h
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/projectfiles/gameengine/gameplayer/axctl/GP_axctl.dsp b/projectfiles/gameengine/gameplayer/axctl/GP_axctl.dsp
index 99b6798bf594245bd555fcdae8764280b9f6a131..56ba052b32d04d8c2a232b8b7cbd548a710dfbd4 100644
--- a/projectfiles/gameengine/gameplayer/axctl/GP_axctl.dsp
+++ b/projectfiles/gameengine/gameplayer/axctl/GP_axctl.dsp
@@ -1,253 +1,253 @@
-# Microsoft Developer Studio Project File - Name="GP_axctl" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=GP_axctl - Win32 MT DLL Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "GP_axctl.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "GP_axctl.mak" CFG="GP_axctl - Win32 MT DLL Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "GP_axctl - Win32 MT DLL Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "GP_axctl - Win32 MT DLL Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "GP_axctl - Win32 MT DLL Debug"
-
-# PROP BASE Use_MFC 2
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "GP_axctl___Win32_MT_DLL_Debug"
-# PROP BASE Intermediate_Dir "GP_axctl___Win32_MT_DLL_Debug"
-# PROP BASE Target_Ext "ocx"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 2
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\..\obj\windows\gameengine\gameplayer\axctl\mtdll_debug"
-# PROP Intermediate_Dir "..\..\..\..\obj\windows\gameengine\gameplayer\axctl\mtdll_debug"
-# PROP Target_Ext "ocx"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\source\gameengine\network" /I "..\..\..\..\source\gameengine\network\loopbacknetwork" /I "..\..\..\..\source\gameengine\gameplayer\common" /I "..\..\..\..\source\gameengine\rasterizer" /I "..\..\..\..\source\gameengine\gamelogic" /I "..\..\..\..\source\sumo\include" /I "..\..\..\..\..\lib\windows\moto\include" /I "..\..\..\..\source\sumo\Fuzzics\include" /I "..\..\..\..\..\lib\windows\python\include\python1.5" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_WINDLL" /D "_AFXDLL" /D "_MBCS" /D "_USRDLL" /FR /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\lib\windows\python\include\python2.2" /I "..\..\..\..\source\kernel\gen_messaging" /I "..\..\..\..\..\lib\windows\bmfont\include" /I "..\..\..\..\..\lib\windows\string\include" /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\source\gameengine\expressions" /I "..\..\..\..\source\gameengine\ketsji" /I "..\..\..\..\source\gameengine\ketsji\kxnetwork" /I "..\..\..\..\source\gameengine\rasterizer" /I "..\..\..\..\source\gameengine\rasterizer\ras_openglrasterizer" /I "..\..\..\..\source\gameengine\scenegraph" /I "..\..\..\..\source\gameengine\gamelogic" /I "..\..\..\..\source\gameengine\soundsystem" /I "..\..\..\..\source\gameengine\soundsystem\snd_openal" /I "..\..\..\..\source\gameengine\network" /I "..\..\..\..\source\gameengine\network\loopbacknetwork" /I "..\..\..\..\source\sumo\include" /I "..\..\..\..\..\lib\windows\moto\include" /I "..\..\..\..\source\sumo\fuzzics\include" /I "..\..\..\..\..\lib\windows\openal\include" /I "..\..\..\..\source\gameengine\gameplayer\common" /I "../../../../source/blender/blenkernel" /I "../../../../source/blender/makesdna" /I "../../../../source/blender/blenlib" /I "../../../../source/blender/blenloader" /I "../../../../source/blender/render/extern/include" /I "../../../../source/blender/imbuf" /I "..\..\..\..\source\gameengine\converter" /I "..\..\..\..\source\gameengine\GamePlayer\common" /I "..\..\..\..\source\gameengine\GamePlayer\common\windows" /I "..\..\..\..\..\lib\windows\iksolver\include" /D "WIN32" /D "_WINDOWS" /D "_WINDLL" /D "_AFXDLL" /D "_MBCS" /D "_USRDLL" /U "_DEBUG" /YX /FD /GZ /c
-# SUBTRACT CPP /Fr
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL"
-# ADD RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 opengl32.lib glu32.lib glaux.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"Debug/ActiveXgp.ocx" /pdbtype:sept /libpath:"..\..\..\..\..\lib\windows\python\lib" /libpath:"..\..\..\..\..\lib\windows\openal\lib\lib_release"
-# SUBTRACT BASE LINK32 /nodefaultlib
-# ADD LINK32 openal_static.lib libmoto.a libguardedalloc.a libbmfont.a libstring.a ws2_32.lib opengl32.lib glu32.lib glaux.lib dxguid.lib ole32.lib vfw32.lib libblenkey.a libeay32.lib libz.a libpng.a libjpeg.a odelib.lib /nologo /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libcmt.lib" /nodefaultlib:"msvcrt.lib" /out:"..\..\..\..\obj\windows\debug\Blender3DPlugin.ocx" /pdbtype:sept /libpath:"..\..\..\..\..\lib\windows\ode\lib\mt_dll" /libpath:"..\..\..\..\..\lib\windows\openal\lib" /libpath:"..\..\..\..\..\lib\windows\guardedalloc\lib" /libpath:"..\..\..\..\..\lib\windows\moto\lib" /libpath:"../../../../../lib/windows/bmfont/lib" /libpath:"../../../../../lib/windows/string/lib" /libpath:"../../../../../lib/windows/python/lib" /libpath:"..\..\..\..\..\lib\windows\openssl\lib\mt_dll" /libpath:"..\..\..\..\..\lib\windows\jpeg\lib" /libpath:"..\..\..\..\..\lib\windows\bmfont/lib" /libpath:"..\..\..\..\..\lib\windows\string\lib" /libpath:"..\..\..\..\..\lib\windows\python\lib" /libpath:"..\..\..\..\..\lib\windows\openssl\lib\\" /libpath:"..\..\..\..\..\lib\windows\zlib\lib\\" /libpath:"..\..\..\..\..\lib\windows\blenkey\lib\\" /libpath:"..\..\..\..\..\lib\windows\png\lib"
-# SUBTRACT LINK32 /pdb:none
-
-!ELSEIF  "$(CFG)" == "GP_axctl - Win32 MT DLL Release"
-
-# PROP BASE Use_MFC 2
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "GP_axctl___Win32_MT_DLL_Release"
-# PROP BASE Intermediate_Dir "GP_axctl___Win32_MT_DLL_Release"
-# PROP BASE Target_Ext "ocx"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 2
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\..\obj\windows\gameengine\gameplayer\axctl\mtdll"
-# PROP Intermediate_Dir "..\..\..\..\obj\windows\gameengine\gameplayer\axctl\mtdll"
-# PROP Target_Ext "ocx"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_WINDLL" /D "_AFXDLL" /D "_MBCS" /D "_USRDLL" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\..\lib\windows\python\include\python2.0" /I "..\..\..\..\..\lib\windows\python\include\python2.2" /I "..\..\..\..\source\kernel\gen_messaging" /I "..\..\..\..\..\lib\windows\bmfont\include" /I "..\..\..\..\..\lib\windows\string\include" /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\source\gameengine\expressions" /I "..\..\..\..\source\gameengine\ketsji" /I "..\..\..\..\source\gameengine\ketsji\kxnetwork" /I "..\..\..\..\source\gameengine\rasterizer" /I "..\..\..\..\source\gameengine\rasterizer\ras_openglrasterizer" /I "..\..\..\..\source\gameengine\scenegraph" /I "..\..\..\..\source\gameengine\gamelogic" /I "..\..\..\..\source\gameengine\soundsystem" /I "..\..\..\..\source\gameengine\soundsystem\snd_openal" /I "..\..\..\..\source\gameengine\network" /I "..\..\..\..\source\gameengine\network\loopbacknetwork" /I "..\..\..\..\source\sumo\include" /I "..\..\..\..\..\lib\windows\moto\include" /I "..\..\..\..\source\sumo\fuzzics\include" /I "..\..\..\..\..\lib\windows\openal\include" /I "..\..\..\..\source\gameengine\gameplayer\common" /I "../../../../source/blender/blenkernel" /I "../../../../source/blender/makesdna" /I "../../../../source/blender/blenlib" /I "../../../../source/blender/blenloader" /I "../../../../source/blender/render/extern/include" /I "../../../../source/blender/imbuf" /I "..\..\..\..\source\gameengine\converter" /I "..\..\..\..\source\gameengine\GamePlayer\common" /I "..\..\..\..\source\gameengine\GamePlayer\common\windows" /I "..\..\..\..\..\lib\windows\iksolver\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_WINDLL" /D "_AFXDLL" /D "_MBCS" /D "_USRDLL" /YX /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL"
-# ADD RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 opengl32.lib glu32.lib glaux.lib /nologo /subsystem:windows /dll /machine:I386 /out:"Release/ActiveXgp.ocx"
-# ADD LINK32 openal_static.lib libmoto.a libguardedalloc.a libbmfont.a libstring.a ws2_32.lib opengl32.lib glu32.lib glaux.lib dxguid.lib ole32.lib vfw32.lib libblenkey.a libeay32.lib libz.a libpng.a libjpeg.a odelib.lib /nologo /subsystem:windows /dll /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libcmt.lib" /nodefaultlib:"msvcrtd.lib" /out:"..\..\..\..\obj\windows\Blender3DPlugin.ocx" /libpath:"..\..\..\..\..\lib\windows\ode\lib\mt_dll" /libpath:"..\..\..\..\..\lib\windows\openal\lib" /libpath:"..\..\..\..\..\lib\windows\guardedalloc\lib" /libpath:"..\..\..\..\..\lib\windows\moto\lib" /libpath:"..\..\..\..\..\lib\windows\bmfont/lib" /libpath:"..\..\..\..\..\lib\windows\string\lib" /libpath:"..\..\..\..\..\lib\windows\python\lib" /libpath:"..\..\..\..\..\lib\windows\openssl\lib\mt_dll" /libpath:"..\..\..\..\..\lib\windows\jpeg\lib" /libpath:"..\..\..\..\..\lib\windows\zlib\lib\\" /libpath:"..\..\..\..\..\lib\windows\blenkey\lib\\" /libpath:"..\..\..\..\..\lib\windows\png\lib"
-# SUBTRACT LINK32 /pdb:none
-
-!ENDIF 
-
-# Begin Target
-
-# Name "GP_axctl - Win32 MT DLL Debug"
-# Name "GP_axctl - Win32 MT DLL Release"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\ActiveX\BlenderDataPathProperty.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\ActiveX\BlenderPlayer.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\ActiveX\BlenderPlayer.def
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\ActiveX\BlenderPlayer.odl
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\ActiveX\BlenderPlayer.rc
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\ActiveX\BlenderPlayerCtl.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\ActiveX\BlenderPlayerPpg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\ActiveX\CControlRefresher.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\blender\makesdna\intern\dna.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\ActiveX\MemoryResource.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\ActiveX\RawImageRsrc.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\ActiveX\SafeControl.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\ActiveX\StdAfx.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\blender\blenkernel\bad_level_call_stubs\stubs.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\ActiveX\BlenderDataPathProperty.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\ActiveX\BlenderPlayer.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\ActiveX\BlenderPlayerCtl.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\ActiveX\BlenderPlayerPpg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\ActiveX\CControlRefresher.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\ActiveX\MemoryResource.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\ActiveX\RawImageRsrc.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\ActiveX\Resource.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\ActiveX\SafeControl.h
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\ActiveX\BlenderPlayer.ico
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\ActiveX\BlenderPlayerCtl.bmp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\ActiveX\splash.bmp
-# End Source File
-# End Group
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\ActiveX\ActiveXandNetscapeTest.html
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\ActiveX\BlenderPlayer.html
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\ActiveX\BlenderPlayerDuo.html
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\common\load.blend
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\common\logo_blender.raw
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\common\logo_blender3d.raw
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\common\logo_nan.raw
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\ActiveX\ReadMe.txt
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\ActiveX\ReadMeBuilding.txt
-# End Source File
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="GP_axctl" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
+
+CFG=GP_axctl - Win32 MT DLL Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "GP_axctl.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "GP_axctl.mak" CFG="GP_axctl - Win32 MT DLL Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "GP_axctl - Win32 MT DLL Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "GP_axctl - Win32 MT DLL Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "GP_axctl - Win32 MT DLL Debug"
+
+# PROP BASE Use_MFC 2
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "GP_axctl___Win32_MT_DLL_Debug"
+# PROP BASE Intermediate_Dir "GP_axctl___Win32_MT_DLL_Debug"
+# PROP BASE Target_Ext "ocx"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 2
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\..\..\obj\windows\gameengine\gameplayer\axctl\mtdll_debug"
+# PROP Intermediate_Dir "..\..\..\..\obj\windows\gameengine\gameplayer\axctl\mtdll_debug"
+# PROP Target_Ext "ocx"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\source\gameengine\network" /I "..\..\..\..\source\gameengine\network\loopbacknetwork" /I "..\..\..\..\source\gameengine\gameplayer\common" /I "..\..\..\..\source\gameengine\rasterizer" /I "..\..\..\..\source\gameengine\gamelogic" /I "..\..\..\..\source\sumo\include" /I "..\..\..\..\..\lib\windows\moto\include" /I "..\..\..\..\source\sumo\Fuzzics\include" /I "..\..\..\..\..\lib\windows\python\include\python1.5" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_WINDLL" /D "_AFXDLL" /D "_MBCS" /D "_USRDLL" /FR /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\lib\windows\python\include\python2.2" /I "..\..\..\..\source\kernel\gen_messaging" /I "..\..\..\..\..\lib\windows\bmfont\include" /I "..\..\..\..\..\lib\windows\string\include" /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\source\gameengine\expressions" /I "..\..\..\..\source\gameengine\ketsji" /I "..\..\..\..\source\gameengine\ketsji\kxnetwork" /I "..\..\..\..\source\gameengine\rasterizer" /I "..\..\..\..\source\gameengine\rasterizer\ras_openglrasterizer" /I "..\..\..\..\source\gameengine\scenegraph" /I "..\..\..\..\source\gameengine\gamelogic" /I "..\..\..\..\source\gameengine\soundsystem" /I "..\..\..\..\source\gameengine\soundsystem\snd_openal" /I "..\..\..\..\source\gameengine\network" /I "..\..\..\..\source\gameengine\network\loopbacknetwork" /I "..\..\..\..\source\sumo\include" /I "..\..\..\..\..\lib\windows\moto\include" /I "..\..\..\..\source\sumo\fuzzics\include" /I "..\..\..\..\..\lib\windows\openal\include" /I "..\..\..\..\source\gameengine\gameplayer\common" /I "../../../../source/blender/blenkernel" /I "../../../../source/blender/makesdna" /I "../../../../source/blender/blenlib" /I "../../../../source/blender/blenloader" /I "../../../../source/blender/render/extern/include" /I "../../../../source/blender/imbuf" /I "..\..\..\..\source\gameengine\converter" /I "..\..\..\..\source\gameengine\GamePlayer\common" /I "..\..\..\..\source\gameengine\GamePlayer\common\windows" /I "..\..\..\..\..\lib\windows\iksolver\include" /D "WIN32" /D "_WINDOWS" /D "_WINDLL" /D "_AFXDLL" /D "_MBCS" /D "_USRDLL" /U "_DEBUG" /YX /FD /GZ /c
+# SUBTRACT CPP /Fr
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL"
+# ADD RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 opengl32.lib glu32.lib glaux.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"Debug/ActiveXgp.ocx" /pdbtype:sept /libpath:"..\..\..\..\..\lib\windows\python\lib" /libpath:"..\..\..\..\..\lib\windows\openal\lib\lib_release"
+# SUBTRACT BASE LINK32 /nodefaultlib
+# ADD LINK32 openal_static.lib libmoto.a libguardedalloc.a libbmfont.a libstring.a ws2_32.lib opengl32.lib glu32.lib glaux.lib dxguid.lib ole32.lib vfw32.lib libblenkey.a libeay32.lib libz.a libpng.a libjpeg.a odelib.lib /nologo /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libcmt.lib" /nodefaultlib:"msvcrt.lib" /out:"..\..\..\..\obj\windows\debug\Blender3DPlugin.ocx" /pdbtype:sept /libpath:"..\..\..\..\..\lib\windows\ode\lib\mt_dll" /libpath:"..\..\..\..\..\lib\windows\openal\lib" /libpath:"..\..\..\..\..\lib\windows\guardedalloc\lib" /libpath:"..\..\..\..\..\lib\windows\moto\lib" /libpath:"../../../../../lib/windows/bmfont/lib" /libpath:"../../../../../lib/windows/string/lib" /libpath:"../../../../../lib/windows/python/lib" /libpath:"..\..\..\..\..\lib\windows\openssl\lib\mt_dll" /libpath:"..\..\..\..\..\lib\windows\jpeg\lib" /libpath:"..\..\..\..\..\lib\windows\bmfont/lib" /libpath:"..\..\..\..\..\lib\windows\string\lib" /libpath:"..\..\..\..\..\lib\windows\python\lib" /libpath:"..\..\..\..\..\lib\windows\openssl\lib\\" /libpath:"..\..\..\..\..\lib\windows\zlib\lib\\" /libpath:"..\..\..\..\..\lib\windows\blenkey\lib\\" /libpath:"..\..\..\..\..\lib\windows\png\lib"
+# SUBTRACT LINK32 /pdb:none
+
+!ELSEIF  "$(CFG)" == "GP_axctl - Win32 MT DLL Release"
+
+# PROP BASE Use_MFC 2
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "GP_axctl___Win32_MT_DLL_Release"
+# PROP BASE Intermediate_Dir "GP_axctl___Win32_MT_DLL_Release"
+# PROP BASE Target_Ext "ocx"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 2
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\..\..\obj\windows\gameengine\gameplayer\axctl\mtdll"
+# PROP Intermediate_Dir "..\..\..\..\obj\windows\gameengine\gameplayer\axctl\mtdll"
+# PROP Target_Ext "ocx"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_WINDLL" /D "_AFXDLL" /D "_MBCS" /D "_USRDLL" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\..\lib\windows\python\include\python2.0" /I "..\..\..\..\..\lib\windows\python\include\python2.2" /I "..\..\..\..\source\kernel\gen_messaging" /I "..\..\..\..\..\lib\windows\bmfont\include" /I "..\..\..\..\..\lib\windows\string\include" /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\source\gameengine\expressions" /I "..\..\..\..\source\gameengine\ketsji" /I "..\..\..\..\source\gameengine\ketsji\kxnetwork" /I "..\..\..\..\source\gameengine\rasterizer" /I "..\..\..\..\source\gameengine\rasterizer\ras_openglrasterizer" /I "..\..\..\..\source\gameengine\scenegraph" /I "..\..\..\..\source\gameengine\gamelogic" /I "..\..\..\..\source\gameengine\soundsystem" /I "..\..\..\..\source\gameengine\soundsystem\snd_openal" /I "..\..\..\..\source\gameengine\network" /I "..\..\..\..\source\gameengine\network\loopbacknetwork" /I "..\..\..\..\source\sumo\include" /I "..\..\..\..\..\lib\windows\moto\include" /I "..\..\..\..\source\sumo\fuzzics\include" /I "..\..\..\..\..\lib\windows\openal\include" /I "..\..\..\..\source\gameengine\gameplayer\common" /I "../../../../source/blender/blenkernel" /I "../../../../source/blender/makesdna" /I "../../../../source/blender/blenlib" /I "../../../../source/blender/blenloader" /I "../../../../source/blender/render/extern/include" /I "../../../../source/blender/imbuf" /I "..\..\..\..\source\gameengine\converter" /I "..\..\..\..\source\gameengine\GamePlayer\common" /I "..\..\..\..\source\gameengine\GamePlayer\common\windows" /I "..\..\..\..\..\lib\windows\iksolver\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_WINDLL" /D "_AFXDLL" /D "_MBCS" /D "_USRDLL" /YX /FD /c
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL"
+# ADD RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 opengl32.lib glu32.lib glaux.lib /nologo /subsystem:windows /dll /machine:I386 /out:"Release/ActiveXgp.ocx"
+# ADD LINK32 openal_static.lib libmoto.a libguardedalloc.a libbmfont.a libstring.a ws2_32.lib opengl32.lib glu32.lib glaux.lib dxguid.lib ole32.lib vfw32.lib libblenkey.a libeay32.lib libz.a libpng.a libjpeg.a odelib.lib /nologo /subsystem:windows /dll /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libcmt.lib" /nodefaultlib:"msvcrtd.lib" /out:"..\..\..\..\obj\windows\Blender3DPlugin.ocx" /libpath:"..\..\..\..\..\lib\windows\ode\lib\mt_dll" /libpath:"..\..\..\..\..\lib\windows\openal\lib" /libpath:"..\..\..\..\..\lib\windows\guardedalloc\lib" /libpath:"..\..\..\..\..\lib\windows\moto\lib" /libpath:"..\..\..\..\..\lib\windows\bmfont/lib" /libpath:"..\..\..\..\..\lib\windows\string\lib" /libpath:"..\..\..\..\..\lib\windows\python\lib" /libpath:"..\..\..\..\..\lib\windows\openssl\lib\mt_dll" /libpath:"..\..\..\..\..\lib\windows\jpeg\lib" /libpath:"..\..\..\..\..\lib\windows\zlib\lib\\" /libpath:"..\..\..\..\..\lib\windows\blenkey\lib\\" /libpath:"..\..\..\..\..\lib\windows\png\lib"
+# SUBTRACT LINK32 /pdb:none
+
+!ENDIF 
+
+# Begin Target
+
+# Name "GP_axctl - Win32 MT DLL Debug"
+# Name "GP_axctl - Win32 MT DLL Release"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\ActiveX\BlenderDataPathProperty.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\ActiveX\BlenderPlayer.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\ActiveX\BlenderPlayer.def
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\ActiveX\BlenderPlayer.odl
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\ActiveX\BlenderPlayer.rc
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\ActiveX\BlenderPlayerCtl.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\ActiveX\BlenderPlayerPpg.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\ActiveX\CControlRefresher.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\blender\makesdna\intern\dna.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\ActiveX\MemoryResource.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\ActiveX\RawImageRsrc.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\ActiveX\SafeControl.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\ActiveX\StdAfx.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\blender\blenkernel\bad_level_call_stubs\stubs.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\ActiveX\BlenderDataPathProperty.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\ActiveX\BlenderPlayer.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\ActiveX\BlenderPlayerCtl.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\ActiveX\BlenderPlayerPpg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\ActiveX\CControlRefresher.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\ActiveX\MemoryResource.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\ActiveX\RawImageRsrc.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\ActiveX\Resource.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\ActiveX\SafeControl.h
+# End Source File
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\ActiveX\BlenderPlayer.ico
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\ActiveX\BlenderPlayerCtl.bmp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\ActiveX\splash.bmp
+# End Source File
+# End Group
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\ActiveX\ActiveXandNetscapeTest.html
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\ActiveX\BlenderPlayer.html
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\ActiveX\BlenderPlayerDuo.html
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\common\load.blend
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\common\logo_blender.raw
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\common\logo_blender3d.raw
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\common\logo_nan.raw
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\ActiveX\ReadMe.txt
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\ActiveX\ReadMeBuilding.txt
+# End Source File
+# End Target
+# End Project
diff --git a/projectfiles/gameengine/gameplayer/common/GP_common.dsp b/projectfiles/gameengine/gameplayer/common/GP_common.dsp
index c150960873168b409f84b5dab4e432166f7a28ef..d3103c4f88afc6d5737399a747e8bdc113cfc63c 100644
--- a/projectfiles/gameengine/gameplayer/common/GP_common.dsp
+++ b/projectfiles/gameengine/gameplayer/common/GP_common.dsp
@@ -1,255 +1,255 @@
-# Microsoft Developer Studio Project File - Name="GP_common" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=GP_common - Win32 Release
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "GP_common.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "GP_common.mak" CFG="GP_common - Win32 Release"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "GP_common - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "GP_common - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "GP_common - Win32 MT DLL Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "GP_common - Win32 MT DLL Release" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "GP_common - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\..\obj\windows\gameengine\gameplayer\common"
-# PROP Intermediate_Dir "..\..\..\..\obj\windows\gameengine\gameplayer\common"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\..\..\..\lib\windows\python\include\python2.0" /I "..\..\..\..\..\lib\windows\python\include\python2.2" /I "..\..\..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\..\source\gameengine\Converter" /I "..\..\..\..\source\gameengine\soundsystem\snd_dummy" /I "..\..\..\..\..\lib\windows\bmfont\include" /I "..\..\..\..\..\lib\windows\string\include" /I "..\..\..\..\lib\windows\string\include" /I "..\..\..\..\source\gameengine\expressions" /I "..\..\..\..\source\gameengine\ketsji" /I "..\..\..\..\source\gameengine\GamePlayer\common\\" /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\source\gameengine\ketsji\kxnetwork" /I "..\..\..\..\source\gameengine\rasterizer" /I "..\..\..\..\source\gameengine\rasterizer\ras_openglrasterizer" /I "..\..\..\..\source\gameengine\scenegraph" /I "..\..\..\..\source\gameengine\gamelogic" /I "..\..\..\..\source\gameengine\soundsystem" /I "..\..\..\..\source\gameengine\soundsystem\snd_openal" /I "..\..\..\..\source\gameengine\network" /I "..\..\..\..\source\gameengine\network\loopbacknetwork" /I "..\..\..\..\source\sumo\include" /I "..\..\..\..\..\lib\windows\moto\include" /I "..\..\..\..\source\sumo\fuzzics\include" /I "..\..\..\..\..\lib\windows\openal\include" /I "../../../../source/blender/blenkernel" /I "../../../../source/blender/makesdna" /I "../../../../source/blender/blenlib" /I "../../../../source/blender/blenloader" /I "../../../../source/blender/render/extern/include" /I "../../../../source/blender/imbuf" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "GP_common - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\..\obj\windows\gameengine\gameplayer\common\debug"
-# PROP Intermediate_Dir "..\..\..\..\obj\windows\gameengine\gameplayer\common\debug"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\lib\windows\python\include\python2.2" /I "..\..\..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\..\source\gameengine\Converter" /I "..\..\..\..\source\gameengine\soundsystem\snd_dummy" /I "..\..\..\..\..\lib\windows\bmfont\include" /I "..\..\..\..\..\lib\windows\string\include" /I "..\..\..\..\lib\windows\string\include" /I "..\..\..\..\source\gameengine\expressions" /I "..\..\..\..\source\gameengine\ketsji" /I "..\..\..\..\source\gameengine\GamePlayer\common\\" /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\source\gameengine\ketsji\kxnetwork" /I "..\..\..\..\source\gameengine\rasterizer" /I "..\..\..\..\source\gameengine\rasterizer\ras_openglrasterizer" /I "..\..\..\..\source\gameengine\scenegraph" /I "..\..\..\..\source\gameengine\gamelogic" /I "..\..\..\..\source\gameengine\soundsystem" /I "..\..\..\..\source\gameengine\soundsystem\snd_openal" /I "..\..\..\..\source\gameengine\network" /I "..\..\..\..\source\gameengine\network\loopbacknetwork" /I "..\..\..\..\source\sumo\include" /I "..\..\..\..\..\lib\windows\moto\include" /I "..\..\..\..\source\sumo\fuzzics\include" /I "..\..\..\..\..\lib\windows\openal\include" /I "../../../../source/blender/blenkernel" /I "../../../../source/blender/makesdna" /I "../../../../source/blender/blenlib" /I "../../../../source/blender/blenloader" /I "../../../../source/blender/render/extern/include" /I "../../../../source/blender/imbuf" /D "WIN32" /D "_MBCS" /D "_LIB" /U "_DEBUG" /YX /FD /GZ /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "GP_common - Win32 MT DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "GP_common___Win32_MT_DLL_Debug"
-# PROP BASE Intermediate_Dir "GP_common___Win32_MT_DLL_Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\..\obj\windows\gameengine\gameplayer\common\mtdll_debug"
-# PROP Intermediate_Dir "..\..\..\..\obj\windows\gameengine\gameplayer\common\mtdll_debug"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /MDd /Gm /GX /ZI /Od /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\source\gameengine\expressions" /I "..\..\..\..\source\gameengine\ketsji" /I "..\..\..\..\source\gameengine\ketsji\kxnetwork" /I "..\..\..\..\source\gameengine\rasterizer" /I "..\..\..\..\source\gameengine\rasterizer\ras_openglrasterizer" /I "..\..\..\..\source\gameengine\scenegraph" /I "..\..\..\..\source\gameengine\gamelogic" /I "..\..\..\..\source\gameengine\soundsystem" /I "..\..\..\..\source\gameengine\soundsystem\snd_openal" /I "..\..\..\..\source\gameengine\network" /I "..\..\..\..\source\gameengine\network\loopbacknetwork" /I "..\..\..\..\source\sumo\include" /I "..\..\..\..\..\lib\windows\moto\include" /I "..\..\..\..\source\sumo\fuzzics\include" /I "..\..\..\..\..\lib\windows\openal\include" /I "..\..\..\..\..\lib\windows\python\include\python1.5" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "..\..\..\..\..\lib\windows\python\include\python2.0" /I "..\..\..\..\..\lib\windows\python\include\python2.2" /I "..\..\..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\..\source\gameengine\Converter" /I "..\..\..\..\source\gameengine\soundsystem\snd_dummy" /I "..\..\..\..\..\lib\windows\bmfont\include" /I "..\..\..\..\..\lib\windows\string\include" /I "..\..\..\..\lib\windows\string\include" /I "..\..\..\..\source\gameengine\expressions" /I "..\..\..\..\source\gameengine\ketsji" /I "..\..\..\..\source\gameengine\GamePlayer\common\\" /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\source\gameengine\ketsji\kxnetwork" /I "..\..\..\..\source\gameengine\rasterizer" /I "..\..\..\..\source\gameengine\rasterizer\ras_openglrasterizer" /I "..\..\..\..\source\gameengine\scenegraph" /I "..\..\..\..\source\gameengine\gamelogic" /I "..\..\..\..\source\gameengine\soundsystem" /I "..\..\..\..\source\gameengine\soundsystem\snd_openal" /I "..\..\..\..\source\gameengine\network" /I "..\..\..\..\source\gameengine\network\loopbacknetwork" /I "..\..\..\..\source\sumo\include" /I "..\..\..\..\..\lib\windows\moto\include" /I "..\..\..\..\source\sumo\fuzzics\include" /I "..\..\..\..\..\lib\windows\openal\include" /I "../../../../source/blender/blenkernel" /I "../../../../source/blender/makesdna" /I "../../../../source/blender/blenlib" /I "../../../../source/blender/blenloader" /I "../../../../source/blender/render/extern/include" /I "../../../../source/blender/imbuf" /D "WIN32" /D "_MBCS" /D "_LIB" /U "_DEBUG" /YX /FD /GZ /c
-# SUBTRACT CPP /Fr
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\..\..\..\obj\windows\gameengine\gameplayer\common\debug\GP_common.lib"
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "GP_common - Win32 MT DLL Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "GP_common___Win32_MT_DLL_Release"
-# PROP BASE Intermediate_Dir "GP_common___Win32_MT_DLL_Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\..\obj\windows\gameengine\gameplayer\common\mtdll"
-# PROP Intermediate_Dir "..\..\..\..\obj\windows\gameengine\gameplayer\common\mtdll"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /GX /O2 /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\source\gameengine\expressions" /I "..\..\..\..\source\gameengine\ketsji" /I "..\..\..\..\source\gameengine\ketsji\kxnetwork" /I "..\..\..\..\source\gameengine\rasterizer" /I "..\..\..\..\source\gameengine\rasterizer\ras_openglrasterizer" /I "..\..\..\..\source\gameengine\scenegraph" /I "..\..\..\..\source\gameengine\gamelogic" /I "..\..\..\..\source\gameengine\soundsystem" /I "..\..\..\..\source\gameengine\soundsystem\snd_openal" /I "..\..\..\..\source\gameengine\network" /I "..\..\..\..\source\gameengine\network\loopbacknetwork" /I "..\..\..\..\source\sumo\include" /I "..\..\..\..\..\lib\windows\moto\include" /I "..\..\..\..\source\sumo\fuzzics\include" /I "..\..\..\..\..\lib\windows\openal\include" /I "..\..\..\..\..\lib\windows\python\include\python2.0" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
-# ADD CPP /nologo /MD /GX /O2 /I "..\..\..\..\..\lib\windows\python\include\python1.5" /I "..\..\..\..\..\lib\windows\python\include\python2.0" /I "..\..\..\..\..\lib\windows\python\include\python2.2" /I "..\..\..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\..\source\gameengine\Converter" /I "..\..\..\..\source\gameengine\soundsystem\snd_dummy" /I "..\..\..\..\..\lib\windows\bmfont\include" /I "..\..\..\..\..\lib\windows\string\include" /I "..\..\..\..\lib\windows\string\include" /I "..\..\..\..\source\gameengine\expressions" /I "..\..\..\..\source\gameengine\ketsji" /I "..\..\..\..\source\gameengine\GamePlayer\common\\" /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\source\gameengine\ketsji\kxnetwork" /I "..\..\..\..\source\gameengine\rasterizer" /I "..\..\..\..\source\gameengine\rasterizer\ras_openglrasterizer" /I "..\..\..\..\source\gameengine\scenegraph" /I "..\..\..\..\source\gameengine\gamelogic" /I "..\..\..\..\source\gameengine\soundsystem" /I "..\..\..\..\source\gameengine\soundsystem\snd_openal" /I "..\..\..\..\source\gameengine\network" /I "..\..\..\..\source\gameengine\network\loopbacknetwork" /I "..\..\..\..\source\sumo\include" /I "..\..\..\..\..\lib\windows\moto\include" /I "..\..\..\..\source\sumo\fuzzics\include" /I "..\..\..\..\..\lib\windows\openal\include" /I "../../../../source/blender/blenkernel" /I "../../../../source/blender/makesdna" /I "../../../../source/blender/blenlib" /I "../../../../source/blender/blenloader" /I "../../../../source/blender/render/extern/include" /I "../../../../source/blender/imbuf" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\..\..\..\obj\windows\gameengine\gameplayer\common\GP_common.lib"
-# ADD LIB32 /nologo
-
-!ENDIF 
-
-# Begin Target
-
-# Name "GP_common - Win32 Release"
-# Name "GP_common - Win32 Debug"
-# Name "GP_common - Win32 MT DLL Debug"
-# Name "GP_common - Win32 MT DLL Release"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\common\bmfont.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\common\GPC_Canvas.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\common\GPC_Engine.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\common\GPC_KeyboardDevice.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\common\GPC_MouseDevice.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\common\GPC_PolygonMaterial.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\common\GPC_RawImage.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\common\GPC_RawLoadDotBlendArray.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\common\GPC_RawLogoArrays.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\common\GPC_RenderTools.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\common\GPC_System.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\common\windows\GPW_Canvas.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\common\windows\GPW_Engine.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\common\windows\GPW_KeyboardDevice.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\common\windows\GPW_System.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\common\GPC_Canvas.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\common\GPC_Engine.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\common\GPC_KeyboardDevice.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\common\GPC_MouseDevice.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\common\GPC_PolygonMaterial.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\common\GPC_RenderTools.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\common\GPC_System.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\common\windows\GPW_Canvas.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\common\windows\GPW_Engine.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\common\windows\GPW_KeyboardDevice.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\common\windows\GPW_System.h
-# End Source File
-# End Group
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\common\Makefile
-# End Source File
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="GP_common" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=GP_common - Win32 Release
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "GP_common.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "GP_common.mak" CFG="GP_common - Win32 Release"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "GP_common - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "GP_common - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "GP_common - Win32 MT DLL Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "GP_common - Win32 MT DLL Release" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "GP_common - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\..\..\obj\windows\gameengine\gameplayer\common"
+# PROP Intermediate_Dir "..\..\..\..\obj\windows\gameengine\gameplayer\common"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\..\..\..\lib\windows\python\include\python2.0" /I "..\..\..\..\..\lib\windows\python\include\python2.2" /I "..\..\..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\..\source\gameengine\Converter" /I "..\..\..\..\source\gameengine\soundsystem\snd_dummy" /I "..\..\..\..\..\lib\windows\bmfont\include" /I "..\..\..\..\..\lib\windows\string\include" /I "..\..\..\..\lib\windows\string\include" /I "..\..\..\..\source\gameengine\expressions" /I "..\..\..\..\source\gameengine\ketsji" /I "..\..\..\..\source\gameengine\GamePlayer\common\\" /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\source\gameengine\ketsji\kxnetwork" /I "..\..\..\..\source\gameengine\rasterizer" /I "..\..\..\..\source\gameengine\rasterizer\ras_openglrasterizer" /I "..\..\..\..\source\gameengine\scenegraph" /I "..\..\..\..\source\gameengine\gamelogic" /I "..\..\..\..\source\gameengine\soundsystem" /I "..\..\..\..\source\gameengine\soundsystem\snd_openal" /I "..\..\..\..\source\gameengine\network" /I "..\..\..\..\source\gameengine\network\loopbacknetwork" /I "..\..\..\..\source\sumo\include" /I "..\..\..\..\..\lib\windows\moto\include" /I "..\..\..\..\source\sumo\fuzzics\include" /I "..\..\..\..\..\lib\windows\openal\include" /I "../../../../source/blender/blenkernel" /I "../../../../source/blender/makesdna" /I "../../../../source/blender/blenlib" /I "../../../../source/blender/blenloader" /I "../../../../source/blender/render/extern/include" /I "../../../../source/blender/imbuf" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "GP_common - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\..\..\obj\windows\gameengine\gameplayer\common\debug"
+# PROP Intermediate_Dir "..\..\..\..\obj\windows\gameengine\gameplayer\common\debug"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\lib\windows\python\include\python2.2" /I "..\..\..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\..\source\gameengine\Converter" /I "..\..\..\..\source\gameengine\soundsystem\snd_dummy" /I "..\..\..\..\..\lib\windows\bmfont\include" /I "..\..\..\..\..\lib\windows\string\include" /I "..\..\..\..\lib\windows\string\include" /I "..\..\..\..\source\gameengine\expressions" /I "..\..\..\..\source\gameengine\ketsji" /I "..\..\..\..\source\gameengine\GamePlayer\common\\" /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\source\gameengine\ketsji\kxnetwork" /I "..\..\..\..\source\gameengine\rasterizer" /I "..\..\..\..\source\gameengine\rasterizer\ras_openglrasterizer" /I "..\..\..\..\source\gameengine\scenegraph" /I "..\..\..\..\source\gameengine\gamelogic" /I "..\..\..\..\source\gameengine\soundsystem" /I "..\..\..\..\source\gameengine\soundsystem\snd_openal" /I "..\..\..\..\source\gameengine\network" /I "..\..\..\..\source\gameengine\network\loopbacknetwork" /I "..\..\..\..\source\sumo\include" /I "..\..\..\..\..\lib\windows\moto\include" /I "..\..\..\..\source\sumo\fuzzics\include" /I "..\..\..\..\..\lib\windows\openal\include" /I "../../../../source/blender/blenkernel" /I "../../../../source/blender/makesdna" /I "../../../../source/blender/blenlib" /I "../../../../source/blender/blenloader" /I "../../../../source/blender/render/extern/include" /I "../../../../source/blender/imbuf" /D "WIN32" /D "_MBCS" /D "_LIB" /U "_DEBUG" /YX /FD /GZ /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "GP_common - Win32 MT DLL Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "GP_common___Win32_MT_DLL_Debug"
+# PROP BASE Intermediate_Dir "GP_common___Win32_MT_DLL_Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\..\..\obj\windows\gameengine\gameplayer\common\mtdll_debug"
+# PROP Intermediate_Dir "..\..\..\..\obj\windows\gameengine\gameplayer\common\mtdll_debug"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /MDd /Gm /GX /ZI /Od /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\source\gameengine\expressions" /I "..\..\..\..\source\gameengine\ketsji" /I "..\..\..\..\source\gameengine\ketsji\kxnetwork" /I "..\..\..\..\source\gameengine\rasterizer" /I "..\..\..\..\source\gameengine\rasterizer\ras_openglrasterizer" /I "..\..\..\..\source\gameengine\scenegraph" /I "..\..\..\..\source\gameengine\gamelogic" /I "..\..\..\..\source\gameengine\soundsystem" /I "..\..\..\..\source\gameengine\soundsystem\snd_openal" /I "..\..\..\..\source\gameengine\network" /I "..\..\..\..\source\gameengine\network\loopbacknetwork" /I "..\..\..\..\source\sumo\include" /I "..\..\..\..\..\lib\windows\moto\include" /I "..\..\..\..\source\sumo\fuzzics\include" /I "..\..\..\..\..\lib\windows\openal\include" /I "..\..\..\..\..\lib\windows\python\include\python1.5" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "..\..\..\..\..\lib\windows\python\include\python2.0" /I "..\..\..\..\..\lib\windows\python\include\python2.2" /I "..\..\..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\..\source\gameengine\Converter" /I "..\..\..\..\source\gameengine\soundsystem\snd_dummy" /I "..\..\..\..\..\lib\windows\bmfont\include" /I "..\..\..\..\..\lib\windows\string\include" /I "..\..\..\..\lib\windows\string\include" /I "..\..\..\..\source\gameengine\expressions" /I "..\..\..\..\source\gameengine\ketsji" /I "..\..\..\..\source\gameengine\GamePlayer\common\\" /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\source\gameengine\ketsji\kxnetwork" /I "..\..\..\..\source\gameengine\rasterizer" /I "..\..\..\..\source\gameengine\rasterizer\ras_openglrasterizer" /I "..\..\..\..\source\gameengine\scenegraph" /I "..\..\..\..\source\gameengine\gamelogic" /I "..\..\..\..\source\gameengine\soundsystem" /I "..\..\..\..\source\gameengine\soundsystem\snd_openal" /I "..\..\..\..\source\gameengine\network" /I "..\..\..\..\source\gameengine\network\loopbacknetwork" /I "..\..\..\..\source\sumo\include" /I "..\..\..\..\..\lib\windows\moto\include" /I "..\..\..\..\source\sumo\fuzzics\include" /I "..\..\..\..\..\lib\windows\openal\include" /I "../../../../source/blender/blenkernel" /I "../../../../source/blender/makesdna" /I "../../../../source/blender/blenlib" /I "../../../../source/blender/blenloader" /I "../../../../source/blender/render/extern/include" /I "../../../../source/blender/imbuf" /D "WIN32" /D "_MBCS" /D "_LIB" /U "_DEBUG" /YX /FD /GZ /c
+# SUBTRACT CPP /Fr
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\..\..\..\obj\windows\gameengine\gameplayer\common\debug\GP_common.lib"
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "GP_common - Win32 MT DLL Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "GP_common___Win32_MT_DLL_Release"
+# PROP BASE Intermediate_Dir "GP_common___Win32_MT_DLL_Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\..\..\obj\windows\gameengine\gameplayer\common\mtdll"
+# PROP Intermediate_Dir "..\..\..\..\obj\windows\gameengine\gameplayer\common\mtdll"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /GX /O2 /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\source\gameengine\expressions" /I "..\..\..\..\source\gameengine\ketsji" /I "..\..\..\..\source\gameengine\ketsji\kxnetwork" /I "..\..\..\..\source\gameengine\rasterizer" /I "..\..\..\..\source\gameengine\rasterizer\ras_openglrasterizer" /I "..\..\..\..\source\gameengine\scenegraph" /I "..\..\..\..\source\gameengine\gamelogic" /I "..\..\..\..\source\gameengine\soundsystem" /I "..\..\..\..\source\gameengine\soundsystem\snd_openal" /I "..\..\..\..\source\gameengine\network" /I "..\..\..\..\source\gameengine\network\loopbacknetwork" /I "..\..\..\..\source\sumo\include" /I "..\..\..\..\..\lib\windows\moto\include" /I "..\..\..\..\source\sumo\fuzzics\include" /I "..\..\..\..\..\lib\windows\openal\include" /I "..\..\..\..\..\lib\windows\python\include\python2.0" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
+# ADD CPP /nologo /MD /GX /O2 /I "..\..\..\..\..\lib\windows\python\include\python1.5" /I "..\..\..\..\..\lib\windows\python\include\python2.0" /I "..\..\..\..\..\lib\windows\python\include\python2.2" /I "..\..\..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\..\source\gameengine\Converter" /I "..\..\..\..\source\gameengine\soundsystem\snd_dummy" /I "..\..\..\..\..\lib\windows\bmfont\include" /I "..\..\..\..\..\lib\windows\string\include" /I "..\..\..\..\lib\windows\string\include" /I "..\..\..\..\source\gameengine\expressions" /I "..\..\..\..\source\gameengine\ketsji" /I "..\..\..\..\source\gameengine\GamePlayer\common\\" /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\source\gameengine\ketsji\kxnetwork" /I "..\..\..\..\source\gameengine\rasterizer" /I "..\..\..\..\source\gameengine\rasterizer\ras_openglrasterizer" /I "..\..\..\..\source\gameengine\scenegraph" /I "..\..\..\..\source\gameengine\gamelogic" /I "..\..\..\..\source\gameengine\soundsystem" /I "..\..\..\..\source\gameengine\soundsystem\snd_openal" /I "..\..\..\..\source\gameengine\network" /I "..\..\..\..\source\gameengine\network\loopbacknetwork" /I "..\..\..\..\source\sumo\include" /I "..\..\..\..\..\lib\windows\moto\include" /I "..\..\..\..\source\sumo\fuzzics\include" /I "..\..\..\..\..\lib\windows\openal\include" /I "../../../../source/blender/blenkernel" /I "../../../../source/blender/makesdna" /I "../../../../source/blender/blenlib" /I "../../../../source/blender/blenloader" /I "../../../../source/blender/render/extern/include" /I "../../../../source/blender/imbuf" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\..\..\..\obj\windows\gameengine\gameplayer\common\GP_common.lib"
+# ADD LIB32 /nologo
+
+!ENDIF 
+
+# Begin Target
+
+# Name "GP_common - Win32 Release"
+# Name "GP_common - Win32 Debug"
+# Name "GP_common - Win32 MT DLL Debug"
+# Name "GP_common - Win32 MT DLL Release"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\common\bmfont.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\common\GPC_Canvas.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\common\GPC_Engine.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\common\GPC_KeyboardDevice.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\common\GPC_MouseDevice.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\common\GPC_PolygonMaterial.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\common\GPC_RawImage.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\common\GPC_RawLoadDotBlendArray.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\common\GPC_RawLogoArrays.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\common\GPC_RenderTools.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\common\GPC_System.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\common\windows\GPW_Canvas.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\common\windows\GPW_Engine.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\common\windows\GPW_KeyboardDevice.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\common\windows\GPW_System.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\common\GPC_Canvas.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\common\GPC_Engine.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\common\GPC_KeyboardDevice.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\common\GPC_MouseDevice.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\common\GPC_PolygonMaterial.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\common\GPC_RenderTools.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\common\GPC_System.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\common\windows\GPW_Canvas.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\common\windows\GPW_Engine.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\common\windows\GPW_KeyboardDevice.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\common\windows\GPW_System.h
+# End Source File
+# End Group
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\common\Makefile
+# End Source File
+# End Target
+# End Project
diff --git a/projectfiles/gameengine/gameplayer/ghost/GP_ghost.dsp b/projectfiles/gameengine/gameplayer/ghost/GP_ghost.dsp
index d569d6fceacd45a2f07a99da6418125b745e7305..63ce23d2647657a5c8ea4fee3fde1b903a762275 100644
--- a/projectfiles/gameengine/gameplayer/ghost/GP_ghost.dsp
+++ b/projectfiles/gameengine/gameplayer/ghost/GP_ghost.dsp
@@ -1,156 +1,156 @@
-# Microsoft Developer Studio Project File - Name="GP_ghost" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=GP_ghost - Win32 Release
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "GP_ghost.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "GP_ghost.mak" CFG="GP_ghost - Win32 Release"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "GP_ghost - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "GP_ghost - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "GP_ghost - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\..\obj\windows\"
-# PROP Intermediate_Dir "..\..\..\..\obj\windows\gameengine\gameplayer\ghost\"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\..\..\..\lib\windows\ode\include" /I "..\..\..\..\..\lib\windows\moto\include" /I "..\..\..\..\source\gameengine\Physics\Ode" /I "..\..\..\..\source\gameengine\Physics" /I "..\..\..\..\..\lib\windows\python\include\python2.2" /I "..\..\..\..\..\lib\windows\bmfont\include" /I "..\..\..\..\source\kernel\gen_messaging" /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\source\gameengine\expressions" /I "..\..\..\..\source\gameengine\ketsji" /I "..\..\..\..\source\gameengine\ketsji\kxnetwork" /I "..\..\..\..\source\gameengine\rasterizer" /I "..\..\..\..\source\gameengine\rasterizer\ras_openglrasterizer" /I "..\..\..\..\source\gameengine\scenegraph" /I "..\..\..\..\source\gameengine\gamelogic" /I "..\..\..\..\source\gameengine\soundsystem" /I "..\..\..\..\source\gameengine\soundsystem\snd_openal" /I "..\..\..\..\source\gameengine\network" /I "..\..\..\..\source\gameengine\network\loopbacknetwork" /I "..\..\..\..\source\sumo\include" /I "..\..\..\..\source\sumo\fuzzics\include" /I "..\..\..\..\..\lib\windows\openal\include" /I "..\..\..\..\source\gameengine\gameplayer\common" /I "../../../../source/blender/blenkernel" /I "../../../../source/blender/makesdna" /I "../../../../source/blender/blenlib" /I "../../../../source/blender/blenloader" /I "../../../../source/blender/readblenfile" /I "../../../../source/blender/render/extern/include" /I "../../../../source/blender/imbuf" /I "..\..\..\..\source\gameengine\converter" /I "..\..\..\..\source\gameengine\gameplayer\common\windows" /I "..\..\..\..\..\lib\windows\string\include" /I "..\..\..\..\..\lib\windows\ghost\include" /I "..\..\..\..\..\lib\windows\iksolver\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 libguardedalloc.a libstring.a libghost.a odelib.lib fmodvc.lib libbmfont.a ws2_32.lib kernel32.lib user32.lib gdi32.lib vfw32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libjpeg.a opengl32.lib glu32.lib openal_static.lib dxguid.lib libblenkey.a libeay32.lib libpng.a libz.a libmoto.a /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libc.lib" /nodefaultlib:"msvcrt.lib" /nodefaultlib:"msvcrtd.lib" /nodefaultlib:"msvcprt.lib" /out:"..\..\..\..\obj\windows\blenderplayer.exe" /libpath:"..\..\..\..\..\lib\windows\ode\lib" /libpath:"..\..\..\..\..\lib\windows\bmfont\lib" /libpath:"..\..\..\..\..\lib\windows\guardedalloc\lib" /libpath:"..\..\..\..\..\lib\windows\string\lib" /libpath:"..\..\..\..\..\lib\windows\ghost\lib" /libpath:"..\..\..\..\..\lib\windows\jpeg/lib" /libpath:"..\..\..\..\..\lib\windows\moto\lib\\" /libpath:"..\..\..\..\..\lib\windows\png\lib" /libpath:"..\..\..\..\..\lib\windows\zlib\lib" /libpath:"..\..\..\..\..\lib\windows\ode-0.03\lib" /libpath:"../../../../../lib/windows/fmod/lib" /libpath:"..\..\..\..\..\lib\windows\python\lib" /libpath:"../../../../../lib/windows/openal/lib" /libpath:"..\..\..\..\..\lib\windows\openssl\lib" /libpath:"..\..\..\..\..\lib\windows\blenkey\lib\\"
-# SUBTRACT LINK32 /pdb:none
-
-!ELSEIF  "$(CFG)" == "GP_ghost - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\..\obj\windows\debug"
-# PROP Intermediate_Dir "..\..\..\..\obj\windows\gameengine\gameplayer\ghost\debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../../../../lib/windows/moto/include" /I "..\..\..\..\source\gameengine\Physics\Ode" /I "..\..\..\..\source\gameengine\Physics" /I "..\..\..\..\..\lib\windows\python\include\python2.2" /I "..\..\..\..\..\lib\windows\bmfont\include" /I "..\..\..\..\source\kernel\gen_messaging" /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\source\gameengine\expressions" /I "..\..\..\..\source\gameengine\ketsji" /I "..\..\..\..\source\gameengine\ketsji\kxnetwork" /I "..\..\..\..\source\gameengine\rasterizer" /I "..\..\..\..\source\gameengine\rasterizer\ras_openglrasterizer" /I "..\..\..\..\source\gameengine\scenegraph" /I "..\..\..\..\source\gameengine\gamelogic" /I "..\..\..\..\source\gameengine\soundsystem" /I "..\..\..\..\source\gameengine\soundsystem\snd_openal" /I "..\..\..\..\source\gameengine\network" /I "..\..\..\..\source\gameengine\network\loopbacknetwork" /I "..\..\..\..\source\sumo\include" /I "..\..\..\..\source\sumo\fuzzics\include" /I "..\..\..\..\..\lib\windows\openal\include" /I "..\..\..\..\source\gameengine\gameplayer\common" /I "../../../../source/blender/blenkernel" /I "../../../../source/blender/makesdna" /I "../../../../source/blender/blenlib" /I "../../../../source/blender/blenloader" /I "../../../../source/blender/readblenfile" /I "../../../../source/blender/render/extern/include" /I "../../../../source/blender/imbuf" /I "..\..\..\..\source\gameengine\converter" /I "..\..\..\..\source\gameengine\gameplayer\common\windows" /I "..\..\..\..\..\lib\windows\string\include" /I "..\..\..\..\..\lib\windows\ghost\include" /I "../../../../../lib/windows/iksolver/include" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "dSINGLE" /U "_DEBUG" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 libguardedalloc.a libstring.a libghost.a odelib.lib fmodvc.lib libbmfont.a ws2_32.lib kernel32.lib user32.lib gdi32.lib vfw32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib opengl32.lib glu32.lib openal_static.lib libjpeg.a dxguid.lib libblenkey.a libeay32.lib libpng.a libz.a libmoto.a /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libc.lib" /nodefaultlib:"libcmt.lib" /nodefaultlib:"msvcrt.lib" /nodefaultlib:"msvcrtd.lib" /nodefaultlib:"msvcprtd.lib" /out:"..\..\..\..\obj\windows\debug\blenderplayer.exe" /pdbtype:sept /libpath:"..\..\..\..\..\lib\windows\ode\lib" /libpath:"..\..\..\..\..\lib\windows\bmfont\lib\\" /libpath:"..\..\..\..\..\lib\windows\guardedalloc\lib" /libpath:"..\..\..\..\..\lib\windows\string\lib\\" /libpath:"..\..\..\..\..\lib\windows\ghost\lib\\" /libpath:"..\..\..\..\..\lib\windows\jpeg\lib" /libpath:"..\..\..\..\..\lib\windows\moto\lib\\" /libpath:"..\..\..\..\..\lib\windows\zlib\lib\\" /libpath:"..\..\..\..\..\lib\windows\png\lib\\" /libpath:"..\..\..\..\..\lib\windows\ode-0.03\lib" /libpath:"../../../../../lib/windows/fmod/lib" /libpath:"..\..\..\..\..\lib\windows\python\lib" /libpath:"../../../../../lib/windows/openal/lib" /libpath:"..\..\..\..\..\lib\windows\openssl\lib" /libpath:"..\..\..\..\..\lib\windows\blenkey\lib\\"
-# SUBTRACT LINK32 /pdb:none
-
-!ENDIF 
-
-# Begin Target
-
-# Name "GP_ghost - Win32 Release"
-# Name "GP_ghost - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\..\..\source\blender\makesdna\intern\dna.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\ghost\GPG_Application.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\ghost\GPG_Canvas.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\ghost\GPG_ghost.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\ghost\GPG_KeyboardDevice.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\ghost\GPG_System.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\blender\blenkernel\bad_level_call_stubs\stubs.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\icons\winplayer.rc
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\ghost\GPG_Application.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\ghost\GPG_Canvas.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\ghost\GPG_KeyboardDevice.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\ghost\GPG_System.h
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# Begin Source File
-
-SOURCE=..\..\..\..\source\icons\winplayer.ico
-# End Source File
-# End Group
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\ghost\Makefile
-# End Source File
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="GP_ghost" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=GP_ghost - Win32 Release
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "GP_ghost.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "GP_ghost.mak" CFG="GP_ghost - Win32 Release"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "GP_ghost - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "GP_ghost - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "GP_ghost - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\..\..\obj\windows\"
+# PROP Intermediate_Dir "..\..\..\..\obj\windows\gameengine\gameplayer\ghost\"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\..\..\..\lib\windows\ode\include" /I "..\..\..\..\..\lib\windows\moto\include" /I "..\..\..\..\source\gameengine\Physics\Ode" /I "..\..\..\..\source\gameengine\Physics" /I "..\..\..\..\..\lib\windows\python\include\python2.2" /I "..\..\..\..\..\lib\windows\bmfont\include" /I "..\..\..\..\source\kernel\gen_messaging" /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\source\gameengine\expressions" /I "..\..\..\..\source\gameengine\ketsji" /I "..\..\..\..\source\gameengine\ketsji\kxnetwork" /I "..\..\..\..\source\gameengine\rasterizer" /I "..\..\..\..\source\gameengine\rasterizer\ras_openglrasterizer" /I "..\..\..\..\source\gameengine\scenegraph" /I "..\..\..\..\source\gameengine\gamelogic" /I "..\..\..\..\source\gameengine\soundsystem" /I "..\..\..\..\source\gameengine\soundsystem\snd_openal" /I "..\..\..\..\source\gameengine\network" /I "..\..\..\..\source\gameengine\network\loopbacknetwork" /I "..\..\..\..\source\sumo\include" /I "..\..\..\..\source\sumo\fuzzics\include" /I "..\..\..\..\..\lib\windows\openal\include" /I "..\..\..\..\source\gameengine\gameplayer\common" /I "../../../../source/blender/blenkernel" /I "../../../../source/blender/makesdna" /I "../../../../source/blender/blenlib" /I "../../../../source/blender/blenloader" /I "../../../../source/blender/readblenfile" /I "../../../../source/blender/render/extern/include" /I "../../../../source/blender/imbuf" /I "..\..\..\..\source\gameengine\converter" /I "..\..\..\..\source\gameengine\gameplayer\common\windows" /I "..\..\..\..\..\lib\windows\string\include" /I "..\..\..\..\..\lib\windows\ghost\include" /I "..\..\..\..\..\lib\windows\iksolver\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 libguardedalloc.a libstring.a libghost.a odelib.lib fmodvc.lib libbmfont.a ws2_32.lib kernel32.lib user32.lib gdi32.lib vfw32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libjpeg.a opengl32.lib glu32.lib openal_static.lib dxguid.lib libblenkey.a libeay32.lib libpng.a libz.a libmoto.a /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libc.lib" /nodefaultlib:"msvcrt.lib" /nodefaultlib:"msvcrtd.lib" /nodefaultlib:"msvcprt.lib" /out:"..\..\..\..\obj\windows\blenderplayer.exe" /libpath:"..\..\..\..\..\lib\windows\ode\lib" /libpath:"..\..\..\..\..\lib\windows\bmfont\lib" /libpath:"..\..\..\..\..\lib\windows\guardedalloc\lib" /libpath:"..\..\..\..\..\lib\windows\string\lib" /libpath:"..\..\..\..\..\lib\windows\ghost\lib" /libpath:"..\..\..\..\..\lib\windows\jpeg/lib" /libpath:"..\..\..\..\..\lib\windows\moto\lib\\" /libpath:"..\..\..\..\..\lib\windows\png\lib" /libpath:"..\..\..\..\..\lib\windows\zlib\lib" /libpath:"..\..\..\..\..\lib\windows\ode-0.03\lib" /libpath:"../../../../../lib/windows/fmod/lib" /libpath:"..\..\..\..\..\lib\windows\python\lib" /libpath:"../../../../../lib/windows/openal/lib" /libpath:"..\..\..\..\..\lib\windows\openssl\lib" /libpath:"..\..\..\..\..\lib\windows\blenkey\lib\\"
+# SUBTRACT LINK32 /pdb:none
+
+!ELSEIF  "$(CFG)" == "GP_ghost - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\..\..\obj\windows\debug"
+# PROP Intermediate_Dir "..\..\..\..\obj\windows\gameengine\gameplayer\ghost\debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../../../../lib/windows/moto/include" /I "..\..\..\..\source\gameengine\Physics\Ode" /I "..\..\..\..\source\gameengine\Physics" /I "..\..\..\..\..\lib\windows\python\include\python2.2" /I "..\..\..\..\..\lib\windows\bmfont\include" /I "..\..\..\..\source\kernel\gen_messaging" /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\source\gameengine\expressions" /I "..\..\..\..\source\gameengine\ketsji" /I "..\..\..\..\source\gameengine\ketsji\kxnetwork" /I "..\..\..\..\source\gameengine\rasterizer" /I "..\..\..\..\source\gameengine\rasterizer\ras_openglrasterizer" /I "..\..\..\..\source\gameengine\scenegraph" /I "..\..\..\..\source\gameengine\gamelogic" /I "..\..\..\..\source\gameengine\soundsystem" /I "..\..\..\..\source\gameengine\soundsystem\snd_openal" /I "..\..\..\..\source\gameengine\network" /I "..\..\..\..\source\gameengine\network\loopbacknetwork" /I "..\..\..\..\source\sumo\include" /I "..\..\..\..\source\sumo\fuzzics\include" /I "..\..\..\..\..\lib\windows\openal\include" /I "..\..\..\..\source\gameengine\gameplayer\common" /I "../../../../source/blender/blenkernel" /I "../../../../source/blender/makesdna" /I "../../../../source/blender/blenlib" /I "../../../../source/blender/blenloader" /I "../../../../source/blender/readblenfile" /I "../../../../source/blender/render/extern/include" /I "../../../../source/blender/imbuf" /I "..\..\..\..\source\gameengine\converter" /I "..\..\..\..\source\gameengine\gameplayer\common\windows" /I "..\..\..\..\..\lib\windows\string\include" /I "..\..\..\..\..\lib\windows\ghost\include" /I "../../../../../lib/windows/iksolver/include" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "dSINGLE" /U "_DEBUG" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 libguardedalloc.a libstring.a libghost.a odelib.lib fmodvc.lib libbmfont.a ws2_32.lib kernel32.lib user32.lib gdi32.lib vfw32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib opengl32.lib glu32.lib openal_static.lib libjpeg.a dxguid.lib libblenkey.a libeay32.lib libpng.a libz.a libmoto.a /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libc.lib" /nodefaultlib:"libcmt.lib" /nodefaultlib:"msvcrt.lib" /nodefaultlib:"msvcrtd.lib" /nodefaultlib:"msvcprtd.lib" /out:"..\..\..\..\obj\windows\debug\blenderplayer.exe" /pdbtype:sept /libpath:"..\..\..\..\..\lib\windows\ode\lib" /libpath:"..\..\..\..\..\lib\windows\bmfont\lib\\" /libpath:"..\..\..\..\..\lib\windows\guardedalloc\lib" /libpath:"..\..\..\..\..\lib\windows\string\lib\\" /libpath:"..\..\..\..\..\lib\windows\ghost\lib\\" /libpath:"..\..\..\..\..\lib\windows\jpeg\lib" /libpath:"..\..\..\..\..\lib\windows\moto\lib\\" /libpath:"..\..\..\..\..\lib\windows\zlib\lib\\" /libpath:"..\..\..\..\..\lib\windows\png\lib\\" /libpath:"..\..\..\..\..\lib\windows\ode-0.03\lib" /libpath:"../../../../../lib/windows/fmod/lib" /libpath:"..\..\..\..\..\lib\windows\python\lib" /libpath:"../../../../../lib/windows/openal/lib" /libpath:"..\..\..\..\..\lib\windows\openssl\lib" /libpath:"..\..\..\..\..\lib\windows\blenkey\lib\\"
+# SUBTRACT LINK32 /pdb:none
+
+!ENDIF 
+
+# Begin Target
+
+# Name "GP_ghost - Win32 Release"
+# Name "GP_ghost - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\..\..\..\source\blender\makesdna\intern\dna.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\ghost\GPG_Application.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\ghost\GPG_Canvas.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\ghost\GPG_ghost.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\ghost\GPG_KeyboardDevice.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\ghost\GPG_System.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\blender\blenkernel\bad_level_call_stubs\stubs.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\icons\winplayer.rc
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\ghost\GPG_Application.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\ghost\GPG_Canvas.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\ghost\GPG_KeyboardDevice.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\ghost\GPG_System.h
+# End Source File
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# Begin Source File
+
+SOURCE=..\..\..\..\source\icons\winplayer.ico
+# End Source File
+# End Group
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\ghost\Makefile
+# End Source File
+# End Target
+# End Project
diff --git a/projectfiles/gameengine/gameplayer/glut/GP_glut.dsp b/projectfiles/gameengine/gameplayer/glut/GP_glut.dsp
index 64315293ac601f6c011b2e7de9598d5cc7a166f9..7e3a2060f92cf5115a88355606771990266256c8 100644
--- a/projectfiles/gameengine/gameplayer/glut/GP_glut.dsp
+++ b/projectfiles/gameengine/gameplayer/glut/GP_glut.dsp
@@ -1,205 +1,205 @@
-# Microsoft Developer Studio Project File - Name="GP_glut" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=GP_glut - Win32 Profile
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "GP_glut.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "GP_glut.mak" CFG="GP_glut - Win32 Profile"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "GP_glut - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "GP_glut - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "GP_glut - Win32 Profile" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "GP_glut - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "..\..\..\..\..\obj\windows\gameengine\gameplayer\glut"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\source\gameengine\network" /I "..\..\..\..\source\gameengine\network\loopbacknetwork" /I "..\..\..\..\source\gameengine\gameplayer\common" /I "..\..\..\..\source\gameengine\rasterizer" /I "..\..\..\..\source\gameengine\gamelogic" /I "..\..\..\..\source\sumo\include" /I "..\..\..\..\source\sumo\Fuzzics\include" /I "..\..\..\..\..\lib\windows\glut-3.7\include" /I "..\..\..\..\..\lib\windows\python\include\python2.0" /I "..\..\source\gameengine\SoundSystem" /I "../../../../../lib/windows/moto/include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 glu32.lib user32.lib gdi32.lib advapi32.lib dxguid.lib ole32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\..\lib\windows\glut-3.7\lib" /libpath:"..\..\..\..\..\lib\windows\python\lib" /libpath:"..\..\..\..\..\lib\windows\openal\lib\lib_release"
-
-!ELSEIF  "$(CFG)" == "GP_glut - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "..\..\..\..\..\obj\windows\gameengine\gameplayer\glut\debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\source\gameengine\network" /I "..\..\..\..\source\gameengine\network\loopbacknetwork" /I "..\..\..\..\source\gameengine\gameplayer\common" /I "..\..\..\..\source\gameengine\rasterizer" /I "..\..\..\..\source\gameengine\gamelogic" /I "..\..\..\..\source\sumo\include" /I "..\..\..\..\source\sumo\Fuzzics\include" /I "..\..\..\..\..\lib\windows\glut-3.7\include" /I "..\..\..\..\..\lib\windows\python\include\python1.5" /I "..\..\source\gameengine\SoundSystem" /I "../../../../../lib/windows/moto/include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 glu32.lib user32.lib gdi32.lib advapi32.lib dxguid.lib ole32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\..\lib\windows\glut-3.7\lib" /libpath:"..\..\..\..\..\lib\windows\python\lib" /libpath:"..\..\..\..\..\lib\windows\openal\lib\lib_release"
-
-!ELSEIF  "$(CFG)" == "GP_glut - Win32 Profile"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "GP_glut___Win32_Profile"
-# PROP BASE Intermediate_Dir "GP_glut___Win32_Profile"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "GP_glut___Win32_Profile"
-# PROP Intermediate_Dir "GP_glut___Win32_Profile"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\source\gameengine\network" /I "..\..\..\..\source\gameengine\network\loopbacknetwork" /I "..\..\..\..\source\gameengine\gameplayer\common" /I "..\..\..\..\source\gameengine\rasterizer" /I "..\..\..\..\source\gameengine\gamelogic" /I "..\..\..\..\source\sumo\include" /I "..\..\..\..\..\lib\windows\moto\include" /I "..\..\..\..\source\sumo\Fuzzics\include" /I "..\..\..\..\..\lib\windows\glut-3.7\include" /I "..\..\..\..\..\lib\windows\python\include\python1.5" /I "..\..\source\gameengine\SoundSystem" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /Zi /O2 /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\source\gameengine\network" /I "..\..\..\..\source\gameengine\network\loopbacknetwork" /I "..\..\..\..\source\gameengine\gameplayer\common" /I "..\..\..\..\source\gameengine\rasterizer" /I "..\..\..\..\source\gameengine\gamelogic" /I "..\..\..\..\source\sumo\include" /I "..\..\..\..\..\lib\windows\moto\include" /I "..\..\..\..\source\sumo\Fuzzics\include" /I "..\..\..\..\..\lib\windows\glut-3.7\include" /I "..\..\..\..\..\lib\windows\python\include\python1.5" /I "..\..\source\gameengine\SoundSystem" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 glu32.lib user32.lib gdi32.lib advapi32.lib dxguid.lib ole32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\..\lib\windows\glut-3.7\lib" /libpath:"..\..\..\..\..\lib\windows\python\lib" /libpath:"..\..\..\..\..\lib\windows\openal\lib\lib_release"
-# ADD LINK32 glu32.lib user32.lib gdi32.lib advapi32.lib dxguid.lib ole32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\..\lib\windows\glut-3.7\lib" /libpath:"..\..\..\..\..\lib\windows\python\lib" /libpath:"..\..\..\..\..\lib\windows\openal\lib\lib_release"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "GP_glut - Win32 Release"
-# Name "GP_glut - Win32 Debug"
-# Name "GP_glut - Win32 Profile"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\Glut\GlutGamePlayer.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\Glut\GlutKeyboardDevice.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\Glut\GlutSystem.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\Glut\GlutCanvas.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\Glut\GlutInputDevice.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\Glut\GlutKeyboardDevice.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\Glut\GlutPolygonMaterial.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\Glut\GlutRenderTools.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\Glut\GlutSystem.h
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# Begin Source File
-
-SOURCE=..\..\..\..\..\lib\windows\openal\lib\alc\ALc.obj
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\..\lib\windows\openal\lib\alu\ALu.obj
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\..\lib\windows\openal\lib\alut\ALut.obj
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\..\lib\windows\openal\lib\OpenAL32\alBuffer.obj
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\..\lib\windows\openal\lib\OpenAL32\alEax.obj
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\..\lib\windows\openal\lib\OpenAL32\alError.obj
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\..\lib\windows\openal\lib\OpenAL32\alExtension.obj
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\..\lib\windows\openal\lib\OpenAL32\alListener.obj
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\..\lib\windows\openal\lib\OpenAL32\alSource.obj
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\..\lib\windows\openal\lib\OpenAL32\alState.obj
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\..\lib\windows\openal\lib\OpenAL32\OpenAL32.obj
-# End Source File
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="GP_glut" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=GP_glut - Win32 Profile
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "GP_glut.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "GP_glut.mak" CFG="GP_glut - Win32 Profile"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "GP_glut - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "GP_glut - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "GP_glut - Win32 Profile" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "GP_glut - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "..\..\..\..\..\obj\windows\gameengine\gameplayer\glut"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\source\gameengine\network" /I "..\..\..\..\source\gameengine\network\loopbacknetwork" /I "..\..\..\..\source\gameengine\gameplayer\common" /I "..\..\..\..\source\gameengine\rasterizer" /I "..\..\..\..\source\gameengine\gamelogic" /I "..\..\..\..\source\sumo\include" /I "..\..\..\..\source\sumo\Fuzzics\include" /I "..\..\..\..\..\lib\windows\glut-3.7\include" /I "..\..\..\..\..\lib\windows\python\include\python2.0" /I "..\..\source\gameengine\SoundSystem" /I "../../../../../lib/windows/moto/include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 glu32.lib user32.lib gdi32.lib advapi32.lib dxguid.lib ole32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\..\lib\windows\glut-3.7\lib" /libpath:"..\..\..\..\..\lib\windows\python\lib" /libpath:"..\..\..\..\..\lib\windows\openal\lib\lib_release"
+
+!ELSEIF  "$(CFG)" == "GP_glut - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "..\..\..\..\..\obj\windows\gameengine\gameplayer\glut\debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\source\gameengine\network" /I "..\..\..\..\source\gameengine\network\loopbacknetwork" /I "..\..\..\..\source\gameengine\gameplayer\common" /I "..\..\..\..\source\gameengine\rasterizer" /I "..\..\..\..\source\gameengine\gamelogic" /I "..\..\..\..\source\sumo\include" /I "..\..\..\..\source\sumo\Fuzzics\include" /I "..\..\..\..\..\lib\windows\glut-3.7\include" /I "..\..\..\..\..\lib\windows\python\include\python1.5" /I "..\..\source\gameengine\SoundSystem" /I "../../../../../lib/windows/moto/include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 glu32.lib user32.lib gdi32.lib advapi32.lib dxguid.lib ole32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\..\lib\windows\glut-3.7\lib" /libpath:"..\..\..\..\..\lib\windows\python\lib" /libpath:"..\..\..\..\..\lib\windows\openal\lib\lib_release"
+
+!ELSEIF  "$(CFG)" == "GP_glut - Win32 Profile"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "GP_glut___Win32_Profile"
+# PROP BASE Intermediate_Dir "GP_glut___Win32_Profile"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "GP_glut___Win32_Profile"
+# PROP Intermediate_Dir "GP_glut___Win32_Profile"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\source\gameengine\network" /I "..\..\..\..\source\gameengine\network\loopbacknetwork" /I "..\..\..\..\source\gameengine\gameplayer\common" /I "..\..\..\..\source\gameengine\rasterizer" /I "..\..\..\..\source\gameengine\gamelogic" /I "..\..\..\..\source\sumo\include" /I "..\..\..\..\..\lib\windows\moto\include" /I "..\..\..\..\source\sumo\Fuzzics\include" /I "..\..\..\..\..\lib\windows\glut-3.7\include" /I "..\..\..\..\..\lib\windows\python\include\python1.5" /I "..\..\source\gameengine\SoundSystem" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GX /Zi /O2 /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\source\gameengine\network" /I "..\..\..\..\source\gameengine\network\loopbacknetwork" /I "..\..\..\..\source\gameengine\gameplayer\common" /I "..\..\..\..\source\gameengine\rasterizer" /I "..\..\..\..\source\gameengine\gamelogic" /I "..\..\..\..\source\sumo\include" /I "..\..\..\..\..\lib\windows\moto\include" /I "..\..\..\..\source\sumo\Fuzzics\include" /I "..\..\..\..\..\lib\windows\glut-3.7\include" /I "..\..\..\..\..\lib\windows\python\include\python1.5" /I "..\..\source\gameengine\SoundSystem" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 glu32.lib user32.lib gdi32.lib advapi32.lib dxguid.lib ole32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\..\lib\windows\glut-3.7\lib" /libpath:"..\..\..\..\..\lib\windows\python\lib" /libpath:"..\..\..\..\..\lib\windows\openal\lib\lib_release"
+# ADD LINK32 glu32.lib user32.lib gdi32.lib advapi32.lib dxguid.lib ole32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\..\lib\windows\glut-3.7\lib" /libpath:"..\..\..\..\..\lib\windows\python\lib" /libpath:"..\..\..\..\..\lib\windows\openal\lib\lib_release"
+
+!ENDIF 
+
+# Begin Target
+
+# Name "GP_glut - Win32 Release"
+# Name "GP_glut - Win32 Debug"
+# Name "GP_glut - Win32 Profile"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\Glut\GlutGamePlayer.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\Glut\GlutKeyboardDevice.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\Glut\GlutSystem.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\Glut\GlutCanvas.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\Glut\GlutInputDevice.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\Glut\GlutKeyboardDevice.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\Glut\GlutPolygonMaterial.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\Glut\GlutRenderTools.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\Glut\GlutSystem.h
+# End Source File
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# Begin Source File
+
+SOURCE=..\..\..\..\..\lib\windows\openal\lib\alc\ALc.obj
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\..\lib\windows\openal\lib\alu\ALu.obj
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\..\lib\windows\openal\lib\alut\ALut.obj
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\..\lib\windows\openal\lib\OpenAL32\alBuffer.obj
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\..\lib\windows\openal\lib\OpenAL32\alEax.obj
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\..\lib\windows\openal\lib\OpenAL32\alError.obj
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\..\lib\windows\openal\lib\OpenAL32\alExtension.obj
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\..\lib\windows\openal\lib\OpenAL32\alListener.obj
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\..\lib\windows\openal\lib\OpenAL32\alSource.obj
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\..\lib\windows\openal\lib\OpenAL32\alState.obj
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\..\lib\windows\openal\lib\OpenAL32\OpenAL32.obj
+# End Source File
+# End Target
+# End Project
diff --git a/projectfiles/gameengine/gameplayer/loader/BlenderLoader/BlenderLoader.dsp b/projectfiles/gameengine/gameplayer/loader/BlenderLoader/BlenderLoader.dsp
index 1af82b0644f38891b006780472efead143ff4c24..eb16fea9fd27c21dfbdf8988e2f5247388973317 100644
--- a/projectfiles/gameengine/gameplayer/loader/BlenderLoader/BlenderLoader.dsp
+++ b/projectfiles/gameengine/gameplayer/loader/BlenderLoader/BlenderLoader.dsp
@@ -1,206 +1,206 @@
-# Microsoft Developer Studio Project File - Name="BlenderLoader" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=BlenderLoader - Win32 Profile
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "BlenderLoader.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "BlenderLoader.mak" CFG="BlenderLoader - Win32 Profile"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "BlenderLoader - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "BlenderLoader - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "BlenderLoader - Win32 Profile" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "BlenderLoader - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\..\..\..\obj\windows\gameengine\gameplayer\BlenderLoader"
-# PROP Intermediate_Dir "..\..\..\..\..\..\obj\windows\gameengine\gameplayer\BlenderLoader"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "../../../../../../lib/windows/python/include/python2.0" /I "../../../../../source/blender/encrypt" /I "../../../../../source/blender/blenkernel" /I "../../../../../source/blender/makesdna" /I "../../../../../source/blender/blenlib" /I "../../../../../source/blender/blenloader" /I "../../../../../source/blender/render/extern/include" /I "../../../../../source/gameengine/Rasterizer" /I "../../../../../../lib\windows\sdl\SDL-1.1.7\include" /I "../../../../../source/gameengine/GameLogic" /I "..\..\..\..\..\source\sumo\include" /I "..\..\..\..\..\..\lib\windows\moto\include" /I "..\..\..\..\..\source\sumo\Fuzzics\include" /I "..\..\..\..\..\source\kernel\gen_system" /I "../../../../../source/blender/imbuf" /I "../../../../../source/gameengine/SoundSystem" /I "../../../../../source/gameengine/SoundSystem/SND_OpenAL" /I "../../../../../source/gameengine/Ketsji" /I "../../../../../source/gameengine/Expressions" /I "../../../../../source/gameengine/SceneGraph" /I "../../../../../source/gameengine/ketsji/kxnetwork" /I "../../../../../source/gameengine/network" /I "../../../../../source/gameengine/network/loopbacknetwork" /I "../../../../../source/gameengine/GamePlayer/common" /I "../../../../../../lib/windows/iksolver/include" /I "../../../../../source/gameengine/SoundSystem/SND_Dummy" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 libguardedalloc.a libmoto.a sdlmain.lib sdl.lib dxguid.lib ole32.lib libjpeg.lib glu32.lib opengl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /out:"..\..\..\..\..\..\obj\windows\BlenderLoader.exe" /libpath:"../../../../../../lib/windows/moto/lib" /libpath:"..\..\..\..\..\..\lib\windows\guardedalloc\lib" /libpath:"../../../../../../lib/windows/python/lib" /libpath:"../../../../../../lib/windows/jpeg/lib" /libpath:"../../../../../../lib/windows/sdl/SDL-1.1.7\Lib"
-
-!ELSEIF  "$(CFG)" == "BlenderLoader - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\..\..\..\obj\windows\gameengine\gameplayer\BlenderLoader\debug"
-# PROP Intermediate_Dir "..\..\..\..\..\..\obj\windows\gameengine\gameplayer\BlenderLoader\debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "../../../../../../lib/windows/python/include/python1.5" /I "../../../../../source/blender/encrypt" /I "../../../../../source/blender/blenkernel" /I "../../../../../source/blender/makesdna" /I "../../../../../source/blender/blenlib" /I "../../../../../source/blender/blenloader" /I "../../../../../source/blender/render/extern/include" /I "../../../../../source/gameengine/Rasterizer" /I "../../../../../../lib\windows\sdl\SDL-1.1.7\include" /I "../../../../../source/gameengine/GameLogic" /I "..\..\..\..\..\source\sumo\include" /I "..\..\..\..\..\..\lib\windows\moto\include" /I "..\..\..\..\..\source\sumo\Fuzzics\include" /I "..\..\..\..\..\source\kernel\gen_system" /I "../../../../../source/blender/imbuf" /I "../../../../../source/gameengine/SoundSystem" /I "../../../../../source/gameengine/SoundSystem/SND_OpenAL" /I "../../../../../source/gameengine/Ketsji" /I "../../../../../source/gameengine/Expressions" /I "../../../../../source/gameengine/SceneGraph" /I "../../../../../source/gameengine/ketsji/kxnetwork" /I "../../../../../source/gameengine/network" /I "../../../../../source/gameengine/network/loopbacknetwork" /I "../../../../../source/gameengine/GamePlayer/common" /I "../../../../../../lib/windows/iksolver/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Fr /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 sdldebug.lib libguardedalloc.a libmoto.a sdlmain.lib sdl.lib dxguid.lib ole32.lib libjpeg.lib glu32.lib opengl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /out:"..\..\..\..\..\..\obj\windows\debug\BlenderLoader.exe" /pdbtype:sept /libpath:"..\..\..\..\..\..\lib\windows\guardedalloc\lib" /libpath:"../../../../../../lib/windows/python/lib" /libpath:"../../../../../../lib/windows/jpeg/lib" /libpath:"../../../../../../lib/windows/sdl/SDL-1.1.7\Lib"
-
-!ELSEIF  "$(CFG)" == "BlenderLoader - Win32 Profile"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "BlenderLoader___Win32_Profile"
-# PROP BASE Intermediate_Dir "BlenderLoader___Win32_Profile"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "BlenderLoader___Win32_Profile"
-# PROP Intermediate_Dir "BlenderLoader___Win32_Profile"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "../../../../../../lib/windows/python/include/python1.5" /I "../../../../../source/blender/blenkernel" /I "../../../../../source/blender/makesdna" /I "../../../../../source/blender/blenlib" /I "../../../../../source/blender/blenloader" /I "../../../../../source/blender/render/extern/include" /I "../../../../../source/gameengine/Rasterizer" /I "../../../../../../lib\windows\sdl\SDL-1.1.7\include" /I "../../../../../source/gameengine/GameLogic" /I "..\..\..\..\..\source\sumo\include" /I "..\..\..\..\..\..\lib\windows\moto\include" /I "..\..\..\..\..\source\sumo\Fuzzics\include" /I "..\..\..\..\..\source\kernel\gen_system" /I "../../../../../source/blender/imbuf" /I "../../../../../source/gameengine/SoundSystem" /I "../../../../../source/gameengine/SoundSystem/SND_OpenAL" /I "../../../../../source/gameengine/Ketsji" /I "../../../../../source/gameengine/Expressions" /I "../../../../../source/gameengine/SceneGraph" /I "../../../../../source/gameengine/ketsji/kxnetwork" /I "../../../../../source/gameengine/network" /I "../../../../../source/gameengine/network/loopbacknetwork" /I "../../../../../source/gameengine/GamePlayer/common" /I "../../../../../../lib/windows/iksolver/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# SUBTRACT BASE CPP /Fr
-# ADD CPP /nologo /W3 /Gm /GX /Zi /O2 /I "../../../../../../lib/windows/python/include/python1.5" /I "../../../../../source/blender/encrypt" /I "../../../../../source/blender/blenkernel" /I "../../../../../source/blender/makesdna" /I "../../../../../source/blender/blenlib" /I "../../../../../source/blender/blenloader" /I "../../../../../source/blender/render/extern/include" /I "../../../../../source/gameengine/Rasterizer" /I "../../../../../../lib\windows\sdl\SDL-1.1.7\include" /I "../../../../../source/gameengine/GameLogic" /I "..\..\..\..\..\source\sumo\include" /I "..\..\..\..\..\..\lib\windows\moto\include" /I "..\..\..\..\..\source\sumo\Fuzzics\include" /I "..\..\..\..\..\source\kernel\gen_system" /I "../../../../../source/blender/imbuf" /I "../../../../../source/gameengine/SoundSystem" /I "../../../../../source/gameengine/SoundSystem/SND_OpenAL" /I "../../../../../source/gameengine/Ketsji" /I "../../../../../source/gameengine/Expressions" /I "../../../../../source/gameengine/SceneGraph" /I "../../../../../source/gameengine/ketsji/kxnetwork" /I "../../../../../source/gameengine/network" /I "../../../../../source/gameengine/network/loopbacknetwork" /I "../../../../../source/gameengine/GamePlayer/common" /I "../../../../../../lib/windows/iksolver/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 sdldebug.lib sdlmain.lib sdl.lib dxguid.lib ole32.lib libjpeg.lib glu32.lib opengl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /out:"..\..\..\..\..\..\obj\windows\debug\BlenderLoader.exe" /pdbtype:sept /libpath:"../../../../../../lib/windows/python/lib" /libpath:"../../../../../../lib/windows/jpeg/lib" /libpath:"../../../../../../lib/windows/sdl/SDL-1.1.7\Lib"
-# ADD LINK32 sdldebug.lib libguardedalloc.a libmoto.a sdlmain.lib sdl.lib dxguid.lib ole32.lib libjpeg.lib glu32.lib opengl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /out:"..\..\..\..\..\..\obj\windows\profile\BlenderLoader.exe" /pdbtype:sept /libpath:"..\..\..\..\..\..\lib\windows\guardedalloc\lib" /libpath:"../../../../../../lib/windows/python/lib" /libpath:"../../../../../../lib/windows/jpeg/lib" /libpath:"../../../../../../lib/windows/sdl/SDL-1.1.7\Lib"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "BlenderLoader - Win32 Release"
-# Name "BlenderLoader - Win32 Debug"
-# Name "BlenderLoader - Win32 Profile"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\..\..\..\source\blender\makesdna\intern\dna.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\..\source\gameengine\GamePlayer\Loaders\Blender\loader.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\..\source\gameengine\GamePlayer\Loaders\Blender\SDLKeyboardDevice.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\..\source\gameengine\GamePlayer\Loaders\Blender\SDLSystem.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\..\source\blender\blenkernel\bad_level_call_stubs\stubs.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\..\..\..\..\source\gameengine\GamePlayer\Loaders\Blender\SDLCanvas.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\..\source\gameengine\GamePlayer\Loaders\Blender\SDLInputDevice.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\..\source\gameengine\GamePlayer\Loaders\Blender\SDLKeyboardDevice.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\..\source\gameengine\GamePlayer\Loaders\Blender\SDLSystem.h
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# Begin Source File
-
-SOURCE=..\..\..\..\..\..\lib\windows\openal\lib\alc\ALc.obj
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\..\..\lib\windows\openal\lib\alu\ALu.obj
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\..\..\lib\windows\openal\lib\alut\ALut.obj
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\..\..\lib\windows\openal\lib\OpenAL32\alBuffer.obj
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\..\..\lib\windows\openal\lib\OpenAL32\alEax.obj
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\..\..\lib\windows\openal\lib\OpenAL32\alError.obj
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\..\..\lib\windows\openal\lib\OpenAL32\alExtension.obj
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\..\..\lib\windows\openal\lib\OpenAL32\alListener.obj
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\..\..\lib\windows\openal\lib\OpenAL32\alSource.obj
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\..\..\lib\windows\openal\lib\OpenAL32\alState.obj
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\..\..\lib\windows\openal\lib\OpenAL32\OpenAL32.obj
-# End Source File
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="BlenderLoader" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=BlenderLoader - Win32 Profile
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "BlenderLoader.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "BlenderLoader.mak" CFG="BlenderLoader - Win32 Profile"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "BlenderLoader - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "BlenderLoader - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "BlenderLoader - Win32 Profile" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "BlenderLoader - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\..\..\..\..\obj\windows\gameengine\gameplayer\BlenderLoader"
+# PROP Intermediate_Dir "..\..\..\..\..\..\obj\windows\gameengine\gameplayer\BlenderLoader"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /I "../../../../../../lib/windows/python/include/python2.0" /I "../../../../../source/blender/encrypt" /I "../../../../../source/blender/blenkernel" /I "../../../../../source/blender/makesdna" /I "../../../../../source/blender/blenlib" /I "../../../../../source/blender/blenloader" /I "../../../../../source/blender/render/extern/include" /I "../../../../../source/gameengine/Rasterizer" /I "../../../../../../lib\windows\sdl\SDL-1.1.7\include" /I "../../../../../source/gameengine/GameLogic" /I "..\..\..\..\..\source\sumo\include" /I "..\..\..\..\..\..\lib\windows\moto\include" /I "..\..\..\..\..\source\sumo\Fuzzics\include" /I "..\..\..\..\..\source\kernel\gen_system" /I "../../../../../source/blender/imbuf" /I "../../../../../source/gameengine/SoundSystem" /I "../../../../../source/gameengine/SoundSystem/SND_OpenAL" /I "../../../../../source/gameengine/Ketsji" /I "../../../../../source/gameengine/Expressions" /I "../../../../../source/gameengine/SceneGraph" /I "../../../../../source/gameengine/ketsji/kxnetwork" /I "../../../../../source/gameengine/network" /I "../../../../../source/gameengine/network/loopbacknetwork" /I "../../../../../source/gameengine/GamePlayer/common" /I "../../../../../../lib/windows/iksolver/include" /I "../../../../../source/gameengine/SoundSystem/SND_Dummy" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 libguardedalloc.a libmoto.a sdlmain.lib sdl.lib dxguid.lib ole32.lib libjpeg.lib glu32.lib opengl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /out:"..\..\..\..\..\..\obj\windows\BlenderLoader.exe" /libpath:"../../../../../../lib/windows/moto/lib" /libpath:"..\..\..\..\..\..\lib\windows\guardedalloc\lib" /libpath:"../../../../../../lib/windows/python/lib" /libpath:"../../../../../../lib/windows/jpeg/lib" /libpath:"../../../../../../lib/windows/sdl/SDL-1.1.7\Lib"
+
+!ELSEIF  "$(CFG)" == "BlenderLoader - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\..\..\..\..\obj\windows\gameengine\gameplayer\BlenderLoader\debug"
+# PROP Intermediate_Dir "..\..\..\..\..\..\obj\windows\gameengine\gameplayer\BlenderLoader\debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "../../../../../../lib/windows/python/include/python1.5" /I "../../../../../source/blender/encrypt" /I "../../../../../source/blender/blenkernel" /I "../../../../../source/blender/makesdna" /I "../../../../../source/blender/blenlib" /I "../../../../../source/blender/blenloader" /I "../../../../../source/blender/render/extern/include" /I "../../../../../source/gameengine/Rasterizer" /I "../../../../../../lib\windows\sdl\SDL-1.1.7\include" /I "../../../../../source/gameengine/GameLogic" /I "..\..\..\..\..\source\sumo\include" /I "..\..\..\..\..\..\lib\windows\moto\include" /I "..\..\..\..\..\source\sumo\Fuzzics\include" /I "..\..\..\..\..\source\kernel\gen_system" /I "../../../../../source/blender/imbuf" /I "../../../../../source/gameengine/SoundSystem" /I "../../../../../source/gameengine/SoundSystem/SND_OpenAL" /I "../../../../../source/gameengine/Ketsji" /I "../../../../../source/gameengine/Expressions" /I "../../../../../source/gameengine/SceneGraph" /I "../../../../../source/gameengine/ketsji/kxnetwork" /I "../../../../../source/gameengine/network" /I "../../../../../source/gameengine/network/loopbacknetwork" /I "../../../../../source/gameengine/GamePlayer/common" /I "../../../../../../lib/windows/iksolver/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Fr /YX /FD /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 sdldebug.lib libguardedalloc.a libmoto.a sdlmain.lib sdl.lib dxguid.lib ole32.lib libjpeg.lib glu32.lib opengl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /out:"..\..\..\..\..\..\obj\windows\debug\BlenderLoader.exe" /pdbtype:sept /libpath:"..\..\..\..\..\..\lib\windows\guardedalloc\lib" /libpath:"../../../../../../lib/windows/python/lib" /libpath:"../../../../../../lib/windows/jpeg/lib" /libpath:"../../../../../../lib/windows/sdl/SDL-1.1.7\Lib"
+
+!ELSEIF  "$(CFG)" == "BlenderLoader - Win32 Profile"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "BlenderLoader___Win32_Profile"
+# PROP BASE Intermediate_Dir "BlenderLoader___Win32_Profile"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "BlenderLoader___Win32_Profile"
+# PROP Intermediate_Dir "BlenderLoader___Win32_Profile"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "../../../../../../lib/windows/python/include/python1.5" /I "../../../../../source/blender/blenkernel" /I "../../../../../source/blender/makesdna" /I "../../../../../source/blender/blenlib" /I "../../../../../source/blender/blenloader" /I "../../../../../source/blender/render/extern/include" /I "../../../../../source/gameengine/Rasterizer" /I "../../../../../../lib\windows\sdl\SDL-1.1.7\include" /I "../../../../../source/gameengine/GameLogic" /I "..\..\..\..\..\source\sumo\include" /I "..\..\..\..\..\..\lib\windows\moto\include" /I "..\..\..\..\..\source\sumo\Fuzzics\include" /I "..\..\..\..\..\source\kernel\gen_system" /I "../../../../../source/blender/imbuf" /I "../../../../../source/gameengine/SoundSystem" /I "../../../../../source/gameengine/SoundSystem/SND_OpenAL" /I "../../../../../source/gameengine/Ketsji" /I "../../../../../source/gameengine/Expressions" /I "../../../../../source/gameengine/SceneGraph" /I "../../../../../source/gameengine/ketsji/kxnetwork" /I "../../../../../source/gameengine/network" /I "../../../../../source/gameengine/network/loopbacknetwork" /I "../../../../../source/gameengine/GamePlayer/common" /I "../../../../../../lib/windows/iksolver/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# SUBTRACT BASE CPP /Fr
+# ADD CPP /nologo /W3 /Gm /GX /Zi /O2 /I "../../../../../../lib/windows/python/include/python1.5" /I "../../../../../source/blender/encrypt" /I "../../../../../source/blender/blenkernel" /I "../../../../../source/blender/makesdna" /I "../../../../../source/blender/blenlib" /I "../../../../../source/blender/blenloader" /I "../../../../../source/blender/render/extern/include" /I "../../../../../source/gameengine/Rasterizer" /I "../../../../../../lib\windows\sdl\SDL-1.1.7\include" /I "../../../../../source/gameengine/GameLogic" /I "..\..\..\..\..\source\sumo\include" /I "..\..\..\..\..\..\lib\windows\moto\include" /I "..\..\..\..\..\source\sumo\Fuzzics\include" /I "..\..\..\..\..\source\kernel\gen_system" /I "../../../../../source/blender/imbuf" /I "../../../../../source/gameengine/SoundSystem" /I "../../../../../source/gameengine/SoundSystem/SND_OpenAL" /I "../../../../../source/gameengine/Ketsji" /I "../../../../../source/gameengine/Expressions" /I "../../../../../source/gameengine/SceneGraph" /I "../../../../../source/gameengine/ketsji/kxnetwork" /I "../../../../../source/gameengine/network" /I "../../../../../source/gameengine/network/loopbacknetwork" /I "../../../../../source/gameengine/GamePlayer/common" /I "../../../../../../lib/windows/iksolver/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 sdldebug.lib sdlmain.lib sdl.lib dxguid.lib ole32.lib libjpeg.lib glu32.lib opengl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /out:"..\..\..\..\..\..\obj\windows\debug\BlenderLoader.exe" /pdbtype:sept /libpath:"../../../../../../lib/windows/python/lib" /libpath:"../../../../../../lib/windows/jpeg/lib" /libpath:"../../../../../../lib/windows/sdl/SDL-1.1.7\Lib"
+# ADD LINK32 sdldebug.lib libguardedalloc.a libmoto.a sdlmain.lib sdl.lib dxguid.lib ole32.lib libjpeg.lib glu32.lib opengl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /out:"..\..\..\..\..\..\obj\windows\profile\BlenderLoader.exe" /pdbtype:sept /libpath:"..\..\..\..\..\..\lib\windows\guardedalloc\lib" /libpath:"../../../../../../lib/windows/python/lib" /libpath:"../../../../../../lib/windows/jpeg/lib" /libpath:"../../../../../../lib/windows/sdl/SDL-1.1.7\Lib"
+
+!ENDIF 
+
+# Begin Target
+
+# Name "BlenderLoader - Win32 Release"
+# Name "BlenderLoader - Win32 Debug"
+# Name "BlenderLoader - Win32 Profile"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\..\..\..\..\source\blender\makesdna\intern\dna.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\..\source\gameengine\GamePlayer\Loaders\Blender\loader.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\..\source\gameengine\GamePlayer\Loaders\Blender\SDLKeyboardDevice.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\..\source\gameengine\GamePlayer\Loaders\Blender\SDLSystem.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\..\source\blender\blenkernel\bad_level_call_stubs\stubs.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=..\..\..\..\..\source\gameengine\GamePlayer\Loaders\Blender\SDLCanvas.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\..\source\gameengine\GamePlayer\Loaders\Blender\SDLInputDevice.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\..\source\gameengine\GamePlayer\Loaders\Blender\SDLKeyboardDevice.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\..\source\gameengine\GamePlayer\Loaders\Blender\SDLSystem.h
+# End Source File
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# Begin Source File
+
+SOURCE=..\..\..\..\..\..\lib\windows\openal\lib\alc\ALc.obj
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\..\..\lib\windows\openal\lib\alu\ALu.obj
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\..\..\lib\windows\openal\lib\alut\ALut.obj
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\..\..\lib\windows\openal\lib\OpenAL32\alBuffer.obj
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\..\..\lib\windows\openal\lib\OpenAL32\alEax.obj
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\..\..\lib\windows\openal\lib\OpenAL32\alError.obj
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\..\..\lib\windows\openal\lib\OpenAL32\alExtension.obj
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\..\..\lib\windows\openal\lib\OpenAL32\alListener.obj
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\..\..\lib\windows\openal\lib\OpenAL32\alSource.obj
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\..\..\lib\windows\openal\lib\OpenAL32\alState.obj
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\..\..\lib\windows\openal\lib\OpenAL32\OpenAL32.obj
+# End Source File
+# End Target
+# End Project
diff --git a/projectfiles/gameengine/gameplayer/netscape/GP_netscape.dsp b/projectfiles/gameengine/gameplayer/netscape/GP_netscape.dsp
index 60dc29e4918fd24a6c11c128afee770c16cfcf9b..e3145b14931d974a23c108bd4aa64c6f135469f9 100644
--- a/projectfiles/gameengine/gameplayer/netscape/GP_netscape.dsp
+++ b/projectfiles/gameengine/gameplayer/netscape/GP_netscape.dsp
@@ -1,173 +1,173 @@
-# Microsoft Developer Studio Project File - Name="GP_netscape" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=GP_netscape - Win32 Profile
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "GP_netscape.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "GP_netscape.mak" CFG="GP_netscape - Win32 Profile"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "GP_netscape - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "GP_netscape - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "GP_netscape - Win32 Profile" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "GP_netscape - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Release"
-# PROP BASE Intermediate_Dir ".\Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "C:\Program Files\Netscape\Communicator\Program\Plugins"
-# PROP Intermediate_Dir ".\Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\source\gameengine\expressions" /I "..\..\..\..\source\gameengine\ketsji" /I "..\..\..\..\source\gameengine\ketsji\kxnetwork" /I "..\..\..\..\source\gameengine\rasterizer" /I "..\..\..\..\source\gameengine\rasterizer\ras_openglrasterizer" /I "..\..\..\..\source\gameengine\scenegraph" /I "..\..\..\..\source\gameengine\gamelogic" /I "..\..\..\..\source\gameengine\soundsystem" /I "..\..\..\..\source\gameengine\soundsystem\snd_openal" /I "..\..\..\..\source\gameengine\network" /I "..\..\..\..\source\gameengine\network\loopbacknetwork" /I "..\..\..\..\source\sumo\include" /I "..\..\..\..\source\sumo\fuzzics\include" /I "..\..\..\..\..\lib\windows\openal\include" /I "..\..\..\..\..\lib\windows\python\include\python2.0" /I "..\..\..\..\source\gameengine\gameplayer\common" /I "../../../../source/blender/blenkernel" /I "../../../../source/blender/makesdna" /I "../../../../source/blender/blenlib" /I "../../../../source/blender/blenloader" /I "../../../../source/blender/render/extern/include" /I "../../../../source/blender/imbuf" /I "..\..\..\..\source\gameengine\converter" /I "..\..\..\..\source\gameengine\gameplayer\common\windows" /I "..\..\..\..\source\gameengine\GamePlayer\Netscape\windows_sdk" /I "..\..\..\..\..\lib\windows\iksolver\include" /I "../../../../../lib/windows/moto/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libjpeg.lib opengl32.lib glu32.lib libblenkey.a libz.a /nologo /subsystem:windows /dll /machine:I386 /out:"C:\Program Files\Netscape\Communicator\Program\Plugins\NPBlender.dll" /libpath:"../../../../../lib/windows/python/lib" /libpath:"../../../../../lib/windows/jpeg/lib" /libpath:"../../../../../lib/windows/zlib/lib/" /libpath:"..\..\..\..\..\lib\windows\blenkey\lib" /libpath:"..\..\..\..\..\lib\windows\openssl\lib" /libpath:"..\..\..\..\..\lib\windows\iksolver\lib\\"
-
-!ELSEIF  "$(CFG)" == "GP_netscape - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Debug"
-# PROP BASE Intermediate_Dir ".\Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "C:\Program Files\Netscape\Communicator\Program\Plugins"
-# PROP Intermediate_Dir ".\Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c
-# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\source\gameengine\expressions" /I "..\..\..\..\source\gameengine\ketsji" /I "..\..\..\..\source\gameengine\ketsji\kxnetwork" /I "..\..\..\..\source\gameengine\rasterizer" /I "..\..\..\..\source\gameengine\rasterizer\ras_openglrasterizer" /I "..\..\..\..\source\gameengine\scenegraph" /I "..\..\..\..\source\gameengine\gamelogic" /I "..\..\..\..\source\gameengine\soundsystem" /I "..\..\..\..\source\gameengine\soundsystem\snd_openal" /I "..\..\..\..\source\gameengine\network" /I "..\..\..\..\source\gameengine\network\loopbacknetwork" /I "..\..\..\..\source\gameengine\GamePlayer\Netscape\windows_sdk" /I "..\..\..\..\source\sumo\include" /I "..\..\..\..\source\sumo\fuzzics\include" /I "..\..\..\..\..\lib\windows\openal\include" /I "..\..\..\..\..\lib\windows\python\include\python1.5" /I "..\..\..\..\source\gameengine\gameplayer\common" /I "../../../../source/blender/blenkernel" /I "../../../../source/blender/makesdna" /I "../../../../source/blender/blenlib" /I "../../../../source/blender/blenloader" /I "../../../../source/blender/render/extern/include" /I "../../../../source/blender/imbuf" /I "..\..\..\..\source\gameengine\converter" /I "..\..\..\..\source\gameengine\gameplayer\common\windows" /I "..\..\..\..\..\lib\windows\iksolver\include" /I "../../../../../lib/windows/moto/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FR /YX /FD /c
-# ADD BASE MTL /nologo /D "_DEBUG" /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libjpeg.lib opengl32.lib glu32.lib openal_static.lib dxguid.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libjpeg.lib opengl32.lib glu32.lib openal_static.lib dxguid.lib libblenkey.a libz.a kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libjpeg.lib opengl32.lib glu32.lib openal_static.lib dxguid.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libjpeg.lib opengl32.lib glu32.lib openal_static.lib dxguid.lib python15.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"C:\Program Files\Netscape\Communicator\Program\Plugins\NPBlender.dll" /libpath:"../../../../../lib/windows/python/lib" /libpath:"../../../../../lib/windows/jpeg/lib" /libpath:"../../../../../lib/windows/openal/lib" /libpath:"../../../../../lib/windows/zlib/lib/" /libpath:"..\..\..\..\..\lib\windows\blenkey\lib" /libpath:"..\..\..\..\..\lib\windows\openssl\lib" /libpath:"..\..\..\..\..\lib\windows\iksolver\lib\\"
-
-!ELSEIF  "$(CFG)" == "GP_netscape - Win32 Profile"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "GP_netscape___Win32_Profile"
-# PROP BASE Intermediate_Dir "GP_netscape___Win32_Profile"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "GP_netscape___Win32_Profile"
-# PROP Intermediate_Dir "GP_netscape___Win32_Profile"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\source\gameengine\expressions" /I "..\..\..\..\source\gameengine\ketsji" /I "..\..\..\..\source\gameengine\ketsji\kxnetwork" /I "..\..\..\..\source\gameengine\rasterizer" /I "..\..\..\..\source\gameengine\rasterizer\ras_openglrasterizer" /I "..\..\..\..\source\gameengine\scenegraph" /I "..\..\..\..\source\gameengine\gamelogic" /I "..\..\..\..\source\gameengine\soundsystem" /I "..\..\..\..\source\gameengine\soundsystem\snd_openal" /I "..\..\..\..\source\gameengine\network" /I "..\..\..\..\source\gameengine\network\loopbacknetwork" /I "..\..\..\..\source\gameengine\GamePlayer\Netscape\windows_sdk" /I "..\..\..\..\source\sumo\include" /I "..\..\..\..\..\lib\windows\moto\include" /I "..\..\..\..\source\sumo\fuzzics\include" /I "..\..\..\..\..\lib\windows\openal\include" /I "..\..\..\..\..\lib\windows\python\include\python1.5" /I "..\..\..\..\source\gameengine\gameplayer\common" /I "../../../../source/blender/blenkernel" /I "../../../../source/blender/makesdna" /I "../../../../source/blender/blenlib" /I "../../../../source/blender/blenloader" /I "../../../../source/blender/render/extern/include" /I "../../../../source/blender/imbuf" /I "..\..\..\..\source\gameengine\converter" /I "..\..\..\..\source\gameengine\gameplayer\common\windows" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FR /YX /FD /c
-# ADD CPP /nologo /W3 /Gm /GX /Zi /O2 /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\source\gameengine\expressions" /I "..\..\..\..\source\gameengine\ketsji" /I "..\..\..\..\source\gameengine\ketsji\kxnetwork" /I "..\..\..\..\source\gameengine\rasterizer" /I "..\..\..\..\source\gameengine\rasterizer\ras_openglrasterizer" /I "..\..\..\..\source\gameengine\scenegraph" /I "..\..\..\..\source\gameengine\gamelogic" /I "..\..\..\..\source\gameengine\soundsystem" /I "..\..\..\..\source\gameengine\soundsystem\snd_openal" /I "..\..\..\..\source\gameengine\network" /I "..\..\..\..\source\gameengine\network\loopbacknetwork" /I "..\..\..\..\source\gameengine\GamePlayer\Netscape\windows_sdk" /I "..\..\..\..\source\sumo\include" /I "..\..\..\..\..\lib\windows\moto\include" /I "..\..\..\..\source\sumo\fuzzics\include" /I "..\..\..\..\..\lib\windows\openal\include" /I "..\..\..\..\..\lib\windows\python\include\python1.5" /I "..\..\..\..\source\gameengine\gameplayer\common" /I "../../../../source/blender/blenkernel" /I "../../../../source/blender/makesdna" /I "../../../../source/blender/blenlib" /I "../../../../source/blender/blenloader" /I "../../../../source/blender/render/extern/include" /I "../../../../source/blender/imbuf" /I "..\..\..\..\source\gameengine\converter" /I "..\..\..\..\source\gameengine\gameplayer\common\windows" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# SUBTRACT CPP /Fr
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libjpeg.lib opengl32.lib glu32.lib openal_static.lib dxguid.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"C:\Program Files\Netscape\Communicator\Program\Plugins\NPBlender.dll" /libpath:"../../../../../lib/windows/python/lib" /libpath:"../../../../../lib/windows/jpeg/lib" /libpath:"../../../../../lib/windows/openal/lib"
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libjpeg.lib opengl32.lib glu32.lib openal_static.lib dxguid.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"C:\Program Files\Netscape\Communicator\Program\Plugins\NPBlender.dll" /libpath:"../../../../../lib/windows/python/lib" /libpath:"../../../../../lib/windows/jpeg/lib" /libpath:"../../../../../lib/windows/openal/lib"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "GP_netscape - Win32 Release"
-# Name "GP_netscape - Win32 Debug"
-# Name "GP_netscape - Win32 Profile"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;for;f90"
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\Netscape\windows\BlenderPlayer.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\blender\makesdna\intern\dna.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\Netscape\windows\netscape_plugin_Plugin.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\Netscape\npblender.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\Netscape\windows\npblender.def
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\Netscape\windows\npblender.rc
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\Netscape\windows\npwin.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\blender\blenkernel\bad_level_call_stubs\stubs.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"
-# End Group
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\NSPlugin\autodownload.html
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\Netscape\Testing\NetscapeExample.html
-# End Source File
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="GP_netscape" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
+
+CFG=GP_netscape - Win32 Profile
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "GP_netscape.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "GP_netscape.mak" CFG="GP_netscape - Win32 Profile"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "GP_netscape - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "GP_netscape - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "GP_netscape - Win32 Profile" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "GP_netscape - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir ".\Release"
+# PROP BASE Intermediate_Dir ".\Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "C:\Program Files\Netscape\Communicator\Program\Plugins"
+# PROP Intermediate_Dir ".\Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c
+# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\source\gameengine\expressions" /I "..\..\..\..\source\gameengine\ketsji" /I "..\..\..\..\source\gameengine\ketsji\kxnetwork" /I "..\..\..\..\source\gameengine\rasterizer" /I "..\..\..\..\source\gameengine\rasterizer\ras_openglrasterizer" /I "..\..\..\..\source\gameengine\scenegraph" /I "..\..\..\..\source\gameengine\gamelogic" /I "..\..\..\..\source\gameengine\soundsystem" /I "..\..\..\..\source\gameengine\soundsystem\snd_openal" /I "..\..\..\..\source\gameengine\network" /I "..\..\..\..\source\gameengine\network\loopbacknetwork" /I "..\..\..\..\source\sumo\include" /I "..\..\..\..\source\sumo\fuzzics\include" /I "..\..\..\..\..\lib\windows\openal\include" /I "..\..\..\..\..\lib\windows\python\include\python2.0" /I "..\..\..\..\source\gameengine\gameplayer\common" /I "../../../../source/blender/blenkernel" /I "../../../../source/blender/makesdna" /I "../../../../source/blender/blenlib" /I "../../../../source/blender/blenloader" /I "../../../../source/blender/render/extern/include" /I "../../../../source/blender/imbuf" /I "..\..\..\..\source\gameengine\converter" /I "..\..\..\..\source\gameengine\gameplayer\common\windows" /I "..\..\..\..\source\gameengine\GamePlayer\Netscape\windows_sdk" /I "..\..\..\..\..\lib\windows\iksolver\include" /I "../../../../../lib/windows/moto/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD BASE MTL /nologo /D "NDEBUG" /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libjpeg.lib opengl32.lib glu32.lib libblenkey.a libz.a /nologo /subsystem:windows /dll /machine:I386 /out:"C:\Program Files\Netscape\Communicator\Program\Plugins\NPBlender.dll" /libpath:"../../../../../lib/windows/python/lib" /libpath:"../../../../../lib/windows/jpeg/lib" /libpath:"../../../../../lib/windows/zlib/lib/" /libpath:"..\..\..\..\..\lib\windows\blenkey\lib" /libpath:"..\..\..\..\..\lib\windows\openssl\lib" /libpath:"..\..\..\..\..\lib\windows\iksolver\lib\\"
+
+!ELSEIF  "$(CFG)" == "GP_netscape - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir ".\Debug"
+# PROP BASE Intermediate_Dir ".\Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "C:\Program Files\Netscape\Communicator\Program\Plugins"
+# PROP Intermediate_Dir ".\Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c
+# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\source\gameengine\expressions" /I "..\..\..\..\source\gameengine\ketsji" /I "..\..\..\..\source\gameengine\ketsji\kxnetwork" /I "..\..\..\..\source\gameengine\rasterizer" /I "..\..\..\..\source\gameengine\rasterizer\ras_openglrasterizer" /I "..\..\..\..\source\gameengine\scenegraph" /I "..\..\..\..\source\gameengine\gamelogic" /I "..\..\..\..\source\gameengine\soundsystem" /I "..\..\..\..\source\gameengine\soundsystem\snd_openal" /I "..\..\..\..\source\gameengine\network" /I "..\..\..\..\source\gameengine\network\loopbacknetwork" /I "..\..\..\..\source\gameengine\GamePlayer\Netscape\windows_sdk" /I "..\..\..\..\source\sumo\include" /I "..\..\..\..\source\sumo\fuzzics\include" /I "..\..\..\..\..\lib\windows\openal\include" /I "..\..\..\..\..\lib\windows\python\include\python1.5" /I "..\..\..\..\source\gameengine\gameplayer\common" /I "../../../../source/blender/blenkernel" /I "../../../../source/blender/makesdna" /I "../../../../source/blender/blenlib" /I "../../../../source/blender/blenloader" /I "../../../../source/blender/render/extern/include" /I "../../../../source/blender/imbuf" /I "..\..\..\..\source\gameengine\converter" /I "..\..\..\..\source\gameengine\gameplayer\common\windows" /I "..\..\..\..\..\lib\windows\iksolver\include" /I "../../../../../lib/windows/moto/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FR /YX /FD /c
+# ADD BASE MTL /nologo /D "_DEBUG" /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libjpeg.lib opengl32.lib glu32.lib openal_static.lib dxguid.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libjpeg.lib opengl32.lib glu32.lib openal_static.lib dxguid.lib libblenkey.a libz.a kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libjpeg.lib opengl32.lib glu32.lib openal_static.lib dxguid.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libjpeg.lib opengl32.lib glu32.lib openal_static.lib dxguid.lib python15.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"C:\Program Files\Netscape\Communicator\Program\Plugins\NPBlender.dll" /libpath:"../../../../../lib/windows/python/lib" /libpath:"../../../../../lib/windows/jpeg/lib" /libpath:"../../../../../lib/windows/openal/lib" /libpath:"../../../../../lib/windows/zlib/lib/" /libpath:"..\..\..\..\..\lib\windows\blenkey\lib" /libpath:"..\..\..\..\..\lib\windows\openssl\lib" /libpath:"..\..\..\..\..\lib\windows\iksolver\lib\\"
+
+!ELSEIF  "$(CFG)" == "GP_netscape - Win32 Profile"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "GP_netscape___Win32_Profile"
+# PROP BASE Intermediate_Dir "GP_netscape___Win32_Profile"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "GP_netscape___Win32_Profile"
+# PROP Intermediate_Dir "GP_netscape___Win32_Profile"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\source\gameengine\expressions" /I "..\..\..\..\source\gameengine\ketsji" /I "..\..\..\..\source\gameengine\ketsji\kxnetwork" /I "..\..\..\..\source\gameengine\rasterizer" /I "..\..\..\..\source\gameengine\rasterizer\ras_openglrasterizer" /I "..\..\..\..\source\gameengine\scenegraph" /I "..\..\..\..\source\gameengine\gamelogic" /I "..\..\..\..\source\gameengine\soundsystem" /I "..\..\..\..\source\gameengine\soundsystem\snd_openal" /I "..\..\..\..\source\gameengine\network" /I "..\..\..\..\source\gameengine\network\loopbacknetwork" /I "..\..\..\..\source\gameengine\GamePlayer\Netscape\windows_sdk" /I "..\..\..\..\source\sumo\include" /I "..\..\..\..\..\lib\windows\moto\include" /I "..\..\..\..\source\sumo\fuzzics\include" /I "..\..\..\..\..\lib\windows\openal\include" /I "..\..\..\..\..\lib\windows\python\include\python1.5" /I "..\..\..\..\source\gameengine\gameplayer\common" /I "../../../../source/blender/blenkernel" /I "../../../../source/blender/makesdna" /I "../../../../source/blender/blenlib" /I "../../../../source/blender/blenloader" /I "../../../../source/blender/render/extern/include" /I "../../../../source/blender/imbuf" /I "..\..\..\..\source\gameengine\converter" /I "..\..\..\..\source\gameengine\gameplayer\common\windows" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FR /YX /FD /c
+# ADD CPP /nologo /W3 /Gm /GX /Zi /O2 /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\source\gameengine\expressions" /I "..\..\..\..\source\gameengine\ketsji" /I "..\..\..\..\source\gameengine\ketsji\kxnetwork" /I "..\..\..\..\source\gameengine\rasterizer" /I "..\..\..\..\source\gameengine\rasterizer\ras_openglrasterizer" /I "..\..\..\..\source\gameengine\scenegraph" /I "..\..\..\..\source\gameengine\gamelogic" /I "..\..\..\..\source\gameengine\soundsystem" /I "..\..\..\..\source\gameengine\soundsystem\snd_openal" /I "..\..\..\..\source\gameengine\network" /I "..\..\..\..\source\gameengine\network\loopbacknetwork" /I "..\..\..\..\source\gameengine\GamePlayer\Netscape\windows_sdk" /I "..\..\..\..\source\sumo\include" /I "..\..\..\..\..\lib\windows\moto\include" /I "..\..\..\..\source\sumo\fuzzics\include" /I "..\..\..\..\..\lib\windows\openal\include" /I "..\..\..\..\..\lib\windows\python\include\python1.5" /I "..\..\..\..\source\gameengine\gameplayer\common" /I "../../../../source/blender/blenkernel" /I "../../../../source/blender/makesdna" /I "../../../../source/blender/blenlib" /I "../../../../source/blender/blenloader" /I "../../../../source/blender/render/extern/include" /I "../../../../source/blender/imbuf" /I "..\..\..\..\source\gameengine\converter" /I "..\..\..\..\source\gameengine\gameplayer\common\windows" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
+# SUBTRACT CPP /Fr
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libjpeg.lib opengl32.lib glu32.lib openal_static.lib dxguid.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"C:\Program Files\Netscape\Communicator\Program\Plugins\NPBlender.dll" /libpath:"../../../../../lib/windows/python/lib" /libpath:"../../../../../lib/windows/jpeg/lib" /libpath:"../../../../../lib/windows/openal/lib"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libjpeg.lib opengl32.lib glu32.lib openal_static.lib dxguid.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"C:\Program Files\Netscape\Communicator\Program\Plugins\NPBlender.dll" /libpath:"../../../../../lib/windows/python/lib" /libpath:"../../../../../lib/windows/jpeg/lib" /libpath:"../../../../../lib/windows/openal/lib"
+
+!ENDIF 
+
+# Begin Target
+
+# Name "GP_netscape - Win32 Release"
+# Name "GP_netscape - Win32 Debug"
+# Name "GP_netscape - Win32 Profile"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;for;f90"
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\Netscape\windows\BlenderPlayer.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\blender\makesdna\intern\dna.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\Netscape\windows\netscape_plugin_Plugin.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\Netscape\npblender.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\Netscape\windows\npblender.def
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\Netscape\windows\npblender.rc
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\Netscape\windows\npwin.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\blender\blenkernel\bad_level_call_stubs\stubs.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"
+# End Group
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\NSPlugin\autodownload.html
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\Netscape\Testing\NetscapeExample.html
+# End Source File
+# End Target
+# End Project
diff --git a/projectfiles/gameengine/gameplayer/netscape2/GP_netscape.dsp b/projectfiles/gameengine/gameplayer/netscape2/GP_netscape.dsp
index e065ac280b7ffaecf1f1a23fdd10dd54912fef5c..5ebdc5c9b7d4d535a0fd3e7ad5ac5751eea3f1e1 100644
--- a/projectfiles/gameengine/gameplayer/netscape2/GP_netscape.dsp
+++ b/projectfiles/gameengine/gameplayer/netscape2/GP_netscape.dsp
@@ -1,181 +1,181 @@
-# Microsoft Developer Studio Project File - Name="GP_netscape2" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=GP_netscape2 - Win32 Profile
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "GP_netscape.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "GP_netscape.mak" CFG="GP_netscape2 - Win32 Profile"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "GP_netscape2 - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "GP_netscape2 - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "GP_netscape2 - Win32 Profile" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "GP_netscape2 - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Release"
-# PROP BASE Intermediate_Dir ".\Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "C:\Program Files\Netscape\Communicator\Program\Plugins"
-# PROP Intermediate_Dir ".\Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\..\source\kernel\gen_messaging" /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\source\gameengine\expressions" /I "..\..\..\..\source\gameengine\ketsji" /I "..\..\..\..\source\gameengine\ketsji\kxnetwork" /I "..\..\..\..\source\gameengine\rasterizer" /I "..\..\..\..\source\gameengine\rasterizer\ras_openglrasterizer" /I "..\..\..\..\source\gameengine\scenegraph" /I "..\..\..\..\source\gameengine\gamelogic" /I "..\..\..\..\source\gameengine\soundsystem" /I "..\..\..\..\source\gameengine\soundsystem\snd_openal" /I "..\..\..\..\source\gameengine\network" /I "..\..\..\..\source\gameengine\network\loopbacknetwork" /I "..\..\..\..\source\gameengine\GamePlayer\Netscape2\windows_sdk" /I "..\..\..\..\source\sumo\include" /I "..\..\..\..\..\lib\windows\moto\include" /I "..\..\..\..\source\sumo\fuzzics\include" /I "..\..\..\..\..\lib\windows\openal\include" /I "..\..\..\..\..\lib\windows\python\include\python1.5" /I "..\..\..\..\source\gameengine\gameplayer\common" /I "../../../../source/blender/blenkernel" /I "../../../../source/blender/makesdna" /I "../../../../source/blender/blenlib" /I "../../../../source/blender/blenloader" /I "../../../../source/blender/render/extern/include" /I "../../../../source/blender/imbuf" /I "..\..\..\..\source\gameengine\converter" /I "..\..\..\..\source\gameengine\gameplayer\common\windows" /I "..\..\..\..\source\gameengine\gameplayer\Netscape2\windows" /I "..\..\..\..\..\lib\windows\iksolver\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
-# ADD LINK32 libblenkey.a libeay32.lib libz.a ws2_32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libjpeg.lib opengl32.lib glu32.lib openal_static.lib dxguid.lib /nologo /subsystem:windows /dll /machine:I386 /out:"C:\Program Files\Netscape\Communicator\Program\Plugins\npBlender3DPlugin.dll" /libpath:"../../../../../lib/windows/python/lib" /libpath:"../../../../../lib/windows/jpeg/lib" /libpath:"../../../../../lib/windows/zlib/lib/" /libpath:"..\..\..\..\..\lib\windows\blenkey\lib" /libpath:"..\..\..\..\..\lib\windows\openssl\lib" /libpath:"..\..\..\..\..\lib\windows\iksolver\lib\\" /libpath:"../../../../../lib/windows/openal/lib"
-
-!ELSEIF  "$(CFG)" == "GP_netscape2 - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Debug"
-# PROP BASE Intermediate_Dir ".\Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "C:\Program Files\Netscape\Communicator\Program\Plugins"
-# PROP Intermediate_Dir ".\Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c
-# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "..\..\..\..\source\kernel\gen_messaging" /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\source\gameengine\expressions" /I "..\..\..\..\source\gameengine\ketsji" /I "..\..\..\..\source\gameengine\ketsji\kxnetwork" /I "..\..\..\..\source\gameengine\rasterizer" /I "..\..\..\..\source\gameengine\rasterizer\ras_openglrasterizer" /I "..\..\..\..\source\gameengine\scenegraph" /I "..\..\..\..\source\gameengine\gamelogic" /I "..\..\..\..\source\gameengine\soundsystem" /I "..\..\..\..\source\gameengine\soundsystem\snd_openal" /I "..\..\..\..\source\gameengine\network" /I "..\..\..\..\source\gameengine\network\loopbacknetwork" /I "..\..\..\..\source\gameengine\GamePlayer\Netscape2\windows_sdk" /I "..\..\..\..\source\sumo\include" /I "..\..\..\..\..\lib\windows\moto\include" /I "..\..\..\..\source\sumo\fuzzics\include" /I "..\..\..\..\..\lib\windows\openal\include" /I "..\..\..\..\..\lib\windows\python\include\python1.5" /I "..\..\..\..\source\gameengine\gameplayer\common" /I "../../../../source/blender/blenkernel" /I "../../../../source/blender/makesdna" /I "../../../../source/blender/blenlib" /I "../../../../source/blender/blenloader" /I "../../../../source/blender/render/extern/include" /I "../../../../source/blender/imbuf" /I "..\..\..\..\source\gameengine\converter" /I "..\..\..\..\source\gameengine\gameplayer\common\windows" /I "..\..\..\..\source\gameengine\gameplayer\Netscape2\windows" /I "..\..\..\..\..\lib\windows\iksolver\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /FR /YX /FD /c
-# ADD BASE MTL /nologo /D "_DEBUG" /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386
-# ADD LINK32 libblenkey.a libeay32.lib libz.a ws2_32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libjpeg.lib opengl32.lib glu32.lib openal_static.lib dxguid.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"C:\Program Files\Netscape\Communicator\Program\Plugins\npBlender3DPlugin.dll" /libpath:"../../../../../lib/windows/python/lib" /libpath:"../../../../../lib/windows/jpeg/lib" /libpath:"../../../../../lib/windows/openal/lib" /libpath:"../../../../../lib/windows/zlib/lib/" /libpath:"..\..\..\..\..\lib\windows\blenkey\lib" /libpath:"..\..\..\lib\windows\openssl\lib" /libpath:"..\..\..\lib\windows\iksolver\lib\\"
-
-!ELSEIF  "$(CFG)" == "GP_netscape2 - Win32 Profile"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "GP_netscape2___Win32_Profile"
-# PROP BASE Intermediate_Dir "GP_netscape2___Win32_Profile"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "GP_netscape2___Win32_Profile"
-# PROP Intermediate_Dir "GP_netscape2___Win32_Profile"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\source\gameengine\expressions" /I "..\..\..\..\source\gameengine\ketsji" /I "..\..\..\..\source\gameengine\ketsji\kxnetwork" /I "..\..\..\..\source\gameengine\rasterizer" /I "..\..\..\..\source\gameengine\rasterizer\ras_openglrasterizer" /I "..\..\..\..\source\gameengine\scenegraph" /I "..\..\..\..\source\gameengine\gamelogic" /I "..\..\..\..\source\gameengine\soundsystem" /I "..\..\..\..\source\gameengine\soundsystem\snd_openal" /I "..\..\..\..\source\gameengine\network" /I "..\..\..\..\source\gameengine\network\loopbacknetwork" /I "..\..\..\..\source\gameengine\GamePlayer\Netscape\windows_sdk" /I "..\..\..\..\source\sumo\include" /I "..\..\..\..\..\lib\windows\moto\include" /I "..\..\..\..\source\sumo\fuzzics\include" /I "..\..\..\..\..\lib\windows\openal\include" /I "..\..\..\..\..\lib\windows\python\include\python1.5" /I "..\..\..\..\source\gameengine\gameplayer\common" /I "../../../../source/blender/blenkernel" /I "../../../../source/blender/makesdna" /I "../../../../source/blender/blenlib" /I "../../../../source/blender/blenloader" /I "../../../../source/blender/render/extern/include" /I "../../../../source/blender/imbuf" /I "..\..\..\..\source\gameengine\converter" /I "..\..\..\..\source\gameengine\gameplayer\common\windows" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FR /YX /FD /c
-# ADD CPP /nologo /W3 /Gm /GX /Zi /O2 /I "..\..\..\..\source\kernel\gen_messaging" /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\source\gameengine\expressions" /I "..\..\..\..\source\gameengine\ketsji" /I "..\..\..\..\source\gameengine\ketsji\kxnetwork" /I "..\..\..\..\source\gameengine\rasterizer" /I "..\..\..\..\source\gameengine\rasterizer\ras_openglrasterizer" /I "..\..\..\..\source\gameengine\scenegraph" /I "..\..\..\..\source\gameengine\gamelogic" /I "..\..\..\..\source\gameengine\soundsystem" /I "..\..\..\..\source\gameengine\soundsystem\snd_openal" /I "..\..\..\..\source\gameengine\network" /I "..\..\..\..\source\gameengine\network\loopbacknetwork" /I "..\..\..\..\source\gameengine\GamePlayer\Netscape2\windows_sdk" /I "..\..\..\..\source\sumo\include" /I "..\..\..\..\..\lib\windows\moto\include" /I "..\..\..\..\source\sumo\fuzzics\include" /I "..\..\..\..\..\lib\windows\openal\include" /I "..\..\..\..\..\lib\windows\python\include\python1.5" /I "..\..\..\..\source\gameengine\gameplayer\common" /I "../../../../source/blender/blenkernel" /I "../../../../source/blender/makesdna" /I "../../../../source/blender/blenlib" /I "../../../../source/blender/blenloader" /I "../../../../source/blender/render/extern/include" /I "../../../../source/blender/imbuf" /I "..\..\..\..\source\gameengine\converter" /I "..\..\..\..\source\gameengine\gameplayer\common\windows" /I "..\..\..\..\source\gameengine\gameplayer\Netscape2\windows" /I "..\..\..\..\..\lib\windows\iksolver\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /c
-# SUBTRACT CPP /Fr
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libjpeg.lib opengl32.lib glu32.lib openal_static.lib dxguid.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"C:\Program Files\Netscape\Communicator\Program\Plugins\NPBlender.dll" /libpath:"../../../../../lib/windows/python/lib" /libpath:"../../../../../lib/windows/jpeg/lib" /libpath:"../../../../../lib/windows/openal/lib"
-# ADD LINK32 libblenkey.a libeay32.lib libz.a ws2_32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libjpeg.lib opengl32.lib glu32.lib openal_static.lib dxguid.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"C:\Program Files\Netscape\Communicator\Program\Plugins\npBlender3DPlugin.dll" /libpath:"../../../../../lib/windows/python/lib" /libpath:"../../../../../lib/windows/jpeg/lib" /libpath:"../../../../../lib/windows/openal/lib"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "GP_netscape2 - Win32 Release"
-# Name "GP_netscape2 - Win32 Debug"
-# Name "GP_netscape2 - Win32 Profile"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;for;f90"
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\Netscape2\windows\Blender3DPlugin.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\blender\makesdna\intern\dna.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\Netscape2\windows\netscape_plugin_Plugin.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\Netscape2\windows\npblender.def
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\Netscape2\windows\npblender.rc
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\Netscape2\npshell.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\Netscape2\windows\npwin.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\Netscape2\windows\plgwnd.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\blender\blenkernel\bad_level_call_stubs\stubs.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\Netscape\plgwnd.h
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"
-# End Group
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\NSPlugin\autodownload.html
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\Netscape\Testing\NetscapeExample.html
-# End Source File
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="GP_netscape2" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
+
+CFG=GP_netscape2 - Win32 Profile
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "GP_netscape.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "GP_netscape.mak" CFG="GP_netscape2 - Win32 Profile"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "GP_netscape2 - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "GP_netscape2 - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "GP_netscape2 - Win32 Profile" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "GP_netscape2 - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir ".\Release"
+# PROP BASE Intermediate_Dir ".\Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "C:\Program Files\Netscape\Communicator\Program\Plugins"
+# PROP Intermediate_Dir ".\Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c
+# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\..\source\kernel\gen_messaging" /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\source\gameengine\expressions" /I "..\..\..\..\source\gameengine\ketsji" /I "..\..\..\..\source\gameengine\ketsji\kxnetwork" /I "..\..\..\..\source\gameengine\rasterizer" /I "..\..\..\..\source\gameengine\rasterizer\ras_openglrasterizer" /I "..\..\..\..\source\gameengine\scenegraph" /I "..\..\..\..\source\gameengine\gamelogic" /I "..\..\..\..\source\gameengine\soundsystem" /I "..\..\..\..\source\gameengine\soundsystem\snd_openal" /I "..\..\..\..\source\gameengine\network" /I "..\..\..\..\source\gameengine\network\loopbacknetwork" /I "..\..\..\..\source\gameengine\GamePlayer\Netscape2\windows_sdk" /I "..\..\..\..\source\sumo\include" /I "..\..\..\..\..\lib\windows\moto\include" /I "..\..\..\..\source\sumo\fuzzics\include" /I "..\..\..\..\..\lib\windows\openal\include" /I "..\..\..\..\..\lib\windows\python\include\python1.5" /I "..\..\..\..\source\gameengine\gameplayer\common" /I "../../../../source/blender/blenkernel" /I "../../../../source/blender/makesdna" /I "../../../../source/blender/blenlib" /I "../../../../source/blender/blenloader" /I "../../../../source/blender/render/extern/include" /I "../../../../source/blender/imbuf" /I "..\..\..\..\source\gameengine\converter" /I "..\..\..\..\source\gameengine\gameplayer\common\windows" /I "..\..\..\..\source\gameengine\gameplayer\Netscape2\windows" /I "..\..\..\..\..\lib\windows\iksolver\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /c
+# ADD BASE MTL /nologo /D "NDEBUG" /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
+# ADD LINK32 libblenkey.a libeay32.lib libz.a ws2_32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libjpeg.lib opengl32.lib glu32.lib openal_static.lib dxguid.lib /nologo /subsystem:windows /dll /machine:I386 /out:"C:\Program Files\Netscape\Communicator\Program\Plugins\npBlender3DPlugin.dll" /libpath:"../../../../../lib/windows/python/lib" /libpath:"../../../../../lib/windows/jpeg/lib" /libpath:"../../../../../lib/windows/zlib/lib/" /libpath:"..\..\..\..\..\lib\windows\blenkey\lib" /libpath:"..\..\..\..\..\lib\windows\openssl\lib" /libpath:"..\..\..\..\..\lib\windows\iksolver\lib\\" /libpath:"../../../../../lib/windows/openal/lib"
+
+!ELSEIF  "$(CFG)" == "GP_netscape2 - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir ".\Debug"
+# PROP BASE Intermediate_Dir ".\Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "C:\Program Files\Netscape\Communicator\Program\Plugins"
+# PROP Intermediate_Dir ".\Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c
+# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "..\..\..\..\source\kernel\gen_messaging" /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\source\gameengine\expressions" /I "..\..\..\..\source\gameengine\ketsji" /I "..\..\..\..\source\gameengine\ketsji\kxnetwork" /I "..\..\..\..\source\gameengine\rasterizer" /I "..\..\..\..\source\gameengine\rasterizer\ras_openglrasterizer" /I "..\..\..\..\source\gameengine\scenegraph" /I "..\..\..\..\source\gameengine\gamelogic" /I "..\..\..\..\source\gameengine\soundsystem" /I "..\..\..\..\source\gameengine\soundsystem\snd_openal" /I "..\..\..\..\source\gameengine\network" /I "..\..\..\..\source\gameengine\network\loopbacknetwork" /I "..\..\..\..\source\gameengine\GamePlayer\Netscape2\windows_sdk" /I "..\..\..\..\source\sumo\include" /I "..\..\..\..\..\lib\windows\moto\include" /I "..\..\..\..\source\sumo\fuzzics\include" /I "..\..\..\..\..\lib\windows\openal\include" /I "..\..\..\..\..\lib\windows\python\include\python1.5" /I "..\..\..\..\source\gameengine\gameplayer\common" /I "../../../../source/blender/blenkernel" /I "../../../../source/blender/makesdna" /I "../../../../source/blender/blenlib" /I "../../../../source/blender/blenloader" /I "../../../../source/blender/render/extern/include" /I "../../../../source/blender/imbuf" /I "..\..\..\..\source\gameengine\converter" /I "..\..\..\..\source\gameengine\gameplayer\common\windows" /I "..\..\..\..\source\gameengine\gameplayer\Netscape2\windows" /I "..\..\..\..\..\lib\windows\iksolver\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /FR /YX /FD /c
+# ADD BASE MTL /nologo /D "_DEBUG" /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386
+# ADD LINK32 libblenkey.a libeay32.lib libz.a ws2_32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libjpeg.lib opengl32.lib glu32.lib openal_static.lib dxguid.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"C:\Program Files\Netscape\Communicator\Program\Plugins\npBlender3DPlugin.dll" /libpath:"../../../../../lib/windows/python/lib" /libpath:"../../../../../lib/windows/jpeg/lib" /libpath:"../../../../../lib/windows/openal/lib" /libpath:"../../../../../lib/windows/zlib/lib/" /libpath:"..\..\..\..\..\lib\windows\blenkey\lib" /libpath:"..\..\..\lib\windows\openssl\lib" /libpath:"..\..\..\lib\windows\iksolver\lib\\"
+
+!ELSEIF  "$(CFG)" == "GP_netscape2 - Win32 Profile"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "GP_netscape2___Win32_Profile"
+# PROP BASE Intermediate_Dir "GP_netscape2___Win32_Profile"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "GP_netscape2___Win32_Profile"
+# PROP Intermediate_Dir "GP_netscape2___Win32_Profile"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\source\gameengine\expressions" /I "..\..\..\..\source\gameengine\ketsji" /I "..\..\..\..\source\gameengine\ketsji\kxnetwork" /I "..\..\..\..\source\gameengine\rasterizer" /I "..\..\..\..\source\gameengine\rasterizer\ras_openglrasterizer" /I "..\..\..\..\source\gameengine\scenegraph" /I "..\..\..\..\source\gameengine\gamelogic" /I "..\..\..\..\source\gameengine\soundsystem" /I "..\..\..\..\source\gameengine\soundsystem\snd_openal" /I "..\..\..\..\source\gameengine\network" /I "..\..\..\..\source\gameengine\network\loopbacknetwork" /I "..\..\..\..\source\gameengine\GamePlayer\Netscape\windows_sdk" /I "..\..\..\..\source\sumo\include" /I "..\..\..\..\..\lib\windows\moto\include" /I "..\..\..\..\source\sumo\fuzzics\include" /I "..\..\..\..\..\lib\windows\openal\include" /I "..\..\..\..\..\lib\windows\python\include\python1.5" /I "..\..\..\..\source\gameengine\gameplayer\common" /I "../../../../source/blender/blenkernel" /I "../../../../source/blender/makesdna" /I "../../../../source/blender/blenlib" /I "../../../../source/blender/blenloader" /I "../../../../source/blender/render/extern/include" /I "../../../../source/blender/imbuf" /I "..\..\..\..\source\gameengine\converter" /I "..\..\..\..\source\gameengine\gameplayer\common\windows" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FR /YX /FD /c
+# ADD CPP /nologo /W3 /Gm /GX /Zi /O2 /I "..\..\..\..\source\kernel\gen_messaging" /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\source\gameengine\expressions" /I "..\..\..\..\source\gameengine\ketsji" /I "..\..\..\..\source\gameengine\ketsji\kxnetwork" /I "..\..\..\..\source\gameengine\rasterizer" /I "..\..\..\..\source\gameengine\rasterizer\ras_openglrasterizer" /I "..\..\..\..\source\gameengine\scenegraph" /I "..\..\..\..\source\gameengine\gamelogic" /I "..\..\..\..\source\gameengine\soundsystem" /I "..\..\..\..\source\gameengine\soundsystem\snd_openal" /I "..\..\..\..\source\gameengine\network" /I "..\..\..\..\source\gameengine\network\loopbacknetwork" /I "..\..\..\..\source\gameengine\GamePlayer\Netscape2\windows_sdk" /I "..\..\..\..\source\sumo\include" /I "..\..\..\..\..\lib\windows\moto\include" /I "..\..\..\..\source\sumo\fuzzics\include" /I "..\..\..\..\..\lib\windows\openal\include" /I "..\..\..\..\..\lib\windows\python\include\python1.5" /I "..\..\..\..\source\gameengine\gameplayer\common" /I "../../../../source/blender/blenkernel" /I "../../../../source/blender/makesdna" /I "../../../../source/blender/blenlib" /I "../../../../source/blender/blenloader" /I "../../../../source/blender/render/extern/include" /I "../../../../source/blender/imbuf" /I "..\..\..\..\source\gameengine\converter" /I "..\..\..\..\source\gameengine\gameplayer\common\windows" /I "..\..\..\..\source\gameengine\gameplayer\Netscape2\windows" /I "..\..\..\..\..\lib\windows\iksolver\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /c
+# SUBTRACT CPP /Fr
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libjpeg.lib opengl32.lib glu32.lib openal_static.lib dxguid.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"C:\Program Files\Netscape\Communicator\Program\Plugins\NPBlender.dll" /libpath:"../../../../../lib/windows/python/lib" /libpath:"../../../../../lib/windows/jpeg/lib" /libpath:"../../../../../lib/windows/openal/lib"
+# ADD LINK32 libblenkey.a libeay32.lib libz.a ws2_32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libjpeg.lib opengl32.lib glu32.lib openal_static.lib dxguid.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"C:\Program Files\Netscape\Communicator\Program\Plugins\npBlender3DPlugin.dll" /libpath:"../../../../../lib/windows/python/lib" /libpath:"../../../../../lib/windows/jpeg/lib" /libpath:"../../../../../lib/windows/openal/lib"
+
+!ENDIF 
+
+# Begin Target
+
+# Name "GP_netscape2 - Win32 Release"
+# Name "GP_netscape2 - Win32 Debug"
+# Name "GP_netscape2 - Win32 Profile"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;for;f90"
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\Netscape2\windows\Blender3DPlugin.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\blender\makesdna\intern\dna.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\Netscape2\windows\netscape_plugin_Plugin.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\Netscape2\windows\npblender.def
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\Netscape2\windows\npblender.rc
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\Netscape2\npshell.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\Netscape2\windows\npwin.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\Netscape2\windows\plgwnd.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\blender\blenkernel\bad_level_call_stubs\stubs.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\Netscape\plgwnd.h
+# End Source File
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"
+# End Group
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\NSPlugin\autodownload.html
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\Netscape\Testing\NetscapeExample.html
+# End Source File
+# End Target
+# End Project
diff --git a/projectfiles/gameengine/gameplayer/ps2/GP_ps2.dsp b/projectfiles/gameengine/gameplayer/ps2/GP_ps2.dsp
index 84aa94ef1a573d61da4aee10e384d6f5dfb9d27b..6fc1d06c3f1a67032359cde0302f8bdda2d0a61c 100644
--- a/projectfiles/gameengine/gameplayer/ps2/GP_ps2.dsp
+++ b/projectfiles/gameengine/gameplayer/ps2/GP_ps2.dsp
@@ -1,182 +1,182 @@
-# Microsoft Developer Studio Project File - Name="GP_ps2" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=GP_ps2 - Win32 Profile
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "GP_ps2.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "GP_ps2.mak" CFG="GP_ps2 - Win32 Profile"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "GP_ps2 - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "GP_ps2 - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "GP_ps2 - Win32 Profile" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "GP_ps2 - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "..\..\..\..\obj\windows\gameengine\gameplayer\ps2"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /GX /O2 /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\source\gameengine\rasterizer" /I "..\..\..\..\source\gameengine\gamelogic" /I "..\..\..\..\source\gameengine\expressions" /I "..\..\..\..\source\sumo\include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-
-!ELSEIF  "$(CFG)" == "GP_ps2 - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "..\..\..\..\obj\windows\gameengine\gameplayer\ps2\debug"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\source\gameengine\rasterizer" /I "..\..\..\..\source\gameengine\gamelogic" /I "..\..\..\..\source\gameengine\expressions" /I "..\..\..\..\source\sumo\include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "GP_ps2 - Win32 Profile"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "GP_ps2___Win32_Profile"
-# PROP BASE Intermediate_Dir "GP_ps2___Win32_Profile"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "GP_ps2___Win32_Profile"
-# PROP Intermediate_Dir "GP_ps2___Win32_Profile"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\source\gameengine\rasterizer" /I "..\..\..\..\source\gameengine\gamelogic" /I "..\..\..\..\source\gameengine\expressions" /I "..\..\..\..\source\sumo\include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /Zi /O2 /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\source\gameengine\rasterizer" /I "..\..\..\..\source\gameengine\gamelogic" /I "..\..\..\..\source\gameengine\expressions" /I "..\..\..\..\source\sumo\include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "GP_ps2 - Win32 Release"
-# Name "GP_ps2 - Win32 Debug"
-# Name "GP_ps2 - Win32 Profile"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\PS2\DebugActuator.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\PS2\GPC_Init.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\PS2\PS2DualShockDevice.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\PS2\PS2GamePlayer.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\PS2\PS2System.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\PS2\DebugActuator.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\PS2\ExampleEngine.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\PS2\GPC_Init.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\PS2\PS2Canvas.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\PS2\PS2DualShockDevice.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\PS2\PS2InputDevice.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\PS2\PS2Rasterizer.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\PS2\PS2RenderTools.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\PS2\PS2System.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\PS2\SamplePolygonMaterial.h
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="GP_ps2" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=GP_ps2 - Win32 Profile
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "GP_ps2.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "GP_ps2.mak" CFG="GP_ps2 - Win32 Profile"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "GP_ps2 - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "GP_ps2 - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "GP_ps2 - Win32 Profile" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "GP_ps2 - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "..\..\..\..\obj\windows\gameengine\gameplayer\ps2"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /GX /O2 /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\source\gameengine\rasterizer" /I "..\..\..\..\source\gameengine\gamelogic" /I "..\..\..\..\source\gameengine\expressions" /I "..\..\..\..\source\sumo\include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+
+!ELSEIF  "$(CFG)" == "GP_ps2 - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "..\..\..\..\obj\windows\gameengine\gameplayer\ps2\debug"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\source\gameengine\rasterizer" /I "..\..\..\..\source\gameengine\gamelogic" /I "..\..\..\..\source\gameengine\expressions" /I "..\..\..\..\source\sumo\include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+
+!ELSEIF  "$(CFG)" == "GP_ps2 - Win32 Profile"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "GP_ps2___Win32_Profile"
+# PROP BASE Intermediate_Dir "GP_ps2___Win32_Profile"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "GP_ps2___Win32_Profile"
+# PROP Intermediate_Dir "GP_ps2___Win32_Profile"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\source\gameengine\rasterizer" /I "..\..\..\..\source\gameengine\gamelogic" /I "..\..\..\..\source\gameengine\expressions" /I "..\..\..\..\source\sumo\include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GX /Zi /O2 /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\source\gameengine\rasterizer" /I "..\..\..\..\source\gameengine\gamelogic" /I "..\..\..\..\source\gameengine\expressions" /I "..\..\..\..\source\sumo\include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+
+!ENDIF 
+
+# Begin Target
+
+# Name "GP_ps2 - Win32 Release"
+# Name "GP_ps2 - Win32 Debug"
+# Name "GP_ps2 - Win32 Profile"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\PS2\DebugActuator.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\PS2\GPC_Init.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\PS2\PS2DualShockDevice.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\PS2\PS2GamePlayer.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\PS2\PS2System.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\PS2\DebugActuator.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\PS2\ExampleEngine.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\PS2\GPC_Init.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\PS2\PS2Canvas.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\PS2\PS2DualShockDevice.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\PS2\PS2InputDevice.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\PS2\PS2Rasterizer.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\PS2\PS2RenderTools.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\PS2\PS2System.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\PS2\SamplePolygonMaterial.h
+# End Source File
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project
diff --git a/projectfiles/gameengine/gameplayer/qt/gp.dsp b/projectfiles/gameengine/gameplayer/qt/gp.dsp
index 512c5b69de6a755857998fb098c367c6b8c10db3..9f3e82b6cd6713c74d35936eb829754757a35f06 100644
--- a/projectfiles/gameengine/gameplayer/qt/gp.dsp
+++ b/projectfiles/gameengine/gameplayer/qt/gp.dsp
@@ -1,164 +1,164 @@
-# Microsoft Developer Studio Project File - Name="gp" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Application" 0x0101
-
-CFG=gp - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "gp.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "gp.mak" CFG="gp - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "gp - Win32 Release" (based on "Win32 (x86) Application")
-!MESSAGE "gp - Win32 Debug" (based on "Win32 (x86) Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "gp - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\..\..\obj\windows\gameengine\gameplayer\qt\gp"
-# PROP Intermediate_Dir "..\..\..\..\..\obj\windows\gameengine\gameplayer\qt\gp"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "h:\qtwin\include" /I "..\..\..\..\source\gameengine\Expressions" /I "..\..\..\..\source\gameengine\GameLogic" /I "..\..\..\..\source\gameengine\Ketsji" /I "..\..\..\..\source\gameengine\Ketsji\KXNetwork" /I "..\..\..\..\source\gameengine\Network" /I "..\..\..\..\source\gameengine\Network\LoopBackNetwork" /I "..\..\..\..\source\gameengine\Rasterizer" /I "..\..\..\..\source\gameengine\Rasterizer\RAS_OpenGLRasterizer" /I "..\..\..\..\source\gameengine\SceneGraph" /I "..\..\..\..\source\sumo\Fuzzics\include" /I "..\..\..\..\source\sumo\include" /I "..\..\..\..\..\lib\windows\moto\include" /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\..\lib\windows\python\include\python2.0" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x413 /d "NDEBUG"
-# ADD RSC /l 0x413 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 opengl32.lib glu32.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib imm32.lib winmm.lib wsock32.lib h:\qtwin\lib\qt.lib h:\qtwin\lib\qnp.lib python20.lib /nologo /subsystem:windows /machine:I386 /out:"..\..\..\..\..\obj\windows\gp.exe" /libpath:"..\..\..\..\..\lib\windows\python\lib\\"
-
-!ELSEIF  "$(CFG)" == "gp - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\..\..\obj\windows\gameengine\gameplayer\qt\gp\debug"
-# PROP Intermediate_Dir "..\..\..\..\..\obj\windows\gameengine\gameplayer\qt\gp\debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /GX /Od /I "h:\qtwin\include" /I "..\..\..\..\source\gameengine\Expressions" /I "..\..\..\..\source\gameengine\GameLogic" /I "..\..\..\..\source\gameengine\Ketsji" /I "..\..\..\..\source\gameengine\Ketsji\KXNetwork" /I "..\..\..\..\source\gameengine\Network" /I "..\..\..\..\source\gameengine\Network\LoopBackNetwork" /I "..\..\..\..\source\gameengine\Rasterizer" /I "..\..\..\..\source\gameengine\Rasterizer\RAS_OpenGLRasterizer" /I "..\..\..\..\source\gameengine\SceneGraph" /I "..\..\..\..\source\sumo\Fuzzics\include" /I "..\..\..\..\source\sumo\include" /I "..\..\..\..\..\lib\windows\moto\include" /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\..\lib\windows\python\include\python1.5" /D "_DEBUG" /D "WIN32"
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x413 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 opengl32.lib glu32.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib imm32.lib winmm.lib wsock32.lib h:\qtwin\lib\qt.lib python15_d.lib /nologo /subsystem:windows /debug /machine:I386 /out:"..\..\..\..\..\obj\windows\debug\gp.exe" /libpath:"..\..\..\..\..\lib\windows\python\lib\\"
-# SUBTRACT LINK32 /pdb:none
-
-!ENDIF 
-
-# Begin Target
-
-# Name "gp - Win32 Release"
-# Name "gp - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\Qt\GP.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\Qt\GP_Init.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\Qt\QtExampleEngine.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\Qt\QtKeyboardDevice.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\Qt\QtOpenGLWidget.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\Qt\QtSystem.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\Qt\DebugActuator.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\Qt\GP_Init.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\Qt\QtExampleEngine.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\Qt\QtInputDevice.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\Qt\QtKeyboardDevice.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\Qt\QtOpenGLWidget.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\Qt\QtRenderTools.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\Qt\QtSystem.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\Qt\SamplePolygonMaterial.h
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="gp" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Application" 0x0101
+
+CFG=gp - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "gp.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "gp.mak" CFG="gp - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "gp - Win32 Release" (based on "Win32 (x86) Application")
+!MESSAGE "gp - Win32 Debug" (based on "Win32 (x86) Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "gp - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\..\..\..\obj\windows\gameengine\gameplayer\qt\gp"
+# PROP Intermediate_Dir "..\..\..\..\..\obj\windows\gameengine\gameplayer\qt\gp"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /I "h:\qtwin\include" /I "..\..\..\..\source\gameengine\Expressions" /I "..\..\..\..\source\gameengine\GameLogic" /I "..\..\..\..\source\gameengine\Ketsji" /I "..\..\..\..\source\gameengine\Ketsji\KXNetwork" /I "..\..\..\..\source\gameengine\Network" /I "..\..\..\..\source\gameengine\Network\LoopBackNetwork" /I "..\..\..\..\source\gameengine\Rasterizer" /I "..\..\..\..\source\gameengine\Rasterizer\RAS_OpenGLRasterizer" /I "..\..\..\..\source\gameengine\SceneGraph" /I "..\..\..\..\source\sumo\Fuzzics\include" /I "..\..\..\..\source\sumo\include" /I "..\..\..\..\..\lib\windows\moto\include" /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\..\lib\windows\python\include\python2.0" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x413 /d "NDEBUG"
+# ADD RSC /l 0x413 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
+# ADD LINK32 opengl32.lib glu32.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib imm32.lib winmm.lib wsock32.lib h:\qtwin\lib\qt.lib h:\qtwin\lib\qnp.lib python20.lib /nologo /subsystem:windows /machine:I386 /out:"..\..\..\..\..\obj\windows\gp.exe" /libpath:"..\..\..\..\..\lib\windows\python\lib\\"
+
+!ELSEIF  "$(CFG)" == "gp - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\..\..\..\obj\windows\gameengine\gameplayer\qt\gp\debug"
+# PROP Intermediate_Dir "..\..\..\..\..\obj\windows\gameengine\gameplayer\qt\gp\debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /W3 /GX /Od /I "h:\qtwin\include" /I "..\..\..\..\source\gameengine\Expressions" /I "..\..\..\..\source\gameengine\GameLogic" /I "..\..\..\..\source\gameengine\Ketsji" /I "..\..\..\..\source\gameengine\Ketsji\KXNetwork" /I "..\..\..\..\source\gameengine\Network" /I "..\..\..\..\source\gameengine\Network\LoopBackNetwork" /I "..\..\..\..\source\gameengine\Rasterizer" /I "..\..\..\..\source\gameengine\Rasterizer\RAS_OpenGLRasterizer" /I "..\..\..\..\source\gameengine\SceneGraph" /I "..\..\..\..\source\sumo\Fuzzics\include" /I "..\..\..\..\source\sumo\include" /I "..\..\..\..\..\lib\windows\moto\include" /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\..\lib\windows\python\include\python1.5" /D "_DEBUG" /D "WIN32"
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x413 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 opengl32.lib glu32.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib imm32.lib winmm.lib wsock32.lib h:\qtwin\lib\qt.lib python15_d.lib /nologo /subsystem:windows /debug /machine:I386 /out:"..\..\..\..\..\obj\windows\debug\gp.exe" /libpath:"..\..\..\..\..\lib\windows\python\lib\\"
+# SUBTRACT LINK32 /pdb:none
+
+!ENDIF 
+
+# Begin Target
+
+# Name "gp - Win32 Release"
+# Name "gp - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\Qt\GP.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\Qt\GP_Init.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\Qt\QtExampleEngine.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\Qt\QtKeyboardDevice.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\Qt\QtOpenGLWidget.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\Qt\QtSystem.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\Qt\DebugActuator.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\Qt\GP_Init.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\Qt\QtExampleEngine.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\Qt\QtInputDevice.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\Qt\QtKeyboardDevice.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\Qt\QtOpenGLWidget.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\Qt\QtRenderTools.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\Qt\QtSystem.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\Qt\SamplePolygonMaterial.h
+# End Source File
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project
diff --git a/projectfiles/gameengine/gameplayer/qt/gpplugin.dsp b/projectfiles/gameengine/gameplayer/qt/gpplugin.dsp
index 180f147c79aca89037512b9ca06ca3ed80996c3b..65148dd706d66f03b94cf15b325332ac9727c009 100644
--- a/projectfiles/gameengine/gameplayer/qt/gpplugin.dsp
+++ b/projectfiles/gameengine/gameplayer/qt/gpplugin.dsp
@@ -1,824 +1,824 @@
-# Microsoft Developer Studio Project File - Name="gpplugin" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=gpplugin - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "gpplugin.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "gpplugin.mak" CFG="gpplugin - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "gpplugin - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "gpplugin - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "gpplugin - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\..\..\obj\windows\gameengine\gameplayer\qt\gpplugin"
-# PROP Intermediate_Dir "..\..\..\..\..\obj\windows\gameengine\gameplayer\qt\gpplugin"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GPPLUGIN_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "h:\qtwin\include" /I "..\..\..\..\source\gameengine\Expressions" /I "..\..\..\..\source\gameengine\GameLogic" /I "..\..\..\..\source\gameengine\Ketsji" /I "..\..\..\..\source\gameengine\Ketsji\KXNetwork" /I "..\..\..\..\source\gameengine\Network" /I "..\..\..\..\source\gameengine\Network\LoopBackNetwork" /I "..\..\..\..\source\gameengine\Rasterizer" /I "..\..\..\..\source\gameengine\Rasterizer\RAS_OpenGLRasterizer" /I "..\..\..\..\source\gameengine\SceneGraph" /I "..\..\..\..\source\sumo\Fuzzics\include" /I "..\..\..\..\source\sumo\include" /I "..\..\..\..\..\lib\windows\moto\include" /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\..\lib\windows\python\include\python2.0" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GPPLUGIN_EXPORTS" /YX /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x413 /d "NDEBUG"
-# ADD RSC /l 0x413 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib imm32.lib winmm.lib wsock32.lib h:\qtwin\lib\qnp.lib h:\qtwin\lib\qt.lib opengl32.lib glu32.lib python20.lib /nologo /dll /machine:I386 /out:"..\..\..\..\..\obj\windows\npWebGP.dll" /libpath:"..\..\..\..\..\lib\windows\python\lib\\"
-
-!ELSEIF  "$(CFG)" == "gpplugin - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\..\..\obj\windows\gameengine\gameplayer\qt\gpplugin\debug"
-# PROP Intermediate_Dir "..\..\..\..\..\obj\windows\gameengine\gameplayer\qt\gpplugin\debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GPPLUGIN_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /GX /Zi /Od /I "h:\qtwin\include" /I "..\..\..\..\source\gameengine\Expressions" /I "..\..\..\..\source\gameengine\GameLogic" /I "..\..\..\..\source\gameengine\Ketsji" /I "..\..\..\..\source\gameengine\Ketsji\KXNetwork" /I "..\..\..\..\source\gameengine\Network" /I "..\..\..\..\source\gameengine\Network\LoopBackNetwork" /I "..\..\..\..\source\gameengine\Rasterizer" /I "..\..\..\..\source\gameengine\Rasterizer\RAS_OpenGLRasterizer" /I "..\..\..\..\source\gameengine\SceneGraph" /I "..\..\..\..\source\sumo\Fuzzics\include" /I "..\..\..\..\source\sumo\include" /I "..\..\..\..\..\lib\windows\moto\include" /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\..\lib\windows\python\include\python1.5" /D "WIN32" /D "PLUGIN" /D "_DEBUG"
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x413 /d "_DEBUG"
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib imm32.lib winmm.lib wsock32.lib h:\qtwin\lib\qnp.lib h:\qtwin\lib\qt.lib opengl32.lib glu32.lib python15_d.lib /nologo /subsystem:windows /dll /debug /machine:I386 /def:"..\..\..\..\source\gameengine\GamePlayer\Qt\GP.def" /out:"..\..\..\..\..\obj\windows\debug\npWebGP.dll" /libpath:"..\..\..\..\..\lib\windows\python\lib"
-# SUBTRACT LINK32 /pdb:none
-
-!ENDIF 
-
-# Begin Target
-
-# Name "gpplugin - Win32 Release"
-# Name "gpplugin - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\Qt\GP.cpp
-DEP_CPP_GP_CP=\
-	"..\..\..\..\..\qtwin\include\qapplication.h"\
-	"..\..\..\..\..\qtwin\include\qarray.h"\
-	"..\..\..\..\..\qtwin\include\qasciidict.h"\
-	"..\..\..\..\..\qtwin\include\qbrush.h"\
-	"..\..\..\..\..\qtwin\include\qcollection.h"\
-	"..\..\..\..\..\qtwin\include\qcolor.h"\
-	"..\..\..\..\..\qtwin\include\qconfig-large.h"\
-	"..\..\..\..\..\qtwin\include\qconfig-medium.h"\
-	"..\..\..\..\..\qtwin\include\qconfig-minimal.h"\
-	"..\..\..\..\..\qtwin\include\qconfig-small.h"\
-	"..\..\..\..\..\qtwin\include\qconfig.h"\
-	"..\..\..\..\..\qtwin\include\qcstring.h"\
-	"..\..\..\..\..\qtwin\include\qcursor.h"\
-	"..\..\..\..\..\qtwin\include\qdatastream.h"\
-	"..\..\..\..\..\qtwin\include\qdialog.h"\
-	"..\..\..\..\..\qtwin\include\qevent.h"\
-	"..\..\..\..\..\qtwin\include\qfeatures.h"\
-	"..\..\..\..\..\qtwin\include\qfont.h"\
-	"..\..\..\..\..\qtwin\include\qfontinfo.h"\
-	"..\..\..\..\..\qtwin\include\qfontmetrics.h"\
-	"..\..\..\..\..\qtwin\include\qframe.h"\
-	"..\..\..\..\..\qtwin\include\qgarray.h"\
-	"..\..\..\..\..\qtwin\include\qgdict.h"\
-	"..\..\..\..\..\qtwin\include\qgl.h"\
-	"..\..\..\..\..\qtwin\include\qglist.h"\
-	"..\..\..\..\..\qtwin\include\qglobal.h"\
-	"..\..\..\..\..\qtwin\include\qiconset.h"\
-	"..\..\..\..\..\qtwin\include\qimage.h"\
-	"..\..\..\..\..\qtwin\include\qintdict.h"\
-	"..\..\..\..\..\qtwin\include\qiodevice.h"\
-	"..\..\..\..\..\qtwin\include\qlist.h"\
-	"..\..\..\..\..\qtwin\include\qmenudata.h"\
-	"..\..\..\..\..\qtwin\include\qmessagebox.h"\
-	"..\..\..\..\..\qtwin\include\qmime.h"\
-	"..\..\..\..\..\qtwin\include\qnamespace.h"\
-	"..\..\..\..\..\qtwin\include\qnp.h"\
-	"..\..\..\..\..\qtwin\include\qobject.h"\
-	"..\..\..\..\..\qtwin\include\qobjectdefs.h"\
-	"..\..\..\..\..\qtwin\include\qpaintdevice.h"\
-	"..\..\..\..\..\qtwin\include\qpainter.h"\
-	"..\..\..\..\..\qtwin\include\qpalette.h"\
-	"..\..\..\..\..\qtwin\include\qpen.h"\
-	"..\..\..\..\..\qtwin\include\qpixmap.h"\
-	"..\..\..\..\..\qtwin\include\qpngio.h"\
-	"..\..\..\..\..\qtwin\include\qpoint.h"\
-	"..\..\..\..\..\qtwin\include\qpointarray.h"\
-	"..\..\..\..\..\qtwin\include\qpopupmenu.h"\
-	"..\..\..\..\..\qtwin\include\qrect.h"\
-	"..\..\..\..\..\qtwin\include\qregexp.h"\
-	"..\..\..\..\..\qtwin\include\qregion.h"\
-	"..\..\..\..\..\qtwin\include\qshared.h"\
-	"..\..\..\..\..\qtwin\include\qsignal.h"\
-	"..\..\..\..\..\qtwin\include\qsize.h"\
-	"..\..\..\..\..\qtwin\include\qsizepolicy.h"\
-	"..\..\..\..\..\qtwin\include\qstring.h"\
-	"..\..\..\..\..\qtwin\include\qstringlist.h"\
-	"..\..\..\..\..\qtwin\include\qstrlist.h"\
-	"..\..\..\..\..\qtwin\include\qstyle.h"\
-	"..\..\..\..\..\qtwin\include\qt_windows.h"\
-	"..\..\..\..\..\qtwin\include\qtranslator.h"\
-	"..\..\..\..\..\qtwin\include\qvaluelist.h"\
-	"..\..\..\..\..\qtwin\include\qwidget.h"\
-	"..\..\..\..\..\qtwin\include\qwindowdefs.h"\
-	"..\..\..\..\..\qtwin\include\qwindowdefs_win.h"\
-	"..\..\..\..\..\qtwin\include\qwmatrix.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\abstract.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\bufferobject.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\ceval.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\classobject.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\cobject.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\complexobject.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\config.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\dictobject.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\fileobject.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\floatobject.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\funcobject.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\import.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\intobject.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\intrcheck.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\listobject.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\longobject.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\methodobject.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\modsupport.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\moduleobject.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\mymalloc.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\myproto.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\object.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\objimpl.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\patchlevel.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\pydebug.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\pyerrors.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\pyfpe.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\pystate.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\Python.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\pythonrun.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\rangeobject.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\sliceobject.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\stringobject.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\sysmodule.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\traceback.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\tupleobject.h"\
-	"..\..\..\..\source\gameengine\GameLogic\SCA_IInputDevice.h"\
-	"..\..\..\..\source\gameengine\GameLogic\SCA_ISystem.h"\
-	"..\..\..\..\source\gameengine\GamePlayer\Qt\GP_Init.h"\
-	"..\..\..\..\source\gameengine\GamePlayer\Qt\QtInputDevice.h"\
-	"..\..\..\..\source\gameengine\GamePlayer\Qt\QtKeyboardDevice.h"\
-	"..\..\..\..\source\gameengine\GamePlayer\Qt\QtOpenGLWidget.h"\
-	"..\..\..\..\source\gameengine\GamePlayer\Qt\QtRenderTools.h"\
-	"..\..\..\..\source\gameengine\GamePlayer\Qt\QtSystem.h"\
-	"..\..\..\..\source\gameengine\Network\LoopBackNetwork\NG_LoopBackNetworkDeviceInterface.h"\
-	"..\..\..\..\source\gameengine\Network\NG_NetworkDeviceInterface.h"\
-	"..\..\..\..\source\gameengine\Network\NG_NetworkScene.h"\
-	"..\..\..\..\source\gameengine\Rasterizer\RAS_ICanvas.h"\
-	"..\..\..\..\source\gameengine\Rasterizer\RAS_IPolygonMaterial.h"\
-	"..\..\..\..\source\gameengine\Rasterizer\RAS_IRasterizer.h"\
-	"..\..\..\..\source\gameengine\Rasterizer\RAS_IRenderTools.h"\
-	"..\..\..\..\source\gameengine\Rasterizer\RAS_MaterialBucket.h"\
-	"..\..\..\..\source\gameengine\Rasterizer\RAS_TexVert.h"\
-	"..\..\..\..\source\kernel\gen_system\GEN_HashedString.h"\
-	"..\..\..\..\source\kernel\gen_system\GEN_Matrix4x4.h"\
-	"..\..\..\..\source\kernel\gen_system\GEN_StdString.h"\
-	"..\..\..\..\..\lib\windows\moto\include\GEN_Map.h"\
-	"..\..\..\..\..\lib\windows\moto\include\GEN_MinMax.h"\
-	"..\..\..\..\..\lib\windows\moto\include\GEN_Optimize.h"\
-	"..\..\..\..\..\lib\windows\moto\include\GEN_random.h"\
-	"..\..\..\..\..\lib\windows\moto\include\GEN_Stream.h"\
-	"..\..\..\..\..\lib\windows\moto\include\MT_assert.h"\
-	"..\..\..\..\..\lib\windows\moto\include\MT_Matrix3x3.h"\
-	"..\..\..\..\..\lib\windows\moto\include\MT_Matrix3x3.inl"\
-	"..\..\..\..\..\lib\windows\moto\include\MT_Point2.h"\
-	"..\..\..\..\..\lib\windows\moto\include\MT_Point2.inl"\
-	"..\..\..\..\..\lib\windows\moto\include\MT_Point3.h"\
-	"..\..\..\..\..\lib\windows\moto\include\MT_Point3.inl"\
-	"..\..\..\..\..\lib\windows\moto\include\MT_Quaternion.h"\
-	"..\..\..\..\..\lib\windows\moto\include\MT_Quaternion.inl"\
-	"..\..\..\..\..\lib\windows\moto\include\MT_Scalar.h"\
-	"..\..\..\..\..\lib\windows\moto\include\MT_Transform.h"\
-	"..\..\..\..\..\lib\windows\moto\include\MT_Tuple2.h"\
-	"..\..\..\..\..\lib\windows\moto\include\MT_Tuple3.h"\
-	"..\..\..\..\..\lib\windows\moto\include\MT_Tuple4.h"\
-	"..\..\..\..\..\lib\windows\moto\include\MT_Vector2.h"\
-	"..\..\..\..\..\lib\windows\moto\include\MT_Vector2.inl"\
-	"..\..\..\..\..\lib\windows\moto\include\MT_Vector3.h"\
-	"..\..\..\..\..\lib\windows\moto\include\MT_Vector3.inl"\
-	"..\..\..\..\..\lib\windows\moto\include\MT_Vector4.h"\
-	"..\..\..\..\..\lib\windows\moto\include\MT_Vector4.inl"\
-	"..\..\..\..\..\lib\windows\moto\include\NM_Scalar.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\Qt\GP_Init.cpp
-DEP_CPP_GP_IN=\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\abstract.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\bufferobject.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\ceval.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\classobject.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\cobject.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\complexobject.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\config.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\dictobject.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\fileobject.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\floatobject.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\funcobject.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\import.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\intobject.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\intrcheck.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\listobject.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\longobject.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\methodobject.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\modsupport.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\moduleobject.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\mymalloc.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\myproto.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\object.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\objimpl.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\patchlevel.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\pydebug.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\pyerrors.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\pyfpe.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\pystate.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\Python.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\pythonrun.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\rangeobject.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\sliceobject.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\stringobject.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\sysmodule.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\traceback.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\tupleobject.h"\
-	"..\..\..\..\source\gameengine\Expressions\BoolValue.h"\
-	"..\..\..\..\source\gameengine\Expressions\ListValue.h"\
-	"..\..\..\..\source\gameengine\Expressions\PyObjectPlus.h"\
-	"..\..\..\..\source\gameengine\Expressions\Value.h"\
-	"..\..\..\..\source\gameengine\GameLogic\SCA_AlwaysEventManager.h"\
-	"..\..\..\..\source\gameengine\GameLogic\SCA_AlwaysSensor.h"\
-	"..\..\..\..\source\gameengine\GameLogic\SCA_ANDController.h"\
-	"..\..\..\..\source\gameengine\GameLogic\SCA_EventManager.h"\
-	"..\..\..\..\source\gameengine\GameLogic\SCA_IActuator.h"\
-	"..\..\..\..\source\gameengine\GameLogic\SCA_IController.h"\
-	"..\..\..\..\source\gameengine\GameLogic\SCA_IInputDevice.h"\
-	"..\..\..\..\source\gameengine\GameLogic\SCA_ILogicBrick.h"\
-	"..\..\..\..\source\gameengine\GameLogic\SCA_IObject.h"\
-	"..\..\..\..\source\gameengine\GameLogic\SCA_ISensor.h"\
-	"..\..\..\..\source\gameengine\GameLogic\SCA_ISystem.h"\
-	"..\..\..\..\source\gameengine\GameLogic\SCA_KeyboardManager.h"\
-	"..\..\..\..\source\gameengine\GameLogic\SCA_KeyboardSensor.h"\
-	"..\..\..\..\source\gameengine\GameLogic\SCA_LogicManager.h"\
-	"..\..\..\..\source\gameengine\GameLogic\SCA_PythonController.h"\
-	"..\..\..\..\source\gameengine\GamePlayer\Qt\DebugActuator.h"\
-	"..\..\..\..\source\gameengine\GamePlayer\Qt\QtExampleEngine.h"\
-	"..\..\..\..\source\gameengine\GamePlayer\Qt\SamplePolygonMaterial.h"\
-	"..\..\..\..\source\gameengine\Ketsji\KX_GameObject.h"\
-	"..\..\..\..\source\gameengine\Ketsji\KX_ObjectActuator.h"\
-	"..\..\..\..\source\gameengine\Ketsji\KX_PythonInit.h"\
-	"..\..\..\..\source\gameengine\Ketsji\KX_SoundActuator.h"\
-	"..\..\..\..\source\gameengine\Ketsji\KXNetwork\KX_NetworkEventManager.h"\
-	"..\..\..\..\source\gameengine\Network\LoopBackNetwork\NG_LoopBackNetworkDeviceInterface.h"\
-	"..\..\..\..\source\gameengine\Network\NG_NetworkDeviceInterface.h"\
-	"..\..\..\..\source\gameengine\Network\NG_NetworkScene.h"\
-	"..\..\..\..\source\gameengine\Rasterizer\RAS_BucketManager.h"\
-	"..\..\..\..\source\gameengine\Rasterizer\RAS_ICanvas.h"\
-	"..\..\..\..\source\gameengine\Rasterizer\RAS_IPolygonMaterial.h"\
-	"..\..\..\..\source\gameengine\Rasterizer\RAS_IRasterizer.h"\
-	"..\..\..\..\source\gameengine\Rasterizer\RAS_MaterialBucket.h"\
-	"..\..\..\..\source\gameengine\Rasterizer\RAS_MeshObject.h"\
-	"..\..\..\..\source\gameengine\Rasterizer\RAS_OpenGLRasterizer\RAS_OpenGLRasterizer.h"\
-	"..\..\..\..\source\gameengine\Rasterizer\RAS_Polygon.h"\
-	"..\..\..\..\source\gameengine\Rasterizer\RAS_TexVert.h"\
-	"..\..\..\..\source\gameengine\SceneGraph\SG_IObject.h"\
-	"..\..\..\..\source\gameengine\SceneGraph\SG_Node.h"\
-	"..\..\..\..\source\gameengine\SceneGraph\SG_Spatial.h"\
-	"..\..\..\..\source\kernel\gen_system\GEN_HashedPtr.h"\
-	"..\..\..\..\source\kernel\gen_system\GEN_HashedString.h"\
-	"..\..\..\..\source\kernel\gen_system\GEN_Matrix4x4.h"\
-	"..\..\..\..\source\kernel\gen_system\GEN_StdString.h"\
-	"..\..\..\..\source\sumo\include\solid.h"\
-	"..\..\..\..\source\sumo\include\solid_types.h"\
-	"..\..\..\..\..\lib\windows\moto\include\GEN_Map.h"\
-	"..\..\..\..\..\lib\windows\moto\include\GEN_MinMax.h"\
-	"..\..\..\..\..\lib\windows\moto\include\GEN_Optimize.h"\
-	"..\..\..\..\..\lib\windows\moto\include\GEN_random.h"\
-	"..\..\..\..\..\lib\windows\moto\include\GEN_Stream.h"\
-	"..\..\..\..\..\lib\windows\moto\include\MT_assert.h"\
-	"..\..\..\..\..\lib\windows\moto\include\MT_Matrix3x3.h"\
-	"..\..\..\..\..\lib\windows\moto\include\MT_Matrix3x3.inl"\
-	"..\..\..\..\..\lib\windows\moto\include\MT_Point2.h"\
-	"..\..\..\..\..\lib\windows\moto\include\MT_Point2.inl"\
-	"..\..\..\..\..\lib\windows\moto\include\MT_Point3.h"\
-	"..\..\..\..\..\lib\windows\moto\include\MT_Point3.inl"\
-	"..\..\..\..\..\lib\windows\moto\include\MT_Quaternion.h"\
-	"..\..\..\..\..\lib\windows\moto\include\MT_Quaternion.inl"\
-	"..\..\..\..\..\lib\windows\moto\include\MT_Scalar.h"\
-	"..\..\..\..\..\lib\windows\moto\include\MT_Transform.h"\
-	"..\..\..\..\..\lib\windows\moto\include\MT_Tuple2.h"\
-	"..\..\..\..\..\lib\windows\moto\include\MT_Tuple3.h"\
-	"..\..\..\..\..\lib\windows\moto\include\MT_Tuple4.h"\
-	"..\..\..\..\..\lib\windows\moto\include\MT_Vector2.h"\
-	"..\..\..\..\..\lib\windows\moto\include\MT_Vector2.inl"\
-	"..\..\..\..\..\lib\windows\moto\include\MT_Vector3.h"\
-	"..\..\..\..\..\lib\windows\moto\include\MT_Vector3.inl"\
-	"..\..\..\..\..\lib\windows\moto\include\MT_Vector4.h"\
-	"..\..\..\..\..\lib\windows\moto\include\MT_Vector4.inl"\
-	"..\..\..\..\..\lib\windows\moto\include\NM_Scalar.h"\
-	
-NODEP_CPP_GP_IN=\
-	"..\..\..\..\source\gameengine\GamePlayer\Qt\GPC_OpenALWaveCache.h"\
-	"..\..\..\..\source\gameengine\GamePlayer\Qt\OpenALScene.h"\
-	"..\..\..\..\source\gameengine\GamePlayer\Qt\SND_SoundObject.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\Qt\QtExampleEngine.cpp
-DEP_CPP_QTEXA=\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\abstract.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\bufferobject.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\ceval.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\classobject.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\cobject.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\complexobject.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\config.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\dictobject.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\fileobject.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\floatobject.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\funcobject.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\import.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\intobject.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\intrcheck.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\listobject.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\longobject.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\methodobject.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\modsupport.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\moduleobject.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\mymalloc.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\myproto.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\object.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\objimpl.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\patchlevel.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\pydebug.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\pyerrors.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\pyfpe.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\pystate.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\Python.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\pythonrun.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\rangeobject.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\sliceobject.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\stringobject.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\sysmodule.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\traceback.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\tupleobject.h"\
-	"..\..\..\..\source\gameengine\Expressions\BoolValue.h"\
-	"..\..\..\..\source\gameengine\Expressions\IntValue.h"\
-	"..\..\..\..\source\gameengine\Expressions\ListValue.h"\
-	"..\..\..\..\source\gameengine\Expressions\PyObjectPlus.h"\
-	"..\..\..\..\source\gameengine\Expressions\Value.h"\
-	"..\..\..\..\source\gameengine\GameLogic\SCA_IActuator.h"\
-	"..\..\..\..\source\gameengine\GameLogic\SCA_IInputDevice.h"\
-	"..\..\..\..\source\gameengine\GameLogic\SCA_ILogicBrick.h"\
-	"..\..\..\..\source\gameengine\GameLogic\SCA_IObject.h"\
-	"..\..\..\..\source\gameengine\GameLogic\SCA_ISystem.h"\
-	"..\..\..\..\source\gameengine\GameLogic\SCA_LogicManager.h"\
-	"..\..\..\..\source\gameengine\GamePlayer\Qt\QtExampleEngine.h"\
-	"..\..\..\..\source\gameengine\Ketsji\KX_Camera.h"\
-	"..\..\..\..\source\gameengine\Ketsji\KX_GameObject.h"\
-	"..\..\..\..\source\gameengine\Ketsji\KX_ObjectActuator.h"\
-	"..\..\..\..\source\gameengine\Network\NG_NetworkScene.h"\
-	"..\..\..\..\source\gameengine\Rasterizer\RAS_BucketManager.h"\
-	"..\..\..\..\source\gameengine\Rasterizer\RAS_CameraData.h"\
-	"..\..\..\..\source\gameengine\Rasterizer\RAS_IPolygonMaterial.h"\
-	"..\..\..\..\source\gameengine\Rasterizer\RAS_IRasterizer.h"\
-	"..\..\..\..\source\gameengine\Rasterizer\RAS_IRenderTools.h"\
-	"..\..\..\..\source\gameengine\Rasterizer\RAS_MaterialBucket.h"\
-	"..\..\..\..\source\gameengine\Rasterizer\RAS_MeshObject.h"\
-	"..\..\..\..\source\gameengine\Rasterizer\RAS_Polygon.h"\
-	"..\..\..\..\source\gameengine\Rasterizer\RAS_TexVert.h"\
-	"..\..\..\..\source\gameengine\SceneGraph\SG_IObject.h"\
-	"..\..\..\..\source\gameengine\SceneGraph\SG_Node.h"\
-	"..\..\..\..\source\gameengine\SceneGraph\SG_Spatial.h"\
-	"..\..\..\..\source\kernel\gen_system\GEN_HashedPtr.h"\
-	"..\..\..\..\source\kernel\gen_system\GEN_HashedString.h"\
-	"..\..\..\..\source\kernel\gen_system\GEN_Matrix4x4.h"\
-	"..\..\..\..\source\kernel\gen_system\GEN_StdString.h"\
-	"..\..\..\..\source\sumo\Fuzzics\include\SM_Scene.h"\
-	"..\..\..\..\source\sumo\include\solid.h"\
-	"..\..\..\..\source\sumo\include\solid_types.h"\
-	"..\..\..\..\..\lib\windows\moto\include\GEN_Map.h"\
-	"..\..\..\..\..\lib\windows\moto\include\GEN_MinMax.h"\
-	"..\..\..\..\..\lib\windows\moto\include\GEN_Optimize.h"\
-	"..\..\..\..\..\lib\windows\moto\include\GEN_random.h"\
-	"..\..\..\..\..\lib\windows\moto\include\GEN_Stream.h"\
-	"..\..\..\..\..\lib\windows\moto\include\MT_assert.h"\
-	"..\..\..\..\..\lib\windows\moto\include\MT_Matrix3x3.h"\
-	"..\..\..\..\..\lib\windows\moto\include\MT_Matrix3x3.inl"\
-	"..\..\..\..\..\lib\windows\moto\include\MT_Point2.h"\
-	"..\..\..\..\..\lib\windows\moto\include\MT_Point2.inl"\
-	"..\..\..\..\..\lib\windows\moto\include\MT_Point3.h"\
-	"..\..\..\..\..\lib\windows\moto\include\MT_Point3.inl"\
-	"..\..\..\..\..\lib\windows\moto\include\MT_Quaternion.h"\
-	"..\..\..\..\..\lib\windows\moto\include\MT_Quaternion.inl"\
-	"..\..\..\..\..\lib\windows\moto\include\MT_Scalar.h"\
-	"..\..\..\..\..\lib\windows\moto\include\MT_Transform.h"\
-	"..\..\..\..\..\lib\windows\moto\include\MT_Tuple2.h"\
-	"..\..\..\..\..\lib\windows\moto\include\MT_Tuple3.h"\
-	"..\..\..\..\..\lib\windows\moto\include\MT_Tuple4.h"\
-	"..\..\..\..\..\lib\windows\moto\include\MT_Vector2.h"\
-	"..\..\..\..\..\lib\windows\moto\include\MT_Vector2.inl"\
-	"..\..\..\..\..\lib\windows\moto\include\MT_Vector3.h"\
-	"..\..\..\..\..\lib\windows\moto\include\MT_Vector3.inl"\
-	"..\..\..\..\..\lib\windows\moto\include\MT_Vector4.h"\
-	"..\..\..\..\..\lib\windows\moto\include\MT_Vector4.inl"\
-	"..\..\..\..\..\lib\windows\moto\include\NM_Scalar.h"\
-	
-NODEP_CPP_QTEXA=\
-	"..\..\..\..\source\gameengine\GamePlayer\Qt\OpenALScene.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\Qt\QtKeyboardDevice.cpp
-DEP_CPP_QTKEY=\
-	"..\..\..\..\source\gameengine\GameLogic\SCA_IInputDevice.h"\
-	"..\..\..\..\source\gameengine\GamePlayer\Qt\QtInputDevice.h"\
-	"..\..\..\..\source\gameengine\GamePlayer\Qt\QtKeyboardDevice.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\Qt\QtOpenGLWidget.cpp
-DEP_CPP_QTOPE=\
-	"..\..\..\..\..\qtwin\include\qapplication.h"\
-	"..\..\..\..\..\qtwin\include\qarray.h"\
-	"..\..\..\..\..\qtwin\include\qasciidict.h"\
-	"..\..\..\..\..\qtwin\include\qbrush.h"\
-	"..\..\..\..\..\qtwin\include\qcollection.h"\
-	"..\..\..\..\..\qtwin\include\qcolor.h"\
-	"..\..\..\..\..\qtwin\include\qconfig-large.h"\
-	"..\..\..\..\..\qtwin\include\qconfig-medium.h"\
-	"..\..\..\..\..\qtwin\include\qconfig-minimal.h"\
-	"..\..\..\..\..\qtwin\include\qconfig-small.h"\
-	"..\..\..\..\..\qtwin\include\qconfig.h"\
-	"..\..\..\..\..\qtwin\include\qcstring.h"\
-	"..\..\..\..\..\qtwin\include\qcursor.h"\
-	"..\..\..\..\..\qtwin\include\qdatastream.h"\
-	"..\..\..\..\..\qtwin\include\qevent.h"\
-	"..\..\..\..\..\qtwin\include\qfeatures.h"\
-	"..\..\..\..\..\qtwin\include\qfont.h"\
-	"..\..\..\..\..\qtwin\include\qfontinfo.h"\
-	"..\..\..\..\..\qtwin\include\qfontmetrics.h"\
-	"..\..\..\..\..\qtwin\include\qframe.h"\
-	"..\..\..\..\..\qtwin\include\qgarray.h"\
-	"..\..\..\..\..\qtwin\include\qgdict.h"\
-	"..\..\..\..\..\qtwin\include\qgl.h"\
-	"..\..\..\..\..\qtwin\include\qglist.h"\
-	"..\..\..\..\..\qtwin\include\qglobal.h"\
-	"..\..\..\..\..\qtwin\include\qiconset.h"\
-	"..\..\..\..\..\qtwin\include\qintdict.h"\
-	"..\..\..\..\..\qtwin\include\qiodevice.h"\
-	"..\..\..\..\..\qtwin\include\qlist.h"\
-	"..\..\..\..\..\qtwin\include\qmenudata.h"\
-	"..\..\..\..\..\qtwin\include\qmime.h"\
-	"..\..\..\..\..\qtwin\include\qnamespace.h"\
-	"..\..\..\..\..\qtwin\include\qobject.h"\
-	"..\..\..\..\..\qtwin\include\qobjectdefs.h"\
-	"..\..\..\..\..\qtwin\include\qpaintdevice.h"\
-	"..\..\..\..\..\qtwin\include\qpalette.h"\
-	"..\..\..\..\..\qtwin\include\qpixmap.h"\
-	"..\..\..\..\..\qtwin\include\qpoint.h"\
-	"..\..\..\..\..\qtwin\include\qpopupmenu.h"\
-	"..\..\..\..\..\qtwin\include\qrect.h"\
-	"..\..\..\..\..\qtwin\include\qregexp.h"\
-	"..\..\..\..\..\qtwin\include\qregion.h"\
-	"..\..\..\..\..\qtwin\include\qshared.h"\
-	"..\..\..\..\..\qtwin\include\qsignal.h"\
-	"..\..\..\..\..\qtwin\include\qsize.h"\
-	"..\..\..\..\..\qtwin\include\qsizepolicy.h"\
-	"..\..\..\..\..\qtwin\include\qstring.h"\
-	"..\..\..\..\..\qtwin\include\qstringlist.h"\
-	"..\..\..\..\..\qtwin\include\qstyle.h"\
-	"..\..\..\..\..\qtwin\include\qt_windows.h"\
-	"..\..\..\..\..\qtwin\include\qtranslator.h"\
-	"..\..\..\..\..\qtwin\include\qvaluelist.h"\
-	"..\..\..\..\..\qtwin\include\qwidget.h"\
-	"..\..\..\..\..\qtwin\include\qwindowdefs.h"\
-	"..\..\..\..\..\qtwin\include\qwindowdefs_win.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\abstract.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\bufferobject.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\ceval.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\classobject.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\cobject.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\complexobject.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\config.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\dictobject.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\fileobject.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\floatobject.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\funcobject.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\import.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\intobject.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\intrcheck.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\listobject.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\longobject.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\methodobject.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\modsupport.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\moduleobject.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\mymalloc.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\myproto.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\object.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\objimpl.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\patchlevel.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\pydebug.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\pyerrors.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\pyfpe.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\pystate.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\Python.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\pythonrun.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\rangeobject.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\sliceobject.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\stringobject.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\sysmodule.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\traceback.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\tupleobject.h"\
-	"..\..\..\..\source\gameengine\GameLogic\SCA_IInputDevice.h"\
-	"..\..\..\..\source\gameengine\GameLogic\SCA_ISystem.h"\
-	"..\..\..\..\source\gameengine\GamePlayer\Qt\GP_Init.h"\
-	"..\..\..\..\source\gameengine\GamePlayer\Qt\QtInputDevice.h"\
-	"..\..\..\..\source\gameengine\GamePlayer\Qt\QtKeyboardDevice.h"\
-	"..\..\..\..\source\gameengine\GamePlayer\Qt\QtOpenGLWidget.h"\
-	"..\..\..\..\source\gameengine\GamePlayer\Qt\QtRenderTools.h"\
-	"..\..\..\..\source\gameengine\GamePlayer\Qt\QtSystem.h"\
-	"..\..\..\..\source\gameengine\Rasterizer\RAS_ICanvas.h"\
-	"..\..\..\..\source\gameengine\Rasterizer\RAS_IPolygonMaterial.h"\
-	"..\..\..\..\source\gameengine\Rasterizer\RAS_IRasterizer.h"\
-	"..\..\..\..\source\gameengine\Rasterizer\RAS_IRenderTools.h"\
-	"..\..\..\..\source\gameengine\Rasterizer\RAS_MaterialBucket.h"\
-	"..\..\..\..\source\gameengine\Rasterizer\RAS_TexVert.h"\
-	"..\..\..\..\source\kernel\gen_system\GEN_HashedString.h"\
-	"..\..\..\..\source\kernel\gen_system\GEN_Matrix4x4.h"\
-	"..\..\..\..\source\kernel\gen_system\GEN_StdString.h"\
-	"..\..\..\..\..\lib\windows\moto\include\GEN_Map.h"\
-	"..\..\..\..\..\lib\windows\moto\include\GEN_MinMax.h"\
-	"..\..\..\..\..\lib\windows\moto\include\GEN_Optimize.h"\
-	"..\..\..\..\..\lib\windows\moto\include\GEN_random.h"\
-	"..\..\..\..\..\lib\windows\moto\include\GEN_Stream.h"\
-	"..\..\..\..\..\lib\windows\moto\include\MT_assert.h"\
-	"..\..\..\..\..\lib\windows\moto\include\MT_Matrix3x3.h"\
-	"..\..\..\..\..\lib\windows\moto\include\MT_Matrix3x3.inl"\
-	"..\..\..\..\..\lib\windows\moto\include\MT_Point2.h"\
-	"..\..\..\..\..\lib\windows\moto\include\MT_Point2.inl"\
-	"..\..\..\..\..\lib\windows\moto\include\MT_Point3.h"\
-	"..\..\..\..\..\lib\windows\moto\include\MT_Point3.inl"\
-	"..\..\..\..\..\lib\windows\moto\include\MT_Quaternion.h"\
-	"..\..\..\..\..\lib\windows\moto\include\MT_Quaternion.inl"\
-	"..\..\..\..\..\lib\windows\moto\include\MT_Scalar.h"\
-	"..\..\..\..\..\lib\windows\moto\include\MT_Transform.h"\
-	"..\..\..\..\..\lib\windows\moto\include\MT_Tuple2.h"\
-	"..\..\..\..\..\lib\windows\moto\include\MT_Tuple3.h"\
-	"..\..\..\..\..\lib\windows\moto\include\MT_Tuple4.h"\
-	"..\..\..\..\..\lib\windows\moto\include\MT_Vector2.h"\
-	"..\..\..\..\..\lib\windows\moto\include\MT_Vector2.inl"\
-	"..\..\..\..\..\lib\windows\moto\include\MT_Vector3.h"\
-	"..\..\..\..\..\lib\windows\moto\include\MT_Vector3.inl"\
-	"..\..\..\..\..\lib\windows\moto\include\MT_Vector4.h"\
-	"..\..\..\..\..\lib\windows\moto\include\MT_Vector4.inl"\
-	"..\..\..\..\..\lib\windows\moto\include\NM_Scalar.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\Qt\QtSystem.cpp
-DEP_CPP_QTSYS=\
-	"..\..\..\..\..\qtwin\include\qapplication.h"\
-	"..\..\..\..\..\qtwin\include\qarray.h"\
-	"..\..\..\..\..\qtwin\include\qasciidict.h"\
-	"..\..\..\..\..\qtwin\include\qbrush.h"\
-	"..\..\..\..\..\qtwin\include\qcollection.h"\
-	"..\..\..\..\..\qtwin\include\qcolor.h"\
-	"..\..\..\..\..\qtwin\include\qconfig-large.h"\
-	"..\..\..\..\..\qtwin\include\qconfig-medium.h"\
-	"..\..\..\..\..\qtwin\include\qconfig-minimal.h"\
-	"..\..\..\..\..\qtwin\include\qconfig-small.h"\
-	"..\..\..\..\..\qtwin\include\qconfig.h"\
-	"..\..\..\..\..\qtwin\include\qcstring.h"\
-	"..\..\..\..\..\qtwin\include\qcursor.h"\
-	"..\..\..\..\..\qtwin\include\qdatastream.h"\
-	"..\..\..\..\..\qtwin\include\qevent.h"\
-	"..\..\..\..\..\qtwin\include\qfeatures.h"\
-	"..\..\..\..\..\qtwin\include\qfont.h"\
-	"..\..\..\..\..\qtwin\include\qfontinfo.h"\
-	"..\..\..\..\..\qtwin\include\qfontmetrics.h"\
-	"..\..\..\..\..\qtwin\include\qframe.h"\
-	"..\..\..\..\..\qtwin\include\qgarray.h"\
-	"..\..\..\..\..\qtwin\include\qgdict.h"\
-	"..\..\..\..\..\qtwin\include\qgl.h"\
-	"..\..\..\..\..\qtwin\include\qglist.h"\
-	"..\..\..\..\..\qtwin\include\qglobal.h"\
-	"..\..\..\..\..\qtwin\include\qiconset.h"\
-	"..\..\..\..\..\qtwin\include\qintdict.h"\
-	"..\..\..\..\..\qtwin\include\qiodevice.h"\
-	"..\..\..\..\..\qtwin\include\qlist.h"\
-	"..\..\..\..\..\qtwin\include\qmenudata.h"\
-	"..\..\..\..\..\qtwin\include\qmime.h"\
-	"..\..\..\..\..\qtwin\include\qnamespace.h"\
-	"..\..\..\..\..\qtwin\include\qobject.h"\
-	"..\..\..\..\..\qtwin\include\qobjectdefs.h"\
-	"..\..\..\..\..\qtwin\include\qpaintdevice.h"\
-	"..\..\..\..\..\qtwin\include\qpalette.h"\
-	"..\..\..\..\..\qtwin\include\qpixmap.h"\
-	"..\..\..\..\..\qtwin\include\qpoint.h"\
-	"..\..\..\..\..\qtwin\include\qpopupmenu.h"\
-	"..\..\..\..\..\qtwin\include\qrect.h"\
-	"..\..\..\..\..\qtwin\include\qregexp.h"\
-	"..\..\..\..\..\qtwin\include\qregion.h"\
-	"..\..\..\..\..\qtwin\include\qshared.h"\
-	"..\..\..\..\..\qtwin\include\qsignal.h"\
-	"..\..\..\..\..\qtwin\include\qsize.h"\
-	"..\..\..\..\..\qtwin\include\qsizepolicy.h"\
-	"..\..\..\..\..\qtwin\include\qstring.h"\
-	"..\..\..\..\..\qtwin\include\qstringlist.h"\
-	"..\..\..\..\..\qtwin\include\qstyle.h"\
-	"..\..\..\..\..\qtwin\include\qt_windows.h"\
-	"..\..\..\..\..\qtwin\include\qtranslator.h"\
-	"..\..\..\..\..\qtwin\include\qvaluelist.h"\
-	"..\..\..\..\..\qtwin\include\qwidget.h"\
-	"..\..\..\..\..\qtwin\include\qwindowdefs.h"\
-	"..\..\..\..\..\qtwin\include\qwindowdefs_win.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\abstract.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\bufferobject.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\ceval.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\classobject.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\cobject.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\complexobject.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\config.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\dictobject.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\fileobject.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\floatobject.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\funcobject.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\import.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\intobject.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\intrcheck.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\listobject.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\longobject.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\methodobject.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\modsupport.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\moduleobject.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\mymalloc.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\myproto.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\object.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\objimpl.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\patchlevel.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\pydebug.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\pyerrors.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\pyfpe.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\pystate.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\Python.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\pythonrun.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\rangeobject.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\sliceobject.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\stringobject.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\sysmodule.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\traceback.h"\
-	"..\..\..\..\..\lib\windows\python\include\python1.5\tupleobject.h"\
-	"..\..\..\..\source\gameengine\GameLogic\SCA_IInputDevice.h"\
-	"..\..\..\..\source\gameengine\GameLogic\SCA_ISystem.h"\
-	"..\..\..\..\source\gameengine\GamePlayer\Qt\GP_Init.h"\
-	"..\..\..\..\source\gameengine\GamePlayer\Qt\QtInputDevice.h"\
-	"..\..\..\..\source\gameengine\GamePlayer\Qt\QtKeyboardDevice.h"\
-	"..\..\..\..\source\gameengine\GamePlayer\Qt\QtOpenGLWidget.h"\
-	"..\..\..\..\source\gameengine\GamePlayer\Qt\QtRenderTools.h"\
-	"..\..\..\..\source\gameengine\GamePlayer\Qt\QtSystem.h"\
-	"..\..\..\..\source\gameengine\Network\LoopBackNetwork\NG_LoopBackNetworkDeviceInterface.h"\
-	"..\..\..\..\source\gameengine\Network\NG_NetworkDeviceInterface.h"\
-	"..\..\..\..\source\gameengine\Network\NG_NetworkScene.h"\
-	"..\..\..\..\source\gameengine\Rasterizer\RAS_ICanvas.h"\
-	"..\..\..\..\source\gameengine\Rasterizer\RAS_IPolygonMaterial.h"\
-	"..\..\..\..\source\gameengine\Rasterizer\RAS_IRasterizer.h"\
-	"..\..\..\..\source\gameengine\Rasterizer\RAS_IRenderTools.h"\
-	"..\..\..\..\source\gameengine\Rasterizer\RAS_MaterialBucket.h"\
-	"..\..\..\..\source\gameengine\Rasterizer\RAS_TexVert.h"\
-	"..\..\..\..\source\kernel\gen_system\GEN_HashedString.h"\
-	"..\..\..\..\source\kernel\gen_system\GEN_Matrix4x4.h"\
-	"..\..\..\..\source\kernel\gen_system\GEN_StdString.h"\
-	"..\..\..\..\..\lib\windows\moto\include\GEN_Map.h"\
-	"..\..\..\..\..\lib\windows\moto\include\GEN_MinMax.h"\
-	"..\..\..\..\..\lib\windows\moto\include\GEN_Optimize.h"\
-	"..\..\..\..\..\lib\windows\moto\include\GEN_random.h"\
-	"..\..\..\..\..\lib\windows\moto\include\GEN_Stream.h"\
-	"..\..\..\..\..\lib\windows\moto\include\MT_assert.h"\
-	"..\..\..\..\..\lib\windows\moto\include\MT_Matrix3x3.h"\
-	"..\..\..\..\..\lib\windows\moto\include\MT_Matrix3x3.inl"\
-	"..\..\..\..\..\lib\windows\moto\include\MT_Point2.h"\
-	"..\..\..\..\..\lib\windows\moto\include\MT_Point2.inl"\
-	"..\..\..\..\..\lib\windows\moto\include\MT_Point3.h"\
-	"..\..\..\..\..\lib\windows\moto\include\MT_Point3.inl"\
-	"..\..\..\..\..\lib\windows\moto\include\MT_Quaternion.h"\
-	"..\..\..\..\..\lib\windows\moto\include\MT_Quaternion.inl"\
-	"..\..\..\..\..\lib\windows\moto\include\MT_Scalar.h"\
-	"..\..\..\..\..\lib\windows\moto\include\MT_Transform.h"\
-	"..\..\..\..\..\lib\windows\moto\include\MT_Tuple2.h"\
-	"..\..\..\..\..\lib\windows\moto\include\MT_Tuple3.h"\
-	"..\..\..\..\..\lib\windows\moto\include\MT_Tuple4.h"\
-	"..\..\..\..\..\lib\windows\moto\include\MT_Vector2.h"\
-	"..\..\..\..\..\lib\windows\moto\include\MT_Vector2.inl"\
-	"..\..\..\..\..\lib\windows\moto\include\MT_Vector3.h"\
-	"..\..\..\..\..\lib\windows\moto\include\MT_Vector3.inl"\
-	"..\..\..\..\..\lib\windows\moto\include\MT_Vector4.h"\
-	"..\..\..\..\..\lib\windows\moto\include\MT_Vector4.inl"\
-	"..\..\..\..\..\lib\windows\moto\include\NM_Scalar.h"\
-	
-NODEP_CPP_QTSYS=\
-	"..\..\..\..\source\gameengine\GamePlayer\Qt\BKE_bad_level_calls.h"\
-	"..\..\..\..\source\gameengine\GamePlayer\Qt\BLO_readfile.h"\
-	
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\Qt\DebugActuator.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\Qt\GP_Init.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\Qt\QtExampleEngine.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\Qt\QtInputDevice.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\Qt\QtKeyboardDevice.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\Qt\QtOpenGLWidget.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\Qt\QtRenderTools.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\Qt\QtSystem.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\Qt\resource.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\Qt\SamplePolygonMaterial.h
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\Qt\GP.rc
-# End Source File
-# End Group
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="gpplugin" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
+
+CFG=gpplugin - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "gpplugin.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "gpplugin.mak" CFG="gpplugin - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "gpplugin - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "gpplugin - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "gpplugin - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\..\..\..\obj\windows\gameengine\gameplayer\qt\gpplugin"
+# PROP Intermediate_Dir "..\..\..\..\..\obj\windows\gameengine\gameplayer\qt\gpplugin"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GPPLUGIN_EXPORTS" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "h:\qtwin\include" /I "..\..\..\..\source\gameengine\Expressions" /I "..\..\..\..\source\gameengine\GameLogic" /I "..\..\..\..\source\gameengine\Ketsji" /I "..\..\..\..\source\gameengine\Ketsji\KXNetwork" /I "..\..\..\..\source\gameengine\Network" /I "..\..\..\..\source\gameengine\Network\LoopBackNetwork" /I "..\..\..\..\source\gameengine\Rasterizer" /I "..\..\..\..\source\gameengine\Rasterizer\RAS_OpenGLRasterizer" /I "..\..\..\..\source\gameengine\SceneGraph" /I "..\..\..\..\source\sumo\Fuzzics\include" /I "..\..\..\..\source\sumo\include" /I "..\..\..\..\..\lib\windows\moto\include" /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\..\lib\windows\python\include\python2.0" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GPPLUGIN_EXPORTS" /YX /FD /c
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x413 /d "NDEBUG"
+# ADD RSC /l 0x413 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib imm32.lib winmm.lib wsock32.lib h:\qtwin\lib\qnp.lib h:\qtwin\lib\qt.lib opengl32.lib glu32.lib python20.lib /nologo /dll /machine:I386 /out:"..\..\..\..\..\obj\windows\npWebGP.dll" /libpath:"..\..\..\..\..\lib\windows\python\lib\\"
+
+!ELSEIF  "$(CFG)" == "gpplugin - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\..\..\..\obj\windows\gameengine\gameplayer\qt\gpplugin\debug"
+# PROP Intermediate_Dir "..\..\..\..\..\obj\windows\gameengine\gameplayer\qt\gpplugin\debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GPPLUGIN_EXPORTS" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /GX /Zi /Od /I "h:\qtwin\include" /I "..\..\..\..\source\gameengine\Expressions" /I "..\..\..\..\source\gameengine\GameLogic" /I "..\..\..\..\source\gameengine\Ketsji" /I "..\..\..\..\source\gameengine\Ketsji\KXNetwork" /I "..\..\..\..\source\gameengine\Network" /I "..\..\..\..\source\gameengine\Network\LoopBackNetwork" /I "..\..\..\..\source\gameengine\Rasterizer" /I "..\..\..\..\source\gameengine\Rasterizer\RAS_OpenGLRasterizer" /I "..\..\..\..\source\gameengine\SceneGraph" /I "..\..\..\..\source\sumo\Fuzzics\include" /I "..\..\..\..\source\sumo\include" /I "..\..\..\..\..\lib\windows\moto\include" /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\..\lib\windows\python\include\python1.5" /D "WIN32" /D "PLUGIN" /D "_DEBUG"
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x413 /d "_DEBUG"
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib imm32.lib winmm.lib wsock32.lib h:\qtwin\lib\qnp.lib h:\qtwin\lib\qt.lib opengl32.lib glu32.lib python15_d.lib /nologo /subsystem:windows /dll /debug /machine:I386 /def:"..\..\..\..\source\gameengine\GamePlayer\Qt\GP.def" /out:"..\..\..\..\..\obj\windows\debug\npWebGP.dll" /libpath:"..\..\..\..\..\lib\windows\python\lib"
+# SUBTRACT LINK32 /pdb:none
+
+!ENDIF 
+
+# Begin Target
+
+# Name "gpplugin - Win32 Release"
+# Name "gpplugin - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\Qt\GP.cpp
+DEP_CPP_GP_CP=\
+	"..\..\..\..\..\qtwin\include\qapplication.h"\
+	"..\..\..\..\..\qtwin\include\qarray.h"\
+	"..\..\..\..\..\qtwin\include\qasciidict.h"\
+	"..\..\..\..\..\qtwin\include\qbrush.h"\
+	"..\..\..\..\..\qtwin\include\qcollection.h"\
+	"..\..\..\..\..\qtwin\include\qcolor.h"\
+	"..\..\..\..\..\qtwin\include\qconfig-large.h"\
+	"..\..\..\..\..\qtwin\include\qconfig-medium.h"\
+	"..\..\..\..\..\qtwin\include\qconfig-minimal.h"\
+	"..\..\..\..\..\qtwin\include\qconfig-small.h"\
+	"..\..\..\..\..\qtwin\include\qconfig.h"\
+	"..\..\..\..\..\qtwin\include\qcstring.h"\
+	"..\..\..\..\..\qtwin\include\qcursor.h"\
+	"..\..\..\..\..\qtwin\include\qdatastream.h"\
+	"..\..\..\..\..\qtwin\include\qdialog.h"\
+	"..\..\..\..\..\qtwin\include\qevent.h"\
+	"..\..\..\..\..\qtwin\include\qfeatures.h"\
+	"..\..\..\..\..\qtwin\include\qfont.h"\
+	"..\..\..\..\..\qtwin\include\qfontinfo.h"\
+	"..\..\..\..\..\qtwin\include\qfontmetrics.h"\
+	"..\..\..\..\..\qtwin\include\qframe.h"\
+	"..\..\..\..\..\qtwin\include\qgarray.h"\
+	"..\..\..\..\..\qtwin\include\qgdict.h"\
+	"..\..\..\..\..\qtwin\include\qgl.h"\
+	"..\..\..\..\..\qtwin\include\qglist.h"\
+	"..\..\..\..\..\qtwin\include\qglobal.h"\
+	"..\..\..\..\..\qtwin\include\qiconset.h"\
+	"..\..\..\..\..\qtwin\include\qimage.h"\
+	"..\..\..\..\..\qtwin\include\qintdict.h"\
+	"..\..\..\..\..\qtwin\include\qiodevice.h"\
+	"..\..\..\..\..\qtwin\include\qlist.h"\
+	"..\..\..\..\..\qtwin\include\qmenudata.h"\
+	"..\..\..\..\..\qtwin\include\qmessagebox.h"\
+	"..\..\..\..\..\qtwin\include\qmime.h"\
+	"..\..\..\..\..\qtwin\include\qnamespace.h"\
+	"..\..\..\..\..\qtwin\include\qnp.h"\
+	"..\..\..\..\..\qtwin\include\qobject.h"\
+	"..\..\..\..\..\qtwin\include\qobjectdefs.h"\
+	"..\..\..\..\..\qtwin\include\qpaintdevice.h"\
+	"..\..\..\..\..\qtwin\include\qpainter.h"\
+	"..\..\..\..\..\qtwin\include\qpalette.h"\
+	"..\..\..\..\..\qtwin\include\qpen.h"\
+	"..\..\..\..\..\qtwin\include\qpixmap.h"\
+	"..\..\..\..\..\qtwin\include\qpngio.h"\
+	"..\..\..\..\..\qtwin\include\qpoint.h"\
+	"..\..\..\..\..\qtwin\include\qpointarray.h"\
+	"..\..\..\..\..\qtwin\include\qpopupmenu.h"\
+	"..\..\..\..\..\qtwin\include\qrect.h"\
+	"..\..\..\..\..\qtwin\include\qregexp.h"\
+	"..\..\..\..\..\qtwin\include\qregion.h"\
+	"..\..\..\..\..\qtwin\include\qshared.h"\
+	"..\..\..\..\..\qtwin\include\qsignal.h"\
+	"..\..\..\..\..\qtwin\include\qsize.h"\
+	"..\..\..\..\..\qtwin\include\qsizepolicy.h"\
+	"..\..\..\..\..\qtwin\include\qstring.h"\
+	"..\..\..\..\..\qtwin\include\qstringlist.h"\
+	"..\..\..\..\..\qtwin\include\qstrlist.h"\
+	"..\..\..\..\..\qtwin\include\qstyle.h"\
+	"..\..\..\..\..\qtwin\include\qt_windows.h"\
+	"..\..\..\..\..\qtwin\include\qtranslator.h"\
+	"..\..\..\..\..\qtwin\include\qvaluelist.h"\
+	"..\..\..\..\..\qtwin\include\qwidget.h"\
+	"..\..\..\..\..\qtwin\include\qwindowdefs.h"\
+	"..\..\..\..\..\qtwin\include\qwindowdefs_win.h"\
+	"..\..\..\..\..\qtwin\include\qwmatrix.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\abstract.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\bufferobject.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\ceval.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\classobject.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\cobject.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\complexobject.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\config.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\dictobject.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\fileobject.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\floatobject.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\funcobject.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\import.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\intobject.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\intrcheck.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\listobject.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\longobject.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\methodobject.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\modsupport.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\moduleobject.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\mymalloc.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\myproto.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\object.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\objimpl.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\patchlevel.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\pydebug.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\pyerrors.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\pyfpe.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\pystate.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\Python.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\pythonrun.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\rangeobject.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\sliceobject.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\stringobject.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\sysmodule.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\traceback.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\tupleobject.h"\
+	"..\..\..\..\source\gameengine\GameLogic\SCA_IInputDevice.h"\
+	"..\..\..\..\source\gameengine\GameLogic\SCA_ISystem.h"\
+	"..\..\..\..\source\gameengine\GamePlayer\Qt\GP_Init.h"\
+	"..\..\..\..\source\gameengine\GamePlayer\Qt\QtInputDevice.h"\
+	"..\..\..\..\source\gameengine\GamePlayer\Qt\QtKeyboardDevice.h"\
+	"..\..\..\..\source\gameengine\GamePlayer\Qt\QtOpenGLWidget.h"\
+	"..\..\..\..\source\gameengine\GamePlayer\Qt\QtRenderTools.h"\
+	"..\..\..\..\source\gameengine\GamePlayer\Qt\QtSystem.h"\
+	"..\..\..\..\source\gameengine\Network\LoopBackNetwork\NG_LoopBackNetworkDeviceInterface.h"\
+	"..\..\..\..\source\gameengine\Network\NG_NetworkDeviceInterface.h"\
+	"..\..\..\..\source\gameengine\Network\NG_NetworkScene.h"\
+	"..\..\..\..\source\gameengine\Rasterizer\RAS_ICanvas.h"\
+	"..\..\..\..\source\gameengine\Rasterizer\RAS_IPolygonMaterial.h"\
+	"..\..\..\..\source\gameengine\Rasterizer\RAS_IRasterizer.h"\
+	"..\..\..\..\source\gameengine\Rasterizer\RAS_IRenderTools.h"\
+	"..\..\..\..\source\gameengine\Rasterizer\RAS_MaterialBucket.h"\
+	"..\..\..\..\source\gameengine\Rasterizer\RAS_TexVert.h"\
+	"..\..\..\..\source\kernel\gen_system\GEN_HashedString.h"\
+	"..\..\..\..\source\kernel\gen_system\GEN_Matrix4x4.h"\
+	"..\..\..\..\source\kernel\gen_system\GEN_StdString.h"\
+	"..\..\..\..\..\lib\windows\moto\include\GEN_Map.h"\
+	"..\..\..\..\..\lib\windows\moto\include\GEN_MinMax.h"\
+	"..\..\..\..\..\lib\windows\moto\include\GEN_Optimize.h"\
+	"..\..\..\..\..\lib\windows\moto\include\GEN_random.h"\
+	"..\..\..\..\..\lib\windows\moto\include\GEN_Stream.h"\
+	"..\..\..\..\..\lib\windows\moto\include\MT_assert.h"\
+	"..\..\..\..\..\lib\windows\moto\include\MT_Matrix3x3.h"\
+	"..\..\..\..\..\lib\windows\moto\include\MT_Matrix3x3.inl"\
+	"..\..\..\..\..\lib\windows\moto\include\MT_Point2.h"\
+	"..\..\..\..\..\lib\windows\moto\include\MT_Point2.inl"\
+	"..\..\..\..\..\lib\windows\moto\include\MT_Point3.h"\
+	"..\..\..\..\..\lib\windows\moto\include\MT_Point3.inl"\
+	"..\..\..\..\..\lib\windows\moto\include\MT_Quaternion.h"\
+	"..\..\..\..\..\lib\windows\moto\include\MT_Quaternion.inl"\
+	"..\..\..\..\..\lib\windows\moto\include\MT_Scalar.h"\
+	"..\..\..\..\..\lib\windows\moto\include\MT_Transform.h"\
+	"..\..\..\..\..\lib\windows\moto\include\MT_Tuple2.h"\
+	"..\..\..\..\..\lib\windows\moto\include\MT_Tuple3.h"\
+	"..\..\..\..\..\lib\windows\moto\include\MT_Tuple4.h"\
+	"..\..\..\..\..\lib\windows\moto\include\MT_Vector2.h"\
+	"..\..\..\..\..\lib\windows\moto\include\MT_Vector2.inl"\
+	"..\..\..\..\..\lib\windows\moto\include\MT_Vector3.h"\
+	"..\..\..\..\..\lib\windows\moto\include\MT_Vector3.inl"\
+	"..\..\..\..\..\lib\windows\moto\include\MT_Vector4.h"\
+	"..\..\..\..\..\lib\windows\moto\include\MT_Vector4.inl"\
+	"..\..\..\..\..\lib\windows\moto\include\NM_Scalar.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\Qt\GP_Init.cpp
+DEP_CPP_GP_IN=\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\abstract.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\bufferobject.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\ceval.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\classobject.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\cobject.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\complexobject.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\config.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\dictobject.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\fileobject.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\floatobject.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\funcobject.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\import.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\intobject.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\intrcheck.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\listobject.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\longobject.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\methodobject.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\modsupport.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\moduleobject.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\mymalloc.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\myproto.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\object.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\objimpl.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\patchlevel.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\pydebug.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\pyerrors.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\pyfpe.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\pystate.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\Python.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\pythonrun.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\rangeobject.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\sliceobject.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\stringobject.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\sysmodule.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\traceback.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\tupleobject.h"\
+	"..\..\..\..\source\gameengine\Expressions\BoolValue.h"\
+	"..\..\..\..\source\gameengine\Expressions\ListValue.h"\
+	"..\..\..\..\source\gameengine\Expressions\PyObjectPlus.h"\
+	"..\..\..\..\source\gameengine\Expressions\Value.h"\
+	"..\..\..\..\source\gameengine\GameLogic\SCA_AlwaysEventManager.h"\
+	"..\..\..\..\source\gameengine\GameLogic\SCA_AlwaysSensor.h"\
+	"..\..\..\..\source\gameengine\GameLogic\SCA_ANDController.h"\
+	"..\..\..\..\source\gameengine\GameLogic\SCA_EventManager.h"\
+	"..\..\..\..\source\gameengine\GameLogic\SCA_IActuator.h"\
+	"..\..\..\..\source\gameengine\GameLogic\SCA_IController.h"\
+	"..\..\..\..\source\gameengine\GameLogic\SCA_IInputDevice.h"\
+	"..\..\..\..\source\gameengine\GameLogic\SCA_ILogicBrick.h"\
+	"..\..\..\..\source\gameengine\GameLogic\SCA_IObject.h"\
+	"..\..\..\..\source\gameengine\GameLogic\SCA_ISensor.h"\
+	"..\..\..\..\source\gameengine\GameLogic\SCA_ISystem.h"\
+	"..\..\..\..\source\gameengine\GameLogic\SCA_KeyboardManager.h"\
+	"..\..\..\..\source\gameengine\GameLogic\SCA_KeyboardSensor.h"\
+	"..\..\..\..\source\gameengine\GameLogic\SCA_LogicManager.h"\
+	"..\..\..\..\source\gameengine\GameLogic\SCA_PythonController.h"\
+	"..\..\..\..\source\gameengine\GamePlayer\Qt\DebugActuator.h"\
+	"..\..\..\..\source\gameengine\GamePlayer\Qt\QtExampleEngine.h"\
+	"..\..\..\..\source\gameengine\GamePlayer\Qt\SamplePolygonMaterial.h"\
+	"..\..\..\..\source\gameengine\Ketsji\KX_GameObject.h"\
+	"..\..\..\..\source\gameengine\Ketsji\KX_ObjectActuator.h"\
+	"..\..\..\..\source\gameengine\Ketsji\KX_PythonInit.h"\
+	"..\..\..\..\source\gameengine\Ketsji\KX_SoundActuator.h"\
+	"..\..\..\..\source\gameengine\Ketsji\KXNetwork\KX_NetworkEventManager.h"\
+	"..\..\..\..\source\gameengine\Network\LoopBackNetwork\NG_LoopBackNetworkDeviceInterface.h"\
+	"..\..\..\..\source\gameengine\Network\NG_NetworkDeviceInterface.h"\
+	"..\..\..\..\source\gameengine\Network\NG_NetworkScene.h"\
+	"..\..\..\..\source\gameengine\Rasterizer\RAS_BucketManager.h"\
+	"..\..\..\..\source\gameengine\Rasterizer\RAS_ICanvas.h"\
+	"..\..\..\..\source\gameengine\Rasterizer\RAS_IPolygonMaterial.h"\
+	"..\..\..\..\source\gameengine\Rasterizer\RAS_IRasterizer.h"\
+	"..\..\..\..\source\gameengine\Rasterizer\RAS_MaterialBucket.h"\
+	"..\..\..\..\source\gameengine\Rasterizer\RAS_MeshObject.h"\
+	"..\..\..\..\source\gameengine\Rasterizer\RAS_OpenGLRasterizer\RAS_OpenGLRasterizer.h"\
+	"..\..\..\..\source\gameengine\Rasterizer\RAS_Polygon.h"\
+	"..\..\..\..\source\gameengine\Rasterizer\RAS_TexVert.h"\
+	"..\..\..\..\source\gameengine\SceneGraph\SG_IObject.h"\
+	"..\..\..\..\source\gameengine\SceneGraph\SG_Node.h"\
+	"..\..\..\..\source\gameengine\SceneGraph\SG_Spatial.h"\
+	"..\..\..\..\source\kernel\gen_system\GEN_HashedPtr.h"\
+	"..\..\..\..\source\kernel\gen_system\GEN_HashedString.h"\
+	"..\..\..\..\source\kernel\gen_system\GEN_Matrix4x4.h"\
+	"..\..\..\..\source\kernel\gen_system\GEN_StdString.h"\
+	"..\..\..\..\source\sumo\include\solid.h"\
+	"..\..\..\..\source\sumo\include\solid_types.h"\
+	"..\..\..\..\..\lib\windows\moto\include\GEN_Map.h"\
+	"..\..\..\..\..\lib\windows\moto\include\GEN_MinMax.h"\
+	"..\..\..\..\..\lib\windows\moto\include\GEN_Optimize.h"\
+	"..\..\..\..\..\lib\windows\moto\include\GEN_random.h"\
+	"..\..\..\..\..\lib\windows\moto\include\GEN_Stream.h"\
+	"..\..\..\..\..\lib\windows\moto\include\MT_assert.h"\
+	"..\..\..\..\..\lib\windows\moto\include\MT_Matrix3x3.h"\
+	"..\..\..\..\..\lib\windows\moto\include\MT_Matrix3x3.inl"\
+	"..\..\..\..\..\lib\windows\moto\include\MT_Point2.h"\
+	"..\..\..\..\..\lib\windows\moto\include\MT_Point2.inl"\
+	"..\..\..\..\..\lib\windows\moto\include\MT_Point3.h"\
+	"..\..\..\..\..\lib\windows\moto\include\MT_Point3.inl"\
+	"..\..\..\..\..\lib\windows\moto\include\MT_Quaternion.h"\
+	"..\..\..\..\..\lib\windows\moto\include\MT_Quaternion.inl"\
+	"..\..\..\..\..\lib\windows\moto\include\MT_Scalar.h"\
+	"..\..\..\..\..\lib\windows\moto\include\MT_Transform.h"\
+	"..\..\..\..\..\lib\windows\moto\include\MT_Tuple2.h"\
+	"..\..\..\..\..\lib\windows\moto\include\MT_Tuple3.h"\
+	"..\..\..\..\..\lib\windows\moto\include\MT_Tuple4.h"\
+	"..\..\..\..\..\lib\windows\moto\include\MT_Vector2.h"\
+	"..\..\..\..\..\lib\windows\moto\include\MT_Vector2.inl"\
+	"..\..\..\..\..\lib\windows\moto\include\MT_Vector3.h"\
+	"..\..\..\..\..\lib\windows\moto\include\MT_Vector3.inl"\
+	"..\..\..\..\..\lib\windows\moto\include\MT_Vector4.h"\
+	"..\..\..\..\..\lib\windows\moto\include\MT_Vector4.inl"\
+	"..\..\..\..\..\lib\windows\moto\include\NM_Scalar.h"\
+	
+NODEP_CPP_GP_IN=\
+	"..\..\..\..\source\gameengine\GamePlayer\Qt\GPC_OpenALWaveCache.h"\
+	"..\..\..\..\source\gameengine\GamePlayer\Qt\OpenALScene.h"\
+	"..\..\..\..\source\gameengine\GamePlayer\Qt\SND_SoundObject.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\Qt\QtExampleEngine.cpp
+DEP_CPP_QTEXA=\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\abstract.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\bufferobject.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\ceval.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\classobject.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\cobject.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\complexobject.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\config.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\dictobject.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\fileobject.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\floatobject.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\funcobject.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\import.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\intobject.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\intrcheck.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\listobject.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\longobject.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\methodobject.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\modsupport.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\moduleobject.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\mymalloc.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\myproto.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\object.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\objimpl.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\patchlevel.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\pydebug.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\pyerrors.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\pyfpe.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\pystate.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\Python.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\pythonrun.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\rangeobject.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\sliceobject.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\stringobject.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\sysmodule.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\traceback.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\tupleobject.h"\
+	"..\..\..\..\source\gameengine\Expressions\BoolValue.h"\
+	"..\..\..\..\source\gameengine\Expressions\IntValue.h"\
+	"..\..\..\..\source\gameengine\Expressions\ListValue.h"\
+	"..\..\..\..\source\gameengine\Expressions\PyObjectPlus.h"\
+	"..\..\..\..\source\gameengine\Expressions\Value.h"\
+	"..\..\..\..\source\gameengine\GameLogic\SCA_IActuator.h"\
+	"..\..\..\..\source\gameengine\GameLogic\SCA_IInputDevice.h"\
+	"..\..\..\..\source\gameengine\GameLogic\SCA_ILogicBrick.h"\
+	"..\..\..\..\source\gameengine\GameLogic\SCA_IObject.h"\
+	"..\..\..\..\source\gameengine\GameLogic\SCA_ISystem.h"\
+	"..\..\..\..\source\gameengine\GameLogic\SCA_LogicManager.h"\
+	"..\..\..\..\source\gameengine\GamePlayer\Qt\QtExampleEngine.h"\
+	"..\..\..\..\source\gameengine\Ketsji\KX_Camera.h"\
+	"..\..\..\..\source\gameengine\Ketsji\KX_GameObject.h"\
+	"..\..\..\..\source\gameengine\Ketsji\KX_ObjectActuator.h"\
+	"..\..\..\..\source\gameengine\Network\NG_NetworkScene.h"\
+	"..\..\..\..\source\gameengine\Rasterizer\RAS_BucketManager.h"\
+	"..\..\..\..\source\gameengine\Rasterizer\RAS_CameraData.h"\
+	"..\..\..\..\source\gameengine\Rasterizer\RAS_IPolygonMaterial.h"\
+	"..\..\..\..\source\gameengine\Rasterizer\RAS_IRasterizer.h"\
+	"..\..\..\..\source\gameengine\Rasterizer\RAS_IRenderTools.h"\
+	"..\..\..\..\source\gameengine\Rasterizer\RAS_MaterialBucket.h"\
+	"..\..\..\..\source\gameengine\Rasterizer\RAS_MeshObject.h"\
+	"..\..\..\..\source\gameengine\Rasterizer\RAS_Polygon.h"\
+	"..\..\..\..\source\gameengine\Rasterizer\RAS_TexVert.h"\
+	"..\..\..\..\source\gameengine\SceneGraph\SG_IObject.h"\
+	"..\..\..\..\source\gameengine\SceneGraph\SG_Node.h"\
+	"..\..\..\..\source\gameengine\SceneGraph\SG_Spatial.h"\
+	"..\..\..\..\source\kernel\gen_system\GEN_HashedPtr.h"\
+	"..\..\..\..\source\kernel\gen_system\GEN_HashedString.h"\
+	"..\..\..\..\source\kernel\gen_system\GEN_Matrix4x4.h"\
+	"..\..\..\..\source\kernel\gen_system\GEN_StdString.h"\
+	"..\..\..\..\source\sumo\Fuzzics\include\SM_Scene.h"\
+	"..\..\..\..\source\sumo\include\solid.h"\
+	"..\..\..\..\source\sumo\include\solid_types.h"\
+	"..\..\..\..\..\lib\windows\moto\include\GEN_Map.h"\
+	"..\..\..\..\..\lib\windows\moto\include\GEN_MinMax.h"\
+	"..\..\..\..\..\lib\windows\moto\include\GEN_Optimize.h"\
+	"..\..\..\..\..\lib\windows\moto\include\GEN_random.h"\
+	"..\..\..\..\..\lib\windows\moto\include\GEN_Stream.h"\
+	"..\..\..\..\..\lib\windows\moto\include\MT_assert.h"\
+	"..\..\..\..\..\lib\windows\moto\include\MT_Matrix3x3.h"\
+	"..\..\..\..\..\lib\windows\moto\include\MT_Matrix3x3.inl"\
+	"..\..\..\..\..\lib\windows\moto\include\MT_Point2.h"\
+	"..\..\..\..\..\lib\windows\moto\include\MT_Point2.inl"\
+	"..\..\..\..\..\lib\windows\moto\include\MT_Point3.h"\
+	"..\..\..\..\..\lib\windows\moto\include\MT_Point3.inl"\
+	"..\..\..\..\..\lib\windows\moto\include\MT_Quaternion.h"\
+	"..\..\..\..\..\lib\windows\moto\include\MT_Quaternion.inl"\
+	"..\..\..\..\..\lib\windows\moto\include\MT_Scalar.h"\
+	"..\..\..\..\..\lib\windows\moto\include\MT_Transform.h"\
+	"..\..\..\..\..\lib\windows\moto\include\MT_Tuple2.h"\
+	"..\..\..\..\..\lib\windows\moto\include\MT_Tuple3.h"\
+	"..\..\..\..\..\lib\windows\moto\include\MT_Tuple4.h"\
+	"..\..\..\..\..\lib\windows\moto\include\MT_Vector2.h"\
+	"..\..\..\..\..\lib\windows\moto\include\MT_Vector2.inl"\
+	"..\..\..\..\..\lib\windows\moto\include\MT_Vector3.h"\
+	"..\..\..\..\..\lib\windows\moto\include\MT_Vector3.inl"\
+	"..\..\..\..\..\lib\windows\moto\include\MT_Vector4.h"\
+	"..\..\..\..\..\lib\windows\moto\include\MT_Vector4.inl"\
+	"..\..\..\..\..\lib\windows\moto\include\NM_Scalar.h"\
+	
+NODEP_CPP_QTEXA=\
+	"..\..\..\..\source\gameengine\GamePlayer\Qt\OpenALScene.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\Qt\QtKeyboardDevice.cpp
+DEP_CPP_QTKEY=\
+	"..\..\..\..\source\gameengine\GameLogic\SCA_IInputDevice.h"\
+	"..\..\..\..\source\gameengine\GamePlayer\Qt\QtInputDevice.h"\
+	"..\..\..\..\source\gameengine\GamePlayer\Qt\QtKeyboardDevice.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\Qt\QtOpenGLWidget.cpp
+DEP_CPP_QTOPE=\
+	"..\..\..\..\..\qtwin\include\qapplication.h"\
+	"..\..\..\..\..\qtwin\include\qarray.h"\
+	"..\..\..\..\..\qtwin\include\qasciidict.h"\
+	"..\..\..\..\..\qtwin\include\qbrush.h"\
+	"..\..\..\..\..\qtwin\include\qcollection.h"\
+	"..\..\..\..\..\qtwin\include\qcolor.h"\
+	"..\..\..\..\..\qtwin\include\qconfig-large.h"\
+	"..\..\..\..\..\qtwin\include\qconfig-medium.h"\
+	"..\..\..\..\..\qtwin\include\qconfig-minimal.h"\
+	"..\..\..\..\..\qtwin\include\qconfig-small.h"\
+	"..\..\..\..\..\qtwin\include\qconfig.h"\
+	"..\..\..\..\..\qtwin\include\qcstring.h"\
+	"..\..\..\..\..\qtwin\include\qcursor.h"\
+	"..\..\..\..\..\qtwin\include\qdatastream.h"\
+	"..\..\..\..\..\qtwin\include\qevent.h"\
+	"..\..\..\..\..\qtwin\include\qfeatures.h"\
+	"..\..\..\..\..\qtwin\include\qfont.h"\
+	"..\..\..\..\..\qtwin\include\qfontinfo.h"\
+	"..\..\..\..\..\qtwin\include\qfontmetrics.h"\
+	"..\..\..\..\..\qtwin\include\qframe.h"\
+	"..\..\..\..\..\qtwin\include\qgarray.h"\
+	"..\..\..\..\..\qtwin\include\qgdict.h"\
+	"..\..\..\..\..\qtwin\include\qgl.h"\
+	"..\..\..\..\..\qtwin\include\qglist.h"\
+	"..\..\..\..\..\qtwin\include\qglobal.h"\
+	"..\..\..\..\..\qtwin\include\qiconset.h"\
+	"..\..\..\..\..\qtwin\include\qintdict.h"\
+	"..\..\..\..\..\qtwin\include\qiodevice.h"\
+	"..\..\..\..\..\qtwin\include\qlist.h"\
+	"..\..\..\..\..\qtwin\include\qmenudata.h"\
+	"..\..\..\..\..\qtwin\include\qmime.h"\
+	"..\..\..\..\..\qtwin\include\qnamespace.h"\
+	"..\..\..\..\..\qtwin\include\qobject.h"\
+	"..\..\..\..\..\qtwin\include\qobjectdefs.h"\
+	"..\..\..\..\..\qtwin\include\qpaintdevice.h"\
+	"..\..\..\..\..\qtwin\include\qpalette.h"\
+	"..\..\..\..\..\qtwin\include\qpixmap.h"\
+	"..\..\..\..\..\qtwin\include\qpoint.h"\
+	"..\..\..\..\..\qtwin\include\qpopupmenu.h"\
+	"..\..\..\..\..\qtwin\include\qrect.h"\
+	"..\..\..\..\..\qtwin\include\qregexp.h"\
+	"..\..\..\..\..\qtwin\include\qregion.h"\
+	"..\..\..\..\..\qtwin\include\qshared.h"\
+	"..\..\..\..\..\qtwin\include\qsignal.h"\
+	"..\..\..\..\..\qtwin\include\qsize.h"\
+	"..\..\..\..\..\qtwin\include\qsizepolicy.h"\
+	"..\..\..\..\..\qtwin\include\qstring.h"\
+	"..\..\..\..\..\qtwin\include\qstringlist.h"\
+	"..\..\..\..\..\qtwin\include\qstyle.h"\
+	"..\..\..\..\..\qtwin\include\qt_windows.h"\
+	"..\..\..\..\..\qtwin\include\qtranslator.h"\
+	"..\..\..\..\..\qtwin\include\qvaluelist.h"\
+	"..\..\..\..\..\qtwin\include\qwidget.h"\
+	"..\..\..\..\..\qtwin\include\qwindowdefs.h"\
+	"..\..\..\..\..\qtwin\include\qwindowdefs_win.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\abstract.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\bufferobject.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\ceval.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\classobject.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\cobject.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\complexobject.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\config.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\dictobject.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\fileobject.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\floatobject.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\funcobject.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\import.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\intobject.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\intrcheck.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\listobject.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\longobject.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\methodobject.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\modsupport.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\moduleobject.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\mymalloc.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\myproto.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\object.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\objimpl.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\patchlevel.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\pydebug.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\pyerrors.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\pyfpe.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\pystate.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\Python.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\pythonrun.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\rangeobject.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\sliceobject.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\stringobject.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\sysmodule.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\traceback.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\tupleobject.h"\
+	"..\..\..\..\source\gameengine\GameLogic\SCA_IInputDevice.h"\
+	"..\..\..\..\source\gameengine\GameLogic\SCA_ISystem.h"\
+	"..\..\..\..\source\gameengine\GamePlayer\Qt\GP_Init.h"\
+	"..\..\..\..\source\gameengine\GamePlayer\Qt\QtInputDevice.h"\
+	"..\..\..\..\source\gameengine\GamePlayer\Qt\QtKeyboardDevice.h"\
+	"..\..\..\..\source\gameengine\GamePlayer\Qt\QtOpenGLWidget.h"\
+	"..\..\..\..\source\gameengine\GamePlayer\Qt\QtRenderTools.h"\
+	"..\..\..\..\source\gameengine\GamePlayer\Qt\QtSystem.h"\
+	"..\..\..\..\source\gameengine\Rasterizer\RAS_ICanvas.h"\
+	"..\..\..\..\source\gameengine\Rasterizer\RAS_IPolygonMaterial.h"\
+	"..\..\..\..\source\gameengine\Rasterizer\RAS_IRasterizer.h"\
+	"..\..\..\..\source\gameengine\Rasterizer\RAS_IRenderTools.h"\
+	"..\..\..\..\source\gameengine\Rasterizer\RAS_MaterialBucket.h"\
+	"..\..\..\..\source\gameengine\Rasterizer\RAS_TexVert.h"\
+	"..\..\..\..\source\kernel\gen_system\GEN_HashedString.h"\
+	"..\..\..\..\source\kernel\gen_system\GEN_Matrix4x4.h"\
+	"..\..\..\..\source\kernel\gen_system\GEN_StdString.h"\
+	"..\..\..\..\..\lib\windows\moto\include\GEN_Map.h"\
+	"..\..\..\..\..\lib\windows\moto\include\GEN_MinMax.h"\
+	"..\..\..\..\..\lib\windows\moto\include\GEN_Optimize.h"\
+	"..\..\..\..\..\lib\windows\moto\include\GEN_random.h"\
+	"..\..\..\..\..\lib\windows\moto\include\GEN_Stream.h"\
+	"..\..\..\..\..\lib\windows\moto\include\MT_assert.h"\
+	"..\..\..\..\..\lib\windows\moto\include\MT_Matrix3x3.h"\
+	"..\..\..\..\..\lib\windows\moto\include\MT_Matrix3x3.inl"\
+	"..\..\..\..\..\lib\windows\moto\include\MT_Point2.h"\
+	"..\..\..\..\..\lib\windows\moto\include\MT_Point2.inl"\
+	"..\..\..\..\..\lib\windows\moto\include\MT_Point3.h"\
+	"..\..\..\..\..\lib\windows\moto\include\MT_Point3.inl"\
+	"..\..\..\..\..\lib\windows\moto\include\MT_Quaternion.h"\
+	"..\..\..\..\..\lib\windows\moto\include\MT_Quaternion.inl"\
+	"..\..\..\..\..\lib\windows\moto\include\MT_Scalar.h"\
+	"..\..\..\..\..\lib\windows\moto\include\MT_Transform.h"\
+	"..\..\..\..\..\lib\windows\moto\include\MT_Tuple2.h"\
+	"..\..\..\..\..\lib\windows\moto\include\MT_Tuple3.h"\
+	"..\..\..\..\..\lib\windows\moto\include\MT_Tuple4.h"\
+	"..\..\..\..\..\lib\windows\moto\include\MT_Vector2.h"\
+	"..\..\..\..\..\lib\windows\moto\include\MT_Vector2.inl"\
+	"..\..\..\..\..\lib\windows\moto\include\MT_Vector3.h"\
+	"..\..\..\..\..\lib\windows\moto\include\MT_Vector3.inl"\
+	"..\..\..\..\..\lib\windows\moto\include\MT_Vector4.h"\
+	"..\..\..\..\..\lib\windows\moto\include\MT_Vector4.inl"\
+	"..\..\..\..\..\lib\windows\moto\include\NM_Scalar.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\Qt\QtSystem.cpp
+DEP_CPP_QTSYS=\
+	"..\..\..\..\..\qtwin\include\qapplication.h"\
+	"..\..\..\..\..\qtwin\include\qarray.h"\
+	"..\..\..\..\..\qtwin\include\qasciidict.h"\
+	"..\..\..\..\..\qtwin\include\qbrush.h"\
+	"..\..\..\..\..\qtwin\include\qcollection.h"\
+	"..\..\..\..\..\qtwin\include\qcolor.h"\
+	"..\..\..\..\..\qtwin\include\qconfig-large.h"\
+	"..\..\..\..\..\qtwin\include\qconfig-medium.h"\
+	"..\..\..\..\..\qtwin\include\qconfig-minimal.h"\
+	"..\..\..\..\..\qtwin\include\qconfig-small.h"\
+	"..\..\..\..\..\qtwin\include\qconfig.h"\
+	"..\..\..\..\..\qtwin\include\qcstring.h"\
+	"..\..\..\..\..\qtwin\include\qcursor.h"\
+	"..\..\..\..\..\qtwin\include\qdatastream.h"\
+	"..\..\..\..\..\qtwin\include\qevent.h"\
+	"..\..\..\..\..\qtwin\include\qfeatures.h"\
+	"..\..\..\..\..\qtwin\include\qfont.h"\
+	"..\..\..\..\..\qtwin\include\qfontinfo.h"\
+	"..\..\..\..\..\qtwin\include\qfontmetrics.h"\
+	"..\..\..\..\..\qtwin\include\qframe.h"\
+	"..\..\..\..\..\qtwin\include\qgarray.h"\
+	"..\..\..\..\..\qtwin\include\qgdict.h"\
+	"..\..\..\..\..\qtwin\include\qgl.h"\
+	"..\..\..\..\..\qtwin\include\qglist.h"\
+	"..\..\..\..\..\qtwin\include\qglobal.h"\
+	"..\..\..\..\..\qtwin\include\qiconset.h"\
+	"..\..\..\..\..\qtwin\include\qintdict.h"\
+	"..\..\..\..\..\qtwin\include\qiodevice.h"\
+	"..\..\..\..\..\qtwin\include\qlist.h"\
+	"..\..\..\..\..\qtwin\include\qmenudata.h"\
+	"..\..\..\..\..\qtwin\include\qmime.h"\
+	"..\..\..\..\..\qtwin\include\qnamespace.h"\
+	"..\..\..\..\..\qtwin\include\qobject.h"\
+	"..\..\..\..\..\qtwin\include\qobjectdefs.h"\
+	"..\..\..\..\..\qtwin\include\qpaintdevice.h"\
+	"..\..\..\..\..\qtwin\include\qpalette.h"\
+	"..\..\..\..\..\qtwin\include\qpixmap.h"\
+	"..\..\..\..\..\qtwin\include\qpoint.h"\
+	"..\..\..\..\..\qtwin\include\qpopupmenu.h"\
+	"..\..\..\..\..\qtwin\include\qrect.h"\
+	"..\..\..\..\..\qtwin\include\qregexp.h"\
+	"..\..\..\..\..\qtwin\include\qregion.h"\
+	"..\..\..\..\..\qtwin\include\qshared.h"\
+	"..\..\..\..\..\qtwin\include\qsignal.h"\
+	"..\..\..\..\..\qtwin\include\qsize.h"\
+	"..\..\..\..\..\qtwin\include\qsizepolicy.h"\
+	"..\..\..\..\..\qtwin\include\qstring.h"\
+	"..\..\..\..\..\qtwin\include\qstringlist.h"\
+	"..\..\..\..\..\qtwin\include\qstyle.h"\
+	"..\..\..\..\..\qtwin\include\qt_windows.h"\
+	"..\..\..\..\..\qtwin\include\qtranslator.h"\
+	"..\..\..\..\..\qtwin\include\qvaluelist.h"\
+	"..\..\..\..\..\qtwin\include\qwidget.h"\
+	"..\..\..\..\..\qtwin\include\qwindowdefs.h"\
+	"..\..\..\..\..\qtwin\include\qwindowdefs_win.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\abstract.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\bufferobject.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\ceval.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\classobject.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\cobject.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\complexobject.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\config.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\dictobject.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\fileobject.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\floatobject.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\funcobject.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\import.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\intobject.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\intrcheck.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\listobject.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\longobject.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\methodobject.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\modsupport.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\moduleobject.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\mymalloc.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\myproto.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\object.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\objimpl.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\patchlevel.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\pydebug.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\pyerrors.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\pyfpe.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\pystate.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\Python.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\pythonrun.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\rangeobject.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\sliceobject.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\stringobject.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\sysmodule.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\traceback.h"\
+	"..\..\..\..\..\lib\windows\python\include\python1.5\tupleobject.h"\
+	"..\..\..\..\source\gameengine\GameLogic\SCA_IInputDevice.h"\
+	"..\..\..\..\source\gameengine\GameLogic\SCA_ISystem.h"\
+	"..\..\..\..\source\gameengine\GamePlayer\Qt\GP_Init.h"\
+	"..\..\..\..\source\gameengine\GamePlayer\Qt\QtInputDevice.h"\
+	"..\..\..\..\source\gameengine\GamePlayer\Qt\QtKeyboardDevice.h"\
+	"..\..\..\..\source\gameengine\GamePlayer\Qt\QtOpenGLWidget.h"\
+	"..\..\..\..\source\gameengine\GamePlayer\Qt\QtRenderTools.h"\
+	"..\..\..\..\source\gameengine\GamePlayer\Qt\QtSystem.h"\
+	"..\..\..\..\source\gameengine\Network\LoopBackNetwork\NG_LoopBackNetworkDeviceInterface.h"\
+	"..\..\..\..\source\gameengine\Network\NG_NetworkDeviceInterface.h"\
+	"..\..\..\..\source\gameengine\Network\NG_NetworkScene.h"\
+	"..\..\..\..\source\gameengine\Rasterizer\RAS_ICanvas.h"\
+	"..\..\..\..\source\gameengine\Rasterizer\RAS_IPolygonMaterial.h"\
+	"..\..\..\..\source\gameengine\Rasterizer\RAS_IRasterizer.h"\
+	"..\..\..\..\source\gameengine\Rasterizer\RAS_IRenderTools.h"\
+	"..\..\..\..\source\gameengine\Rasterizer\RAS_MaterialBucket.h"\
+	"..\..\..\..\source\gameengine\Rasterizer\RAS_TexVert.h"\
+	"..\..\..\..\source\kernel\gen_system\GEN_HashedString.h"\
+	"..\..\..\..\source\kernel\gen_system\GEN_Matrix4x4.h"\
+	"..\..\..\..\source\kernel\gen_system\GEN_StdString.h"\
+	"..\..\..\..\..\lib\windows\moto\include\GEN_Map.h"\
+	"..\..\..\..\..\lib\windows\moto\include\GEN_MinMax.h"\
+	"..\..\..\..\..\lib\windows\moto\include\GEN_Optimize.h"\
+	"..\..\..\..\..\lib\windows\moto\include\GEN_random.h"\
+	"..\..\..\..\..\lib\windows\moto\include\GEN_Stream.h"\
+	"..\..\..\..\..\lib\windows\moto\include\MT_assert.h"\
+	"..\..\..\..\..\lib\windows\moto\include\MT_Matrix3x3.h"\
+	"..\..\..\..\..\lib\windows\moto\include\MT_Matrix3x3.inl"\
+	"..\..\..\..\..\lib\windows\moto\include\MT_Point2.h"\
+	"..\..\..\..\..\lib\windows\moto\include\MT_Point2.inl"\
+	"..\..\..\..\..\lib\windows\moto\include\MT_Point3.h"\
+	"..\..\..\..\..\lib\windows\moto\include\MT_Point3.inl"\
+	"..\..\..\..\..\lib\windows\moto\include\MT_Quaternion.h"\
+	"..\..\..\..\..\lib\windows\moto\include\MT_Quaternion.inl"\
+	"..\..\..\..\..\lib\windows\moto\include\MT_Scalar.h"\
+	"..\..\..\..\..\lib\windows\moto\include\MT_Transform.h"\
+	"..\..\..\..\..\lib\windows\moto\include\MT_Tuple2.h"\
+	"..\..\..\..\..\lib\windows\moto\include\MT_Tuple3.h"\
+	"..\..\..\..\..\lib\windows\moto\include\MT_Tuple4.h"\
+	"..\..\..\..\..\lib\windows\moto\include\MT_Vector2.h"\
+	"..\..\..\..\..\lib\windows\moto\include\MT_Vector2.inl"\
+	"..\..\..\..\..\lib\windows\moto\include\MT_Vector3.h"\
+	"..\..\..\..\..\lib\windows\moto\include\MT_Vector3.inl"\
+	"..\..\..\..\..\lib\windows\moto\include\MT_Vector4.h"\
+	"..\..\..\..\..\lib\windows\moto\include\MT_Vector4.inl"\
+	"..\..\..\..\..\lib\windows\moto\include\NM_Scalar.h"\
+	
+NODEP_CPP_QTSYS=\
+	"..\..\..\..\source\gameengine\GamePlayer\Qt\BKE_bad_level_calls.h"\
+	"..\..\..\..\source\gameengine\GamePlayer\Qt\BLO_readfile.h"\
+	
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\Qt\DebugActuator.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\Qt\GP_Init.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\Qt\QtExampleEngine.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\Qt\QtInputDevice.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\Qt\QtKeyboardDevice.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\Qt\QtOpenGLWidget.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\Qt\QtRenderTools.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\Qt\QtSystem.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\Qt\resource.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\Qt\SamplePolygonMaterial.h
+# End Source File
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\Qt\GP.rc
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/projectfiles/gameengine/gameplayer/qt/qtgp.dsw b/projectfiles/gameengine/gameplayer/qt/qtgp.dsw
index 22d9c5db23c4810079d30c8c3e8f7a722ce3f173..aac0b0f24231deb2ad85737dd8a01e82fc713490 100644
--- a/projectfiles/gameengine/gameplayer/qt/qtgp.dsw
+++ b/projectfiles/gameengine/gameplayer/qt/qtgp.dsw
@@ -1,323 +1,323 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "BLO_loader"=..\..\..\blender\loader\BLO_loader.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "EXP_expressions"=..\..\expression\EXP_expressions.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "SCA_GameLogic"=..\..\gamelogic\SCA_GameLogic.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "KX_ketsji"=..\..\ketsji\KX_ketsji.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "KX_network"=..\..\ketsji\network\KX_network.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "SG_SceneGraph"=..\..\scenegraph\SG_SceneGraph.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "NG_loopbacknetwork"=..\..\network\loopbacknetwork\NG_loopbacknetwork.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "NG_network"=..\..\network\network\NG_network.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "RAS_openglrasterizer"=..\..\rasterizer\openglrasterizer\RAS_openglrasterizer.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "RAS_rasterizer"=..\..\rasterizer\RAS_rasterizer.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "SM_fuzzics"=..\..\..\sumo\fuzzics\SM_fuzzics.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "SM_moto"=..\..\..\sumo\moto\SM_moto.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "SM_solid"=..\..\..\sumo\solid\SM_solid.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "SND_openal"=..\..\sound\openal\SND_openal.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "SND_sound"=..\..\sound\SND_sound.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "SYS_system"=..\..\..\kernel\system\SYS_system.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "gp"=.\gp.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name EXP_expressions
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name SCA_GameLogic
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name KX_ketsji
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name KX_network
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name SG_SceneGraph
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name NG_loopbacknetwork
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name NG_network
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name RAS_openglrasterizer
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name RAS_rasterizer
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name SM_fuzzics
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name SM_moto
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name SM_solid
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name SND_openal
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name SND_sound
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name SYS_system
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "gpplugin"=.\gpplugin.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name EXP_expressions
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name SCA_GameLogic
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name KX_ketsji
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name KX_network
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name SG_SceneGraph
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name NG_loopbacknetwork
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name NG_network
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name RAS_openglrasterizer
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name RAS_rasterizer
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name SM_fuzzics
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name SM_moto
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name SM_solid
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name SND_openal
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name SND_sound
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name SYS_system
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "BLO_loader"=..\..\..\blender\loader\BLO_loader.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "EXP_expressions"=..\..\expression\EXP_expressions.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "SCA_GameLogic"=..\..\gamelogic\SCA_GameLogic.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "KX_ketsji"=..\..\ketsji\KX_ketsji.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "KX_network"=..\..\ketsji\network\KX_network.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "SG_SceneGraph"=..\..\scenegraph\SG_SceneGraph.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "NG_loopbacknetwork"=..\..\network\loopbacknetwork\NG_loopbacknetwork.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "NG_network"=..\..\network\network\NG_network.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "RAS_openglrasterizer"=..\..\rasterizer\openglrasterizer\RAS_openglrasterizer.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "RAS_rasterizer"=..\..\rasterizer\RAS_rasterizer.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "SM_fuzzics"=..\..\..\sumo\fuzzics\SM_fuzzics.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "SM_moto"=..\..\..\sumo\moto\SM_moto.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "SM_solid"=..\..\..\sumo\solid\SM_solid.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "SND_openal"=..\..\sound\openal\SND_openal.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "SND_sound"=..\..\sound\SND_sound.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "SYS_system"=..\..\..\kernel\system\SYS_system.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "gp"=.\gp.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name EXP_expressions
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name SCA_GameLogic
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name KX_ketsji
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name KX_network
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name SG_SceneGraph
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name NG_loopbacknetwork
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name NG_network
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name RAS_openglrasterizer
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name RAS_rasterizer
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name SM_fuzzics
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name SM_moto
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name SM_solid
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name SND_openal
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name SND_sound
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name SYS_system
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "gpplugin"=.\gpplugin.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name EXP_expressions
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name SCA_GameLogic
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name KX_ketsji
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name KX_network
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name SG_SceneGraph
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name NG_loopbacknetwork
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name NG_network
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name RAS_openglrasterizer
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name RAS_rasterizer
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name SM_fuzzics
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name SM_moto
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name SM_solid
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name SND_openal
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name SND_sound
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name SYS_system
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
diff --git a/projectfiles/gameengine/gameplayer/sdl/GP_sdl.dsp b/projectfiles/gameengine/gameplayer/sdl/GP_sdl.dsp
index 56c758de7e97799a293c6a7eeb4ca0d5565f1444..a3a1c226d61c546fe0a771627027bd00a00d0d6b 100644
--- a/projectfiles/gameengine/gameplayer/sdl/GP_sdl.dsp
+++ b/projectfiles/gameengine/gameplayer/sdl/GP_sdl.dsp
@@ -1,205 +1,205 @@
-# Microsoft Developer Studio Project File - Name="GP_sdl" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=GP_sdl - Win32 Profile
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "GP_sdl.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "GP_sdl.mak" CFG="GP_sdl - Win32 Profile"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "GP_sdl - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "GP_sdl - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "GP_sdl - Win32 Profile" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "GP_sdl - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "..\..\..\..\obj\windows\gameengine\gameplayer\sdl"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\..\source\gameengine\network" /I "..\..\..\..\source\gameengine\network\loopbacknetwork" /I "..\..\..\..\source\gameengine\gameplayer\common" /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\source\gameengine\gamelogic" /I "..\..\..\..\source\gameengine\Rasterizer" /I "..\..\..\..\source\sumo\include" /I "..\..\..\..\..\lib\windows\moto\include" /I "..\..\..\..\source\sumo\Fuzzics\include" /I "..\..\..\..\..\lib\windows\sdl\SDL-1.1.7\include" /I "..\..\..\..\..\lib\windows\python\include\python2.0" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 sdl.lib sdlmain.lib kernel32.lib winspool.lib comdlg32.lib shell32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib opengl32.lib user32.lib gdi32.lib advapi32.lib dxguid.lib ole32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\..\lib\windows\sdl\sdl-1.1.7\lib" /libpath:"..\..\..\..\..\lib\windows\python\lib"
-
-!ELSEIF  "$(CFG)" == "GP_sdl - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "..\..\..\..\obj\windows\gameengine\gameplayer\sdl\debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "..\..\..\..\source\gameengine\network" /I "..\..\..\..\source\gameengine\network\loopbacknetwork" /I "..\..\..\..\source\gameengine\gameplayer\common" /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\source\gameengine\gamelogic" /I "..\..\..\..\source\gameengine\Rasterizer" /I "..\..\..\..\source\sumo\include" /I "..\..\..\..\..\lib\windows\moto\include" /I "..\..\..\..\source\sumo\Fuzzics\include" /I "..\..\..\..\..\lib\windows\sdl\SDL-1.1.7\include" /I "..\..\..\..\..\lib\windows\python\include\python1.5" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 glu32.lib sdlmaindebug.lib sdldebug.lib opengl32.lib user32.lib gdi32.lib advapi32.lib dxguid.lib ole32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\..\lib\windows\sdl\sdl-1.1.7\lib" /libpath:"..\..\..\..\..\lib\windows\python\lib" /libpath:"..\..\..\..\..\lib\windows\openal\lib\lib_release"
-
-!ELSEIF  "$(CFG)" == "GP_sdl - Win32 Profile"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "GP_sdl___Win32_Profile"
-# PROP BASE Intermediate_Dir "GP_sdl___Win32_Profile"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "GP_sdl___Win32_Profile"
-# PROP Intermediate_Dir "GP_sdl___Win32_Profile"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\..\source\gameengine\network" /I "..\..\..\..\source\gameengine\network\loopbacknetwork" /I "..\..\..\..\source\gameengine\gameplayer\common" /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\source\gameengine\gamelogic" /I "..\..\..\..\source\gameengine\Rasterizer" /I "..\..\..\..\source\sumo\include" /I "..\..\..\..\..\lib\windows\moto\include" /I "..\..\..\..\source\sumo\Fuzzics\include" /I "..\..\..\..\..\lib\windows\sdl\SDL-1.1.7\include" /I "..\..\..\..\..\lib\windows\python\include\python1.5" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /Zi /O2 /I "..\..\..\..\source\gameengine\network" /I "..\..\..\..\source\gameengine\network\loopbacknetwork" /I "..\..\..\..\source\gameengine\gameplayer\common" /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\source\gameengine\gamelogic" /I "..\..\..\..\source\gameengine\Rasterizer" /I "..\..\..\..\source\sumo\include" /I "..\..\..\..\..\lib\windows\moto\include" /I "..\..\..\..\source\sumo\Fuzzics\include" /I "..\..\..\..\..\lib\windows\sdl\SDL-1.1.7\include" /I "..\..\..\..\..\lib\windows\python\include\python1.5" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 glu32.lib sdlmaindebug.lib sdldebug.lib opengl32.lib user32.lib gdi32.lib advapi32.lib dxguid.lib ole32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\..\lib\windows\sdl\sdl-1.1.7\lib" /libpath:"..\..\..\..\..\lib\windows\python\lib" /libpath:"..\..\..\..\..\lib\windows\openal\lib\lib_release"
-# ADD LINK32 glu32.lib sdlmaindebug.lib sdldebug.lib opengl32.lib user32.lib gdi32.lib advapi32.lib dxguid.lib ole32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\..\lib\windows\sdl\sdl-1.1.7\lib" /libpath:"..\..\..\..\..\lib\windows\python\lib" /libpath:"..\..\..\..\..\lib\windows\openal\lib\lib_release"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "GP_sdl - Win32 Release"
-# Name "GP_sdl - Win32 Debug"
-# Name "GP_sdl - Win32 Profile"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\SDL\main.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\SDL\SDLKeyboardDevice.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\SDL\SDLRenderTools.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\SDL\SDLSystem.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\SDL\SDLCanvas.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\SDL\SDLInputDevice.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\SDL\SDLKeyboardDevice.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\SDL\SDLRenderTools.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\GamePlayer\SDL\SDLSystem.h
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# Begin Source File
-
-SOURCE=..\..\..\..\..\lib\windows\openal\lib\alc\ALc.obj
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\..\lib\windows\openal\lib\alu\ALu.obj
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\..\lib\windows\openal\lib\alut\ALut.obj
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\..\lib\windows\openal\lib\OpenAL32\alBuffer.obj
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\..\lib\windows\openal\lib\OpenAL32\alEax.obj
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\..\lib\windows\openal\lib\OpenAL32\alError.obj
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\..\lib\windows\openal\lib\OpenAL32\alExtension.obj
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\..\lib\windows\openal\lib\OpenAL32\alListener.obj
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\..\lib\windows\openal\lib\OpenAL32\alSource.obj
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\..\lib\windows\openal\lib\OpenAL32\alState.obj
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\..\lib\windows\openal\lib\OpenAL32\OpenAL32.obj
-# End Source File
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="GP_sdl" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=GP_sdl - Win32 Profile
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "GP_sdl.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "GP_sdl.mak" CFG="GP_sdl - Win32 Profile"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "GP_sdl - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "GP_sdl - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "GP_sdl - Win32 Profile" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "GP_sdl - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "..\..\..\..\obj\windows\gameengine\gameplayer\sdl"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\..\source\gameengine\network" /I "..\..\..\..\source\gameengine\network\loopbacknetwork" /I "..\..\..\..\source\gameengine\gameplayer\common" /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\source\gameengine\gamelogic" /I "..\..\..\..\source\gameengine\Rasterizer" /I "..\..\..\..\source\sumo\include" /I "..\..\..\..\..\lib\windows\moto\include" /I "..\..\..\..\source\sumo\Fuzzics\include" /I "..\..\..\..\..\lib\windows\sdl\SDL-1.1.7\include" /I "..\..\..\..\..\lib\windows\python\include\python2.0" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 sdl.lib sdlmain.lib kernel32.lib winspool.lib comdlg32.lib shell32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib opengl32.lib user32.lib gdi32.lib advapi32.lib dxguid.lib ole32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\..\lib\windows\sdl\sdl-1.1.7\lib" /libpath:"..\..\..\..\..\lib\windows\python\lib"
+
+!ELSEIF  "$(CFG)" == "GP_sdl - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "..\..\..\..\obj\windows\gameengine\gameplayer\sdl\debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "..\..\..\..\source\gameengine\network" /I "..\..\..\..\source\gameengine\network\loopbacknetwork" /I "..\..\..\..\source\gameengine\gameplayer\common" /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\source\gameengine\gamelogic" /I "..\..\..\..\source\gameengine\Rasterizer" /I "..\..\..\..\source\sumo\include" /I "..\..\..\..\..\lib\windows\moto\include" /I "..\..\..\..\source\sumo\Fuzzics\include" /I "..\..\..\..\..\lib\windows\sdl\SDL-1.1.7\include" /I "..\..\..\..\..\lib\windows\python\include\python1.5" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 glu32.lib sdlmaindebug.lib sdldebug.lib opengl32.lib user32.lib gdi32.lib advapi32.lib dxguid.lib ole32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\..\lib\windows\sdl\sdl-1.1.7\lib" /libpath:"..\..\..\..\..\lib\windows\python\lib" /libpath:"..\..\..\..\..\lib\windows\openal\lib\lib_release"
+
+!ELSEIF  "$(CFG)" == "GP_sdl - Win32 Profile"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "GP_sdl___Win32_Profile"
+# PROP BASE Intermediate_Dir "GP_sdl___Win32_Profile"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "GP_sdl___Win32_Profile"
+# PROP Intermediate_Dir "GP_sdl___Win32_Profile"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\..\source\gameengine\network" /I "..\..\..\..\source\gameengine\network\loopbacknetwork" /I "..\..\..\..\source\gameengine\gameplayer\common" /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\source\gameengine\gamelogic" /I "..\..\..\..\source\gameengine\Rasterizer" /I "..\..\..\..\source\sumo\include" /I "..\..\..\..\..\lib\windows\moto\include" /I "..\..\..\..\source\sumo\Fuzzics\include" /I "..\..\..\..\..\lib\windows\sdl\SDL-1.1.7\include" /I "..\..\..\..\..\lib\windows\python\include\python1.5" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GX /Zi /O2 /I "..\..\..\..\source\gameengine\network" /I "..\..\..\..\source\gameengine\network\loopbacknetwork" /I "..\..\..\..\source\gameengine\gameplayer\common" /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\source\gameengine\gamelogic" /I "..\..\..\..\source\gameengine\Rasterizer" /I "..\..\..\..\source\sumo\include" /I "..\..\..\..\..\lib\windows\moto\include" /I "..\..\..\..\source\sumo\Fuzzics\include" /I "..\..\..\..\..\lib\windows\sdl\SDL-1.1.7\include" /I "..\..\..\..\..\lib\windows\python\include\python1.5" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 glu32.lib sdlmaindebug.lib sdldebug.lib opengl32.lib user32.lib gdi32.lib advapi32.lib dxguid.lib ole32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\..\lib\windows\sdl\sdl-1.1.7\lib" /libpath:"..\..\..\..\..\lib\windows\python\lib" /libpath:"..\..\..\..\..\lib\windows\openal\lib\lib_release"
+# ADD LINK32 glu32.lib sdlmaindebug.lib sdldebug.lib opengl32.lib user32.lib gdi32.lib advapi32.lib dxguid.lib ole32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\..\lib\windows\sdl\sdl-1.1.7\lib" /libpath:"..\..\..\..\..\lib\windows\python\lib" /libpath:"..\..\..\..\..\lib\windows\openal\lib\lib_release"
+
+!ENDIF 
+
+# Begin Target
+
+# Name "GP_sdl - Win32 Release"
+# Name "GP_sdl - Win32 Debug"
+# Name "GP_sdl - Win32 Profile"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\SDL\main.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\SDL\SDLKeyboardDevice.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\SDL\SDLRenderTools.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\SDL\SDLSystem.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\SDL\SDLCanvas.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\SDL\SDLInputDevice.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\SDL\SDLKeyboardDevice.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\SDL\SDLRenderTools.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\GamePlayer\SDL\SDLSystem.h
+# End Source File
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# Begin Source File
+
+SOURCE=..\..\..\..\..\lib\windows\openal\lib\alc\ALc.obj
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\..\lib\windows\openal\lib\alu\ALu.obj
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\..\lib\windows\openal\lib\alut\ALut.obj
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\..\lib\windows\openal\lib\OpenAL32\alBuffer.obj
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\..\lib\windows\openal\lib\OpenAL32\alEax.obj
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\..\lib\windows\openal\lib\OpenAL32\alError.obj
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\..\lib\windows\openal\lib\OpenAL32\alExtension.obj
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\..\lib\windows\openal\lib\OpenAL32\alListener.obj
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\..\lib\windows\openal\lib\OpenAL32\alSource.obj
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\..\lib\windows\openal\lib\OpenAL32\alState.obj
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\..\lib\windows\openal\lib\OpenAL32\OpenAL32.obj
+# End Source File
+# End Target
+# End Project
diff --git a/projectfiles/gameengine/ketsji/KX_ketsji.dsp b/projectfiles/gameengine/ketsji/KX_ketsji.dsp
index b7139d01bc3aea10382eb9de87c5d997f83fac81..8c4370d9c9a632a265bd5d82ba94e90f4eff1fc8 100644
--- a/projectfiles/gameengine/ketsji/KX_ketsji.dsp
+++ b/projectfiles/gameengine/ketsji/KX_ketsji.dsp
@@ -1,690 +1,690 @@
-# Microsoft Developer Studio Project File - Name="KX_ketsji" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=KX_ketsji - Win32 Release
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "KX_ketsji.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "KX_ketsji.mak" CFG="KX_ketsji - Win32 Release"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "KX_ketsji - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "KX_ketsji - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "KX_ketsji - Win32 MT DLL Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "KX_ketsji - Win32 MT DLL Release" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "KX_ketsji - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\obj\windows\gameengine\ketsji"
-# PROP Intermediate_Dir "..\..\..\obj\windows\gameengine\ketsji"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-MTL=midl.exe
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "..\..\..\source\gameengine\physics\common\dummy" /I "..\..\..\extern\solid" /I "..\..\..\..\lib\windows\string\include" /I "..\..\..\..\lib\windows\moto\include" /I "..\..\..\source\kernel\gen_system" /I "..\..\..\..\lib\windows\soundsystem\include" /I "..\..\..\source\gameengine\rasterizer" /I "..\..\..\source\gameengine\scenegraph" /I "..\..\..\source\gameengine\gamelogic" /I "..\..\..\source\gameengine\expressions" /I "..\..\..\source\sumo\include" /I "..\..\..\source\sumo\fuzzics\include" /I "..\..\..\source\gameengine\network" /I "..\..\..\source\gameengine\Converter" /I "..\..\..\source\gameengine\ketsji\kxnetwork" /I "..\..\..\source\gameengine\physics" /I "..\..\..\source\gameengine\physics\common" /I "..\..\..\source\gameengine\physics\dummy" /I "..\..\..\source\gameengine\physics\sumo" /I "..\..\..\source\gameengine\physics\sumo\fuzzics\include" /I "..\..\..\source\gameengine\physics\sumo\include" /I "..\..\..\source\gameengine\physics\BlOde" /I "..\..\..\..\lib\windows\python\include\python2.4" /I "..\..\..\source\blender\python" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\blender\include" /I "..\..\..\source\blender\imbuf" /I "..\..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\source\gameengine\physics\bullet" /I "..\..\..\extern\bullet\linearmath" /I "..\..\..\extern\bullet\Bulletdynamics" /I "..\..\..\extern\bullet\Bullet" /I "..\..\..\source\gameengine\Rasterizer\RAS_OpenGLRasterizer" /I "..\..\..\source\blender\blenlib" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "EXP_PYTHON_EMBEDDING" /D "USE_SUMO_SOLID" /YX /J /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "KX_ketsji - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\obj\windows\gameengine\ketsji\debug"
-# PROP Intermediate_Dir "..\..\..\obj\windows\gameengine\ketsji\debug"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-MTL=midl.exe
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GR /GX /Zi /Od /I "..\..\..\source\gameengine\physics\common\dummy" /I "..\..\..\extern\solid" /I "..\..\..\..\lib\windows\string\include" /I "..\..\..\..\lib\windows\moto\include" /I "..\..\..\source\kernel\gen_system" /I "..\..\..\..\lib\windows\soundsystem\include" /I "..\..\..\source\gameengine\rasterizer" /I "..\..\..\source\gameengine\scenegraph" /I "..\..\..\source\gameengine\gamelogic" /I "..\..\..\source\gameengine\expressions" /I "..\..\..\source\sumo\include" /I "..\..\..\source\sumo\fuzzics\include" /I "..\..\..\source\gameengine\network" /I "..\..\..\source\gameengine\Converter" /I "..\..\..\source\gameengine\ketsji\kxnetwork" /I "..\..\..\source\gameengine\physics" /I "..\..\..\source\gameengine\physics\common" /I "..\..\..\source\gameengine\physics\dummy" /I "..\..\..\source\gameengine\physics\sumo" /I "..\..\..\source\gameengine\physics\sumo\fuzzics\include" /I "..\..\..\source\gameengine\physics\sumo\include" /I "..\..\..\source\gameengine\physics\BlOde" /I "..\..\..\..\lib\windows\python\include\python2.4" /I "..\..\..\source\blender\python" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\blender\include" /I "..\..\..\source\blender\imbuf" /I "..\..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\source\gameengine\physics\bullet" /I "..\..\..\extern\bullet\linearmath" /I "..\..\..\extern\bullet\Bulletdynamics" /I "..\..\..\extern\bullet\Bullet" /I "..\..\..\source\gameengine\Rasterizer\RAS_OpenGLRasterizer" /I "..\..\..\source\blender\blenlib" /D "JANCODEPANCO" /D "WIN32" /D "_MBCS" /D "_LIB" /D "EXP_PYTHON_EMBEDDING" /D "USE_SUMO_SOLID" /U "_DEBUG" /YX /J /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "KX_ketsji - Win32 MT DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "KX_ketsji___Win32_MT_DLL_Debug"
-# PROP BASE Intermediate_Dir "KX_ketsji___Win32_MT_DLL_Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\obj\windows\gameengine\ketsji\mtdll_debug"
-# PROP Intermediate_Dir "..\..\..\obj\windows\gameengine\ketsji\mtdll_debug"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-MTL=midl.exe
-# ADD BASE CPP /nologo /Gm /GX /ZI /Od /I "..\..\..\source\kernel\gen_system" /I "..\..\..\source\gameengine\soundsystem" /I "..\..\..\source\gameengine\rasterizer" /I "..\..\..\source\gameengine\scenegraph" /I "..\..\..\source\gameengine\gamelogic" /I "..\..\..\source\gameengine\expressions" /I "..\..\..\source\sumo\include" /I "..\..\..\source\sumo\fuzzics\include" /I "..\..\..\..\lib\windows\moto\include" /I "..\..\..\..\lib\windows\python\include\python1.5" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "EXP_PYTHON_EMBEDDING" /YX /J /FD /GZ /c
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "..\..\..\..\lib\windows\python\include\python2.4" /I "..\..\..\source\gameengine\physics\common\dummy" /I "..\..\..\..\lib\windows\python\include\python2.2" /I "..\..\..\..\lib\windows\string\include" /I "..\..\..\..\lib\windows\moto\include" /I "..\..\..\source\kernel\gen_system" /I "..\..\..\source\gameengine\soundsystem" /I "..\..\..\source\gameengine\rasterizer" /I "..\..\..\source\gameengine\scenegraph" /I "..\..\..\source\gameengine\gamelogic" /I "..\..\..\source\gameengine\expressions" /I "..\..\..\source\sumo\include" /I "..\..\..\source\sumo\fuzzics\include" /I "..\..\..\source\gameengine\network" /I "..\..\..\source\gameengine\ketsji\kxnetwork" /I "..\..\..\source\gameengine\physics" /I "..\..\..\source\gameengine\physics\common" /I "..\..\..\source\gameengine\physics\dummy" /I "..\..\..\source\gameengine\physics\sumo" /I "..\..\..\source\gameengine\physics\sumo\fuzzics\include" /I "..\..\..\source\gameengine\physics\sumo\include" /I "..\..\..\source\gameengine\physics\BlOde" /D "WIN32" /D "_MBCS" /D "_LIB" /D "EXP_PYTHON_EMBEDDING" /U "_DEBUG" /YX /J /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\..\..\..\obj\windows\gameengine\ketsji\debug\KX_ketsji.lib"
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "KX_ketsji - Win32 MT DLL Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "KX_ketsji___Win32_MT_DLL_Release"
-# PROP BASE Intermediate_Dir "KX_ketsji___Win32_MT_DLL_Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\obj\windows\gameengine\ketsji\mtdll"
-# PROP Intermediate_Dir "..\..\..\obj\windows\gameengine\ketsji\mtdll"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-MTL=midl.exe
-# ADD BASE CPP /nologo /GX /O2 /I "..\..\..\source\kernel\gen_system" /I "..\..\..\source\gameengine\soundsystem" /I "..\..\..\source\gameengine\rasterizer" /I "..\..\..\source\gameengine\scenegraph" /I "..\..\..\source\gameengine\gamelogic" /I "..\..\..\source\gameengine\expressions" /I "..\..\..\source\sumo\include" /I "..\..\..\source\sumo\fuzzics\include" /I "..\..\..\..\lib\windows\moto\include" /I "..\..\..\..\lib\windows\python\include\python2.0" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "EXP_PYTHON_EMBEDDING" /YX /J /FD /c
-# ADD CPP /nologo /MD /GX /O2 /I "..\..\..\..\lib\windows\python\include\python2.4" /I "..\..\..\source\gameengine\physics\common\dummy" /I "..\..\..\..\lib\windows\python\include\python2.2" /I "..\..\..\..\lib\windows\string\include" /I "..\..\..\..\lib\windows\moto\include" /I "..\..\..\source\kernel\gen_system" /I "..\..\..\source\gameengine\soundsystem" /I "..\..\..\source\gameengine\rasterizer" /I "..\..\..\source\gameengine\scenegraph" /I "..\..\..\source\gameengine\gamelogic" /I "..\..\..\source\gameengine\expressions" /I "..\..\..\source\sumo\include" /I "..\..\..\source\sumo\fuzzics\include" /I "..\..\..\source\gameengine\network" /I "..\..\..\source\gameengine\ketsji\kxnetwork" /I "..\..\..\source\gameengine\physics" /I "..\..\..\source\gameengine\physics\common" /I "..\..\..\source\gameengine\physics\dummy" /I "..\..\..\source\gameengine\physics\sumo" /I "..\..\..\source\gameengine\physics\sumo\fuzzics\include" /I "..\..\..\source\gameengine\physics\sumo\include" /I "..\..\..\source\gameengine\physics\BlOde" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "EXP_PYTHON_EMBEDDING" /YX /J /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\..\..\..\obj\windows\gameengine\ketsji\KX_ketsji.lib"
-# ADD LIB32 /nologo
-
-!ENDIF 
-
-# Begin Target
-
-# Name "KX_ketsji - Win32 Release"
-# Name "KX_ketsji - Win32 Debug"
-# Name "KX_ketsji - Win32 MT DLL Debug"
-# Name "KX_ketsji - Win32 MT DLL Release"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Group "ActuatorsImp"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\KX_CameraActuator.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\KX_CDActuator.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\KX_ConstraintActuator.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\KX_GameActuator.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\KX_IpoActuator.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\KX_ObjectActuator.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\KX_SCA_AddObjectActuator.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\KX_SCA_EndObjectActuator.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\KX_SCA_ReplaceMeshActuator.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\KX_SceneActuator.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\KX_SoundActuator.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\KX_TrackToActuator.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\KX_VisibilityActuator.cpp
-# End Source File
-# End Group
-# Begin Group "SG_ControllersImp"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\KX_CameraIpoSGController.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\KX_IPO_SGController.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\KX_LightIpoSGController.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\KX_ObColorIpoSGController.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\KX_WorldIpoController.cpp
-# End Source File
-# End Group
-# Begin Group "SensorsImp"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\KX_MouseFocusSensor.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\KX_NearSensor.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\KX_RadarSensor.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\KX_RaySensor.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\KX_TouchSensor.cpp
-# End Source File
-# End Group
-# Begin Group "IposImp"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\KX_OrientationInterpolator.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\KX_PositionInterpolator.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\KX_ScalarInterpolator.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\KX_ScalingInterpolator.cpp
-# End Source File
-# End Group
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\BL_Material.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\BL_Shader.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\BL_Texture.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\KX_BlenderMaterial.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\KX_BulletPhysicsController.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\KX_Camera.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\KX_ConstraintWrapper.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\KX_ConvertPhysicsObjects.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\KX_EmptyObject.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\KX_GameObject.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\KX_IPhysicsController.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\KX_KetsjiEngine.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\KX_Light.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\KX_MaterialIpoController.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\KX_MeshProxy.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\KX_MotionState.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\KX_OdePhysicsController.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\KX_PhysicsObjectWrapper.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\KX_PolygonMaterial.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\KX_PyConstraintBinding.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\KX_PyMath.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\KX_PythonInit.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\KX_RayCast.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\KX_RayEventManager.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\KX_Scene.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\KX_SG_BoneParentNodeRelationship.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\KX_SG_NodeRelationships.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\KX_SumoPhysicsController.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\KX_TimeCategoryLogger.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\KX_TimeLogger.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\KX_TouchEventManager.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\KX_VehicleWrapper.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\KX_VertexProxy.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\KX_WorldInfo.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Group "Actuators"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\KX_CameraActuator.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\KX_CDActuator.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\KX_ConstraintActuator.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\KX_GameActuator.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\KX_IpoActuator.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\KX_ObjectActuator.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\KX_SCA_AddObjectActuator.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\KX_SCA_EndObjectActuator.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\KX_SCA_ReplaceMeshActuator.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\KX_SceneActuator.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\KX_SoundActuator.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\KX_TrackToActuator.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\KX_VisibilityActuator.h
-# End Source File
-# End Group
-# Begin Group "SG_Controllers"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\KX_CameraIpoSGController.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\KX_IPO_SGController.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\KX_LightIpoSGController.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\KX_ObColorIpoSGController.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\KX_WorldIpoController.h
-# End Source File
-# End Group
-# Begin Group "Sensors"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\KX_MouseFocusSensor.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\KX_NearSensor.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\KX_RadarSensor.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\KX_RaySensor.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\KX_TouchSensor.h
-# End Source File
-# End Group
-# Begin Group "Ipos"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\KX_IInterpolator.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\KX_IScalarInterpolator.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\KX_OrientationInterpolator.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\KX_PositionInterpolator.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\KX_ScalarInterpolator.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\KX_ScalingInterpolator.h
-# End Source File
-# End Group
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\BL_Material.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\BL_Shader.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\BL_Texture.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\KX_BlenderMaterial.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\KX_BulletPhysicsController.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\KX_Camera.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\KX_ConstraintWrapper.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\KX_ConvertPhysicsObject.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\KX_EmptyObject.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\KX_GameObject.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\KX_IPhysicsController.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\KX_IPOTransform.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\KX_ISceneConverter.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\KX_ISystem.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\KX_KetsjiEngine.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\KX_Light.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\KX_MaterialIpoController.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\KX_MeshProxy.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\KX_MotionState.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\KX_OdePhysicsController.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\KX_PhysicsObjectWrapper.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\KX_PolygonMaterial.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\KX_PyConstraintBinding.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\KX_PyMath.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\KX_PythonInit.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\KX_RayCast.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\KX_RayEventManager.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\KX_Scene.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\KX_SG_BoneParentNodeRelationship.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\KX_SG_NodeRelationships.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\KX_SumoPhysicsController.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\KX_TimeCategoryLogger.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\KX_TimeLogger.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\KX_TouchEventManager.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\KX_VehicleWrapper.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\KX_VertexProxy.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Ketsji\KX_WorldInfo.h
-# End Source File
-# End Group
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="KX_ketsji" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=KX_ketsji - Win32 Release
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "KX_ketsji.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "KX_ketsji.mak" CFG="KX_ketsji - Win32 Release"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "KX_ketsji - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "KX_ketsji - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "KX_ketsji - Win32 MT DLL Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "KX_ketsji - Win32 MT DLL Release" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "KX_ketsji - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\..\obj\windows\gameengine\ketsji"
+# PROP Intermediate_Dir "..\..\..\obj\windows\gameengine\ketsji"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+MTL=midl.exe
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "..\..\..\source\gameengine\physics\common\dummy" /I "..\..\..\extern\solid" /I "..\..\..\..\lib\windows\string\include" /I "..\..\..\..\lib\windows\moto\include" /I "..\..\..\source\kernel\gen_system" /I "..\..\..\..\lib\windows\soundsystem\include" /I "..\..\..\source\gameengine\rasterizer" /I "..\..\..\source\gameengine\scenegraph" /I "..\..\..\source\gameengine\gamelogic" /I "..\..\..\source\gameengine\expressions" /I "..\..\..\source\sumo\include" /I "..\..\..\source\sumo\fuzzics\include" /I "..\..\..\source\gameengine\network" /I "..\..\..\source\gameengine\Converter" /I "..\..\..\source\gameengine\ketsji\kxnetwork" /I "..\..\..\source\gameengine\physics" /I "..\..\..\source\gameengine\physics\common" /I "..\..\..\source\gameengine\physics\dummy" /I "..\..\..\source\gameengine\physics\sumo" /I "..\..\..\source\gameengine\physics\sumo\fuzzics\include" /I "..\..\..\source\gameengine\physics\sumo\include" /I "..\..\..\source\gameengine\physics\BlOde" /I "..\..\..\..\lib\windows\python\include\python2.4" /I "..\..\..\source\blender\python" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\blender\include" /I "..\..\..\source\blender\imbuf" /I "..\..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\source\gameengine\physics\bullet" /I "..\..\..\extern\bullet\linearmath" /I "..\..\..\extern\bullet\Bulletdynamics" /I "..\..\..\extern\bullet\Bullet" /I "..\..\..\source\gameengine\Rasterizer\RAS_OpenGLRasterizer" /I "..\..\..\source\blender\blenlib" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "EXP_PYTHON_EMBEDDING" /D "USE_SUMO_SOLID" /YX /J /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "KX_ketsji - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\..\obj\windows\gameengine\ketsji\debug"
+# PROP Intermediate_Dir "..\..\..\obj\windows\gameengine\ketsji\debug"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+MTL=midl.exe
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GR /GX /Zi /Od /I "..\..\..\source\gameengine\physics\common\dummy" /I "..\..\..\extern\solid" /I "..\..\..\..\lib\windows\string\include" /I "..\..\..\..\lib\windows\moto\include" /I "..\..\..\source\kernel\gen_system" /I "..\..\..\..\lib\windows\soundsystem\include" /I "..\..\..\source\gameengine\rasterizer" /I "..\..\..\source\gameengine\scenegraph" /I "..\..\..\source\gameengine\gamelogic" /I "..\..\..\source\gameengine\expressions" /I "..\..\..\source\sumo\include" /I "..\..\..\source\sumo\fuzzics\include" /I "..\..\..\source\gameengine\network" /I "..\..\..\source\gameengine\Converter" /I "..\..\..\source\gameengine\ketsji\kxnetwork" /I "..\..\..\source\gameengine\physics" /I "..\..\..\source\gameengine\physics\common" /I "..\..\..\source\gameengine\physics\dummy" /I "..\..\..\source\gameengine\physics\sumo" /I "..\..\..\source\gameengine\physics\sumo\fuzzics\include" /I "..\..\..\source\gameengine\physics\sumo\include" /I "..\..\..\source\gameengine\physics\BlOde" /I "..\..\..\..\lib\windows\python\include\python2.4" /I "..\..\..\source\blender\python" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\blender\include" /I "..\..\..\source\blender\imbuf" /I "..\..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\source\gameengine\physics\bullet" /I "..\..\..\extern\bullet\linearmath" /I "..\..\..\extern\bullet\Bulletdynamics" /I "..\..\..\extern\bullet\Bullet" /I "..\..\..\source\gameengine\Rasterizer\RAS_OpenGLRasterizer" /I "..\..\..\source\blender\blenlib" /D "JANCODEPANCO" /D "WIN32" /D "_MBCS" /D "_LIB" /D "EXP_PYTHON_EMBEDDING" /D "USE_SUMO_SOLID" /U "_DEBUG" /YX /J /FD /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "KX_ketsji - Win32 MT DLL Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "KX_ketsji___Win32_MT_DLL_Debug"
+# PROP BASE Intermediate_Dir "KX_ketsji___Win32_MT_DLL_Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\..\obj\windows\gameengine\ketsji\mtdll_debug"
+# PROP Intermediate_Dir "..\..\..\obj\windows\gameengine\ketsji\mtdll_debug"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+MTL=midl.exe
+# ADD BASE CPP /nologo /Gm /GX /ZI /Od /I "..\..\..\source\kernel\gen_system" /I "..\..\..\source\gameengine\soundsystem" /I "..\..\..\source\gameengine\rasterizer" /I "..\..\..\source\gameengine\scenegraph" /I "..\..\..\source\gameengine\gamelogic" /I "..\..\..\source\gameengine\expressions" /I "..\..\..\source\sumo\include" /I "..\..\..\source\sumo\fuzzics\include" /I "..\..\..\..\lib\windows\moto\include" /I "..\..\..\..\lib\windows\python\include\python1.5" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "EXP_PYTHON_EMBEDDING" /YX /J /FD /GZ /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "..\..\..\..\lib\windows\python\include\python2.4" /I "..\..\..\source\gameengine\physics\common\dummy" /I "..\..\..\..\lib\windows\python\include\python2.2" /I "..\..\..\..\lib\windows\string\include" /I "..\..\..\..\lib\windows\moto\include" /I "..\..\..\source\kernel\gen_system" /I "..\..\..\source\gameengine\soundsystem" /I "..\..\..\source\gameengine\rasterizer" /I "..\..\..\source\gameengine\scenegraph" /I "..\..\..\source\gameengine\gamelogic" /I "..\..\..\source\gameengine\expressions" /I "..\..\..\source\sumo\include" /I "..\..\..\source\sumo\fuzzics\include" /I "..\..\..\source\gameengine\network" /I "..\..\..\source\gameengine\ketsji\kxnetwork" /I "..\..\..\source\gameengine\physics" /I "..\..\..\source\gameengine\physics\common" /I "..\..\..\source\gameengine\physics\dummy" /I "..\..\..\source\gameengine\physics\sumo" /I "..\..\..\source\gameengine\physics\sumo\fuzzics\include" /I "..\..\..\source\gameengine\physics\sumo\include" /I "..\..\..\source\gameengine\physics\BlOde" /D "WIN32" /D "_MBCS" /D "_LIB" /D "EXP_PYTHON_EMBEDDING" /U "_DEBUG" /YX /J /FD /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\..\..\..\obj\windows\gameengine\ketsji\debug\KX_ketsji.lib"
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "KX_ketsji - Win32 MT DLL Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "KX_ketsji___Win32_MT_DLL_Release"
+# PROP BASE Intermediate_Dir "KX_ketsji___Win32_MT_DLL_Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\..\obj\windows\gameengine\ketsji\mtdll"
+# PROP Intermediate_Dir "..\..\..\obj\windows\gameengine\ketsji\mtdll"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+MTL=midl.exe
+# ADD BASE CPP /nologo /GX /O2 /I "..\..\..\source\kernel\gen_system" /I "..\..\..\source\gameengine\soundsystem" /I "..\..\..\source\gameengine\rasterizer" /I "..\..\..\source\gameengine\scenegraph" /I "..\..\..\source\gameengine\gamelogic" /I "..\..\..\source\gameengine\expressions" /I "..\..\..\source\sumo\include" /I "..\..\..\source\sumo\fuzzics\include" /I "..\..\..\..\lib\windows\moto\include" /I "..\..\..\..\lib\windows\python\include\python2.0" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "EXP_PYTHON_EMBEDDING" /YX /J /FD /c
+# ADD CPP /nologo /MD /GX /O2 /I "..\..\..\..\lib\windows\python\include\python2.4" /I "..\..\..\source\gameengine\physics\common\dummy" /I "..\..\..\..\lib\windows\python\include\python2.2" /I "..\..\..\..\lib\windows\string\include" /I "..\..\..\..\lib\windows\moto\include" /I "..\..\..\source\kernel\gen_system" /I "..\..\..\source\gameengine\soundsystem" /I "..\..\..\source\gameengine\rasterizer" /I "..\..\..\source\gameengine\scenegraph" /I "..\..\..\source\gameengine\gamelogic" /I "..\..\..\source\gameengine\expressions" /I "..\..\..\source\sumo\include" /I "..\..\..\source\sumo\fuzzics\include" /I "..\..\..\source\gameengine\network" /I "..\..\..\source\gameengine\ketsji\kxnetwork" /I "..\..\..\source\gameengine\physics" /I "..\..\..\source\gameengine\physics\common" /I "..\..\..\source\gameengine\physics\dummy" /I "..\..\..\source\gameengine\physics\sumo" /I "..\..\..\source\gameengine\physics\sumo\fuzzics\include" /I "..\..\..\source\gameengine\physics\sumo\include" /I "..\..\..\source\gameengine\physics\BlOde" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "EXP_PYTHON_EMBEDDING" /YX /J /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\..\..\..\obj\windows\gameengine\ketsji\KX_ketsji.lib"
+# ADD LIB32 /nologo
+
+!ENDIF 
+
+# Begin Target
+
+# Name "KX_ketsji - Win32 Release"
+# Name "KX_ketsji - Win32 Debug"
+# Name "KX_ketsji - Win32 MT DLL Debug"
+# Name "KX_ketsji - Win32 MT DLL Release"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Group "ActuatorsImp"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\KX_CameraActuator.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\KX_CDActuator.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\KX_ConstraintActuator.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\KX_GameActuator.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\KX_IpoActuator.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\KX_ObjectActuator.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\KX_SCA_AddObjectActuator.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\KX_SCA_EndObjectActuator.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\KX_SCA_ReplaceMeshActuator.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\KX_SceneActuator.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\KX_SoundActuator.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\KX_TrackToActuator.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\KX_VisibilityActuator.cpp
+# End Source File
+# End Group
+# Begin Group "SG_ControllersImp"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\KX_CameraIpoSGController.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\KX_IPO_SGController.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\KX_LightIpoSGController.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\KX_ObColorIpoSGController.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\KX_WorldIpoController.cpp
+# End Source File
+# End Group
+# Begin Group "SensorsImp"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\KX_MouseFocusSensor.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\KX_NearSensor.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\KX_RadarSensor.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\KX_RaySensor.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\KX_TouchSensor.cpp
+# End Source File
+# End Group
+# Begin Group "IposImp"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\KX_OrientationInterpolator.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\KX_PositionInterpolator.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\KX_ScalarInterpolator.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\KX_ScalingInterpolator.cpp
+# End Source File
+# End Group
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\BL_Material.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\BL_Shader.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\BL_Texture.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\KX_BlenderMaterial.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\KX_BulletPhysicsController.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\KX_Camera.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\KX_ConstraintWrapper.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\KX_ConvertPhysicsObjects.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\KX_EmptyObject.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\KX_GameObject.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\KX_IPhysicsController.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\KX_KetsjiEngine.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\KX_Light.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\KX_MaterialIpoController.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\KX_MeshProxy.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\KX_MotionState.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\KX_OdePhysicsController.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\KX_PhysicsObjectWrapper.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\KX_PolygonMaterial.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\KX_PyConstraintBinding.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\KX_PyMath.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\KX_PythonInit.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\KX_RayCast.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\KX_RayEventManager.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\KX_Scene.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\KX_SG_BoneParentNodeRelationship.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\KX_SG_NodeRelationships.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\KX_SumoPhysicsController.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\KX_TimeCategoryLogger.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\KX_TimeLogger.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\KX_TouchEventManager.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\KX_VehicleWrapper.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\KX_VertexProxy.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\KX_WorldInfo.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Group "Actuators"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\KX_CameraActuator.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\KX_CDActuator.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\KX_ConstraintActuator.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\KX_GameActuator.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\KX_IpoActuator.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\KX_ObjectActuator.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\KX_SCA_AddObjectActuator.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\KX_SCA_EndObjectActuator.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\KX_SCA_ReplaceMeshActuator.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\KX_SceneActuator.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\KX_SoundActuator.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\KX_TrackToActuator.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\KX_VisibilityActuator.h
+# End Source File
+# End Group
+# Begin Group "SG_Controllers"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\KX_CameraIpoSGController.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\KX_IPO_SGController.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\KX_LightIpoSGController.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\KX_ObColorIpoSGController.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\KX_WorldIpoController.h
+# End Source File
+# End Group
+# Begin Group "Sensors"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\KX_MouseFocusSensor.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\KX_NearSensor.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\KX_RadarSensor.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\KX_RaySensor.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\KX_TouchSensor.h
+# End Source File
+# End Group
+# Begin Group "Ipos"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\KX_IInterpolator.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\KX_IScalarInterpolator.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\KX_OrientationInterpolator.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\KX_PositionInterpolator.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\KX_ScalarInterpolator.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\KX_ScalingInterpolator.h
+# End Source File
+# End Group
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\BL_Material.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\BL_Shader.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\BL_Texture.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\KX_BlenderMaterial.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\KX_BulletPhysicsController.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\KX_Camera.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\KX_ConstraintWrapper.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\KX_ConvertPhysicsObject.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\KX_EmptyObject.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\KX_GameObject.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\KX_IPhysicsController.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\KX_IPOTransform.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\KX_ISceneConverter.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\KX_ISystem.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\KX_KetsjiEngine.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\KX_Light.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\KX_MaterialIpoController.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\KX_MeshProxy.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\KX_MotionState.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\KX_OdePhysicsController.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\KX_PhysicsObjectWrapper.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\KX_PolygonMaterial.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\KX_PyConstraintBinding.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\KX_PyMath.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\KX_PythonInit.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\KX_RayCast.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\KX_RayEventManager.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\KX_Scene.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\KX_SG_BoneParentNodeRelationship.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\KX_SG_NodeRelationships.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\KX_SumoPhysicsController.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\KX_TimeCategoryLogger.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\KX_TimeLogger.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\KX_TouchEventManager.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\KX_VehicleWrapper.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\KX_VertexProxy.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Ketsji\KX_WorldInfo.h
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/projectfiles/gameengine/ketsji/network/KX_network.dsp b/projectfiles/gameengine/ketsji/network/KX_network.dsp
index 0c265e9dd561621b650ad439d0140c2d5e8d14d3..7a67a8259883eb494b75be409b91a631c09d07a3 100644
--- a/projectfiles/gameengine/ketsji/network/KX_network.dsp
+++ b/projectfiles/gameengine/ketsji/network/KX_network.dsp
@@ -1,186 +1,186 @@
-# Microsoft Developer Studio Project File - Name="KX_network" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=KX_network - Win32 Release
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "KX_network.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "KX_network.mak" CFG="KX_network - Win32 Release"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "KX_network - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "KX_network - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "KX_network - Win32 MT DLL Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "KX_network - Win32 MT DLL Release" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "KX_network - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\..\obj\windows\gameengine\ketsji\network"
-# PROP Intermediate_Dir "..\..\..\..\obj\windows\gameengine\ketsji\network"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "..\..\..\..\..\lib\windows\python\include\python2.4" /I "..\..\..\..\..\lib\windows\string\include" /I "..\..\..\..\source\gameengine\ketsji" /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\source\gameengine\GameLogic" /I "..\..\..\..\source\gameengine\expressions" /I "..\..\..\..\source\gameengine\Network" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "KX_network - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\..\obj\windows\gameengine\ketsji\network\debug"
-# PROP Intermediate_Dir "..\..\..\..\obj\windows\gameengine\ketsji\network\debug"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GR /GX /Zi /Od /I "..\..\..\..\..\lib\windows\python\include\python2.4" /I "..\..\..\..\..\lib\windows\string\include" /I "..\..\..\..\source\gameengine\ketsji" /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\source\gameengine\GameLogic" /I "..\..\..\..\source\gameengine\expressions" /I "..\..\..\..\source\gameengine\Network" /D "WIN32" /D "_MBCS" /D "_LIB" /U "_DEBUG" /YX /J /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "KX_network - Win32 MT DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "KX_network___Win32_MT_DLL_Debug"
-# PROP BASE Intermediate_Dir "KX_network___Win32_MT_DLL_Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\..\obj\windows\gameengine\ketsji\network\mtdll_debug"
-# PROP Intermediate_Dir "..\..\..\..\obj\windows\gameengine\ketsji\network\mtdll_debug"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /Gm /GX /ZI /Od /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\source\gameengine\GameLogic" /I "..\..\..\..\source\gameengine\expressions" /I "..\..\..\..\source\gameengine\Network" /I "..\..\..\..\..\lib\windows\python\include\python1.5" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /GZ /c
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "..\..\..\..\..\lib\windows\python\include\python2.2" /I "..\..\..\..\..\lib\windows\string\include" /I "..\..\..\..\source\gameengine\ketsji" /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\source\gameengine\GameLogic" /I "..\..\..\..\source\gameengine\expressions" /I "..\..\..\..\source\gameengine\Network" /D "WIN32" /D "_MBCS" /D "_LIB" /U "_DEBUG" /YX /J /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\..\..\..\..\obj\windows\gameengine\ketsji\network\debug\KX_network.lib"
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "KX_network - Win32 MT DLL Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "KX_network___Win32_MT_DLL_Release"
-# PROP BASE Intermediate_Dir "KX_network___Win32_MT_DLL_Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\..\obj\windows\gameengine\ketsji\network\mtdll"
-# PROP Intermediate_Dir "..\..\..\..\obj\windows\gameengine\ketsji\network\mtdll"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /GX /O2 /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\source\gameengine\GameLogic" /I "..\..\..\..\source\gameengine\expressions" /I "..\..\..\..\source\gameengine\Network" /I "..\..\..\..\..\lib\windows\python\include\python2.0" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
-# ADD CPP /nologo /MD /GX /O2 /I "..\..\..\..\..\lib\windows\python\include\python2.0" /I "..\..\..\..\..\lib\windows\python\include\python2.2" /I "..\..\..\..\..\lib\windows\string\include" /I "..\..\..\..\source\gameengine\ketsji" /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\source\gameengine\GameLogic" /I "..\..\..\..\source\gameengine\expressions" /I "..\..\..\..\source\gameengine\Network" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\..\..\..\..\obj\windows\gameengine\ketsji\network\KX_network.lib"
-# ADD LIB32 /nologo
-
-!ENDIF 
-
-# Begin Target
-
-# Name "KX_network - Win32 Release"
-# Name "KX_network - Win32 Debug"
-# Name "KX_network - Win32 MT DLL Debug"
-# Name "KX_network - Win32 MT DLL Release"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\Ketsji\KXNetwork\KX_NetworkEventManager.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\Ketsji\KXNetwork\KX_NetworkMessageActuator.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\Ketsji\KXNetwork\KX_NetworkMessageSensor.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\Ketsji\KXNetwork\KX_NetworkObjectActuator.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\Ketsji\KXNetwork\KX_NetworkObjectSensor.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\Ketsji\KXNetwork\KX_NetworkEventManager.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\Ketsji\KXNetwork\KX_NetworkMessageActuator.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\Ketsji\KXNetwork\KX_NetworkMessageSensor.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\Ketsji\KXNetwork\KX_NetworkObjectActuator.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\Ketsji\KXNetwork\KX_NetworkObjectSensor.h
-# End Source File
-# End Group
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="KX_network" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=KX_network - Win32 Release
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "KX_network.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "KX_network.mak" CFG="KX_network - Win32 Release"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "KX_network - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "KX_network - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "KX_network - Win32 MT DLL Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "KX_network - Win32 MT DLL Release" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "KX_network - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\..\..\obj\windows\gameengine\ketsji\network"
+# PROP Intermediate_Dir "..\..\..\..\obj\windows\gameengine\ketsji\network"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "..\..\..\..\..\lib\windows\python\include\python2.4" /I "..\..\..\..\..\lib\windows\string\include" /I "..\..\..\..\source\gameengine\ketsji" /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\source\gameengine\GameLogic" /I "..\..\..\..\source\gameengine\expressions" /I "..\..\..\..\source\gameengine\Network" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "KX_network - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\..\..\obj\windows\gameengine\ketsji\network\debug"
+# PROP Intermediate_Dir "..\..\..\..\obj\windows\gameengine\ketsji\network\debug"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GR /GX /Zi /Od /I "..\..\..\..\..\lib\windows\python\include\python2.4" /I "..\..\..\..\..\lib\windows\string\include" /I "..\..\..\..\source\gameengine\ketsji" /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\source\gameengine\GameLogic" /I "..\..\..\..\source\gameengine\expressions" /I "..\..\..\..\source\gameengine\Network" /D "WIN32" /D "_MBCS" /D "_LIB" /U "_DEBUG" /YX /J /FD /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "KX_network - Win32 MT DLL Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "KX_network___Win32_MT_DLL_Debug"
+# PROP BASE Intermediate_Dir "KX_network___Win32_MT_DLL_Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\..\..\obj\windows\gameengine\ketsji\network\mtdll_debug"
+# PROP Intermediate_Dir "..\..\..\..\obj\windows\gameengine\ketsji\network\mtdll_debug"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /Gm /GX /ZI /Od /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\source\gameengine\GameLogic" /I "..\..\..\..\source\gameengine\expressions" /I "..\..\..\..\source\gameengine\Network" /I "..\..\..\..\..\lib\windows\python\include\python1.5" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /GZ /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "..\..\..\..\..\lib\windows\python\include\python2.2" /I "..\..\..\..\..\lib\windows\string\include" /I "..\..\..\..\source\gameengine\ketsji" /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\source\gameengine\GameLogic" /I "..\..\..\..\source\gameengine\expressions" /I "..\..\..\..\source\gameengine\Network" /D "WIN32" /D "_MBCS" /D "_LIB" /U "_DEBUG" /YX /J /FD /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\..\..\..\..\obj\windows\gameengine\ketsji\network\debug\KX_network.lib"
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "KX_network - Win32 MT DLL Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "KX_network___Win32_MT_DLL_Release"
+# PROP BASE Intermediate_Dir "KX_network___Win32_MT_DLL_Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\..\..\obj\windows\gameengine\ketsji\network\mtdll"
+# PROP Intermediate_Dir "..\..\..\..\obj\windows\gameengine\ketsji\network\mtdll"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /GX /O2 /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\source\gameengine\GameLogic" /I "..\..\..\..\source\gameengine\expressions" /I "..\..\..\..\source\gameengine\Network" /I "..\..\..\..\..\lib\windows\python\include\python2.0" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
+# ADD CPP /nologo /MD /GX /O2 /I "..\..\..\..\..\lib\windows\python\include\python2.0" /I "..\..\..\..\..\lib\windows\python\include\python2.2" /I "..\..\..\..\..\lib\windows\string\include" /I "..\..\..\..\source\gameengine\ketsji" /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\source\gameengine\GameLogic" /I "..\..\..\..\source\gameengine\expressions" /I "..\..\..\..\source\gameengine\Network" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\..\..\..\..\obj\windows\gameengine\ketsji\network\KX_network.lib"
+# ADD LIB32 /nologo
+
+!ENDIF 
+
+# Begin Target
+
+# Name "KX_network - Win32 Release"
+# Name "KX_network - Win32 Debug"
+# Name "KX_network - Win32 MT DLL Debug"
+# Name "KX_network - Win32 MT DLL Release"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\Ketsji\KXNetwork\KX_NetworkEventManager.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\Ketsji\KXNetwork\KX_NetworkMessageActuator.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\Ketsji\KXNetwork\KX_NetworkMessageSensor.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\Ketsji\KXNetwork\KX_NetworkObjectActuator.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\Ketsji\KXNetwork\KX_NetworkObjectSensor.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\Ketsji\KXNetwork\KX_NetworkEventManager.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\Ketsji\KXNetwork\KX_NetworkMessageActuator.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\Ketsji\KXNetwork\KX_NetworkMessageSensor.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\Ketsji\KXNetwork\KX_NetworkObjectActuator.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\Ketsji\KXNetwork\KX_NetworkObjectSensor.h
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/projectfiles/gameengine/network/loopbacknetwork/NG_loopbacknetwork.dsp b/projectfiles/gameengine/network/loopbacknetwork/NG_loopbacknetwork.dsp
index 08bd4a1326ddcee050fdb6729ee81bc120ea47d2..30c08933fadcf885cae3635756f24a6d1b184dea 100644
--- a/projectfiles/gameengine/network/loopbacknetwork/NG_loopbacknetwork.dsp
+++ b/projectfiles/gameengine/network/loopbacknetwork/NG_loopbacknetwork.dsp
@@ -1,155 +1,155 @@
-# Microsoft Developer Studio Project File - Name="NG_loopbacknetwork" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=NG_loopbacknetwork - Win32 Release
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "NG_loopbacknetwork.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "NG_loopbacknetwork.mak" CFG="NG_loopbacknetwork - Win32 Release"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "NG_loopbacknetwork - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "NG_loopbacknetwork - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "NG_loopbacknetwork - Win32 MT DLL Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "NG_loopbacknetwork - Win32 MT DLL Release" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "NG_loopbacknetwork - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\..\obj\windows\gameengine\network\loopbacknetwork"
-# PROP Intermediate_Dir "..\..\..\..\obj\windows\gameengine\network\loopbacknetwork"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "..\..\..\..\..\lib\windows\string\include" /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\source\gameengine\Network" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "NG_loopbacknetwork - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\..\obj\windows\gameengine\network\loopbacknetwork\debug"
-# PROP Intermediate_Dir "..\..\..\..\obj\windows\gameengine\network\loopbacknetwork\debug"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GR /GX /Zi /Od /I "..\..\..\..\..\lib\windows\string\include" /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\source\gameengine\Network" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /GZ /c
-# SUBTRACT CPP /Fr
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "NG_loopbacknetwork - Win32 MT DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "NG_loopbacknetwork___Win32_MT_DLL_Debug"
-# PROP BASE Intermediate_Dir "NG_loopbacknetwork___Win32_MT_DLL_Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\..\obj\windows\gameengine\network\loopbacknetwork\mtdll_debug"
-# PROP Intermediate_Dir "..\..\..\..\obj\windows\gameengine\network\loopbacknetwork\mtdll_debug"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /Gm /GX /ZI /Od /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\source\gameengine\Network" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /GZ /c
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "..\..\..\..\..\lib\windows\string\include" /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\source\gameengine\Network" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\..\..\..\..\obj\windows\gameengine\network\loopbacknetwork\debug\NG_loopbacknetwork.lib"
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "NG_loopbacknetwork - Win32 MT DLL Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "NG_loopbacknetwork___Win32_MT_DLL_Release"
-# PROP BASE Intermediate_Dir "NG_loopbacknetwork___Win32_MT_DLL_Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\..\obj\windows\gameengine\network\loopbacknetwork\mtdll"
-# PROP Intermediate_Dir "..\..\..\..\obj\windows\gameengine\network\loopbacknetwork\mtdll"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /GX /O2 /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\source\gameengine\Network" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
-# ADD CPP /nologo /MD /GX /O2 /I "..\..\..\..\..\lib\windows\string\include" /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\source\gameengine\Network" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\..\..\..\..\obj\windows\gameengine\network\loopbacknetwork\NG_loopbacknetwork.lib"
-# ADD LIB32 /nologo
-
-!ENDIF 
-
-# Begin Target
-
-# Name "NG_loopbacknetwork - Win32 Release"
-# Name "NG_loopbacknetwork - Win32 Debug"
-# Name "NG_loopbacknetwork - Win32 MT DLL Debug"
-# Name "NG_loopbacknetwork - Win32 MT DLL Release"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\Network\LoopBackNetwork\NG_LoopBackNetworkDeviceInterface.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\Network\LoopBackNetwork\NG_LoopBackNetworkDeviceInterface.h
-# End Source File
-# End Group
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="NG_loopbacknetwork" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=NG_loopbacknetwork - Win32 Release
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "NG_loopbacknetwork.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "NG_loopbacknetwork.mak" CFG="NG_loopbacknetwork - Win32 Release"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "NG_loopbacknetwork - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "NG_loopbacknetwork - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "NG_loopbacknetwork - Win32 MT DLL Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "NG_loopbacknetwork - Win32 MT DLL Release" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "NG_loopbacknetwork - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\..\..\obj\windows\gameengine\network\loopbacknetwork"
+# PROP Intermediate_Dir "..\..\..\..\obj\windows\gameengine\network\loopbacknetwork"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "..\..\..\..\..\lib\windows\string\include" /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\source\gameengine\Network" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "NG_loopbacknetwork - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\..\..\obj\windows\gameengine\network\loopbacknetwork\debug"
+# PROP Intermediate_Dir "..\..\..\..\obj\windows\gameengine\network\loopbacknetwork\debug"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GR /GX /Zi /Od /I "..\..\..\..\..\lib\windows\string\include" /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\source\gameengine\Network" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /GZ /c
+# SUBTRACT CPP /Fr
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "NG_loopbacknetwork - Win32 MT DLL Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "NG_loopbacknetwork___Win32_MT_DLL_Debug"
+# PROP BASE Intermediate_Dir "NG_loopbacknetwork___Win32_MT_DLL_Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\..\..\obj\windows\gameengine\network\loopbacknetwork\mtdll_debug"
+# PROP Intermediate_Dir "..\..\..\..\obj\windows\gameengine\network\loopbacknetwork\mtdll_debug"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /Gm /GX /ZI /Od /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\source\gameengine\Network" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /GZ /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "..\..\..\..\..\lib\windows\string\include" /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\source\gameengine\Network" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\..\..\..\..\obj\windows\gameengine\network\loopbacknetwork\debug\NG_loopbacknetwork.lib"
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "NG_loopbacknetwork - Win32 MT DLL Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "NG_loopbacknetwork___Win32_MT_DLL_Release"
+# PROP BASE Intermediate_Dir "NG_loopbacknetwork___Win32_MT_DLL_Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\..\..\obj\windows\gameengine\network\loopbacknetwork\mtdll"
+# PROP Intermediate_Dir "..\..\..\..\obj\windows\gameengine\network\loopbacknetwork\mtdll"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /GX /O2 /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\source\gameengine\Network" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
+# ADD CPP /nologo /MD /GX /O2 /I "..\..\..\..\..\lib\windows\string\include" /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\source\gameengine\Network" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\..\..\..\..\obj\windows\gameengine\network\loopbacknetwork\NG_loopbacknetwork.lib"
+# ADD LIB32 /nologo
+
+!ENDIF 
+
+# Begin Target
+
+# Name "NG_loopbacknetwork - Win32 Release"
+# Name "NG_loopbacknetwork - Win32 Debug"
+# Name "NG_loopbacknetwork - Win32 MT DLL Debug"
+# Name "NG_loopbacknetwork - Win32 MT DLL Release"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\Network\LoopBackNetwork\NG_LoopBackNetworkDeviceInterface.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\Network\LoopBackNetwork\NG_LoopBackNetworkDeviceInterface.h
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/projectfiles/gameengine/network/network/NG_network.dsp b/projectfiles/gameengine/network/network/NG_network.dsp
index 8c13c01f7e71127a75ca760d55f17f4253f251ab..ca67963500c917a0d58a6fe0c5152aad1bfa13ef 100644
--- a/projectfiles/gameengine/network/network/NG_network.dsp
+++ b/projectfiles/gameengine/network/network/NG_network.dsp
@@ -1,174 +1,174 @@
-# Microsoft Developer Studio Project File - Name="NG_network" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=NG_network - Win32 Release
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "NG_network.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "NG_network.mak" CFG="NG_network - Win32 Release"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "NG_network - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "NG_network - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "NG_network - Win32 MT DLL Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "NG_network - Win32 MT DLL Release" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "NG_network - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\..\obj\windows\gameengine\network\network"
-# PROP Intermediate_Dir "..\..\..\..\obj\windows\gameengine\network\network"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "..\..\..\..\..\lib\windows\string\include" /I "..\..\..\..\..\lib\windows\moto\include" /I "..\..\..\..\source\kernel\gen_system" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "NG_network - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\..\obj\windows\gameengine\network\network\debug"
-# PROP Intermediate_Dir "..\..\..\..\obj\windows\gameengine\network\network\debug"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GR /GX /Zi /Od /I "..\..\..\..\..\lib\windows\string\include" /I "..\..\..\..\..\lib\windows\moto\include" /I "..\..\..\..\source\kernel\gen_system" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "NG_network - Win32 MT DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "NG_network___Win32_MT_DLL_Debug"
-# PROP BASE Intermediate_Dir "NG_network___Win32_MT_DLL_Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\..\obj\windows\gameengine\network\network\mtdll_debug"
-# PROP Intermediate_Dir "..\..\..\..\obj\windows\gameengine\network\network\mtdll_debug"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /Gm /GX /ZI /Od /I "..\..\..\..\source\kernel\gen_system" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /GZ /c
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "..\..\..\..\..\lib\windows\string\include" /I "..\..\..\..\source\kernel\gen_system" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\..\..\..\..\obj\windows\gameengine\network\network\debug\NG_network.lib"
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "NG_network - Win32 MT DLL Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "NG_network___Win32_MT_DLL_Release"
-# PROP BASE Intermediate_Dir "NG_network___Win32_MT_DLL_Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\..\obj\windows\gameengine\network\network\mtdll"
-# PROP Intermediate_Dir "..\..\..\..\obj\windows\gameengine\network\network\mtdll"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /GX /O2 /I "..\..\..\..\source\kernel\gen_system" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
-# ADD CPP /nologo /MD /GX /O2 /I "..\..\..\..\..\lib\windows\string\include" /I "..\..\..\..\source\kernel\gen_system" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\..\..\..\..\obj\windows\gameengine\network\network\NG_network.lib"
-# ADD LIB32 /nologo
-
-!ENDIF 
-
-# Begin Target
-
-# Name "NG_network - Win32 Release"
-# Name "NG_network - Win32 Debug"
-# Name "NG_network - Win32 MT DLL Debug"
-# Name "NG_network - Win32 MT DLL Release"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\Network\NG_NetworkMessage.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\Network\NG_NetworkObject.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\Network\NG_NetworkScene.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\Network\NG_NetworkDeviceInterface.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\Network\NG_NetworkMessage.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\Network\NG_NetworkObject.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\Network\NG_NetworkScene.h
-# End Source File
-# End Group
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="NG_network" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=NG_network - Win32 Release
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "NG_network.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "NG_network.mak" CFG="NG_network - Win32 Release"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "NG_network - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "NG_network - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "NG_network - Win32 MT DLL Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "NG_network - Win32 MT DLL Release" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "NG_network - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\..\..\obj\windows\gameengine\network\network"
+# PROP Intermediate_Dir "..\..\..\..\obj\windows\gameengine\network\network"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "..\..\..\..\..\lib\windows\string\include" /I "..\..\..\..\..\lib\windows\moto\include" /I "..\..\..\..\source\kernel\gen_system" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "NG_network - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\..\..\obj\windows\gameengine\network\network\debug"
+# PROP Intermediate_Dir "..\..\..\..\obj\windows\gameengine\network\network\debug"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GR /GX /Zi /Od /I "..\..\..\..\..\lib\windows\string\include" /I "..\..\..\..\..\lib\windows\moto\include" /I "..\..\..\..\source\kernel\gen_system" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "NG_network - Win32 MT DLL Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "NG_network___Win32_MT_DLL_Debug"
+# PROP BASE Intermediate_Dir "NG_network___Win32_MT_DLL_Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\..\..\obj\windows\gameengine\network\network\mtdll_debug"
+# PROP Intermediate_Dir "..\..\..\..\obj\windows\gameengine\network\network\mtdll_debug"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /Gm /GX /ZI /Od /I "..\..\..\..\source\kernel\gen_system" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /GZ /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "..\..\..\..\..\lib\windows\string\include" /I "..\..\..\..\source\kernel\gen_system" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\..\..\..\..\obj\windows\gameengine\network\network\debug\NG_network.lib"
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "NG_network - Win32 MT DLL Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "NG_network___Win32_MT_DLL_Release"
+# PROP BASE Intermediate_Dir "NG_network___Win32_MT_DLL_Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\..\..\obj\windows\gameengine\network\network\mtdll"
+# PROP Intermediate_Dir "..\..\..\..\obj\windows\gameengine\network\network\mtdll"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /GX /O2 /I "..\..\..\..\source\kernel\gen_system" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
+# ADD CPP /nologo /MD /GX /O2 /I "..\..\..\..\..\lib\windows\string\include" /I "..\..\..\..\source\kernel\gen_system" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\..\..\..\..\obj\windows\gameengine\network\network\NG_network.lib"
+# ADD LIB32 /nologo
+
+!ENDIF 
+
+# Begin Target
+
+# Name "NG_network - Win32 Release"
+# Name "NG_network - Win32 Debug"
+# Name "NG_network - Win32 MT DLL Debug"
+# Name "NG_network - Win32 MT DLL Release"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\Network\NG_NetworkMessage.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\Network\NG_NetworkObject.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\Network\NG_NetworkScene.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\Network\NG_NetworkDeviceInterface.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\Network\NG_NetworkMessage.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\Network\NG_NetworkObject.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\Network\NG_NetworkScene.h
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/projectfiles/gameengine/network/terraplaynetwork/NG_terraplaynetwork.dsp b/projectfiles/gameengine/network/terraplaynetwork/NG_terraplaynetwork.dsp
index ce407eda0f79a6f1f9af7c417c0a0f5f6671fce5..6653783bcaebccd21315f2a5af019d257ab09b71 100644
--- a/projectfiles/gameengine/network/terraplaynetwork/NG_terraplaynetwork.dsp
+++ b/projectfiles/gameengine/network/terraplaynetwork/NG_terraplaynetwork.dsp
@@ -1,180 +1,180 @@
-# Microsoft Developer Studio Project File - Name="NG_terraplaynetwork" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=NG_terraplaynetwork - Win32 Profile
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "NG_terraplaynetwork.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "NG_terraplaynetwork.mak" CFG="NG_terraplaynetwork - Win32 Profile"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "NG_terraplaynetwork - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "NG_terraplaynetwork - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "NG_terraplaynetwork - Win32 MT DLL Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "NG_terraplaynetwork - Win32 MT DLL Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "NG_terraplaynetwork - Win32 Profile" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "NG_terraplaynetwork - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "..\..\..\..\..\obj\windows\gameengine\network\terraplaynetwork"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\..\source\gameengine\network" /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\..\lib\windows\terraplay\include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\..\..\..\obj\windows\gameengine\network\terraplaynetwork\NG_terraplaynetwork.lib"
-
-!ELSEIF  "$(CFG)" == "NG_terraplaynetwork - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "..\..\..\..\..\obj\windows\gameengine\network\terraplaynetwork\debug"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\..\source\gameengine\network" /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\..\lib\windows\terraplay\include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /FR /YX /J /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\..\..\..\obj\windows\gameengine\network\terraplaynetwork\debug\NG_terraplaynetwork.lib"
-
-!ELSEIF  "$(CFG)" == "NG_terraplaynetwork - Win32 MT DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "NG_terraplaynetwork___Win32_MT_DLL_Debug"
-# PROP BASE Intermediate_Dir "NG_terraplaynetwork___Win32_MT_DLL_Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\..\..\obj\windows\gameengine\network\terraplaynetwork\mtdll_debug"
-# PROP Intermediate_Dir "..\..\..\..\..\obj\windows\gameengine\network\terraplaynetwork\mtdll_debug"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /Gm /GX /ZI /Od /I "..\..\..\..\source\gameengine\network" /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\..\lib\windows\terraplay\include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /GZ /c
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "..\..\..\..\source\gameengine\network" /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\..\lib\windows\terraplay\include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\..\..\..\..\obj\windows\gameengine\network\terraplaynetwork\debug\NG_terraplaynetwork.lib"
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "NG_terraplaynetwork - Win32 MT DLL Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "NG_terraplaynetwork___Win32_MT_DLL_Release"
-# PROP BASE Intermediate_Dir "NG_terraplaynetwork___Win32_MT_DLL_Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\..\..\obj\windows\gameengine\network\terraplaynetwork\mtdll"
-# PROP Intermediate_Dir "..\..\..\..\..\obj\windows\gameengine\network\terraplaynetwork\mtdll"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /GX /O2 /I "..\..\..\..\source\gameengine\network" /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\..\lib\windows\terraplay\include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
-# ADD CPP /nologo /MD /GX /O2 /I "..\..\..\..\source\gameengine\network" /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\..\lib\windows\terraplay\include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\..\..\..\..\obj\windows\gameengine\network\terraplaynetwork\NG_terraplaynetwork.lib"
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "NG_terraplaynetwork - Win32 Profile"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "NG_terraplaynetwork___Win32_Profile"
-# PROP BASE Intermediate_Dir "NG_terraplaynetwork___Win32_Profile"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "NG_terraplaynetwork___Win32_Profile"
-# PROP Intermediate_Dir "NG_terraplaynetwork___Win32_Profile"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\..\source\gameengine\network" /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\..\lib\windows\terraplay\include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /Zi /O2 /I "..\..\..\..\source\gameengine\network" /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\..\lib\windows\terraplay\include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\..\..\..\obj\windows\gameengine\network\terraplaynetwork\debug\NG_terraplaynetwork.lib"
-# ADD LIB32 /nologo /out:"..\..\..\..\..\obj\windows\gameengine\network\terraplaynetwork\profile\NG_terraplaynetwork.lib"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "NG_terraplaynetwork - Win32 Release"
-# Name "NG_terraplaynetwork - Win32 Debug"
-# Name "NG_terraplaynetwork - Win32 MT DLL Debug"
-# Name "NG_terraplaynetwork - Win32 MT DLL Release"
-# Name "NG_terraplaynetwork - Win32 Profile"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\Network\TerraplayNetwork\NG_TerraplayNetworkDeviceInterface.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\Network\TerraplayNetwork\NG_TerraplayNetworkDeviceInterface.h
-# End Source File
-# End Group
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="NG_terraplaynetwork" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=NG_terraplaynetwork - Win32 Profile
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "NG_terraplaynetwork.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "NG_terraplaynetwork.mak" CFG="NG_terraplaynetwork - Win32 Profile"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "NG_terraplaynetwork - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "NG_terraplaynetwork - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "NG_terraplaynetwork - Win32 MT DLL Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "NG_terraplaynetwork - Win32 MT DLL Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "NG_terraplaynetwork - Win32 Profile" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "NG_terraplaynetwork - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "..\..\..\..\..\obj\windows\gameengine\network\terraplaynetwork"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\..\source\gameengine\network" /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\..\lib\windows\terraplay\include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\..\..\..\..\obj\windows\gameengine\network\terraplaynetwork\NG_terraplaynetwork.lib"
+
+!ELSEIF  "$(CFG)" == "NG_terraplaynetwork - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "..\..\..\..\..\obj\windows\gameengine\network\terraplaynetwork\debug"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\..\source\gameengine\network" /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\..\lib\windows\terraplay\include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /FR /YX /J /FD /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\..\..\..\..\obj\windows\gameengine\network\terraplaynetwork\debug\NG_terraplaynetwork.lib"
+
+!ELSEIF  "$(CFG)" == "NG_terraplaynetwork - Win32 MT DLL Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "NG_terraplaynetwork___Win32_MT_DLL_Debug"
+# PROP BASE Intermediate_Dir "NG_terraplaynetwork___Win32_MT_DLL_Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\..\..\..\obj\windows\gameengine\network\terraplaynetwork\mtdll_debug"
+# PROP Intermediate_Dir "..\..\..\..\..\obj\windows\gameengine\network\terraplaynetwork\mtdll_debug"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /Gm /GX /ZI /Od /I "..\..\..\..\source\gameengine\network" /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\..\lib\windows\terraplay\include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /GZ /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "..\..\..\..\source\gameengine\network" /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\..\lib\windows\terraplay\include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\..\..\..\..\obj\windows\gameengine\network\terraplaynetwork\debug\NG_terraplaynetwork.lib"
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "NG_terraplaynetwork - Win32 MT DLL Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "NG_terraplaynetwork___Win32_MT_DLL_Release"
+# PROP BASE Intermediate_Dir "NG_terraplaynetwork___Win32_MT_DLL_Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\..\..\..\obj\windows\gameengine\network\terraplaynetwork\mtdll"
+# PROP Intermediate_Dir "..\..\..\..\..\obj\windows\gameengine\network\terraplaynetwork\mtdll"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /GX /O2 /I "..\..\..\..\source\gameengine\network" /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\..\lib\windows\terraplay\include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
+# ADD CPP /nologo /MD /GX /O2 /I "..\..\..\..\source\gameengine\network" /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\..\lib\windows\terraplay\include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\..\..\..\..\obj\windows\gameengine\network\terraplaynetwork\NG_terraplaynetwork.lib"
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "NG_terraplaynetwork - Win32 Profile"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "NG_terraplaynetwork___Win32_Profile"
+# PROP BASE Intermediate_Dir "NG_terraplaynetwork___Win32_Profile"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "NG_terraplaynetwork___Win32_Profile"
+# PROP Intermediate_Dir "NG_terraplaynetwork___Win32_Profile"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\..\source\gameengine\network" /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\..\lib\windows\terraplay\include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GX /Zi /O2 /I "..\..\..\..\source\gameengine\network" /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\..\lib\windows\terraplay\include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\..\..\..\obj\windows\gameengine\network\terraplaynetwork\debug\NG_terraplaynetwork.lib"
+# ADD LIB32 /nologo /out:"..\..\..\..\..\obj\windows\gameengine\network\terraplaynetwork\profile\NG_terraplaynetwork.lib"
+
+!ENDIF 
+
+# Begin Target
+
+# Name "NG_terraplaynetwork - Win32 Release"
+# Name "NG_terraplaynetwork - Win32 Debug"
+# Name "NG_terraplaynetwork - Win32 MT DLL Debug"
+# Name "NG_terraplaynetwork - Win32 MT DLL Release"
+# Name "NG_terraplaynetwork - Win32 Profile"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\Network\TerraplayNetwork\NG_TerraplayNetworkDeviceInterface.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\Network\TerraplayNetwork\NG_TerraplayNetworkDeviceInterface.h
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/projectfiles/gameengine/physics/PHY_Physics/PHY_Dummy/PHY_Dummy.dsp b/projectfiles/gameengine/physics/PHY_Physics/PHY_Dummy/PHY_Dummy.dsp
index 0cc26260fd047c0f2b0dbd34031cc629c0d91644..0620baa5d0370aab9e59c1f17ce27b2c267f0b3a 100644
--- a/projectfiles/gameengine/physics/PHY_Physics/PHY_Dummy/PHY_Dummy.dsp
+++ b/projectfiles/gameengine/physics/PHY_Physics/PHY_Dummy/PHY_Dummy.dsp
@@ -1,154 +1,154 @@
-# Microsoft Developer Studio Project File - Name="PHY_Dummy" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=PHY_Dummy - Win32 MT DLL Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "PHY_Dummy.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "PHY_Dummy.mak" CFG="PHY_Dummy - Win32 MT DLL Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "PHY_Dummy - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "PHY_Dummy - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "PHY_Dummy - Win32 MT DLL Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "PHY_Dummy - Win32 MT DLL Release" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "PHY_Dummy - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\..\..\obj\windows\gameengine\physics\dummy\"
-# PROP Intermediate_Dir "..\..\..\..\..\obj\windows\gameengine\physics\dummy\"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /W3 /GR /GX /O2 /I "../../../../../source/gameengine/physics/common" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "PHY_Dummy - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\..\..\obj\windows\gameengine\physics\dummy\debug"
-# PROP Intermediate_Dir "..\..\..\..\..\obj\windows\gameengine\physics\dummy\debug"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GR /GX /ZI /Od /I "../../../../../source/gameengine/physics/common" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "PHY_Dummy - Win32 MT DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "PHY_Dummy___Win32_MT_DLL_Debug"
-# PROP BASE Intermediate_Dir "PHY_Dummy___Win32_MT_DLL_Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\..\..\obj\windows\gameengine\physics\dummy\mtdll_debug"
-# PROP Intermediate_Dir "..\..\..\..\..\obj\windows\gameengine\physics\dummy\mtdll_debug"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "../../../../../source/gameengine/physics/common" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../../../../source/gameengine/physics/common" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "PHY_Dummy - Win32 MT DLL Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "PHY_Dummy___Win32_MT_DLL_Release"
-# PROP BASE Intermediate_Dir "PHY_Dummy___Win32_MT_DLL_Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\..\..\obj\windows\gameengine\physics\dummy\mtdll"
-# PROP Intermediate_Dir "..\..\..\..\..\obj\windows\gameengine\physics\dummy\mtdll"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /GX /O2 /I "../../../../../source/gameengine/physics/common" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../../../../source/gameengine/physics/common" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ENDIF 
-
-# Begin Target
-
-# Name "PHY_Dummy - Win32 Release"
-# Name "PHY_Dummy - Win32 Debug"
-# Name "PHY_Dummy - Win32 MT DLL Debug"
-# Name "PHY_Dummy - Win32 MT DLL Release"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\..\..\..\source\gameengine\Physics\Dummy\DummyPhysicsEnvironment.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\..\..\..\..\source\gameengine\Physics\Dummy\DummyPhysicsEnvironment.h
-# End Source File
-# End Group
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="PHY_Dummy" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=PHY_Dummy - Win32 MT DLL Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "PHY_Dummy.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "PHY_Dummy.mak" CFG="PHY_Dummy - Win32 MT DLL Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "PHY_Dummy - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "PHY_Dummy - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "PHY_Dummy - Win32 MT DLL Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "PHY_Dummy - Win32 MT DLL Release" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "PHY_Dummy - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\..\..\..\obj\windows\gameengine\physics\dummy\"
+# PROP Intermediate_Dir "..\..\..\..\..\obj\windows\gameengine\physics\dummy\"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /W3 /GR /GX /O2 /I "../../../../../source/gameengine/physics/common" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "PHY_Dummy - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\..\..\..\obj\windows\gameengine\physics\dummy\debug"
+# PROP Intermediate_Dir "..\..\..\..\..\obj\windows\gameengine\physics\dummy\debug"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GR /GX /ZI /Od /I "../../../../../source/gameengine/physics/common" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "PHY_Dummy - Win32 MT DLL Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "PHY_Dummy___Win32_MT_DLL_Debug"
+# PROP BASE Intermediate_Dir "PHY_Dummy___Win32_MT_DLL_Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\..\..\..\obj\windows\gameengine\physics\dummy\mtdll_debug"
+# PROP Intermediate_Dir "..\..\..\..\..\obj\windows\gameengine\physics\dummy\mtdll_debug"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "../../../../../source/gameengine/physics/common" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../../../../source/gameengine/physics/common" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "PHY_Dummy - Win32 MT DLL Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "PHY_Dummy___Win32_MT_DLL_Release"
+# PROP BASE Intermediate_Dir "PHY_Dummy___Win32_MT_DLL_Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\..\..\..\obj\windows\gameengine\physics\dummy\mtdll"
+# PROP Intermediate_Dir "..\..\..\..\..\obj\windows\gameengine\physics\dummy\mtdll"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /W3 /GX /O2 /I "../../../../../source/gameengine/physics/common" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../../../../source/gameengine/physics/common" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ENDIF 
+
+# Begin Target
+
+# Name "PHY_Dummy - Win32 Release"
+# Name "PHY_Dummy - Win32 Debug"
+# Name "PHY_Dummy - Win32 MT DLL Debug"
+# Name "PHY_Dummy - Win32 MT DLL Release"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\..\..\..\..\source\gameengine\Physics\Dummy\DummyPhysicsEnvironment.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=..\..\..\..\..\source\gameengine\Physics\Dummy\DummyPhysicsEnvironment.h
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/projectfiles/gameengine/physics/PHY_Physics/PHY_Ode/PHY_Ode.dsp b/projectfiles/gameengine/physics/PHY_Physics/PHY_Ode/PHY_Ode.dsp
index fef5dbf63f5baea5dce445daf30c64eb8f4a1327..9d607db809ca6eb6e1672b56f9358d50c5b60412 100644
--- a/projectfiles/gameengine/physics/PHY_Physics/PHY_Ode/PHY_Ode.dsp
+++ b/projectfiles/gameengine/physics/PHY_Physics/PHY_Ode/PHY_Ode.dsp
@@ -1,162 +1,162 @@
-# Microsoft Developer Studio Project File - Name="PHY_Ode" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=PHY_Ode - Win32 MT DLL Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "PHY_Ode.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "PHY_Ode.mak" CFG="PHY_Ode - Win32 MT DLL Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "PHY_Ode - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "PHY_Ode - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "PHY_Ode - Win32 MT DLL Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "PHY_Ode - Win32 MT DLL Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "PHY_Ode - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\..\..\obj\windows\gameengine\physics\ode\"
-# PROP Intermediate_Dir "..\..\..\..\..\obj\windows\gameengine\physics\ode\"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /W3 /GR /GX /O2 /I "..\..\..\..\..\..\lib\windows\ode\include" /I "..\..\..\..\..\source\gameengine\physics\common" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "PHY_Ode - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\..\..\obj\windows\gameengine\physics\ode\debug"
-# PROP Intermediate_Dir "..\..\..\..\..\obj\windows\gameengine\physics\ode\debug"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GR /GX /ZI /Od /I "..\..\..\..\..\..\lib\windows\ode\include" /I "..\..\..\..\..\source\gameengine\physics\common" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "PHY_Ode - Win32 MT DLL Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "PHY_Ode___Win32_MT_DLL_Release"
-# PROP BASE Intermediate_Dir "PHY_Ode___Win32_MT_DLL_Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\..\..\obj\windows\gameengine\physics\ode\mtdll"
-# PROP Intermediate_Dir "..\..\..\..\..\obj\windows\gameengine\physics\ode\mtdll"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /GX /O2 /I "../../../../../source/ode/include" /I "..\..\..\..\..\..\lib\windows\ode\include" /I "../../../../../source/gameengine/physics/common" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "dSINGLE" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\..\..\lib\windows\ode\include" /I "..\..\..\..\..\source\gameengine\physics\common" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "PHY_Ode - Win32 MT DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "PHY_Ode___Win32_MT_DLL_Debug"
-# PROP BASE Intermediate_Dir "PHY_Ode___Win32_MT_DLL_Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\..\..\obj\windows\gameengine\physics\ode\mtdll_debug"
-# PROP Intermediate_Dir "..\..\..\..\..\obj\windows\gameengine\physics\ode\mtdll_debug"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../../../../../lib/windows/ode/include" /I "../../../../../source/gameengine/physics/common" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "dSINGLE" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\..\lib\windows\ode\include" /I "..\..\..\..\..\source\gameengine\physics\common" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ENDIF 
-
-# Begin Target
-
-# Name "PHY_Ode - Win32 Release"
-# Name "PHY_Ode - Win32 Debug"
-# Name "PHY_Ode - Win32 MT DLL Release"
-# Name "PHY_Ode - Win32 MT DLL Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\..\..\..\source\gameengine\Physics\BlOde\OdePhysicsController.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\..\source\gameengine\Physics\BlOde\OdePhysicsEnvironment.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\..\..\..\..\source\gameengine\Physics\BlOde\OdePhysicsController.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\..\source\gameengine\Physics\BlOde\OdePhysicsEnvironment.h
-# End Source File
-# End Group
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="PHY_Ode" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=PHY_Ode - Win32 MT DLL Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "PHY_Ode.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "PHY_Ode.mak" CFG="PHY_Ode - Win32 MT DLL Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "PHY_Ode - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "PHY_Ode - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "PHY_Ode - Win32 MT DLL Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "PHY_Ode - Win32 MT DLL Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "PHY_Ode - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\..\..\..\obj\windows\gameengine\physics\ode\"
+# PROP Intermediate_Dir "..\..\..\..\..\obj\windows\gameengine\physics\ode\"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /W3 /GR /GX /O2 /I "..\..\..\..\..\..\lib\windows\ode\include" /I "..\..\..\..\..\source\gameengine\physics\common" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "PHY_Ode - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\..\..\..\obj\windows\gameengine\physics\ode\debug"
+# PROP Intermediate_Dir "..\..\..\..\..\obj\windows\gameengine\physics\ode\debug"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GR /GX /ZI /Od /I "..\..\..\..\..\..\lib\windows\ode\include" /I "..\..\..\..\..\source\gameengine\physics\common" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "PHY_Ode - Win32 MT DLL Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "PHY_Ode___Win32_MT_DLL_Release"
+# PROP BASE Intermediate_Dir "PHY_Ode___Win32_MT_DLL_Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\..\..\..\obj\windows\gameengine\physics\ode\mtdll"
+# PROP Intermediate_Dir "..\..\..\..\..\obj\windows\gameengine\physics\ode\mtdll"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /W3 /GX /O2 /I "../../../../../source/ode/include" /I "..\..\..\..\..\..\lib\windows\ode\include" /I "../../../../../source/gameengine/physics/common" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "dSINGLE" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\..\..\lib\windows\ode\include" /I "..\..\..\..\..\source\gameengine\physics\common" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "PHY_Ode - Win32 MT DLL Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "PHY_Ode___Win32_MT_DLL_Debug"
+# PROP BASE Intermediate_Dir "PHY_Ode___Win32_MT_DLL_Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\..\..\..\obj\windows\gameengine\physics\ode\mtdll_debug"
+# PROP Intermediate_Dir "..\..\..\..\..\obj\windows\gameengine\physics\ode\mtdll_debug"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../../../../../lib/windows/ode/include" /I "../../../../../source/gameengine/physics/common" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "dSINGLE" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\..\lib\windows\ode\include" /I "..\..\..\..\..\source\gameengine\physics\common" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ENDIF 
+
+# Begin Target
+
+# Name "PHY_Ode - Win32 Release"
+# Name "PHY_Ode - Win32 Debug"
+# Name "PHY_Ode - Win32 MT DLL Release"
+# Name "PHY_Ode - Win32 MT DLL Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\..\..\..\..\source\gameengine\Physics\BlOde\OdePhysicsController.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\..\source\gameengine\Physics\BlOde\OdePhysicsEnvironment.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=..\..\..\..\..\source\gameengine\Physics\BlOde\OdePhysicsController.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\..\source\gameengine\Physics\BlOde\OdePhysicsEnvironment.h
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/projectfiles/gameengine/physics/PHY_Physics/PHY_Physics.dsp b/projectfiles/gameengine/physics/PHY_Physics/PHY_Physics.dsp
index f54875c2c18b2664d179ec3bb11081b7d78c2136..bdf4e0f5db56e037d32d0cc08a8eee92df4d3677 100644
--- a/projectfiles/gameengine/physics/PHY_Physics/PHY_Physics.dsp
+++ b/projectfiles/gameengine/physics/PHY_Physics/PHY_Physics.dsp
@@ -1,178 +1,178 @@
-# Microsoft Developer Studio Project File - Name="PHY_Physics" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=PHY_Physics - Win32 MT DLL Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "PHY_Physics.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "PHY_Physics.mak" CFG="PHY_Physics - Win32 MT DLL Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "PHY_Physics - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "PHY_Physics - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "PHY_Physics - Win32 MT DLL Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "PHY_Physics - Win32 MT DLL Release" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "PHY_Physics - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\..\obj\windows\gameengine\physics"
-# PROP Intermediate_Dir "..\..\..\..\obj\windows\gameengine\physics"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /W3 /GR /GX /O2 /I "common" /I "dummy" /I "../../../../extern/solid/include" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "PHY_Physics - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\..\obj\windows\gameengine\physics\debug"
-# PROP Intermediate_Dir "..\..\..\..\obj\windows\gameengine\physics\debug"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GR /GX /ZI /Od /I "common" /I "dummy" /I "../../../../extern/solid/include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "PHY_Physics - Win32 MT DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "PHY_Physics___Win32_MT_DLL_Debug"
-# PROP BASE Intermediate_Dir "PHY_Physics___Win32_MT_DLL_Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\..\obj\windows\gameengine\physics\mtdll_debug"
-# PROP Intermediate_Dir "..\..\..\..\obj\windows\gameengine\physics\mtdll_debug"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "common" /I "dummy" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "common" /I "dummy" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "PHY_Physics - Win32 MT DLL Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "PHY_Physics___Win32_MT_DLL_Release"
-# PROP BASE Intermediate_Dir "PHY_Physics___Win32_MT_DLL_Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\..\obj\windows\gameengine\physics\mtdll"
-# PROP Intermediate_Dir "..\..\..\..\obj\windows\gameengine\physics\mtdll"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /GX /O2 /I "common" /I "dummy" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "common" /I "dummy" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ENDIF 
-
-# Begin Target
-
-# Name "PHY_Physics - Win32 Release"
-# Name "PHY_Physics - Win32 Debug"
-# Name "PHY_Physics - Win32 MT DLL Debug"
-# Name "PHY_Physics - Win32 MT DLL Release"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\Physics\common\PHY_IMotionState.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\Physics\common\PHY_IPhysicsController.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\Physics\common\PHY_IPhysicsEnvironment.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\Physics\common\PHY_DynamicTypes.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\Physics\common\PHY_IMotionState.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\Physics\common\PHY_IPhysicsController.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\Physics\common\PHY_IPhysicsEnvironment.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\Physics\common\PHY_Pro.h
-# End Source File
-# End Group
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="PHY_Physics" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=PHY_Physics - Win32 MT DLL Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "PHY_Physics.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "PHY_Physics.mak" CFG="PHY_Physics - Win32 MT DLL Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "PHY_Physics - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "PHY_Physics - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "PHY_Physics - Win32 MT DLL Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "PHY_Physics - Win32 MT DLL Release" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "PHY_Physics - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\..\..\obj\windows\gameengine\physics"
+# PROP Intermediate_Dir "..\..\..\..\obj\windows\gameengine\physics"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /W3 /GR /GX /O2 /I "common" /I "dummy" /I "../../../../extern/solid/include" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "PHY_Physics - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\..\..\obj\windows\gameengine\physics\debug"
+# PROP Intermediate_Dir "..\..\..\..\obj\windows\gameengine\physics\debug"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GR /GX /ZI /Od /I "common" /I "dummy" /I "../../../../extern/solid/include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "PHY_Physics - Win32 MT DLL Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "PHY_Physics___Win32_MT_DLL_Debug"
+# PROP BASE Intermediate_Dir "PHY_Physics___Win32_MT_DLL_Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\..\..\obj\windows\gameengine\physics\mtdll_debug"
+# PROP Intermediate_Dir "..\..\..\..\obj\windows\gameengine\physics\mtdll_debug"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "common" /I "dummy" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "common" /I "dummy" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "PHY_Physics - Win32 MT DLL Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "PHY_Physics___Win32_MT_DLL_Release"
+# PROP BASE Intermediate_Dir "PHY_Physics___Win32_MT_DLL_Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\..\..\obj\windows\gameengine\physics\mtdll"
+# PROP Intermediate_Dir "..\..\..\..\obj\windows\gameengine\physics\mtdll"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /W3 /GX /O2 /I "common" /I "dummy" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "common" /I "dummy" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ENDIF 
+
+# Begin Target
+
+# Name "PHY_Physics - Win32 Release"
+# Name "PHY_Physics - Win32 Debug"
+# Name "PHY_Physics - Win32 MT DLL Debug"
+# Name "PHY_Physics - Win32 MT DLL Release"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\Physics\common\PHY_IMotionState.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\Physics\common\PHY_IPhysicsController.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\Physics\common\PHY_IPhysicsEnvironment.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\Physics\common\PHY_DynamicTypes.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\Physics\common\PHY_IMotionState.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\Physics\common\PHY_IPhysicsController.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\Physics\common\PHY_IPhysicsEnvironment.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\Physics\common\PHY_Pro.h
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/projectfiles/gameengine/physics/PHY_Physics/PHY_Sumo/PHY_Sumo.dsp b/projectfiles/gameengine/physics/PHY_Physics/PHY_Sumo/PHY_Sumo.dsp
index 8f148363addb7d4c55e403ff3b9ca30f1a6d802b..1a9f6e98201834e7d7d0a4940714b8af8461c6a8 100644
--- a/projectfiles/gameengine/physics/PHY_Physics/PHY_Sumo/PHY_Sumo.dsp
+++ b/projectfiles/gameengine/physics/PHY_Physics/PHY_Sumo/PHY_Sumo.dsp
@@ -1,162 +1,162 @@
-# Microsoft Developer Studio Project File - Name="PHY_Sumo" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=PHY_Sumo - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "PHY_Sumo.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "PHY_Sumo.mak" CFG="PHY_Sumo - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "PHY_Sumo - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "PHY_Sumo - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "PHY_Sumo - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../../../../extern/solid" /I "../../../../../source/gameengine/physics" /I "../../../../../source/gameengine/physics/common" /I "../../../../../source/gameengine/physics/sumo" /I "../../../../../source/gameengine/physics/sumo/include" /I "../../../../../source/gameengine/physics/sumo/fuzzics/include" /I "../../../../../../lib/windows/Moto/include" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\gameengine\physics\sumo\PHY_Sumo.lib"
-
-!ELSEIF  "$(CFG)" == "PHY_Sumo - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GR /GX /ZI /Od /I "../../../../../extern/solid" /I "../../../../../source/gameengine/physics" /I "../../../../../source/gameengine/physics/common" /I "../../../../../source/gameengine/physics/sumo" /I "../../../../../source/gameengine/physics/sumo/include" /I "../../../../../source/gameengine/physics/sumo/fuzzics/include" /I "../../../../../../lib/windows/Moto/include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\gameengine\physics\sumo\debug\PHY_Sumo.lib"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "PHY_Sumo - Win32 Release"
-# Name "PHY_Sumo - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\..\..\..\source\gameengine\Physics\Sumo\Fuzzics\src\SM_FhObject.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\..\source\gameengine\Physics\Sumo\Fuzzics\src\SM_MotionState.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\..\source\gameengine\Physics\Sumo\Fuzzics\src\SM_Object.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\..\source\gameengine\Physics\Sumo\Fuzzics\src\SM_Scene.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\..\source\gameengine\Physics\Sumo\SumoPHYCallbackBridge.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\..\source\gameengine\Physics\Sumo\SumoPhysicsController.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\..\source\gameengine\Physics\Sumo\SumoPhysicsEnvironment.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\..\..\..\..\source\gameengine\Physics\Sumo\Fuzzics\include\SM_Callback.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\..\source\gameengine\Physics\Sumo\Fuzzics\include\SM_ClientObjectInfo.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\..\source\gameengine\Physics\Sumo\Fuzzics\include\SM_FhObject.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\..\source\gameengine\Physics\Sumo\Fuzzics\include\SM_MotionState.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\..\source\gameengine\Physics\Sumo\Fuzzics\include\SM_Object.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\..\source\gameengine\Physics\Sumo\Fuzzics\include\SM_Props.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\..\source\gameengine\Physics\Sumo\Fuzzics\include\SM_Scene.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\..\source\gameengine\Physics\Sumo\SumoPHYCallbackBridge.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\..\source\gameengine\Physics\Sumo\SumoPhysicsController.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\..\source\gameengine\Physics\Sumo\SumoPhysicsEnvironment.h
-# End Source File
-# End Group
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="PHY_Sumo" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=PHY_Sumo - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "PHY_Sumo.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "PHY_Sumo.mak" CFG="PHY_Sumo - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "PHY_Sumo - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "PHY_Sumo - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "PHY_Sumo - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../../../../extern/solid" /I "../../../../../source/gameengine/physics" /I "../../../../../source/gameengine/physics/common" /I "../../../../../source/gameengine/physics/sumo" /I "../../../../../source/gameengine/physics/sumo/include" /I "../../../../../source/gameengine/physics/sumo/fuzzics/include" /I "../../../../../../lib/windows/Moto/include" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\gameengine\physics\sumo\PHY_Sumo.lib"
+
+!ELSEIF  "$(CFG)" == "PHY_Sumo - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GR /GX /ZI /Od /I "../../../../../extern/solid" /I "../../../../../source/gameengine/physics" /I "../../../../../source/gameengine/physics/common" /I "../../../../../source/gameengine/physics/sumo" /I "../../../../../source/gameengine/physics/sumo/include" /I "../../../../../source/gameengine/physics/sumo/fuzzics/include" /I "../../../../../../lib/windows/Moto/include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\gameengine\physics\sumo\debug\PHY_Sumo.lib"
+
+!ENDIF 
+
+# Begin Target
+
+# Name "PHY_Sumo - Win32 Release"
+# Name "PHY_Sumo - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\..\..\..\..\source\gameengine\Physics\Sumo\Fuzzics\src\SM_FhObject.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\..\source\gameengine\Physics\Sumo\Fuzzics\src\SM_MotionState.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\..\source\gameengine\Physics\Sumo\Fuzzics\src\SM_Object.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\..\source\gameengine\Physics\Sumo\Fuzzics\src\SM_Scene.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\..\source\gameengine\Physics\Sumo\SumoPHYCallbackBridge.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\..\source\gameengine\Physics\Sumo\SumoPhysicsController.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\..\source\gameengine\Physics\Sumo\SumoPhysicsEnvironment.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=..\..\..\..\..\source\gameengine\Physics\Sumo\Fuzzics\include\SM_Callback.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\..\source\gameengine\Physics\Sumo\Fuzzics\include\SM_ClientObjectInfo.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\..\source\gameengine\Physics\Sumo\Fuzzics\include\SM_FhObject.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\..\source\gameengine\Physics\Sumo\Fuzzics\include\SM_MotionState.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\..\source\gameengine\Physics\Sumo\Fuzzics\include\SM_Object.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\..\source\gameengine\Physics\Sumo\Fuzzics\include\SM_Props.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\..\source\gameengine\Physics\Sumo\Fuzzics\include\SM_Scene.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\..\source\gameengine\Physics\Sumo\SumoPHYCallbackBridge.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\..\source\gameengine\Physics\Sumo\SumoPhysicsController.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\..\source\gameengine\Physics\Sumo\SumoPhysicsEnvironment.h
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/projectfiles/gameengine/rasterizer/RAS_rasterizer.dsp b/projectfiles/gameengine/rasterizer/RAS_rasterizer.dsp
index c764823632e32bc979ab907ba27838c3adfc81c6..bb960e95969274a8b73c76fc77af8b43b487b908 100644
--- a/projectfiles/gameengine/rasterizer/RAS_rasterizer.dsp
+++ b/projectfiles/gameengine/rasterizer/RAS_rasterizer.dsp
@@ -1,243 +1,243 @@
-# Microsoft Developer Studio Project File - Name="RAS_rasterizer" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=RAS_rasterizer - Win32 Release
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "RAS_rasterizer.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "RAS_rasterizer.mak" CFG="RAS_rasterizer - Win32 Release"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "RAS_rasterizer - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "RAS_rasterizer - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "RAS_rasterizer - Win32 MT DLL Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "RAS_rasterizer - Win32 MT DLL Release" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "RAS_rasterizer - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\obj\windows\gameengine\rasterizer"
-# PROP Intermediate_Dir "..\..\..\obj\windows\gameengine\rasterizer"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "..\..\..\..\lib\windows\moto\include\\" /I "..\..\..\..\lib\windows\string\include" /I "..\..\..\source\kernel\gen_system" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "RAS_rasterizer - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\obj\windows\gameengine\rasterizer\debug"
-# PROP Intermediate_Dir "..\..\..\obj\windows\gameengine\rasterizer\debug"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GR /GX /Zi /Od /I "..\..\..\..\lib\windows\moto\include\\" /I "..\..\..\..\lib\windows\string\include" /I "..\..\..\source\kernel\gen_system" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /GZ /c
-# SUBTRACT CPP /Fr
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "RAS_rasterizer - Win32 MT DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "RAS_rasterizer___Win32_MT_DLL_Debug"
-# PROP BASE Intermediate_Dir "RAS_rasterizer___Win32_MT_DLL_Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\obj\windows\gameengine\rasterizer\mtdll_debug"
-# PROP Intermediate_Dir "..\..\..\obj\windows\gameengine\rasterizer\mtdll_debug"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /Gm /GX /ZI /Od /I "../../../../../lib/windows/moto/include" /I "..\..\..\source\kernel\gen_system" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /GZ /c
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "../../../../lib/windows/moto/include" /I "..\..\..\..\lib\windows\string\include" /I "..\..\..\source\kernel\gen_system" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\..\..\..\obj\windows\gameengine\rasterizer\debug\RAS_rasterizer.lib"
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "RAS_rasterizer - Win32 MT DLL Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "RAS_rasterizer___Win32_MT_DLL_Release"
-# PROP BASE Intermediate_Dir "RAS_rasterizer___Win32_MT_DLL_Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\obj\windows\gameengine\rasterizer\mtdll"
-# PROP Intermediate_Dir "..\..\..\obj\windows\gameengine\rasterizer\mtdll"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /GX /O2 /I "../../../../../lib/windows/moto/include" /I "..\..\..\source\kernel\gen_system" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
-# ADD CPP /nologo /MD /GX /O2 /I "../../../../lib/windows/moto/include" /I "..\..\..\..\lib\windows\string\include" /I "..\..\..\source\kernel\gen_system" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\..\..\..\obj\windows\gameengine\rasterizer\RAS_rasterizer.lib"
-# ADD LIB32 /nologo
-
-!ENDIF 
-
-# Begin Target
-
-# Name "RAS_rasterizer - Win32 Release"
-# Name "RAS_rasterizer - Win32 Debug"
-# Name "RAS_rasterizer - Win32 MT DLL Debug"
-# Name "RAS_rasterizer - Win32 MT DLL Release"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Rasterizer\RAS_BucketManager.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Rasterizer\RAS_FramingManager.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Rasterizer\RAS_IPolygonMaterial.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Rasterizer\RAS_IRenderTools.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Rasterizer\RAS_MaterialBucket.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Rasterizer\RAS_MeshObject.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Rasterizer\RAS_Polygon.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Rasterizer\RAS_texmatrix.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Rasterizer\RAS_TexVert.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Rasterizer\RAS_BucketManager.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Rasterizer\RAS_CameraData.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Rasterizer\RAS_Deformer.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Rasterizer\RAS_FramingManager.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Rasterizer\RAS_ICanvas.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Rasterizer\RAS_IPolygonMaterial.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Rasterizer\RAS_IRasterizer.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Rasterizer\RAS_IRenderTools.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Rasterizer\RAS_LightObject.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Rasterizer\RAS_MaterialBucket.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Rasterizer\RAS_MeshObject.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Rasterizer\RAS_ObjectColor.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Rasterizer\RAS_Polygon.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Rasterizer\RAS_TexMatrix.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Rasterizer\RAS_TexVert.h
-# End Source File
-# End Group
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="RAS_rasterizer" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=RAS_rasterizer - Win32 Release
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "RAS_rasterizer.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "RAS_rasterizer.mak" CFG="RAS_rasterizer - Win32 Release"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "RAS_rasterizer - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "RAS_rasterizer - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "RAS_rasterizer - Win32 MT DLL Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "RAS_rasterizer - Win32 MT DLL Release" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "RAS_rasterizer - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\..\obj\windows\gameengine\rasterizer"
+# PROP Intermediate_Dir "..\..\..\obj\windows\gameengine\rasterizer"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "..\..\..\..\lib\windows\moto\include\\" /I "..\..\..\..\lib\windows\string\include" /I "..\..\..\source\kernel\gen_system" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "RAS_rasterizer - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\..\obj\windows\gameengine\rasterizer\debug"
+# PROP Intermediate_Dir "..\..\..\obj\windows\gameengine\rasterizer\debug"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GR /GX /Zi /Od /I "..\..\..\..\lib\windows\moto\include\\" /I "..\..\..\..\lib\windows\string\include" /I "..\..\..\source\kernel\gen_system" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /GZ /c
+# SUBTRACT CPP /Fr
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "RAS_rasterizer - Win32 MT DLL Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "RAS_rasterizer___Win32_MT_DLL_Debug"
+# PROP BASE Intermediate_Dir "RAS_rasterizer___Win32_MT_DLL_Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\..\obj\windows\gameengine\rasterizer\mtdll_debug"
+# PROP Intermediate_Dir "..\..\..\obj\windows\gameengine\rasterizer\mtdll_debug"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /Gm /GX /ZI /Od /I "../../../../../lib/windows/moto/include" /I "..\..\..\source\kernel\gen_system" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /GZ /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "../../../../lib/windows/moto/include" /I "..\..\..\..\lib\windows\string\include" /I "..\..\..\source\kernel\gen_system" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\..\..\..\obj\windows\gameengine\rasterizer\debug\RAS_rasterizer.lib"
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "RAS_rasterizer - Win32 MT DLL Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "RAS_rasterizer___Win32_MT_DLL_Release"
+# PROP BASE Intermediate_Dir "RAS_rasterizer___Win32_MT_DLL_Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\..\obj\windows\gameengine\rasterizer\mtdll"
+# PROP Intermediate_Dir "..\..\..\obj\windows\gameengine\rasterizer\mtdll"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /GX /O2 /I "../../../../../lib/windows/moto/include" /I "..\..\..\source\kernel\gen_system" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
+# ADD CPP /nologo /MD /GX /O2 /I "../../../../lib/windows/moto/include" /I "..\..\..\..\lib\windows\string\include" /I "..\..\..\source\kernel\gen_system" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\..\..\..\obj\windows\gameengine\rasterizer\RAS_rasterizer.lib"
+# ADD LIB32 /nologo
+
+!ENDIF 
+
+# Begin Target
+
+# Name "RAS_rasterizer - Win32 Release"
+# Name "RAS_rasterizer - Win32 Debug"
+# Name "RAS_rasterizer - Win32 MT DLL Debug"
+# Name "RAS_rasterizer - Win32 MT DLL Release"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Rasterizer\RAS_BucketManager.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Rasterizer\RAS_FramingManager.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Rasterizer\RAS_IPolygonMaterial.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Rasterizer\RAS_IRenderTools.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Rasterizer\RAS_MaterialBucket.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Rasterizer\RAS_MeshObject.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Rasterizer\RAS_Polygon.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Rasterizer\RAS_texmatrix.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Rasterizer\RAS_TexVert.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Rasterizer\RAS_BucketManager.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Rasterizer\RAS_CameraData.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Rasterizer\RAS_Deformer.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Rasterizer\RAS_FramingManager.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Rasterizer\RAS_ICanvas.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Rasterizer\RAS_IPolygonMaterial.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Rasterizer\RAS_IRasterizer.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Rasterizer\RAS_IRenderTools.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Rasterizer\RAS_LightObject.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Rasterizer\RAS_MaterialBucket.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Rasterizer\RAS_MeshObject.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Rasterizer\RAS_ObjectColor.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Rasterizer\RAS_Polygon.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Rasterizer\RAS_TexMatrix.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Rasterizer\RAS_TexVert.h
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/projectfiles/gameengine/rasterizer/openglrasterizer/RAS_openglrasterizer.dsp b/projectfiles/gameengine/rasterizer/openglrasterizer/RAS_openglrasterizer.dsp
index 1f1b95291edc5e2ce53b9baf042eb9342569988e..8b4cce618d1fce54e748de06491eaa8aa4557589 100644
--- a/projectfiles/gameengine/rasterizer/openglrasterizer/RAS_openglrasterizer.dsp
+++ b/projectfiles/gameengine/rasterizer/openglrasterizer/RAS_openglrasterizer.dsp
@@ -1,183 +1,183 @@
-# Microsoft Developer Studio Project File - Name="RAS_openglrasterizer" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=RAS_openglrasterizer - Win32 Release
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "RAS_openglrasterizer.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "RAS_openglrasterizer.mak" CFG="RAS_openglrasterizer - Win32 Release"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "RAS_openglrasterizer - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "RAS_openglrasterizer - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "RAS_openglrasterizer - Win32 MT DLL Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "RAS_openglrasterizer - Win32 MT DLL Release" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "RAS_openglrasterizer - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\..\obj\windows\gameengine\rasterizer\openglrasterizer"
-# PROP Intermediate_Dir "..\..\..\..\obj\windows\gameengine\rasterizer\openglrasterizer"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-MTL=midl.exe
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "..\..\..\..\..\lib\windows\string\include" /I "..\..\..\..\source\kernel\gen_system" /I "../../../../../lib/windows/moto/include" /I "..\..\..\..\source\gameengine\Rasterizer" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "RAS_openglrasterizer - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\..\obj\windows\gameengine\rasterizer\openglrasterizer\debug"
-# PROP Intermediate_Dir "..\..\..\..\obj\windows\gameengine\rasterizer\openglrasterizer\debug"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-MTL=midl.exe
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GR /GX /Zi /Od /I "..\..\..\..\..\lib\windows\string\include" /I "..\..\..\..\source\kernel\gen_system" /I "../../../../../lib/windows/moto/include" /I "..\..\..\..\source\gameengine\Rasterizer" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /GZ /c
-# SUBTRACT CPP /Fr
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "RAS_openglrasterizer - Win32 MT DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "RAS_openglrasterizer___Win32_MT_DLL_Debug"
-# PROP BASE Intermediate_Dir "RAS_openglrasterizer___Win32_MT_DLL_Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\..\obj\windows\gameengine\rasterizer\openglrasterizer\mtdll_debug"
-# PROP Intermediate_Dir "..\..\..\..\obj\windows\gameengine\rasterizer\openglrasterizer\mtdll_debug"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-MTL=midl.exe
-# ADD BASE CPP /nologo /Gm /GX /ZI /Od /I "..\..\..\..\source\kernel\gen_system" /I "../../../../../lib/windows/moto/include" /I "..\..\..\..\source\gameengine\Rasterizer" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /GZ /c
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "..\..\..\..\..\lib\windows\string\include" /I "..\..\..\..\source\kernel\gen_system" /I "../../../../../lib/windows/moto/include" /I "..\..\..\..\source\gameengine\Rasterizer" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\..\..\..\..\obj\windows\gameengine\rasterizer\openglrasterizer\debug\RAS_openglrasterizer.lib"
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "RAS_openglrasterizer - Win32 MT DLL Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "RAS_openglrasterizer___Win32_MT_DLL_Release"
-# PROP BASE Intermediate_Dir "RAS_openglrasterizer___Win32_MT_DLL_Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\..\obj\windows\gameengine\rasterizer\openglrasterizer\mtdll"
-# PROP Intermediate_Dir "..\..\..\..\obj\windows\gameengine\rasterizer\openglrasterizer\mtdll"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-MTL=midl.exe
-# ADD BASE CPP /nologo /GX /O2 /I "..\..\..\..\source\kernel\gen_system" /I ".../../../../../lib/windows/moto/include" /I "..\..\..\..\source\gameengine\Rasterizer" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
-# ADD CPP /nologo /MD /GX /O2 /I "..\..\..\..\..\lib\windows\string\include" /I "..\..\..\..\source\kernel\gen_system" /I "../../../../../lib/windows/moto/include" /I "..\..\..\..\source\gameengine\Rasterizer" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\..\..\..\..\obj\windows\gameengine\rasterizer\openglrasterizer\RAS_openglrasterizer.lib"
-# ADD LIB32 /nologo
-
-!ENDIF 
-
-# Begin Target
-
-# Name "RAS_openglrasterizer - Win32 Release"
-# Name "RAS_openglrasterizer - Win32 Debug"
-# Name "RAS_openglrasterizer - Win32 MT DLL Debug"
-# Name "RAS_openglrasterizer - Win32 MT DLL Release"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\Rasterizer\RAS_OpenGLRasterizer\RAS_GLExtensionManager.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\Rasterizer\RAS_OpenGLRasterizer\RAS_ListRasterizer.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\Rasterizer\RAS_OpenGLRasterizer\RAS_OpenGLRasterizer.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\Rasterizer\RAS_OpenGLRasterizer\RAS_VAOpenGLRasterizer.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\Rasterizer\RAS_OpenGLRasterizer\RAS_GLExtensionManager.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\Rasterizer\RAS_OpenGLRasterizer\RAS_ListRasterizer.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\Rasterizer\RAS_OpenGLRasterizer\RAS_OpenGLRasterizer.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\gameengine\Rasterizer\RAS_OpenGLRasterizer\RAS_VAOpenGLRasterizer.h
-# End Source File
-# End Group
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="RAS_openglrasterizer" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=RAS_openglrasterizer - Win32 Release
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "RAS_openglrasterizer.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "RAS_openglrasterizer.mak" CFG="RAS_openglrasterizer - Win32 Release"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "RAS_openglrasterizer - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "RAS_openglrasterizer - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "RAS_openglrasterizer - Win32 MT DLL Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "RAS_openglrasterizer - Win32 MT DLL Release" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "RAS_openglrasterizer - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\..\..\obj\windows\gameengine\rasterizer\openglrasterizer"
+# PROP Intermediate_Dir "..\..\..\..\obj\windows\gameengine\rasterizer\openglrasterizer"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+MTL=midl.exe
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "..\..\..\..\..\lib\windows\string\include" /I "..\..\..\..\source\kernel\gen_system" /I "../../../../../lib/windows/moto/include" /I "..\..\..\..\source\gameengine\Rasterizer" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "RAS_openglrasterizer - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\..\..\obj\windows\gameengine\rasterizer\openglrasterizer\debug"
+# PROP Intermediate_Dir "..\..\..\..\obj\windows\gameengine\rasterizer\openglrasterizer\debug"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+MTL=midl.exe
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GR /GX /Zi /Od /I "..\..\..\..\..\lib\windows\string\include" /I "..\..\..\..\source\kernel\gen_system" /I "../../../../../lib/windows/moto/include" /I "..\..\..\..\source\gameengine\Rasterizer" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /GZ /c
+# SUBTRACT CPP /Fr
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "RAS_openglrasterizer - Win32 MT DLL Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "RAS_openglrasterizer___Win32_MT_DLL_Debug"
+# PROP BASE Intermediate_Dir "RAS_openglrasterizer___Win32_MT_DLL_Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\..\..\obj\windows\gameengine\rasterizer\openglrasterizer\mtdll_debug"
+# PROP Intermediate_Dir "..\..\..\..\obj\windows\gameengine\rasterizer\openglrasterizer\mtdll_debug"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+MTL=midl.exe
+# ADD BASE CPP /nologo /Gm /GX /ZI /Od /I "..\..\..\..\source\kernel\gen_system" /I "../../../../../lib/windows/moto/include" /I "..\..\..\..\source\gameengine\Rasterizer" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /GZ /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "..\..\..\..\..\lib\windows\string\include" /I "..\..\..\..\source\kernel\gen_system" /I "../../../../../lib/windows/moto/include" /I "..\..\..\..\source\gameengine\Rasterizer" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\..\..\..\..\obj\windows\gameengine\rasterizer\openglrasterizer\debug\RAS_openglrasterizer.lib"
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "RAS_openglrasterizer - Win32 MT DLL Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "RAS_openglrasterizer___Win32_MT_DLL_Release"
+# PROP BASE Intermediate_Dir "RAS_openglrasterizer___Win32_MT_DLL_Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\..\..\obj\windows\gameengine\rasterizer\openglrasterizer\mtdll"
+# PROP Intermediate_Dir "..\..\..\..\obj\windows\gameengine\rasterizer\openglrasterizer\mtdll"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+MTL=midl.exe
+# ADD BASE CPP /nologo /GX /O2 /I "..\..\..\..\source\kernel\gen_system" /I ".../../../../../lib/windows/moto/include" /I "..\..\..\..\source\gameengine\Rasterizer" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
+# ADD CPP /nologo /MD /GX /O2 /I "..\..\..\..\..\lib\windows\string\include" /I "..\..\..\..\source\kernel\gen_system" /I "../../../../../lib/windows/moto/include" /I "..\..\..\..\source\gameengine\Rasterizer" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\..\..\..\..\obj\windows\gameengine\rasterizer\openglrasterizer\RAS_openglrasterizer.lib"
+# ADD LIB32 /nologo
+
+!ENDIF 
+
+# Begin Target
+
+# Name "RAS_openglrasterizer - Win32 Release"
+# Name "RAS_openglrasterizer - Win32 Debug"
+# Name "RAS_openglrasterizer - Win32 MT DLL Debug"
+# Name "RAS_openglrasterizer - Win32 MT DLL Release"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\Rasterizer\RAS_OpenGLRasterizer\RAS_GLExtensionManager.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\Rasterizer\RAS_OpenGLRasterizer\RAS_ListRasterizer.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\Rasterizer\RAS_OpenGLRasterizer\RAS_OpenGLRasterizer.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\Rasterizer\RAS_OpenGLRasterizer\RAS_VAOpenGLRasterizer.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\Rasterizer\RAS_OpenGLRasterizer\RAS_GLExtensionManager.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\Rasterizer\RAS_OpenGLRasterizer\RAS_ListRasterizer.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\Rasterizer\RAS_OpenGLRasterizer\RAS_OpenGLRasterizer.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\source\gameengine\Rasterizer\RAS_OpenGLRasterizer\RAS_VAOpenGLRasterizer.h
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/projectfiles/gameengine/scenegraph/SG_scenegraph.dsp b/projectfiles/gameengine/scenegraph/SG_scenegraph.dsp
index 5a2b4c8cba3ac3de9defce11536c79a586b24567..72777059b50f72e881fa7ad00dcfc218504a1b27 100644
--- a/projectfiles/gameengine/scenegraph/SG_scenegraph.dsp
+++ b/projectfiles/gameengine/scenegraph/SG_scenegraph.dsp
@@ -1,199 +1,199 @@
-# Microsoft Developer Studio Project File - Name="SG_SceneGraph" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=SG_SceneGraph - Win32 Release
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "SG_SceneGraph.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "SG_SceneGraph.mak" CFG="SG_SceneGraph - Win32 Release"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "SG_SceneGraph - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "SG_SceneGraph - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "SG_SceneGraph - Win32 MT DLL Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "SG_SceneGraph - Win32 MT DLL Release" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "SG_SceneGraph - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\obj\windows\gameengine\scenegraph"
-# PROP Intermediate_Dir "..\..\..\obj\windows\gameengine\scenegraph"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../../../lib/windows/moto/include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "SG_SceneGraph - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\obj\windows\gameengine\scenegraph\debug"
-# PROP Intermediate_Dir "..\..\..\obj\windows\gameengine\scenegraph\debug"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GR /GX /Zi /Od /I "../../../../lib/windows/moto/include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /GZ /c
-# SUBTRACT CPP /Fr
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "SG_SceneGraph - Win32 MT DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "SG_SceneGraph___Win32_MT_DLL_Debug"
-# PROP BASE Intermediate_Dir "SG_SceneGraph___Win32_MT_DLL_Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\obj\windows\gameengine\scenegraph\mtdll_debug"
-# PROP Intermediate_Dir "..\..\..\obj\windows\gameengine\scenegraph\mtdll_debug"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /Gm /GX /ZI /Od /I "../../../../../lib/windows/moto/include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /GZ /c
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "../../../../lib/windows/moto/include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\..\..\..\obj\windows\gameengine\scenegraph\debug\SG_SceneGraph.lib"
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "SG_SceneGraph - Win32 MT DLL Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "SG_SceneGraph___Win32_MT_DLL_Release"
-# PROP BASE Intermediate_Dir "SG_SceneGraph___Win32_MT_DLL_Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\obj\windows\gameengine\scenegraph\mtdll"
-# PROP Intermediate_Dir "..\..\..\obj\windows\gameengine\scenegraph\mtdll"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /GX /O2 /I "../../../../../lib/windows/moto/include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
-# ADD CPP /nologo /MD /GX /O2 /I "../../../../lib/windows/moto/include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\..\..\..\obj\windows\gameengine\scenegraph\SG_SceneGraph.lib"
-# ADD LIB32 /nologo
-
-!ENDIF 
-
-# Begin Target
-
-# Name "SG_SceneGraph - Win32 Release"
-# Name "SG_SceneGraph - Win32 Debug"
-# Name "SG_SceneGraph - Win32 MT DLL Debug"
-# Name "SG_SceneGraph - Win32 MT DLL Release"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\SceneGraph\SG_BBox.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\SceneGraph\SG_Controller.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\SceneGraph\SG_IObject.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\SceneGraph\SG_Node.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\SceneGraph\SG_Spatial.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\SceneGraph\SG_Tree.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\SceneGraph\SG_BBox.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\SceneGraph\SG_Controller.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\SceneGraph\SG_IObject.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\SceneGraph\SG_Node.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\SceneGraph\SG_ParentRelation.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\SceneGraph\SG_Spatial.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\SceneGraph\SG_Tree.h
-# End Source File
-# End Group
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="SG_SceneGraph" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=SG_SceneGraph - Win32 Release
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "SG_SceneGraph.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "SG_SceneGraph.mak" CFG="SG_SceneGraph - Win32 Release"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "SG_SceneGraph - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "SG_SceneGraph - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "SG_SceneGraph - Win32 MT DLL Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "SG_SceneGraph - Win32 MT DLL Release" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "SG_SceneGraph - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\..\obj\windows\gameengine\scenegraph"
+# PROP Intermediate_Dir "..\..\..\obj\windows\gameengine\scenegraph"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../../../../lib/windows/moto/include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "SG_SceneGraph - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\..\obj\windows\gameengine\scenegraph\debug"
+# PROP Intermediate_Dir "..\..\..\obj\windows\gameengine\scenegraph\debug"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GR /GX /Zi /Od /I "../../../../lib/windows/moto/include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /GZ /c
+# SUBTRACT CPP /Fr
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "SG_SceneGraph - Win32 MT DLL Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "SG_SceneGraph___Win32_MT_DLL_Debug"
+# PROP BASE Intermediate_Dir "SG_SceneGraph___Win32_MT_DLL_Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\..\obj\windows\gameengine\scenegraph\mtdll_debug"
+# PROP Intermediate_Dir "..\..\..\obj\windows\gameengine\scenegraph\mtdll_debug"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /Gm /GX /ZI /Od /I "../../../../../lib/windows/moto/include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /GZ /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "../../../../lib/windows/moto/include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\..\..\..\obj\windows\gameengine\scenegraph\debug\SG_SceneGraph.lib"
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "SG_SceneGraph - Win32 MT DLL Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "SG_SceneGraph___Win32_MT_DLL_Release"
+# PROP BASE Intermediate_Dir "SG_SceneGraph___Win32_MT_DLL_Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\..\obj\windows\gameengine\scenegraph\mtdll"
+# PROP Intermediate_Dir "..\..\..\obj\windows\gameengine\scenegraph\mtdll"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /GX /O2 /I "../../../../../lib/windows/moto/include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
+# ADD CPP /nologo /MD /GX /O2 /I "../../../../lib/windows/moto/include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\..\..\..\obj\windows\gameengine\scenegraph\SG_SceneGraph.lib"
+# ADD LIB32 /nologo
+
+!ENDIF 
+
+# Begin Target
+
+# Name "SG_SceneGraph - Win32 Release"
+# Name "SG_SceneGraph - Win32 Debug"
+# Name "SG_SceneGraph - Win32 MT DLL Debug"
+# Name "SG_SceneGraph - Win32 MT DLL Release"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\SceneGraph\SG_BBox.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\SceneGraph\SG_Controller.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\SceneGraph\SG_IObject.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\SceneGraph\SG_Node.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\SceneGraph\SG_Spatial.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\SceneGraph\SG_Tree.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\SceneGraph\SG_BBox.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\SceneGraph\SG_Controller.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\SceneGraph\SG_IObject.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\SceneGraph\SG_Node.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\SceneGraph\SG_ParentRelation.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\SceneGraph\SG_Spatial.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\SceneGraph\SG_Tree.h
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/projectfiles/kernel/gen_messaging/gen_messaging.dsp b/projectfiles/kernel/gen_messaging/gen_messaging.dsp
index 578f897112260b121d1719bf0f1f8f90ef6e92fe..8aebbedecdef74ec8263b0cb6d1acfb3a38215bd 100644
--- a/projectfiles/kernel/gen_messaging/gen_messaging.dsp
+++ b/projectfiles/kernel/gen_messaging/gen_messaging.dsp
@@ -1,155 +1,155 @@
-# Microsoft Developer Studio Project File - Name="gen_messaging" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=gen_messaging - Win32 Release
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "gen_messaging.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "gen_messaging.mak" CFG="gen_messaging - Win32 Release"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "gen_messaging - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "gen_messaging - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "gen_messaging - Win32 MT DLL Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "gen_messaging - Win32 MT DLL Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "gen_messaging - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\obj\windows\kernel\gen_messaging"
-# PROP Intermediate_Dir "..\..\..\obj\windows\kernel\gen_messaging"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\..\source\kernel\gen_messaging" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "gen_messaging - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\obj\windows\kernel\gen_messaging\debug"
-# PROP Intermediate_Dir "..\..\..\obj\windows\kernel\gen_messaging\debug"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\..\..\source\kernel\gen_messaging" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# SUBTRACT CPP /Fr
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "gen_messaging - Win32 MT DLL Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "gen_messaging___Win32_MT_DLL_Release"
-# PROP BASE Intermediate_Dir "gen_messaging___Win32_MT_DLL_Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\obj\windows\kernel\gen_messaging\mtdll"
-# PROP Intermediate_Dir "..\..\..\obj\windows\kernel\gen_messaging\mtdll"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /GX /O2 /I "..\..\..\source\kernel\gen_messaging" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\source\kernel\gen_messaging" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "gen_messaging - Win32 MT DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "gen_messaging___Win32_MT_DLL_Debug"
-# PROP BASE Intermediate_Dir "gen_messaging___Win32_MT_DLL_Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\obj\windows\kernel\gen_messaging\mtdll_debug"
-# PROP Intermediate_Dir "..\..\..\obj\windows\kernel\gen_messaging\mtdll_debug"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\source\kernel\gen_messaging" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\source\kernel\gen_messaging" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ENDIF 
-
-# Begin Target
-
-# Name "gen_messaging - Win32 Release"
-# Name "gen_messaging - Win32 Debug"
-# Name "gen_messaging - Win32 MT DLL Release"
-# Name "gen_messaging - Win32 MT DLL Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\..\source\kernel\gen_messaging\intern\messaging.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\..\..\source\kernel\gen_messaging\GEN_messaging.h
-# End Source File
-# End Group
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="gen_messaging" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=gen_messaging - Win32 Release
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "gen_messaging.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "gen_messaging.mak" CFG="gen_messaging - Win32 Release"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "gen_messaging - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "gen_messaging - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "gen_messaging - Win32 MT DLL Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "gen_messaging - Win32 MT DLL Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "gen_messaging - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\..\obj\windows\kernel\gen_messaging"
+# PROP Intermediate_Dir "..\..\..\obj\windows\kernel\gen_messaging"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\..\source\kernel\gen_messaging" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "gen_messaging - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\..\obj\windows\kernel\gen_messaging\debug"
+# PROP Intermediate_Dir "..\..\..\obj\windows\kernel\gen_messaging\debug"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\..\..\source\kernel\gen_messaging" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# SUBTRACT CPP /Fr
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "gen_messaging - Win32 MT DLL Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "gen_messaging___Win32_MT_DLL_Release"
+# PROP BASE Intermediate_Dir "gen_messaging___Win32_MT_DLL_Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\..\obj\windows\kernel\gen_messaging\mtdll"
+# PROP Intermediate_Dir "..\..\..\obj\windows\kernel\gen_messaging\mtdll"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /W3 /GX /O2 /I "..\..\..\source\kernel\gen_messaging" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\source\kernel\gen_messaging" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "gen_messaging - Win32 MT DLL Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "gen_messaging___Win32_MT_DLL_Debug"
+# PROP BASE Intermediate_Dir "gen_messaging___Win32_MT_DLL_Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\..\obj\windows\kernel\gen_messaging\mtdll_debug"
+# PROP Intermediate_Dir "..\..\..\obj\windows\kernel\gen_messaging\mtdll_debug"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\source\kernel\gen_messaging" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\source\kernel\gen_messaging" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ENDIF 
+
+# Begin Target
+
+# Name "gen_messaging - Win32 Release"
+# Name "gen_messaging - Win32 Debug"
+# Name "gen_messaging - Win32 MT DLL Release"
+# Name "gen_messaging - Win32 MT DLL Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\..\..\source\kernel\gen_messaging\intern\messaging.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=..\..\..\source\kernel\gen_messaging\GEN_messaging.h
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/projectfiles/kernel/system/SYS_system.dsp b/projectfiles/kernel/system/SYS_system.dsp
index b424839e4ba55653edb7ccbec5ac22b323568152..c5b66202f9c4c53c32a410754c0c63d2962162d6 100644
--- a/projectfiles/kernel/system/SYS_system.dsp
+++ b/projectfiles/kernel/system/SYS_system.dsp
@@ -1,183 +1,183 @@
-# Microsoft Developer Studio Project File - Name="SYS_system" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=SYS_system - Win32 Release
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "SYS_system.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "SYS_system.mak" CFG="SYS_system - Win32 Release"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "SYS_system - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "SYS_system - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "SYS_system - Win32 MT DLL Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "SYS_system - Win32 MT DLL Release" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "SYS_system - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\obj\windows\gameengine\kernel\gen_system"
-# PROP Intermediate_Dir "..\..\..\obj\windows\gameengine\kernel\gen_system"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\..\..\lib\windows\string\include" /I "../../../../../lib/windows/moto/include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "SYS_system - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\obj\windows\gameengine\kernel\gen_system\debug"
-# PROP Intermediate_Dir "..\..\..\obj\windows\gameengine\kernel\gen_system\debug"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\lib\windows\string\include" /I "../../../../../lib/windows/moto/include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /GZ /c
-# SUBTRACT CPP /Fr
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "SYS_system - Win32 MT DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "SYS_system___Win32_MT_DLL_Debug"
-# PROP BASE Intermediate_Dir "SYS_system___Win32_MT_DLL_Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\obj\windows\gameengine\kernel\gen_system\mtdll_debug"
-# PROP Intermediate_Dir "..\..\..\obj\windows\gameengine\kernel\gen_system\mtdll_debug"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /MDd /Gm /GX /ZI /Od /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /GZ /c
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "..\..\..\..\lib\windows\string\include" /I "../../../../../lib/windows/moto/include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\..\..\..\obj\windows\gameengine\kernel\gen_system\debug\SYS_system.lib"
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "SYS_system - Win32 MT DLL Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "SYS_system___Win32_MT_DLL_Release"
-# PROP BASE Intermediate_Dir "SYS_system___Win32_MT_DLL_Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\obj\windows\gameengine\kernel\gen_system\mtdll"
-# PROP Intermediate_Dir "..\..\..\obj\windows\gameengine\kernel\gen_system\mtdll"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /GX /O2 /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
-# ADD CPP /nologo /MD /GX /O2 /I "..\..\..\..\lib\windows\string\include" /I "../../../../../lib/windows/moto/include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\..\..\..\obj\windows\gameengine\kernel\gen_system\SYS_system.lib"
-# ADD LIB32 /nologo
-
-!ENDIF 
-
-# Begin Target
-
-# Name "SYS_system - Win32 Release"
-# Name "SYS_system - Win32 Debug"
-# Name "SYS_system - Win32 MT DLL Debug"
-# Name "SYS_system - Win32 MT DLL Release"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\..\source\kernel\gen_system\GEN_HashedPtr.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\kernel\gen_system\SYS_SingletonSystem.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\kernel\gen_system\SYS_System.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\..\..\source\kernel\gen_system\GEN_DataCache.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\kernel\gen_system\GEN_HashedPtr.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\kernel\gen_system\GEN_Map.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\kernel\gen_system\GEN_SmartPtr.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\kernel\gen_system\SYS_SingletonSystem.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\kernel\gen_system\SYS_System.h
-# End Source File
-# End Group
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="SYS_system" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=SYS_system - Win32 Release
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "SYS_system.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "SYS_system.mak" CFG="SYS_system - Win32 Release"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "SYS_system - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "SYS_system - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "SYS_system - Win32 MT DLL Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "SYS_system - Win32 MT DLL Release" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "SYS_system - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\..\obj\windows\gameengine\kernel\gen_system"
+# PROP Intermediate_Dir "..\..\..\obj\windows\gameengine\kernel\gen_system"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\..\..\lib\windows\string\include" /I "../../../../../lib/windows/moto/include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "SYS_system - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\..\obj\windows\gameengine\kernel\gen_system\debug"
+# PROP Intermediate_Dir "..\..\..\obj\windows\gameengine\kernel\gen_system\debug"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\lib\windows\string\include" /I "../../../../../lib/windows/moto/include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /GZ /c
+# SUBTRACT CPP /Fr
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "SYS_system - Win32 MT DLL Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "SYS_system___Win32_MT_DLL_Debug"
+# PROP BASE Intermediate_Dir "SYS_system___Win32_MT_DLL_Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\..\obj\windows\gameengine\kernel\gen_system\mtdll_debug"
+# PROP Intermediate_Dir "..\..\..\obj\windows\gameengine\kernel\gen_system\mtdll_debug"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /MDd /Gm /GX /ZI /Od /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /GZ /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "..\..\..\..\lib\windows\string\include" /I "../../../../../lib/windows/moto/include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\..\..\..\obj\windows\gameengine\kernel\gen_system\debug\SYS_system.lib"
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "SYS_system - Win32 MT DLL Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "SYS_system___Win32_MT_DLL_Release"
+# PROP BASE Intermediate_Dir "SYS_system___Win32_MT_DLL_Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\..\obj\windows\gameengine\kernel\gen_system\mtdll"
+# PROP Intermediate_Dir "..\..\..\obj\windows\gameengine\kernel\gen_system\mtdll"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /GX /O2 /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
+# ADD CPP /nologo /MD /GX /O2 /I "..\..\..\..\lib\windows\string\include" /I "../../../../../lib/windows/moto/include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\..\..\..\obj\windows\gameengine\kernel\gen_system\SYS_system.lib"
+# ADD LIB32 /nologo
+
+!ENDIF 
+
+# Begin Target
+
+# Name "SYS_system - Win32 Release"
+# Name "SYS_system - Win32 Debug"
+# Name "SYS_system - Win32 MT DLL Debug"
+# Name "SYS_system - Win32 MT DLL Release"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\..\..\source\kernel\gen_system\GEN_HashedPtr.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\kernel\gen_system\SYS_SingletonSystem.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\kernel\gen_system\SYS_System.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=..\..\..\source\kernel\gen_system\GEN_DataCache.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\kernel\gen_system\GEN_HashedPtr.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\kernel\gen_system\GEN_Map.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\kernel\gen_system\GEN_SmartPtr.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\kernel\gen_system\SYS_SingletonSystem.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\kernel\gen_system\SYS_System.h
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/projectfiles/sumo/fuzzics/SM_fuzzics.dsp b/projectfiles/sumo/fuzzics/SM_fuzzics.dsp
index c415810d2c9b542546b3ee4c39282fa051fa0cdb..8804fdcb79683f4c131f7741b83c1bcb582492df 100644
--- a/projectfiles/sumo/fuzzics/SM_fuzzics.dsp
+++ b/projectfiles/sumo/fuzzics/SM_fuzzics.dsp
@@ -1,216 +1,216 @@
-# Microsoft Developer Studio Project File - Name="SM_fuzzics" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=SM_fuzzics - Win32 Profile
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "SM_fuzzics.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "SM_fuzzics.mak" CFG="SM_fuzzics - Win32 Profile"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "SM_fuzzics - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "SM_fuzzics - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "SM_fuzzics - Win32 MT DLL Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "SM_fuzzics - Win32 MT DLL Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "SM_fuzzics - Win32 Profile" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "SM_fuzzics - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\obj\windows\sumo\fuzzics"
-# PROP Intermediate_Dir "..\..\..\obj\windows\sumo\fuzzics"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "..\..\..\source\gameengine\physics\sumo\Fuzzics\include" /I "../../../../lib/windows/moto/include" /I "../../../extern/solid" /I "..\..\..\source\sumo\include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "SM_fuzzics - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\obj\windows\sumo\fuzzics\debug"
-# PROP Intermediate_Dir "..\..\..\obj\windows\sumo\fuzzics\debug"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GR /GX /Zi /Od /I "..\..\..\source\gameengine\physics\sumo\Fuzzics\include" /I "../../../../lib/windows/moto/include" /I "../../../extern/solid" /I "..\..\..\source\sumo\include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "SM_fuzzics - Win32 MT DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "SM_fuzzics___Win32_MT_DLL_Debug"
-# PROP BASE Intermediate_Dir "SM_fuzzics___Win32_MT_DLL_Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\..\obj\windows\sumo\fuzzics\mtdll_debug"
-# PROP Intermediate_Dir "..\..\..\..\obj\windows\sumo\fuzzics\mtdll_debug"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /Gm /GX /ZI /Od /I "..\..\..\source\sumo\Fuzzics\include" /I "../../../../../lib/windows/moto/include" /I "..\..\..\source\sumo\include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /GZ /c
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "..\..\..\source\sumo\Fuzzics\include" /I "../../../../lib/windows/moto/include" /I "..\..\..\source\sumo\include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\..\..\..\obj\windows\sumo\fuzzics\debug\SM_fuzzics.lib"
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "SM_fuzzics - Win32 MT DLL Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "SM_fuzzics___Win32_MT_DLL_Release"
-# PROP BASE Intermediate_Dir "SM_fuzzics___Win32_MT_DLL_Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\..\obj\windows\sumo\fuzzics\mtdll"
-# PROP Intermediate_Dir "..\..\..\..\obj\windows\sumo\fuzzics\mtdll"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /GX /O2 /I "..\..\..\source\sumo\Fuzzics\include" /I "../../../../../lib/windows/moto/include" /I "..\..\..\source\sumo\include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
-# ADD CPP /nologo /MD /GX /O2 /I "..\..\..\source\sumo\Fuzzics\include" /I "../../../../lib/windows/moto/include" /I "..\..\..\source\sumo\include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\..\..\..\obj\windows\sumo\fuzzics\SM_fuzzics.lib"
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "SM_fuzzics - Win32 Profile"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "SM_fuzzics___Win32_Profile"
-# PROP BASE Intermediate_Dir "SM_fuzzics___Win32_Profile"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "SM_fuzzics___Win32_Profile"
-# PROP Intermediate_Dir "SM_fuzzics___Win32_Profile"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\source\sumo\Fuzzics\include" /I "../../../../../lib/windows/moto/include" /I "..\..\..\source\sumo\include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /Zi /O2 /I "..\..\..\source\sumo\Fuzzics\include" /I "../../../../lib/windows/moto/include" /I "..\..\..\source\sumo\include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\..\..\obj\windows\sumo\fuzzics\debug\SM_fuzzics.lib"
-# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\sumo\fuzzics\profile\SM_fuzzics.lib"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "SM_fuzzics - Win32 Release"
-# Name "SM_fuzzics - Win32 Debug"
-# Name "SM_fuzzics - Win32 MT DLL Debug"
-# Name "SM_fuzzics - Win32 MT DLL Release"
-# Name "SM_fuzzics - Win32 Profile"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Physics\Sumo\Fuzzics\src\SM_FhObject.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Physics\Sumo\Fuzzics\src\SM_Object.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Physics\Sumo\Fuzzics\src\SM_Scene.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Physics\Sumo\Fuzzics\include\SM_Callback.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Physics\Sumo\Fuzzics\include\SM_ClientObjectInfo.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Physics\Sumo\Fuzzics\include\SM_Debug.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Physics\Sumo\Fuzzics\include\SM_FhObject.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Physics\Sumo\Fuzzics\include\SM_MotionState.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Physics\Sumo\Fuzzics\include\SM_Object.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Physics\Sumo\Fuzzics\include\SM_Props.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\gameengine\Physics\Sumo\Fuzzics\include\SM_Scene.h
-# End Source File
-# End Group
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="SM_fuzzics" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=SM_fuzzics - Win32 Profile
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "SM_fuzzics.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "SM_fuzzics.mak" CFG="SM_fuzzics - Win32 Profile"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "SM_fuzzics - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "SM_fuzzics - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "SM_fuzzics - Win32 MT DLL Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "SM_fuzzics - Win32 MT DLL Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "SM_fuzzics - Win32 Profile" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "SM_fuzzics - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\..\obj\windows\sumo\fuzzics"
+# PROP Intermediate_Dir "..\..\..\obj\windows\sumo\fuzzics"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "..\..\..\source\gameengine\physics\sumo\Fuzzics\include" /I "../../../../lib/windows/moto/include" /I "../../../extern/solid" /I "..\..\..\source\sumo\include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "SM_fuzzics - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\..\obj\windows\sumo\fuzzics\debug"
+# PROP Intermediate_Dir "..\..\..\obj\windows\sumo\fuzzics\debug"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GR /GX /Zi /Od /I "..\..\..\source\gameengine\physics\sumo\Fuzzics\include" /I "../../../../lib/windows/moto/include" /I "../../../extern/solid" /I "..\..\..\source\sumo\include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "SM_fuzzics - Win32 MT DLL Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "SM_fuzzics___Win32_MT_DLL_Debug"
+# PROP BASE Intermediate_Dir "SM_fuzzics___Win32_MT_DLL_Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\..\..\obj\windows\sumo\fuzzics\mtdll_debug"
+# PROP Intermediate_Dir "..\..\..\..\obj\windows\sumo\fuzzics\mtdll_debug"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /Gm /GX /ZI /Od /I "..\..\..\source\sumo\Fuzzics\include" /I "../../../../../lib/windows/moto/include" /I "..\..\..\source\sumo\include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /GZ /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "..\..\..\source\sumo\Fuzzics\include" /I "../../../../lib/windows/moto/include" /I "..\..\..\source\sumo\include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\..\..\..\obj\windows\sumo\fuzzics\debug\SM_fuzzics.lib"
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "SM_fuzzics - Win32 MT DLL Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "SM_fuzzics___Win32_MT_DLL_Release"
+# PROP BASE Intermediate_Dir "SM_fuzzics___Win32_MT_DLL_Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\..\..\obj\windows\sumo\fuzzics\mtdll"
+# PROP Intermediate_Dir "..\..\..\..\obj\windows\sumo\fuzzics\mtdll"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /GX /O2 /I "..\..\..\source\sumo\Fuzzics\include" /I "../../../../../lib/windows/moto/include" /I "..\..\..\source\sumo\include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
+# ADD CPP /nologo /MD /GX /O2 /I "..\..\..\source\sumo\Fuzzics\include" /I "../../../../lib/windows/moto/include" /I "..\..\..\source\sumo\include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\..\..\..\obj\windows\sumo\fuzzics\SM_fuzzics.lib"
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "SM_fuzzics - Win32 Profile"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "SM_fuzzics___Win32_Profile"
+# PROP BASE Intermediate_Dir "SM_fuzzics___Win32_Profile"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "SM_fuzzics___Win32_Profile"
+# PROP Intermediate_Dir "SM_fuzzics___Win32_Profile"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\source\sumo\Fuzzics\include" /I "../../../../../lib/windows/moto/include" /I "..\..\..\source\sumo\include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GX /Zi /O2 /I "..\..\..\source\sumo\Fuzzics\include" /I "../../../../lib/windows/moto/include" /I "..\..\..\source\sumo\include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\..\..\obj\windows\sumo\fuzzics\debug\SM_fuzzics.lib"
+# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\sumo\fuzzics\profile\SM_fuzzics.lib"
+
+!ENDIF 
+
+# Begin Target
+
+# Name "SM_fuzzics - Win32 Release"
+# Name "SM_fuzzics - Win32 Debug"
+# Name "SM_fuzzics - Win32 MT DLL Debug"
+# Name "SM_fuzzics - Win32 MT DLL Release"
+# Name "SM_fuzzics - Win32 Profile"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Physics\Sumo\Fuzzics\src\SM_FhObject.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Physics\Sumo\Fuzzics\src\SM_Object.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Physics\Sumo\Fuzzics\src\SM_Scene.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Physics\Sumo\Fuzzics\include\SM_Callback.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Physics\Sumo\Fuzzics\include\SM_ClientObjectInfo.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Physics\Sumo\Fuzzics\include\SM_Debug.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Physics\Sumo\Fuzzics\include\SM_FhObject.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Physics\Sumo\Fuzzics\include\SM_MotionState.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Physics\Sumo\Fuzzics\include\SM_Object.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Physics\Sumo\Fuzzics\include\SM_Props.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\gameengine\Physics\Sumo\Fuzzics\include\SM_Scene.h
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/projectfiles/sumo/moto/SM_moto.dsp b/projectfiles/sumo/moto/SM_moto.dsp
index 3fd627ce60dce85885f5cd975506e4f3fe80f0b7..0a27fad5a0d815599abdec01c346b5fdcdc31881 100644
--- a/projectfiles/sumo/moto/SM_moto.dsp
+++ b/projectfiles/sumo/moto/SM_moto.dsp
@@ -1,332 +1,332 @@
-# Microsoft Developer Studio Project File - Name="SM_moto" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=SM_moto - Win32 Profile
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "SM_moto.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "SM_moto.mak" CFG="SM_moto - Win32 Profile"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "SM_moto - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "SM_moto - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "SM_moto - Win32 MT DLL Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "SM_moto - Win32 MT DLL Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "SM_moto - Win32 Profile" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "SM_moto - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "..\..\..\..\obj\windows\sumo\moto"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\..\lib\windows\moto\include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\sumo\moto\SM_moto.lib"
-
-!ELSEIF  "$(CFG)" == "SM_moto - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "..\..\..\..\obj\windows\sumo\moto\debug"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "..\..\..\source\sumo\MoTo\include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /FR /YX /J /FD /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\sumo\moto\debug\SM_moto.lib"
-
-!ELSEIF  "$(CFG)" == "SM_moto - Win32 MT DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "SM_moto___Win32_MT_DLL_Debug"
-# PROP BASE Intermediate_Dir "SM_moto___Win32_MT_DLL_Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\..\obj\windows\sumo\moto\mtdll_debug"
-# PROP Intermediate_Dir "..\..\..\..\obj\windows\sumo\moto\mtdll_debug"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /Gm /GX /ZI /Od /I "..\..\..\source\sumo\MoTo\include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /GZ /c
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "..\..\..\source\sumo\MoTo\include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /FR /YX /J /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\..\..\..\obj\windows\sumo\moto\debug\SM_moto.lib"
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "SM_moto - Win32 MT DLL Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "SM_moto___Win32_MT_DLL_Release"
-# PROP BASE Intermediate_Dir "SM_moto___Win32_MT_DLL_Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\..\obj\windows\sumo\moto\mtdll"
-# PROP Intermediate_Dir "..\..\..\..\obj\windows\sumo\moto\mtdll"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /GX /O2 /I "..\..\..\source\sumo\MoTo\include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
-# ADD CPP /nologo /MD /GX /O2 /I "..\..\..\source\sumo\MoTo\include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\..\..\..\obj\windows\sumo\moto\SM_moto.lib"
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "SM_moto - Win32 Profile"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "SM_moto___Win32_Profile"
-# PROP BASE Intermediate_Dir "SM_moto___Win32_Profile"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "SM_moto___Win32_Profile"
-# PROP Intermediate_Dir "SM_moto___Win32_Profile"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /O2 /I "..\..\..\source\sumo\MoTo\include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
-# ADD CPP /nologo /W3 /Gm /GX /Zi /O2 /I "..\..\..\source\sumo\MoTo\include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\..\..\obj\windows\sumo\moto\debug\SM_moto.lib"
-# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\sumo\moto\profile\SM_moto.lib"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "SM_moto - Win32 Release"
-# Name "SM_moto - Win32 Debug"
-# Name "SM_moto - Win32 MT DLL Debug"
-# Name "SM_moto - Win32 MT DLL Release"
-# Name "SM_moto - Win32 Profile"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\..\source\sumo\MoTo\src\MT_CmMatrix4x4.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\sumo\MoTo\src\MT_Matrix3x3.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\sumo\MoTo\src\MT_Matrix4x4.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\sumo\MoTo\src\MT_Point3.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\sumo\MoTo\src\MT_Quaternion.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\sumo\MoTo\src\MT_random.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\sumo\MoTo\src\MT_Transform.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\sumo\MoTo\src\MT_Vector2.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\sumo\MoTo\src\MT_Vector3.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\sumo\MoTo\src\MT_Vector4.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\..\..\source\sumo\MoTo\include\GEN_List.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\sumo\MoTo\include\GEN_Map.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\sumo\MoTo\include\MT_assert.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\sumo\MoTo\include\MT_CmMatrix4x4.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\sumo\MoTo\include\MT_Matrix3x3.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\sumo\MoTo\include\MT_Matrix3x3.inl
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\sumo\MoTo\include\MT_Matrix4x4.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\sumo\MoTo\include\MT_Matrix4x4.inl
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\sumo\MoTo\include\MT_MinMax.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\sumo\MoTo\include\MT_Optimize.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\sumo\MoTo\include\MT_Point2.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\sumo\MoTo\include\MT_Point2.inl
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\sumo\MoTo\include\MT_Point3.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\sumo\MoTo\include\MT_Point3.inl
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\sumo\MoTo\include\MT_Quaternion.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\sumo\MoTo\include\MT_Quaternion.inl
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\sumo\MoTo\include\MT_random.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\sumo\MoTo\include\MT_Scalar.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\sumo\MoTo\include\MT_Stream.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\sumo\MoTo\include\MT_Transform.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\sumo\MoTo\include\MT_Tuple2.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\sumo\MoTo\include\MT_Tuple3.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\sumo\MoTo\include\MT_Tuple4.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\sumo\MoTo\include\MT_Vector2.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\sumo\MoTo\include\MT_Vector2.inl
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\sumo\MoTo\include\MT_Vector3.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\sumo\MoTo\include\MT_Vector3.inl
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\sumo\MoTo\include\MT_Vector4.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\sumo\MoTo\include\MT_Vector4.inl
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\sumo\MoTo\include\NM_Scalar.h
-# End Source File
-# End Group
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="SM_moto" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=SM_moto - Win32 Profile
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "SM_moto.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "SM_moto.mak" CFG="SM_moto - Win32 Profile"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "SM_moto - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "SM_moto - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "SM_moto - Win32 MT DLL Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "SM_moto - Win32 MT DLL Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "SM_moto - Win32 Profile" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "SM_moto - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "..\..\..\..\obj\windows\sumo\moto"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\..\lib\windows\moto\include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\sumo\moto\SM_moto.lib"
+
+!ELSEIF  "$(CFG)" == "SM_moto - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "..\..\..\..\obj\windows\sumo\moto\debug"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "..\..\..\source\sumo\MoTo\include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /FR /YX /J /FD /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\sumo\moto\debug\SM_moto.lib"
+
+!ELSEIF  "$(CFG)" == "SM_moto - Win32 MT DLL Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "SM_moto___Win32_MT_DLL_Debug"
+# PROP BASE Intermediate_Dir "SM_moto___Win32_MT_DLL_Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\..\..\obj\windows\sumo\moto\mtdll_debug"
+# PROP Intermediate_Dir "..\..\..\..\obj\windows\sumo\moto\mtdll_debug"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /Gm /GX /ZI /Od /I "..\..\..\source\sumo\MoTo\include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /GZ /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "..\..\..\source\sumo\MoTo\include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /FR /YX /J /FD /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\..\..\..\obj\windows\sumo\moto\debug\SM_moto.lib"
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "SM_moto - Win32 MT DLL Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "SM_moto___Win32_MT_DLL_Release"
+# PROP BASE Intermediate_Dir "SM_moto___Win32_MT_DLL_Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\..\..\obj\windows\sumo\moto\mtdll"
+# PROP Intermediate_Dir "..\..\..\..\obj\windows\sumo\moto\mtdll"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /GX /O2 /I "..\..\..\source\sumo\MoTo\include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
+# ADD CPP /nologo /MD /GX /O2 /I "..\..\..\source\sumo\MoTo\include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\..\..\..\obj\windows\sumo\moto\SM_moto.lib"
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "SM_moto - Win32 Profile"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "SM_moto___Win32_Profile"
+# PROP BASE Intermediate_Dir "SM_moto___Win32_Profile"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "SM_moto___Win32_Profile"
+# PROP Intermediate_Dir "SM_moto___Win32_Profile"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /O2 /I "..\..\..\source\sumo\MoTo\include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
+# ADD CPP /nologo /W3 /Gm /GX /Zi /O2 /I "..\..\..\source\sumo\MoTo\include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\..\..\obj\windows\sumo\moto\debug\SM_moto.lib"
+# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\sumo\moto\profile\SM_moto.lib"
+
+!ENDIF 
+
+# Begin Target
+
+# Name "SM_moto - Win32 Release"
+# Name "SM_moto - Win32 Debug"
+# Name "SM_moto - Win32 MT DLL Debug"
+# Name "SM_moto - Win32 MT DLL Release"
+# Name "SM_moto - Win32 Profile"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\..\..\source\sumo\MoTo\src\MT_CmMatrix4x4.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\sumo\MoTo\src\MT_Matrix3x3.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\sumo\MoTo\src\MT_Matrix4x4.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\sumo\MoTo\src\MT_Point3.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\sumo\MoTo\src\MT_Quaternion.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\sumo\MoTo\src\MT_random.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\sumo\MoTo\src\MT_Transform.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\sumo\MoTo\src\MT_Vector2.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\sumo\MoTo\src\MT_Vector3.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\sumo\MoTo\src\MT_Vector4.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=..\..\..\source\sumo\MoTo\include\GEN_List.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\sumo\MoTo\include\GEN_Map.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\sumo\MoTo\include\MT_assert.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\sumo\MoTo\include\MT_CmMatrix4x4.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\sumo\MoTo\include\MT_Matrix3x3.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\sumo\MoTo\include\MT_Matrix3x3.inl
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\sumo\MoTo\include\MT_Matrix4x4.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\sumo\MoTo\include\MT_Matrix4x4.inl
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\sumo\MoTo\include\MT_MinMax.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\sumo\MoTo\include\MT_Optimize.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\sumo\MoTo\include\MT_Point2.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\sumo\MoTo\include\MT_Point2.inl
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\sumo\MoTo\include\MT_Point3.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\sumo\MoTo\include\MT_Point3.inl
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\sumo\MoTo\include\MT_Quaternion.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\sumo\MoTo\include\MT_Quaternion.inl
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\sumo\MoTo\include\MT_random.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\sumo\MoTo\include\MT_Scalar.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\sumo\MoTo\include\MT_Stream.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\sumo\MoTo\include\MT_Transform.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\sumo\MoTo\include\MT_Tuple2.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\sumo\MoTo\include\MT_Tuple3.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\sumo\MoTo\include\MT_Tuple4.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\sumo\MoTo\include\MT_Vector2.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\sumo\MoTo\include\MT_Vector2.inl
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\sumo\MoTo\include\MT_Vector3.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\sumo\MoTo\include\MT_Vector3.inl
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\sumo\MoTo\include\MT_Vector4.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\sumo\MoTo\include\MT_Vector4.inl
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\sumo\MoTo\include\NM_Scalar.h
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/projectfiles/sumo/solid/SM_solid.dsp b/projectfiles/sumo/solid/SM_solid.dsp
index dfaa85c35d8585c27ded88366bb255a486326716..221a72f67efa3a70cde250f4538832704e80d50a 100644
--- a/projectfiles/sumo/solid/SM_solid.dsp
+++ b/projectfiles/sumo/solid/SM_solid.dsp
@@ -1,340 +1,340 @@
-# Microsoft Developer Studio Project File - Name="SM_solid" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=SM_solid - Win32 Release
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "SM_solid.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "SM_solid.mak" CFG="SM_solid - Win32 Release"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "SM_solid - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "SM_solid - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "SM_solid - Win32 MT DLL Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "SM_solid - Win32 MT DLL Release" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "SM_solid - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\obj\windows\sumo\solid"
-# PROP Intermediate_Dir "..\..\..\obj\windows\sumo\solid"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\..\source\gameengine\physics\sumo\SOLID-3.0\include" /I "../../../../lib/windows/moto/include" /I "..\..\..\source\gameengine\physics\sumo\include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /J /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "SM_solid - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\obj\windows\sumo\solid\debug"
-# PROP Intermediate_Dir "..\..\..\obj\windows\sumo\solid\debug"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\..\..\source\gameengine\physics\sumo\SOLID-3.0\include" /I "../../../../lib/windows/moto/include" /I "..\..\..\source\gameengine\physics\sumo\include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /GZ /c
-# SUBTRACT CPP /Fr
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "SM_solid - Win32 MT DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "SM_solid___Win32_MT_DLL_Debug"
-# PROP BASE Intermediate_Dir "SM_solid___Win32_MT_DLL_Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\obj\windows\sumo\solid\mtdll_debug"
-# PROP Intermediate_Dir "..\..\..\obj\windows\sumo\solid\mtdll_debug"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /Gm /GX /ZI /Od /I "..\..\..\source\sumo\SOLID-3.0\include" /I "../../../../../lib/windows/moto/include" /I "..\..\..\source\sumo\include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /GZ /c
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "..\..\..\source\gameengine\physics\sumo\SOLID-3.0\include" /I "../../../../lib/windows/moto/include" /I "..\..\..\source\gameengine\physics\sumo\include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\..\..\..\obj\windows\sumo\solid\debug\SM_solid.lib"
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "SM_solid - Win32 MT DLL Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "SM_solid___Win32_MT_DLL_Release"
-# PROP BASE Intermediate_Dir "SM_solid___Win32_MT_DLL_Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\obj\windows\sumo\solid\mtdll"
-# PROP Intermediate_Dir "..\..\..\obj\windows\sumo\solid\mtdll"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /GX /O2 /I "..\..\..\source\sumo\SOLID-3.0\include" /I "../../../../../lib/windows/moto/include" /I "..\..\..\source\sumo\include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
-# ADD CPP /nologo /MD /GX /O2 /I "..\..\..\source\gameengine\physics\sumo\SOLID-3.0\include" /I "../../../../lib/windows/moto/include" /I "..\..\..\source\gameengine\physics\sumo\include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\..\..\..\obj\windows\sumo\solid\SM_solid.lib"
-# ADD LIB32 /nologo
-
-!ENDIF 
-
-# Begin Target
-
-# Name "SM_solid - Win32 Release"
-# Name "SM_solid - Win32 Debug"
-# Name "SM_solid - Win32 MT DLL Debug"
-# Name "SM_solid - Win32 MT DLL Release"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\src\BBoxTree.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\src\Box.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\src\Complex.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\src\Cone.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\src\Convex.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\src\Cylinder.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\src\DT_BP_C-api.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\src\DT_BP_Endpoint.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\src\DT_BP_Proxy.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\src\DT_BP_Scene.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\src\DT_C-api.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\src\DT_DoubleBase.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\src\DT_Encounter.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\src\DT_FloatBase.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\src\DT_LineSegment.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\src\DT_Object.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\src\DT_RespTable.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\src\DT_Scene.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\src\Polyhedron.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\src\Polytope.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\src\Sphere.cpp"
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\include\AlgoTable.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\include\BBoxTree.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\include\Box.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\include\Complex.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\include\Cone.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\include\Convex.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\include\Cylinder.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\include\DT_AABBox.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\include\DT_BBox.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\include\DT_BP_Endpoint.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\include\DT_BP_Proxy.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\include\DT_BP_Scene.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\include\DT_DoubleBase.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\include\DT_Encounter.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\include\DT_FloatBase.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\include\DT_LineSegment.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\include\DT_Object.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\include\DT_Response.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\include\DT_RespTable.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\include\DT_Scene.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\include\DT_VertexBase.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\include\DT_VertexBased.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\include\IndexArray.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\include\Polyhedron.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\include\Polytope.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\include\Shape.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\include\Sphere.h"
-# End Source File
-# End Group
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="SM_solid" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=SM_solid - Win32 Release
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "SM_solid.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "SM_solid.mak" CFG="SM_solid - Win32 Release"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "SM_solid - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "SM_solid - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "SM_solid - Win32 MT DLL Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "SM_solid - Win32 MT DLL Release" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "SM_solid - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\..\obj\windows\sumo\solid"
+# PROP Intermediate_Dir "..\..\..\obj\windows\sumo\solid"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\..\source\gameengine\physics\sumo\SOLID-3.0\include" /I "../../../../lib/windows/moto/include" /I "..\..\..\source\gameengine\physics\sumo\include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /J /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "SM_solid - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\..\obj\windows\sumo\solid\debug"
+# PROP Intermediate_Dir "..\..\..\obj\windows\sumo\solid\debug"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\..\..\source\gameengine\physics\sumo\SOLID-3.0\include" /I "../../../../lib/windows/moto/include" /I "..\..\..\source\gameengine\physics\sumo\include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /GZ /c
+# SUBTRACT CPP /Fr
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "SM_solid - Win32 MT DLL Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "SM_solid___Win32_MT_DLL_Debug"
+# PROP BASE Intermediate_Dir "SM_solid___Win32_MT_DLL_Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\..\obj\windows\sumo\solid\mtdll_debug"
+# PROP Intermediate_Dir "..\..\..\obj\windows\sumo\solid\mtdll_debug"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /Gm /GX /ZI /Od /I "..\..\..\source\sumo\SOLID-3.0\include" /I "../../../../../lib/windows/moto/include" /I "..\..\..\source\sumo\include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /GZ /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "..\..\..\source\gameengine\physics\sumo\SOLID-3.0\include" /I "../../../../lib/windows/moto/include" /I "..\..\..\source\gameengine\physics\sumo\include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\..\..\..\obj\windows\sumo\solid\debug\SM_solid.lib"
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "SM_solid - Win32 MT DLL Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "SM_solid___Win32_MT_DLL_Release"
+# PROP BASE Intermediate_Dir "SM_solid___Win32_MT_DLL_Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\..\obj\windows\sumo\solid\mtdll"
+# PROP Intermediate_Dir "..\..\..\obj\windows\sumo\solid\mtdll"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /GX /O2 /I "..\..\..\source\sumo\SOLID-3.0\include" /I "../../../../../lib/windows/moto/include" /I "..\..\..\source\sumo\include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
+# ADD CPP /nologo /MD /GX /O2 /I "..\..\..\source\gameengine\physics\sumo\SOLID-3.0\include" /I "../../../../lib/windows/moto/include" /I "..\..\..\source\gameengine\physics\sumo\include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\..\..\..\obj\windows\sumo\solid\SM_solid.lib"
+# ADD LIB32 /nologo
+
+!ENDIF 
+
+# Begin Target
+
+# Name "SM_solid - Win32 Release"
+# Name "SM_solid - Win32 Debug"
+# Name "SM_solid - Win32 MT DLL Debug"
+# Name "SM_solid - Win32 MT DLL Release"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\src\BBoxTree.cpp"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\src\Box.cpp"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\src\Complex.cpp"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\src\Cone.cpp"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\src\Convex.cpp"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\src\Cylinder.cpp"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\src\DT_BP_C-api.cpp"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\src\DT_BP_Endpoint.cpp"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\src\DT_BP_Proxy.cpp"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\src\DT_BP_Scene.cpp"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\src\DT_C-api.cpp"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\src\DT_DoubleBase.cpp"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\src\DT_Encounter.cpp"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\src\DT_FloatBase.cpp"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\src\DT_LineSegment.cpp"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\src\DT_Object.cpp"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\src\DT_RespTable.cpp"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\src\DT_Scene.cpp"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\src\Polyhedron.cpp"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\src\Polytope.cpp"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\src\Sphere.cpp"
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\include\AlgoTable.h"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\include\BBoxTree.h"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\include\Box.h"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\include\Complex.h"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\include\Cone.h"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\include\Convex.h"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\include\Cylinder.h"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\include\DT_AABBox.h"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\include\DT_BBox.h"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\include\DT_BP_Endpoint.h"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\include\DT_BP_Proxy.h"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\include\DT_BP_Scene.h"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\include\DT_DoubleBase.h"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\include\DT_Encounter.h"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\include\DT_FloatBase.h"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\include\DT_LineSegment.h"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\include\DT_Object.h"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\include\DT_Response.h"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\include\DT_RespTable.h"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\include\DT_Scene.h"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\include\DT_VertexBase.h"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\include\DT_VertexBased.h"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\include\IndexArray.h"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\include\Polyhedron.h"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\include\Polytope.h"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\include\Shape.h"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\include\Sphere.h"
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/projectfiles_vc7/sumo/moto/SM_moto.dsp b/projectfiles_vc7/sumo/moto/SM_moto.dsp
index 3fd627ce60dce85885f5cd975506e4f3fe80f0b7..0a27fad5a0d815599abdec01c346b5fdcdc31881 100644
--- a/projectfiles_vc7/sumo/moto/SM_moto.dsp
+++ b/projectfiles_vc7/sumo/moto/SM_moto.dsp
@@ -1,332 +1,332 @@
-# Microsoft Developer Studio Project File - Name="SM_moto" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=SM_moto - Win32 Profile
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "SM_moto.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "SM_moto.mak" CFG="SM_moto - Win32 Profile"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "SM_moto - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "SM_moto - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "SM_moto - Win32 MT DLL Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "SM_moto - Win32 MT DLL Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "SM_moto - Win32 Profile" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "SM_moto - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "..\..\..\..\obj\windows\sumo\moto"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\..\lib\windows\moto\include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\sumo\moto\SM_moto.lib"
-
-!ELSEIF  "$(CFG)" == "SM_moto - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "..\..\..\..\obj\windows\sumo\moto\debug"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "..\..\..\source\sumo\MoTo\include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /FR /YX /J /FD /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\sumo\moto\debug\SM_moto.lib"
-
-!ELSEIF  "$(CFG)" == "SM_moto - Win32 MT DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "SM_moto___Win32_MT_DLL_Debug"
-# PROP BASE Intermediate_Dir "SM_moto___Win32_MT_DLL_Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\..\obj\windows\sumo\moto\mtdll_debug"
-# PROP Intermediate_Dir "..\..\..\..\obj\windows\sumo\moto\mtdll_debug"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /Gm /GX /ZI /Od /I "..\..\..\source\sumo\MoTo\include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /GZ /c
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "..\..\..\source\sumo\MoTo\include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /FR /YX /J /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\..\..\..\obj\windows\sumo\moto\debug\SM_moto.lib"
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "SM_moto - Win32 MT DLL Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "SM_moto___Win32_MT_DLL_Release"
-# PROP BASE Intermediate_Dir "SM_moto___Win32_MT_DLL_Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\..\obj\windows\sumo\moto\mtdll"
-# PROP Intermediate_Dir "..\..\..\..\obj\windows\sumo\moto\mtdll"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /GX /O2 /I "..\..\..\source\sumo\MoTo\include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
-# ADD CPP /nologo /MD /GX /O2 /I "..\..\..\source\sumo\MoTo\include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\..\..\..\obj\windows\sumo\moto\SM_moto.lib"
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "SM_moto - Win32 Profile"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "SM_moto___Win32_Profile"
-# PROP BASE Intermediate_Dir "SM_moto___Win32_Profile"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "SM_moto___Win32_Profile"
-# PROP Intermediate_Dir "SM_moto___Win32_Profile"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /O2 /I "..\..\..\source\sumo\MoTo\include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
-# ADD CPP /nologo /W3 /Gm /GX /Zi /O2 /I "..\..\..\source\sumo\MoTo\include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\..\..\obj\windows\sumo\moto\debug\SM_moto.lib"
-# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\sumo\moto\profile\SM_moto.lib"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "SM_moto - Win32 Release"
-# Name "SM_moto - Win32 Debug"
-# Name "SM_moto - Win32 MT DLL Debug"
-# Name "SM_moto - Win32 MT DLL Release"
-# Name "SM_moto - Win32 Profile"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\..\source\sumo\MoTo\src\MT_CmMatrix4x4.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\sumo\MoTo\src\MT_Matrix3x3.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\sumo\MoTo\src\MT_Matrix4x4.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\sumo\MoTo\src\MT_Point3.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\sumo\MoTo\src\MT_Quaternion.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\sumo\MoTo\src\MT_random.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\sumo\MoTo\src\MT_Transform.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\sumo\MoTo\src\MT_Vector2.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\sumo\MoTo\src\MT_Vector3.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\sumo\MoTo\src\MT_Vector4.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\..\..\source\sumo\MoTo\include\GEN_List.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\sumo\MoTo\include\GEN_Map.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\sumo\MoTo\include\MT_assert.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\sumo\MoTo\include\MT_CmMatrix4x4.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\sumo\MoTo\include\MT_Matrix3x3.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\sumo\MoTo\include\MT_Matrix3x3.inl
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\sumo\MoTo\include\MT_Matrix4x4.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\sumo\MoTo\include\MT_Matrix4x4.inl
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\sumo\MoTo\include\MT_MinMax.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\sumo\MoTo\include\MT_Optimize.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\sumo\MoTo\include\MT_Point2.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\sumo\MoTo\include\MT_Point2.inl
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\sumo\MoTo\include\MT_Point3.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\sumo\MoTo\include\MT_Point3.inl
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\sumo\MoTo\include\MT_Quaternion.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\sumo\MoTo\include\MT_Quaternion.inl
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\sumo\MoTo\include\MT_random.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\sumo\MoTo\include\MT_Scalar.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\sumo\MoTo\include\MT_Stream.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\sumo\MoTo\include\MT_Transform.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\sumo\MoTo\include\MT_Tuple2.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\sumo\MoTo\include\MT_Tuple3.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\sumo\MoTo\include\MT_Tuple4.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\sumo\MoTo\include\MT_Vector2.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\sumo\MoTo\include\MT_Vector2.inl
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\sumo\MoTo\include\MT_Vector3.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\sumo\MoTo\include\MT_Vector3.inl
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\sumo\MoTo\include\MT_Vector4.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\sumo\MoTo\include\MT_Vector4.inl
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\sumo\MoTo\include\NM_Scalar.h
-# End Source File
-# End Group
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="SM_moto" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=SM_moto - Win32 Profile
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "SM_moto.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "SM_moto.mak" CFG="SM_moto - Win32 Profile"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "SM_moto - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "SM_moto - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "SM_moto - Win32 MT DLL Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "SM_moto - Win32 MT DLL Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "SM_moto - Win32 Profile" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "SM_moto - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "..\..\..\..\obj\windows\sumo\moto"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\..\lib\windows\moto\include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\sumo\moto\SM_moto.lib"
+
+!ELSEIF  "$(CFG)" == "SM_moto - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "..\..\..\..\obj\windows\sumo\moto\debug"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "..\..\..\source\sumo\MoTo\include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /FR /YX /J /FD /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\sumo\moto\debug\SM_moto.lib"
+
+!ELSEIF  "$(CFG)" == "SM_moto - Win32 MT DLL Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "SM_moto___Win32_MT_DLL_Debug"
+# PROP BASE Intermediate_Dir "SM_moto___Win32_MT_DLL_Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\..\..\obj\windows\sumo\moto\mtdll_debug"
+# PROP Intermediate_Dir "..\..\..\..\obj\windows\sumo\moto\mtdll_debug"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /Gm /GX /ZI /Od /I "..\..\..\source\sumo\MoTo\include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /GZ /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "..\..\..\source\sumo\MoTo\include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /FR /YX /J /FD /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\..\..\..\obj\windows\sumo\moto\debug\SM_moto.lib"
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "SM_moto - Win32 MT DLL Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "SM_moto___Win32_MT_DLL_Release"
+# PROP BASE Intermediate_Dir "SM_moto___Win32_MT_DLL_Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\..\..\obj\windows\sumo\moto\mtdll"
+# PROP Intermediate_Dir "..\..\..\..\obj\windows\sumo\moto\mtdll"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /GX /O2 /I "..\..\..\source\sumo\MoTo\include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
+# ADD CPP /nologo /MD /GX /O2 /I "..\..\..\source\sumo\MoTo\include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\..\..\..\obj\windows\sumo\moto\SM_moto.lib"
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "SM_moto - Win32 Profile"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "SM_moto___Win32_Profile"
+# PROP BASE Intermediate_Dir "SM_moto___Win32_Profile"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "SM_moto___Win32_Profile"
+# PROP Intermediate_Dir "SM_moto___Win32_Profile"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /O2 /I "..\..\..\source\sumo\MoTo\include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
+# ADD CPP /nologo /W3 /Gm /GX /Zi /O2 /I "..\..\..\source\sumo\MoTo\include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\..\..\obj\windows\sumo\moto\debug\SM_moto.lib"
+# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\sumo\moto\profile\SM_moto.lib"
+
+!ENDIF 
+
+# Begin Target
+
+# Name "SM_moto - Win32 Release"
+# Name "SM_moto - Win32 Debug"
+# Name "SM_moto - Win32 MT DLL Debug"
+# Name "SM_moto - Win32 MT DLL Release"
+# Name "SM_moto - Win32 Profile"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\..\..\source\sumo\MoTo\src\MT_CmMatrix4x4.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\sumo\MoTo\src\MT_Matrix3x3.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\sumo\MoTo\src\MT_Matrix4x4.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\sumo\MoTo\src\MT_Point3.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\sumo\MoTo\src\MT_Quaternion.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\sumo\MoTo\src\MT_random.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\sumo\MoTo\src\MT_Transform.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\sumo\MoTo\src\MT_Vector2.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\sumo\MoTo\src\MT_Vector3.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\sumo\MoTo\src\MT_Vector4.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=..\..\..\source\sumo\MoTo\include\GEN_List.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\sumo\MoTo\include\GEN_Map.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\sumo\MoTo\include\MT_assert.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\sumo\MoTo\include\MT_CmMatrix4x4.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\sumo\MoTo\include\MT_Matrix3x3.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\sumo\MoTo\include\MT_Matrix3x3.inl
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\sumo\MoTo\include\MT_Matrix4x4.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\sumo\MoTo\include\MT_Matrix4x4.inl
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\sumo\MoTo\include\MT_MinMax.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\sumo\MoTo\include\MT_Optimize.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\sumo\MoTo\include\MT_Point2.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\sumo\MoTo\include\MT_Point2.inl
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\sumo\MoTo\include\MT_Point3.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\sumo\MoTo\include\MT_Point3.inl
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\sumo\MoTo\include\MT_Quaternion.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\sumo\MoTo\include\MT_Quaternion.inl
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\sumo\MoTo\include\MT_random.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\sumo\MoTo\include\MT_Scalar.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\sumo\MoTo\include\MT_Stream.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\sumo\MoTo\include\MT_Transform.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\sumo\MoTo\include\MT_Tuple2.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\sumo\MoTo\include\MT_Tuple3.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\sumo\MoTo\include\MT_Tuple4.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\sumo\MoTo\include\MT_Vector2.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\sumo\MoTo\include\MT_Vector2.inl
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\sumo\MoTo\include\MT_Vector3.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\sumo\MoTo\include\MT_Vector3.inl
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\sumo\MoTo\include\MT_Vector4.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\sumo\MoTo\include\MT_Vector4.inl
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\sumo\MoTo\include\NM_Scalar.h
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/projectfiles_vc7/sumo/solid/SM_solid.dsp b/projectfiles_vc7/sumo/solid/SM_solid.dsp
index dfaa85c35d8585c27ded88366bb255a486326716..221a72f67efa3a70cde250f4538832704e80d50a 100644
--- a/projectfiles_vc7/sumo/solid/SM_solid.dsp
+++ b/projectfiles_vc7/sumo/solid/SM_solid.dsp
@@ -1,340 +1,340 @@
-# Microsoft Developer Studio Project File - Name="SM_solid" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=SM_solid - Win32 Release
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "SM_solid.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "SM_solid.mak" CFG="SM_solid - Win32 Release"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "SM_solid - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "SM_solid - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "SM_solid - Win32 MT DLL Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "SM_solid - Win32 MT DLL Release" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "SM_solid - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\obj\windows\sumo\solid"
-# PROP Intermediate_Dir "..\..\..\obj\windows\sumo\solid"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\..\source\gameengine\physics\sumo\SOLID-3.0\include" /I "../../../../lib/windows/moto/include" /I "..\..\..\source\gameengine\physics\sumo\include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /J /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "SM_solid - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\obj\windows\sumo\solid\debug"
-# PROP Intermediate_Dir "..\..\..\obj\windows\sumo\solid\debug"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\..\..\source\gameengine\physics\sumo\SOLID-3.0\include" /I "../../../../lib/windows/moto/include" /I "..\..\..\source\gameengine\physics\sumo\include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /GZ /c
-# SUBTRACT CPP /Fr
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "SM_solid - Win32 MT DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "SM_solid___Win32_MT_DLL_Debug"
-# PROP BASE Intermediate_Dir "SM_solid___Win32_MT_DLL_Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\obj\windows\sumo\solid\mtdll_debug"
-# PROP Intermediate_Dir "..\..\..\obj\windows\sumo\solid\mtdll_debug"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /Gm /GX /ZI /Od /I "..\..\..\source\sumo\SOLID-3.0\include" /I "../../../../../lib/windows/moto/include" /I "..\..\..\source\sumo\include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /GZ /c
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "..\..\..\source\gameengine\physics\sumo\SOLID-3.0\include" /I "../../../../lib/windows/moto/include" /I "..\..\..\source\gameengine\physics\sumo\include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\..\..\..\obj\windows\sumo\solid\debug\SM_solid.lib"
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "SM_solid - Win32 MT DLL Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "SM_solid___Win32_MT_DLL_Release"
-# PROP BASE Intermediate_Dir "SM_solid___Win32_MT_DLL_Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\obj\windows\sumo\solid\mtdll"
-# PROP Intermediate_Dir "..\..\..\obj\windows\sumo\solid\mtdll"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /GX /O2 /I "..\..\..\source\sumo\SOLID-3.0\include" /I "../../../../../lib/windows/moto/include" /I "..\..\..\source\sumo\include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
-# ADD CPP /nologo /MD /GX /O2 /I "..\..\..\source\gameengine\physics\sumo\SOLID-3.0\include" /I "../../../../lib/windows/moto/include" /I "..\..\..\source\gameengine\physics\sumo\include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\..\..\..\obj\windows\sumo\solid\SM_solid.lib"
-# ADD LIB32 /nologo
-
-!ENDIF 
-
-# Begin Target
-
-# Name "SM_solid - Win32 Release"
-# Name "SM_solid - Win32 Debug"
-# Name "SM_solid - Win32 MT DLL Debug"
-# Name "SM_solid - Win32 MT DLL Release"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\src\BBoxTree.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\src\Box.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\src\Complex.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\src\Cone.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\src\Convex.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\src\Cylinder.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\src\DT_BP_C-api.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\src\DT_BP_Endpoint.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\src\DT_BP_Proxy.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\src\DT_BP_Scene.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\src\DT_C-api.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\src\DT_DoubleBase.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\src\DT_Encounter.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\src\DT_FloatBase.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\src\DT_LineSegment.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\src\DT_Object.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\src\DT_RespTable.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\src\DT_Scene.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\src\Polyhedron.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\src\Polytope.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\src\Sphere.cpp"
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\include\AlgoTable.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\include\BBoxTree.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\include\Box.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\include\Complex.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\include\Cone.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\include\Convex.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\include\Cylinder.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\include\DT_AABBox.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\include\DT_BBox.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\include\DT_BP_Endpoint.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\include\DT_BP_Proxy.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\include\DT_BP_Scene.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\include\DT_DoubleBase.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\include\DT_Encounter.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\include\DT_FloatBase.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\include\DT_LineSegment.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\include\DT_Object.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\include\DT_Response.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\include\DT_RespTable.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\include\DT_Scene.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\include\DT_VertexBase.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\include\DT_VertexBased.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\include\IndexArray.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\include\Polyhedron.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\include\Polytope.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\include\Shape.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\include\Sphere.h"
-# End Source File
-# End Group
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="SM_solid" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=SM_solid - Win32 Release
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "SM_solid.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "SM_solid.mak" CFG="SM_solid - Win32 Release"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "SM_solid - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "SM_solid - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "SM_solid - Win32 MT DLL Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "SM_solid - Win32 MT DLL Release" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "SM_solid - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\..\obj\windows\sumo\solid"
+# PROP Intermediate_Dir "..\..\..\obj\windows\sumo\solid"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\..\source\gameengine\physics\sumo\SOLID-3.0\include" /I "../../../../lib/windows/moto/include" /I "..\..\..\source\gameengine\physics\sumo\include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /J /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "SM_solid - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\..\obj\windows\sumo\solid\debug"
+# PROP Intermediate_Dir "..\..\..\obj\windows\sumo\solid\debug"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\..\..\source\gameengine\physics\sumo\SOLID-3.0\include" /I "../../../../lib/windows/moto/include" /I "..\..\..\source\gameengine\physics\sumo\include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /GZ /c
+# SUBTRACT CPP /Fr
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "SM_solid - Win32 MT DLL Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "SM_solid___Win32_MT_DLL_Debug"
+# PROP BASE Intermediate_Dir "SM_solid___Win32_MT_DLL_Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\..\obj\windows\sumo\solid\mtdll_debug"
+# PROP Intermediate_Dir "..\..\..\obj\windows\sumo\solid\mtdll_debug"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /Gm /GX /ZI /Od /I "..\..\..\source\sumo\SOLID-3.0\include" /I "../../../../../lib/windows/moto/include" /I "..\..\..\source\sumo\include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /GZ /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "..\..\..\source\gameengine\physics\sumo\SOLID-3.0\include" /I "../../../../lib/windows/moto/include" /I "..\..\..\source\gameengine\physics\sumo\include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\..\..\..\obj\windows\sumo\solid\debug\SM_solid.lib"
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "SM_solid - Win32 MT DLL Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "SM_solid___Win32_MT_DLL_Release"
+# PROP BASE Intermediate_Dir "SM_solid___Win32_MT_DLL_Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\..\obj\windows\sumo\solid\mtdll"
+# PROP Intermediate_Dir "..\..\..\obj\windows\sumo\solid\mtdll"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+# ADD BASE CPP /nologo /GX /O2 /I "..\..\..\source\sumo\SOLID-3.0\include" /I "../../../../../lib/windows/moto/include" /I "..\..\..\source\sumo\include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
+# ADD CPP /nologo /MD /GX /O2 /I "..\..\..\source\gameengine\physics\sumo\SOLID-3.0\include" /I "../../../../lib/windows/moto/include" /I "..\..\..\source\gameengine\physics\sumo\include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\..\..\..\obj\windows\sumo\solid\SM_solid.lib"
+# ADD LIB32 /nologo
+
+!ENDIF 
+
+# Begin Target
+
+# Name "SM_solid - Win32 Release"
+# Name "SM_solid - Win32 Debug"
+# Name "SM_solid - Win32 MT DLL Debug"
+# Name "SM_solid - Win32 MT DLL Release"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\src\BBoxTree.cpp"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\src\Box.cpp"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\src\Complex.cpp"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\src\Cone.cpp"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\src\Convex.cpp"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\src\Cylinder.cpp"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\src\DT_BP_C-api.cpp"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\src\DT_BP_Endpoint.cpp"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\src\DT_BP_Proxy.cpp"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\src\DT_BP_Scene.cpp"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\src\DT_C-api.cpp"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\src\DT_DoubleBase.cpp"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\src\DT_Encounter.cpp"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\src\DT_FloatBase.cpp"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\src\DT_LineSegment.cpp"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\src\DT_Object.cpp"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\src\DT_RespTable.cpp"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\src\DT_Scene.cpp"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\src\Polyhedron.cpp"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\src\Polytope.cpp"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\src\Sphere.cpp"
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\include\AlgoTable.h"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\include\BBoxTree.h"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\include\Box.h"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\include\Complex.h"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\include\Cone.h"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\include\Convex.h"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\include\Cylinder.h"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\include\DT_AABBox.h"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\include\DT_BBox.h"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\include\DT_BP_Endpoint.h"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\include\DT_BP_Proxy.h"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\include\DT_BP_Scene.h"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\include\DT_DoubleBase.h"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\include\DT_Encounter.h"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\include\DT_FloatBase.h"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\include\DT_LineSegment.h"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\include\DT_Object.h"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\include\DT_Response.h"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\include\DT_RespTable.h"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\include\DT_Scene.h"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\include\DT_VertexBase.h"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\include\DT_VertexBased.h"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\include\IndexArray.h"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\include\Polyhedron.h"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\include\Polytope.h"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\include\Shape.h"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\source\gameengine\Physics\Sumo\SOLID-3.0\include\Sphere.h"
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/projectfiles_vc9/gameengine/ketsji/KX_ketsji.vcproj b/projectfiles_vc9/gameengine/ketsji/KX_ketsji.vcproj
index b14cce5b39900671d78ee7cb8866708ae6fab2ff..80c34bef2238cc847cfdc28aa2de7871644ce586 100644
--- a/projectfiles_vc9/gameengine/ketsji/KX_ketsji.vcproj
+++ b/projectfiles_vc9/gameengine/ketsji/KX_ketsji.vcproj
@@ -577,6 +577,10 @@
 				RelativePath="..\..\..\source\gameengine\Ketsji\KX_PythonInit.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\..\source\gameengine\Ketsji\KX_PythonInitTypes.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\..\source\gameengine\Ketsji\KX_RayCast.cpp"
 				>
@@ -882,6 +886,10 @@
 				RelativePath="..\..\..\source\gameengine\Ketsji\KX_PythonInit.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\..\source\gameengine\Ketsji\KX_PythonInitTypes.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\..\source\gameengine\Ketsji\KX_RayCast.h"
 				>
diff --git a/release/scripts/image_auto_layout.py b/release/scripts/image_auto_layout.py
index c6f97a25434f9ae00da9091f528ca3e3003b433d..d19ba1da6629737db1056f7786e5fd37bbd6766e 100644
--- a/release/scripts/image_auto_layout.py
+++ b/release/scripts/image_auto_layout.py
@@ -9,7 +9,7 @@ Tooltip: 'Pack all texture images into 1 image and remap faces.'
 
 __author__ = "Campbell Barton"
 __url__ = ("blender", "blenderartists.org")
-__version__ = "1.1 2007/02/15"
+__version__ = "1.1a 2009/04/01"
 
 __bpydoc__ = """\
 This script makes a new image from the used areas of all the images mapped to the selected mesh objects.
@@ -273,9 +273,12 @@ def consolidate_mesh_images(mesh_list, scn, PREF_IMAGE_PATH, PREF_IMAGE_SIZE, PR
 	
 	# New Mesh and Object
 	render_mat= B.Material.New()
-	render_mat.mode |= B.Material.Modes.SHADELESS
-	render_mat.mode |= B.Material.Modes.TEXFACE
-	render_mat.mode |= B.Material.Modes.ZTRANSP
+	render_mat.mode |= \
+			B.Material.Modes.SHADELESS | \
+			B.Material.Modes.TEXFACE | \
+			B.Material.Modes.TEXFACE_ALPHA | \
+			B.Material.Modes.ZTRANSP
+	
 	render_mat.setAlpha(0.0)
 		
 	render_me= B.Mesh.New()
@@ -420,7 +423,7 @@ def main():
 	
 	PREF_IMAGE_PATH= PREF_IMAGE_PATH.val
 	PREF_IMAGE_SIZE= PREF_IMAGE_SIZE.val
-	PREF_IMAGE_MARGIN= PREF_IMAGE_MARGIN.val
+	PREF_IMAGE_MARGIN= float(PREF_IMAGE_MARGIN.val) # important this is a float otherwise division wont work properly
 	PREF_KEEP_ASPECT= PREF_KEEP_ASPECT.val
 	PREF_ALL_SEL_OBS= PREF_ALL_SEL_OBS.val
 	
diff --git a/release/scripts/mesh_poly_reduce_grid.py b/release/scripts/mesh_poly_reduce_grid.py
new file mode 100644
index 0000000000000000000000000000000000000000..3741a47723aac281dac0c8d6ccd43aa3b2704fb6
--- /dev/null
+++ b/release/scripts/mesh_poly_reduce_grid.py
@@ -0,0 +1,351 @@
+#!BPY
+"""
+Name: 'Poly Reduce Selection (Unsubsurf)'
+Blender: 245
+Group: 'Mesh'
+Tooltip: 'pradictable mesh simplifaction maintaining face loops'
+"""
+
+from Blender import Scene, Mesh, Window, sys
+import BPyMessages
+import bpy
+
+# ***** BEGIN GPL LICENSE BLOCK *****
+#
+# Script copyright (C) Campbell J Barton
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+# ***** END GPL LICENCE BLOCK *****
+# --------------------------------------------------------------------------
+
+
+def my_mesh_util(me):
+	me_verts = me.verts
+	
+	vert_faces = [ [] for v in me_verts]
+	vert_faces_corner = [ [] for v in me_verts]
+	
+	
+	# Ignore topology where there are not 2 faces connected to an edge.
+	edge_count = {}
+	for f in me.faces:
+		for edkey in f.edge_keys:
+			try:
+				edge_count[edkey] += 1
+			except:
+				edge_count[edkey]  = 1
+				
+	for edkey, count in edge_count.iteritems():
+		
+		# Ignore verts that connect to edges with more then 2 faces.
+		if count != 2:
+			vert_faces[edkey[0]] = None
+			vert_faces[edkey[1]] = None
+	# Done
+	
+	
+	
+	def faces_set_verts(face_ls):
+		unique_verts = set()
+		for f in face_ls:
+			for v in f:
+				unique_verts.add(v.index)
+		return unique_verts
+	
+	for f in me.faces:
+		for corner, v in enumerate(f):
+			i = v.index
+			if vert_faces[i] != None:
+				vert_faces[i].append(f)
+				vert_faces_corner[i].append( corner )
+	
+	grid_data_ls = []
+	
+	for vi, face_ls in enumerate(vert_faces):
+		if face_ls != None:
+			if len(face_ls) == 4:
+				if face_ls[0].sel and face_ls[1].sel and face_ls[2].sel and face_ls[3].sel:					
+					# Support triangles also
+					unique_vert_count = len(faces_set_verts(face_ls))
+					quads = 0
+					for f in face_ls:
+						if len(f) ==4:
+							quads += 1
+					if unique_vert_count==5+quads: # yay we have a grid
+						grid_data_ls.append( (vi, face_ls) )
+			
+			elif len(face_ls) == 3:
+				if face_ls[0].sel and face_ls[1].sel and face_ls[2].sel:
+					unique_vert_count = len(faces_set_verts(face_ls))
+					if unique_vert_count==4: # yay we have 3 triangles to make into a bigger triangle
+						grid_data_ls.append( (vi, face_ls) )
+				
+	
+	
+	# Now sort out which grid faces to use
+	
+	
+	# This list will be used for items we can convert, vertex is key, faces are values
+	grid_data_dict = {}
+	
+	if not grid_data_ls:
+		print "doing nothing"
+		return
+	
+	# quick lookup for the opposing corner of a qiad
+	quad_diag_mapping = 2,3,0,1
+	
+	verts_used = [0] * len(me_verts) # 0 == untouched, 1==should touch, 2==touched
+	verts_used[grid_data_ls[0][0]] = 1 # start touching 1!
+	
+	# From the corner vert, get the 2 edges that are not the corner or its opposing vert, this edge will make a new face
+	quad_edge_mapping = (1,3), (2,0), (1,3), (0,2) # hi-low, low-hi order is intended
+	tri_edge_mapping = (1,2), (0,2), (0,1)
+	
+	done_somthing = True
+	while done_somthing:
+		done_somthing = False
+		grid_data_ls_index = -1
+		
+		for vi, face_ls in grid_data_ls:
+			grid_data_ls_index += 1
+			if len(face_ls) == 3:
+				grid_data_dict[vi] = face_ls
+				grid_data_ls.pop( grid_data_ls_index )
+				break
+			elif len(face_ls) == 4:
+				# print vi
+				if verts_used[vi] == 1:
+					verts_used[vi] = 2 # dont look at this again.
+					done_somthing = True
+					
+					grid_data_dict[vi] = face_ls
+					
+					# Tag all faces verts as used
+					
+					for i, f in enumerate(face_ls):
+						# i == face index on vert, needed to recall which corner were on.
+						v_corner = vert_faces_corner[vi][i]
+						fv =f.v
+						
+						if len(f) == 4:
+							v_other = quad_diag_mapping[v_corner]
+							# get the 2 other corners
+							corner1, corner2 = quad_edge_mapping[v_corner]
+							if verts_used[fv[v_other].index] == 0:
+								verts_used[fv[v_other].index] = 1 # TAG for touching!
+						else:
+							corner1, corner2 = tri_edge_mapping[v_corner]
+						
+						verts_used[fv[corner1].index] = 2 # Dont use these, they are 
+						verts_used[fv[corner2].index] = 2
+						
+						
+					# remove this since we have used it.
+					grid_data_ls.pop( grid_data_ls_index )
+					
+					break
+		
+		if done_somthing == False:
+			# See if there are any that have not even been tagged, (probably on a different island), then tag them.
+			
+			for vi, face_ls in grid_data_ls:
+				if verts_used[vi] == 0:
+					verts_used[vi] = 1
+					done_somthing = True
+					break
+	
+	
+	# Now we have all the areas we will fill, calculate corner triangles we need to fill in.
+	new_faces = []
+	quad_del_vt_map = (1,2,3), (0,2,3), (0,1,3), (0,1,2)
+	for vi, face_ls in grid_data_dict.iteritems():
+		for i, f in enumerate(face_ls):
+			if len(f) == 4:
+				# i == face index on vert, needed to recall which corner were on.
+				v_corner = vert_faces_corner[vi][i]
+				v_other = quad_diag_mapping[v_corner]
+				fv =f.v
+				
+				#print verts_used[fv[v_other].index]
+				#if verts_used[fv[v_other].index] != 2: # DOSNT WORK ALWAYS
+				
+				if 1: # THIS IS LAzY - some of these faces will be removed after adding.
+					# Ok we are removing half of this face, add the other half
+					
+					# This is probably slower
+					# new_faces.append( [fv[ii].index for ii in (0,1,2,3) if ii != v_corner ] )
+					
+					# do this instead
+					new_faces.append( (fv[quad_del_vt_map[v_corner][0]], fv[quad_del_vt_map[v_corner][1]], fv[quad_del_vt_map[v_corner][2]]) )
+	
+	del grid_data_ls
+	
+	
+	# me.sel = 0
+	def faceCombine4(vi, face_ls):
+		edges = []
+		
+		for i, f in enumerate(face_ls):
+			fv = f.v
+			v_corner = vert_faces_corner[vi][i]
+			if len(f)==4:	ed = quad_edge_mapping[v_corner]
+			else:			ed = tri_edge_mapping[v_corner]
+			
+			edges.append( [fv[ed[0]].index, fv[ed[1]].index] )
+		
+		# get the face from the edges 
+		face = edges.pop()
+		while len(face) != 4:
+			# print len(edges), edges, face
+			for ed_idx, ed in enumerate(edges):
+				if face[-1] == ed[0] and (ed[1] != face[0]):
+					face.append(ed[1])
+				elif face[-1] == ed[1] and (ed[0] != face[0]):
+					face.append(ed[0])
+				else:
+					continue
+				
+				edges.pop(ed_idx) # we used the edge alredy
+				break
+		
+		return face	
+	
+	for vi, face_ls in grid_data_dict.iteritems():
+		if len(face_ls) == 4:
+			new_faces.append( faceCombine4(vi, face_ls) )
+			#pass
+		if len(face_ls) == 3: # 3 triangles
+			face = list(faces_set_verts(face_ls))
+			face.remove(vi)
+			new_faces.append( face )
+			
+	
+	# Now remove verts surounded by 3 triangles
+	
+
+		
+	# print new_edges
+	# me.faces.extend(new_faces, ignoreDups=True)
+	
+	'''
+	faces_remove = []
+	for vi, face_ls in grid_data_dict.iteritems():
+		faces_remove.extend(face_ls)
+	'''
+	
+	orig_facelen = len(me.faces)
+	
+	orig_faces = list(me.faces)
+	me.faces.extend(new_faces, ignoreDups=True)
+	new_faces = list(me.faces)[len(orig_faces):]
+	
+	
+	
+	
+	
+	if me.faceUV:
+		uvnames = me.getUVLayerNames()
+		act_uvlay = me.activeUVLayer
+		
+		vert_faces_uvs =	[]
+		vert_faces_images =	[]
+			
+			
+		act_uvlay = me.activeUVLayer
+		
+		for uvlay in uvnames:
+			me.activeUVLayer = uvlay
+			vert_faces_uvs[:] = [None] * len(me.verts)
+			vert_faces_images[:] = vert_faces_uvs[:]
+			
+			for i,f in enumerate(orig_faces):
+				img = f.image
+				fv = f.v
+				uv = f.uv
+				mat = f.mat
+				for i,v in enumerate(fv):
+					vi = v.index
+					vert_faces_uvs[vi] = uv[i] # no nice averaging
+					vert_faces_images[vi] = img
+					
+					
+			# Now copy UVs across
+			for f in new_faces:	
+				fi = [v.index for v in f.v]
+				f.image = vert_faces_images[fi[0]]
+				uv = f.uv
+				for i,vi in enumerate(fi):
+					uv[i][:] = vert_faces_uvs[vi]
+		
+		if len(me.materials) > 1:
+			vert_faces_mats = [None] * len(me.verts)
+			for i,f in enumerate(orig_faces):
+				mat = f.mat
+				for i,v in enumerate(f.v):
+					vi = v.index
+					vert_faces_mats[vi] = mat
+				
+			# Now copy UVs across
+			for f in new_faces:
+				print vert_faces_mats[f.v[0].index]
+				f.mat = vert_faces_mats[f.v[0].index]
+				
+	
+	me.verts.delete(grid_data_dict.keys())
+	
+	# me.faces.delete(1, faces_remove)
+	
+	if me.faceUV:
+		me.activeUVLayer = act_uvlay
+	
+	me.calcNormals()
+
+def main():
+	
+	# Gets the current scene, there can be many scenes in 1 blend file.
+	sce = bpy.data.scenes.active
+	
+	# Get the active object, there can only ever be 1
+	# and the active object is always the editmode object.
+	ob_act = sce.objects.active
+	
+	if not ob_act or ob_act.type != 'Mesh':
+		BPyMessages.Error_NoMeshActive()
+		return 
+	
+	is_editmode = Window.EditMode()
+	if is_editmode: Window.EditMode(0)
+	
+	Window.WaitCursor(1)
+	me = ob_act.getData(mesh=1) # old NMesh api is default
+	t = sys.time()
+	
+	# Run the mesh editing function
+	my_mesh_util(me)
+	
+	# Restore editmode if it was enabled
+	if is_editmode: Window.EditMode(1)
+	
+	# Timing the script is a good way to be aware on any speed hits when scripting
+	print 'My Script finished in %.2f seconds' % (sys.time()-t)
+	Window.WaitCursor(0)
+	
+	
+# This lets you can import the script without running it
+if __name__ == '__main__':
+	main()
+
diff --git a/release/scripts/scripttemplate_camer_object.py b/release/scripts/scripttemplate_camera_object.py
similarity index 100%
rename from release/scripts/scripttemplate_camer_object.py
rename to release/scripts/scripttemplate_camera_object.py
diff --git a/release/scripts/uvcalc_smart_project.py b/release/scripts/uvcalc_smart_project.py
index d622e1a2af8398deacfb73abe92e7fc8d72b887e..55d6ebfaa6fc90013a3e6916a7351ba9d8adab6c 100644
--- a/release/scripts/uvcalc_smart_project.py
+++ b/release/scripts/uvcalc_smart_project.py
@@ -870,7 +870,7 @@ def main():
 	'UV Layout',\
 	('Share Tex Space', USER_SHARE_SPACE, 'Objects Share texture space, map all objects into 1 uvmap.'),\
 	('Stretch to bounds', USER_STRETCH_ASPECT, 'Stretch the final output to texture bounds.'),\
-	('Island Margin:', USER_ISLAND_MARGIN, 0.0, 0.25, 'Margin to reduce bleed from adjacent islands.'),\
+	('Island Margin:', USER_ISLAND_MARGIN, 0.0, 0.5, 'Margin to reduce bleed from adjacent islands.'),\
 	'Fill in empty areas',\
 	('Fill Holes', USER_FILL_HOLES, 'Fill in empty areas reduced texture waistage (slow).'),\
 	('Fill Quality:', USER_FILL_HOLES_QUALITY, 1, 100, 'Depends on fill holes, how tightly to fill UV holes, (higher is slower)'),\
diff --git a/source/blender/blenkernel/BKE_bmesh.h b/source/blender/blenkernel/BKE_bmesh.h
index 8ec7144faf6658ff9cfe507796402bf2b357d7c0..04ffc0a409283f0c568c4fbf31f024563f6b6403 100644
--- a/source/blender/blenkernel/BKE_bmesh.h
+++ b/source/blender/blenkernel/BKE_bmesh.h
@@ -3,7 +3,7 @@
  *
  *	BMesh modeler structure and functions.
  *
- * $Id: BKE_bmesh.h,v 1.00 2007/01/17 17:42:01 Briggs Exp $
+ * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
diff --git a/source/blender/blenkernel/BKE_bmeshCustomData.h b/source/blender/blenkernel/BKE_bmeshCustomData.h
index 4f5f2641f548d72596b136ab23048c03d10b5e6f..e910fc13ed4f4df6dc959baeb8b4befc05acc167 100644
--- a/source/blender/blenkernel/BKE_bmeshCustomData.h
+++ b/source/blender/blenkernel/BKE_bmeshCustomData.h
@@ -3,7 +3,7 @@
  *
  *	BMesh modeler structure and functions.
  *
- * $Id: BKE_bmesh.h,v 1.00 2007/01/17 17:42:01 Briggs Exp $
+ * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
diff --git a/source/blender/blenkernel/BKE_cloth.h b/source/blender/blenkernel/BKE_cloth.h
index f3c13d3d82051cf52924a6dcdd4ce77169cdb4ae..28c826d17c3077e41070382e754baed19fa451a4 100644
--- a/source/blender/blenkernel/BKE_cloth.h
+++ b/source/blender/blenkernel/BKE_cloth.h
@@ -1,7 +1,7 @@
 /**
  * BKE_cloth.h
  *
- * $Id: BKE_cloth.h,v 1.1 2007/08/01 02:07:27 daniel Exp $
+ * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
diff --git a/source/blender/blenkernel/BKE_collision.h b/source/blender/blenkernel/BKE_collision.h
index c483148e4de4a3804ce2d01d6f965cb97a9388d9..5e6485d48a397323c7854c125943dd718e247999 100644
--- a/source/blender/blenkernel/BKE_collision.h
+++ b/source/blender/blenkernel/BKE_collision.h
@@ -1,7 +1,7 @@
 /**
  * BKE_cloth.h
  *
- * $Id: BKE_cloth.h,v 1.1 2007/08/01 02:07:27 daniel Exp $
+ * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
diff --git a/source/blender/blenkernel/BKE_curve.h b/source/blender/blenkernel/BKE_curve.h
index a66199587976d5fad1f0b65b0a69426b5b78418a..a8d4ece7a2180092a12b6859a81a0bc23abeaedc 100644
--- a/source/blender/blenkernel/BKE_curve.h
+++ b/source/blender/blenkernel/BKE_curve.h
@@ -46,6 +46,10 @@ struct BevList;
 #define SEGMENTSU(nu)	    ( ((nu)->flagu & CU_CYCLIC) ? (nu)->pntsu : (nu)->pntsu-1 )
 #define SEGMENTSV(nu)	    ( ((nu)->flagv & CU_CYCLIC) ? (nu)->pntsv : (nu)->pntsv-1 )
 
+#define CU_DO_TILT(cu, nu) (((nu->type & CU_2D) && (cu->flag & CU_3D)==0) ? 0 : 1)
+#define CU_DO_RADIUS(cu, nu) ((CU_DO_TILT(cu, nu) || cu->bevobj) ? 1:0)
+
+
 void unlink_curve( struct Curve *cu);
 void free_curve( struct Curve *cu);
 struct Curve *add_curve(char *name, int type);
diff --git a/source/blender/blenkernel/BKE_particle.h b/source/blender/blenkernel/BKE_particle.h
index caba63ef8ce3b4ce9d9409554e3bebf9cb49bb99..5dbfe2fe520ecbb9a5775dedc474314828d12eeb 100644
--- a/source/blender/blenkernel/BKE_particle.h
+++ b/source/blender/blenkernel/BKE_particle.h
@@ -1,7 +1,7 @@
 /* BKE_particle.h
  *
  *
- * $Id: BKE_particle.h $
+ * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
@@ -188,6 +188,19 @@ typedef struct ParticleThread {
 	int num, tot;
 } ParticleThread;
 
+typedef struct ParticleBillboardData
+{
+	struct Object *ob;
+	float vec[3], vel[3];
+	float offset[2];
+	float size, tilt, random, time;
+	int uv[3];
+	int lock, num;
+	int totnum;
+	short align, uv_split, anim, split_offset;
+}
+ParticleBillboardData;
+
 /* ----------- functions needed outside particlesystem ---------------- */
 /* particle.c */
 int count_particles(struct ParticleSystem *psys);
@@ -260,6 +273,8 @@ void psys_threads_free(ParticleThread *threads);
 void psys_thread_distribute_particle(ParticleThread *thread, struct ParticleData *pa, struct ChildParticle *cpa, int p);
 void psys_thread_create_path(ParticleThread *thread, struct ChildParticle *cpa, ParticleCacheKey *keys, int i);
 
+void psys_make_billboard(ParticleBillboardData *bb, float xvec[3], float yvec[3], float zvec[3], float center[3]);
+
 /* particle_system.c */
 int psys_count_keyed_targets(struct Object *ob, struct ParticleSystem *psys);
 void psys_get_reactor_target(struct Object *ob, struct ParticleSystem *psys, struct Object **target_ob, struct ParticleSystem **target_psys);
diff --git a/source/blender/blenkernel/BKE_suggestions.h b/source/blender/blenkernel/BKE_suggestions.h
index d58b8f58bf5a32ef91fdac8a80f64c74d529b069..473e3f547f2c5c31c7cbcb6835563ff6c8b33ee8 100644
--- a/source/blender/blenkernel/BKE_suggestions.h
+++ b/source/blender/blenkernel/BKE_suggestions.h
@@ -1,5 +1,5 @@
 /**	
- * $Id: $ 
+ * $Id$ 
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
diff --git a/source/blender/blenkernel/intern/BME_Customdata.c b/source/blender/blenkernel/intern/BME_Customdata.c
index 1fc8a4071dc8bf6b760e60e4b084ad367408fb34..ea149e03959141b03e26f56ae90b7305d3f64bb6 100644
--- a/source/blender/blenkernel/intern/BME_Customdata.c
+++ b/source/blender/blenkernel/intern/BME_Customdata.c
@@ -3,7 +3,7 @@
  *
  *	Custom Data functions for Bmesh
  *
- * $Id: BKE_bmesh.h,v 1.00 2007/01/17 17:42:01 Briggs Exp $
+ * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
diff --git a/source/blender/blenkernel/intern/BME_conversions.c b/source/blender/blenkernel/intern/BME_conversions.c
index daf0de5b748e1e91eafe368dbc0f0909c648ace6..39af580969fd982a944938b3201cd3a4d8baeacc 100644
--- a/source/blender/blenkernel/intern/BME_conversions.c
+++ b/source/blender/blenkernel/intern/BME_conversions.c
@@ -3,7 +3,7 @@
  *
  *	BMesh mesh level functions.
  *
- * $Id: BME_eulers.c,v 1.00 2007/01/17 17:42:01 Briggs Exp $
+ * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
diff --git a/source/blender/blenkernel/intern/BME_eulers.c b/source/blender/blenkernel/intern/BME_eulers.c
index 801e0b8bdec9ff97cdf3115eb4228f890e9fdf05..d0b4ab6a9ca2e87070ae71d1ac1cb6d489857fb2 100644
--- a/source/blender/blenkernel/intern/BME_eulers.c
+++ b/source/blender/blenkernel/intern/BME_eulers.c
@@ -3,7 +3,7 @@
  *
  *	BMesh Euler construction API.
  *
- * $Id: BME_eulers.c,v 1.00 2007/01/17 17:42:01 Briggs Exp $
+ * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
diff --git a/source/blender/blenkernel/intern/BME_mesh.c b/source/blender/blenkernel/intern/BME_mesh.c
index ad46a7c1eb78b0ab4fd8fccc9fc3e1c82a4cfeaf..f635cfcfcd2961e5db6a966d6dd612d1a91fd048 100644
--- a/source/blender/blenkernel/intern/BME_mesh.c
+++ b/source/blender/blenkernel/intern/BME_mesh.c
@@ -3,7 +3,7 @@
  *
  *	BMesh mesh level functions.
  *
- * $Id: BME_eulers.c,v 1.00 2007/01/17 17:42:01 Briggs Exp $
+ * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
diff --git a/source/blender/blenkernel/intern/BME_structure.c b/source/blender/blenkernel/intern/BME_structure.c
index ca27f5efd1058831cf2dd61b99346229f1f8db47..22ee48e4f7e996926f37b3fae097aa5776c6747e 100644
--- a/source/blender/blenkernel/intern/BME_structure.c
+++ b/source/blender/blenkernel/intern/BME_structure.c
@@ -3,7 +3,7 @@
  *
  *	Low level routines for manipulating the BMesh structure.
  *
- * $Id: BME_structure.c,v 1.00 2007/01/17 17:42:01 Briggs Exp $
+ * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
diff --git a/source/blender/blenkernel/intern/BME_tools.c b/source/blender/blenkernel/intern/BME_tools.c
index 90259031e5caa3e42e22ba9ef9ed75a64e5d336e..f3e4add34e91dfedf20e7b8c1f49dd41c936dfd3 100644
--- a/source/blender/blenkernel/intern/BME_tools.c
+++ b/source/blender/blenkernel/intern/BME_tools.c
@@ -3,7 +3,7 @@
  *
  *	Functions for changing the topology of a mesh.
  *
- * $Id: BME_eulers.c,v 1.00 2007/01/17 17:42:01 Briggs Exp $
+ * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
diff --git a/source/blender/blenkernel/intern/anim.c b/source/blender/blenkernel/intern/anim.c
index 87d7bfc4853e3ff22ac8b9809d80387de8f92c3a..50be417c8efc5f362680de3e6e6f49c657984c95 100644
--- a/source/blender/blenkernel/intern/anim.c
+++ b/source/blender/blenkernel/intern/anim.c
@@ -747,7 +747,7 @@ static void new_particle_duplilist(ListBase *lb, ID *id, Object *par, float par_
 	float ctime, pa_time, scale = 1.0f;
 	float tmat[4][4], mat[4][4], pamat[4][4], size=0.0;
 	float (*obmat)[4], (*oldobmat)[4];
-	int lay, a, b, k, step_nbr = 0, counter, hair = 0;
+	int lay, a, b, k, counter, hair = 0;
 	int totpart, totchild, totgroup=0, pa_num;
 
 	if(psys==0) return;
@@ -775,11 +775,6 @@ static void new_particle_duplilist(ListBase *lb, ID *id, Object *par, float par_
 	if((part->draw_as == PART_DRAW_OB && part->dup_ob) ||
 		(part->draw_as == PART_DRAW_GR && part->dup_group && part->dup_group->gobject.first)) {
 
-		if(psys->flag & (PSYS_HAIR_DONE|PSYS_KEYED) && part->draw & PART_DRAW_KEYS)
-			step_nbr = part->keys_step;
-		else
-			step_nbr = 0;
-
 		/* if we have a hair particle system, use the path cache */
 		if(part->type == PART_HAIR) {
 			if(psys->flag & PSYS_HAIR_DONE)
@@ -859,76 +854,65 @@ static void new_particle_duplilist(ListBase *lb, ID *id, Object *par, float par_
 				oldobmat= obcopy.obmat;
 			}
 
-			for(k=0; k<=step_nbr; k++, counter++) {
-				if(hair) {
-					/* hair we handle separate and compute transform based on hair keys */
-					if(a < totpart) {
-						cache = psys->pathcache[a];
-						psys_get_dupli_path_transform(par, psys, psmd, pa, 0, cache, pamat, &scale);
-					}
-					else {
-						cache = psys->childcache[a-totpart];
-						psys_get_dupli_path_transform(par, psys, psmd, 0, cpa, cache, pamat, &scale);
-					}
-
-					VECCOPY(pamat[3], cache->co);
-					pamat[3][3]= 1.0f;
-					
-				}
-				else if(step_nbr) {
-					/* other keys */
-					state.time = (float)k / (float)step_nbr;
-					psys_get_particle_on_path(par, psys, a, &state, 0);
-
-					QuatToMat4(state.rot, pamat);
-					VECCOPY(pamat[3], state.co);
-					pamat[3][3]= 1.0f;
+			if(hair) {
+				/* hair we handle separate and compute transform based on hair keys */
+				if(a < totpart) {
+					cache = psys->pathcache[a];
+					psys_get_dupli_path_transform(par, psys, psmd, pa, 0, cache, pamat, &scale);
 				}
 				else {
-					/* first key */
-					state.time = -1.0;
-					if(psys_get_particle_state(par, psys, a, &state, 0) == 0)
-						continue;
-
-					QuatToMat4(state.rot, pamat);
-					VECCOPY(pamat[3], state.co);
-					pamat[3][3]= 1.0f;
+					cache = psys->childcache[a-totpart];
+					psys_get_dupli_path_transform(par, psys, psmd, 0, cpa, cache, pamat, &scale);
 				}
 
-				if(part->draw_as==PART_DRAW_GR && psys->part->draw & PART_DRAW_WHOLE_GR) {
-					for(go= part->dup_group->gobject.first, b=0; go; go= go->next, b++) {
-						Mat4MulMat4(tmat, oblist[b]->obmat, pamat);
-						Mat4MulFloat3((float *)tmat, size*scale);
-						if(par_space_mat)
-							Mat4MulMat4(mat, tmat, par_space_mat);
-						else
-							Mat4CpyMat4(mat, tmat);
+				VECCOPY(pamat[3], cache->co);
+				pamat[3][3]= 1.0f;
+				
+			}
+			else {
+				/* first key */
+				state.time = ctime;
+				if(psys_get_particle_state(par, psys, a, &state, 0) == 0)
+					continue;
 
-						dob= new_dupli_object(lb, go->ob, mat, par->lay, counter, OB_DUPLIPARTS, animated);
-						Mat4CpyMat4(dob->omat, obcopylist[b].obmat);
-						if(G.rendering)
-							psys_get_dupli_texture(par, part, psmd, pa, cpa, dob->uv, dob->orco);
-					}
-				}
-				else {
-					/* to give ipos in object correct offset */
-					where_is_object_time(ob, ctime-pa_time);
-					
-					Mat4CpyMat4(mat, pamat);
+				QuatToMat4(state.rot, pamat);
+				VECCOPY(pamat[3], state.co);
+				pamat[3][3]= 1.0f;
+			}
 
-					Mat4MulMat4(tmat, obmat, mat);
+			if(part->draw_as==PART_DRAW_GR && psys->part->draw & PART_DRAW_WHOLE_GR) {
+				for(go= part->dup_group->gobject.first, b=0; go; go= go->next, b++) {
+					Mat4MulMat4(tmat, oblist[b]->obmat, pamat);
 					Mat4MulFloat3((float *)tmat, size*scale);
 					if(par_space_mat)
 						Mat4MulMat4(mat, tmat, par_space_mat);
 					else
 						Mat4CpyMat4(mat, tmat);
 
-					dob= new_dupli_object(lb, ob, mat, par->lay, counter, OB_DUPLIPARTS, animated);
-					Mat4CpyMat4(dob->omat, oldobmat);
+					dob= new_dupli_object(lb, go->ob, mat, par->lay, counter, OB_DUPLIPARTS, animated);
+					Mat4CpyMat4(dob->omat, obcopylist[b].obmat);
 					if(G.rendering)
 						psys_get_dupli_texture(par, part, psmd, pa, cpa, dob->uv, dob->orco);
 				}
 			}
+			else {
+				/* to give ipos in object correct offset */
+				where_is_object_time(ob, ctime-pa_time);
+				
+				Mat4CpyMat4(mat, pamat);
+
+				Mat4MulMat4(tmat, obmat, mat);
+				Mat4MulFloat3((float *)tmat, size*scale);
+				if(par_space_mat)
+					Mat4MulMat4(mat, tmat, par_space_mat);
+				else
+					Mat4CpyMat4(mat, tmat);
+
+				dob= new_dupli_object(lb, ob, mat, ob->lay, counter, OB_DUPLIPARTS, animated);
+				Mat4CpyMat4(dob->omat, oldobmat);
+				if(G.rendering)
+					psys_get_dupli_texture(par, part, psmd, pa, cpa, dob->uv, dob->orco);
+			}
 		}
 
 		/* restore objects since they were changed in where_is_object_time */
diff --git a/source/blender/blenkernel/intern/bmesh_private.h b/source/blender/blenkernel/intern/bmesh_private.h
index f34ef0090f39d1126583c95b038efe6238b372b3..dd7d20bcf15fd3cbf5d90840ecac356fb6188a00 100644
--- a/source/blender/blenkernel/intern/bmesh_private.h
+++ b/source/blender/blenkernel/intern/bmesh_private.h
@@ -3,7 +3,7 @@
  *
  *	low level, 'private' function prototypes for bmesh kernel.
  *
- * $Id: BKE_bmesh.h,v 1.00 2007/01/17 17:42:01 Briggs Exp $
+ * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
diff --git a/source/blender/blenkernel/intern/curve.c b/source/blender/blenkernel/intern/curve.c
index e303f78b16368db81021e90b51d8b3f9251a6c7d..0d6382a8d37e21d9e04660360717f27ccb697a18 100644
--- a/source/blender/blenkernel/intern/curve.c
+++ b/source/blender/blenkernel/intern/curve.c
@@ -1535,8 +1535,8 @@ void makeBevelList(Object *ob)
 	while(nu) {
 		
 		/* check if we will calculate tilt data */
-		do_tilt = ((nu->type & CU_2D) && (cu->flag & CU_3D)==0) ? 0 : 1;
-		do_radius = (do_tilt || cu->bevobj) ? 1 : 0; /* normal display uses the radius, better just to calculate them */
+		do_tilt = CU_DO_TILT(cu, nu);
+		do_radius = CU_DO_RADIUS(cu, nu); /* normal display uses the radius, better just to calculate them */
 		
 		/* check we are a single point? also check we are not a surface and that the orderu is sane,
 		 * enforced in the UI but can go wrong possibly */
diff --git a/source/blender/blenkernel/intern/modifier.c b/source/blender/blenkernel/intern/modifier.c
index 566a139f72c406f8f7dd61c337f640ad67a6e61c..b3892a515af70629931003f90de1ba418cb5c9fa 100644
--- a/source/blender/blenkernel/intern/modifier.c
+++ b/source/blender/blenkernel/intern/modifier.c
@@ -6382,6 +6382,7 @@ static DerivedMesh * particleInstanceModifier_applyModifier(
 	if(psys->flag & (PSYS_HAIR_DONE|PSYS_KEYED)){
 
 		float min_r[3], max_r[3];
+		INIT_MINMAX(min_r, max_r);
 		dm->getMinMax(dm, min_r, max_r);		
 		min_co=min_r[track];
 		max_co=max_r[track];
diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c
index 44ee5c236fae3ce0b0f57b15481ebca1e34b60a5..4eabb82f6cb9dde4b791a175647abe5cd0cbe87e 100644
--- a/source/blender/blenkernel/intern/particle.c
+++ b/source/blender/blenkernel/intern/particle.c
@@ -1,7 +1,7 @@
 /* particle.c
  *
  *
- * $Id: particle.c $
+ * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
@@ -2050,9 +2050,10 @@ void psys_thread_create_path(ParticleThread *thread, struct ChildParticle *cpa,
 	ptex.clump=1.0;
 	ptex.kink=1.0;
 	ptex.rough= 1.0;
+	ptex.exist= 1.0;
 
 	get_cpa_texture(ctx->dm,ctx->ma,cpa_num,cpa_fuv,orco,&ptex,
-		MAP_PA_LENGTH|MAP_PA_CLUMP|MAP_PA_KINK|MAP_PA_ROUGH);
+		MAP_PA_DENS|MAP_PA_LENGTH|MAP_PA_CLUMP|MAP_PA_KINK|MAP_PA_ROUGH);
 	
 	pa_length=ptex.length;
 	pa_clump=ptex.clump;
@@ -2062,6 +2063,11 @@ void psys_thread_create_path(ParticleThread *thread, struct ChildParticle *cpa,
 	pa_roughe=ptex.rough;
 	pa_effector= 1.0f;
 
+	if(ptex.exist < cpa->rand[1]) {
+		keys->steps = -1;
+		return;
+	}
+
 	if(ctx->vg_length)
 		pa_length*=psys_interpolate_value_from_verts(ctx->dm,cpa_from,cpa_num,cpa_fuv,ctx->vg_length);
 	if(ctx->vg_clump)
@@ -3165,6 +3171,8 @@ static void get_cpa_texture(DerivedMesh *dm, Material *ma, int face_index, float
 				ptex->kink= texture_value_blend(def,ptex->kink,value,var,blend,neg & MAP_PA_KINK);
 			if((event & mtex->pmapto) & MAP_PA_ROUGH)
 				ptex->rough= texture_value_blend(def,ptex->rough,value,var,blend,neg & MAP_PA_ROUGH);
+			if((event & mtex->pmapto) & MAP_PA_DENS)
+				ptex->exist= texture_value_blend(def,ptex->exist,value,var,blend,neg & MAP_PA_DENS);
 		}
 	}
 	if(event & MAP_PA_TIME) { CLAMP(ptex->time,0.0,1.0); }
@@ -3172,6 +3180,7 @@ static void get_cpa_texture(DerivedMesh *dm, Material *ma, int face_index, float
 	if(event & MAP_PA_CLUMP) { CLAMP(ptex->clump,0.0,1.0); }
 	if(event & MAP_PA_KINK) { CLAMP(ptex->kink,0.0,1.0); }
 	if(event & MAP_PA_ROUGH) { CLAMP(ptex->rough,0.0,1.0); }
+	if(event & MAP_PA_DENS) { CLAMP(ptex->exist,0.0,1.0); }
 }
 void psys_get_texture(Object *ob, Material *ma, ParticleSystemModifierData *psmd, ParticleSystem *psys, ParticleData *pa, ParticleTexture *ptex, int event)
 {
@@ -3860,3 +3869,75 @@ void psys_get_dupli_path_transform(Object *ob, ParticleSystem *psys, ParticleSys
 	*scale= len;
 }
 
+void psys_make_billboard(ParticleBillboardData *bb, float xvec[3], float yvec[3], float zvec[3], float center[3])
+{
+	float onevec[3] = {0.0f,0.0f,0.0f}, tvec[3], tvec2[3];
+
+	xvec[0] = 1.0f; xvec[1] = 0.0f; xvec[2] = 0.0f;
+	yvec[0] = 0.0f; yvec[1] = 1.0f; yvec[2] = 0.0f;
+
+	if(bb->align < PART_BB_VIEW)
+		onevec[bb->align]=1.0f;
+
+	if(bb->lock && (bb->align == PART_BB_VIEW)) {
+		VECCOPY(xvec, bb->ob->obmat[0]);
+		Normalize(xvec);
+
+		VECCOPY(yvec, bb->ob->obmat[1]);
+		Normalize(yvec);
+
+		VECCOPY(zvec, bb->ob->obmat[2]);
+		Normalize(zvec);
+	}
+	else if(bb->align == PART_BB_VEL) {
+		float temp[3];
+
+		VECCOPY(temp, bb->vel);
+		Normalize(temp);
+
+		VECSUB(zvec, bb->ob->obmat[3], bb->vec);
+
+		if(bb->lock) {
+			float fac = -Inpf(zvec, temp);
+
+			VECADDFAC(zvec, zvec, temp, fac);
+		}
+		Normalize(zvec);
+
+		Crossf(xvec,temp,zvec);
+		Normalize(xvec);
+
+		Crossf(yvec,zvec,xvec);
+	}
+	else {
+		VECSUB(zvec, bb->ob->obmat[3], bb->vec);
+		if(bb->lock)
+			zvec[bb->align] = 0.0f;
+		Normalize(zvec);
+
+		if(bb->align < PART_BB_VIEW)
+			Crossf(xvec, onevec, zvec);
+		else
+			Crossf(xvec, bb->ob->obmat[1], zvec);
+		Normalize(xvec);
+
+		Crossf(yvec,zvec,xvec);
+	}
+
+	VECCOPY(tvec, xvec);
+	VECCOPY(tvec2, yvec);
+
+	VecMulf(xvec, cos(bb->tilt * (float)M_PI));
+	VecMulf(tvec2, sin(bb->tilt * (float)M_PI));
+	VECADD(xvec, xvec, tvec2);
+
+	VecMulf(yvec, cos(bb->tilt * (float)M_PI));
+	VecMulf(tvec, -sin(bb->tilt * (float)M_PI));
+	VECADD(yvec, yvec, tvec);
+
+	VecMulf(xvec, bb->size);
+	VecMulf(yvec, bb->size);
+
+	VECADDFAC(center, bb->vec, xvec, bb->offset[0]);
+	VECADDFAC(center, center, yvec, bb->offset[1]);
+}
\ No newline at end of file
diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c
index 8a964c5b32eac7dec605fb953ed1d0a59e8cb452..7bda29ebcaf670d4079a457edae63f37285c5bc8 100644
--- a/source/blender/blenkernel/intern/particle_system.c
+++ b/source/blender/blenkernel/intern/particle_system.c
@@ -1,7 +1,7 @@
 /* particle_system.c
  *
  *
- * $Id: particle_system.c $
+ * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
diff --git a/source/blender/blenkernel/intern/suggestions.c b/source/blender/blenkernel/intern/suggestions.c
index 6530909336ccb50042f01b775e46fb515cc57a80..dee3365633264051cccd0751af3b7d17482fd08a 100644
--- a/source/blender/blenkernel/intern/suggestions.c
+++ b/source/blender/blenkernel/intern/suggestions.c
@@ -1,5 +1,5 @@
 /**
- * $Id: $
+ * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
diff --git a/source/blender/blenkernel/intern/writeffmpeg.c b/source/blender/blenkernel/intern/writeffmpeg.c
index 378e4319223664f1854831600692e279c0cd288f..c3d8ed855a24844f3789723eebcc055b3bf5c5b3 100644
--- a/source/blender/blenkernel/intern/writeffmpeg.c
+++ b/source/blender/blenkernel/intern/writeffmpeg.c
@@ -315,9 +315,9 @@ static AVFrame* generate_video_frame(uint8_t* pixels)
 			uint8_t* end = src + width * 4;
 			while (src != end) {
 				target[3] = src[3];
-				target[2] = src[0];
+				target[2] = src[2];
 				target[1] = src[1];
-				target[0] = src[2];
+				target[0] = src[0];
 
 				target += 4;
 				src += 4;
@@ -331,9 +331,9 @@ static AVFrame* generate_video_frame(uint8_t* pixels)
 			uint8_t* src = rendered_frame + width * 4 * y;
 			uint8_t* end = src + width * 4;
 			while (src != end) {
-				target[3] = src[2];
+				target[3] = src[0];
 				target[2] = src[1];
-				target[1] = src[0];
+				target[1] = src[2];
 				target[0] = src[3];
 
 				target += 4;
diff --git a/source/blender/blenlib/intern/freetypefont.c b/source/blender/blenlib/intern/freetypefont.c
index 48a40db6a72e1849d013ad4103e35b0eaf21a5b4..a97f2460ba17552ebde2b8d016b40cc2a80dd6e8 100644
--- a/source/blender/blenlib/intern/freetypefont.c
+++ b/source/blender/blenlib/intern/freetypefont.c
@@ -178,6 +178,7 @@ void freetypechar_to_vchar(FT_Face face, FT_ULong charcode, VFontData *vfd)
 						bezt->vec[2][1] = (dy +	(2 * ftoutline.points[l+1].y)* scale) / 3.0;
 
 						bezt->h1= bezt->h2= HD_ALIGN;
+						bezt->radius= 1.0f;
 						bezt++;
 					}
 				}
@@ -264,6 +265,7 @@ void freetypechar_to_vchar(FT_Face face, FT_ULong charcode, VFontData *vfd)
 					{
 						bezt->h1= bezt->h2= HD_ALIGN;
 					}
+					bezt->radius= 1.0f;
 					bezt++;
 				}
 			}
diff --git a/source/blender/blenlib/intern/psfont.c b/source/blender/blenlib/intern/psfont.c
index 54d7f8ec1af5fcb61f7e824d5d83feb36252cdc4..39d38e4cf3af1f8b234e14ecbece852370441378 100644
--- a/source/blender/blenlib/intern/psfont.c
+++ b/source/blender/blenlib/intern/psfont.c
@@ -2094,6 +2094,7 @@ static VFontData *objfnt_to_vfontdata(objfnt *fnt)
 						while(a--) {
 							if(bezt->h1!=HD_ALIGN && bezt->h2==HD_ALIGN) bezt->h2= 0;
 							else if(bezt->h2!=HD_ALIGN && bezt->h1==HD_ALIGN) bezt->h1= 0;
+							bezt->radius= 1.0f;
 							bezt++;
 						}
 						
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index d604c66002fa1e49197041c5160aa65141c2e56d..4317cddd4c2f0f57bad70df8eaaa10d4b6499352 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -8024,6 +8024,16 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
 			sce->toolsettings->skgen_retarget_roll = SK_RETARGET_ROLL_VIEW;
 		}
 	}
+
+	if (main->versionfile < 248 || (main->versionfile == 248 && main->subversionfile < 3)) {
+		Object *ob;
+
+		/* Adjustments needed after Bullets update */
+		for(ob = main->object.first; ob; ob= ob->id.next) {
+			ob->damping *= 0.635f;
+			ob->rdamping = 0.1 + (0.59f * ob->rdamping);
+		}
+	}
 	
 	if (main->versionfile < 248 || (main->versionfile == 248 && main->subversionfile < 3)) {
 		Scene *sce;
diff --git a/source/blender/imbuf/intern/IMB_jp2.h b/source/blender/imbuf/intern/IMB_jp2.h
index fcdd4589fcad9b20eb6f6b518bcae78df879382d..abc6b78357c18c08836e7fa71801c4c925d0fbd2 100644
--- a/source/blender/imbuf/intern/IMB_jp2.h
+++ b/source/blender/imbuf/intern/IMB_jp2.h
@@ -1,7 +1,7 @@
 /*
  * IMB_jp2.h
  *
- * $Id: IMB_bmp.h 14444 2008-04-16 22:40:48Z hos $
+ * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
diff --git a/source/blender/imbuf/intern/dds/Makefile b/source/blender/imbuf/intern/dds/Makefile
index 28f9e24c9470f67765b2dabde2a5ee566872fdb0..e14f9320d19c57b2e5b09c47b34687b7f6a1200f 100644
--- a/source/blender/imbuf/intern/dds/Makefile
+++ b/source/blender/imbuf/intern/dds/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile 7037 2006-03-12 14:11:23Z ton $
+# $Id$
 #
 # ***** BEGIN GPL LICENSE BLOCK *****
 #
diff --git a/source/blender/include/BDR_gpencil.h b/source/blender/include/BDR_gpencil.h
index 6af156775bea5f34ef9feac0f33b62db740dc006..6848be2a48194e8471d2c5ebd06843601abb4151 100644
--- a/source/blender/include/BDR_gpencil.h
+++ b/source/blender/include/BDR_gpencil.h
@@ -65,7 +65,7 @@ struct bGPdata *gpencil_data_getactive(struct ScrArea *sa);
 short gpencil_data_setactive(struct ScrArea *sa, struct bGPdata *gpd);
 struct ScrArea *gpencil_data_findowner(struct bGPdata *gpd);
 
-void gpencil_frame_delete_laststroke(struct bGPDframe *gpf);
+void gpencil_frame_delete_laststroke(struct bGPDframe *gpf, bGPDlayer *gpl);
 
 struct bGPDframe *gpencil_layer_getframe(struct bGPDlayer *gpl, int cframe, short addnew);
 void gpencil_layer_delframe(struct bGPDlayer *gpl, struct bGPDframe *gpf);
diff --git a/source/blender/include/BDR_sketch.h b/source/blender/include/BDR_sketch.h
index 55d6e1d80cfead168571a6fe4ace082085d694e9..d64f763eccdfd126966e0eb6be9efe643c34973c 100644
--- a/source/blender/include/BDR_sketch.h
+++ b/source/blender/include/BDR_sketch.h
@@ -1,5 +1,5 @@
 /**
- * $Id:  $
+ * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
diff --git a/source/blender/include/BIF_editparticle.h b/source/blender/include/BIF_editparticle.h
index 2db9aacc96b4399649367a808ec9b8bf748dcdbe..9abf4e6c2b47370d2bb54079e63c43033df97a55 100644
--- a/source/blender/include/BIF_editparticle.h
+++ b/source/blender/include/BIF_editparticle.h
@@ -1,7 +1,7 @@
 /* BIF_editparticle.h
  *
  *
- * $Id: BIF_editparticle.h $
+ * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
diff --git a/source/blender/include/BIF_generate.h b/source/blender/include/BIF_generate.h
index e64edf99bdc188d46e09ef4857f2fecf5073556d..fa70c10ac2c9b51dd211e76e5c68de18b522c6b1 100644
--- a/source/blender/include/BIF_generate.h
+++ b/source/blender/include/BIF_generate.h
@@ -1,5 +1,5 @@
 /**
- * $Id:  $
+ * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
diff --git a/source/blender/include/BIF_radialcontrol.h b/source/blender/include/BIF_radialcontrol.h
index 81181a3a91e79aca9f0473058dc56901d629279b..a23b9c7aa611303186ed812e0f7f51d748d8f5b5 100644
--- a/source/blender/include/BIF_radialcontrol.h
+++ b/source/blender/include/BIF_radialcontrol.h
@@ -1,5 +1,5 @@
 /*
- * $Id: multires.h 13015 2007-12-27 07:27:03Z nicholasbishop $
+ * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
diff --git a/source/blender/include/BIF_retarget.h b/source/blender/include/BIF_retarget.h
index 9de10fb2a38e29473f2fcfd2bf141c4414695aad..0a58f29899031771925ec4bd4c77a071159afb3b 100644
--- a/source/blender/include/BIF_retarget.h
+++ b/source/blender/include/BIF_retarget.h
@@ -1,5 +1,5 @@
 /**
- * $Id:  $
+ * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
diff --git a/source/blender/include/BIF_sketch.h b/source/blender/include/BIF_sketch.h
index 9cd7393633ea19f2bb4be4ae17a71fd3ff410e25..2419d915b14eea4e258a4a005ad3f031734c0437 100644
--- a/source/blender/include/BIF_sketch.h
+++ b/source/blender/include/BIF_sketch.h
@@ -1,5 +1,5 @@
 /**
- * $Id:  $
+ * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
diff --git a/source/blender/include/BSE_editaction_types.h b/source/blender/include/BSE_editaction_types.h
index be21041597312e29c08f741b02a95e10ef5bebdf..c0842d405e3185e221bded048ecbb81972e5ed0e 100644
--- a/source/blender/include/BSE_editaction_types.h
+++ b/source/blender/include/BSE_editaction_types.h
@@ -1,5 +1,5 @@
 /**
- * $Id: BIF_editaction.h 10519 2007-04-13 11:15:08Z aligorith $
+ * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
diff --git a/source/blender/makesdna/DNA_cloth_types.h b/source/blender/makesdna/DNA_cloth_types.h
index c99dc44cd5ea92bd4e6cdd5220e4900c08c4e35d..311a70c93cabe2b2ea943d8650319880347d2b58 100644
--- a/source/blender/makesdna/DNA_cloth_types.h
+++ b/source/blender/makesdna/DNA_cloth_types.h
@@ -1,5 +1,5 @@
 /**
-* $Id: DNA_cloth_types.h,v 1.1 2007/08/01 02:28:34 daniel Exp $
+* $Id$
 *
 * ***** BEGIN GPL LICENSE BLOCK *****
 *
diff --git a/source/blender/makesdna/DNA_particle_types.h b/source/blender/makesdna/DNA_particle_types.h
index 7dd69b2151c59026b451046bc022dfaa97e2da58..e68f8515af103c8a3b12484604e54b68c2ae52b1 100644
--- a/source/blender/makesdna/DNA_particle_types.h
+++ b/source/blender/makesdna/DNA_particle_types.h
@@ -1,7 +1,7 @@
 /* DNA_particle_types.h
  *
  *
- * $Id: DNA_particle_types.h $
+ * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
@@ -304,7 +304,7 @@ typedef struct ParticleSystem{				/* note, make sure all (runtime) are NULL's in
 #define PART_DRAW_ANG		2
 #define PART_DRAW_SIZE		4
 #define PART_DRAW_EMITTER	8	/* render emitter also */
-#define PART_DRAW_KEYS		16
+//#define PART_DRAW_KEYS		16 /* not used anywhere */
 #define PART_DRAW_ADAPT		32
 #define PART_DRAW_COS		64
 #define PART_DRAW_BB_LOCK	128
diff --git a/source/blender/nodes/TEX_node.h b/source/blender/nodes/TEX_node.h
index c52fc7575071c0da3b2f117a5c1d1995b4095f0e..d298f062143d7c639ebc503cc4b44b8e744f4e0c 100644
--- a/source/blender/nodes/TEX_node.h
+++ b/source/blender/nodes/TEX_node.h
@@ -1,5 +1,5 @@
 /**
- * $Id: CMP_node.h 12429 2007-10-29 14:37:19Z bebraw $
+ * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
diff --git a/source/blender/nodes/intern/CMP_nodes/CMP_normalize.c b/source/blender/nodes/intern/CMP_nodes/CMP_normalize.c
index a62e4be4015ecf14142c744baae1a59c00d78fb2..846aec490c2c475a8b1d15009e033e863072f4ff 100644
--- a/source/blender/nodes/intern/CMP_nodes/CMP_normalize.c
+++ b/source/blender/nodes/intern/CMP_nodes/CMP_normalize.c
@@ -1,5 +1,5 @@
 /**
- * $Id: CMP_normalize.c,v 1.0 2007/03/24 06:57:29 scourage Exp $
+ * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
diff --git a/source/blender/nodes/intern/SHD_nodes/SHD_invert.c b/source/blender/nodes/intern/SHD_nodes/SHD_invert.c
index 72ee1483ecfe61f8342322671e235bb22f2035fe..fbab7f64cb3629f6bf420ba80d55d3f15298f490 100644
--- a/source/blender/nodes/intern/SHD_nodes/SHD_invert.c
+++ b/source/blender/nodes/intern/SHD_nodes/SHD_invert.c
@@ -1,5 +1,5 @@
 /**
- * $Id: SHD_math.c,v 1.4 2007/04/04 13:58:12 jesterking Exp $
+ * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
diff --git a/source/blender/nodes/intern/TEX_nodes/Makefile b/source/blender/nodes/intern/TEX_nodes/Makefile
index 7fad19a772c22e49afa5ca0a3ff0a800c15e72af..ac741280478cc462f97a4ed8c0431307e6dae298 100644
--- a/source/blender/nodes/intern/TEX_nodes/Makefile
+++ b/source/blender/nodes/intern/TEX_nodes/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile 12796 2007-12-05 16:58:52Z sirdude $
+# $Id$
 #
 # ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
 #
diff --git a/source/blender/nodes/intern/TEX_nodes/TEX_image.c b/source/blender/nodes/intern/TEX_nodes/TEX_image.c
index f9477fef12bf9ff84bae30fae2ce117e4b9cd748..b84088da15463f518be2f000b10d0bfe781694b5 100644
--- a/source/blender/nodes/intern/TEX_nodes/TEX_image.c
+++ b/source/blender/nodes/intern/TEX_nodes/TEX_image.c
@@ -1,5 +1,5 @@
 /**
- * $Id: TEX_image.c 10456 2007-04-04 13:58:12Z jesterking $
+ * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
diff --git a/source/blender/nodes/intern/TEX_nodes/TEX_valToRgb.c b/source/blender/nodes/intern/TEX_nodes/TEX_valToRgb.c
index ec59769fdfd9d7bcfc7ed703da6b0ae82eeb6f2b..71d9cb07e184a9312426cbcda74f3a7a19b58d43 100644
--- a/source/blender/nodes/intern/TEX_nodes/TEX_valToRgb.c
+++ b/source/blender/nodes/intern/TEX_nodes/TEX_valToRgb.c
@@ -1,5 +1,5 @@
 /**
- * $Id: SHD_valToRgb.c 10456 2007-04-04 13:58:12Z jesterking $
+ * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
diff --git a/source/blender/python/api2_2x/Particle.c b/source/blender/python/api2_2x/Particle.c
index bbdc3942fc7e64a04bd1145673d3d283f9f39470..c3f2e0f89c055209e452a5a6f0e0acbc2cde3a15 100644
--- a/source/blender/python/api2_2x/Particle.c
+++ b/source/blender/python/api2_2x/Particle.c
@@ -134,6 +134,24 @@ static PyObject *Part_getRenderStep( BPy_PartSys * self );
 static PyObject *Part_getDupOb( BPy_PartSys * self );
 static PyObject *Part_getDrawAs( BPy_PartSys * self );
 static PyObject *Part_GetAge( BPy_PartSys * self, PyObject * args );
+static int Part_setChildAmount( BPy_PartSys * self, PyObject * args );
+static PyObject *Part_getChildAmount( BPy_PartSys * self );
+static int Part_setChildType( BPy_PartSys * self, PyObject * args );
+static PyObject *Part_getChildType( BPy_PartSys * self );
+static int Part_setChildRenderAmount( BPy_PartSys * self, PyObject * args );
+static PyObject *Part_getChildRenderAmount( BPy_PartSys * self );
+static int Part_setChildRadius( BPy_PartSys * self, PyObject * args );
+static PyObject *Part_getChildRadius( BPy_PartSys * self );
+static int Part_setChildRoundness( BPy_PartSys * self, PyObject * args );
+static PyObject *Part_getChildRoundness( BPy_PartSys * self );
+static int Part_setChildClumping( BPy_PartSys * self, PyObject * args );
+static PyObject *Part_getChildClumping( BPy_PartSys * self );
+static int Part_setChildShape( BPy_PartSys * self, PyObject * args );
+static PyObject *Part_getChildShape( BPy_PartSys * self );
+static int Part_setChildSize( BPy_PartSys * self, PyObject * args );
+static PyObject *Part_getChildSize( BPy_PartSys * self );
+static int Part_setChildRandom( BPy_PartSys * self, PyObject * args );
+static PyObject *Part_getChildRandom( BPy_PartSys * self );
 
 /*****************************************************************************/
 /* Python Effect_Type callback function prototypes:                           */
@@ -316,6 +334,43 @@ static PyGetSetDef BPy_ParticleSys_getseters[] = {
 	 (getter)Part_getDrawAs, NULL,
 	 "Get draw type Particle.DRAWAS([ 'NONE' | 'OBJECT' | 'POINT' | ... ] )",
 	 NULL},
+/* Children */
+	{"childAmount",
+	 (getter)Part_getChildAmount, (setter)Part_setChildAmount,
+	 "The total number of children",
+	 NULL},
+	 {"childType",
+	 (getter)Part_getChildType, (setter)Part_setChildType,
+	 "Type of childrens ( Particle.CHILDTYPE[ 'FACES' | 'PARTICLES' | 'NONE' ] )",
+	 NULL},
+	 {"childRenderAmount",
+	 (getter)Part_getChildRenderAmount, (setter)Part_setChildRenderAmount,
+	 "Amount of children/parent for rendering",
+	 NULL},
+	 {"childRadius",
+	 (getter)Part_getChildRadius, (setter)Part_setChildRadius,
+	 "Radius of children around parent",
+	 NULL},
+	 {"childRound",
+	 (getter)Part_getChildRoundness, (setter)Part_setChildRoundness,
+	 "Roundness of children around parent",
+	 NULL},
+	 {"childClump",
+	 (getter)Part_getChildClumping, (setter)Part_setChildClumping,
+	 "Amount of clumpimg",
+	 NULL},
+	 {"childShape",
+	 (getter)Part_getChildShape, (setter)Part_setChildShape,
+	 "Shape of clumpimg",
+	 NULL},
+	 {"childSize",
+	 (getter)Part_getChildSize, (setter)Part_setChildSize,
+	 "A multiplier for the child particle size",
+	 NULL},
+	 {"childRand",
+	 (getter)Part_getChildRandom, (setter)Part_setChildRandom,
+	 "Random variation to the size of the child particles",
+	 NULL},
 	{NULL,NULL,NULL,NULL,NULL}  /* Sentinel */
 };
 
@@ -710,6 +765,26 @@ static PyObject *Particle_ReactOnDict( void )
 	return ReactOn;
 }
 
+
+/* create the Blender.Particle.ChildType constant dict */
+
+static PyObject *Particle_ChildTypeDict( void )
+{
+	PyObject *ChildTypes = PyConstant_New(  );
+
+	if( ChildTypes ) {
+		BPy_constant *c = ( BPy_constant * ) ChildTypes;
+
+		PyConstant_Insert( c, "FACES",
+				 PyInt_FromLong( 2 ) );
+		PyConstant_Insert( c, "PARTICLES",
+				 PyInt_FromLong( 1 ) );
+		PyConstant_Insert( c, "NONE",
+				 PyInt_FromLong( 0 ) );
+	}
+	return ChildTypes;
+}
+
 static PyObject *Particle_DrawAs( void )
 {
 	PyObject *DrawAs = PyConstant_New(  );
@@ -756,6 +831,8 @@ PyObject *ParticleSys_Init( void ){
 	PyObject *EmitFrom;
 	PyObject *Dist;
 	PyObject *DrawAs;
+	PyObject *ChildTypes;
+
 
 	if( PyType_Ready( &ParticleSys_Type ) < 0)
 		return NULL;
@@ -765,6 +842,7 @@ PyObject *ParticleSys_Init( void ){
 	EmitFrom = Particle_EmitFrom();
 	DrawAs = Particle_DrawAs();
 	Dist = Particle_DistrDict();
+	ChildTypes = Particle_ChildTypeDict();
 
 	submodule = Py_InitModule3( "Blender.Particle", 
 								M_ParticleSys_methods, M_ParticleSys_doc );
@@ -779,6 +857,8 @@ PyObject *ParticleSys_Init( void ){
 		PyModule_AddObject( submodule, "DISTRIBUTION", Dist );
 	if( DrawAs )
 		PyModule_AddObject( submodule, "DRAWAS", DrawAs );
+	if( ChildTypes )
+		PyModule_AddObject( submodule, "CHILDTYPE", ChildTypes );
 
 	return ( submodule );
 }
@@ -2010,3 +2090,138 @@ static PyObject *Part_getDrawAs( BPy_PartSys * self )
 {
 	return PyInt_FromLong( (long)( self->psys->part->draw_as ) );
 }
+
+static int Part_setChildAmount( BPy_PartSys * self, PyObject * args )
+{
+	int res = EXPP_setIValueRange( args, &self->psys->part->child_nbr,
+			0, MAX_PART_CHILDREN, 'i' );
+
+	psys_flush_settings( self->psys->part, PSYS_ALLOC, 1 );
+
+	return res;
+}
+
+static PyObject *Part_getChildAmount( BPy_PartSys * self )
+{
+	return PyInt_FromLong( ((int)( self->psys->part->child_nbr )) );
+}
+
+static int Part_setChildType( BPy_PartSys * self, PyObject * args )
+{
+	int res = EXPP_setIValueRange( args, &self->psys->part->childtype,
+			0, 2, 'h' );
+
+	psys_flush_settings( self->psys->part, PSYS_ALLOC, 1 );
+
+	return res;
+}
+
+static PyObject *Part_getChildType( BPy_PartSys * self )
+{
+	return PyInt_FromLong( (short)( self->psys->part->childtype ) );
+}
+
+static int Part_setChildRenderAmount( BPy_PartSys * self, PyObject * args )
+{
+	int res = EXPP_setIValueRange( args, &self->psys->part->ren_child_nbr,
+			0, MAX_PART_CHILDREN, 'i' );
+
+	psys_flush_settings( self->psys->part, PSYS_ALLOC, 1 );
+
+	return res;
+}
+
+static PyObject *Part_getChildRenderAmount( BPy_PartSys * self )
+{
+	return PyInt_FromLong( ((int)( self->psys->part->ren_child_nbr )) );
+}
+
+static int Part_setChildRadius( BPy_PartSys * self, PyObject * args )
+{
+	int res = EXPP_setFloatRange( args, &self->psys->part->childrad,
+			0.0, 10.0 );
+
+	psys_flush_settings( self->psys->part, PSYS_ALLOC, 1 );
+
+	return res;
+}
+
+static PyObject *Part_getChildRadius( BPy_PartSys * self )
+{
+	return PyFloat_FromDouble( ((float)( self->psys->part->childrad )) );
+}
+
+static int Part_setChildRoundness( BPy_PartSys * self, PyObject * args )
+{
+	int res = EXPP_setFloatRange( args, &self->psys->part->childflat,
+			0.0, 1.0 );
+
+	psys_flush_settings( self->psys->part, PSYS_ALLOC, 1 );
+
+	return res;
+}
+
+static PyObject *Part_getChildRoundness( BPy_PartSys * self )
+{
+	return PyFloat_FromDouble( ((float)( self->psys->part->childflat )) );
+}
+
+static int Part_setChildClumping( BPy_PartSys * self, PyObject * args )
+{
+	int res = EXPP_setFloatRange( args, &self->psys->part->clumpfac,
+			-1.0, 1.0 );
+
+	psys_flush_settings( self->psys->part, PSYS_ALLOC, 1 );
+
+	return res;
+}
+
+static PyObject *Part_getChildClumping( BPy_PartSys * self )
+{
+	return PyFloat_FromDouble( ((float)( self->psys->part->clumpfac )) );
+}
+
+static int Part_setChildShape( BPy_PartSys * self, PyObject * args )
+{
+	int res = EXPP_setFloatRange( args, &self->psys->part->clumppow,
+			-0.999, 0.999 );
+
+	psys_flush_settings( self->psys->part, PSYS_ALLOC, 1 );
+
+	return res;
+}
+
+static PyObject *Part_getChildShape( BPy_PartSys * self )
+{
+	return PyFloat_FromDouble( ((float)( self->psys->part->clumppow )) );
+}
+
+static int Part_setChildSize( BPy_PartSys * self, PyObject * args )
+{
+	int res = EXPP_setFloatRange( args, &self->psys->part->childsize,
+			0.01, 100.0 );
+
+	psys_flush_settings( self->psys->part, PSYS_ALLOC, 1 );
+
+	return res;
+}
+
+static PyObject *Part_getChildSize( BPy_PartSys * self )
+{
+	return PyFloat_FromDouble( ((float)( self->psys->part->childsize )) );
+}
+
+static int Part_setChildRandom( BPy_PartSys * self, PyObject * args )
+{
+	int res = EXPP_setFloatRange( args, &self->psys->part->childrandsize,
+			0.0, 1.0 );
+
+	psys_flush_settings( self->psys->part, PSYS_ALLOC, 1 );
+
+	return res;
+}
+
+static PyObject *Part_getChildRandom( BPy_PartSys * self )
+{
+	return PyFloat_FromDouble( ((float)( self->psys->part->childrandsize )) );
+}
diff --git a/source/blender/python/api2_2x/doc/Particle.py b/source/blender/python/api2_2x/doc/Particle.py
index cf662d9147a0ce6518cc32e93bf432253c738818..47bcc7c88a3f35e15ca5286f9c4145b40ec4d1a5 100644
--- a/source/blender/python/api2_2x/doc/Particle.py
+++ b/source/blender/python/api2_2x/doc/Particle.py
@@ -42,6 +42,11 @@ This module provides access to the B{Particle} in Blender.
 		- OBJECT: Draw object
 		- GROUP: Draw goup
 		- BILLBOARD: Draw as billboard 
+@type CHILDTYPE: readonly dictionary
+@var CHILDTYPE: Constant dict used for whith L{Particle.CHILDTYPE}
+		- NONE: set no children
+		- PARTICLES: set children born from particles
+		- FACES: set children born from faces
 """
 
 class Particle:
@@ -118,6 +123,24 @@ class Particle:
 	@type duplicateObject: Blender Object
 	@ivar drawAs: Get draw type Particle.DRAWAS([ 'NONE' | 'OBJECT' | 'POINT' | ... ]).
 	@type drawAs: int
+	@ivar childAmount: The total number of children
+	@type childAmount: int
+	@ivar childType: Type of childrens ( Particle.CHILDTYPE[ 'FACES' | 'PARTICLES' | 'NONE' ] )
+	@type childType: int
+	@ivar childRenderAmount: Amount of children/parent for rendering
+	@type childRenderAmount: int
+	@ivar childRadius: Radius of children around parent
+	@type childRadius: float
+	@ivar childRound: Roundness of children around parent
+	@type childRound: float
+	@ivar childClump: Amount of clumpimg
+	@type childClump: float
+	@ivar childShape: Shape of clumpimg
+	@type childShape: float
+	@ivar childSize: A multiplier for the child particle size
+	@type childSize: float
+	@ivar childRand: Random variation to the size of the child particles
+	@type childRand: float
 	"""
 	
 	def freeEdit():
diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c
index 601acc881de8ec8d5f21ebea0a59da5d62099439..9e474c1961910fd1e98af3d980eefac1f2b9669c 100644
--- a/source/blender/render/intern/source/convertblender.c
+++ b/source/blender/render/intern/source/convertblender.c
@@ -947,11 +947,17 @@ static Material *give_render_material(Render *re, Object *ob, int nr)
 /* ------------------------------------------------------------------------- */
 /* Particles                                                                 */
 /* ------------------------------------------------------------------------- */
-
+typedef struct ParticleStrandData
+{
+	struct MCol *mcol;
+	float *orco, *uvco, *surfnor;
+	float time, adapt_angle, adapt_pix, size;
+	int totuv, totcol;
+	int first, line, adapt, override_uv;
+}
+ParticleStrandData;
 /* future thread problem... */
-static void static_particle_strand(Render *re, ObjectRen *obr, Material *ma, float *orco, float *surfnor,
-								   float *uvco, int totuv, MCol *mcol, int totcol, float *vec, float *vec1, float ctime,
-								   int first, int line, int adapt, float adapt_angle, float adapt_pix, int override_uv)
+static void static_particle_strand(Render *re, ObjectRen *obr, Material *ma, ParticleStrandData *sd, float *vec, float *vec1)
 {
 	static VertRen *v1= NULL, *v2= NULL;
 	VlakRen *vlr;
@@ -974,11 +980,11 @@ static void static_particle_strand(Render *re, ObjectRen *obr, Material *ma, flo
 		float fac;
 		if(ma->strand_ease!=0.0f) {
 			if(ma->strand_ease<0.0f)
-				fac= pow(ctime, 1.0+ma->strand_ease);
+				fac= pow(sd->time, 1.0+ma->strand_ease);
 			else
-				fac= pow(ctime, 1.0/(1.0f-ma->strand_ease));
+				fac= pow(sd->time, 1.0/(1.0f-ma->strand_ease));
 		}
-		else fac= ctime;
+		else fac= sd->time;
 
 		width= ((1.0f-fac)*ma->strand_sta + (fac)*ma->strand_end);
 
@@ -1010,7 +1016,7 @@ static void static_particle_strand(Render *re, ObjectRen *obr, Material *ma, flo
 		flag |= R_STRAND;
 	
 	/* single face line */
-	if(line) {
+	if(sd->line) {
 		vlr= RE_findOrAddVlak(obr, obr->totvlak++);
 		vlr->flag= flag;
 		vlr->v1= RE_findOrAddVert(obr, obr->totvert++);
@@ -1021,25 +1027,25 @@ static void static_particle_strand(Render *re, ObjectRen *obr, Material *ma, flo
 		VECCOPY(vlr->v1->co, vec);
 		VecAddf(vlr->v1->co, vlr->v1->co, cross);
 		VECCOPY(vlr->v1->n, nor);
-		vlr->v1->orco= orco;
+		vlr->v1->orco= sd->orco;
 		vlr->v1->accum= -1.0f;	// accum abuse for strand texco
 		
 		VECCOPY(vlr->v2->co, vec);
 		VecSubf(vlr->v2->co, vlr->v2->co, cross);
 		VECCOPY(vlr->v2->n, nor);
-		vlr->v2->orco= orco;
+		vlr->v2->orco= sd->orco;
 		vlr->v2->accum= vlr->v1->accum;
 
 		VECCOPY(vlr->v4->co, vec1);
 		VecAddf(vlr->v4->co, vlr->v4->co, cross);
 		VECCOPY(vlr->v4->n, nor);
-		vlr->v4->orco= orco;
+		vlr->v4->orco= sd->orco;
 		vlr->v4->accum= 1.0f;	// accum abuse for strand texco
 		
 		VECCOPY(vlr->v3->co, vec1);
 		VecSubf(vlr->v3->co, vlr->v3->co, cross);
 		VECCOPY(vlr->v3->n, nor);
-		vlr->v3->orco= orco;
+		vlr->v3->orco= sd->orco;
 		vlr->v3->accum= vlr->v4->accum;
 
 		CalcNormFloat4(vlr->v4->co, vlr->v3->co, vlr->v2->co, vlr->v1->co, vlr->n);
@@ -1047,23 +1053,23 @@ static void static_particle_strand(Render *re, ObjectRen *obr, Material *ma, flo
 		vlr->mat= ma;
 		vlr->ec= ME_V2V3;
 
-		if(surfnor) {
+		if(sd->surfnor) {
 			float *snor= RE_vlakren_get_surfnor(obr, vlr, 1);
-			VECCOPY(snor, surfnor);
+			VECCOPY(snor, sd->surfnor);
 		}
 
-		if(uvco){
-			for(i=0; i<totuv; i++){
+		if(sd->uvco){
+			for(i=0; i<sd->totuv; i++){
 				MTFace *mtf;
 				mtf=RE_vlakren_get_tface(obr,vlr,i,NULL,1);
 				mtf->uv[0][0]=mtf->uv[1][0]=
-				mtf->uv[2][0]=mtf->uv[3][0]=(uvco+2*i)[0];
+				mtf->uv[2][0]=mtf->uv[3][0]=(sd->uvco+2*i)[0];
 				mtf->uv[0][1]=mtf->uv[1][1]=
-				mtf->uv[2][1]=mtf->uv[3][1]=(uvco+2*i)[1];
+				mtf->uv[2][1]=mtf->uv[3][1]=(sd->uvco+2*i)[1];
 			}
-			if(override_uv>=0){
+			if(sd->override_uv>=0){
 				MTFace *mtf;
-				mtf=RE_vlakren_get_tface(obr,vlr,override_uv,NULL,0);
+				mtf=RE_vlakren_get_tface(obr,vlr,sd->override_uv,NULL,0);
 				
 				mtf->uv[0][0]=mtf->uv[3][0]=0.0f;
 				mtf->uv[1][0]=mtf->uv[2][0]=1.0f;
@@ -1072,18 +1078,18 @@ static void static_particle_strand(Render *re, ObjectRen *obr, Material *ma, flo
 				mtf->uv[2][1]=mtf->uv[3][1]=1.0f;
 			}
 		}
-		if(mcol){
-			for(i=0; i<totcol; i++){
+		if(sd->mcol){
+			for(i=0; i<sd->totcol; i++){
 				MCol *mc;
 				mc=RE_vlakren_get_mcol(obr,vlr,i,NULL,1);
-				mc[0]=mc[1]=mc[2]=mc[3]=mcol[i];
-				mc[0]=mc[1]=mc[2]=mc[3]=mcol[i];
+				mc[0]=mc[1]=mc[2]=mc[3]=sd->mcol[i];
+				mc[0]=mc[1]=mc[2]=mc[3]=sd->mcol[i];
 			}
 		}
 	}
 	/* first two vertices of a strand */
-	else if(first) {
-		if(adapt){
+	else if(sd->first) {
+		if(sd->adapt){
 			VECCOPY(anor, nor);
 			VECCOPY(avec, vec);
 			second=1;
@@ -1095,18 +1101,18 @@ static void static_particle_strand(Render *re, ObjectRen *obr, Material *ma, flo
 		VECCOPY(v1->co, vec);
 		VecAddf(v1->co, v1->co, cross);
 		VECCOPY(v1->n, nor);
-		v1->orco= orco;
+		v1->orco= sd->orco;
 		v1->accum= -1.0f;	// accum abuse for strand texco
 		
 		VECCOPY(v2->co, vec);
 		VecSubf(v2->co, v2->co, cross);
 		VECCOPY(v2->n, nor);
-		v2->orco= orco;
+		v2->orco= sd->orco;
 		v2->accum= v1->accum;
 	}
 	/* more vertices & faces to strand */
 	else {
-		if(adapt==0 || second){
+		if(sd->adapt==0 || second){
 			vlr= RE_findOrAddVlak(obr, obr->totvlak++);
 			vlr->flag= flag;
 			vlr->v1= v1;
@@ -1118,14 +1124,14 @@ static void static_particle_strand(Render *re, ObjectRen *obr, Material *ma, flo
 			v2= vlr->v3; // cycle
 
 			
-			if(adapt){
+			if(sd->adapt){
 				second=0;
 				VECCOPY(anor,nor);
 				VECCOPY(avec,vec);
 			}
 
 		}
-		else if(adapt){
+		else if(sd->adapt){
 			float dvec[3],pvec[3];
 			VecSubf(dvec,avec,vec);
 			Projf(pvec,dvec,vec);
@@ -1135,7 +1141,7 @@ static void static_particle_strand(Render *re, ObjectRen *obr, Material *ma, flo
 			dx= re->winx*dvec[0]*re->winmat[0][0]/w;
 			dy= re->winy*dvec[1]*re->winmat[1][1]/w;
 			w= sqrt(dx*dx + dy*dy);
-			if(Inpf(anor,nor)<adapt_angle && w>adapt_pix){
+			if(Inpf(anor,nor)<sd->adapt_angle && w>sd->adapt_pix){
 				vlr= RE_findOrAddVlak(obr, obr->totvlak++);
 				vlr->flag= flag;
 				vlr->v1= v1;
@@ -1157,13 +1163,13 @@ static void static_particle_strand(Render *re, ObjectRen *obr, Material *ma, flo
 		VECCOPY(vlr->v4->co, vec);
 		VecAddf(vlr->v4->co, vlr->v4->co, cross);
 		VECCOPY(vlr->v4->n, nor);
-		vlr->v4->orco= orco;
-		vlr->v4->accum= -1.0f + 2.0f*ctime;	// accum abuse for strand texco
+		vlr->v4->orco= sd->orco;
+		vlr->v4->accum= -1.0f + 2.0f*sd->time;	// accum abuse for strand texco
 		
 		VECCOPY(vlr->v3->co, vec);
 		VecSubf(vlr->v3->co, vlr->v3->co, cross);
 		VECCOPY(vlr->v3->n, nor);
-		vlr->v3->orco= orco;
+		vlr->v3->orco= sd->orco;
 		vlr->v3->accum= vlr->v4->accum;
 		
 		CalcNormFloat4(vlr->v4->co, vlr->v3->co, vlr->v2->co, vlr->v1->co, vlr->n);
@@ -1171,23 +1177,23 @@ static void static_particle_strand(Render *re, ObjectRen *obr, Material *ma, flo
 		vlr->mat= ma;
 		vlr->ec= ME_V2V3;
 
-		if(surfnor) {
+		if(sd->surfnor) {
 			float *snor= RE_vlakren_get_surfnor(obr, vlr, 1);
-			VECCOPY(snor, surfnor);
+			VECCOPY(snor, sd->surfnor);
 		}
 
-		if(uvco){
-			for(i=0; i<totuv; i++){
+		if(sd->uvco){
+			for(i=0; i<sd->totuv; i++){
 				MTFace *mtf;
 				mtf=RE_vlakren_get_tface(obr,vlr,i,NULL,1);
 				mtf->uv[0][0]=mtf->uv[1][0]=
-				mtf->uv[2][0]=mtf->uv[3][0]=(uvco+2*i)[0];
+				mtf->uv[2][0]=mtf->uv[3][0]=(sd->uvco+2*i)[0];
 				mtf->uv[0][1]=mtf->uv[1][1]=
-				mtf->uv[2][1]=mtf->uv[3][1]=(uvco+2*i)[1];
+				mtf->uv[2][1]=mtf->uv[3][1]=(sd->uvco+2*i)[1];
 			}
-			if(override_uv>=0){
+			if(sd->override_uv>=0){
 				MTFace *mtf;
-				mtf=RE_vlakren_get_tface(obr,vlr,override_uv,NULL,0);
+				mtf=RE_vlakren_get_tface(obr,vlr,sd->override_uv,NULL,0);
 				
 				mtf->uv[0][0]=mtf->uv[3][0]=0.0f;
 				mtf->uv[1][0]=mtf->uv[2][0]=1.0f;
@@ -1196,12 +1202,12 @@ static void static_particle_strand(Render *re, ObjectRen *obr, Material *ma, flo
 				mtf->uv[2][1]=mtf->uv[3][1]=(vlr->v3->accum+1.0f)/2.0f;
 			}
 		}
-		if(mcol){
-			for(i=0; i<totcol; i++){
+		if(sd->mcol){
+			for(i=0; i<sd->totcol; i++){
 				MCol *mc;
 				mc=RE_vlakren_get_mcol(obr,vlr,i,NULL,1);
-				mc[0]=mc[1]=mc[2]=mc[3]=mcol[i];
-				mc[0]=mc[1]=mc[2]=mc[3]=mcol[i];
+				mc[0]=mc[1]=mc[2]=mc[3]=sd->mcol[i];
+				mc[0]=mc[1]=mc[2]=mc[3]=sd->mcol[i];
 			}
 		}
 	}
@@ -1254,17 +1260,13 @@ static void static_particle_wire(ObjectRen *obr, Material *ma, float *vec, float
 	}
 
 }
-static void particle_billboard(Render *re, ObjectRen *obr, Material *ma, Object *bb_ob, float *vec, float *vel, float size, float tilt, short align,
-							   int lock, int p, int totpart, short uv_split, short anim, short split_offset, float random, float pa_time, float offset[2], int uv[3])
+
+static void particle_billboard(Render *re, ObjectRen *obr, Material *ma, ParticleBillboardData *bb)
 {
 	VlakRen *vlr;
 	MTFace *mtf;
-	float xvec[3]={1.0f,0.0f,0.0f}, yvec[3]={0.0f,1.0f,0.0f}, zvec[3];
-	float onevec[3]={0.0f,0.0f,0.0f}, tvec[3],tvec2[3], bb_center[3];
-	float uvx=0.0f, uvy=0.0f, uvdx=1.0f, uvdy=1.0f, time=0.0f;
-
-	if(align<PART_BB_VIEW)
-		onevec[align]=1.0f;
+	float xvec[3], yvec[3], zvec[3], bb_center[3];
+	float uvx = 0.0f, uvy = 0.0f, uvdx = 1.0f, uvdy = 1.0f, time = 0.0f;
 
 	vlr= RE_findOrAddVlak(obr, obr->totvlak++);
 	vlr->v1= RE_findOrAddVert(obr, obr->totvert++);
@@ -1272,74 +1274,23 @@ static void particle_billboard(Render *re, ObjectRen *obr, Material *ma, Object
 	vlr->v3= RE_findOrAddVert(obr, obr->totvert++);
 	vlr->v4= RE_findOrAddVert(obr, obr->totvert++);
 
-	if(lock && align==PART_BB_VIEW){
-		VECCOPY(xvec,bb_ob->obmat[0]);
-		Normalize(xvec);
-		VECCOPY(yvec,bb_ob->obmat[1]);
-		Normalize(yvec);
-		VECCOPY(zvec,bb_ob->obmat[2]);
-		Normalize(zvec);
-	}
-	else if(align==PART_BB_VEL){
-		float temp[3];
-		VECCOPY(temp,vel);
-		Normalize(temp);
-		VECSUB(zvec,bb_ob->obmat[3],vec);
-		if(lock){
-			float fac=-Inpf(zvec,temp);
-			VECADDFAC(zvec,zvec,temp,fac);
-		}
-		Normalize(zvec);
-		Crossf(xvec,temp,zvec);
-		Normalize(xvec);
-		Crossf(yvec,zvec,xvec);
-	}
-	else{
-		VECSUB(zvec,bb_ob->obmat[3],vec);
-		if(lock)
-			zvec[align]=0.0f;
-		Normalize(zvec);
-
-		if(align<PART_BB_VIEW)
-			Crossf(xvec,onevec,zvec);
-		else
-			Crossf(xvec,bb_ob->obmat[1],zvec);
-		Normalize(xvec);
-		Crossf(yvec,zvec,xvec);
-	}
-
-	VECCOPY(tvec,xvec);
-	VECCOPY(tvec2,yvec);
-
-	VecMulf(xvec,cos(tilt*(float)M_PI));
-	VecMulf(tvec2,sin(tilt*(float)M_PI));
-	VECADD(xvec,xvec,tvec2);
-
-	VecMulf(yvec,cos(tilt*(float)M_PI));
-	VecMulf(tvec,-sin(tilt*(float)M_PI));
-	VECADD(yvec,yvec,tvec);
-
-	VecMulf(xvec,size);
-	VecMulf(yvec,size);
+	psys_make_billboard(bb, xvec, yvec, zvec, bb_center);
 
-	VECADDFAC(bb_center,vec,xvec,offset[0]);
-	VECADDFAC(bb_center,bb_center,yvec,offset[1]);
+	VECADD(vlr->v1->co, bb_center, xvec);
+	VECADD(vlr->v1->co, vlr->v1->co, yvec);
+	MTC_Mat4MulVecfl(re->viewmat, vlr->v1->co);
 
-	VECADD(vlr->v1->co,bb_center,xvec);
-	VECADD(vlr->v1->co,vlr->v1->co,yvec);
-	MTC_Mat4MulVecfl(re->viewmat,vlr->v1->co);
+	VECSUB(vlr->v2->co, bb_center, xvec);
+	VECADD(vlr->v2->co, vlr->v2->co, yvec);
+	MTC_Mat4MulVecfl(re->viewmat, vlr->v2->co);
 
-	VECSUB(vlr->v2->co,bb_center,xvec);
-	VECADD(vlr->v2->co,vlr->v2->co,yvec);
-	MTC_Mat4MulVecfl(re->viewmat,vlr->v2->co);
+	VECSUB(vlr->v3->co, bb_center, xvec);
+	VECSUB(vlr->v3->co, vlr->v3->co, yvec);
+	MTC_Mat4MulVecfl(re->viewmat, vlr->v3->co);
 
-	VECSUB(vlr->v3->co,bb_center,xvec);
-	VECSUB(vlr->v3->co,vlr->v3->co,yvec);
-	MTC_Mat4MulVecfl(re->viewmat,vlr->v3->co);
-
-	VECADD(vlr->v4->co,bb_center,xvec);
-	VECSUB(vlr->v4->co,vlr->v4->co,yvec);
-	MTC_Mat4MulVecfl(re->viewmat,vlr->v4->co);
+	VECADD(vlr->v4->co, bb_center, xvec);
+	VECSUB(vlr->v4->co, vlr->v4->co, yvec);
+	MTC_Mat4MulVecfl(re->viewmat, vlr->v4->co);
 
 	CalcNormFloat4(vlr->v4->co, vlr->v3->co, vlr->v2->co, vlr->v1->co, vlr->n);
 	VECCOPY(vlr->v1->n,vlr->n);
@@ -1350,113 +1301,141 @@ static void particle_billboard(Render *re, ObjectRen *obr, Material *ma, Object
 	vlr->mat= ma;
 	vlr->ec= ME_V2V3;
 
-	if(uv_split>1){
-		uvdx=uvdy=1.0f/(float)uv_split;
-		if(anim==PART_BB_ANIM_TIME){
-			if(split_offset==PART_BB_OFF_NONE)
-				time=pa_time;
-			else if(split_offset==PART_BB_OFF_LINEAR)
-				time=(float)fmod(pa_time+(float)p/(float)(uv_split*uv_split),1.0f);
+	if(bb->uv_split > 1){
+		uvdx = uvdy = 1.0f / (float)bb->uv_split;
+		if(bb->anim == PART_BB_ANIM_TIME) {
+			if(bb->split_offset == PART_BB_OFF_NONE)
+				time = bb->time;
+			else if(bb->split_offset == PART_BB_OFF_LINEAR)
+				time = (float)fmod(bb->time + (float)bb->num / (float)(bb->uv_split * bb->uv_split), 1.0f);
 			else /* split_offset==PART_BB_OFF_RANDOM */
-				time=(float)fmod(pa_time+random,1.0f);
+				time = (float)fmod(bb->time + bb->random, 1.0f);
 
 		}
-		else if(anim==PART_BB_ANIM_ANGLE){
-			if(align==PART_BB_VIEW){
-				time=(float)fmod((tilt+1.0f)/2.0f,1.0);
+		else if(bb->anim == PART_BB_ANIM_ANGLE) {
+			if(bb->align == PART_BB_VIEW) {
+				time = (float)fmod((bb->tilt + 1.0f) / 2.0f, 1.0);
 			}
 			else{
-				float axis1[3]={0.0f,0.0f,0.0f};
-				float axis2[3]={0.0f,0.0f,0.0f};
-				axis1[(align+1)%3]=1.0f;
-				axis2[(align+2)%3]=1.0f;
-				if(lock==0){
-					zvec[align]=0.0f;
+				float axis1[3] = {0.0f,0.0f,0.0f};
+				float axis2[3] = {0.0f,0.0f,0.0f};
+				axis1[(bb->align + 1) % 3] = 1.0f;
+				axis2[(bb->align + 2) % 3] = 1.0f;
+				if(bb->lock == 0) {
+					zvec[bb->align] = 0.0f;
 					Normalize(zvec);
 				}
-				time=saacos(Inpf(zvec,axis1))/(float)M_PI;
-				if(Inpf(zvec,axis2)<0.0f)
-					time=1.0f-time/2.0f;
+				time = saacos(Inpf(zvec, axis1)) / (float)M_PI;
+				if(Inpf(zvec, axis2) < 0.0f)
+					time = 1.0f - time / 2.0f;
 				else
-					time=time/2.0f;
+					time = time / 2.0f;
 			}
-			if(split_offset==PART_BB_OFF_LINEAR)
-				time=(float)fmod(pa_time+(float)p/(float)(uv_split*uv_split),1.0f);
-			else if(split_offset==PART_BB_OFF_RANDOM)
-				time=(float)fmod(pa_time+random,1.0f);
+			if(bb->split_offset == PART_BB_OFF_LINEAR)
+				time = (float)fmod(bb->time + (float)bb->num / (float)(bb->uv_split * bb->uv_split), 1.0f);
+			else if(bb->split_offset == PART_BB_OFF_RANDOM)
+				time = (float)fmod(bb->time + bb->random, 1.0f);
 		}
 		else{
-			if(split_offset==PART_BB_OFF_NONE)
-				time=0.0f;
-			else if(split_offset==PART_BB_OFF_LINEAR)
-				time=(float)fmod((float)p/(float)(uv_split*uv_split),1.0f);
+			if(bb->split_offset == PART_BB_OFF_NONE)
+				time = 0.0f;
+			else if(bb->split_offset == PART_BB_OFF_LINEAR)
+				time = (float)fmod((float)bb->num /(float)(bb->uv_split * bb->uv_split) , 1.0f);
 			else /* split_offset==PART_BB_OFF_RANDOM */
-				time=random;
+				time = bb->random;
 		}
-		uvx=uvdx*floor((float)(uv_split*uv_split)*(float)fmod((double)time,(double)uvdx));
-		uvy=uvdy*floor((1.0f-time)*(float)uv_split);
-		if(fmod(time,1.0f/uv_split)==0.0f)
-			uvy-=uvdy;
+		uvx = uvdx * floor((float)(bb->uv_split * bb->uv_split) * (float)fmod((double)time, (double)uvdx));
+		uvy = uvdy * floor((1.0f - time) * (float)bb->uv_split);
+		if(fmod(time, 1.0f / bb->uv_split) == 0.0f)
+			uvy -= uvdy;
 	}
 
 	/* normal UVs */
-	if(uv[0]>=0){
-		mtf=RE_vlakren_get_tface(obr,vlr,uv[0],NULL,1);
-		mtf->uv[0][0]=1.0f;
-		mtf->uv[0][1]=1.0f;
-		mtf->uv[1][0]=0.0f;
-		mtf->uv[1][1]=1.0f;
-		mtf->uv[2][0]=0.0f;
-		mtf->uv[2][1]=0.0f;
-		mtf->uv[3][0]=1.0f;
-		mtf->uv[3][1]=0.0f;
+	if(bb->uv[0] >= 0){
+		mtf = RE_vlakren_get_tface(obr, vlr, bb->uv[0], NULL, 1);
+		mtf->uv[0][0] = 1.0f;
+		mtf->uv[0][1] = 1.0f;
+		mtf->uv[1][0] = 0.0f;
+		mtf->uv[1][1] = 1.0f;
+		mtf->uv[2][0] = 0.0f;
+		mtf->uv[2][1] = 0.0f;
+		mtf->uv[3][0] = 1.0f;
+		mtf->uv[3][1] = 0.0f;
 	}
 
 	/* time-index UVs */
-	if(uv[1]>=0){
-		mtf=RE_vlakren_get_tface(obr,vlr,uv[1],NULL,1);
-		mtf->uv[0][0]=mtf->uv[1][0]=mtf->uv[2][0]=mtf->uv[3][0]=pa_time;
-		mtf->uv[0][1]=mtf->uv[1][1]=mtf->uv[2][1]=mtf->uv[3][1]=(float)p/(float)totpart;
+	if(bb->uv[1] >= 0){
+		mtf = RE_vlakren_get_tface(obr, vlr, bb->uv[1], NULL, 1);
+		mtf->uv[0][0] = mtf->uv[1][0] = mtf->uv[2][0] = mtf->uv[3][0] = bb->time;
+		mtf->uv[0][1] = mtf->uv[1][1] = mtf->uv[2][1] = mtf->uv[3][1] = (float)bb->num/(float)bb->totnum;
 	}
 
 	/* split UVs */
-	if(uv_split>1 && uv[2]>=0){
-		mtf=RE_vlakren_get_tface(obr,vlr,uv[2],NULL,1);
-		mtf->uv[0][0]=uvx+uvdx;
-		mtf->uv[0][1]=uvy+uvdy;
-		mtf->uv[1][0]=uvx;
-		mtf->uv[1][1]=uvy+uvdy;
-		mtf->uv[2][0]=uvx;
-		mtf->uv[2][1]=uvy;
-		mtf->uv[3][0]=uvx+uvdx;
-		mtf->uv[3][1]=uvy;
+	if(bb->uv_split > 1 && bb->uv[2] >= 0){
+		mtf = RE_vlakren_get_tface(obr, vlr, bb->uv[2], NULL, 1);
+		mtf->uv[0][0] = uvx + uvdx;
+		mtf->uv[0][1] = uvy + uvdy;
+		mtf->uv[1][0] = uvx;
+		mtf->uv[1][1] = uvy + uvdy;
+		mtf->uv[2][0] = uvx;
+		mtf->uv[2][1] = uvy;
+		mtf->uv[3][0] = uvx + uvdx;
+		mtf->uv[3][1] = uvy;
 	}
 }
-static void render_new_particle(Render *re, ObjectRen *obr, DerivedMesh *dm, Material *ma, int path, int first, int line,
-								float time, float *loc, float *loc1, float *orco, float *surfnor, int totuv, float *uvco,
-								int totcol, MCol *mcol, float size, int seed, int override_uv,
-								int adapt, float adapt_angle, float adapt_pix)
+static void render_new_particle(Render *re, ObjectRen *obr, DerivedMesh *dm, Material *ma, ParticleStrandData *sd, float *loc, float *loc1,	int seed)
 {
 	HaloRen *har=0;
-	if(path){
-		if(ma->mode&MA_WIRE)
-			static_particle_wire(obr, ma, loc, loc1, first, line);
-		else if(ma->mode & MA_HALO){
-			har= RE_inithalo_particle(re, obr, dm, ma, loc, loc1, orco, uvco, size, 1.0, seed);
-			if(har) har->lay= obr->ob->lay;
+
+	if(ma->mode&MA_WIRE)
+		static_particle_wire(obr, ma, loc, loc1, sd->first, sd->line);
+	else if(ma->mode & MA_HALO){
+		har= RE_inithalo_particle(re, obr, dm, ma, loc, loc1, sd->orco, sd->uvco, sd->size, 1.0, seed);
+		if(har) har->lay= obr->ob->lay;
+	}
+	else
+		static_particle_strand(re, obr, ma, sd, loc, loc1);
+}
+static void get_particle_uvco_mcol(short from, DerivedMesh *dm, float *fuv, int num, ParticleStrandData *sd)
+{
+	int i;
+
+	/* get uvco */
+	if(sd->uvco && ELEM(from,PART_FROM_FACE,PART_FROM_VOLUME)) {
+		for(i=0; i<sd->totuv; i++) {
+			if(num != DMCACHE_NOTFOUND) {
+				MFace *mface = dm->getFaceData(dm, num, CD_MFACE);
+				MTFace *mtface = (MTFace*)CustomData_get_layer_n(&dm->faceData, CD_MTFACE, i);
+				mtface += num;
+				
+				psys_interpolate_uvs(mtface, mface->v4, fuv, sd->uvco + 2 * i);
+			}
+			else {
+				sd->uvco[2*i] = 0.0f;
+				sd->uvco[2*i + 1] = 0.0f;
+			}
 		}
-		else
-			static_particle_strand(re, obr, ma, orco, surfnor, uvco, totuv, mcol, totcol, loc, loc1, time, first, line, adapt, adapt_angle, adapt_pix, override_uv);
 	}
-	else{
-		har= RE_inithalo_particle(re, obr, dm, ma, loc, NULL, orco, uvco, size, 0.0, seed);
-		if(har) har->lay= obr->ob->lay;
+
+	/* get mcol */
+	if(sd->mcol && ELEM(from,PART_FROM_FACE,PART_FROM_VOLUME)) {
+		for(i=0; i<sd->totcol; i++) {
+			if(num != DMCACHE_NOTFOUND) {
+				MFace *mface = dm->getFaceData(dm, num, CD_MFACE);
+				MCol *mc = (MCol*)CustomData_get_layer_n(&dm->faceData, CD_MCOL, i);
+				mc += num * 4;
+
+				psys_interpolate_mcol(mc, mface->v4, fuv, sd->mcol + i);
+			}
+			else
+				memset(&sd->mcol[i], 0, sizeof(MCol));
+		}
 	}
 }
 static int render_new_particle_system(Render *re, ObjectRen *obr, ParticleSystem *psys, int timeoffset)
 {
 	Object *ob= obr->ob;
-	Object *tob=0, *bb_ob=re->scene->camera;
+	Object *tob=0;
 	Material *ma=0;
 	MTFace *mtface;
 	ParticleSystemModifierData *psmd;
@@ -1466,19 +1445,20 @@ static int render_new_particle_system(Render *re, ObjectRen *obr, ParticleSystem
 	ParticleKey *states=0;
 	ParticleKey state;
 	ParticleCacheKey *cache=0;
+	ParticleBillboardData bb;
+	ParticleStrandData sd;
 	StrandBuffer *strandbuf=0;
 	StrandVert *svert=0;
 	StrandBound *sbound= 0;
 	StrandRen *strand=0;
 	RNG *rng= 0;
-	MCol *mcol= 0;
 	float loc[3],loc1[3],loc0[3],vel[3],mat[4][4],nmat[3][3],co[3],nor[3],time;
-	float *orco=0,*surfnor=0,*uvco=0, strandlen=0.0f, curlen=0.0f;
+	float strandlen=0.0f, curlen=0.0f;
 	float hasize, pa_size, pa_time, r_tilt, cfra=bsystem_time(ob,(float)CFRA,0.0);
-	float adapt_angle=0.0, adapt_pix=0.0, random, simplify[2];
-	int i, a, k, max_k=0, totpart, totuv=0, totcol=0, override_uv=-1, dosimplify = 0, dosurfacecache = 0;
-	int path_possible=0, keys_possible=0, baked_keys=0, totchild=0;
-	int seed, path_nbr=0, path=0, orco1=0, adapt=0, uv[3]={0,0,0}, num;
+	float random, simplify[2];
+	int i, a, k, max_k=0, totpart, dosimplify = 0, dosurfacecache = 0;
+	int totchild=0;
+	int seed, path_nbr=0, orco1=0, num;
 	int totface, *origindex = 0;
 	char **uv_name=0;
 
@@ -1505,6 +1485,7 @@ static int render_new_particle_system(Render *re, ObjectRen *obr, ParticleSystem
 			return 1;
 	}
 
+	/* last possibility to bail out! */
 	psmd= psys_get_modifier(ob,psys);
 	if(!(psmd->modifier.mode & eModifierMode_Render))
 		return 0;
@@ -1513,182 +1494,182 @@ static int render_new_particle_system(Render *re, ObjectRen *obr, ParticleSystem
 		totchild = (int)((float)totchild * (float)part->disp / 100.0f);
 	}
 
-	psys->flag|=PSYS_DRAWING;
+	psys->flag |= PSYS_DRAWING;
 
 	rng= rng_new(psys->seed);
-	
-	ma= give_render_material(re, ob, part->omat);
 
-	if(part->bb_ob)
-		bb_ob=part->bb_ob;
+	totpart=psys->totpart;
+
+	memset(&sd, 0, sizeof(ParticleStrandData));
+	sd.override_uv = -1;
+
+/* 2.1 setup material stff */
+	ma= give_render_material(re, ob, part->omat);
 	
 	if(ma->ipo){
 		calc_ipo(ma->ipo, cfra);
 		execute_ipo((ID *)ma, ma->ipo);
 	}
 
+	hasize = ma->hasize;
+	seed = ma->seed1;
+
+	re->flag |= R_HALO;
+
 	RE_set_customdata_names(obr, &psmd->dm->faceData);
-	totuv=CustomData_number_of_layers(&psmd->dm->faceData,CD_MTFACE);
-	totcol=CustomData_number_of_layers(&psmd->dm->faceData,CD_MCOL);
+	sd.totuv = CustomData_number_of_layers(&psmd->dm->faceData, CD_MTFACE);
+	sd.totcol = CustomData_number_of_layers(&psmd->dm->faceData, CD_MCOL);
 
-	if(ma->texco & TEXCO_UV && totuv) {
-		uvco = MEM_callocN(totuv*2*sizeof(float),"particle_uvs");
+	if(ma->texco & TEXCO_UV && sd.totuv) {
+		sd.uvco = MEM_callocN(sd.totuv * 2 * sizeof(float), "particle_uvs");
 
 		if(ma->strand_uvname[0]) {
-			override_uv= CustomData_get_named_layer_index(&psmd->dm->faceData,CD_MTFACE,ma->strand_uvname);
-			override_uv-= CustomData_get_layer_index(&psmd->dm->faceData,CD_MTFACE);
+			sd.override_uv = CustomData_get_named_layer_index(&psmd->dm->faceData, CD_MTFACE, ma->strand_uvname);
+			sd.override_uv -= CustomData_get_layer_index(&psmd->dm->faceData, CD_MTFACE);
 		}
 	}
+	else
+		sd.uvco = NULL;
 
-	if(totcol)
-		mcol = MEM_callocN(totcol*sizeof(MCol),"particle_mcols");
+	if(sd.totcol)
+		sd.mcol = MEM_callocN(sd.totcol * sizeof(MCol), "particle_mcols");
 
-	if(part->draw_as==PART_DRAW_BB){
-		int first_uv=CustomData_get_layer_index(&psmd->dm->faceData,CD_MTFACE);
+/* 2.2 setup billboards */
+	if(part->draw_as == PART_DRAW_BB) {
+		int first_uv = CustomData_get_layer_index(&psmd->dm->faceData, CD_MTFACE);
 
-		uv[0]=CustomData_get_named_layer_index(&psmd->dm->faceData,CD_MTFACE,psys->bb_uvname[0]);
-		if(uv[0]<0)
-			uv[0]=CustomData_get_active_layer_index(&psmd->dm->faceData,CD_MTFACE);
+		bb.uv[0] = CustomData_get_named_layer_index(&psmd->dm->faceData, CD_MTFACE, psys->bb_uvname[0]);
+		if(bb.uv[0] < 0)
+			bb.uv[0] = CustomData_get_active_layer_index(&psmd->dm->faceData, CD_MTFACE);
 
-		uv[1]=CustomData_get_named_layer_index(&psmd->dm->faceData,CD_MTFACE,psys->bb_uvname[1]);
-		//if(uv[1]<0)
-		//	uv[1]=CustomData_get_active_layer_index(&psmd->dm->faceData,CD_MTFACE);
+		bb.uv[1] = CustomData_get_named_layer_index(&psmd->dm->faceData, CD_MTFACE, psys->bb_uvname[1]);
 
-		uv[2]=CustomData_get_named_layer_index(&psmd->dm->faceData,CD_MTFACE,psys->bb_uvname[2]);
-		//if(uv[2]<0)
-		//	uv[2]=CustomData_get_active_layer_index(&psmd->dm->faceData,CD_MTFACE);
+		bb.uv[2] = CustomData_get_named_layer_index(&psmd->dm->faceData, CD_MTFACE, psys->bb_uvname[2]);
 
-		if(first_uv>=0){
-			uv[0]-=first_uv;
-			uv[1]-=first_uv;
-			uv[2]-=first_uv;
+		if(first_uv >= 0) {
+			bb.uv[0] -= first_uv;
+			bb.uv[1] -= first_uv;
+			bb.uv[2] -= first_uv;
 		}
+
+		bb.align = part->bb_align;
+		bb.anim = part->bb_anim;
+		bb.lock = part->draw & PART_DRAW_BB_LOCK;
+		bb.ob = (part->bb_ob ? part->bb_ob : re->scene->camera);
+		bb.offset[0] = part->bb_offset[0];
+		bb.offset[1] = part->bb_offset[1];
+		bb.split_offset = part->bb_split_offset;
+		bb.totnum = totpart+totchild;
+		bb.uv_split = part->bb_uv_split;
 	}
 
-	if(part->flag&PART_ABS_TIME && part->ipo){
+/* 2.3 setup time */
+	if(part->flag&PART_ABS_TIME && part->ipo) {
 		calc_ipo(part->ipo, cfra);
 		execute_ipo((ID *)part, part->ipo);
 	}
 
-	if(part->flag&PART_GLOB_TIME)
-		cfra=bsystem_time(0,(float)CFRA,0.0);
+	if(part->flag & PART_GLOB_TIME)
+		cfra = bsystem_time(0, (float)CFRA, 0.0);
 
-	if(part->type==PART_REACTOR){
+/* 2.4 setup reactors */
+	if(part->type == PART_REACTOR){
 		psys_get_reactor_target(ob, psys, &tob, &tpsys);
 		if(tpsys && (part->from==PART_FROM_PARTICLE || part->phystype==PART_PHYS_NO)){
-			psmd=psys_get_modifier(tob,tpsys);
-			tpart=tpsys->part;
+			psmd = psys_get_modifier(tob,tpsys);
+			tpart = tpsys->part;
 		}
 	}
-
-	hasize = ma->hasize;
-	seed = ma->seed1;
-
-	re->flag |= R_HALO;
 	
+/* 2.5 setup matrices */
 	MTC_Mat4MulMat4(mat, ob->obmat, re->viewmat);
 	MTC_Mat4Invert(ob->imat, mat);	/* need to be that way, for imat texture */
 	Mat3CpyMat4(nmat, ob->imat);
 	Mat3Transp(nmat);
 
-	totpart=psys->totpart;
+/* 2.6 setup strand rendering */
+	if(part->draw_as == PART_DRAW_PATH && psys->pathcache){
+		path_nbr=(int)pow(2.0,(double) part->ren_step);
 
-	if(psys->pathcache){
-		path_possible=1;
-		keys_possible=1;
-	}
-	if(part->draw_as==PART_DRAW_PATH){
-		if(path_possible){
-			path_nbr=(int)pow(2.0,(double) part->ren_step);
-			//if(part->phystype==PART_PHYS_KEYED && (psys->flag&PSYS_BAKED)==0)
-			//	path_nbr*=psys->totkeyed;
-
-			if(path_nbr) {
-				if((ma->mode & (MA_HALO|MA_WIRE))==0) {
-					orco= MEM_mallocN(3*sizeof(float)*(totpart+totchild), "particle orcos");
-					set_object_orco(re, psys, orco);
-				}
-				path=1;
+		if(path_nbr) {
+			if((ma->mode & (MA_HALO|MA_WIRE))==0) {
+				sd.orco = MEM_mallocN(3*sizeof(float)*(totpart+totchild), "particle orcos");
+				set_object_orco(re, psys, sd.orco);
 			}
+		}
 
-			if(part->draw&PART_DRAW_REN_ADAPT) {
-				adapt=1;
-				adapt_pix=(float)part->adapt_pix;
-				adapt_angle=cos((float)part->adapt_angle*(float)(M_PI/180.0));
-			}
+		if(part->draw & PART_DRAW_REN_ADAPT) {
+			sd.adapt = 1;
+			sd.adapt_pix = (float)part->adapt_pix;
+			sd.adapt_angle = cos((float)part->adapt_angle * (float)(M_PI / 180.0));
+		}
 
-			if(re->r.renderer==R_INTERN && part->draw&PART_DRAW_REN_STRAND) {
-				strandbuf= RE_addStrandBuffer(obr, (totpart+totchild)*(path_nbr+1));
-				strandbuf->ma= ma;
-				strandbuf->lay= ob->lay;
-				Mat4CpyMat4(strandbuf->winmat, re->winmat);
-				strandbuf->winx= re->winx;
-				strandbuf->winy= re->winy;
-				strandbuf->maxdepth= 2;
-				strandbuf->adaptcos= cos((float)part->adapt_angle*(float)(M_PI/180.0));
-				strandbuf->overrideuv= override_uv;
-				strandbuf->minwidth= ma->strand_min;
-
-				if(ma->strand_widthfade == 0.0f)
-					strandbuf->widthfade= 0.0f;
-				else if(ma->strand_widthfade >= 1.0f)
-					strandbuf->widthfade= 2.0f - ma->strand_widthfade;
-				else
-					strandbuf->widthfade= 1.0f/MAX2(ma->strand_widthfade, 1e-5f);
+		if(re->r.renderer==R_INTERN && part->draw&PART_DRAW_REN_STRAND) {
+			strandbuf= RE_addStrandBuffer(obr, (totpart+totchild)*(path_nbr+1));
+			strandbuf->ma= ma;
+			strandbuf->lay= ob->lay;
+			Mat4CpyMat4(strandbuf->winmat, re->winmat);
+			strandbuf->winx= re->winx;
+			strandbuf->winy= re->winy;
+			strandbuf->maxdepth= 2;
+			strandbuf->adaptcos= cos((float)part->adapt_angle*(float)(M_PI/180.0));
+			strandbuf->overrideuv= sd.override_uv;
+			strandbuf->minwidth= ma->strand_min;
+
+			if(ma->strand_widthfade == 0.0f)
+				strandbuf->widthfade= 0.0f;
+			else if(ma->strand_widthfade >= 1.0f)
+				strandbuf->widthfade= 2.0f - ma->strand_widthfade;
+			else
+				strandbuf->widthfade= 1.0f/MAX2(ma->strand_widthfade, 1e-5f);
 
-				if(part->flag & PART_HAIR_BSPLINE)
-					strandbuf->flag |= R_STRAND_BSPLINE;
-				if(ma->mode & MA_STR_B_UNITS)
-					strandbuf->flag |= R_STRAND_B_UNITS;
+			if(part->flag & PART_HAIR_BSPLINE)
+				strandbuf->flag |= R_STRAND_BSPLINE;
+			if(ma->mode & MA_STR_B_UNITS)
+				strandbuf->flag |= R_STRAND_B_UNITS;
 
-				svert= strandbuf->vert;
+			svert= strandbuf->vert;
 
-				if(re->r.mode & R_SPEED)
+			if(re->r.mode & R_SPEED)
+				dosurfacecache= 1;
+			else if((re->wrld.mode & WO_AMB_OCC) && (re->wrld.ao_gather_method == WO_AOGATHER_APPROX))
+				if(ma->amb != 0.0f)
 					dosurfacecache= 1;
-				else if((re->wrld.mode & WO_AMB_OCC) && (re->wrld.ao_gather_method == WO_AOGATHER_APPROX))
-					if(ma->amb != 0.0f)
-						dosurfacecache= 1;
-
-				totface= psmd->dm->getNumFaces(psmd->dm);
-				origindex= psmd->dm->getFaceDataArray(psmd->dm, CD_ORIGINDEX);
-				if(origindex) {
-					for(a=0; a<totface; a++)
-						strandbuf->totbound= MAX2(strandbuf->totbound, origindex[a]);
-					strandbuf->totbound++;
-				}
+
+			totface= psmd->dm->getNumFaces(psmd->dm);
+			origindex= psmd->dm->getFaceDataArray(psmd->dm, CD_ORIGINDEX);
+			if(origindex) {
+				for(a=0; a<totface; a++)
+					strandbuf->totbound= MAX2(strandbuf->totbound, origindex[a]);
 				strandbuf->totbound++;
-				strandbuf->bound= MEM_callocN(sizeof(StrandBound)*strandbuf->totbound, "StrandBound");
-				sbound= strandbuf->bound;
-				sbound->start= sbound->end= 0;
 			}
+			strandbuf->totbound++;
+			strandbuf->bound= MEM_callocN(sizeof(StrandBound)*strandbuf->totbound, "StrandBound");
+			sbound= strandbuf->bound;
+			sbound->start= sbound->end= 0;
 		}
 	}
-	else if(keys_possible && part->draw&PART_DRAW_KEYS){
-		path_nbr=part->keys_step;
-		if(path_nbr==0)
-			baked_keys=1;
-	}
 
-	if(orco==0){
-		orco=MEM_mallocN(3*sizeof(float),"particle orco");
-		orco1=1;
+	if(sd.orco == 0) {
+		sd.orco = MEM_mallocN(3 * sizeof(float), "particle orco");
+		orco1 = 1;
 	}
 
-	if(path_nbr==0)
-		psys->lattice=psys_get_lattice(ob,psys);
+	if(path_nbr == 0)
+		psys->lattice = psys_get_lattice(ob, psys);
 
 /* 3. start creating renderable things */
 	for(a=0,pa=pars; a<totpart+totchild; a++, pa++, seed++) {
 		random = rng_getFloat(rng);
-
+		/* setup per particle individual stuff */
 		if(a<totpart){
 			if(pa->flag & PARS_UNEXIST) continue;
 
 			pa_time=(cfra-pa->time)/pa->lifetime;
-			if((part->flag&PART_ABS_TIME)==0){
-				if(ma->ipo){
+			if((part->flag&PART_ABS_TIME) == 0) {
+				if(ma->ipo) {
 					/* correction for lifetime */
-					calc_ipo(ma->ipo, 100.0f*pa_time);
+					calc_ipo(ma->ipo, 100.0f * pa_time);
 					execute_ipo((ID *)ma, ma->ipo);
 				}
 				if(part->ipo){
@@ -1703,51 +1684,25 @@ static int render_new_particle_system(Render *re, ObjectRen *obr, ParticleSystem
 			/* get orco */
 			if(tpsys && (part->from==PART_FROM_PARTICLE || part->phystype==PART_PHYS_NO)){
 				tpa=tpsys->particles+pa->num;
-				psys_particle_on_emitter(psmd,tpart->from,tpa->num,pa->num_dmcache,tpa->fuv,tpa->foffset,co,nor,0,0,orco,0);
+				psys_particle_on_emitter(psmd,tpart->from,tpa->num,pa->num_dmcache,tpa->fuv,tpa->foffset,co,nor,0,0,sd.orco,0);
 			}
 			else
-				psys_particle_on_emitter(psmd,part->from,pa->num,pa->num_dmcache,pa->fuv,pa->foffset,co,nor,0,0,orco,0);
+				psys_particle_on_emitter(psmd,part->from,pa->num,pa->num_dmcache,pa->fuv,pa->foffset,co,nor,0,0,sd.orco,0);
 
+			/* get uvco & mcol */
 			num= pa->num_dmcache;
 
 			if(num == DMCACHE_NOTFOUND)
 				if(pa->num < psmd->dm->getNumFaces(psmd->dm))
 					num= pa->num;
 
-			if(uvco && ELEM(part->from,PART_FROM_FACE,PART_FROM_VOLUME)){
-				for(i=0; i<totuv; i++){
-					if(num != DMCACHE_NOTFOUND) {
-						MFace *mface=psmd->dm->getFaceData(psmd->dm,num,CD_MFACE);
-						mtface=(MTFace*)CustomData_get_layer_n(&psmd->dm->faceData,CD_MTFACE,i);
-						mtface+=num;
-						
-						psys_interpolate_uvs(mtface,mface->v4,pa->fuv,uvco+2*i);
-					}
-					else {
-						uvco[2*i]= 0.0f;
-						uvco[2*i + 1]= 0.0f;
-					}
-				}
-			}
-			if(mcol && ELEM(part->from,PART_FROM_FACE,PART_FROM_VOLUME)){
-				for(i=0; i<totcol; i++){
-					if(num != DMCACHE_NOTFOUND) {
-						MFace *mface=psmd->dm->getFaceData(psmd->dm,num,CD_MFACE);
-						MCol *mc=(MCol*)CustomData_get_layer_n(&psmd->dm->faceData,CD_MCOL,i);
-						mc+=num*4;
-
-						psys_interpolate_mcol(mc,mface->v4,pa->fuv,mcol+i);
-					}
-					else
-						memset(&mcol[i], 0, sizeof(MCol));
-				}
-			}
+			get_particle_uvco_mcol(part->from, psmd->dm, pa->fuv, num, &sd);
 
-			pa_size=pa->size;
+			pa_size = pa->size;
 
-			r_tilt=1.0f+pa->r_ave[0];
+			r_tilt = 1.0f + pa->r_ave[0];
 
-			if(path_nbr){
+			if(path_nbr) {
 				cache = psys->pathcache[a];
 				max_k = (int)cache->steps;
 			}
@@ -1756,123 +1711,67 @@ static int render_new_particle_system(Render *re, ObjectRen *obr, ParticleSystem
 		}
 		else {
 			ChildParticle *cpa= psys->child+a-totpart;
+
+			if(path_nbr) {
+				cache = psys->childcache[a-totpart];
+
+				if(cache->steps < 0)
+					continue;
+
+				max_k = (int)cache->steps;
+			}
 			
-			pa_time=psys_get_child_time(psys, cpa, cfra);
+			pa_time = psys_get_child_time(psys, cpa, cfra);
 
-			if((part->flag&PART_ABS_TIME)==0){
-				if(ma->ipo){
+			if((part->flag & PART_ABS_TIME) == 0) {
+				if(ma->ipo) {
 					/* correction for lifetime */
-					calc_ipo(ma->ipo, 100.0f*pa_time);
+					calc_ipo(ma->ipo, 100.0f * pa_time);
 					execute_ipo((ID *)ma, ma->ipo);
 				}
-				if(part->ipo){
+				if(part->ipo) {
 					/* correction for lifetime */
-					calc_ipo(part->ipo, 100.0f*pa_time);
+					calc_ipo(part->ipo, 100.0f * pa_time);
 					execute_ipo((ID *)part, part->ipo);
 				}
 			}
 
-			pa_size=psys_get_child_size(psys, cpa, cfra, &pa_time);
+			pa_size = psys_get_child_size(psys, cpa, cfra, &pa_time);
 
-			r_tilt=2.0f*cpa->rand[2];
+			r_tilt = 2.0f * cpa->rand[2];
 
-			num= cpa->num;
+			num = cpa->num;
 
 			/* get orco */
 			if(part->childtype == PART_CHILD_FACES) {
 				psys_particle_on_emitter(psmd,
 					PART_FROM_FACE, cpa->num,DMCACHE_ISCHILD,
-					cpa->fuv,cpa->foffset,co,nor,0,0,orco,0);
+					cpa->fuv,cpa->foffset,co,nor,0,0,sd.orco,0);
 			}
 			else {
 				ParticleData *par = psys->particles + cpa->parent;
 				psys_particle_on_emitter(psmd, part->from,
 					par->num,DMCACHE_ISCHILD,par->fuv,
-					par->foffset,co,nor,0,0,orco,0);
+					par->foffset,co,nor,0,0,sd.orco,0);
 			}
 
-			if(uvco){
-				if(part->from!=PART_FROM_PARTICLE && part->childtype==PART_CHILD_FACES){
-					for(i=0; i<totuv; i++){
-						if(part->childtype==PART_CHILD_FACES){
-							MFace *mface=psmd->dm->getFaceData(psmd->dm,cpa->num,CD_MFACE);
-
-							mtface=(MTFace*)CustomData_get_layer_n(&psmd->dm->faceData,CD_MTFACE,i);
-							mtface+=cpa->num;
-							
-							psys_interpolate_uvs(mtface,mface->v4,cpa->fuv,uvco+2*i);
-						}
-						else{
-							uvco[2*i]=uvco[2*i+1]=0.0f;
-						}
-					}
-				}
-				else if(ELEM(part->from,PART_FROM_FACE,PART_FROM_VOLUME)){
-					ParticleData *parent = psys->particles + cpa->parent;
-					num= parent->num_dmcache;
-
-					if(num == DMCACHE_NOTFOUND)
-						if(parent->num < psmd->dm->getNumFaces(psmd->dm))
-							num= parent->num;
-
-					for(i=0; i<totuv; i++) {
-						if(num != DMCACHE_NOTFOUND) {
-							MFace *mface=psmd->dm->getFaceData(psmd->dm,num,CD_MFACE);
-							mtface=(MTFace*)CustomData_get_layer_n(&psmd->dm->faceData,CD_MTFACE,i);
-							mtface+=num;
-							psys_interpolate_uvs(mtface,mface->v4,parent->fuv,uvco+2*i);
-						}
-						else {
-							uvco[2*i]= 0.0f;
-							uvco[2*i + 1]= 0.0f;
-						}
-					}
-				}
-			}
-
-			if(mcol){
-				if(part->from!=PART_FROM_PARTICLE && part->childtype==PART_CHILD_FACES){
-					for(i=0; i<totcol; i++){
-						if(part->childtype==PART_CHILD_FACES){
-							MFace *mface=psmd->dm->getFaceData(psmd->dm,cpa->num,CD_MFACE);
-							MCol *mc=(MCol*)CustomData_get_layer_n(&psmd->dm->faceData,CD_MCOL,i);
-							mc+=cpa->num*4;
-							
-							psys_interpolate_mcol(mc,mface->v4,cpa->fuv,mcol+i);
-						}
-						else
-							memset(&mcol[i], 0, sizeof(MCol));
-					}
-				}
-				else if(ELEM(part->from,PART_FROM_FACE,PART_FROM_VOLUME)){
-					ParticleData *parent = psys->particles + cpa->parent;
-					num= parent->num_dmcache;
-
-					if(num == DMCACHE_NOTFOUND)
-						if(parent->num < psmd->dm->getNumFaces(psmd->dm))
-							num= parent->num;
-
-					for(i=0; i<totcol; i++){
-						if(num != DMCACHE_NOTFOUND) {
-							MFace *mface=psmd->dm->getFaceData(psmd->dm,num,CD_MFACE);
-							MCol *mc=(MCol*)CustomData_get_layer_n(&psmd->dm->faceData,CD_MCOL,i);
-							mc+=num*4;
-							
-							psys_interpolate_mcol(mc,mface->v4,parent->fuv,mcol+i);
-						}
-						else
-							memset(&mcol[i], 0, sizeof(MCol));
-					}
-				}
+			/* get uvco & mcol */
+			if(part->from!=PART_FROM_PARTICLE && part->childtype==PART_CHILD_FACES) {
+				get_particle_uvco_mcol(PART_FROM_FACE, psmd->dm, cpa->fuv, cpa->num, &sd);
 			}
+			else {
+				ParticleData *parent = psys->particles + cpa->parent;
+				num = parent->num_dmcache;
 
-			dosimplify= psys_render_simplify_params(psys, cpa, simplify);
+				if(num == DMCACHE_NOTFOUND)
+					if(parent->num < psmd->dm->getNumFaces(psmd->dm))
+						num = parent->num;
 
-			if(path_nbr && psys->childcache) {
-				cache = psys->childcache[a-totpart];
-				max_k = (int)cache->steps;
+				get_particle_uvco_mcol(part->from, psmd->dm, pa->fuv, num, &sd);
 			}
 
+			dosimplify = psys_render_simplify_params(psys, cpa, simplify);
+
 			if(strandbuf) {
 				if(origindex[cpa->num]+1 > sbound - strandbuf->bound) {
 					sbound= strandbuf->bound + origindex[cpa->num]+1;
@@ -1884,17 +1783,17 @@ static int render_new_particle_system(Render *re, ObjectRen *obr, ParticleSystem
 		/* surface normal shading setup */
 		if(ma->mode_l & MA_STR_SURFDIFF) {
 			Mat3MulVecfl(nmat, nor);
-			surfnor= nor;
+			sd.surfnor= nor;
 		}
 		else
-			surfnor= NULL;
+			sd.surfnor= NULL;
 
 		/* strand render setup */
 		if(strandbuf) {
 			strand= RE_findOrAddStrand(obr, obr->totstrand++);
 			strand->buffer= strandbuf;
 			strand->vert= svert;
-			VECCOPY(strand->orco, orco);
+			VECCOPY(strand->orco, sd.orco);
 
 			if(dosimplify) {
 				float *ssimplify= RE_strandren_get_simplify(obr, strand, 1);
@@ -1902,9 +1801,9 @@ static int render_new_particle_system(Render *re, ObjectRen *obr, ParticleSystem
 				ssimplify[1]= simplify[1];
 			}
 
-			if(surfnor) {
+			if(sd.surfnor) {
 				float *snor= RE_strandren_get_surfnor(obr, strand, 1);
-				VECCOPY(snor, surfnor);
+				VECCOPY(snor, sd.surfnor);
 			}
 
 			if(dosurfacecache && num >= 0) {
@@ -1912,20 +1811,20 @@ static int render_new_particle_system(Render *re, ObjectRen *obr, ParticleSystem
 				*facenum= num;
 			}
 
-			if(uvco) {
-				for(i=0; i<totuv; i++) {
-					if(i != override_uv) {
+			if(sd.uvco) {
+				for(i=0; i<sd.totuv; i++) {
+					if(i != sd.override_uv) {
 						float *uv= RE_strandren_get_uv(obr, strand, i, NULL, 1);
 
-						uv[0]= uvco[2*i];
-						uv[1]= uvco[2*i+1];
+						uv[0]= sd.uvco[2*i];
+						uv[1]= sd.uvco[2*i+1];
 					}
 				}
 			}
-			if(mcol) {
-				for(i=0; i<totcol; i++) {
+			if(sd.mcol) {
+				for(i=0; i<sd.totcol; i++) {
 					MCol *mc= RE_strandren_get_mcol(obr, strand, i, NULL, 1);
-					*mc = mcol[i];
+					*mc = sd.mcol[i];
 				}
 			}
 
@@ -1941,11 +1840,10 @@ static int render_new_particle_system(Render *re, ObjectRen *obr, ParticleSystem
 					strandlen += VecLenf((cache+k-1)->co, (cache+k)->co);
 		}
 
-		for(k=0; k<=path_nbr; k++){
-			if(path_nbr){
+		if(path_nbr) {
+			/* render strands */
+			for(k=0; k<=path_nbr; k++){
 				if(k<=max_k){
-					//bti->convert_bake_key(bsys,cache+k,0,(void*)&state);
-					//copy_particle_key(&state,cache+k,0);
 					VECCOPY(state.co,(cache+k)->co);
 					VECCOPY(state.vel,(cache+k)->vel);
 				}
@@ -1955,65 +1853,95 @@ static int render_new_particle_system(Render *re, ObjectRen *obr, ParticleSystem
 				if(k > 0)
 					curlen += VecLenf((cache+k-1)->co, (cache+k)->co);
 				time= curlen/strandlen;
-			}
-			else{
-				time=0.0f;
-				state.time=cfra;
-				if(psys_get_particle_state(ob,psys,a,&state,0)==0)
-					continue;
+
+				VECCOPY(loc,state.co);
+				MTC_Mat4MulVecfl(re->viewmat,loc);
+
+				if(strandbuf) {
+					VECCOPY(svert->co, loc);
+					svert->strandco= -1.0f + 2.0f*time;
+					svert++;
+					strand->totvert++;
+				}
+				else{
+					sd.first = 0;
+					sd.time = time;
+					sd.size = hasize;
+
+					if(k==1){
+						sd.first = 1;
+						sd.time = 0.0f;
+						VECSUB(loc0,loc1,loc);
+						VECADD(loc0,loc1,loc0);
+					}
+
+					if(k)
+						render_new_particle(re, obr, psmd->dm, ma, &sd, loc, loc1, seed);
+
+					VECCOPY(loc1,loc);
+				}
 			}
 
+		}
+		else {
+			/* render normal particles */
+			time=0.0f;
+			state.time=cfra;
+			if(psys_get_particle_state(ob,psys,a,&state,0)==0)
+				continue;
+
 			VECCOPY(loc,state.co);
 			if(part->draw_as!=PART_DRAW_BB)
 				MTC_Mat4MulVecfl(re->viewmat,loc);
 
-			if(part->draw_as==PART_DRAW_LINE) {
-				VECCOPY(vel,state.vel);
-				//VECADD(vel,vel,state.co);
-				MTC_Mat4Mul3Vecfl(re->viewmat,vel);
-				//VECSUB(vel,vel,loc);
-				Normalize(vel);
-				if(part->draw & PART_DRAW_VEL_LENGTH)
-					VecMulf(vel,VecLength(state.vel));
-				VECADDFAC(loc0,loc,vel,-part->draw_line[0]);
-				VECADDFAC(loc1,loc,vel,part->draw_line[1]);
-
-				render_new_particle(re,obr,psmd->dm,ma,1,0,1,0.0f,loc0,loc1,
-									orco,surfnor,totuv,uvco,totcol,mcol,hasize,seed,override_uv,0,0,0);
-			}
-			else if(part->draw_as==PART_DRAW_BB) {
-				VECCOPY(vel,state.vel);
-				//MTC_Mat4Mul3Vecfl(re->viewmat,vel);
-				particle_billboard(re,obr,ma,bb_ob,loc,vel,pa_size,part->bb_tilt*(1.0f-part->bb_rand_tilt*r_tilt),
-									part->bb_align,part->draw&PART_DRAW_BB_LOCK,
-									a,totpart+totchild,part->bb_uv_split,part->bb_anim,part->bb_split_offset,random,pa_time,part->bb_offset,uv);
-			}
-			else if(strandbuf) { if(svert) {
-				VECCOPY(svert->co, loc);
-				svert->strandco= -1.0f + 2.0f*time;
-				svert++;
-				strand->totvert++;
-			} }
-			else{
-				if(k==1){
-					VECSUB(loc0,loc1,loc);
-					VECADD(loc0,loc1,loc0);
-					render_new_particle(re,obr,psmd->dm,ma,path,1,0,0.0f,loc1,loc0,
-										orco,surfnor,totuv,uvco,totcol,mcol,hasize,seed,override_uv,
-										adapt,adapt_angle,adapt_pix);
-				}
+			switch(part->draw_as) {
+				case PART_DRAW_LINE:
+					sd.line = 1;
+					sd.time = 0.0f;
+					sd.size = hasize;
+
+					VECCOPY(vel,state.vel);
+					MTC_Mat4Mul3Vecfl(re->viewmat,vel);
+					Normalize(vel);
+
+					if(part->draw & PART_DRAW_VEL_LENGTH)
+						VecMulf(vel,VecLength(state.vel));
+
+					VECADDFAC(loc0,loc,vel,-part->draw_line[0]);
+					VECADDFAC(loc1,loc,vel,part->draw_line[1]);
 
-				if(path_nbr==0 || k)
-					render_new_particle(re,obr,psmd->dm,ma,path,0,0,time,loc,loc1,
-										orco,surfnor,totuv,uvco,totcol,mcol,hasize,seed,override_uv,
-										adapt,adapt_angle,adapt_pix);
+					render_new_particle(re,obr,psmd->dm,ma,&sd,loc0,loc1,seed);
 
-				VECCOPY(loc1,loc);
+					break;
+
+				case PART_DRAW_BB:
+					bb.random = random;
+					bb.size = pa_size;
+					bb.tilt = part->bb_tilt * (1.0f - part->bb_rand_tilt * r_tilt);
+					bb.time = pa_time;
+					bb.num = a;
+					VECCOPY(bb.vec, loc);
+					VECCOPY(bb.vel, state.vel);
+
+					particle_billboard(re, obr, ma, &bb);
+
+					break;
+
+				default:
+				{
+					HaloRen *har=0;
+
+					har = RE_inithalo_particle(re, obr, psmd->dm, ma, loc, NULL, sd.orco, sd.uvco, hasize, 0.0, seed);
+					
+					if(har) har->lay= obr->ob->lay;
+
+					break;
+				}
 			}
 		}
 
 		if(orco1==0)
-			orco+=3;
+			sd.orco+=3;
 
 		if(re->test_break())
 			break;
@@ -2026,13 +1954,13 @@ static int render_new_particle_system(Render *re, ObjectRen *obr, ParticleSystem
 	if(ma) do_mat_ipo(ma);
 
 	if(orco1)
-		MEM_freeN(orco);
+		MEM_freeN(sd.orco);
 
-	if(uvco)
-		MEM_freeN(uvco);
+	if(sd.uvco)
+		MEM_freeN(sd.uvco);
 	
-	if(mcol)
-		MEM_freeN(mcol);
+	if(sd.mcol)
+		MEM_freeN(sd.mcol);
 
 	if(uv_name)
 		MEM_freeN(uv_name);
@@ -2049,7 +1977,7 @@ static int render_new_particle_system(Render *re, ObjectRen *obr, ParticleSystem
 		psys->lattice=0;
 	}
 
-	if(path && (ma->mode_l & MA_TANGENT_STR)==0)
+	if(path_nbr && (ma->mode_l & MA_TANGENT_STR)==0)
 		calc_vertexnormals(re, obr, 0, 0);
 
 	return 1;
diff --git a/source/blender/render/intern/source/raytrace.c b/source/blender/render/intern/source/raytrace.c
index ec47df74d0428039771fd84b45d91b860dd5fd09..09d3711885afc4a72f3f4c759a34b65d91ed012d 100644
--- a/source/blender/render/intern/source/raytrace.c
+++ b/source/blender/render/intern/source/raytrace.c
@@ -1,5 +1,5 @@
 /**
- * $Id: $
+ * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
diff --git a/source/blender/src/buttons_editing.c b/source/blender/src/buttons_editing.c
index 2f77e3659eecb40007113f55707a148f2a5da9cf..80495b9ff80df34f6a53e5ba6aa66bdd27e485e3 100644
--- a/source/blender/src/buttons_editing.c
+++ b/source/blender/src/buttons_editing.c
@@ -6858,9 +6858,12 @@ void editing_panels()
 			uiNewPanelTabbed("Mesh Tools 1", "Editing");
 			
 			#ifdef WITH_BF_REEB
-			editing_panel_mesh_skgen(ob, ob->data);
-			editing_panel_mesh_skgen_retarget(ob, ob->data);
-			editing_panel_mesh_skgen_display(ob, ob->data);
+			if (G.rt == -1)
+			{
+				editing_panel_mesh_skgen(ob, ob->data);
+				editing_panel_mesh_skgen_retarget(ob, ob->data);
+				editing_panel_mesh_skgen_display(ob, ob->data);
+			}
 			#endif
 			
 			editing_panel_mesh_uvautocalculation();
diff --git a/source/blender/src/buttons_logic.c b/source/blender/src/buttons_logic.c
index 01520061a198618c4e85817ac65e8075ead36cb2..cf6d29da0d3b9c736ac87c4bb00771efbedac318 100644
--- a/source/blender/src/buttons_logic.c
+++ b/source/blender/src/buttons_logic.c
@@ -3122,30 +3122,32 @@ static uiBlock *advanced_bullet_menu(void *arg_ob)
 					"Collision margin");
 			yco -= 20;
 
-			uiDefButBitI(block, TOG, OB_LOCK_RIGID_BODY_X_AXIS, 0, "Lock X Axis", 
-				xco, yco, 180, 19, &ob->gameflag2, 0, 0, 0, 0, 
-				"Disable simulation of linear motion along the X axis");
-			uiDefButBitI(block, TOG, OB_LOCK_RIGID_BODY_X_ROT_AXIS, 0, "Lock X Rot Xxis", 
-				xco+=180, yco, 180, 19, &ob->gameflag2, 0, 0, 0, 0, 
-				"Disable simulation of angular motion along the X axis");
-			yco -= 20;
-			xco=0;
-			uiDefButBitI(block, TOG, OB_LOCK_RIGID_BODY_Y_AXIS, 0, "Lock Y Axis", 
-				xco, yco, 180, 19, &ob->gameflag2, 0, 0, 0, 0, 
-				"Disable simulation of linear motion along the Y axis");
-			uiDefButBitI(block, TOG, OB_LOCK_RIGID_BODY_Y_ROT_AXIS, 0, "Lock Y Rot Axis", 
-				xco+=180, yco, 180, 19, &ob->gameflag2, 0, 0, 0, 0, 
-				"Disable simulation of angular motion along the Y axis");
-
-			yco -= 20;
-			xco=0;
-			uiDefButBitI(block, TOG, OB_LOCK_RIGID_BODY_Z_AXIS, 0, "Lock Z Axis", 
-				xco, yco, 180, 19, &ob->gameflag2, 0, 0, 0, 0, 
-				"Disable simulation of linear motion along the Z axis");
-			uiDefButBitI(block, TOG, OB_LOCK_RIGID_BODY_Z_ROT_AXIS, 0, "Lock Z Rot Axis", 
-				xco+=180, yco, 180, 19, &ob->gameflag2, 0, 0, 0, 0, 
-				"Disable simulation of angular motion along the Z axis");
-
+			if (ob->gameflag & OB_RIGID_BODY)
+			{
+				uiDefButBitI(block, TOG, OB_LOCK_RIGID_BODY_X_AXIS, 0, "Lock X Axis", 
+					xco, yco, 180, 19, &ob->gameflag2, 0, 0, 0, 0, 
+					"Disable simulation of linear motion along the X axis");
+				uiDefButBitI(block, TOG, OB_LOCK_RIGID_BODY_X_ROT_AXIS, 0, "Lock X Rot Xxis", 
+					xco+=180, yco, 180, 19, &ob->gameflag2, 0, 0, 0, 0, 
+					"Disable simulation of angular motion along the X axis");
+				yco -= 20;
+				xco=0;
+				uiDefButBitI(block, TOG, OB_LOCK_RIGID_BODY_Y_AXIS, 0, "Lock Y Axis", 
+					xco, yco, 180, 19, &ob->gameflag2, 0, 0, 0, 0, 
+					"Disable simulation of linear motion along the Y axis");
+				uiDefButBitI(block, TOG, OB_LOCK_RIGID_BODY_Y_ROT_AXIS, 0, "Lock Y Rot Axis", 
+					xco+=180, yco, 180, 19, &ob->gameflag2, 0, 0, 0, 0, 
+					"Disable simulation of angular motion along the Y axis");
+
+				yco -= 20;
+				xco=0;
+				uiDefButBitI(block, TOG, OB_LOCK_RIGID_BODY_Z_AXIS, 0, "Lock Z Axis", 
+					xco, yco, 180, 19, &ob->gameflag2, 0, 0, 0, 0, 
+					"Disable simulation of linear motion along the Z axis");
+				uiDefButBitI(block, TOG, OB_LOCK_RIGID_BODY_Z_ROT_AXIS, 0, "Lock Z Rot Axis", 
+					xco+=180, yco, 180, 19, &ob->gameflag2, 0, 0, 0, 0, 
+					"Disable simulation of angular motion along the Z axis");
+			}
 			/*
 			uiDefButBitI(block, TOG, OB_BSB_COL_CL_RS, 0, "Cluster Collision RS", 
 				xco, yco, 180, 19, &ob->bsoft->collisionflags, 0, 0, 0, 0, 
diff --git a/source/blender/src/buttons_object.c b/source/blender/src/buttons_object.c
index 6162a12d06d5ceabe7ae6cdbdee343d8a85788a0..04aa54f2526ae912e76d7e0331faa590f4f37c15 100644
--- a/source/blender/src/buttons_object.c
+++ b/source/blender/src/buttons_object.c
@@ -4433,7 +4433,10 @@ static void object_panel_particle_visual(Object *ob)
 	block= uiNewBlock(&curarea->uiblocks, "object_panel_particle_visual", UI_EMBOSS, UI_HELV, curarea->win);
 	if(uiNewPanel(curarea, block, "Visualization", "Particle", 640, 0, 318, 204)==0) return;
 
-	uiDefButS(block, MENU, B_PART_RECALC, "Billboard %x9|Group %x8|Object %x7|Path %x6|Line %x5|Axis %x4|Cross %x3|Circle %x2|Point %x1|None %x0", butx,buty,butw,buth, &part->draw_as, 14.0, 0.0, 0, 0, "How particles are visualized");
+	if(part->type==PART_HAIR)
+		uiDefButS(block, MENU, B_PART_RECALC, "Group %x8|Object %x7|Path %x6|None %x0", butx,buty,butw,buth, &part->draw_as, 14.0, 0.0, 0, 0, "How hair is visualized");
+	else
+		uiDefButS(block, MENU, B_PART_RECALC, "Billboard %x9|Group %x8|Object %x7|Path %x6|Line %x5|Axis %x4|Cross %x3|Circle %x2|Point %x1|None %x0", butx,buty,butw,buth, &part->draw_as, 14.0, 0.0, 0, 0, "How particles are visualized");
 
 	if(part->draw_as==PART_DRAW_NOT) {
 		uiDefButBitS(block, TOG, PART_DRAW_EMITTER, B_PART_REDRAW, "Render emitter",	butx,(buty-=2*buth),butw,buth, &part->draw, 0, 0, 0, 0, "Render emitter object");
diff --git a/source/blender/src/drawgpencil.c b/source/blender/src/drawgpencil.c
index 1b3d869b2f844823b97a0fd3ce9be1117a049113..3c6cef469a2d1fdca07364c059b5df2f30ff0189 100644
--- a/source/blender/src/drawgpencil.c
+++ b/source/blender/src/drawgpencil.c
@@ -139,8 +139,10 @@ void gp_ui_delstroke_cb (void *gpd, void *gpl)
 {
 	bGPDframe *gpf= gpencil_layer_getframe(gpl, CFRA, 0);
 	
+	if (gpf->framenum != CFRA) return;
+
 	gpencil_layer_setactive(gpd, gpl);
-	gpencil_frame_delete_laststroke(gpf);
+	gpencil_frame_delete_laststroke(gpf, gpl);
 	
 	scrarea_queue_winredraw(curarea);
 }
diff --git a/source/blender/src/drawobject.c b/source/blender/src/drawobject.c
index 2063ac42bb1b6b385393ce6b4532bcd3e10ec5b9..c9fffa407ee38bc88f8f6974138164f86b1c9a74 100644
--- a/source/blender/src/drawobject.c
+++ b/source/blender/src/drawobject.c
@@ -2910,6 +2910,7 @@ static void draw_new_particle_system(Base *base, ParticleSystem *psys, int dt)
 	ParticleData *pars, *pa;
 	ParticleKey state, *states=0;
 	ParticleCacheKey *cache=0;
+	ParticleBillboardData bb;
 	Material *ma;
 	Object *bb_ob=0;
 	float vel[3], vec[3], vec2[3], imat[4][4], onevec[3]={0.0f,0.0f,0.0f}, bb_center[3];
@@ -2917,8 +2918,7 @@ static void draw_new_particle_system(Base *base, ParticleSystem *psys, int dt)
 	float cfra=bsystem_time(ob,(float)CFRA,0.0);
 	float *vdata=0, *vedata=0, *cdata=0, *ndata=0, *vd=0, *ved=0, *cd=0, *nd=0, xvec[3], yvec[3], zvec[3];
 	float ma_r=0.0f, ma_g=0.0f, ma_b=0.0f;
-	int a, k, k_max=0, totpart, totpoint=0, draw_as, path_nbr=0;
-	int path_possible=0, keys_possible=0, draw_keys=0, totchild=0;
+	int a, k, k_max=0, totpart, totpoint=0, draw_as, totchild=0;
 	int select=ob->flag&SELECT, create_cdata=0;
 	GLint polygonmode[2];
 	char val[32];
@@ -3004,18 +3004,9 @@ static void draw_new_particle_system(Base *base, ParticleSystem *psys, int dt)
 	if(part->flag&PART_GLOB_TIME)
 		cfra=bsystem_time(0,(float)CFRA,0.0);
 
-	if(psys->pathcache){
-		path_possible=1;
-		keys_possible=1;
-	}
-	if(draw_as==PART_DRAW_PATH && path_possible==0)
+	if(draw_as==PART_DRAW_PATH && psys->pathcache==NULL)
 		draw_as=PART_DRAW_DOT;
 
-	if(draw_as!=PART_DRAW_PATH && keys_possible && part->draw&PART_DRAW_KEYS){
-		path_nbr=part->keys_step;
-		draw_keys=1;
-	}
-
 /* 3. */
 	switch(draw_as){
 		case PART_DRAW_DOT:
@@ -3064,12 +3055,15 @@ static void draw_new_particle_system(Base *base, ParticleSystem *psys, int dt)
 					glPointSize(2.0); /* default dot size */
 			}
 			else if(part->bb_ob)
-				bb_ob=part->bb_ob;
+				bb.ob=part->bb_ob;
 			else
-				bb_ob=G.vd->camera;
+				bb.ob=G.vd->camera;
 
-			if(part->bb_align<PART_BB_VIEW)
-				onevec[part->bb_align]=1.0f;
+			bb.align = part->bb_align;
+			bb.anim = part->bb_anim;
+			bb.lock = part->draw & PART_DRAW_BB_LOCK;
+			bb.offset[0] = part->bb_offset[0];
+			bb.offset[1] = part->bb_offset[1];
 			break;
 		case PART_DRAW_PATH:
 			break;
@@ -3081,35 +3075,37 @@ static void draw_new_particle_system(Base *base, ParticleSystem *psys, int dt)
 	}
 
 /* 4. */
-	if(draw_as && draw_as!=PART_DRAW_PATH){
-		if(draw_as!=PART_DRAW_CIRC){
-			switch(draw_as){
+	if(draw_as && draw_as!=PART_DRAW_PATH) {
+		int tot_vec_size = (totpart + totchild) * 3 * sizeof(float);
+
+		if(draw_as!=PART_DRAW_CIRC) {
+			switch(draw_as) {
 				case PART_DRAW_AXIS:
 				case PART_DRAW_CROSS:
-					if(draw_as!=PART_DRAW_CROSS || create_cdata)
-						cdata=MEM_callocN((totpart+totchild)*(path_nbr+1)*6*3*sizeof(float), "particle_cdata");
-					vdata=MEM_callocN((totpart+totchild)*(path_nbr+1)*6*3*sizeof(float), "particle_vdata");
+					if(draw_as != PART_DRAW_CROSS || create_cdata)
+						cdata = MEM_callocN(tot_vec_size * 6, "particle_cdata");
+					vdata = MEM_callocN(tot_vec_size * 6, "particle_vdata");
 					break;
 				case PART_DRAW_LINE:
 					if(create_cdata)
-						cdata=MEM_callocN((totpart+totchild)*(path_nbr+1)*2*3*sizeof(float), "particle_cdata");
-					vdata=MEM_callocN((totpart+totchild)*(path_nbr+1)*2*3*sizeof(float), "particle_vdata");
+						cdata = MEM_callocN(tot_vec_size * 2, "particle_cdata");
+					vdata = MEM_callocN(tot_vec_size * 2, "particle_vdata");
 					break;
 				case PART_DRAW_BB:
 					if(create_cdata)
-						cdata=MEM_callocN((totpart+totchild)*(path_nbr+1)*4*3*sizeof(float), "particle_cdata");
-					vdata=MEM_callocN((totpart+totchild)*(path_nbr+1)*4*3*sizeof(float), "particle_vdata");
-					ndata=MEM_callocN((totpart+totchild)*(path_nbr+1)*4*3*sizeof(float), "particle_vdata");
+						cdata = MEM_callocN(tot_vec_size * 4, "particle_cdata");
+					vdata = MEM_callocN(tot_vec_size * 4, "particle_vdata");
+					ndata = MEM_callocN(tot_vec_size * 4, "particle_vdata");
 					break;
 				default:
 					if(create_cdata)
-						cdata=MEM_callocN((totpart+totchild)*(path_nbr+1)*3*sizeof(float), "particle_cdata");
-					vdata=MEM_callocN((totpart+totchild)*(path_nbr+1)*3*sizeof(float), "particle_vdata");
+						cdata=MEM_callocN(tot_vec_size, "particle_cdata");
+					vdata=MEM_callocN(tot_vec_size, "particle_vdata");
 			}
 		}
 
-		if(part->draw&PART_DRAW_VEL && draw_as!=PART_DRAW_LINE)
-			vedata=MEM_callocN((totpart+totchild)*2*3*(path_nbr+1)*sizeof(float), "particle_vedata");
+		if(part->draw & PART_DRAW_VEL && draw_as != PART_DRAW_LINE)
+			vedata = MEM_callocN(tot_vec_size * 2, "particle_vedata");
 
 		vd=vdata;
 		ved=vedata;
@@ -3122,6 +3118,7 @@ static void draw_new_particle_system(Base *base, ParticleSystem *psys, int dt)
 	if(draw_as){
 /* 5. */
 		for(a=0,pa=pars; a<totpart+totchild; a++, pa++){
+			/* setup per particle individual stuff */
 			if(a<totpart){
 				if(totchild && (part->draw&PART_DRAW_PARENT)==0) continue;
 				if(pa->flag & PARS_NO_DISP || pa->flag & PARS_UNEXIST) continue;
@@ -3159,11 +3156,6 @@ static void draw_new_particle_system(Base *base, ParticleSystem *psys, int dt)
 				}
 
 				r_tilt=1.0f+pa->r_ave[0];
-
-				if(path_nbr){
-					cache=psys->pathcache[a];
-					k_max=(int)(cache->steps);
-				}
 			}
 			else{
 				ChildParticle *cpa= &psys->child[a-totpart];
@@ -3191,47 +3183,23 @@ static void draw_new_particle_system(Base *base, ParticleSystem *psys, int dt)
 				pa_size=psys_get_child_size(psys,cpa,cfra,0);
 
 				r_tilt=2.0f*cpa->rand[2];
-				if(path_nbr){
-					cache=psys->childcache[a-totpart];
-					k_max=(int)(cache->steps);
-				}
 			}
 
 			if(draw_as!=PART_DRAW_PATH){
-				int next_pa=0;
-				for(k=0; k<=path_nbr; k++){
-					if(draw_keys){
-						state.time=(float)k/(float)path_nbr;
-						psys_get_particle_on_path(ob,psys,a,&state,1);
-					}
-					else if(path_nbr){
-						if(k<=k_max){
-							VECCOPY(state.co,(cache+k)->co);
-							VECCOPY(state.vel,(cache+k)->vel);
-							QUATCOPY(state.rot,(cache+k)->rot);
-						}
-						else
-							continue;	
-					}
-					else{
-						state.time=cfra;
-						if(psys_get_particle_state(ob,psys,a,&state,0)==0){
-							next_pa=1;
-							break;
-						}
-					}
-
+				state.time=cfra;
+				if(psys_get_particle_state(ob,psys,a,&state,0)){
+					/* create actiual particle data */
 					switch(draw_as){
 						case PART_DRAW_DOT:
+							if(vd){
+								VECCOPY(vd,state.co) vd+=3;
+							}
 							if(cd) {
 								cd[0]=ma_r;
 								cd[1]=ma_g;
 								cd[2]=ma_b;
 								cd+=3;
 							}
-							if(vd){
-								VECCOPY(vd,state.co) vd+=3;
-							}
 							break;
 						case PART_DRAW_CROSS:
 						case PART_DRAW_AXIS:
@@ -3314,59 +3282,15 @@ static void draw_new_particle_system(Base *base, ParticleSystem *psys, int dt)
 								cd[2]=cd[5]=cd[8]=cd[11]=ma_b;
 								cd+=12;
 							}
-							if(part->draw&PART_DRAW_BB_LOCK && part->bb_align==PART_BB_VIEW){
-								VECCOPY(xvec,bb_ob->obmat[0]);
-								Normalize(xvec);
-								VECCOPY(yvec,bb_ob->obmat[1]);
-								Normalize(yvec);
-								VECCOPY(zvec,bb_ob->obmat[2]);
-								Normalize(zvec);
-							}
-							else if(part->bb_align==PART_BB_VEL){
-								float temp[3];
-								VECCOPY(temp,state.vel);
-								Normalize(temp);
-								VECSUB(zvec,bb_ob->obmat[3],state.co);
-								if(part->draw&PART_DRAW_BB_LOCK){
-									float fac=-Inpf(zvec,temp);
-									VECADDFAC(zvec,zvec,temp,fac);
-								}
-								Normalize(zvec);
-								Crossf(xvec,temp,zvec);
-								Normalize(xvec);
-								Crossf(yvec,zvec,xvec);
-							}
-							else{
-								VECSUB(zvec,bb_ob->obmat[3],state.co);
-								if(part->draw&PART_DRAW_BB_LOCK)
-									zvec[part->bb_align]=0.0f;
-								Normalize(zvec);
-
-								if(part->bb_align<PART_BB_VIEW)
-									Crossf(xvec,onevec,zvec);
-								else
-									Crossf(xvec,bb_ob->obmat[1],zvec);
-								Normalize(xvec);
-								Crossf(yvec,zvec,xvec);
-							}
 
-							VECCOPY(vec,xvec);
-							VECCOPY(vec2,yvec);
-
-							VecMulf(xvec,cos(part->bb_tilt*(1.0f-part->bb_rand_tilt*r_tilt)*(float)M_PI));
-							VecMulf(vec2,sin(part->bb_tilt*(1.0f-part->bb_rand_tilt*r_tilt)*(float)M_PI));
-							VECADD(xvec,xvec,vec2);
-
-							VecMulf(yvec,cos(part->bb_tilt*(1.0f-part->bb_rand_tilt*r_tilt)*(float)M_PI));
-							VecMulf(vec,-sin(part->bb_tilt*(1.0f-part->bb_rand_tilt*r_tilt)*(float)M_PI));
-							VECADD(yvec,yvec,vec);
-
-							VecMulf(xvec,pa_size);
-							VecMulf(yvec,pa_size);
-
-							VECADDFAC(bb_center,state.co,xvec,part->bb_offset[0]);
-							VECADDFAC(bb_center,bb_center,yvec,part->bb_offset[1]);
+							bb.size = pa_size;
+							bb.tilt = part->bb_tilt * (1.0f - part->bb_rand_tilt * r_tilt);
+							bb.time = pa_time;
+							VECCOPY(bb.vec, state.co);
+							VECCOPY(bb.vel, state.vel);
 
+							psys_make_billboard(&bb, xvec, yvec, zvec, bb_center);
+							
 							VECADD(vd,bb_center,xvec);
 							VECADD(vd,vd,yvec); vd+=3;
 
@@ -3386,6 +3310,10 @@ static void draw_new_particle_system(Base *base, ParticleSystem *psys, int dt)
 							break;
 					}
 
+					totpoint++;
+
+					/* additional things to draw for each particle	*/
+					/* (velocity, size and number)					*/
 					if(vedata){
 						VECCOPY(ved,state.co);
 						ved+=3;
@@ -3401,15 +3329,12 @@ static void draw_new_particle_system(Base *base, ParticleSystem *psys, int dt)
 						setlinestyle(0);
 					}
 
-					totpoint++;
-				}
-				if(next_pa)
-						continue;
-				if(part->draw&PART_DRAW_NUM && !(G.f & G_RENDER_SHADOW)){
-					/* in path drawing state.co is the end point */
-					glRasterPos3f(state.co[0],  state.co[1],  state.co[2]);
-					sprintf(val," %i",a);
-					BMF_DrawString(G.font, val);
+					if(part->draw&PART_DRAW_NUM && !(G.f & G_RENDER_SHADOW)){
+						/* in path drawing state.co is the end point */
+						glRasterPos3f(state.co[0],  state.co[1],  state.co[2]);
+						sprintf(val," %i",a);
+						BMF_DrawString(G.font, val);
+					}
 				}
 			}
 		}
@@ -3418,51 +3343,39 @@ static void draw_new_particle_system(Base *base, ParticleSystem *psys, int dt)
 		glGetIntegerv(GL_POLYGON_MODE, polygonmode);
 		glDisableClientState(GL_NORMAL_ARRAY);
 
-		if(draw_as != PART_DRAW_CIRC){
-			if(draw_as==PART_DRAW_PATH){
-				ParticleCacheKey **cache, *path;
-				float *cd2=0,*cdata2=0;
-
-				glEnableClientState(GL_VERTEX_ARRAY);
-
-				if(dt > OB_WIRE) {
-					glEnableClientState(GL_NORMAL_ARRAY);
+		if(draw_as==PART_DRAW_PATH){
+			ParticleCacheKey **cache, *path;
+			float *cd2=0,*cdata2=0;
 
-					if(part->draw&PART_DRAW_MAT_COL)
-						glEnableClientState(GL_COLOR_ARRAY);
+			glEnableClientState(GL_VERTEX_ARRAY);
 
-					glEnable(GL_LIGHTING);
-					glColorMaterial(GL_FRONT_AND_BACK, GL_DIFFUSE);
-					glEnable(GL_COLOR_MATERIAL);
-				}
-				else {
-					glDisableClientState(GL_NORMAL_ARRAY);
+			/* setup gl flags */
+			if(dt > OB_WIRE) {
+				glEnableClientState(GL_NORMAL_ARRAY);
 
-					glDisable(GL_COLOR_MATERIAL);
-					glDisable(GL_LIGHTING);
-					BIF_ThemeColor(TH_WIRE);
-				}
+				if(part->draw&PART_DRAW_MAT_COL)
+					glEnableClientState(GL_COLOR_ARRAY);
 
-				if(totchild && (part->draw&PART_DRAW_PARENT)==0)
-					totpart=0;
+				glEnable(GL_LIGHTING);
+				glColorMaterial(GL_FRONT_AND_BACK, GL_DIFFUSE);
+				glEnable(GL_COLOR_MATERIAL);
+			}
+			else {
+				glDisableClientState(GL_NORMAL_ARRAY);
 
-				cache=psys->pathcache;
-				for(a=0, pa=psys->particles; a<totpart; a++, pa++){
-					path=cache[a];
-					glVertexPointer(3, GL_FLOAT, sizeof(ParticleCacheKey), path->co);
+				glDisable(GL_COLOR_MATERIAL);
+				glDisable(GL_LIGHTING);
+				BIF_ThemeColor(TH_WIRE);
+			}
 
-					if(dt > OB_WIRE) {
-						glNormalPointer(GL_FLOAT, sizeof(ParticleCacheKey), path->vel);
-						if(part->draw&PART_DRAW_MAT_COL)
-							glColorPointer(3, GL_FLOAT, sizeof(ParticleCacheKey), path->col);
-					}
+			if(totchild && (part->draw&PART_DRAW_PARENT)==0)
+				totpart=0;
 
-					glDrawArrays(GL_LINE_STRIP, 0, path->steps + 1);
-				}
-				
-				cache=psys->childcache;
-				for(a=0; a<totchild; a++){
-					path=cache[a];
+			/* draw actual/parent particles */
+			cache=psys->pathcache;
+			for(a=0, pa=psys->particles; a<totpart; a++, pa++){
+				path=cache[a];
+				if(path->steps > 0) {
 					glVertexPointer(3, GL_FLOAT, sizeof(ParticleCacheKey), path->co);
 
 					if(dt > OB_WIRE) {
@@ -3473,68 +3386,85 @@ static void draw_new_particle_system(Base *base, ParticleSystem *psys, int dt)
 
 					glDrawArrays(GL_LINE_STRIP, 0, path->steps + 1);
 				}
+			}
+			
+			/* draw child particles */
+			cache=psys->childcache;
+			for(a=0; a<totchild; a++){
+				path=cache[a];
+				glVertexPointer(3, GL_FLOAT, sizeof(ParticleCacheKey), path->co);
 
 				if(dt > OB_WIRE) {
+					glNormalPointer(GL_FLOAT, sizeof(ParticleCacheKey), path->vel);
 					if(part->draw&PART_DRAW_MAT_COL)
-						glDisable(GL_COLOR_ARRAY);
-					glDisable(GL_COLOR_MATERIAL);
+						glColorPointer(3, GL_FLOAT, sizeof(ParticleCacheKey), path->col);
 				}
 
-				if(cdata2)
-					MEM_freeN(cdata2);
-				cd2=cdata2=0;
+				glDrawArrays(GL_LINE_STRIP, 0, path->steps + 1);
+			}
 
-				glLineWidth(1.0f);
 
-				/* draw particle edit mode key points*/
+			/* restore & clean up */
+			if(dt > OB_WIRE) {
+				if(part->draw&PART_DRAW_MAT_COL)
+					glDisable(GL_COLOR_ARRAY);
+				glDisable(GL_COLOR_MATERIAL);
 			}
 
-			if(draw_as!=PART_DRAW_PATH){
-				glDisableClientState(GL_COLOR_ARRAY);
+			if(cdata2)
+				MEM_freeN(cdata2);
+			cd2=cdata2=0;
 
-				if(vdata){
-					glEnableClientState(GL_VERTEX_ARRAY);
-					glVertexPointer(3, GL_FLOAT, 0, vdata);
-				}
-				else
-					glDisableClientState(GL_VERTEX_ARRAY);
+			glLineWidth(1.0f);
+		}
+		else if(draw_as!=PART_DRAW_CIRC){
+			glDisableClientState(GL_COLOR_ARRAY);
 
-				if(ndata && dt>OB_WIRE){
-					glEnableClientState(GL_NORMAL_ARRAY);
-					glNormalPointer(GL_FLOAT, 0, ndata);
-					glEnable(GL_LIGHTING);
-				}
-				else{
-					glDisableClientState(GL_NORMAL_ARRAY);
-					glDisable(GL_LIGHTING);
-				}
+			/* setup created data arrays */
+			if(vdata){
+				glEnableClientState(GL_VERTEX_ARRAY);
+				glVertexPointer(3, GL_FLOAT, 0, vdata);
+			}
+			else
+				glDisableClientState(GL_VERTEX_ARRAY);
 
-				if(cdata){
-					glEnableClientState(GL_COLOR_ARRAY);
-					glColorPointer(3, GL_FLOAT, 0, cdata);
-				}
+			if(ndata && dt>OB_WIRE){
+				glEnableClientState(GL_NORMAL_ARRAY);
+				glNormalPointer(GL_FLOAT, 0, ndata);
+				glEnable(GL_LIGHTING);
+			}
+			else{
+				glDisableClientState(GL_NORMAL_ARRAY);
+				glDisable(GL_LIGHTING);
+			}
 
-				switch(draw_as){
-					case PART_DRAW_AXIS:
-					case PART_DRAW_CROSS:
-						glDrawArrays(GL_LINES, 0, 6*totpoint);
-						break;
-					case PART_DRAW_LINE:
-						glDrawArrays(GL_LINES, 0, 2*totpoint);
-						break;
-					case PART_DRAW_BB:
-						if(dt<=OB_WIRE)
-							glPolygonMode(GL_FRONT_AND_BACK,GL_LINE);
-
-						glDrawArrays(GL_QUADS, 0, 4*totpoint);
-						break;
-					default:
-						glDrawArrays(GL_POINTS, 0, totpoint);
-						break;
-				}
+			if(cdata){
+				glEnableClientState(GL_COLOR_ARRAY);
+				glColorPointer(3, GL_FLOAT, 0, cdata);
 			}
 
+
+			/* draw created data arrays */
+			switch(draw_as){
+				case PART_DRAW_AXIS:
+				case PART_DRAW_CROSS:
+					glDrawArrays(GL_LINES, 0, 6*totpoint);
+					break;
+				case PART_DRAW_LINE:
+					glDrawArrays(GL_LINES, 0, 2*totpoint);
+					break;
+				case PART_DRAW_BB:
+					if(dt<=OB_WIRE)
+						glPolygonMode(GL_FRONT_AND_BACK,GL_LINE);
+
+					glDrawArrays(GL_QUADS, 0, 4*totpoint);
+					break;
+				default:
+					glDrawArrays(GL_POINTS, 0, totpoint);
+					break;
+			}
 		}
+
 		if(vedata){
 			glDisableClientState(GL_COLOR_ARRAY);
 			cpack(0xC0C0C0);
diff --git a/source/blender/src/edit.c b/source/blender/src/edit.c
index f681b65925f2aeb9aecde776c82b29841e583b85..202d8a813f1686d680d6f06fc29fb82f8c996a01 100644
--- a/source/blender/src/edit.c
+++ b/source/blender/src/edit.c
@@ -792,19 +792,13 @@ void countall()
 			if(ob->transflag & OB_DUPLIPARTS) {
 				ParticleSystem *psys;
 				ParticleSettings *part;
-				int step_nbr;
 
 				for(psys=ob->particlesystem.first; psys; psys=psys->next){
 					part=psys->part;
-					
-					//if(psys->flag&PSYS_BAKED && part->draw&PART_DRAW_KEYS)
-					//	step_nbr=part->keys_step;
-					//else
-						step_nbr=1;
 
 					if(part->draw_as==PART_DRAW_OB && part->dup_ob){
 						int tot=count_particles(psys);
-						count_object(part->dup_ob, 0, tot*step_nbr);
+						count_object(part->dup_ob, 0, tot);
 					}
 					else if(part->draw_as==PART_DRAW_GR && part->dup_group){
 						GroupObject *go;
@@ -818,7 +812,7 @@ void countall()
 						go= part->dup_group->gobject.first;
 						while(go){
 							tot=count_particles_mod(psys,totgroup,cur);
-							count_object(go->ob, 0, tot*step_nbr);
+							count_object(go->ob, 0, tot);
 							cur++;
 							go=go->next;
 						}
diff --git a/source/blender/src/editarmature_generate.c b/source/blender/src/editarmature_generate.c
index 189a823ab98cc59666afed79be2f8215f57e8aa2..ad312f079bd723e863c28f0dd697b4ed2691be8d 100644
--- a/source/blender/src/editarmature_generate.c
+++ b/source/blender/src/editarmature_generate.c
@@ -1,5 +1,5 @@
 /**
- * $Id: editarmature_generate.c  $
+ * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
diff --git a/source/blender/src/editarmature_retarget.c b/source/blender/src/editarmature_retarget.c
index ad114868a69520759945021a88b18cf5d94292dd..f42fed06757ace0dc7543baed9c0812eb0607efe 100644
--- a/source/blender/src/editarmature_retarget.c
+++ b/source/blender/src/editarmature_retarget.c
@@ -201,12 +201,12 @@ float rollBoneByQuatAligned(EditBone *bone, float old_up_axis[3], float qrot[4],
 	}
 }
 
-float rollBoneByQuatJoint(RigEdge *edge, RigEdge *previous, float qrot[4], float qroll[4])
+float rollBoneByQuatJoint(RigEdge *edge, RigEdge *previous, float qrot[4], float qroll[4], float up_axis[3])
 {
 	if (previous == NULL)
 	{
-		QuatOne(qroll);
-		return rollBoneByQuat(edge->bone, edge->up_axis, qrot);
+		/* default to up_axis if no previous */
+		return rollBoneByQuatAligned(edge->bone, edge->up_axis, qrot, qroll, up_axis);
 	}
 	else
 	{
@@ -223,9 +223,8 @@ float rollBoneByQuatJoint(RigEdge *edge, RigEdge *previous, float qrot[4], float
 		}
 		else
 		{
-			/* SHOULDN'T BE HERE */
-			QuatOne(qroll);
-			return rollBoneByQuat(edge->bone, edge->up_axis, qrot);
+			/* default to up_axis if first bone in the chain is an offset */
+			return rollBoneByQuatAligned(edge->bone, edge->up_axis, qrot, qroll, up_axis);
 		}
 		
 		VecSubf(vec_second, edge->bone->tail, edge->bone->head);
@@ -1846,7 +1845,7 @@ static void repositionBone(RigGraph *rigg, RigEdge *edge, float vec0[3], float v
 		}
 		else if (G.scene->toolsettings->skgen_retarget_roll == SK_RETARGET_ROLL_JOINT)
 		{
-			bone->roll = rollBoneByQuatJoint(edge, edge->next, qrot, qroll);
+			bone->roll = rollBoneByQuatJoint(edge, edge->prev, qrot, qroll, up_axis);
 		}
 		else
 		{
diff --git a/source/blender/src/editarmature_sketch.c b/source/blender/src/editarmature_sketch.c
index 1452a3d04417ea2b58cbc216eafc78d059100499..38e44319b47b8c9dd5378beb0828b2330794be44 100644
--- a/source/blender/src/editarmature_sketch.c
+++ b/source/blender/src/editarmature_sketch.c
@@ -1,5 +1,5 @@
 /**
- * $Id: $
+ * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
diff --git a/source/blender/src/editparticle.c b/source/blender/src/editparticle.c
index 0538bcb98d75192183664416d64b00c812e68330..d48b84789d82d238af594653dc649d27164d0289 100644
--- a/source/blender/src/editparticle.c
+++ b/source/blender/src/editparticle.c
@@ -1,7 +1,7 @@
 /* editparticle.c
  *
  *
- * $Id: editparticle.c $
+ * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
diff --git a/source/blender/src/gpencil.c b/source/blender/src/gpencil.c
index f4cfc0c0dd6b1acbeb5f6f1f5d3d470337d11930..c7e453c416c30e09656a2eb772614c0a8843a6aa 100644
--- a/source/blender/src/gpencil.c
+++ b/source/blender/src/gpencil.c
@@ -484,7 +484,7 @@ ScrArea *gpencil_data_findowner (bGPdata *gpd)
 /* -------- GP-Frame API ---------- */
 
 /* delete the last stroke of the given frame */
-void gpencil_frame_delete_laststroke (bGPDframe *gpf)
+void gpencil_frame_delete_laststroke (bGPDframe *gpf, bGPDlayer *gpl)
 {
 	bGPDstroke *gps= (gpf) ? gpf->strokes.last : NULL;
 	
@@ -495,6 +495,11 @@ void gpencil_frame_delete_laststroke (bGPDframe *gpf)
 	/* free the stroke and its data */
 	MEM_freeN(gps->points);
 	BLI_freelinkN(&gpf->strokes, gps);
+	
+	if (gpf->strokes.first == NULL) {
+		gpencil_layer_delframe(gpl, gpf);
+		gpencil_layer_getframe(gpl, CFRA, 0);
+	}
 }
 
 /* -------- GP-Layer API ---------- */
@@ -603,6 +608,7 @@ bGPDframe *gpencil_layer_getframe (bGPDlayer *gpl, int cframe, short addnew)
 		else if (found)
 			gpl->actframe= gpf;
 		else {
+			gpl->actframe = gpl->frames.first;
 			/* unresolved errogenous situation! */
 			printf("Error: cannot find appropriate gp-frame \n");
 			/* gpl->actframe should still be NULL */
@@ -696,7 +702,9 @@ void gpencil_delete_laststroke (bGPdata *gpd)
 	bGPDlayer *gpl= gpencil_layer_getactive(gpd);
 	bGPDframe *gpf= gpencil_layer_getframe(gpl, CFRA, 0);
 	
-	gpencil_frame_delete_laststroke(gpf);
+	if (gpf->framenum != CFRA) return;
+
+	gpencil_frame_delete_laststroke(gpf, gpl);
 }
 
 /* delete the active frame */
diff --git a/source/blender/src/radialcontrol.c b/source/blender/src/radialcontrol.c
index 404aac225c6afbcc9079d7cf03ba7b338309f2cd..b61a150bada91c5674ccde46dcd938d2f3d87975 100644
--- a/source/blender/src/radialcontrol.c
+++ b/source/blender/src/radialcontrol.c
@@ -1,5 +1,5 @@
 /*
- * $Id: multires.c 13015 2007-12-27 07:27:03Z nicholasbishop $
+ * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index 8e2a906614d4ab6eca3c5c42c2c5d61475a81917..a20913bc714439869d3886fa69f9d593c567b78a 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -124,6 +124,7 @@ IF(APPLE)
     COMMAND find ${TARGETDIR}/blender.app -name CVS -prune -exec rm -rf {} "\;"
     COMMAND find ${TARGETDIR}/blender.app -name CVS.sandboxinfo -prune -exec rm -rf {} "\;"
     COMMAND find ${TARGETDIR}/blender.app -name .DS_Store -prune -exec rm -rf {} "\;"
+    COMMAND find ${TARGETDIR}/blender.app -name .svn -prune -exec rm -rf {} "\;"
   )
 ENDIF(APPLE)
 
diff --git a/source/darwin/Makefile b/source/darwin/Makefile
index 4959fa428e963bcf5f3f1c0c9793451c78b1e7a9..f7b513fc2146200ff26765a61d0829786790bfc8 100644
--- a/source/darwin/Makefile
+++ b/source/darwin/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile,v 1.7 2003/05/12 18:12:25 sgefant Exp $
+# $Id$
 #
 # ***** BEGIN GPL LICENSE BLOCK *****
 #
@@ -53,3 +53,4 @@ endif
 	@echo "---> removing CVS directories and Mac hidden files from distribution"
 	@find $(DIR)/bin/$(APPLICATION).app -name CVS -prune -exec rm -rf {} \;
 	@find $(DIR)/bin/$(APPLICATION).app -name .DS_Store -exec rm -f {} \;
+	@find $(DIR)/bin/$(APPLICATION).app -name .svn -exec rm -rf {} \;
diff --git a/source/gameengine/Converter/BL_ActionActuator.cpp b/source/gameengine/Converter/BL_ActionActuator.cpp
index 22c6c95b1584eba26a39fbc878371d157d5db47a..943bb68f6f28c16c298cf306671ee3d58644a0bf 100644
--- a/source/gameengine/Converter/BL_ActionActuator.cpp
+++ b/source/gameengine/Converter/BL_ActionActuator.cpp
@@ -965,22 +965,22 @@ KX_PYMETHODDEF_DOC(BL_ActionActuator, setChannel,
 /* ------------------------------------------------------------------------- */
 
 PyTypeObject BL_ActionActuator::Type = {
-	PyObject_HEAD_INIT(&PyType_Type)
+	PyObject_HEAD_INIT(NULL)
 		0,
 		"BL_ActionActuator",
 		sizeof(BL_ActionActuator),
 		0,
 		PyDestructor,
 		0,
-		__getattr,
-		__setattr,
-		0, //&MyPyCompare,
-		__repr,
-		0, //&cvalue_as_number,
 		0,
 		0,
 		0,
-		0
+		py_base_repr,
+		0,0,0,0,0,0,
+		py_base_getattro,
+		py_base_setattro,
+		0,0,0,0,0,0,0,0,0,
+		Methods
 };
 
 PyParentObject BL_ActionActuator::Parents[] = {
@@ -1035,17 +1035,20 @@ PyAttributeDef BL_ActionActuator::Attributes[] = {
 	{ NULL }	//Sentinel
 };
 
-PyObject* BL_ActionActuator::_getattr(const char *attr) {
-	if (!strcmp(attr, "action"))
+PyObject* BL_ActionActuator::py_getattro(PyObject *attr) {
+	char *attr_str= PyString_AsString(attr);
+	if (!strcmp(attr_str, "action"))
 		return PyString_FromString(m_action->id.name+2);
-	PyObject* object = _getattr_self(Attributes, this, attr);
+
+	PyObject* object = py_getattro_self(Attributes, this, attr);
 	if (object != NULL)
 		return object;
-	_getattr_up(SCA_IActuator);
+	py_getattro_up(SCA_IActuator);
 }
 
-int BL_ActionActuator::_setattr(const char *attr, PyObject* value) {
-	if (!strcmp(attr, "action"))
+int BL_ActionActuator::py_setattro(PyObject *attr, PyObject* value) {
+	char *attr_str= PyString_AsString(attr);
+	if (!strcmp(attr_str, "action"))
 	{
 		if (!PyString_Check(value))
 		{
@@ -1075,8 +1078,8 @@ int BL_ActionActuator::_setattr(const char *attr, PyObject* value) {
 		m_action = action;
 		return 0;
 	}
-	int ret = _setattr_self(Attributes, this, attr, value);
+	int ret = py_setattro_self(Attributes, this, attr, value);
 	if (ret >= 0)
 		return ret;
-	return SCA_IActuator::_setattr(attr, value);
+	return SCA_IActuator::py_setattro(attr, value);
 }
\ No newline at end of file
diff --git a/source/gameengine/Converter/BL_ActionActuator.h b/source/gameengine/Converter/BL_ActionActuator.h
index 6161048afb8518dba9cc68ddbc9a2461a576cd04..7160dd4dad0a9cc82acb56a823ab9cead0bcfe3d 100644
--- a/source/gameengine/Converter/BL_ActionActuator.h
+++ b/source/gameengine/Converter/BL_ActionActuator.h
@@ -110,8 +110,8 @@ public:
 
 	KX_PYMETHOD_DOC(BL_ActionActuator,setChannel);
 
-	virtual PyObject* _getattr(const char *attr);
-	virtual int _setattr(const char *attr, PyObject* value);
+	virtual PyObject* py_getattro(PyObject* attr);
+	virtual int py_setattro(PyObject* attr, PyObject* value);
 
 	/* attribute check */
 	static int CheckFrame(void *self, const PyAttributeDef*)
diff --git a/source/gameengine/Converter/BL_ShapeActionActuator.cpp b/source/gameengine/Converter/BL_ShapeActionActuator.cpp
index 2e02ee9b94101e7016a45c07f0080c5c2a8fcb10..c53be4653ca1ef0f96d060b6559b3f2fcce9e486 100644
--- a/source/gameengine/Converter/BL_ShapeActionActuator.cpp
+++ b/source/gameengine/Converter/BL_ShapeActionActuator.cpp
@@ -420,22 +420,22 @@ bool BL_ShapeActionActuator::Update(double curtime, bool frame)
 /* Integration hooks ------------------------------------------------------- */
 
 PyTypeObject BL_ShapeActionActuator::Type = {
-	PyObject_HEAD_INIT(&PyType_Type)
+	PyObject_HEAD_INIT(NULL)
 		0,
 		"BL_ShapeActionActuator",
 		sizeof(BL_ShapeActionActuator),
 		0,
 		PyDestructor,
 		0,
-		__getattr,
-		__setattr,
-		0, //&MyPyCompare,
-		__repr,
-		0, //&cvalue_as_number,
 		0,
 		0,
 		0,
-		0
+		py_base_repr,
+		0,0,0,0,0,0,
+		py_base_getattro,
+		py_base_setattro,
+		0,0,0,0,0,0,0,0,0,
+		Methods
 };
 
 PyParentObject BL_ShapeActionActuator::Parents[] = {
@@ -484,17 +484,19 @@ PyAttributeDef BL_ShapeActionActuator::Attributes[] = {
 };
 
 
-PyObject* BL_ShapeActionActuator::_getattr(const char *attr) {
-	if (!strcmp(attr, "action"))
+PyObject* BL_ShapeActionActuator::py_getattro(PyObject* attr) {
+	char *attr_str= PyString_AsString(attr);
+	if (!strcmp(attr_str, "action"))
 		return PyString_FromString(m_action->id.name+2);
-	PyObject* object = _getattr_self(Attributes, this, attr);
+	PyObject* object = py_getattro_self(Attributes, this, attr);
 	if (object != NULL)
 		return object;
-	_getattr_up(SCA_IActuator);
+	py_getattro_up(SCA_IActuator);
 }
 
-int BL_ShapeActionActuator::_setattr(const char *attr, PyObject* value) {
-	if (!strcmp(attr, "action"))
+int BL_ShapeActionActuator::py_setattro(PyObject *attr, PyObject* value) {
+	char *attr_str= PyString_AsString(attr);
+	if (!strcmp(attr_str, "action"))
 	{
 		if (!PyString_Check(value))
 		{
@@ -524,10 +526,10 @@ int BL_ShapeActionActuator::_setattr(const char *attr, PyObject* value) {
 		m_action = action;
 		return 0;
 	}
-	int ret = _setattr_self(Attributes, this, attr, value);
+	int ret = py_setattro_self(Attributes, this, attr, value);
 	if (ret >= 0)
 		return ret;
-	return SCA_IActuator::_setattr(attr, value);
+	return SCA_IActuator::py_setattro(attr, value);
 }
 
 /*     setStart                                                              */
diff --git a/source/gameengine/Converter/BL_ShapeActionActuator.h b/source/gameengine/Converter/BL_ShapeActionActuator.h
index 7f2431bcfa56b5f73ada98fbc4560298b541acb7..ea25d66e0503ae2b8a2e90b2ef2be9e1a2cb317c 100644
--- a/source/gameengine/Converter/BL_ShapeActionActuator.h
+++ b/source/gameengine/Converter/BL_ShapeActionActuator.h
@@ -103,8 +103,8 @@ public:
 	KX_PYMETHOD_DOC_NOARGS(BL_ShapeActionActuator,GetType);
 	KX_PYMETHOD_DOC(BL_ShapeActionActuator,SetType);
 
-	virtual PyObject* _getattr(const char *attr);
-	virtual int _setattr(const char *attr, PyObject* value);
+	virtual PyObject* py_getattro(PyObject* attr);
+	virtual int py_setattro(PyObject* attr, PyObject* value);
 
 	static int CheckBlendTime(void *self, const PyAttributeDef*)
 	{
diff --git a/source/gameengine/Expressions/ListValue.cpp b/source/gameengine/Expressions/ListValue.cpp
index 90a939af23611ac3447d0b98f188c1f036242eeb..15eb8835b798a06ead89748a2f13180007c3c953 100644
--- a/source/gameengine/Expressions/ListValue.cpp
+++ b/source/gameengine/Expressions/ListValue.cpp
@@ -193,7 +193,7 @@ static  PyMappingMethods instance_as_mapping = {
 
 
 PyTypeObject CListValue::Type = {
-	PyObject_HEAD_INIT(&PyType_Type)
+	PyObject_HEAD_INIT(NULL)
 	0,				/*ob_size*/
 	"CListValue",			/*tp_name*/
 	sizeof(CListValue),		/*tp_basicsize*/
@@ -201,15 +201,20 @@ PyTypeObject CListValue::Type = {
 	/* methods */
 	PyDestructor,	  		/*tp_dealloc*/
 	0,			 	/*tp_print*/
-	__getattr, 			/*tp_getattr*/
-	__setattr, 			/*tp_setattr*/
+	0, 			/*tp_getattr*/
+	0, 			/*tp_setattr*/
 	0,			        /*tp_compare*/
-	__repr,			        /*tp_repr*/
+	py_base_repr,			        /*tp_repr*/
 	0,			        /*tp_as_number*/
 	&listvalue_as_sequence, /*tp_as_sequence*/
 	&instance_as_mapping,	        /*tp_as_mapping*/
 	0,			        /*tp_hash*/
 	0,				/*tp_call */
+	0,
+	py_base_getattro,
+	py_base_setattro,
+	0,0,0,0,0,0,0,0,0,
+	Methods
 };
 
 
@@ -236,8 +241,8 @@ PyAttributeDef CListValue::Attributes[] = {
 	{ NULL }	//Sentinel
 };
 
-PyObject* CListValue::_getattr(const char *attr) {
-	_getattr_up(CValue);
+PyObject* CListValue::py_getattro(PyObject* attr) {
+	py_getattro_up(CValue);
 }
 
 
diff --git a/source/gameengine/Expressions/ListValue.h b/source/gameengine/Expressions/ListValue.h
index 104e3e632839a1dd4954ed0e33cf7dbda01539a0..f936298a8c45ed28a1467730590ed361855cefe3 100644
--- a/source/gameengine/Expressions/ListValue.h
+++ b/source/gameengine/Expressions/ListValue.h
@@ -59,7 +59,7 @@ public:
 
 	bool CheckEqual(CValue* first,CValue* second);
 
-	virtual PyObject* _getattr(const char *attr);
+	virtual PyObject* py_getattro(PyObject* attr);
 
 	KX_PYMETHOD_O(CListValue,append);
 	KX_PYMETHOD_NOARGS(CListValue,reverse);
diff --git a/source/gameengine/Expressions/PyObjectPlus.cpp b/source/gameengine/Expressions/PyObjectPlus.cpp
index 494a848be74a663a52aab8c0605108e0e012b50d..ed6932b414ac4cf643694bafa932f1f276f42446 100644
--- a/source/gameengine/Expressions/PyObjectPlus.cpp
+++ b/source/gameengine/Expressions/PyObjectPlus.cpp
@@ -55,23 +55,23 @@
 ------------------------------*/
 
 PyTypeObject PyObjectPlus::Type = {
-	PyObject_HEAD_INIT(&PyType_Type)
+	PyObject_HEAD_INIT(NULL)
 	0,				/*ob_size*/
 	"PyObjectPlus",			/*tp_name*/
 	sizeof(PyObjectPlus),		/*tp_basicsize*/
 	0,				/*tp_itemsize*/
 	/* methods */
-	PyDestructor,	  		/*tp_dealloc*/
-	0,			 	/*tp_print*/
-	__getattr, 			/*tp_getattr*/
-	__setattr, 			/*tp_setattr*/
-	0,			        /*tp_compare*/
-	__repr,			        /*tp_repr*/
-	0,			        /*tp_as_number*/
-	0,		 	        /*tp_as_sequence*/
-	0,			        /*tp_as_mapping*/
-	0,			        /*tp_hash*/
-	0,				/*tp_call */
+	PyDestructor,
+	0,
+	0,
+	0,
+	0,
+	py_base_repr,
+	0,0,0,0,0,0,
+	py_base_getattro,
+	py_base_setattro,
+	0,0,0,0,0,0,0,0,0,
+	Methods
 };
 
 PyObjectPlus::~PyObjectPlus()
@@ -106,37 +106,41 @@ PyParentObject PyObjectPlus::Parents[] = {&PyObjectPlus::Type, NULL};
 /*------------------------------
  * PyObjectPlus attributes	-- attributes
 ------------------------------*/
-PyObject *PyObjectPlus::_getattr(const char *attr)
+PyObject *PyObjectPlus::py_getattro(PyObject* attr)
 {
-	if (!strcmp(attr, "__doc__") && GetType()->tp_doc)
-		return PyString_FromString(GetType()->tp_doc);
-
+	PyObject *descr = PyDict_GetItem(Type.tp_dict, attr); \
+	if (descr == NULL) {
+		PyErr_SetString(PyExc_AttributeError, "attribute not found");
+		return NULL;
+	} else {
+		return PyCFunction_New(((PyMethodDescrObject *)descr)->d_method, (PyObject *)this); \
+	}
   //if (streq(attr, "type"))
   //  return Py_BuildValue("s", (*(GetParents()))->tp_name);
-
-  return Py_FindMethod(Methods, this, attr);
 }
 
-int PyObjectPlus::_delattr(const char *attr)
+int PyObjectPlus::py_delattro(PyObject* attr)
 {
 	PyErr_SetString(PyExc_AttributeError, "attribute cant be deleted");
 	return 1;
 }
 
-int PyObjectPlus::_setattr(const char *attr, PyObject *value)
+int PyObjectPlus::py_setattro(PyObject *attr, PyObject* value)
 {
-	//return PyObject::_setattr(attr,value);
+	//return PyObject::py_setattro(attr,value);
 	//cerr << "Unknown attribute" << endl;
 	PyErr_SetString(PyExc_AttributeError, "attribute cant be set");
 	return 1;
 }
 
-PyObject *PyObjectPlus::_getattr_self(const PyAttributeDef attrlist[], void *self, const char *attr)
+PyObject *PyObjectPlus::py_getattro_self(const PyAttributeDef attrlist[], void *self, PyObject *attr)
 {
+	char *attr_str= PyString_AsString(attr);
+
 	const PyAttributeDef *attrdef;
 	for (attrdef=attrlist; attrdef->m_name != NULL; attrdef++)
 	{
-		if (!strcmp(attr, attrdef->m_name))
+		if (!strcmp(attr_str, attrdef->m_name))
 		{
 			if (attrdef->m_type == KX_PYATTRIBUTE_TYPE_DUMMY)
 			{
@@ -245,16 +249,17 @@ PyObject *PyObjectPlus::_getattr_self(const PyAttributeDef attrlist[], void *sel
 	return NULL;
 }
 
-int PyObjectPlus::_setattr_self(const PyAttributeDef attrlist[], void *self, const char *attr, PyObject *value)
+int PyObjectPlus::py_setattro_self(const PyAttributeDef attrlist[], void *self, PyObject *attr, PyObject *value)
 {
 	const PyAttributeDef *attrdef;
 	void *undoBuffer = NULL;
 	void *sourceBuffer = NULL;
 	size_t bufferSize = 0;
+	char *attr_str= PyString_AsString(attr);
 
 	for (attrdef=attrlist; attrdef->m_name != NULL; attrdef++)
 	{
-		if (!strcmp(attr, attrdef->m_name))
+		if (!strcmp(attr_str, attrdef->m_name))
 		{
 			if (attrdef->m_access == KX_PYATTRIBUTE_RO ||
 				attrdef->m_type == KX_PYATTRIBUTE_TYPE_DUMMY)
@@ -687,7 +692,7 @@ int PyObjectPlus::_setattr_self(const PyAttributeDef attrlist[], void *self, con
 /*------------------------------
  * PyObjectPlus repr		-- representations
 ------------------------------*/
-PyObject *PyObjectPlus::_repr(void)
+PyObject *PyObjectPlus::py_repr(void)
 {
 	PyErr_SetString(PyExc_SystemError, "Representation not overridden by object.");  
 	return NULL;
@@ -729,7 +734,7 @@ PyObject *PyObjectPlus::Py_isA(PyObject *value)		// Python wrapper for isA
     Py_RETURN_FALSE;
 }
 
-/* Utility function called by the macro _getattr_up()
+/* Utility function called by the macro py_getattro_up()
  * for getting ob.__dict__() values from our PyObject
  * this is used by python for doing dir() on an object, so its good
  * if we return a list of attributes and methods.
diff --git a/source/gameengine/Expressions/PyObjectPlus.h b/source/gameengine/Expressions/PyObjectPlus.h
index 6ba80255aa31857a37a4e2ec983c16cb5809d990..77963c092ebf0de353ddca5746c2784c79e70689 100644
--- a/source/gameengine/Expressions/PyObjectPlus.h
+++ b/source/gameengine/Expressions/PyObjectPlus.h
@@ -72,6 +72,8 @@ typedef int Py_ssize_t;
 #define PY_METHODCHAR const char *
 #endif
 
+#include "descrobject.h"
+
 static inline void Py_Fatal(const char *M) {
 	fprintf(stderr, "%s\n", M);
 	exit(-1);
@@ -90,22 +92,27 @@ static inline void Py_Fatal(const char *M) {
 
 
 
-								// This defines the _getattr_up macro
+								// This defines the py_getattro_up macro
 								// which allows attribute and method calls
 								// to be properly passed up the hierarchy.
-#define _getattr_up(Parent) \
-	PyObject *rvalue = Py_FindMethod(Methods, this, attr); \
+
+#define py_getattro_up(Parent) \
+	PyObject *rvalue; \
+	PyObject *descr = PyDict_GetItem(Type.tp_dict, attr); \
 	 \
-	if (rvalue == NULL) { \
+	if (descr == NULL) { \
 		PyErr_Clear(); \
-		rvalue = Parent::_getattr(attr); \
+		rvalue = Parent::py_getattro(attr); \
+	} else { \
+		rvalue= PyCFunction_New(((PyMethodDescrObject *)descr)->d_method, (PyObject *)this); \
 	} \
-	if ((rvalue == NULL) && !strcmp(attr, "__dict__")) {\
-		PyErr_Clear(); \
-		rvalue = _getattr_dict(Parent::_getattr(attr), Methods, Attributes); \
+	\
+	if (strcmp(PyString_AsString(attr), "__dict__")==0) {\
+		rvalue = _getattr_dict(rvalue, Methods, Attributes); \
 	} \
 	return rvalue; \
 
+
 /**
  * These macros are helpfull when embedding Python routines. The second
  * macro is one that also requires a documentation string
@@ -362,29 +369,29 @@ public:
 //		  Py_DECREF(this);
 //	  };				// decref method
 	
-	virtual PyObject *_getattr(const char *attr);			// _getattr method
-	static  PyObject *__getattr(PyObject * PyObj, char *attr) 	// This should be the entry in Type. 
+	virtual PyObject *py_getattro(PyObject *attr);			// py_getattro method
+	static  PyObject *py_base_getattro(PyObject * PyObj, PyObject *attr) 	// This should be the entry in Type. 
 	{
-		return ((PyObjectPlus*) PyObj)->_getattr(attr); 
+		return ((PyObjectPlus*) PyObj)->py_getattro(attr); 
 	}
-	static PyObject *_getattr_self(const PyAttributeDef attrlist[], void *self, const char *attr);
-	static int _setattr_self(const PyAttributeDef attrlist[], void *self, const char *attr, PyObject *value);
+	static PyObject *py_getattro_self(const PyAttributeDef attrlist[], void *self, PyObject *attr);
+	static int py_setattro_self(const PyAttributeDef attrlist[], void *self, PyObject *attr, PyObject *value);
 	
-	virtual int _delattr(const char *attr);
-	virtual int _setattr(const char *attr, PyObject *value);		// _setattr method
-	static  int __setattr(PyObject *PyObj, 			// This should be the entry in Type. 
-				char *attr, 
+	virtual int py_delattro(PyObject *attr);
+	virtual int py_setattro(PyObject *attr, PyObject *value);		// py_setattro method
+	static  int py_base_setattro(PyObject *PyObj, 			// This should be the entry in Type. 
+				PyObject *attr, 
 				PyObject *value)
 	{ 
-		if (!value)
-			return ((PyObjectPlus*) PyObj)->_delattr(attr);
-		return ((PyObjectPlus*) PyObj)->_setattr(attr, value);  
+		if (value==NULL)
+			return ((PyObjectPlus*) PyObj)->py_delattro(attr);
+		return ((PyObjectPlus*) PyObj)->py_setattro(attr, value);  
 	}
 	
-	virtual PyObject *_repr(void);				// _repr method
-	static  PyObject *__repr(PyObject *PyObj)			// This should be the entry in Type.
+	virtual PyObject *py_repr(void);				// py_repr method
+	static  PyObject *py_base_repr(PyObject *PyObj)			// This should be the entry in Type.
 	{
-		return ((PyObjectPlus*) PyObj)->_repr();  
+		return ((PyObjectPlus*) PyObj)->py_repr();  
 	}
 	
 									// isA methods
diff --git a/source/gameengine/Expressions/Value.cpp b/source/gameengine/Expressions/Value.cpp
index ebb12636ac2cc65ce91c353fa18cec2871b5e0b5..8b910b9038b3f6bf86db7c5a907697986c33f66f 100644
--- a/source/gameengine/Expressions/Value.cpp
+++ b/source/gameengine/Expressions/Value.cpp
@@ -139,22 +139,23 @@ static PyNumberMethods cvalue_as_number = {
 
 
 PyTypeObject CValue::Type = {
-	PyObject_HEAD_INIT(&PyType_Type)
+	PyObject_HEAD_INIT(NULL)
 	0,
 	"CValue",
 	sizeof(CValue),
 	0,
 	PyDestructor,
 	0,
-	__getattr,
-	__setattr,
-	&MyPyCompare,
-	__repr,
-	&cvalue_as_number,
-	0,
 	0,
 	0,
-	0
+	&MyPyCompare,
+	py_base_repr,
+	&cvalue_as_number,
+	0,0,0,0,0,
+	py_base_getattro,
+	py_base_setattro,
+	0,0,0,0,0,0,0,0,0,
+	Methods
 };
 
 PyParentObject CValue::Parents[] = {
@@ -320,55 +321,70 @@ STR_String CValue::op2str (VALUE_OPERATOR op)
 //
 void CValue::SetProperty(const STR_String & name,CValue* ioProperty)
 {
-	// Check if somebody is setting an empty property
 	if (ioProperty==NULL)
-	{
+	{	// Check if somebody is setting an empty property
 		trace("Warning:trying to set empty property!");
 		return;
 	}
 
-	// Make sure we have a property array
-	if (m_pNamedPropertyArray == NULL)
+	if (m_pNamedPropertyArray)
+	{	// Try to replace property (if so -> exit as soon as we replaced it)
+		CValue* oldval = (*m_pNamedPropertyArray)[name];
+		if (oldval)
+			oldval->Release();
+	}
+	else { // Make sure we have a property array
 		m_pNamedPropertyArray = new std::map<STR_String,CValue *>;
-
-	// Try to replace property (if so -> exit as soon as we replaced it)
-	CValue* oldval = (*m_pNamedPropertyArray)[name];
-	if (oldval)
-	{
-		oldval->Release();
 	}
 	
 	// Add property at end of array
 	(*m_pNamedPropertyArray)[name] = ioProperty->AddRef();//->Add(ioProperty);
 }
 
+void CValue::SetProperty(const char* name,CValue* ioProperty)
+{
+	if (ioProperty==NULL)
+	{	// Check if somebody is setting an empty property
+		trace("Warning:trying to set empty property!");
+		return;
+	}
 
+	if (m_pNamedPropertyArray)
+	{	// Try to replace property (if so -> exit as soon as we replaced it)
+		CValue* oldval = (*m_pNamedPropertyArray)[name];
+		if (oldval)
+			oldval->Release();
+	}
+	else { // Make sure we have a property array
+		m_pNamedPropertyArray = new std::map<STR_String,CValue *>;
+	}
+	
+	// Add property at end of array
+	(*m_pNamedPropertyArray)[name] = ioProperty->AddRef();//->Add(ioProperty);
+}
 
 //
 // Get pointer to a property with name <inName>, returns NULL if there is no property named <inName>
 //
 CValue* CValue::GetProperty(const STR_String & inName)
 {
-	// Check properties, as soon as we found it -> Return a pointer to the property
-	CValue* result = NULL;
-	if (m_pNamedPropertyArray)
-	{
-		std::map<STR_String,CValue*>::iterator it = (*m_pNamedPropertyArray).find(inName);
-		if (!( it==m_pNamedPropertyArray->end()))
-		{
-			result = (*it).second;
-		}
-
+	if (m_pNamedPropertyArray) {
+		std::map<STR_String,CValue*>::iterator it = m_pNamedPropertyArray->find(inName);
+		if (it != m_pNamedPropertyArray->end())
+			return (*it).second;
 	}
-		//for (int i=0; i<m_pValuePropertyArray->size(); i++)
-		//	if ((*m_pValuePropertyArray)[i]->GetName() == inName)
-		//		return (*m_pValuePropertyArray)[i];
-	
-	// Did not find property with name <inName>, return NULL property pointer
-	return result;
+	return NULL;
 }
 
-
+CValue* CValue::GetProperty(const char *inName)
+{
+	if (m_pNamedPropertyArray) {
+		std::map<STR_String,CValue*>::iterator it = m_pNamedPropertyArray->find(inName);
+		if (it != m_pNamedPropertyArray->end())
+			return (*it).second;
+	}
+	return NULL;
+}
 
 //
 // Get text description of property with name <inName>, returns an empty string if there is no property named <inName>
@@ -396,26 +412,20 @@ float CValue::GetPropertyNumber(const STR_String& inName,float defnumber)
 //
 // Remove the property named <inName>, returns true if the property was succesfully removed, false if property was not found or could not be removed
 //
-bool CValue::RemoveProperty(const STR_String & inName)
+bool CValue::RemoveProperty(const char *inName)
 {
 	// Check if there are properties at all which can be removed
-	if (m_pNamedPropertyArray) {	
-		CValue* val = GetProperty(inName);
-		if (NULL != val) 
+	if (m_pNamedPropertyArray)
+	{
+		std::map<STR_String,CValue*>::iterator it = m_pNamedPropertyArray->find(inName);
+		if (it != m_pNamedPropertyArray->end())
 		{
-			val->Release();
-			m_pNamedPropertyArray->erase(inName);
+			((*it).second)->Release();
+			m_pNamedPropertyArray->erase(it);
 			return true;
 		}
-	} 
-	
-	char err[128];
-	if (m_pNamedPropertyArray)
-		sprintf(err, "attribute \"%s\" dosnt exist", inName.ReadPtr());
-	else
-		sprintf(err, "attribute \"%s\" dosnt exist (no property array)", inName.ReadPtr());
+	}
 	
-	PyErr_SetString(PyExc_AttributeError, err);
 	return false;
 }
 
@@ -426,8 +436,8 @@ vector<STR_String> CValue::GetPropertyNames()
 {
 	vector<STR_String> result;
 	if(!m_pNamedPropertyArray) return result;
-	for ( std::map<STR_String,CValue*>::iterator it = m_pNamedPropertyArray->begin();
-	!(it == m_pNamedPropertyArray->end());it++)
+	std::map<STR_String,CValue*>::iterator it;
+	for (it= m_pNamedPropertyArray->begin(); (it != m_pNamedPropertyArray->end()); it++)
 	{
 		result.push_back((*it).first);
 	}
@@ -444,8 +454,8 @@ void CValue::ClearProperties()
 		return;
 
 	// Remove all properties
-	for ( std::map<STR_String,CValue*>::iterator it = m_pNamedPropertyArray->begin();
-	!(it == m_pNamedPropertyArray->end());it++)
+	std::map<STR_String,CValue*>::iterator it;
+	for (it= m_pNamedPropertyArray->begin();(it != m_pNamedPropertyArray->end()); it++)
 	{
 		CValue* tmpval = (*it).second;
 		//STR_String name = (*it).first;
@@ -464,9 +474,11 @@ void CValue::ClearProperties()
 //
 void CValue::SetPropertiesModified(bool inModified)
 {
-	int numprops = GetPropertyCount();
-	for (int i=0; i<numprops; i++)
-		GetProperty(i)->SetModified(inModified);
+	if(!m_pNamedPropertyArray) return;
+	std::map<STR_String,CValue*>::iterator it;
+	
+	for (it= m_pNamedPropertyArray->begin();(it != m_pNamedPropertyArray->end()); it++)
+		((*it).second)->SetModified(inModified);
 }
 
 
@@ -476,11 +488,13 @@ void CValue::SetPropertiesModified(bool inModified)
 //
 bool CValue::IsAnyPropertyModified()
 {
-	int numprops = GetPropertyCount();
-	for (int i=0;i<numprops;i++)
-		if (GetProperty(i)->IsModified())
+	if(!m_pNamedPropertyArray) return false;
+	std::map<STR_String,CValue*>::iterator it;
+	
+	for (it= m_pNamedPropertyArray->begin();(it != m_pNamedPropertyArray->end()); it++)
+		if (((*it).second)->IsModified())
 			return true;
-
+	
 	return false;
 }
 
@@ -489,7 +503,6 @@ bool CValue::IsAnyPropertyModified()
 //
 // Get property number <inIndex>
 //
-
 CValue* CValue::GetProperty(int inIndex)
 {
 
@@ -498,8 +511,8 @@ CValue* CValue::GetProperty(int inIndex)
 
 	if (m_pNamedPropertyArray)
 	{
-		for ( std::map<STR_String,CValue*>::iterator it = m_pNamedPropertyArray->begin();
-		!(it == m_pNamedPropertyArray->end());it++)
+		std::map<STR_String,CValue*>::iterator it;
+		for (it= m_pNamedPropertyArray->begin(); (it != m_pNamedPropertyArray->end()); it++)
 		{
 			if (count++==inIndex)
 			{
@@ -535,8 +548,8 @@ void CValue::CloneProperties(CValue *replica)
 	if (m_pNamedPropertyArray)
 	{
 		replica->m_pNamedPropertyArray=NULL;
-		for ( std::map<STR_String,CValue*>::iterator it = m_pNamedPropertyArray->begin();
-		!(it == m_pNamedPropertyArray->end());it++)
+		std::map<STR_String,CValue*>::iterator it;
+		for (it= m_pNamedPropertyArray->begin(); (it != m_pNamedPropertyArray->end()); it++)
 		{
 			CValue *val = (*it).second->GetReplica();
 			replica->SetProperty((*it).first,val);
@@ -685,32 +698,20 @@ PyAttributeDef CValue::Attributes[] = {
 };
 
 
-PyObject*	CValue::_getattr(const char *attr)
+PyObject*	CValue::py_getattro(PyObject *attr)
 {
-	CValue* resultattr = FindIdentifier(STR_String(attr));
-	STR_String text;
+	char *attr_str= PyString_AsString(attr);
+	CValue* resultattr = GetProperty(attr_str);
 	if (resultattr)
 	{
-		if (resultattr->IsError())
-		{
-			resultattr->Release();
-		} else
-		{
-			// to avoid some compare problems, return a real pythonthing
-			PyObject* pyconvert = resultattr->ConvertValueToPython();
-			if (pyconvert)
-			{
-				resultattr->Release();
-				return pyconvert;
-			} else
-			{
-				// also check if it's already in pythoninterpreter!
-				return resultattr;
-			}
-			
-		}
+		PyObject* pyconvert = resultattr->ConvertValueToPython();
+	
+		if (pyconvert)
+			return pyconvert;
+		else
+			return resultattr; // also check if it's already in pythoninterpreter!
 	}
-	_getattr_up(PyObjectPlus);
+	py_getattro_up(PyObjectPlus);
 }
 
 CValue* CValue::ConvertPythonToValue(PyObject* pyobj)
@@ -772,35 +773,36 @@ CValue* CValue::ConvertPythonToValue(PyObject* pyobj)
 
 }
 
-int	CValue::_delattr(const char *attr)
+int	CValue::py_delattro(PyObject *attr)
 {
-	if (!RemoveProperty(STR_String(attr))) /* sets error */
-		return 1;
-	return 0;
+	char *attr_str= PyString_AsString(attr);
+	if (RemoveProperty(STR_String(attr_str)))
+		return 0;
+	
+	PyErr_Format(PyExc_AttributeError, "attribute \"%s\" dosnt exist", attr_str);
+	return 1;
 }
 
-int	CValue::_setattr(const char *attr,PyObject* pyobj)
+int	CValue::py_setattro(PyObject *attr, PyObject* pyobj)
 {
 	CValue* vallie = ConvertPythonToValue(pyobj);
 	if (vallie)
 	{
-		STR_String attr_str = attr;
+		char *attr_str= PyString_AsString(attr);
 		CValue* oldprop = GetProperty(attr_str);
 		
 		if (oldprop)
-		{
 			oldprop->SetValue(vallie);
-		} else
-		{
+		else
 			SetProperty(attr_str, vallie);
-		}
+		
 		vallie->Release();
 	} else
 	{
 		return 1; /* ConvertPythonToValue sets the error message */
 	}
 	
-	//PyObjectPlus::_setattr(attr,value);
+	//PyObjectPlus::py_setattro(attr,value);
 	return 0;
 };
 
@@ -811,8 +813,8 @@ PyObject*	CValue::ConvertKeysToPython( void )
 	
 	if (m_pNamedPropertyArray)
 	{
-		for ( std::map<STR_String,CValue*>::iterator it = m_pNamedPropertyArray->begin();
-		!(it == m_pNamedPropertyArray->end());it++)
+		std::map<STR_String,CValue*>::iterator it;
+		for (it= m_pNamedPropertyArray->begin(); (it != m_pNamedPropertyArray->end()); it++)
 		{
 			pystr = PyString_FromString( (*it).first );
 			PyList_Append(pylist, pystr);
diff --git a/source/gameengine/Expressions/Value.h b/source/gameengine/Expressions/Value.h
index caf1064dc32e4f438a8ccd30f718811a5f23e009..7a2816a9778ee6e500865b6108324a0d81f7f79d 100644
--- a/source/gameengine/Expressions/Value.h
+++ b/source/gameengine/Expressions/Value.h
@@ -217,14 +217,14 @@ public:
 
 	CValue(PyTypeObject *T = &Type);
 	//static PyObject*	PyMake(PyObject*,PyObject*);
-	virtual PyObject *_repr(void)
+	virtual PyObject *py_repr(void)
 	{
 		return Py_BuildValue("s",(const char*)GetText());
 	}
 
 
 
-	virtual PyObject*			_getattr(const char *attr);
+	virtual PyObject*			py_getattro(PyObject *attr);
 
 	void	SpecialRelease()
 	{
@@ -251,8 +251,8 @@ public:
 	virtual CValue*	ConvertPythonToValue(PyObject* pyobj);
 
 
-	virtual int				_delattr(const char *attr);
-	virtual int				_setattr(const char *attr, PyObject* value);
+	virtual int				py_delattro(PyObject *attr);
+	virtual int				py_setattro(PyObject *attr, PyObject* value);
 	
 	virtual PyObject* ConvertKeysToPython( void );
 	
@@ -283,10 +283,12 @@ public:
 
 	/// Property Management
 	virtual void		SetProperty(const STR_String& name,CValue* ioProperty);						// Set property <ioProperty>, overwrites and releases a previous property with the same name if needed
-	virtual CValue*		GetProperty(const STR_String & inName);							// Get pointer to a property with name <inName>, returns NULL if there is no property named <inName>
+	virtual void		SetProperty(const char* name,CValue* ioProperty);
+	virtual CValue*		GetProperty(const char* inName);							// Get pointer to a property with name <inName>, returns NULL if there is no property named <inName>
+	virtual CValue*		GetProperty(const STR_String & inName);
 	STR_String			GetPropertyText(const STR_String & inName,const STR_String& deftext="");						// Get text description of property with name <inName>, returns an empty string if there is no property named <inName>
 	float				GetPropertyNumber(const STR_String& inName,float defnumber);
-	virtual bool		RemoveProperty(const STR_String & inName);						// Remove the property named <inName>, returns true if the property was succesfully removed, false if property was not found or could not be removed
+	virtual bool		RemoveProperty(const char *inName);						// Remove the property named <inName>, returns true if the property was succesfully removed, false if property was not found or could not be removed
 	virtual vector<STR_String>	GetPropertyNames();
 	virtual void		ClearProperties();										// Clear all properties
 
diff --git a/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp b/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp
index 7bf051f2b5cb559a396a05471bbf2da02f4baa02..9d4dc1f33d697464f7264cb40590a4adfcee4964 100644
--- a/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp
+++ b/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp
@@ -80,22 +80,22 @@ bool SCA_2DFilterActuator::Update()
 
 
 PyTypeObject SCA_2DFilterActuator::Type = {
-        PyObject_HEAD_INIT(&PyType_Type)
+        PyObject_HEAD_INIT(NULL)
         0,
         "SCA_2DFilterActuator",
         sizeof(SCA_2DFilterActuator),
         0,
-        PyDestructor,
-        0,
-        __getattr,
-        __setattr,
-        0, 
-         __repr,
-        0,
-        0,
-        0,
-        0,
-        0
+		PyDestructor,
+		0,
+		0,
+		0,
+		0,
+		py_base_repr,
+		0,0,0,0,0,0,
+		py_base_getattro,
+		py_base_setattro,
+		0,0,0,0,0,0,0,0,0,
+		Methods
 };
 
 
@@ -117,6 +117,6 @@ PyAttributeDef SCA_2DFilterActuator::Attributes[] = {
 	{ NULL }	//Sentinel
 };
 
-PyObject* SCA_2DFilterActuator::_getattr(const char *attr) {
-    _getattr_up(SCA_IActuator);
+PyObject* SCA_2DFilterActuator::py_getattro(PyObject *attr) {
+    py_getattro_up(SCA_IActuator);
 }
diff --git a/source/gameengine/GameLogic/SCA_2DFilterActuator.h b/source/gameengine/GameLogic/SCA_2DFilterActuator.h
index 9da0500afff6fbf5b5503227a8d423b9d1dae217..f69c680b7747f6f76b91dcc573a70780e7b3964b 100644
--- a/source/gameengine/GameLogic/SCA_2DFilterActuator.h
+++ b/source/gameengine/GameLogic/SCA_2DFilterActuator.h
@@ -38,7 +38,7 @@ public:
     virtual bool Update();
 
     virtual CValue* GetReplica();
-    virtual PyObject* _getattr(const char *attr);
+    virtual PyObject* py_getattro(PyObject *attr);
 
 };
 #endif
diff --git a/source/gameengine/GameLogic/SCA_ANDController.cpp b/source/gameengine/GameLogic/SCA_ANDController.cpp
index b67ef7dabaf19cd7ff7835c738a002a9c0f398ea..cb62e2b5a1dc871dc4e882b26f13b50ad39ac208 100644
--- a/source/gameengine/GameLogic/SCA_ANDController.cpp
+++ b/source/gameengine/GameLogic/SCA_ANDController.cpp
@@ -107,22 +107,22 @@ CValue* SCA_ANDController::GetReplica()
 
 /* Integration hooks ------------------------------------------------------- */
 PyTypeObject SCA_ANDController::Type = {
-	PyObject_HEAD_INIT(&PyType_Type)
+	PyObject_HEAD_INIT(NULL)
 	0,
 	"SCA_ANDController",
 	sizeof(SCA_ANDController),
 	0,
 	PyDestructor,
 	0,
-	__getattr,
-	__setattr,
-	0, //&MyPyCompare,
-	__repr,
-	0, //&cvalue_as_number,
 	0,
 	0,
 	0,
-	0
+	py_base_repr,
+	0,0,0,0,0,0,
+	py_base_getattro,
+	py_base_setattro,
+	0,0,0,0,0,0,0,0,0,
+	Methods
 };
 
 PyParentObject SCA_ANDController::Parents[] = {
@@ -141,8 +141,8 @@ PyAttributeDef SCA_ANDController::Attributes[] = {
 	{ NULL }	//Sentinel
 };
 
-PyObject* SCA_ANDController::_getattr(const char *attr) {
-	_getattr_up(SCA_IController);
+PyObject* SCA_ANDController::py_getattro(PyObject *attr) {
+	py_getattro_up(SCA_IController);
 }
 
 /* eof */
diff --git a/source/gameengine/GameLogic/SCA_ANDController.h b/source/gameengine/GameLogic/SCA_ANDController.h
index eba7e1b545a31ff68ce173878148462b86e5cd46..fdb93d0fc4290dad8609a66a085a2e709e1e6ec3 100644
--- a/source/gameengine/GameLogic/SCA_ANDController.h
+++ b/source/gameengine/GameLogic/SCA_ANDController.h
@@ -48,7 +48,7 @@ public:
 	/* Python interface ---------------------------------------------------- */
 	/* --------------------------------------------------------------------- */
 
-	virtual PyObject* _getattr(const char *attr);
+	virtual PyObject* py_getattro(PyObject *attr);
 
 };
 
diff --git a/source/gameengine/GameLogic/SCA_ActuatorSensor.cpp b/source/gameengine/GameLogic/SCA_ActuatorSensor.cpp
index 7f8dbef7758c920063dd138b3e83a1b6840e3812..ed7aa66d04b50c5905088ec6759e777ab45eff09 100644
--- a/source/gameengine/GameLogic/SCA_ActuatorSensor.cpp
+++ b/source/gameengine/GameLogic/SCA_ActuatorSensor.cpp
@@ -122,22 +122,22 @@ void SCA_ActuatorSensor::Update()
 
 /* Integration hooks ------------------------------------------------------- */
 PyTypeObject SCA_ActuatorSensor::Type = {
-	PyObject_HEAD_INIT(&PyType_Type)
+	PyObject_HEAD_INIT(NULL)
 	0,
 	"SCA_ActuatorSensor",
 	sizeof(SCA_ActuatorSensor),
 	0,
 	PyDestructor,
 	0,
-	__getattr,
-	__setattr,
-	0, //&MyPyCompare,
-	__repr,
-	0, //&cvalue_as_number,
 	0,
 	0,
 	0,
-	0
+	py_base_repr,
+	0,0,0,0,0,0,
+	py_base_getattro,
+	py_base_setattro,
+	0,0,0,0,0,0,0,0,0,
+	Methods
 };
 
 PyParentObject SCA_ActuatorSensor::Parents[] = {
@@ -161,11 +161,11 @@ PyAttributeDef SCA_ActuatorSensor::Attributes[] = {
 	{ NULL }	//Sentinel
 };
 
-PyObject* SCA_ActuatorSensor::_getattr(const char *attr) {
-	PyObject* object = _getattr_self(Attributes, this, attr);
+PyObject* SCA_ActuatorSensor::py_getattro(PyObject *attr) {
+	PyObject* object = py_getattro_self(Attributes, this, attr);
 	if (object != NULL)
 		return object;
-	_getattr_up(SCA_ISensor); /* implicit return! */
+	py_getattro_up(SCA_ISensor); /* implicit return! */
 }
 
 int SCA_ActuatorSensor::CheckActuator(void *self, const PyAttributeDef*)
@@ -180,11 +180,11 @@ int SCA_ActuatorSensor::CheckActuator(void *self, const PyAttributeDef*)
 	return 1;
 }
 
-int SCA_ActuatorSensor::_setattr(const char *attr, PyObject *value) {
-	int ret = _setattr_self(Attributes, this, attr, value);
+int SCA_ActuatorSensor::py_setattro(PyObject *attr, PyObject *value) {
+	int ret = py_setattro_self(Attributes, this, attr, value);
 	if (ret >= 0)
 		return ret;
-	return SCA_ISensor::_setattr(attr, value);
+	return SCA_ISensor::py_setattro(attr, value);
 }
 
 /* 3. getActuator */
diff --git a/source/gameengine/GameLogic/SCA_ActuatorSensor.h b/source/gameengine/GameLogic/SCA_ActuatorSensor.h
index 75ee08f42d6831c2cc3fd07e6d8c1ddd684b78bd..9bc873e4ee132f40ba751fb60326ee8d92159b7f 100644
--- a/source/gameengine/GameLogic/SCA_ActuatorSensor.h
+++ b/source/gameengine/GameLogic/SCA_ActuatorSensor.h
@@ -61,8 +61,8 @@ public:
 	/* Python interface ---------------------------------------------------- */
 	/* --------------------------------------------------------------------- */
 
-	virtual PyObject* _getattr(const char *attr);
-	virtual int _setattr(const char *attr, PyObject *value);
+	virtual PyObject* py_getattro(PyObject *attr);
+	virtual int py_setattro(PyObject *attr, PyObject *value);
 
 	/* 3. setProperty */
 	KX_PYMETHOD_DOC(SCA_ActuatorSensor,SetActuator);
diff --git a/source/gameengine/GameLogic/SCA_AlwaysSensor.cpp b/source/gameengine/GameLogic/SCA_AlwaysSensor.cpp
index 154f0ad8cef7a6583a07640bd230f9014b74bdbc..a7b0e5a14d2244c5d1eea21df5fa71e7a166451b 100644
--- a/source/gameengine/GameLogic/SCA_AlwaysSensor.cpp
+++ b/source/gameengine/GameLogic/SCA_AlwaysSensor.cpp
@@ -105,22 +105,22 @@ bool SCA_AlwaysSensor::Evaluate(CValue* event)
 
 /* Integration hooks ------------------------------------------------------- */
 PyTypeObject SCA_AlwaysSensor::Type = {
-	PyObject_HEAD_INIT(&PyType_Type)
+	PyObject_HEAD_INIT(NULL)
 	0,
 	"SCA_AlwaysSensor",
 	sizeof(SCA_AlwaysSensor),
 	0,
 	PyDestructor,
 	0,
-	__getattr,
-	__setattr,
-	0, //&MyPyCompare,
-	__repr,
-	0, //&cvalue_as_number,
 	0,
 	0,
 	0,
-	0
+	py_base_repr,
+	0,0,0,0,0,0,
+	py_base_getattro,
+	py_base_setattro,
+	0,0,0,0,0,0,0,0,0,
+	Methods
 };
 
 PyParentObject SCA_AlwaysSensor::Parents[] = {
@@ -139,8 +139,8 @@ PyAttributeDef SCA_AlwaysSensor::Attributes[] = {
 	{ NULL }	//Sentinel
 };
 
-PyObject* SCA_AlwaysSensor::_getattr(const char *attr) {
-	_getattr_up(SCA_ISensor);
+PyObject* SCA_AlwaysSensor::py_getattro(PyObject *attr) {
+	py_getattro_up(SCA_ISensor);
 }
 
 /* eof */
diff --git a/source/gameengine/GameLogic/SCA_AlwaysSensor.h b/source/gameengine/GameLogic/SCA_AlwaysSensor.h
index ebe6ba80208beabf7dc42109c097eb56f8873d04..87949babf595310662bf8f1eb8fa2996e32c9043 100644
--- a/source/gameengine/GameLogic/SCA_AlwaysSensor.h
+++ b/source/gameengine/GameLogic/SCA_AlwaysSensor.h
@@ -52,7 +52,7 @@ public:
 	/* Python interface ---------------------------------------------------- */
 	/* --------------------------------------------------------------------- */
 	
-	virtual PyObject* _getattr(const char *attr);
+	virtual PyObject* py_getattro(PyObject *attr);
 
 	
 };
diff --git a/source/gameengine/GameLogic/SCA_DelaySensor.cpp b/source/gameengine/GameLogic/SCA_DelaySensor.cpp
index 31a620b939d4b10ae7c09b9420d6222814c73404..5082caacfd503cd6524869f6d75908d0d635bf9c 100644
--- a/source/gameengine/GameLogic/SCA_DelaySensor.cpp
+++ b/source/gameengine/GameLogic/SCA_DelaySensor.cpp
@@ -131,22 +131,22 @@ bool SCA_DelaySensor::Evaluate(CValue* event)
 
 /* Integration hooks ------------------------------------------------------- */
 PyTypeObject SCA_DelaySensor::Type = {
-	PyObject_HEAD_INIT(&PyType_Type)
+	PyObject_HEAD_INIT(NULL)
 	0,
 	"SCA_DelaySensor",
 	sizeof(SCA_DelaySensor),
 	0,
 	PyDestructor,
 	0,
-	__getattr,
-	__setattr,
-	0, //&MyPyCompare,
-	__repr,
-	0, //&cvalue_as_number,
 	0,
 	0,
 	0,
-	0
+	py_base_repr,
+	0,0,0,0,0,0,
+	py_base_getattro,
+	py_base_setattro,
+	0,0,0,0,0,0,0,0,0,
+	Methods
 };
 
 PyParentObject SCA_DelaySensor::Parents[] = {
@@ -178,18 +178,18 @@ PyAttributeDef SCA_DelaySensor::Attributes[] = {
 	{ NULL }	//Sentinel
 };
 
-PyObject* SCA_DelaySensor::_getattr(const char *attr) {
-	PyObject* object = _getattr_self(Attributes, this, attr);
+PyObject* SCA_DelaySensor::py_getattro(PyObject *attr) {
+	PyObject* object = py_getattro_self(Attributes, this, attr);
 	if (object != NULL)
 		return object;
-	_getattr_up(SCA_ISensor);
+	py_getattro_up(SCA_ISensor);
 }
 
-int SCA_DelaySensor::_setattr(const char *attr, PyObject *value) {
-	int ret = _setattr_self(Attributes, this, attr, value);
+int SCA_DelaySensor::py_setattro(PyObject *attr, PyObject *value) {
+	int ret = py_setattro_self(Attributes, this, attr, value);
 	if (ret >= 0)
 		return ret;
-	return SCA_ISensor::_setattr(attr, value);
+	return SCA_ISensor::py_setattro(attr, value);
 }
 
 
diff --git a/source/gameengine/GameLogic/SCA_DelaySensor.h b/source/gameengine/GameLogic/SCA_DelaySensor.h
index 491eee61da8a57b5befaedc5b769d72121e56ea7..f9e3d619198550a60569f304fee035f2800b0018 100644
--- a/source/gameengine/GameLogic/SCA_DelaySensor.h
+++ b/source/gameengine/GameLogic/SCA_DelaySensor.h
@@ -60,8 +60,8 @@ public:
 	/* Python interface ---------------------------------------------------- */
 	/* --------------------------------------------------------------------- */
 	
-	virtual PyObject* _getattr(const char *attr);
-	virtual int _setattr(const char *attr, PyObject *value);
+	virtual PyObject* py_getattro(PyObject *attr);
+	virtual int py_setattro(PyObject *attr, PyObject *value);
 
 	/* setProperty */
 	KX_PYMETHOD_DOC(SCA_DelaySensor,SetDelay);
diff --git a/source/gameengine/GameLogic/SCA_ExpressionController.h b/source/gameengine/GameLogic/SCA_ExpressionController.h
index 79c26eea1e718926806a4d1cdbbb51bee803ca07..2936742be19e4875a0c29954dd81f22c3bb9465e 100644
--- a/source/gameengine/GameLogic/SCA_ExpressionController.h
+++ b/source/gameengine/GameLogic/SCA_ExpressionController.h
@@ -59,7 +59,7 @@ public:
 	/* Python interface ---------------------------------------------------- */
 	/* --------------------------------------------------------------------- */
 
-//	virtual PyObject* _getattr(const char *attr);
+//	virtual PyObject* py_getattro(PyObject *attr);
 
 };
 
diff --git a/source/gameengine/GameLogic/SCA_ILogicBrick.cpp b/source/gameengine/GameLogic/SCA_ILogicBrick.cpp
index 49d39f75814ea70797f13017b071fbd8a0123374..45ebd874ea5b9c5e052a25d20171341c77d3f297 100644
--- a/source/gameengine/GameLogic/SCA_ILogicBrick.cpp
+++ b/source/gameengine/GameLogic/SCA_ILogicBrick.cpp
@@ -217,22 +217,22 @@ CValue* SCA_ILogicBrick::GetEvent()
 /* python stuff */
 
 PyTypeObject SCA_ILogicBrick::Type = {
-	PyObject_HEAD_INIT(&PyType_Type)
+	PyObject_HEAD_INIT(NULL)
 	0,
 	"SCA_ILogicBrick",
 	sizeof(SCA_ILogicBrick),
 	0,
 	PyDestructor,
 	0,
-	__getattr,
-	__setattr,
-	0, //&MyPyCompare,
-	__repr,
-	0, //&cvalue_as_number,
 	0,
 	0,
 	0,
-	0
+	py_base_repr,
+	0,0,0,0,0,0,
+	py_base_getattro,
+	py_base_setattro,
+	0,0,0,0,0,0,0,0,0,
+	Methods
 };
 
 
@@ -278,20 +278,20 @@ int SCA_ILogicBrick::CheckProperty(void *self, const PyAttributeDef *attrdef)
 }
 
 PyObject*
-SCA_ILogicBrick::_getattr(const char *attr)
+SCA_ILogicBrick::py_getattro(PyObject *attr)
 {
-	PyObject* object = _getattr_self(Attributes, this, attr);
+	PyObject* object = py_getattro_self(Attributes, this, attr);
 	if (object != NULL)
 		return object;
-  _getattr_up(CValue);
+  py_getattro_up(CValue);
 }
 
-int SCA_ILogicBrick::_setattr(const char *attr, PyObject *value)
+int SCA_ILogicBrick::py_setattro(PyObject *attr, PyObject *value)
 {
-	int ret = _setattr_self(Attributes, this, attr, value);
+	int ret = py_setattro_self(Attributes, this, attr, value);
 	if (ret >= 0)
 		return ret;
-	return CValue::_setattr(attr, value);
+	return CValue::py_setattro(attr, value);
 }
 
 
diff --git a/source/gameengine/GameLogic/SCA_ILogicBrick.h b/source/gameengine/GameLogic/SCA_ILogicBrick.h
index 70d499416135f0a7c8e18f66c9ac7a1e47fcb0a5..c098f9dfd8ab735cc400b55dabb4ebc93d6569c7 100644
--- a/source/gameengine/GameLogic/SCA_ILogicBrick.h
+++ b/source/gameengine/GameLogic/SCA_ILogicBrick.h
@@ -79,8 +79,8 @@ public:
 
 	virtual	bool		LessComparedTo(SCA_ILogicBrick* other);
 	
-	virtual PyObject* _getattr(const char *attr);
-	virtual int _setattr(const char *attr, PyObject *value);
+	virtual PyObject* py_getattro(PyObject *attr);
+	virtual int py_setattro(PyObject *attr, PyObject *value);
 
 	static class SCA_LogicManager*	m_sCurrentLogicManager;
 
diff --git a/source/gameengine/GameLogic/SCA_IObject.cpp b/source/gameengine/GameLogic/SCA_IObject.cpp
index debd62d44e6ab045812f1b4c504b6d300112466c..d1ce377316b9a9f42428dbd1ce81d3a1e63f0c19 100644
--- a/source/gameengine/GameLogic/SCA_IObject.cpp
+++ b/source/gameengine/GameLogic/SCA_IObject.cpp
@@ -375,22 +375,22 @@ void SCA_IObject::SetState(unsigned int state)
 
 /* Integration hooks ------------------------------------------------------- */
 PyTypeObject SCA_IObject::Type = {
-	PyObject_HEAD_INIT(&PyType_Type)
+	PyObject_HEAD_INIT(NULL)
 	0,
 	"SCA_IObject",
 	sizeof(SCA_IObject),
 	0,
 	PyDestructor,
 	0,
-	__getattr,
-	__setattr,
-	0, //&MyPyCompare,
-	__repr,
-	0, //&cvalue_as_number,
 	0,
 	0,
 	0,
-	0
+	py_base_repr,
+	0,0,0,0,0,0,
+	py_base_getattro,
+	py_base_setattro,
+	0,0,0,0,0,0,0,0,0,
+	Methods
 };
 
 
@@ -414,7 +414,7 @@ PyAttributeDef SCA_IObject::Attributes[] = {
 };
 
 
-PyObject* SCA_IObject::_getattr(const char *attr) {
-	_getattr_up(CValue);
+PyObject* SCA_IObject::py_getattro(PyObject *attr) {
+	py_getattro_up(CValue);
 }
 
diff --git a/source/gameengine/GameLogic/SCA_IObject.h b/source/gameengine/GameLogic/SCA_IObject.h
index d47353b1ac02e38b2cc6d4143cb6398fcf2783d4..44ed3c8f3fe7cc19a00d35e38673af83f0c57612 100644
--- a/source/gameengine/GameLogic/SCA_IObject.h
+++ b/source/gameengine/GameLogic/SCA_IObject.h
@@ -145,7 +145,7 @@ public:
 //	const class MT_Point3&	ConvertPythonPylist(PyObject* pylist);
 	
 	// here come the python forwarded methods
-	virtual PyObject* _getattr(const char *attr);
+	virtual PyObject* py_getattro(PyObject *attr);
 
 	virtual int GetGameObjectType() {return -1;}
 	
diff --git a/source/gameengine/GameLogic/SCA_ISensor.cpp b/source/gameengine/GameLogic/SCA_ISensor.cpp
index e8a072f4c46a9be64f9663959fff83db2ab40a36..8a40c0c35f3a99ecbfc10a73630df5c347f4a485 100644
--- a/source/gameengine/GameLogic/SCA_ISensor.cpp
+++ b/source/gameengine/GameLogic/SCA_ISensor.cpp
@@ -393,22 +393,22 @@ KX_PYMETHODDEF_DOC_NOARGS(SCA_ISensor, reset,
 /* ----------------------------------------------- */
 
 PyTypeObject SCA_ISensor::Type = {
-	PyObject_HEAD_INIT(&PyType_Type)
+	PyObject_HEAD_INIT(NULL)
 	0,
 	"SCA_ISensor",
 	sizeof(SCA_ISensor),
 	0,
 	PyDestructor,
 	0,
-	__getattr,
-	__setattr,
-	0, //&MyPyCompare,
-	__repr,
-	0, //&cvalue_as_number,
 	0,
 	0,
 	0,
-	0
+	py_base_repr,
+	0,0,0,0,0,0,
+	py_base_getattro,
+	py_base_setattro,
+	0,0,0,0,0,0,0,0,0,
+	Methods
 };
 
 PyParentObject SCA_ISensor::Parents[] = {
@@ -454,38 +454,40 @@ PyAttributeDef SCA_ISensor::Attributes[] = {
 	KX_PYATTRIBUTE_INT_RW("frequency",0,100000,true,SCA_ISensor,m_pulse_frequency),
 	KX_PYATTRIBUTE_BOOL_RW("invert",SCA_ISensor,m_invert),
 	KX_PYATTRIBUTE_BOOL_RW("level",SCA_ISensor,m_level),
-	// make these properties read-only in _setaddr, must still implement them in _getattr
+	// make these properties read-only in _setaddr, must still implement them in py_getattro
 	KX_PYATTRIBUTE_DUMMY("triggered"),
 	KX_PYATTRIBUTE_DUMMY("positive"),
 	{ NULL }	//Sentinel
 };
 
 PyObject*
-SCA_ISensor::_getattr(const char *attr)
+SCA_ISensor::py_getattro(PyObject *attr)
 {
-	PyObject* object = _getattr_self(Attributes, this, attr);
+	PyObject* object = py_getattro_self(Attributes, this, attr);
 	if (object != NULL)
 		return object;
-	if (!strcmp(attr, "triggered"))
+	
+	char *attr_str= PyString_AsString(attr);
+	if (!strcmp(attr_str, "triggered"))
 	{
 		int retval = 0;
 		if (SCA_PythonController::m_sCurrentController)
 			retval = SCA_PythonController::m_sCurrentController->IsTriggered(this);
 		return PyInt_FromLong(retval);
 	}
-	if (!strcmp(attr, "positive"))
+	if (!strcmp(attr_str, "positive"))
 	{	
 		int retval = IsPositiveTrigger();
 		return PyInt_FromLong(retval);
 	}
-	_getattr_up(SCA_ILogicBrick);
+	py_getattro_up(SCA_ILogicBrick);
 }
 
-int SCA_ISensor::_setattr(const char *attr, PyObject *value)
+int SCA_ISensor::py_setattro(PyObject *attr, PyObject *value)
 {
-	int ret = _setattr_self(Attributes, this, attr, value);
+	int ret = py_setattro_self(Attributes, this, attr, value);
 	if (ret >= 0)
 		return ret;
-	return SCA_ILogicBrick::_setattr(attr, value);
+	return SCA_ILogicBrick::py_setattro(attr, value);
 }
 /* eof */
diff --git a/source/gameengine/GameLogic/SCA_ISensor.h b/source/gameengine/GameLogic/SCA_ISensor.h
index 23f2c76c19fde67fb7ebea9cae43afec16997a96..ce7b66df1cda4b8c81df235dd1adee16e189bde3 100644
--- a/source/gameengine/GameLogic/SCA_ISensor.h
+++ b/source/gameengine/GameLogic/SCA_ISensor.h
@@ -136,8 +136,8 @@ public:
 
 	/* Python functions: */
 	
-	virtual PyObject* _getattr(const char *attr);
-	virtual int _setattr(const char *attr, PyObject *value);
+	virtual PyObject* py_getattro(PyObject *attr);
+	virtual int py_setattro(PyObject *attr, PyObject *value);
 
 	//Deprecated functions ----->
 	KX_PYMETHOD_DOC_NOARGS(SCA_ISensor,IsPositive);
diff --git a/source/gameengine/GameLogic/SCA_JoystickSensor.cpp b/source/gameengine/GameLogic/SCA_JoystickSensor.cpp
index c2d90c830cff0c858fc4ad743a9f897895d671e0..0cfd6843c1b965e438cd01e520a1c31ea947f69d 100644
--- a/source/gameengine/GameLogic/SCA_JoystickSensor.cpp
+++ b/source/gameengine/GameLogic/SCA_JoystickSensor.cpp
@@ -275,22 +275,22 @@ bool SCA_JoystickSensor::isValid(SCA_JoystickSensor::KX_JOYSENSORMODE m)
 
 /* Integration hooks ------------------------------------------------------- */
 PyTypeObject SCA_JoystickSensor::Type = {
-	PyObject_HEAD_INIT(&PyType_Type)
+	PyObject_HEAD_INIT(NULL)
 		0,
 		"SCA_JoystickSensor",
 		sizeof(SCA_JoystickSensor),
 		0,
 		PyDestructor,
 		0,
-		__getattr,
-		__setattr,
-		0, //&MyPyCompare,
-		__repr,
-		0, //&cvalue_as_number,
 		0,
 		0,
 		0,
-		0
+		py_base_repr,
+		0,0,0,0,0,0,
+		py_base_getattro,
+		py_base_setattro,
+		0,0,0,0,0,0,0,0,0,
+		Methods
 };
 
 
@@ -333,8 +333,8 @@ PyAttributeDef SCA_JoystickSensor::Attributes[] = {
 	KX_PYATTRIBUTE_INT_RW("button",0,100,false,SCA_JoystickSensor,m_button),
 	KX_PYATTRIBUTE_INT_LIST_RW_CHECK("axis",0,3,true,SCA_JoystickSensor,m_axis,2,CheckAxis),
 	KX_PYATTRIBUTE_INT_LIST_RW_CHECK("hat",0,12,true,SCA_JoystickSensor,m_hat,2,CheckHat),
-	// dummy attributes will just be read-only in _setattr
-	// you still need to defined them in _getattr
+	// dummy attributes will just be read-only in py_setattro
+	// you still need to defined them in py_getattro
 	KX_PYATTRIBUTE_DUMMY("axisPosition"),
 	KX_PYATTRIBUTE_DUMMY("numAxis"),
 	KX_PYATTRIBUTE_DUMMY("numButtons"),
@@ -343,38 +343,40 @@ PyAttributeDef SCA_JoystickSensor::Attributes[] = {
 	{ NULL }	//Sentinel
 };
 
-PyObject* SCA_JoystickSensor::_getattr(const char *attr) {
+PyObject* SCA_JoystickSensor::py_getattro(PyObject *attr) {
 	SCA_Joystick *joy = m_pJoystickMgr->GetJoystickDevice(m_joyindex);
-	if (!strcmp(attr, "axisPosition")) {
+	char *attr_str= PyString_AsString(attr);
+	
+	if (!strcmp(attr_str, "axisPosition")) {
 		if(joy)
 			return Py_BuildValue("[iiii]", joy->GetAxis10(), joy->GetAxis11(), joy->GetAxis20(), joy->GetAxis21());
 		else
 			return Py_BuildValue("[iiii]", 0, 0, 0, 0);
 	}
-	if (!strcmp(attr, "numAxis")) {
+	if (!strcmp(attr_str, "numAxis")) {
 		return PyInt_FromLong( joy ? joy->GetNumberOfAxes() : 0 );
 	}
-	if (!strcmp(attr, "numButtons")) {
+	if (!strcmp(attr_str, "numButtons")) {
 		return PyInt_FromLong( joy ? joy->GetNumberOfButtons() : 0 );
 	}
-	if (!strcmp(attr, "numHats")) {
+	if (!strcmp(attr_str, "numHats")) {
 		return PyInt_FromLong( joy ? joy->GetNumberOfHats() : 0 );
 	}
-	if (!strcmp(attr, "connected")) {
+	if (!strcmp(attr_str, "connected")) {
 		return PyBool_FromLong( joy ? joy->Connected() : 0 );
 	}
-	PyObject* object = _getattr_self(Attributes, this, attr);
+	PyObject* object = py_getattro_self(Attributes, this, attr);
 	if (object != NULL)
 		return object;
-	_getattr_up(SCA_ISensor);
+	py_getattro_up(SCA_ISensor);
 }
 
-int SCA_JoystickSensor::_setattr(const char *attr, PyObject *value) 
+int SCA_JoystickSensor::py_setattro(PyObject *attr, PyObject *value) 
 {
-	int ret = _setattr_self(Attributes, this, attr, value);
+	int ret = py_setattro_self(Attributes, this, attr, value);
 	if (ret >= 0)
 		return ret;
-	return SCA_ISensor::_setattr(attr, value);
+	return SCA_ISensor::py_setattro(attr, value);
 }
 
 
diff --git a/source/gameengine/GameLogic/SCA_JoystickSensor.h b/source/gameengine/GameLogic/SCA_JoystickSensor.h
index 49d220c056de8fdab72dbdbfe522a9710e4a8444..ccdd2107b218e5028753559a4a40a2ce876b7d4f 100644
--- a/source/gameengine/GameLogic/SCA_JoystickSensor.h
+++ b/source/gameengine/GameLogic/SCA_JoystickSensor.h
@@ -121,8 +121,8 @@ public:
 	/* Python interface ---------------------------------------------------- */
 	/* --------------------------------------------------------------------- */
 
-	virtual PyObject* _getattr(const char *attr);
-	virtual int _setattr(const char *attr, PyObject *value);
+	virtual PyObject* py_getattro(PyObject *attr);
+	virtual int py_setattro(PyObject *attr, PyObject *value);
 
 	/* Joystick Index */
 	KX_PYMETHOD_DOC_NOARGS(SCA_JoystickSensor,GetIndex);
diff --git a/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp b/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
index 324e5eae98a624298bb00cf85dc6f71f3acc245e..fc1b5be354049f9f89be7a05ac5e16e67f22c71b 100644
--- a/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
+++ b/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
@@ -778,22 +778,22 @@ KX_PYMETHODDEF_DOC_O(SCA_KeyboardSensor, getKeyStatus,
 /* ------------------------------------------------------------------------- */
 
 PyTypeObject SCA_KeyboardSensor::Type = {
-	PyObject_HEAD_INIT(&PyType_Type)
+	PyObject_HEAD_INIT(NULL)
 	0,
 	"SCA_KeyboardSensor",
 	sizeof(SCA_KeyboardSensor),
 	0,
 	PyDestructor,
 	0,
-	__getattr,
-	__setattr,
-	0, //&MyPyCompare,
-	__repr,
-	0, //&cvalue_as_number,
 	0,
 	0,
 	0,
-	0
+	py_base_repr,
+	0,0,0,0,0,0,
+	py_base_getattro,
+	py_base_setattro,
+	0,0,0,0,0,0,0,0,0,
+	Methods
 };
 
 PyParentObject SCA_KeyboardSensor::Parents[] = {
@@ -831,18 +831,18 @@ PyAttributeDef SCA_KeyboardSensor::Attributes[] = {
 };
 
 PyObject*
-SCA_KeyboardSensor::_getattr(const char *attr)
+SCA_KeyboardSensor::py_getattro(PyObject *attr)
 {
-	PyObject* object = _getattr_self(Attributes, this, attr);
+	PyObject* object = py_getattro_self(Attributes, this, attr);
 	if (object != NULL)
 		return object;
-  _getattr_up(SCA_ISensor);
+  py_getattro_up(SCA_ISensor);
 }
 
-int SCA_KeyboardSensor::_setattr(const char *attr, PyObject *value)
+int SCA_KeyboardSensor::py_setattro(PyObject *attr, PyObject *value)
 {
-	int ret = _setattr_self(Attributes, this, attr, value);
+	int ret = py_setattro_self(Attributes, this, attr, value);
 	if (ret >= 0)
 		return ret;
-	return SCA_ISensor::_setattr(attr, value);
+	return SCA_ISensor::py_setattro(attr, value);
 }
diff --git a/source/gameengine/GameLogic/SCA_KeyboardSensor.h b/source/gameengine/GameLogic/SCA_KeyboardSensor.h
index bc2f86327a5e7c080ee610009612a72807ae3a3c..c579b6a82f814d7a8ebacb037f183df3b046468f 100644
--- a/source/gameengine/GameLogic/SCA_KeyboardSensor.h
+++ b/source/gameengine/GameLogic/SCA_KeyboardSensor.h
@@ -126,8 +126,8 @@ public:
 	/* Python interface ---------------------------------------------------- */
 	/* --------------------------------------------------------------------- */
 
-	virtual PyObject* _getattr(const char *attr);
-	virtual int _setattr(const char *attr, PyObject *value);
+	virtual PyObject* py_getattro(PyObject *attr);
+	virtual int py_setattro(PyObject *attr, PyObject *value);
 
 	//Deprecated functions ----->
 	/** 1. GetKey : check which key this sensor looks at */
diff --git a/source/gameengine/GameLogic/SCA_MouseSensor.cpp b/source/gameengine/GameLogic/SCA_MouseSensor.cpp
index 57535b29f32696703b5b40a2e271be969875b38d..c5f6fdabbe876a9cb3065a857d6f7274ccca7678 100644
--- a/source/gameengine/GameLogic/SCA_MouseSensor.cpp
+++ b/source/gameengine/GameLogic/SCA_MouseSensor.cpp
@@ -102,7 +102,7 @@ int SCA_MouseSensor::UpdateHotkey(void *self, const PyAttributeDef*)
 	default:
 		; /* ignore, no hotkey */
 	}
-	// return value is used in _setattr(), 
+	// return value is used in py_setattro(), 
 	// 0=attribute checked ok (see Attributes array definition)
 	return 0;
 }
@@ -300,22 +300,22 @@ KX_PYMETHODDEF_DOC_O(SCA_MouseSensor, getButtonStatus,
 /* ------------------------------------------------------------------------- */
 
 PyTypeObject SCA_MouseSensor::Type = {
-	PyObject_HEAD_INIT(&PyType_Type)
+	PyObject_HEAD_INIT(NULL)
 	0,
 	"SCA_MouseSensor",
 	sizeof(SCA_MouseSensor),
 	0,
 	PyDestructor,
 	0,
-	__getattr,
-	__setattr,
-	0, //&MyPyCompare,
-	__repr,
-	0, //&cvalue_as_number,
 	0,
 	0,
 	0,
-	0
+	py_base_repr,
+	0,0,0,0,0,0,
+	py_base_getattro,
+	py_base_setattro,
+	0,0,0,0,0,0,0,0,0,
+	Methods
 };
 
 PyParentObject SCA_MouseSensor::Parents[] = {
@@ -341,20 +341,20 @@ PyAttributeDef SCA_MouseSensor::Attributes[] = {
 	{ NULL }	//Sentinel
 };
 
-PyObject* SCA_MouseSensor::_getattr(const char *attr) 
+PyObject* SCA_MouseSensor::py_getattro(PyObject *attr) 
 {
-	PyObject* object = _getattr_self(Attributes, this, attr);
+	PyObject* object = py_getattro_self(Attributes, this, attr);
 	if (object != NULL)
 		return object;
-	_getattr_up(SCA_ISensor);
+	py_getattro_up(SCA_ISensor);
 }
 
-int SCA_MouseSensor::_setattr(const char *attr, PyObject *value)
+int SCA_MouseSensor::py_setattro(PyObject *attr, PyObject *value)
 {
-	int ret = _setattr_self(Attributes, this, attr, value);
+	int ret = py_setattro_self(Attributes, this, attr, value);
 	if (ret >= 0)
 		return ret;
-	return SCA_ISensor::_setattr(attr, value);
+	return SCA_ISensor::py_setattro(attr, value);
 }
 
 /* eof */
diff --git a/source/gameengine/GameLogic/SCA_MouseSensor.h b/source/gameengine/GameLogic/SCA_MouseSensor.h
index 30b43fe53cc620cb9ef7f8034de20af5c979ef82..73410569cc2e6bf897f513ff1e4cb1a821d0baeb 100644
--- a/source/gameengine/GameLogic/SCA_MouseSensor.h
+++ b/source/gameengine/GameLogic/SCA_MouseSensor.h
@@ -109,8 +109,8 @@ class SCA_MouseSensor : public SCA_ISensor
 	/* Python interface ---------------------------------------------------- */
 	/* --------------------------------------------------------------------- */
 
-	virtual PyObject* _getattr(const char *attr);
-	virtual int _setattr(const char *attr, PyObject *value);
+	virtual PyObject* py_getattro(PyObject *attr);
+	virtual int py_setattro(PyObject *attr, PyObject *value);
 
 	//Deprecated functions ----->
 	/* read x-coordinate */
diff --git a/source/gameengine/GameLogic/SCA_NANDController.cpp b/source/gameengine/GameLogic/SCA_NANDController.cpp
index 18426d755823fb1989089dbb56ca6bb537fad05f..bddd5f4d3abafd45b88710ba50062ae7a6720824 100644
--- a/source/gameengine/GameLogic/SCA_NANDController.cpp
+++ b/source/gameengine/GameLogic/SCA_NANDController.cpp
@@ -107,22 +107,22 @@ CValue* SCA_NANDController::GetReplica()
 
 /* Integration hooks ------------------------------------------------------- */
 PyTypeObject SCA_NANDController::Type = {
-	PyObject_HEAD_INIT(&PyType_Type)
+	PyObject_HEAD_INIT(NULL)
 	0,
 	"SCA_NANDController",
 	sizeof(SCA_NANDController),
 	0,
 	PyDestructor,
 	0,
-	__getattr,
-	__setattr,
-	0, //&MyPyCompare,
-	__repr,
-	0, //&cvalue_as_number,
 	0,
 	0,
 	0,
-	0
+	py_base_repr,
+	0,0,0,0,0,0,
+	py_base_getattro,
+	py_base_setattro,
+	0,0,0,0,0,0,0,0,0,
+	Methods
 };
 
 PyParentObject SCA_NANDController::Parents[] = {
@@ -141,8 +141,8 @@ PyAttributeDef SCA_NANDController::Attributes[] = {
 	{ NULL }	//Sentinel
 };
 
-PyObject* SCA_NANDController::_getattr(const char *attr) {
-	_getattr_up(SCA_IController);
+PyObject* SCA_NANDController::py_getattro(PyObject *attr) {
+	py_getattro_up(SCA_IController);
 }
 
 /* eof */
diff --git a/source/gameengine/GameLogic/SCA_NANDController.h b/source/gameengine/GameLogic/SCA_NANDController.h
index d88504cfc0dbbb492a65ae13b3d0872fa65d6eb6..11600914a1a212413b313ff52a958a92a6cd63f9 100644
--- a/source/gameengine/GameLogic/SCA_NANDController.h
+++ b/source/gameengine/GameLogic/SCA_NANDController.h
@@ -48,7 +48,7 @@ public:
 	/* Python interface ---------------------------------------------------- */
 	/* --------------------------------------------------------------------- */
 
-	virtual PyObject* _getattr(const char *attr);
+	virtual PyObject* py_getattro(PyObject *attr);
 
 };
 
diff --git a/source/gameengine/GameLogic/SCA_NORController.cpp b/source/gameengine/GameLogic/SCA_NORController.cpp
index 1de6a641c3d85d889a28d045d81f57076a340b8d..3ee073523c3dd56027a4f42227644c2fa280b8b5 100644
--- a/source/gameengine/GameLogic/SCA_NORController.cpp
+++ b/source/gameengine/GameLogic/SCA_NORController.cpp
@@ -107,22 +107,22 @@ CValue* SCA_NORController::GetReplica()
 
 /* Integration hooks ------------------------------------------------------- */
 PyTypeObject SCA_NORController::Type = {
-	PyObject_HEAD_INIT(&PyType_Type)
+	PyObject_HEAD_INIT(NULL)
 	0,
 	"SCA_NORController",
 	sizeof(SCA_NORController),
 	0,
 	PyDestructor,
 	0,
-	__getattr,
-	__setattr,
-	0, //&MyPyCompare,
-	__repr,
-	0, //&cvalue_as_number,
 	0,
 	0,
 	0,
-	0
+	py_base_repr,
+	0,0,0,0,0,0,
+	py_base_getattro,
+	py_base_setattro,
+	0,0,0,0,0,0,0,0,0,
+	Methods
 };
 
 PyParentObject SCA_NORController::Parents[] = {
@@ -141,8 +141,8 @@ PyAttributeDef SCA_NORController::Attributes[] = {
 	{ NULL }	//Sentinel
 };
 
-PyObject* SCA_NORController::_getattr(const char *attr) {
-	_getattr_up(SCA_IController);
+PyObject* SCA_NORController::py_getattro(PyObject *attr) {
+	py_getattro_up(SCA_IController);
 }
 
 /* eof */
diff --git a/source/gameengine/GameLogic/SCA_NORController.h b/source/gameengine/GameLogic/SCA_NORController.h
index 45b639f3f3f294919626659e43855c0a700f99ce..fc814e28d37285dae3f581d5ade1f65e9f7045f9 100644
--- a/source/gameengine/GameLogic/SCA_NORController.h
+++ b/source/gameengine/GameLogic/SCA_NORController.h
@@ -48,7 +48,7 @@ public:
 	/* Python interface ---------------------------------------------------- */
 	/* --------------------------------------------------------------------- */
 
-	virtual PyObject* _getattr(const char *attr);
+	virtual PyObject* py_getattro(PyObject *attr);
 
 };
 
diff --git a/source/gameengine/GameLogic/SCA_ORController.cpp b/source/gameengine/GameLogic/SCA_ORController.cpp
index 61fbc889d901d80d2ef34ad57b631594eda71a01..91d5e56d4f365a33f9fd54d385d82abdfa7eb516 100644
--- a/source/gameengine/GameLogic/SCA_ORController.cpp
+++ b/source/gameengine/GameLogic/SCA_ORController.cpp
@@ -99,22 +99,22 @@ void SCA_ORController::Trigger(SCA_LogicManager* logicmgr)
 
 /* Integration hooks ------------------------------------------------------- */
 PyTypeObject SCA_ORController::Type = {
-	PyObject_HEAD_INIT(&PyType_Type)
+	PyObject_HEAD_INIT(NULL)
 	0,
 	"SCA_ORController",
 	sizeof(SCA_ORController),
 	0,
 	PyDestructor,
 	0,
-	__getattr,
-	__setattr,
-	0, //&MyPyCompare,
-	__repr,
-	0, //&cvalue_as_number,
 	0,
 	0,
 	0,
-	0
+	py_base_repr,
+	0,0,0,0,0,0,
+	py_base_getattro,
+	py_base_setattro,
+	0,0,0,0,0,0,0,0,0,
+	Methods
 };
 
 PyParentObject SCA_ORController::Parents[] = {
@@ -134,8 +134,8 @@ PyAttributeDef SCA_ORController::Attributes[] = {
 };
 
 
-PyObject* SCA_ORController::_getattr(const char *attr) {
-	_getattr_up(SCA_IController);
+PyObject* SCA_ORController::py_getattro(PyObject *attr) {
+	py_getattro_up(SCA_IController);
 }
 
 /* eof */
diff --git a/source/gameengine/GameLogic/SCA_ORController.h b/source/gameengine/GameLogic/SCA_ORController.h
index 9a6e9e75022e8a642435791e75034fe51d59bff4..fdc81486e741143e2abb1d7fd4355907be55d392 100644
--- a/source/gameengine/GameLogic/SCA_ORController.h
+++ b/source/gameengine/GameLogic/SCA_ORController.h
@@ -49,7 +49,7 @@ public:
 	/* Python interface ---------------------------------------------------- */
 	/* --------------------------------------------------------------------- */
 
-	virtual PyObject* _getattr(const char *attr);
+	virtual PyObject* py_getattro(PyObject *attr);
 };
 
 #endif //__KX_ORCONTROLLER
diff --git a/source/gameengine/GameLogic/SCA_PropertyActuator.cpp b/source/gameengine/GameLogic/SCA_PropertyActuator.cpp
index c9ace081bae8e126aef8765552a1faa2e518e543..e1f303430ec16bab41dc269a05ea5e54118c02c8 100644
--- a/source/gameengine/GameLogic/SCA_PropertyActuator.cpp
+++ b/source/gameengine/GameLogic/SCA_PropertyActuator.cpp
@@ -218,22 +218,22 @@ void SCA_PropertyActuator::Relink(GEN_Map<GEN_HashedPtr, void*> *obj_map)
 
 /* Integration hooks ------------------------------------------------------- */
 PyTypeObject SCA_PropertyActuator::Type = {
-	PyObject_HEAD_INIT(&PyType_Type)
+	PyObject_HEAD_INIT(NULL)
 	0,
 	"SCA_PropertyActuator",
 	sizeof(SCA_PropertyActuator),
 	0,
 	PyDestructor,
 	0,
-	__getattr,
-	__setattr,
-	0, //&MyPyCompare,
-	__repr,
-	0, //&cvalue_as_number,
 	0,
 	0,
 	0,
-	0
+	py_base_repr,
+	0,0,0,0,0,0,
+	py_base_getattro,
+	py_base_setattro,
+	0,0,0,0,0,0,0,0,0,
+	Methods
 };
 
 PyParentObject SCA_PropertyActuator::Parents[] = {
@@ -260,18 +260,18 @@ PyAttributeDef SCA_PropertyActuator::Attributes[] = {
 	{ NULL }	//Sentinel
 };
 
-PyObject* SCA_PropertyActuator::_getattr(const char *attr) {
-	PyObject* object = _getattr_self(Attributes, this, attr);
+PyObject* SCA_PropertyActuator::py_getattro(PyObject *attr) {
+	PyObject* object = py_getattro_self(Attributes, this, attr);
 	if (object != NULL)
 		return object;
-	_getattr_up(SCA_IActuator);
+	py_getattro_up(SCA_IActuator);
 }
 
-int SCA_PropertyActuator::_setattr(const char *attr, PyObject *value) {
-	int ret = _setattr_self(Attributes, this, attr, value);
+int SCA_PropertyActuator::py_setattro(PyObject *attr, PyObject *value) {
+	int ret = py_setattro_self(Attributes, this, attr, value);
 	if (ret >= 0)
 		return ret;
-	return SCA_IActuator::_setattr(attr, value);
+	return SCA_IActuator::py_setattro(attr, value);
 }
 
 /* 1. setProperty                                                        */
diff --git a/source/gameengine/GameLogic/SCA_PropertyActuator.h b/source/gameengine/GameLogic/SCA_PropertyActuator.h
index 444d928579693258dd2b7c13c6bd48c4482d91be..6a975716ed0504529d00c86398e60c4bc925a7cd 100644
--- a/source/gameengine/GameLogic/SCA_PropertyActuator.h
+++ b/source/gameengine/GameLogic/SCA_PropertyActuator.h
@@ -85,8 +85,8 @@ public:
 	/* Python interface ---------------------------------------------------- */
 	/* --------------------------------------------------------------------- */
 
-	virtual PyObject*  _getattr(const char *attr);
-	virtual int _setattr(const char *attr, PyObject *value);
+	virtual PyObject*  py_getattro(PyObject *attr);
+	virtual int py_setattro(PyObject *attr, PyObject *value);
 
 	// python wrapped methods
 	KX_PYMETHOD_DOC(SCA_PropertyActuator,SetProperty);
diff --git a/source/gameengine/GameLogic/SCA_PropertySensor.cpp b/source/gameengine/GameLogic/SCA_PropertySensor.cpp
index d683c8bb3e7d70bfd627bb4d642da831e0fc74ad..659823f6fbaa292549dff4c13c349dd110d714fe 100644
--- a/source/gameengine/GameLogic/SCA_PropertySensor.cpp
+++ b/source/gameengine/GameLogic/SCA_PropertySensor.cpp
@@ -306,22 +306,22 @@ int SCA_PropertySensor::validValueForProperty(void *self, const PyAttributeDef*)
 
 /* Integration hooks ------------------------------------------------------- */
 PyTypeObject SCA_PropertySensor::Type = {
-	PyObject_HEAD_INIT(&PyType_Type)
+	PyObject_HEAD_INIT(NULL)
 	0,
 	"SCA_PropertySensor",
 	sizeof(SCA_PropertySensor),
 	0,
 	PyDestructor,
 	0,
-	__getattr,
-	__setattr,
-	0, //&MyPyCompare,
-	__repr,
-	0, //&cvalue_as_number,
 	0,
 	0,
 	0,
-	0
+	py_base_repr,
+	0,0,0,0,0,0,
+	py_base_getattro,
+	py_base_setattro,
+	0,0,0,0,0,0,0,0,0,
+	Methods
 };
 
 PyParentObject SCA_PropertySensor::Parents[] = {
@@ -352,18 +352,18 @@ PyAttributeDef SCA_PropertySensor::Attributes[] = {
 };
 
 
-PyObject* SCA_PropertySensor::_getattr(const char *attr) {
-	PyObject* object = _getattr_self(Attributes, this, attr);
+PyObject* SCA_PropertySensor::py_getattro(PyObject *attr) {
+	PyObject* object = py_getattro_self(Attributes, this, attr);
 	if (object != NULL)
 		return object;
-	_getattr_up(SCA_ISensor); /* implicit return! */
+	py_getattro_up(SCA_ISensor); /* implicit return! */
 }
 
-int SCA_PropertySensor::_setattr(const char *attr, PyObject *value) {
-	int ret = _setattr_self(Attributes, this, attr, value);
+int SCA_PropertySensor::py_setattro(PyObject *attr, PyObject *value) {
+	int ret = py_setattro_self(Attributes, this, attr, value);
 	if (ret >= 0)
 		return ret;
-	return SCA_ISensor::_setattr(attr, value);
+	return SCA_ISensor::py_setattro(attr, value);
 }
 
 /* 1. getType */
diff --git a/source/gameengine/GameLogic/SCA_PropertySensor.h b/source/gameengine/GameLogic/SCA_PropertySensor.h
index 2594e3fca9d55c849f2d0e66a3c2c01cddd91475..076c1ae51ecef5f7432d11d234fe987c7108add5 100644
--- a/source/gameengine/GameLogic/SCA_PropertySensor.h
+++ b/source/gameengine/GameLogic/SCA_PropertySensor.h
@@ -89,8 +89,8 @@ public:
 	/* Python interface ---------------------------------------------------- */
 	/* --------------------------------------------------------------------- */
 
-	virtual PyObject* _getattr(const char *attr);
-	virtual int _setattr(const char *attr, PyObject *value);
+	virtual PyObject* py_getattro(PyObject *attr);
+	virtual int py_setattro(PyObject *attr, PyObject *value);
 
 	/* 1. getType */
 	KX_PYMETHOD_DOC(SCA_PropertySensor,GetType);
diff --git a/source/gameengine/GameLogic/SCA_PythonController.cpp b/source/gameengine/GameLogic/SCA_PythonController.cpp
index c75e36acab298b29919c601facfabceed9033d54..2d200e0a2380adb5f24777843509d8b3c0af199e 100644
--- a/source/gameengine/GameLogic/SCA_PythonController.cpp
+++ b/source/gameengine/GameLogic/SCA_PythonController.cpp
@@ -224,22 +224,22 @@ const char* SCA_PythonController::sPyAddActiveActuator__doc__= "addActiveActuato
 const char SCA_PythonController::GetActuators_doc[] = "getActuator";
 
 PyTypeObject SCA_PythonController::Type = {
-	PyObject_HEAD_INIT(&PyType_Type)
+	PyObject_HEAD_INIT(NULL)
 		0,
 		"SCA_PythonController",
 		sizeof(SCA_PythonController),
 		0,
 		PyDestructor,
 		0,
-		__getattr,
-		__setattr,
-		0, //&MyPyCompare,
-		__repr,
-		0, //&cvalue_as_number,
 		0,
 		0,
 		0,
-		0
+		py_base_repr,
+		0,0,0,0,0,0,
+		py_base_getattro,
+		py_base_setattro,
+		0,0,0,0,0,0,0,0,0,
+		Methods
 };
 
 PyParentObject SCA_PythonController::Parents[] = {
@@ -372,24 +372,26 @@ void SCA_PythonController::Trigger(SCA_LogicManager* logicmgr)
 
 
 
-PyObject* SCA_PythonController::_getattr(const char *attr)
+PyObject* SCA_PythonController::py_getattro(PyObject *attr)
 {
-	if (!strcmp(attr,"state")) {
+	char *attr_str= PyString_AsString(attr);
+	if (!strcmp(attr_str,"state")) {
 		return PyInt_FromLong(m_statemask);
 	}
-	if (!strcmp(attr,"script")) {
+	if (!strcmp(attr_str,"script")) {
 		return PyString_FromString(m_scriptText);
 	}
-	_getattr_up(SCA_IController);
+	py_getattro_up(SCA_IController);
 }
 
-int SCA_PythonController::_setattr(const char *attr, PyObject *value)
+int SCA_PythonController::py_setattro(PyObject *attr, PyObject *value)
 {
-	if (!strcmp(attr,"state")) {
+	char *attr_str= PyString_AsString(attr);
+	if (!strcmp(attr_str,"state")) {
 		PyErr_SetString(PyExc_AttributeError, "state is read only");
 		return 1;
 	}
-	if (!strcmp(attr,"script")) {
+	if (!strcmp(attr_str,"script")) {
 		char *scriptArg = PyString_AsString(value);
 		
 		if (scriptArg==NULL) {
@@ -403,7 +405,7 @@ int SCA_PythonController::_setattr(const char *attr, PyObject *value)
 		
 		return 1;
 	}
-	return SCA_IController::_setattr(attr, value);
+	return SCA_IController::py_setattro(attr, value);
 }
 
 PyObject* SCA_PythonController::PyActivate(PyObject* self, PyObject *value)
diff --git a/source/gameengine/GameLogic/SCA_PythonController.h b/source/gameengine/GameLogic/SCA_PythonController.h
index 4ec18f32c23a67f942894a2359c53eca7b45102e..3348071c00fdd12d64828c569b675a06f598bdb8 100644
--- a/source/gameengine/GameLogic/SCA_PythonController.h
+++ b/source/gameengine/GameLogic/SCA_PythonController.h
@@ -78,8 +78,8 @@ class SCA_PythonController : public SCA_IController
 	static PyObject* sPyAddActiveActuator(PyObject* self, 
 										  PyObject* args);
 	static SCA_IActuator* LinkedActuatorFromPy(PyObject *value);
-	virtual PyObject* _getattr(const char *attr);
-	virtual int _setattr(const char *attr, PyObject *value);
+	virtual PyObject* py_getattro(PyObject *attr);
+	virtual int py_setattro(PyObject *attr, PyObject *value);
 
 		
 	KX_PYMETHOD_O(SCA_PythonController,Activate);
diff --git a/source/gameengine/GameLogic/SCA_RandomActuator.cpp b/source/gameengine/GameLogic/SCA_RandomActuator.cpp
index d6c73f21f37aa417879af56cc8acaabee3af0da7..7af116fad992b1f5cc17d031e9fadf374cabafe1 100644
--- a/source/gameengine/GameLogic/SCA_RandomActuator.cpp
+++ b/source/gameengine/GameLogic/SCA_RandomActuator.cpp
@@ -312,22 +312,22 @@ void SCA_RandomActuator::enforceConstraints() {
 
 /* Integration hooks ------------------------------------------------------- */
 PyTypeObject SCA_RandomActuator::Type = {
-	PyObject_HEAD_INIT(&PyType_Type)
+	PyObject_HEAD_INIT(NULL)
 	0,
 	"SCA_RandomActuator",
 	sizeof(SCA_RandomActuator),
 	0,
 	PyDestructor,
 	0,
-	__getattr,
-	__setattr,
-	0, //&MyPyCompare,
-	__repr,
-	0, //&cvalue_as_number,
 	0,
 	0,
 	0,
-	0
+	py_base_repr,
+	0,0,0,0,0,0,
+	py_base_getattro,
+	py_base_setattro,
+	0,0,0,0,0,0,0,0,0,
+	Methods
 };
 
 PyParentObject SCA_RandomActuator::Parents[] = {
@@ -348,16 +348,18 @@ PyMethodDef SCA_RandomActuator::Methods[] = {
 	{"setProperty",     (PyCFunction) SCA_RandomActuator::sPySetProperty, METH_VARARGS, (PY_METHODCHAR)SetProperty_doc},
 	{"getProperty",     (PyCFunction) SCA_RandomActuator::sPyGetProperty, METH_VARARGS, (PY_METHODCHAR)GetProperty_doc},
 	//<----- Deprecated
-	{"setBoolConst",    (PyCFunction) SCA_RandomActuator::sPySetBoolConst, METH_VARARGS, (PY_METHODCHAR)SetBoolConst_doc},
-	{"setBoolUniform",  (PyCFunction) SCA_RandomActuator::sPySetBoolUniform, METH_VARARGS, (PY_METHODCHAR)SetBoolUniform_doc},
-	{"setBoolBernouilli",(PyCFunction) SCA_RandomActuator::sPySetBoolBernouilli, METH_VARARGS, (PY_METHODCHAR)SetBoolBernouilli_doc},
-	{"setIntConst",     (PyCFunction) SCA_RandomActuator::sPySetIntConst, METH_VARARGS, (PY_METHODCHAR)SetIntConst_doc},
-	{"setIntUniform",   (PyCFunction) SCA_RandomActuator::sPySetIntUniform, METH_VARARGS, (PY_METHODCHAR)SetIntUniform_doc},
-	{"setIntPoisson",   (PyCFunction) SCA_RandomActuator::sPySetIntPoisson, METH_VARARGS, (PY_METHODCHAR)SetIntPoisson_doc},
-	{"setFloatConst",   (PyCFunction) SCA_RandomActuator::sPySetFloatConst, METH_VARARGS, (PY_METHODCHAR)SetFloatConst_doc},
-	{"setFloatUniform", (PyCFunction) SCA_RandomActuator::sPySetFloatUniform, METH_VARARGS, (PY_METHODCHAR)SetFloatUniform_doc},
-	{"setFloatNormal",  (PyCFunction) SCA_RandomActuator::sPySetFloatNormal, METH_VARARGS, (PY_METHODCHAR)SetFloatNormal_doc},
-	{"setFloatNegativeExponential", (PyCFunction) SCA_RandomActuator::sPySetFloatNegativeExponential, METH_VARARGS, (PY_METHODCHAR)SetFloatNegativeExponential_doc},
+	KX_PYMETHODTABLE(SCA_RandomActuator, setBoolConst),
+	KX_PYMETHODTABLE_NOARGS(SCA_RandomActuator, setBoolUniform),
+	KX_PYMETHODTABLE(SCA_RandomActuator, setBoolBernouilli),
+
+	KX_PYMETHODTABLE(SCA_RandomActuator, setIntConst),
+	KX_PYMETHODTABLE(SCA_RandomActuator, setIntUniform),
+	KX_PYMETHODTABLE(SCA_RandomActuator, setIntPoisson),
+
+	KX_PYMETHODTABLE(SCA_RandomActuator, setFloatConst),
+	KX_PYMETHODTABLE(SCA_RandomActuator, setFloatUniform),
+	KX_PYMETHODTABLE(SCA_RandomActuator, setFloatNormal),
+	KX_PYMETHODTABLE(SCA_RandomActuator, setFloatNegativeExponential),
 	{NULL,NULL} //Sentinel
 };
 
@@ -366,35 +368,42 @@ PyAttributeDef SCA_RandomActuator::Attributes[] = {
 	KX_PYATTRIBUTE_FLOAT_RO("para2",SCA_RandomActuator,m_parameter2),
 	KX_PYATTRIBUTE_ENUM_RO("distribution",SCA_RandomActuator,m_distribution),
 	KX_PYATTRIBUTE_STRING_RW_CHECK("property",0,100,false,SCA_RandomActuator,m_propname,CheckProperty),
+	KX_PYATTRIBUTE_RW_FUNCTION("seed",SCA_RandomActuator,pyattr_get_seed,pyattr_set_seed),
 	{ NULL }	//Sentinel
 };	
 
-PyObject* SCA_RandomActuator::_getattr(const char *attr) {
-	PyObject* object = _getattr_self(Attributes, this, attr);
+PyObject* SCA_RandomActuator::pyattr_get_seed(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef)
+{
+	SCA_RandomActuator* act = static_cast<SCA_RandomActuator*>(self);
+	return PyInt_FromLong(act->m_base->GetSeed());
+}
+
+int SCA_RandomActuator::pyattr_set_seed(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef, PyObject *value)
+{
+	SCA_RandomActuator* act = static_cast<SCA_RandomActuator*>(self);
+	if (PyInt_Check(value))	{
+		int ival = PyInt_AsLong(value);
+		act->m_base->SetSeed(ival);
+		return 0;
+	} else {
+		PyErr_SetString(PyExc_TypeError, "expected an integer");
+		return 1;
+	}
+}
+
+PyObject* SCA_RandomActuator::py_getattro(PyObject *attr) {
+	PyObject* object = py_getattro_self(Attributes, this, attr);
 	if (object != NULL)
 		return object;
-	if (!strcmp(attr, "seed")) {
-		return PyInt_FromLong(m_base->GetSeed());
-	}
-	_getattr_up(SCA_IActuator);
+	py_getattro_up(SCA_IActuator);
 }
 
-int SCA_RandomActuator::_setattr(const char *attr, PyObject *value)
+int SCA_RandomActuator::py_setattro(PyObject *attr, PyObject *value)
 {
-	int ret = _setattr_self(Attributes, this, attr, value);
+	int ret = py_setattro_self(Attributes, this, attr, value);
 	if (ret >= 0)
 		return ret;
-	if (!strcmp(attr, "seed")) {
-		if (PyInt_Check(value))	{
-			int ival = PyInt_AsLong(value);
-			m_base->SetSeed(ival);
-			return 0;
-		} else {
-			PyErr_SetString(PyExc_TypeError, "expected an integer");
-			return 1;
-		}
-	}
-	return SCA_IActuator::_setattr(attr, value);
+	return SCA_IActuator::py_setattro(attr, value);
 }
 
 /* 1. setSeed                                                            */
@@ -491,13 +500,11 @@ PyObject* SCA_RandomActuator::PyGetProperty(PyObject* self, PyObject* args, PyOb
 }
 
 /* 11. setBoolConst */
-const char SCA_RandomActuator::SetBoolConst_doc[] = 
+KX_PYMETHODDEF_DOC_VARARGS(SCA_RandomActuator, setBoolConst,
 "setBoolConst(value)\n"
 "\t- value: 0 or 1\n"
-"\tSet this generator to produce a constant boolean value.\n";
-PyObject* SCA_RandomActuator::PySetBoolConst(PyObject* self, 
-											PyObject* args, 
-											PyObject* kwds) {
+"\tSet this generator to produce a constant boolean value.\n") 
+{
 	int paraArg;
 	if(!PyArg_ParseTuple(args, "i", &paraArg)) {
 		return NULL;
@@ -509,25 +516,21 @@ PyObject* SCA_RandomActuator::PySetBoolConst(PyObject* self,
 	Py_RETURN_NONE;
 }
 /* 12. setBoolUniform, */
-const char SCA_RandomActuator::SetBoolUniform_doc[] = 
+KX_PYMETHODDEF_DOC_NOARGS(SCA_RandomActuator, setBoolUniform,
 "setBoolUniform()\n"
-"\tSet this generator to produce true and false, each with 50%% chance of occuring\n";
-PyObject* SCA_RandomActuator::PySetBoolUniform(PyObject* self, 
-											  PyObject* args, 
-											  PyObject* kwds) {
+"\tSet this generator to produce true and false, each with 50%% chance of occuring\n") 
+{
 	/* no args */
 	m_distribution = KX_RANDOMACT_BOOL_UNIFORM;
 	enforceConstraints();
 	Py_RETURN_NONE;
 }
 /* 13. setBoolBernouilli,  */
-const char SCA_RandomActuator::SetBoolBernouilli_doc[] = 
+KX_PYMETHODDEF_DOC_VARARGS(SCA_RandomActuator, setBoolBernouilli,
 "setBoolBernouilli(value)\n"
 "\t- value: a float between 0 and 1\n"
-"\tReturn false value * 100%% of the time.\n";
-PyObject* SCA_RandomActuator::PySetBoolBernouilli(PyObject* self, 
-												 PyObject* args, 
-												 PyObject* kwds) {
+"\tReturn false value * 100%% of the time.\n")
+{
 	float paraArg;
 	if(!PyArg_ParseTuple(args, "f", &paraArg)) {
 		return NULL;
@@ -539,13 +542,11 @@ PyObject* SCA_RandomActuator::PySetBoolBernouilli(PyObject* self,
 	Py_RETURN_NONE;
 }
 /* 14. setIntConst,*/
-const char SCA_RandomActuator::SetIntConst_doc[] = 
+KX_PYMETHODDEF_DOC_VARARGS(SCA_RandomActuator, setIntConst,
 "setIntConst(value)\n"
 "\t- value: integer\n"
-"\tAlways return value\n";
-PyObject* SCA_RandomActuator::PySetIntConst(PyObject* self, 
-										   PyObject* args, 
-										   PyObject* kwds) {
+"\tAlways return value\n") 
+{
 	int paraArg;
 	if(!PyArg_ParseTuple(args, "i", &paraArg)) {
 		return NULL;
@@ -557,15 +558,13 @@ PyObject* SCA_RandomActuator::PySetIntConst(PyObject* self,
 	Py_RETURN_NONE;
 }
 /* 15. setIntUniform,*/
-const char SCA_RandomActuator::SetIntUniform_doc[] = 
+KX_PYMETHODDEF_DOC_VARARGS(SCA_RandomActuator, setIntUniform,
 "setIntUniform(lower_bound, upper_bound)\n"
 "\t- lower_bound: integer\n"
 "\t- upper_bound: integer\n"
 "\tReturn a random integer between lower_bound and\n"
-"\tupper_bound. The boundaries are included.\n";
-PyObject* SCA_RandomActuator::PySetIntUniform(PyObject* self, 
-											 PyObject* args, 
-											 PyObject* kwds) {
+"\tupper_bound. The boundaries are included.\n")
+{
 	int paraArg1, paraArg2;
 	if(!PyArg_ParseTuple(args, "ii", &paraArg1, &paraArg2)) {
 		return NULL;
@@ -578,15 +577,13 @@ PyObject* SCA_RandomActuator::PySetIntUniform(PyObject* self,
 	Py_RETURN_NONE;
 }
 /* 16. setIntPoisson,		*/
-const char SCA_RandomActuator::SetIntPoisson_doc[] = 
+KX_PYMETHODDEF_DOC_VARARGS(SCA_RandomActuator, setIntPoisson,
 "setIntPoisson(value)\n"
 "\t- value: float\n"
 "\tReturn a Poisson-distributed number. This performs a series\n"
 "\tof Bernouilli tests with parameter value. It returns the\n"
-"\tnumber of tries needed to achieve succes.\n";
-PyObject* SCA_RandomActuator::PySetIntPoisson(PyObject* self, 
-											 PyObject* args, 
-											 PyObject* kwds) {
+"\tnumber of tries needed to achieve succes.\n")
+{
 	float paraArg;
 	if(!PyArg_ParseTuple(args, "f", &paraArg)) {
 		return NULL;
@@ -597,14 +594,12 @@ PyObject* SCA_RandomActuator::PySetIntPoisson(PyObject* self,
 	enforceConstraints();
 	Py_RETURN_NONE;
 }
-/* 17. setFloatConst,*/
-const char SCA_RandomActuator::SetFloatConst_doc[] = 
+/* 17. setFloatConst */
+KX_PYMETHODDEF_DOC_VARARGS(SCA_RandomActuator, setFloatConst,
 "setFloatConst(value)\n"
 "\t- value: float\n"
-"\tAlways return value\n";
-PyObject* SCA_RandomActuator::PySetFloatConst(PyObject* self, 
-											 PyObject* args, 
-											 PyObject* kwds) {
+"\tAlways return value\n")
+{
 	float paraArg;
 	if(!PyArg_ParseTuple(args, "f", &paraArg)) {
 		return NULL;
@@ -616,15 +611,13 @@ PyObject* SCA_RandomActuator::PySetFloatConst(PyObject* self,
 	Py_RETURN_NONE;
 }
 /* 18. setFloatUniform, */
-const char SCA_RandomActuator::SetFloatUniform_doc[] = 
+KX_PYMETHODDEF_DOC_VARARGS(SCA_RandomActuator, setFloatUniform,
 "setFloatUniform(lower_bound, upper_bound)\n"
 "\t- lower_bound: float\n"
 "\t- upper_bound: float\n"
 "\tReturn a random integer between lower_bound and\n"
-"\tupper_bound.\n";
-PyObject* SCA_RandomActuator::PySetFloatUniform(PyObject* self, 
-											   PyObject* args, 
-											   PyObject* kwds) {
+"\tupper_bound.\n")
+{
 	float paraArg1, paraArg2;
 	if(!PyArg_ParseTuple(args, "ff", &paraArg1, &paraArg2)) {
 		return NULL;
@@ -637,15 +630,13 @@ PyObject* SCA_RandomActuator::PySetFloatUniform(PyObject* self,
 	Py_RETURN_NONE;
 }
 /* 19. setFloatNormal, */
-const char SCA_RandomActuator::SetFloatNormal_doc[] = 
+KX_PYMETHODDEF_DOC_VARARGS(SCA_RandomActuator, setFloatNormal,
 "setFloatNormal(mean, standard_deviation)\n"
 "\t- mean: float\n"
 "\t- standard_deviation: float\n"
 "\tReturn normal-distributed numbers. The average is mean, and the\n"
-"\tdeviation from the mean is characterized by standard_deviation.\n";
-PyObject* SCA_RandomActuator::PySetFloatNormal(PyObject* self, 
-											  PyObject* args, 
-											  PyObject* kwds) {
+"\tdeviation from the mean is characterized by standard_deviation.\n")
+{
 	float paraArg1, paraArg2;
 	if(!PyArg_ParseTuple(args, "ff", &paraArg1, &paraArg2)) {
 		return NULL;
@@ -658,14 +649,12 @@ PyObject* SCA_RandomActuator::PySetFloatNormal(PyObject* self,
 	Py_RETURN_NONE;
 }
 /* 20. setFloatNegativeExponential, */
-const char SCA_RandomActuator::SetFloatNegativeExponential_doc[] = 
+KX_PYMETHODDEF_DOC_VARARGS(SCA_RandomActuator, setFloatNegativeExponential, 
 "setFloatNegativeExponential(half_life)\n"
 "\t- half_life: float\n"
 "\tReturn negative-exponentially distributed numbers. The half-life 'time'\n"
-"\tis characterized by half_life.\n";
-PyObject* SCA_RandomActuator::PySetFloatNegativeExponential(PyObject* self, 
-														   PyObject* args, 
-														   PyObject* kwds) {
+"\tis characterized by half_life.\n")
+{
 	float paraArg;
 	if(!PyArg_ParseTuple(args, "f", &paraArg)) {
 		return NULL;
diff --git a/source/gameengine/GameLogic/SCA_RandomActuator.h b/source/gameengine/GameLogic/SCA_RandomActuator.h
index 0d404fa8a9f375ef7cec02007b96b67ca53e6c57..fbafbb69c017b6c5b75a9d4c99436374afa211ff 100644
--- a/source/gameengine/GameLogic/SCA_RandomActuator.h
+++ b/source/gameengine/GameLogic/SCA_RandomActuator.h
@@ -96,46 +96,32 @@ class SCA_RandomActuator : public SCA_IActuator
 	/* Python interface ---------------------------------------------------- */
 	/* --------------------------------------------------------------------- */
 
-	virtual PyObject* _getattr(const char *attr);
-	virtual int _setattr(const char *attr, PyObject *value);
+	virtual PyObject* py_getattro(PyObject *attr);
+	virtual int py_setattro(PyObject *attr, PyObject *value);
 
-	/* 1. setSeed                                                            */
+	static PyObject* pyattr_get_seed(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef);
+	static int pyattr_set_seed(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef, PyObject *value);
+
+	// Deprecated methods ----->
 	KX_PYMETHOD_DOC(SCA_RandomActuator,SetSeed);
-	/* 2. getSeed                                                            */
 	KX_PYMETHOD_DOC(SCA_RandomActuator,GetSeed);
-	/* 3. setPara1 -removed-                                                 */
-	/* 4. getPara1                                                           */
 	KX_PYMETHOD_DOC(SCA_RandomActuator,GetPara1);
-	/* 5. setPara2 -removed-                                                 */
-	/* 6. getPara2                                                           */
 	KX_PYMETHOD_DOC(SCA_RandomActuator,GetPara2);
-	/* 7. setDistribution -removed-                                          */
-	/* 8. getDistribution                                                    */
 	KX_PYMETHOD_DOC(SCA_RandomActuator,GetDistribution);
-	/* 9. setProperty                                                        */
 	KX_PYMETHOD_DOC(SCA_RandomActuator,SetProperty);
-	/* 10. getProperty                                                       */
 	KX_PYMETHOD_DOC(SCA_RandomActuator,GetProperty);
-	/* 11. setBoolConst                                                      */
-	KX_PYMETHOD_DOC(SCA_RandomActuator,SetBoolConst);
-	/* 12. setBoolUniform, */
-	KX_PYMETHOD_DOC(SCA_RandomActuator,SetBoolUniform);
-	/* 13. setBoolBernouilli,  */
-	KX_PYMETHOD_DOC(SCA_RandomActuator,SetBoolBernouilli);
-	/* 14. setIntConst,*/
-	KX_PYMETHOD_DOC(SCA_RandomActuator,SetIntConst);
-	/* 15. setIntUniform,*/
-	KX_PYMETHOD_DOC(SCA_RandomActuator,SetIntUniform);
-	/* 16. setIntPoisson,		*/
-	KX_PYMETHOD_DOC(SCA_RandomActuator,SetIntPoisson);
-	/* 17. setFloatConst,*/
-	KX_PYMETHOD_DOC(SCA_RandomActuator,SetFloatConst);
-	/* 18. setFloatUniform, */
-	KX_PYMETHOD_DOC(SCA_RandomActuator,SetFloatUniform);
-	/* 19. setFloatNormal, */
-	KX_PYMETHOD_DOC(SCA_RandomActuator,SetFloatNormal);
-	/* 20. setFloatNegativeExponential, */
-	KX_PYMETHOD_DOC(SCA_RandomActuator,SetFloatNegativeExponential);
+	// <-----
+
+	KX_PYMETHOD_DOC_VARARGS(SCA_RandomActuator, setBoolConst);
+	KX_PYMETHOD_DOC_NOARGS(SCA_RandomActuator, setBoolUniform);
+	KX_PYMETHOD_DOC_VARARGS(SCA_RandomActuator, setBoolBernouilli);
+	KX_PYMETHOD_DOC_VARARGS(SCA_RandomActuator, setIntConst);
+	KX_PYMETHOD_DOC_VARARGS(SCA_RandomActuator, setIntUniform);
+	KX_PYMETHOD_DOC_VARARGS(SCA_RandomActuator, setIntPoisson);
+	KX_PYMETHOD_DOC_VARARGS(SCA_RandomActuator, setFloatConst);
+	KX_PYMETHOD_DOC_VARARGS(SCA_RandomActuator, setFloatUniform);
+	KX_PYMETHOD_DOC_VARARGS(SCA_RandomActuator, setFloatNormal);
+	KX_PYMETHOD_DOC_VARARGS(SCA_RandomActuator, setFloatNegativeExponential);
 }; /* end of class KX_EditObjectActuator : public SCA_PropertyActuator */
 
 #endif
diff --git a/source/gameengine/GameLogic/SCA_RandomSensor.cpp b/source/gameengine/GameLogic/SCA_RandomSensor.cpp
index 5354c120f52ef243157491b3de8bc286f18c2450..84a9ef95e843333a708edb95d6b87978a79326eb 100644
--- a/source/gameengine/GameLogic/SCA_RandomSensor.cpp
+++ b/source/gameengine/GameLogic/SCA_RandomSensor.cpp
@@ -127,22 +127,22 @@ bool SCA_RandomSensor::Evaluate(CValue* event)
 
 /* Integration hooks ------------------------------------------------------- */
 PyTypeObject SCA_RandomSensor::Type = {
-	PyObject_HEAD_INIT(&PyType_Type)
+	PyObject_HEAD_INIT(NULL)
 	0,
 	"SCA_RandomSensor",
 	sizeof(SCA_RandomSensor),
 	0,
 	PyDestructor,
 	0,
-	__getattr,
-	__setattr,
-	0, //&MyPyCompare,
-	__repr,
-	0, //&cvalue_as_number,
 	0,
 	0,
 	0,
-	0
+	py_base_repr,
+	0,0,0,0,0,0,
+	py_base_getattro,
+	py_base_setattro,
+	0,0,0,0,0,0,0,0,0,
+	Methods
 };
 
 PyParentObject SCA_RandomSensor::Parents[] = {
@@ -165,22 +165,25 @@ PyAttributeDef SCA_RandomSensor::Attributes[] = {
 	{NULL} //Sentinel
 };
 
-PyObject* SCA_RandomSensor::_getattr(const char *attr) {
-	PyObject* object = _getattr_self(Attributes, this, attr);
+PyObject* SCA_RandomSensor::py_getattro(PyObject *attr) {
+	PyObject* object = py_getattro_self(Attributes, this, attr);
 	if (object != NULL)
 		return object;
-	if (!strcmp(attr,"seed")) {
+	
+	char *attr_str= PyString_AsString(attr);
+	if (!strcmp(attr_str,"seed")) {
 		return PyInt_FromLong(m_basegenerator->GetSeed());
 	}
-	_getattr_up(SCA_ISensor);
+	py_getattro_up(SCA_ISensor);
 }
 
-int SCA_RandomSensor::_setattr(const char *attr, PyObject *value)
+int SCA_RandomSensor::py_setattro(PyObject *attr, PyObject *value)
 {
-	int ret = _setattr_self(Attributes, this, attr, value);
+	int ret = py_setattro_self(Attributes, this, attr, value);
 	if (ret >= 0)
 		return ret;
-	if (!strcmp(attr,"seed")) {
+	char *attr_str= PyString_AsString(attr);
+	if (!strcmp(attr_str,"seed")) {
 		if (PyInt_Check(value))	{
 			int ival = PyInt_AsLong(value);
 			m_basegenerator->SetSeed(ival);
@@ -190,7 +193,7 @@ int SCA_RandomSensor::_setattr(const char *attr, PyObject *value)
 			return 1;
 		}
 	}
-	return SCA_ISensor::_setattr(attr, value);
+	return SCA_ISensor::py_setattro(attr, value);
 }
 
 /* 1. setSeed                                                            */
diff --git a/source/gameengine/GameLogic/SCA_RandomSensor.h b/source/gameengine/GameLogic/SCA_RandomSensor.h
index d808db0753670f303c17a9b1ae8ac3bd1e49e70a..39d072dd3161758d91452fb35eb3efcfbb203f3c 100644
--- a/source/gameengine/GameLogic/SCA_RandomSensor.h
+++ b/source/gameengine/GameLogic/SCA_RandomSensor.h
@@ -60,8 +60,8 @@ public:
 	/* Python interface ---------------------------------------------------- */
 	/* --------------------------------------------------------------------- */
 
-	virtual PyObject* _getattr(const char *attr);
-	virtual int _setattr(const char *attr, PyObject *value);
+	virtual PyObject* py_getattro(PyObject *attr);
+	virtual int py_setattro(PyObject *attr, PyObject *value);
 
 	/* 1. setSeed                                                            */
 	KX_PYMETHOD_DOC(SCA_RandomSensor,SetSeed);
diff --git a/source/gameengine/GameLogic/SCA_XNORController.cpp b/source/gameengine/GameLogic/SCA_XNORController.cpp
index b2734dd1b330e518907d9638d6b7123f4ce17383..10757e1c9355768fad7f4586fa501aec5aed0e2f 100644
--- a/source/gameengine/GameLogic/SCA_XNORController.cpp
+++ b/source/gameengine/GameLogic/SCA_XNORController.cpp
@@ -111,22 +111,22 @@ CValue* SCA_XNORController::GetReplica()
 
 /* Integration hooks ------------------------------------------------------- */
 PyTypeObject SCA_XNORController::Type = {
-	PyObject_HEAD_INIT(&PyType_Type)
+	PyObject_HEAD_INIT(NULL)
 	0,
 	"SCA_XNORController",
 	sizeof(SCA_XNORController),
 	0,
 	PyDestructor,
 	0,
-	__getattr,
-	__setattr,
-	0, //&MyPyCompare,
-	__repr,
-	0, //&cvalue_as_number,
 	0,
 	0,
 	0,
-	0
+	py_base_repr,
+	0,0,0,0,0,0,
+	py_base_getattro,
+	py_base_setattro,
+	0,0,0,0,0,0,0,0,0,
+	Methods
 };
 
 PyParentObject SCA_XNORController::Parents[] = {
@@ -145,8 +145,8 @@ PyAttributeDef SCA_XNORController::Attributes[] = {
 	{ NULL }	//Sentinel
 };
 
-PyObject* SCA_XNORController::_getattr(const char *attr) {
-	_getattr_up(SCA_IController);
+PyObject* SCA_XNORController::py_getattro(PyObject *attr) {
+	py_getattro_up(SCA_IController);
 }
 
 /* eof */
diff --git a/source/gameengine/GameLogic/SCA_XNORController.h b/source/gameengine/GameLogic/SCA_XNORController.h
index a431a72c177268173bc24cf6d3a2c915aa9a26b4..c992d5f183485d6d2628650f3383d0cc2ba63fe1 100644
--- a/source/gameengine/GameLogic/SCA_XNORController.h
+++ b/source/gameengine/GameLogic/SCA_XNORController.h
@@ -48,7 +48,7 @@ public:
 	/* Python interface ---------------------------------------------------- */
 	/* --------------------------------------------------------------------- */
 
-	virtual PyObject* _getattr(const char *attr);
+	virtual PyObject* py_getattro(PyObject *attr);
 
 };
 
diff --git a/source/gameengine/GameLogic/SCA_XORController.cpp b/source/gameengine/GameLogic/SCA_XORController.cpp
index 662ef523d5621d19f51873e2603ff8b6bbc13638..d2290fe207a4a32b4737f680f080c04eeb9cfcde 100644
--- a/source/gameengine/GameLogic/SCA_XORController.cpp
+++ b/source/gameengine/GameLogic/SCA_XORController.cpp
@@ -111,22 +111,22 @@ CValue* SCA_XORController::GetReplica()
 
 /* Integration hooks ------------------------------------------------------- */
 PyTypeObject SCA_XORController::Type = {
-	PyObject_HEAD_INIT(&PyType_Type)
+	PyObject_HEAD_INIT(NULL)
 	0,
 	"SCA_XORController",
 	sizeof(SCA_XORController),
 	0,
 	PyDestructor,
 	0,
-	__getattr,
-	__setattr,
-	0, //&MyPyCompare,
-	__repr,
-	0, //&cvalue_as_number,
 	0,
 	0,
 	0,
-	0
+	py_base_repr,
+	0,0,0,0,0,0,
+	py_base_getattro,
+	py_base_setattro,
+	0,0,0,0,0,0,0,0,0,
+	Methods
 };
 
 PyParentObject SCA_XORController::Parents[] = {
@@ -145,8 +145,8 @@ PyAttributeDef SCA_XORController::Attributes[] = {
 	{ NULL }	//Sentinel
 };
 
-PyObject* SCA_XORController::_getattr(const char *attr) {
-	_getattr_up(SCA_IController);
+PyObject* SCA_XORController::py_getattro(PyObject *attr) {
+	py_getattro_up(SCA_IController);
 }
 
 /* eof */
diff --git a/source/gameengine/GameLogic/SCA_XORController.h b/source/gameengine/GameLogic/SCA_XORController.h
index 2fbc7866ecff785bbe41cc65aecc655f45e47ccd..065b31fd90197ab74296d06d30fe1e73ac4042ac 100644
--- a/source/gameengine/GameLogic/SCA_XORController.h
+++ b/source/gameengine/GameLogic/SCA_XORController.h
@@ -48,7 +48,7 @@ public:
 	/* Python interface ---------------------------------------------------- */
 	/* --------------------------------------------------------------------- */
 
-	virtual PyObject* _getattr(const char *attr);
+	virtual PyObject* py_getattro(PyObject *attr);
 
 };
 
diff --git a/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp b/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp
index 8135635ddb3d5a5940809b6e2e1d8c8671d2b49d..eafdb8a96bb21031166b84da040505866e2cc6b0 100644
--- a/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp
+++ b/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp
@@ -29,6 +29,8 @@
 
 #include "GL/glew.h"
 
+#include "BMF_Api.h"
+
 #include "DNA_scene_types.h"
 
 #include "RAS_IRenderTools.h"
@@ -54,6 +56,7 @@
 
 #include "GPC_RenderTools.h"
 
+
 unsigned int GPC_RenderTools::m_numgllights;
 
 GPC_RenderTools::GPC_RenderTools()
@@ -311,28 +314,19 @@ void GPC_RenderTools::RenderText2D(RAS_TEXT_RENDER_MODE mode,
 	glMatrixMode(GL_MODELVIEW);
 	glPushMatrix();
 	glLoadIdentity();
-	
-	// Actual drawing
-	unsigned char colors[2][3] = {
-		{0x00, 0x00, 0x00},
-		{0xFF, 0xFF, 0xFF}
-	};
-	int numTimes = mode == RAS_TEXT_PADDED ? 2 : 1;
-	for (int i = 0; i < numTimes; i++) {
-		glColor3ub(colors[i][0], colors[i][1], colors[i][2]);
-		glRasterPos2i(xco, yco);
-		for (p = s, lines = 0; *p; p++) {
-			if (*p == '\n')
-			{
-				lines++;
-				glRasterPos2i(xco, yco-(lines*18));
-			}
-			BMF_DrawCharacter(m_font, *p);
-		}
-		xco += 1;
-		yco += 1;
+
+	// Actual drawing (draw black first if padded)
+	if (mode == RAS_IRenderTools::RAS_TEXT_PADDED)
+	{
+		glColor3ub(0, 0, 0);
+		glRasterPos2s(xco+1, height-yco-1);
+		BMF_DrawString(m_font, s);
 	}
 
+	glColor3ub(255, 255, 255);
+	glRasterPos2s(xco, height-yco);
+	BMF_DrawString(m_font, s);
+
 	// Restore view settings
 	glMatrixMode(GL_PROJECTION);
 	glPopMatrix();
diff --git a/source/gameengine/GamePlayer/ghost/GPG_Application.cpp b/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
index 191bb3a45cfc1ab7442be07010536ca4dc4d8ed3..9c28a26cf1b3ee290e1fc54340fe138cddacf999 100644
--- a/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
+++ b/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
@@ -530,7 +530,7 @@ bool GPG_Application::initEngine(GHOST_IWindow* window, const int stereoMode)
 		bool fixed_framerate= (SYS_GetCommandLineInt(syshandle, "fixed_framerate", fixedFr) != 0);
 		bool frameRate = (SYS_GetCommandLineInt(syshandle, "show_framerate", 0) != 0);
 		bool useLists = (SYS_GetCommandLineInt(syshandle, "displaylists", G.fileflags & G_FILE_DISPLAY_LISTS) != 0);
-		bool nodepwarnings = (SYS_GetCommandLineInt(syshandle, "ignore_deprecation_warnings", 0) != 0);
+		bool nodepwarnings = (SYS_GetCommandLineInt(syshandle, "ignore_deprecation_warnings", 1) != 0);
 
 		if(GLEW_ARB_multitexture && GLEW_VERSION_1_1)
 			m_blendermat = (SYS_GetCommandLineInt(syshandle, "blender_material", 1) != 0);
diff --git a/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp b/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
index 018c966ac6974e305da85a287b112e51cfdbd082..a41446ad88c4baccab263e625d4126b884c4cf58 100644
--- a/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
+++ b/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
@@ -204,7 +204,7 @@ void usage(const char* program)
 	printf("       show_properties                0         Show debug properties\n");
 	printf("       show_profile                   0         Show profiling information\n");
 	printf("       blender_material               0         Enable material settings\n");
-	printf("       ignore_deprecation_warnings    0         Ignore deprecation warnings\n");
+	printf("       ignore_deprecation_warnings    1         Ignore deprecation warnings\n");
 	printf("\n");
 	printf("example: %s -w 320 200 10 10 -g noaudio c:\\loadtest.blend\n", program);
 	printf("example: %s -g show_framerate = 0 c:\\loadtest.blend\n", program);
diff --git a/source/gameengine/Ketsji/BL_Shader.cpp b/source/gameengine/Ketsji/BL_Shader.cpp
index 60cb288436ab137b18fd5fbdb5b5a7695c1919b0..279721b48402c373f5ab67caae0749e9da07ee4e 100644
--- a/source/gameengine/Ketsji/BL_Shader.cpp
+++ b/source/gameengine/Ketsji/BL_Shader.cpp
@@ -729,9 +729,9 @@ void BL_Shader::SetUniform(int uniform, const int* val, int len)
 }
 
 
-PyObject* BL_Shader::_getattr(const char *attr)
+PyObject* BL_Shader::py_getattro(PyObject *attr)
 {
-	_getattr_up(PyObjectPlus);
+	py_getattro_up(PyObjectPlus);
 }
 
 
@@ -772,24 +772,28 @@ PyAttributeDef BL_Shader::Attributes[] = {
 };
 
 PyTypeObject BL_Shader::Type = {
-	PyObject_HEAD_INIT(&PyType_Type)
+	PyObject_HEAD_INIT(NULL)
 		0,
 		"BL_Shader",
 		sizeof(BL_Shader),
 		0,
 		PyDestructor,
 		0,
-		__getattr,
-		__setattr,
 		0,
-		__repr,
-		0
+		0,
+		0,
+		py_base_repr,
+		0,0,0,0,0,0,
+		py_base_getattro,
+		py_base_setattro,
+		0,0,0,0,0,0,0,0,0,
+		Methods
 };
 
 
 PyParentObject BL_Shader::Parents[] = {
-	&PyObjectPlus::Type,
 	&BL_Shader::Type,
+	&PyObjectPlus::Type,
 	NULL
 };
 
diff --git a/source/gameengine/Ketsji/BL_Shader.h b/source/gameengine/Ketsji/BL_Shader.h
index 76acd5513ef582dec242df1bf1249cc20ecd0baa..490c0268a6d4810cbab7c825ba4569a0bdc95b60 100644
--- a/source/gameengine/Ketsji/BL_Shader.h
+++ b/source/gameengine/Ketsji/BL_Shader.h
@@ -202,7 +202,7 @@ public:
 	void SetUniform(int uniform, const int val);
 
 	// Python interface
-	virtual PyObject* _getattr(const char *attr);
+	virtual PyObject* py_getattro(PyObject *attr);
 
 	// -----------------------------------
 	KX_PYMETHOD_DOC( BL_Shader, setSource );
diff --git a/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.cpp b/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.cpp
index 4e5f27df2daac94ac69ca5bccc73a8e2221723d0..a5fd8ebab6b672e9dec2f4b610ab1346e0b44e11 100644
--- a/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.cpp
+++ b/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.cpp
@@ -47,7 +47,7 @@ KX_NetworkMessageActuator::KX_NetworkMessageActuator(
 	m_networkscene(networkscene),
 	m_toPropName(toPropName),
 	m_subject(subject),
-	m_bodyType(bodyType),
+	m_bPropBody(bodyType),
 	m_body(body)
 {
 }
@@ -69,7 +69,7 @@ bool KX_NetworkMessageActuator::Update()
 	}
 	//printf("messageactuator true event\n");
 
-	if (m_bodyType == 1) // ACT_MESG_PROP in DNA_actuator_types.h
+	if (m_bPropBody) // ACT_MESG_PROP in DNA_actuator_types.h
 	{
 		m_networkscene->SendMessage(
 			m_toPropName,
@@ -105,22 +105,22 @@ CValue* KX_NetworkMessageActuator::GetReplica()
 
 /* Integration hooks -------------------------------------------------- */
 PyTypeObject KX_NetworkMessageActuator::Type = {
-	PyObject_HEAD_INIT(&PyType_Type)
+	PyObject_HEAD_INIT(NULL)
 	0,
 	"KX_NetworkMessageActuator",
 	sizeof(KX_NetworkMessageActuator),
 	0,
 	PyDestructor,
 	0,
-	__getattr,
-	__setattr,
-	0, //&MyPyCompare,
-	__repr,
-	0, //&cvalue_as_number,
 	0,
 	0,
 	0,
-	0
+	py_base_repr,
+	0,0,0,0,0,0,
+	py_base_getattro,
+	py_base_setattro,
+	0,0,0,0,0,0,0,0,0,
+	Methods
 };
 
 PyParentObject KX_NetworkMessageActuator::Parents[] = {
@@ -132,6 +132,7 @@ PyParentObject KX_NetworkMessageActuator::Parents[] = {
 };
 
 PyMethodDef KX_NetworkMessageActuator::Methods[] = {
+	// Deprecated ----->
 	{"setToPropName", (PyCFunction)
 		KX_NetworkMessageActuator::sPySetToPropName, METH_VARARGS},
 	{"setSubject", (PyCFunction)
@@ -140,23 +141,40 @@ PyMethodDef KX_NetworkMessageActuator::Methods[] = {
 		KX_NetworkMessageActuator::sPySetBodyType, METH_VARARGS},
 	{"setBody", (PyCFunction)
 		KX_NetworkMessageActuator::sPySetBody, METH_VARARGS},
+	// <-----
 	{NULL,NULL} // Sentinel
 };
 
 PyAttributeDef KX_NetworkMessageActuator::Attributes[] = {
+	KX_PYATTRIBUTE_STRING_RW("propName", 0, 100, false, KX_NetworkMessageActuator, m_toPropName),
+	KX_PYATTRIBUTE_STRING_RW("subject", 0, 100, false, KX_NetworkMessageActuator, m_subject),
+	KX_PYATTRIBUTE_BOOL_RW("usePropBody", KX_NetworkMessageActuator, m_bPropBody),
+	KX_PYATTRIBUTE_STRING_RW("body", 0, 100, false, KX_NetworkMessageActuator, m_body),
 	{ NULL }	//Sentinel
 };
 
-PyObject* KX_NetworkMessageActuator::_getattr(const char *attr) {
-	_getattr_up(SCA_IActuator);
+PyObject* KX_NetworkMessageActuator::py_getattro(PyObject *attr) {
+	PyObject* object = py_getattro_self(Attributes, this, attr);
+	if (object != NULL)
+		return object;
+	py_getattro_up(SCA_IActuator);
 }
 
+int KX_NetworkMessageActuator::py_setattro(PyObject *attr, PyObject *value) {
+	int ret = py_setattro_self(Attributes, this, attr, value);
+	if (ret >= 0)
+		return ret;
+	return SCA_IActuator::py_setattro(attr, value);
+}
+
+// Deprecated ----->
 // 1. SetToPropName
 PyObject* KX_NetworkMessageActuator::PySetToPropName(
 	PyObject* self,
 	PyObject* args,
 	PyObject* kwds)
 {
+	ShowDeprecationWarning("setToProp()", "the propName property");
     char* ToPropName;
 
 	if (PyArg_ParseTuple(args, "s", &ToPropName)) {
@@ -175,6 +193,7 @@ PyObject* KX_NetworkMessageActuator::PySetSubject(
 	PyObject* args,
 	PyObject* kwds)
 {
+	ShowDeprecationWarning("setSubject()", "the subject property");
     char* Subject;
 
 	if (PyArg_ParseTuple(args, "s", &Subject)) {
@@ -193,10 +212,11 @@ PyObject* KX_NetworkMessageActuator::PySetBodyType(
 	PyObject* args,
 	PyObject* kwds)
 {
+	ShowDeprecationWarning("setBodyType()", "the usePropBody property");
     int BodyType;
 
 	if (PyArg_ParseTuple(args, "i", &BodyType)) {
-	     m_bodyType = BodyType;
+		m_bPropBody = (BodyType != 0);
 	}
 	else {
 		return NULL;
@@ -211,6 +231,7 @@ PyObject* KX_NetworkMessageActuator::PySetBody(
 	PyObject* args,
 	PyObject* kwds)
 {
+	ShowDeprecationWarning("setBody()", "the body property");
     char* Body;
 
 	if (PyArg_ParseTuple(args, "s", &Body)) {
@@ -223,3 +244,4 @@ PyObject* KX_NetworkMessageActuator::PySetBody(
 	Py_RETURN_NONE;
 }
 
+// <----- Deprecated
\ No newline at end of file
diff --git a/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.h b/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.h
index 96b55ef839bbf9b329e831dec7db0f80d61f56db..850f825b8f375f050e847399bcc69b587e064e6d 100644
--- a/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.h
+++ b/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.h
@@ -41,7 +41,7 @@ class KX_NetworkMessageActuator : public SCA_IActuator
 	class NG_NetworkScene* m_networkscene;	// needed for replication
 	STR_String m_toPropName;
 	STR_String m_subject;
-	int m_bodyType;
+	bool m_bPropBody;
 	STR_String m_body;
 public:
 	KX_NetworkMessageActuator(
@@ -61,12 +61,15 @@ public:
 	/* Python interface ------------------------------------------- */
 	/* ------------------------------------------------------------ */
 
-	virtual PyObject* _getattr(const char *attr);
+	virtual PyObject* py_getattro(PyObject *attr);
+	virtual int py_setattro(PyObject *attr, PyObject *value);
 
+	// Deprecated ----->
 	KX_PYMETHOD(KX_NetworkMessageActuator, SetToPropName);
 	KX_PYMETHOD(KX_NetworkMessageActuator, SetSubject);
 	KX_PYMETHOD(KX_NetworkMessageActuator, SetBodyType);
 	KX_PYMETHOD(KX_NetworkMessageActuator, SetBody);
+	// <-----
 
 };
 
diff --git a/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp b/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp
index ac89d8b0716901d1e7002fcaa62270e97f21b5fb..7922c341659b57d8c71ed26e33d6362eece9a74a 100644
--- a/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp
+++ b/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp
@@ -168,22 +168,22 @@ bool KX_NetworkMessageSensor::IsPositiveTrigger()
 
 /* Integration hooks --------------------------------------------------- */
 PyTypeObject KX_NetworkMessageSensor::Type = {
-	PyObject_HEAD_INIT(&PyType_Type)
+	PyObject_HEAD_INIT(NULL)
 	0,
 	"KX_NetworkMessageSensor",
 	sizeof(KX_NetworkMessageSensor),
 	0,
 	PyDestructor,
 	0,
-	__getattr,
-	__setattr,
-	0, //&MyPyCompare,
-	__repr,
-	0, //&cvalue_as_number,
 	0,
 	0,
 	0,
-	0
+	py_base_repr,
+	0,0,0,0,0,0,
+	py_base_getattro,
+	py_base_setattro,
+	0,0,0,0,0,0,0,0,0,
+	Methods
 };
 
 PyParentObject KX_NetworkMessageSensor::Parents[] = {
@@ -195,6 +195,7 @@ PyParentObject KX_NetworkMessageSensor::Parents[] = {
 };
 
 PyMethodDef KX_NetworkMessageSensor::Methods[] = {
+	// Deprecated ----->
 	{"setSubjectFilterText", (PyCFunction)
 		KX_NetworkMessageSensor::sPySetSubjectFilterText, METH_O,
 		(PY_METHODCHAR)SetSubjectFilterText_doc},
@@ -210,17 +211,53 @@ PyMethodDef KX_NetworkMessageSensor::Methods[] = {
 	{"getSubjects", (PyCFunction)
 		KX_NetworkMessageSensor::sPyGetSubjects, METH_NOARGS,
 		(PY_METHODCHAR)GetSubjects_doc},
+	// <-----
 	{NULL,NULL} //Sentinel
 };
 
 PyAttributeDef KX_NetworkMessageSensor::Attributes[] = {
+	KX_PYATTRIBUTE_STRING_RW("subject", 0, 100, false, KX_NetworkMessageSensor, m_subject),
+	KX_PYATTRIBUTE_INT_RO("frameMessageCount", KX_NetworkMessageSensor, m_frame_message_count),
+	KX_PYATTRIBUTE_RO_FUNCTION("bodies", KX_NetworkMessageSensor, pyattr_get_bodies),
+	KX_PYATTRIBUTE_RO_FUNCTION("subjects", KX_NetworkMessageSensor, pyattr_get_subjects),
 	{ NULL }	//Sentinel
 };
 
-PyObject* KX_NetworkMessageSensor::_getattr(const char *attr) {
-	_getattr_up(SCA_ISensor); // implicit return!
+PyObject* KX_NetworkMessageSensor::py_getattro(PyObject *attr) {
+	PyObject* object = py_getattro_self(Attributes, this, attr);
+	if (object != NULL)
+		return object;
+	py_getattro_up(SCA_ISensor);
 }
 
+int KX_NetworkMessageSensor::py_setattro(PyObject *attr, PyObject *value) {
+	int ret = py_setattro_self(Attributes, this, attr, value);
+	if (ret >= 0)
+		return ret;
+	return SCA_ISensor::py_setattro(attr, value);
+}
+
+PyObject* KX_NetworkMessageSensor::pyattr_get_bodies(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
+{
+	KX_NetworkMessageSensor *self = static_cast<KX_NetworkMessageSensor*>(self_v);
+	if (self->m_BodyList) {
+		return ((PyObject*) self->m_BodyList->AddRef());
+	} else {
+		return ((PyObject*) new CListValue());
+	}
+}
+
+PyObject* KX_NetworkMessageSensor::pyattr_get_subjects(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
+{
+	KX_NetworkMessageSensor *self = static_cast<KX_NetworkMessageSensor*>(self_v);
+	if (self->m_SubjectList) {
+		return ((PyObject*) self->m_SubjectList->AddRef());
+	} else {
+		return ((PyObject*) new CListValue());
+	}
+}
+
+// Deprecated ----->
 // 1. Set the message subject that this sensor listens for
 const char KX_NetworkMessageSensor::SetSubjectFilterText_doc[] = 
 "\tsetSubjectFilterText(value)\n"
@@ -228,6 +265,7 @@ const char KX_NetworkMessageSensor::SetSubjectFilterText_doc[] =
 
 PyObject* KX_NetworkMessageSensor::PySetSubjectFilterText( PyObject* self, PyObject* value)
 {
+	ShowDeprecationWarning("setSubjectFilterText()", "subject");
 	char* Subject = PyString_AsString(value);
 	if (Subject==NULL) {
 		PyErr_SetString(PyExc_TypeError, "expected a string message");
@@ -245,6 +283,7 @@ const char KX_NetworkMessageSensor::GetFrameMessageCount_doc[] =
 
 PyObject* KX_NetworkMessageSensor::PyGetFrameMessageCount( PyObject* )
 {
+	ShowDeprecationWarning("getFrameMessageCount()", "frameMessageCount");
 	return PyInt_FromLong(long(m_frame_message_count));
 }
 
@@ -255,6 +294,7 @@ const char KX_NetworkMessageSensor::GetBodies_doc[] =
 
 PyObject* KX_NetworkMessageSensor::PyGetBodies( PyObject* )
 {
+	ShowDeprecationWarning("getBodies()", "bodies");
 	if (m_BodyList) {
 		return ((PyObject*) m_BodyList->AddRef());
 	} else {
@@ -269,6 +309,7 @@ const char KX_NetworkMessageSensor::GetSubject_doc[] =
 
 PyObject* KX_NetworkMessageSensor::PyGetSubject( PyObject* )
 {
+	ShowDeprecationWarning("getSubject()", "subject");
 	return PyString_FromString(m_subject ? m_subject : "");
 }
 
@@ -279,9 +320,11 @@ const char KX_NetworkMessageSensor::GetSubjects_doc[] =
 
 PyObject* KX_NetworkMessageSensor::PyGetSubjects( PyObject* )
 {
+	ShowDeprecationWarning("getSubjects()", "subjects");
 	if (m_SubjectList) {
 		return ((PyObject*) m_SubjectList->AddRef());
 	} else {
 		return ((PyObject*) new CListValue());
 	}
 }
+// <----- Deprecated
\ No newline at end of file
diff --git a/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.h b/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.h
index 26adbc9945a2badac14e7b7f5b8cbeff9353bfa3..ac0e880d25c7c5fb6119f27690ded595c5b792bd 100644
--- a/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.h
+++ b/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.h
@@ -72,14 +72,20 @@ public:
 	/* Python interface -------------------------------------------- */
 	/* ------------------------------------------------------------- */
 
-	virtual PyObject* _getattr(const char *attr);
+	virtual PyObject* py_getattro(PyObject *attr);
+	virtual int py_setattro(PyObject *attr, PyObject *value);
 
+	// Deprecated ----->
 	KX_PYMETHOD_DOC_O(KX_NetworkMessageSensor, SetSubjectFilterText);
 	KX_PYMETHOD_DOC_NOARGS(KX_NetworkMessageSensor, GetFrameMessageCount);
 	KX_PYMETHOD_DOC_NOARGS(KX_NetworkMessageSensor, GetBodies);
 	KX_PYMETHOD_DOC_NOARGS(KX_NetworkMessageSensor, GetSubject);
 	KX_PYMETHOD_DOC_NOARGS(KX_NetworkMessageSensor, GetSubjects);
+	// <-----
 
+	/* attributes */
+	static PyObject*	pyattr_get_bodies(void* self_v, const KX_PYATTRIBUTE_DEF *attrdef);	
+	static PyObject*	pyattr_get_subjects(void* self_v, const KX_PYATTRIBUTE_DEF *attrdef);
 
 };
 
diff --git a/source/gameengine/Ketsji/KX_BlenderMaterial.cpp b/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
index b9bd7647f89338d7df7701368069c7888b174ca2..bd137196ac6add5737d2d2c5740debc9286f31ad 100644
--- a/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
+++ b/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
@@ -753,36 +753,40 @@ PyAttributeDef KX_BlenderMaterial::Attributes[] = {
 };
 
 PyTypeObject KX_BlenderMaterial::Type = {
-	PyObject_HEAD_INIT(&PyType_Type)
+	PyObject_HEAD_INIT(NULL)
 		0,
 		"KX_BlenderMaterial",
 		sizeof(KX_BlenderMaterial),
 		0,
 		PyDestructor,
 		0,
-		__getattr,
-		__setattr,
 		0,
-		__repr,
-		0
+		0,
+		0,
+		py_base_repr,
+		0,0,0,0,0,0,
+		py_base_getattro,
+		py_base_setattro,
+		0,0,0,0,0,0,0,0,0,
+		Methods
 };
 
 
 PyParentObject KX_BlenderMaterial::Parents[] = {
-	&PyObjectPlus::Type,
 	&KX_BlenderMaterial::Type,
+	&PyObjectPlus::Type,
 	NULL
 };
 
 
-PyObject* KX_BlenderMaterial::_getattr(const char *attr)
+PyObject* KX_BlenderMaterial::py_getattro(PyObject *attr)
 {
-	_getattr_up(PyObjectPlus);
+	py_getattro_up(PyObjectPlus);
 }
 
-int KX_BlenderMaterial::_setattr(const char *attr, PyObject *pyvalue)
+int KX_BlenderMaterial::py_setattro(PyObject *attr, PyObject *pyvalue)
 {
-	return PyObjectPlus::_setattr(attr, pyvalue);
+	return PyObjectPlus::py_setattro(attr, pyvalue);
 }
 
 
diff --git a/source/gameengine/Ketsji/KX_BlenderMaterial.h b/source/gameengine/Ketsji/KX_BlenderMaterial.h
index 2cf623dbd85269a33afc1dd3f37b85373c45cfa7..2d9dc8fd022be650d5c9394a2964856a5e36a867 100644
--- a/source/gameengine/Ketsji/KX_BlenderMaterial.h
+++ b/source/gameengine/Ketsji/KX_BlenderMaterial.h
@@ -82,8 +82,8 @@ public:
 	);
 	
 	// --------------------------------
-	virtual PyObject* _getattr(const char *attr);
-	virtual int       _setattr(const char *attr, PyObject *pyvalue);
+	virtual PyObject* py_getattro(PyObject *attr);
+	virtual int       py_setattro(PyObject *attr, PyObject *pyvalue);
 
 	KX_PYMETHOD_DOC( KX_BlenderMaterial, getShader );
 	KX_PYMETHOD_DOC( KX_BlenderMaterial, getMaterialIndex );
diff --git a/source/gameengine/Ketsji/KX_CDActuator.cpp b/source/gameengine/Ketsji/KX_CDActuator.cpp
index ef7883910fdd47431dfb8a318cc6cb16d9f8fab5..57c9d30e92e2cb117fbf172e9c188122c53de23b 100644
--- a/source/gameengine/Ketsji/KX_CDActuator.cpp
+++ b/source/gameengine/Ketsji/KX_CDActuator.cpp
@@ -98,7 +98,7 @@ bool KX_CDActuator::Update()
 				SND_CDObject::Instance()->SetPlaymode(SND_CD_ALL);
 				SND_CDObject::Instance()->SetTrack(1);
 				SND_CDObject::Instance()->SetPlaystate(SND_MUST_PLAY);
-				result = true;
+				//result = true;
 				break;
 			}
 		case KX_CDACT_PLAY_TRACK:
@@ -106,7 +106,7 @@ bool KX_CDActuator::Update()
 				SND_CDObject::Instance()->SetPlaymode(SND_CD_TRACK);
 				SND_CDObject::Instance()->SetTrack(m_track);
 				SND_CDObject::Instance()->SetPlaystate(SND_MUST_PLAY);
-				result = true;
+				//result = true;
 				break;
 			}
 		case KX_CDACT_LOOP_TRACK:
@@ -114,7 +114,7 @@ bool KX_CDActuator::Update()
 				SND_CDObject::Instance()->SetPlaymode(SND_CD_ALL);
 				SND_CDObject::Instance()->SetTrack(m_track);
 				SND_CDObject::Instance()->SetPlaystate(SND_MUST_PLAY);
-				result = true;
+				//result = true;
 				break;
 			}
 		case KX_CDACT_STOP:
@@ -125,19 +125,19 @@ bool KX_CDActuator::Update()
 		case KX_CDACT_PAUSE:
 			{
 				SND_CDObject::Instance()->SetPlaystate(SND_MUST_PAUSE);
-				result = true;
+				//result = true;
 				break;
 			}
 		case KX_CDACT_RESUME:
 			{
 				SND_CDObject::Instance()->SetPlaystate(SND_MUST_RESUME);
-				result = true;
+				//result = true;
 				break;
 			}
 		case KX_CDACT_VOLUME:
 			{
 				SND_CDObject::Instance()->SetGain(m_gain);
-				result = true;
+				//result = true;
 				break;
 			}
 		default:
@@ -158,22 +158,22 @@ bool KX_CDActuator::Update()
 
 /* Integration hooks ------------------------------------------------------- */
 PyTypeObject KX_CDActuator::Type = {
-	PyObject_HEAD_INIT(&PyType_Type)
+	PyObject_HEAD_INIT(NULL)
 		0,
 		"KX_SoundActuator",
 		sizeof(KX_CDActuator),
 		0,
 		PyDestructor,
 		0,
-		__getattr,
-		__setattr,
-		0, //&MyPyCompare,
-		__repr,
-		0, //&cvalue_as_number,
 		0,
 		0,
 		0,
-		0
+		py_base_repr,
+		0,0,0,0,0,0,
+		py_base_getattro,
+		py_base_setattro,
+		0,0,0,0,0,0,0,0,0,
+		Methods
 };
 
 
@@ -189,53 +189,116 @@ PyParentObject KX_CDActuator::Parents[] = {
 
 
 PyMethodDef KX_CDActuator::Methods[] = {
-	{"startCD",(PyCFunction) KX_CDActuator::sPyStartCD,METH_VARARGS,NULL},
-	{"pauseCD",(PyCFunction) KX_CDActuator::sPyPauseCD,METH_VARARGS,NULL},
-	{"stopCD",(PyCFunction) KX_CDActuator::sPyStopCD,METH_VARARGS,NULL},
+	// Deprecated ----->
 	{"setGain",(PyCFunction) KX_CDActuator::sPySetGain,METH_VARARGS,NULL},
 	{"getGain",(PyCFunction) KX_CDActuator::sPyGetGain,METH_VARARGS,NULL},
+	// <-----
+	KX_PYMETHODTABLE_NOARGS(KX_CDActuator, startCD),
+	KX_PYMETHODTABLE_NOARGS(KX_CDActuator, pauseCD),
+	KX_PYMETHODTABLE_NOARGS(KX_CDActuator, resumeCD),
+	KX_PYMETHODTABLE_NOARGS(KX_CDActuator, stopCD),
+	KX_PYMETHODTABLE_NOARGS(KX_CDActuator, playAll),
+	KX_PYMETHODTABLE_O(KX_CDActuator, playTrack),
 	{NULL,NULL,NULL,NULL} //Sentinel
 };
 
 PyAttributeDef KX_CDActuator::Attributes[] = {
+	KX_PYATTRIBUTE_FLOAT_RW_CHECK("volume", 0.0, 1.0, KX_CDActuator, m_gain,pyattr_setGain),
+	KX_PYATTRIBUTE_INT_RW("track", 1, 99, false, KX_CDActuator, m_track),
 	{ NULL }	//Sentinel
 };
 
-PyObject* KX_CDActuator::_getattr(const char *attr)
+int KX_CDActuator::pyattr_setGain(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef)
 {
-	_getattr_up(SCA_IActuator);
+	KX_CDActuator* act = static_cast<KX_CDActuator*>(self);
+	SND_CDObject::Instance()->SetGain(act->m_gain);
+	return 0;
 }
 
+PyObject* KX_CDActuator::py_getattro(PyObject *attr)
+{
+	PyObject* object = py_getattro_self(Attributes, this, attr);
+	if (object != NULL)
+		return object;
+	py_getattro_up(SCA_IActuator);
+}
+
+int KX_CDActuator::py_setattro(PyObject *attr, PyObject *value)
+{
+	int ret = py_setattro_self(Attributes, this, attr, value);
+	if (ret >= 0)
+		return ret;
+	return SCA_IActuator::py_setattro(attr, value);
+}
 
 
 
-PyObject* KX_CDActuator::PyStartCD(PyObject* self, PyObject* args, PyObject* kwds)
+KX_PYMETHODDEF_DOC_NOARGS(KX_CDActuator, startCD,
+"startCD()\n"
+"\tStarts the CD playing.\n")
 {
 	SND_CDObject::Instance()->SetPlaystate(SND_MUST_PLAY);
 	Py_RETURN_NONE;
 }         
 
 
-
-PyObject* KX_CDActuator::PyPauseCD(PyObject* self, PyObject* args, PyObject* kwds)
+KX_PYMETHODDEF_DOC_NOARGS(KX_CDActuator, pauseCD,
+"pauseCD()\n"
+"\tPauses the CD playing.\n")
 {
 	SND_CDObject::Instance()->SetPlaystate(SND_MUST_PAUSE);
 	Py_RETURN_NONE;
 } 
 
 
+KX_PYMETHODDEF_DOC_NOARGS(KX_CDActuator, resumeCD,
+"resumeCD()\n"
+"\tResumes the CD playing.\n")
+{
+	SND_CDObject::Instance()->SetPlaystate(SND_MUST_RESUME);
+	Py_RETURN_NONE;
+} 
+
 
-PyObject* KX_CDActuator::PyStopCD(PyObject* self, PyObject* args, PyObject* kwds)
+KX_PYMETHODDEF_DOC_NOARGS(KX_CDActuator, stopCD,
+"stopCD()\n"
+"\tStops the CD playing.\n")
 {
 	SND_CDObject::Instance()->SetPlaystate(SND_MUST_STOP);
 	Py_RETURN_NONE;
 }
 
 
+KX_PYMETHODDEF_DOC_O(KX_CDActuator, playTrack,
+"playTrack(trackNumber)\n"
+"\tPlays the track selected.\n")
+{
+	if (PyInt_Check(value)) {
+		int track = PyInt_AsLong(value);
+		SND_CDObject::Instance()->SetPlaymode(SND_CD_TRACK);
+		SND_CDObject::Instance()->SetTrack(track);
+		SND_CDObject::Instance()->SetPlaystate(SND_MUST_PLAY);
+	}
+	Py_RETURN_NONE;
+}
+
+
+
+KX_PYMETHODDEF_DOC_NOARGS(KX_CDActuator, playAll,
+"playAll()\n"
+"\tPlays the CD from the beginning.\n")
+{
+	SND_CDObject::Instance()->SetPlaymode(SND_CD_ALL);
+	SND_CDObject::Instance()->SetTrack(1);
+	SND_CDObject::Instance()->SetPlaystate(SND_MUST_PLAY);
+	Py_RETURN_NONE;
+}     
 
+// Deprecated ----->
 PyObject* KX_CDActuator::PySetGain(PyObject* self, PyObject* args, PyObject* kwds)
 {
 	float gain = 1.0;
+	ShowDeprecationWarning("setGain()", "the volume property");
 	if (!PyArg_ParseTuple(args, "f", &gain))
 		return NULL;
 	
@@ -249,7 +312,9 @@ PyObject* KX_CDActuator::PySetGain(PyObject* self, PyObject* args, PyObject* kwd
 PyObject* KX_CDActuator::PyGetGain(PyObject* self, PyObject* args, PyObject* kwds)
 {
 	float gain = SND_CDObject::Instance()->GetGain();
+	ShowDeprecationWarning("getGain()", "the volume property");
 	PyObject* result = PyFloat_FromDouble(gain);
 	
 	return result;
 }
+// <-----
diff --git a/source/gameengine/Ketsji/KX_CDActuator.h b/source/gameengine/Ketsji/KX_CDActuator.h
index 393c49083f974f36250f81b2fd9b9c17517da26f..e7683297c7a2b6e70e2599fcb7fe391584d78a1d 100644
--- a/source/gameengine/Ketsji/KX_CDActuator.h
+++ b/source/gameengine/Ketsji/KX_CDActuator.h
@@ -81,13 +81,24 @@ public:
 	/* Python interface --------------------------------------------------- */
 	/* -------------------------------------------------------------------- */
 
-	virtual PyObject*  _getattr(const char *attr);
+	virtual PyObject*  py_getattro(PyObject *attr);
+	virtual int py_setattro(PyObject *attr, PyObject *value);
 
-	KX_PYMETHOD(KX_CDActuator,StartCD);
-	KX_PYMETHOD(KX_CDActuator,PauseCD);
-	KX_PYMETHOD(KX_CDActuator,StopCD);
+	// Deprecated ----->
 	KX_PYMETHOD(KX_CDActuator,SetGain);
 	KX_PYMETHOD(KX_CDActuator,GetGain);
+	// <-----
+
+	KX_PYMETHOD_DOC_NOARGS(KX_CDActuator, startCD);
+	KX_PYMETHOD_DOC_NOARGS(KX_CDActuator, pauseCD);
+	KX_PYMETHOD_DOC_NOARGS(KX_CDActuator, resumeCD);
+	KX_PYMETHOD_DOC_NOARGS(KX_CDActuator, stopCD);
+	KX_PYMETHOD_DOC_NOARGS(KX_CDActuator, playAll);
+	KX_PYMETHOD_DOC_O(KX_CDActuator, playTrack);
+
+	static int pyattr_setGain(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef);
+
+
 };
 
 #endif //__KX_CDACTUATOR
diff --git a/source/gameengine/Ketsji/KX_Camera.cpp b/source/gameengine/Ketsji/KX_Camera.cpp
index 5caac2fc67037d653b4f634424f175e48e9d7548..19370d83322824a43d7f1fedfa97a94637254b58 100644
--- a/source/gameengine/Ketsji/KX_Camera.cpp
+++ b/source/gameengine/Ketsji/KX_Camera.cpp
@@ -487,51 +487,23 @@ PyAttributeDef KX_Camera::Attributes[] = {
 	{ NULL }	//Sentinel
 };
 
-char KX_Camera::doc[] = "Module KX_Camera\n\n"
-"Constants:\n"
-"\tINSIDE\n"
-"\tINTERSECT\n"
-"\tOUTSIDE\n"
-"Attributes:\n"
-"\tlens -> float\n"
-"\t\tThe camera's lens value\n"
-"\tnear -> float\n"
-"\t\tThe camera's near clip distance\n"
-"\tfar -> float\n"
-"\t\tThe camera's far clip distance\n"
-"\tfrustum_culling -> bool\n"
-"\t\tNon zero if this camera is frustum culling.\n"
-"\tprojection_matrix -> [[float]]\n"
-"\t\tThis camera's projection matrix.\n"
-"\tmodelview_matrix -> [[float]] (read only)\n"
-"\t\tThis camera's model view matrix.\n"
-"\t\tRegenerated every frame from the camera's position and orientation.\n"
-"\tcamera_to_world -> [[float]] (read only)\n"
-"\t\tThis camera's camera to world transform.\n"
-"\t\tRegenerated every frame from the camera's position and orientation.\n"
-"\tworld_to_camera -> [[float]] (read only)\n"
-"\t\tThis camera's world to camera transform.\n"
-"\t\tRegenerated every frame from the camera's position and orientation.\n"
-"\t\tThis is camera_to_world inverted.\n";
-
 PyTypeObject KX_Camera::Type = {
-	PyObject_HEAD_INIT(&PyType_Type)
+	PyObject_HEAD_INIT(NULL)
 		0,
 		"KX_Camera",
 		sizeof(KX_Camera),
 		0,
 		PyDestructor,
 		0,
-		__getattr,
-		__setattr,
-		0, //&MyPyCompare,
-		__repr,
-		0, //&cvalue_as_number,
 		0,
 		0,
 		0,
-		0, 0, 0, 0, 0, 0,
-		doc
+		py_base_repr,
+		0,0,0,0,0,0,
+		py_base_getattro,
+		py_base_setattro,
+		0,0,0,0,0,0,0,0,0,
+		Methods
 };
 
 PyParentObject KX_Camera::Parents[] = {
@@ -542,48 +514,51 @@ PyParentObject KX_Camera::Parents[] = {
 		NULL
 };
 
-PyObject* KX_Camera::_getattr(const char *attr)
+PyObject* KX_Camera::py_getattro(PyObject *attr)
 {
-	if (!strcmp(attr, "INSIDE"))
+	char *attr_str= PyString_AsString(attr);
+	if (!strcmp(attr_str, "INSIDE"))
 		return PyInt_FromLong(INSIDE); /* new ref */
-	if (!strcmp(attr, "OUTSIDE"))
+	if (!strcmp(attr_str, "OUTSIDE"))
 		return PyInt_FromLong(OUTSIDE); /* new ref */
-	if (!strcmp(attr, "INTERSECT"))
+	if (!strcmp(attr_str, "INTERSECT"))
 		return PyInt_FromLong(INTERSECT); /* new ref */
 	
-	if (!strcmp(attr, "lens"))
+	if (!strcmp(attr_str, "lens"))
 		return PyFloat_FromDouble(GetLens()); /* new ref */
-	if (!strcmp(attr, "near"))
+	if (!strcmp(attr_str, "near"))
 		return PyFloat_FromDouble(GetCameraNear()); /* new ref */
-	if (!strcmp(attr, "far"))
+	if (!strcmp(attr_str, "far"))
 		return PyFloat_FromDouble(GetCameraFar()); /* new ref */
-	if (!strcmp(attr, "frustum_culling"))
+	if (!strcmp(attr_str, "frustum_culling"))
 		return PyInt_FromLong(m_frustum_culling); /* new ref */
-	if (!strcmp(attr, "perspective"))
+	if (!strcmp(attr_str, "perspective"))
 		return PyInt_FromLong(m_camdata.m_perspective); /* new ref */
-	if (!strcmp(attr, "projection_matrix"))
+	if (!strcmp(attr_str, "projection_matrix"))
 		return PyObjectFrom(GetProjectionMatrix()); /* new ref */
-	if (!strcmp(attr, "modelview_matrix"))
+	if (!strcmp(attr_str, "modelview_matrix"))
 		return PyObjectFrom(GetModelviewMatrix()); /* new ref */
-	if (!strcmp(attr, "camera_to_world"))
+	if (!strcmp(attr_str, "camera_to_world"))
 		return PyObjectFrom(GetCameraToWorld()); /* new ref */
-	if (!strcmp(attr, "world_to_camera"))
+	if (!strcmp(attr_str, "world_to_camera"))
 		return PyObjectFrom(GetWorldToCamera()); /* new ref */
 	
-	_getattr_up(KX_GameObject);
+	py_getattro_up(KX_GameObject);
 }
 
-int KX_Camera::_setattr(const char *attr, PyObject *pyvalue)
+int KX_Camera::py_setattro(PyObject *attr, PyObject *pyvalue)
 {
+	char *attr_str= PyString_AsString(attr);
+	
 	if (PyInt_Check(pyvalue))
 	{
-		if (!strcmp(attr, "frustum_culling"))
+		if (!strcmp(attr_str, "frustum_culling"))
 		{
 			m_frustum_culling = PyInt_AsLong(pyvalue);
 			return 0;
 		}
 		
-		if (!strcmp(attr, "perspective"))
+		if (!strcmp(attr_str, "perspective"))
 		{
 			m_camdata.m_perspective = PyInt_AsLong(pyvalue);
 			return 0;
@@ -592,19 +567,19 @@ int KX_Camera::_setattr(const char *attr, PyObject *pyvalue)
 	
 	if (PyFloat_Check(pyvalue))
 	{
-		if (!strcmp(attr, "lens"))
+		if (!strcmp(attr_str, "lens"))
 		{
 			m_camdata.m_lens = PyFloat_AsDouble(pyvalue);
 			m_set_projection_matrix = false;
 			return 0;
 		}
-		if (!strcmp(attr, "near"))
+		if (!strcmp(attr_str, "near"))
 		{
 			m_camdata.m_clipstart = PyFloat_AsDouble(pyvalue);
 			m_set_projection_matrix = false;
 			return 0;
 		}
-		if (!strcmp(attr, "far"))
+		if (!strcmp(attr_str, "far"))
 		{
 			m_camdata.m_clipend = PyFloat_AsDouble(pyvalue);
 			m_set_projection_matrix = false;
@@ -614,7 +589,7 @@ int KX_Camera::_setattr(const char *attr, PyObject *pyvalue)
 	
 	if (PyObject_IsMT_Matrix(pyvalue, 4))
 	{
-		if (!strcmp(attr, "projection_matrix"))
+		if (!strcmp(attr_str, "projection_matrix"))
 		{
 			MT_Matrix4x4 mat;
 			if (PyMatTo(pyvalue, mat))
@@ -625,7 +600,7 @@ int KX_Camera::_setattr(const char *attr, PyObject *pyvalue)
 			return 1;
 		}
 	}
-	return KX_GameObject::_setattr(attr, pyvalue);
+	return KX_GameObject::py_setattro(attr, pyvalue);
 }
 
 KX_PYMETHODDEF_DOC_VARARGS(KX_Camera, sphereInsideFrustum,
diff --git a/source/gameengine/Ketsji/KX_Camera.h b/source/gameengine/Ketsji/KX_Camera.h
index efd18f99390aa493ad6d82f8c0e647b8b1960383..499db66ab14683de4f1ca5f2649b8f08bc708e67 100644
--- a/source/gameengine/Ketsji/KX_Camera.h
+++ b/source/gameengine/Ketsji/KX_Camera.h
@@ -107,11 +107,6 @@ protected:
 	MT_Scalar    m_frustum_radius;
 	bool         m_set_frustum_center;
 
-	/**
-	 * Python module doc string.
-	 */
-	static char doc[];
-
 	/**
 	 * Extracts the camera clip frames from the projection and world-to-camera matrices.
 	 */
@@ -270,8 +265,8 @@ public:
 	KX_PYMETHOD_DOC_VARARGS(KX_Camera, setViewport);	
 	KX_PYMETHOD_DOC_NOARGS(KX_Camera, setOnTop);	
 
-	virtual PyObject* _getattr(const char *attr); /* lens, near, far, projection_matrix */
-	virtual int       _setattr(const char *attr, PyObject *pyvalue);
+	virtual PyObject* py_getattro(PyObject *attr); /* lens, near, far, projection_matrix */
+	virtual int       py_setattro(PyObject *attr, PyObject *pyvalue);
 
 };
 
diff --git a/source/gameengine/Ketsji/KX_CameraActuator.cpp b/source/gameengine/Ketsji/KX_CameraActuator.cpp
index 65f3aea12f963fd8cbf3cf39c02d54eeaedfc391..354143f1e69fd63d6d09a823a77510325713c7f3 100644
--- a/source/gameengine/Ketsji/KX_CameraActuator.cpp
+++ b/source/gameengine/Ketsji/KX_CameraActuator.cpp
@@ -371,22 +371,22 @@ bool KX_CameraActuator::string2axischoice(const char *axisString)
 
 /* Integration hooks ------------------------------------------------------- */
 PyTypeObject KX_CameraActuator::Type = {
-	PyObject_HEAD_INIT(&PyType_Type)
+	PyObject_HEAD_INIT(NULL)
 	0,
 	"KX_CameraActuator",
 	sizeof(KX_CameraActuator),
 	0,
 	PyDestructor,
 	0,
-	__getattr,
-	__setattr,
-	0, //&MyPyCompare,
-	__repr,
-	0, //&cvalue_as_number,
 	0,
 	0,
 	0,
-	0
+	py_base_repr,
+	0,0,0,0,0,0,
+	py_base_getattro,
+	py_base_setattro,
+	0,0,0,0,0,0,0,0,0,
+	Methods
 };
 
 PyParentObject KX_CameraActuator::Parents[] = {
@@ -417,27 +417,28 @@ PyAttributeDef KX_CameraActuator::Attributes[] = {
 	KX_PYATTRIBUTE_FLOAT_RW("max",-MAXFLOAT,MAXFLOAT,KX_CameraActuator,m_maxHeight),
 	KX_PYATTRIBUTE_FLOAT_RW("height",-MAXFLOAT,MAXFLOAT,KX_CameraActuator,m_height),
 	KX_PYATTRIBUTE_BOOL_RW("xy",KX_CameraActuator,m_x),
+	KX_PYATTRIBUTE_DUMMY("object"),
 	{NULL}
 };
 
-PyObject* KX_CameraActuator::_getattr(const char *attr) {
+PyObject* KX_CameraActuator::py_getattro(PyObject *attr) {
 	PyObject* object;
-	
-	if (!strcmp(attr, "object")) {
+	char *attr_str= PyString_AsString(attr);
+	if (!strcmp(attr_str, "object")) {
 		if (!m_ob)	Py_RETURN_NONE;
 		else		return m_ob->AddRef();
 	}
 	
-	object = _getattr_self(Attributes, this, attr);
+	object = py_getattro_self(Attributes, this, attr);
 	if (object != NULL)
 		return object;
-	_getattr_up(SCA_IActuator);
+	py_getattro_up(SCA_IActuator);
 }
 
-int KX_CameraActuator::_setattr(const char *attr, PyObject* value) {
+int KX_CameraActuator::py_setattro(PyObject *attr, PyObject* value) {
 	int ret;
-	
-	if (!strcmp(attr, "object")) {
+	char *attr_str= PyString_AsString(attr);
+	if (!strcmp(attr_str, "object")) {
 		KX_GameObject *gameobj;
 		
 		if (!ConvertPythonToGameObject(value, &gameobj, true))
@@ -454,10 +455,10 @@ int KX_CameraActuator::_setattr(const char *attr, PyObject* value) {
 		return 0;
 	}
 	
-	ret = _setattr_self(Attributes, this, attr, value);
+	ret = py_setattro_self(Attributes, this, attr, value);
 	if (ret >= 0)
 		return ret;
-	return SCA_IActuator::_setattr(attr, value);
+	return SCA_IActuator::py_setattro(attr, value);
 }
 
 /* get obj  ---------------------------------------------------------- */
diff --git a/source/gameengine/Ketsji/KX_CameraActuator.h b/source/gameengine/Ketsji/KX_CameraActuator.h
index 3b08536fc21d3811ddeaeec4dcec7cf273862ada..5d7473a5bf08b256920cb75f8086dda44f4f153b 100644
--- a/source/gameengine/Ketsji/KX_CameraActuator.h
+++ b/source/gameengine/Ketsji/KX_CameraActuator.h
@@ -120,8 +120,8 @@ private :
 	/* Python interface ---------------------------------------------------- */
 	/* --------------------------------------------------------------------- */
 
-	virtual PyObject* _getattr(const char *attr);
-	virtual int _setattr(const char *attr, PyObject* value);
+	virtual PyObject* py_getattro(PyObject *attr);
+	virtual int py_setattro(PyObject *attr, PyObject* value);
 
 	/* set object to look at */
 	KX_PYMETHOD_DOC_O(KX_CameraActuator,SetObject);
diff --git a/source/gameengine/Ketsji/KX_ConstraintActuator.cpp b/source/gameengine/Ketsji/KX_ConstraintActuator.cpp
index fba9544d7027864cbadc043b53c395e5a1713299..feee851bb01f3a20c3ecc049652d00b9a4081628 100644
--- a/source/gameengine/Ketsji/KX_ConstraintActuator.cpp
+++ b/source/gameengine/Ketsji/KX_ConstraintActuator.cpp
@@ -560,22 +560,22 @@ bool KX_ConstraintActuator::IsValidMode(KX_ConstraintActuator::KX_CONSTRAINTTYPE
 
 /* Integration hooks ------------------------------------------------------- */
 PyTypeObject KX_ConstraintActuator::Type = {
-	PyObject_HEAD_INIT(&PyType_Type)
+	PyObject_HEAD_INIT(NULL)
 	0,
 	"KX_ConstraintActuator",
 	sizeof(KX_ConstraintActuator),
 	0,
 	PyDestructor,
 	0,
-	__getattr,
-	__setattr,
-	0, //&MyPyCompare,
-	__repr,
-	0, //&cvalue_as_number,
 	0,
 	0,
 	0,
-	0
+	py_base_repr,
+	0,0,0,0,0,0,
+	py_base_getattro,
+	py_base_setattro,
+	0,0,0,0,0,0,0,0,0,
+	Methods
 };
 
 PyParentObject KX_ConstraintActuator::Parents[] = {
@@ -616,8 +616,8 @@ PyAttributeDef KX_ConstraintActuator::Attributes[] = {
 	{ NULL }	//Sentinel
 };
 
-PyObject* KX_ConstraintActuator::_getattr(const char *attr) {
-	_getattr_up(SCA_IActuator);
+PyObject* KX_ConstraintActuator::py_getattro(PyObject *attr) {
+	py_getattro_up(SCA_IActuator);
 }
 
 /* 2. setDamp                                                                */
diff --git a/source/gameengine/Ketsji/KX_ConstraintActuator.h b/source/gameengine/Ketsji/KX_ConstraintActuator.h
index 132b8a7328a5b5ed011a9930113c38c7c26779b3..193400fbf2b27b8390e466d279b6323c2ae5a803 100644
--- a/source/gameengine/Ketsji/KX_ConstraintActuator.h
+++ b/source/gameengine/Ketsji/KX_ConstraintActuator.h
@@ -142,7 +142,7 @@ protected:
 	/* Python interface ---------------------------------------------------- */
 	/* --------------------------------------------------------------------- */
 
-	virtual PyObject* _getattr(const char *attr);
+	virtual PyObject* py_getattro(PyObject *attr);
 
 	KX_PYMETHOD_DOC(KX_ConstraintActuator,SetDamp);
 	KX_PYMETHOD_DOC_NOARGS(KX_ConstraintActuator,GetDamp);
diff --git a/source/gameengine/Ketsji/KX_ConstraintWrapper.cpp b/source/gameengine/Ketsji/KX_ConstraintWrapper.cpp
index f014c1896fe47205d95995f9db30af9aa23c000d..edd6e991e9f6295d11fee839b1601fdd36e6e31f 100644
--- a/source/gameengine/Ketsji/KX_ConstraintWrapper.cpp
+++ b/source/gameengine/Ketsji/KX_ConstraintWrapper.cpp
@@ -69,22 +69,22 @@ PyObject* KX_ConstraintWrapper::PyGetConstraintId(PyObject* self,
 
 //python specific stuff
 PyTypeObject KX_ConstraintWrapper::Type = {
-	PyObject_HEAD_INIT(&PyType_Type)
+	PyObject_HEAD_INIT(NULL)
 		0,
 		"KX_ConstraintWrapper",
 		sizeof(KX_ConstraintWrapper),
 		0,
 		PyDestructor,
 		0,
-		__getattr,
-		__setattr,
-		0, //&MyPyCompare,
-		__repr,
-		0, //&cvalue_as_number,
 		0,
 		0,
 		0,
-		0
+		py_base_repr,
+		0,0,0,0,0,0,
+		py_base_getattro,
+		py_base_setattro,
+		0,0,0,0,0,0,0,0,0,
+		Methods
 };
 
 PyParentObject KX_ConstraintWrapper::Parents[] = {
@@ -92,13 +92,13 @@ PyParentObject KX_ConstraintWrapper::Parents[] = {
 	NULL
 };
 
-PyObject*	KX_ConstraintWrapper::_getattr(const char *attr)
+PyObject*	KX_ConstraintWrapper::py_getattro(PyObject *attr)
 {
 	//here you can search for existing data members (like mass,friction etc.)
-	_getattr_up(PyObjectPlus);
+	py_getattro_up(PyObjectPlus);
 }
 
-int	KX_ConstraintWrapper::_setattr(const char *attr,PyObject* pyobj)
+int	KX_ConstraintWrapper::py_setattro(PyObject *attr,PyObject* pyobj)
 {
 	int result = 1;
 
@@ -120,7 +120,7 @@ int	KX_ConstraintWrapper::_setattr(const char *attr,PyObject* pyobj)
 		result = 0;
 	}
 	if (result)
-		result = PyObjectPlus::_setattr(attr,pyobj);
+		result = PyObjectPlus::py_setattro(attr,pyobj);
 	return result;
 };
 
diff --git a/source/gameengine/Ketsji/KX_ConstraintWrapper.h b/source/gameengine/Ketsji/KX_ConstraintWrapper.h
index 36606d2d67b98dcc63ecb2de91533a789816533b..6e67d842cb6d175b194203c54e0cbfa49e6d5bf3 100644
--- a/source/gameengine/Ketsji/KX_ConstraintWrapper.h
+++ b/source/gameengine/Ketsji/KX_ConstraintWrapper.h
@@ -35,8 +35,8 @@
 class	KX_ConstraintWrapper : public PyObjectPlus
 {
 	Py_Header;
-	virtual PyObject*		_getattr(const char *attr);
-	virtual int 			_setattr(const char *attr, PyObject *value);
+	virtual PyObject*		py_getattro(PyObject *attr);
+	virtual int 			py_setattro(PyObject *attr, PyObject *value);
 public:
 	KX_ConstraintWrapper(PHY_ConstraintType ctype,int constraintId,class PHY_IPhysicsEnvironment* physenv,PyTypeObject *T = &Type);
 	virtual ~KX_ConstraintWrapper ();
diff --git a/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp b/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
index 9b2d740397434a0d157db8862e2d4947f359683b..03149859f4d2d40c782b87ae7e308b0cada3be15 100644
--- a/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
+++ b/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
@@ -882,10 +882,9 @@ void	KX_ConvertBulletObject(	class	KX_GameObject* gameobj,
 					shapeInfo->SetMesh(meshobj, false,false);
 				}
 
-				// Note! since 2.48a bullet mesh conversion has been sped up not to remove doubles
-				// if softbody needs this there should be some post processing filter for softbody meshes.
+				// Soft bodies require welding. Only avoid remove doubles for non-soft bodies!
 				if (objprop->m_softbody)
-					shapeInfo->setVertexWeldingThreshold(0.01f); //todo: expose this to the UI
+					shapeInfo->setVertexWeldingThreshold1(0.01f); //todo: expose this to the UI
 
 				bm = shapeInfo->CreateBulletShape();
 				//no moving concave meshes, so don't bother calculating inertia
@@ -1106,16 +1105,19 @@ void	KX_ConvertBulletObject(	class	KX_GameObject* gameobj,
 
 		if (rbody)
 		{
-			btVector3 linearFactor(
-				objprop->m_lockXaxis? 0 : 1,
-				objprop->m_lockYaxis? 0 : 1,
-				objprop->m_lockZaxis? 0 : 1);
-			btVector3 angularFactor(
-				objprop->m_lockXRotaxis? 0 : 1,
-				objprop->m_lockYRotaxis? 0 : 1,
-				objprop->m_lockZRotaxis? 0 : 1);
-			rbody->setLinearFactor(linearFactor);
-			rbody->setAngularFactor(angularFactor);
+			if (objprop->m_angular_rigidbody)
+			{
+				btVector3 linearFactor(
+					objprop->m_lockXaxis? 0 : 1,
+					objprop->m_lockYaxis? 0 : 1,
+					objprop->m_lockZaxis? 0 : 1);
+				btVector3 angularFactor(
+					objprop->m_lockXRotaxis? 0 : 1,
+					objprop->m_lockYRotaxis? 0 : 1,
+					objprop->m_lockZRotaxis? 0 : 1);
+				rbody->setLinearFactor(linearFactor);
+				rbody->setAngularFactor(angularFactor);
+			}
 
 			if (rbody && objprop->m_disableSleeping)
 			{
diff --git a/source/gameengine/Ketsji/KX_GameActuator.cpp b/source/gameengine/Ketsji/KX_GameActuator.cpp
index 6799ac7269cabeb5b2dea53a08f541db62c7dda3..a2a3d48642095c6b37e7fc35179311de66be3e46 100644
--- a/source/gameengine/Ketsji/KX_GameActuator.cpp
+++ b/source/gameengine/Ketsji/KX_GameActuator.cpp
@@ -208,22 +208,22 @@ bool KX_GameActuator::Update()
 
 /* Integration hooks ------------------------------------------------------- */
 PyTypeObject KX_GameActuator::Type = {
-	PyObject_HEAD_INIT(&PyType_Type)
+	PyObject_HEAD_INIT(NULL)
 		0,
 		"KX_GameActuator",
 		sizeof(KX_GameActuator),
 		0,
 		PyDestructor,
 		0,
-		__getattr,
-		__setattr,
-		0, //&MyPyCompare,
-		__repr,
-		0, //&cvalue_as_number,
 		0,
 		0,
 		0,
-		0
+		py_base_repr,
+		0,0,0,0,0,0,
+		py_base_getattro,
+		py_base_setattro,
+		0,0,0,0,0,0,0,0,0,
+		Methods
 };
 
 
@@ -254,20 +254,20 @@ PyAttributeDef KX_GameActuator::Attributes[] = {
 };
 
 PyObject*
-KX_GameActuator::_getattr(const char *attr)
+KX_GameActuator::py_getattro(PyObject *attr)
 {
-	PyObject* object = _getattr_self(Attributes, this, attr);
+	PyObject* object = py_getattro_self(Attributes, this, attr);
 	if (object != NULL)
 		return object;
-	_getattr_up(SCA_IActuator);
+	py_getattro_up(SCA_IActuator);
 }
 
-int KX_GameActuator::_setattr(const char *attr, PyObject *value)
+int KX_GameActuator::py_setattro(PyObject *attr, PyObject *value)
 {
-	int ret = _setattr_self(Attributes, this, attr, value);
+	int ret = py_setattro_self(Attributes, this, attr, value);
 	if (ret >= 0)
 		return ret;
-	return SCA_IActuator::_setattr(attr, value);
+	return SCA_IActuator::py_setattro(attr, value);
 }
 
 
diff --git a/source/gameengine/Ketsji/KX_GameActuator.h b/source/gameengine/Ketsji/KX_GameActuator.h
index ad638254c31075429a5e4a44a0d779bede01dd17..570cb2e68efe0f871d10b75bf2e8630f1e9929b9 100644
--- a/source/gameengine/Ketsji/KX_GameActuator.h
+++ b/source/gameengine/Ketsji/KX_GameActuator.h
@@ -77,8 +77,8 @@ protected:
 	/* Python interface ---------------------------------------------------- */
 	/* --------------------------------------------------------------------- */
 
-	virtual PyObject* _getattr(const char *attr);
-	virtual int _setattr(const char *attr, PyObject *value);
+	virtual PyObject* py_getattro(PyObject *attr);
+	virtual int py_setattro(PyObject *attr, PyObject *value);
 
 	// Deprecated functions ----->
 	KX_PYMETHOD_DOC(KX_GameActuator,GetFile);
diff --git a/source/gameengine/Ketsji/KX_GameObject.cpp b/source/gameengine/Ketsji/KX_GameObject.cpp
index bbfa2ad324fb8a923076b94df94d1ed6156ec18a..e79ef5ab72b41a5d1d94afe658d82517abd1da9e 100644
--- a/source/gameengine/Ketsji/KX_GameObject.cpp
+++ b/source/gameengine/Ketsji/KX_GameObject.cpp
@@ -942,14 +942,14 @@ const MT_Vector3& KX_GameObject::NodeGetWorldScaling() const
 }
 
 
-
+static MT_Point3 dummy_point= MT_Point3(0.0, 0.0, 0.0);
 const MT_Point3& KX_GameObject::NodeGetWorldPosition() const
 {
 	// check on valid node in case a python controller holds a reference to a deleted object
 	if (GetSGNode())
 		return GetSGNode()->GetWorldPosition();
 	else
-		return MT_Point3(0.0, 0.0, 0.0);
+		return dummy_point;
 }
 
 /* Suspend/ resume: for the dynamic behaviour, there is a simple
@@ -1043,6 +1043,7 @@ PyAttributeDef KX_GameObject::Attributes[] = {
 	KX_PYATTRIBUTE_RW_FUNCTION("scaling",	KX_GameObject, pyattr_get_scaling,	pyattr_set_scaling),
 	KX_PYATTRIBUTE_RW_FUNCTION("timeOffset",KX_GameObject, pyattr_get_timeOffset,pyattr_set_timeOffset),
 	KX_PYATTRIBUTE_RW_FUNCTION("state",		KX_GameObject, pyattr_get_state,	pyattr_set_state),
+	KX_PYATTRIBUTE_RO_FUNCTION("__dict__",	KX_GameObject, pyattr_get_dir_dict),
 	{NULL} //Sentinel
 };
 
@@ -1103,28 +1104,105 @@ PyObject* KX_GameObject::PyGetPosition(PyObject* self)
 }
 
 
+Py_ssize_t KX_GameObject::Map_Len(PyObject* self_v)
+{
+	return (static_cast<KX_GameObject*>(self_v))->GetPropertyCount();
+}
+
+
+PyObject *KX_GameObject::Map_GetItem(PyObject *self_v, PyObject *item)
+{
+	KX_GameObject* self= static_cast<KX_GameObject*>(self_v);
+	const char *attr= PyString_AsString(item);
+	CValue* resultattr;
+	PyObject* pyconvert;
+	
+	
+	if(attr==NULL) {
+		PyErr_SetString(PyExc_TypeError, "KX_GameObject key but a string");
+		return NULL;
+	}
+	
+	resultattr = self->GetProperty(attr);
+	
+	if(resultattr==NULL) {
+		PyErr_SetString(PyExc_KeyError, "KX_GameObject key does not exist");
+		return NULL;
+	}
+	
+	pyconvert = resultattr->ConvertValueToPython();
+	
+	return pyconvert ? pyconvert:resultattr;
+}
+
+
+int KX_GameObject::Map_SetItem(PyObject *self_v, PyObject *key, PyObject *val)
+{
+	KX_GameObject* self= static_cast<KX_GameObject*>(self_v);
+	const char *attr= PyString_AsString(key);
+	
+	if(attr==NULL) {
+		PyErr_SetString(PyExc_TypeError, "KX_GameObject key but a string");
+		return 1;
+	}
+	
+	if (val==NULL) { /* del ob["key"] */
+		if (self->RemoveProperty(attr)==false) {
+			PyErr_Format(PyExc_KeyError, "KX_GameObject key \"%s\" not found", attr);
+			return 1;
+		}
+	}
+	else { /* ob["key"] = value */
+		CValue* vallie = self->ConvertPythonToValue(val);
+		
+		if(vallie==NULL)
+			return 1; /* ConvertPythonToValue sets the error */
+		
+		CValue* oldprop = self->GetProperty(attr);
+		
+		if (oldprop)
+			oldprop->SetValue(vallie);
+		else
+			self->SetProperty(attr, vallie);
+		
+		vallie->Release();
+	}
+	
+	return 0;
+}
+
+
+PyMappingMethods KX_GameObject::Mapping = {
+	(lenfunc)KX_GameObject::Map_Len, 			/*inquiry mp_length */
+	(binaryfunc)KX_GameObject::Map_GetItem,		/*binaryfunc mp_subscript */
+	(objobjargproc)KX_GameObject::Map_SetItem,	/*objobjargproc mp_ass_subscript */
+};
+
 
 PyTypeObject KX_GameObject::Type = {
-	PyObject_HEAD_INIT(&PyType_Type)
+	PyObject_HEAD_INIT(NULL)
 		0,
 		"KX_GameObject",
 		sizeof(KX_GameObject),
 		0,
 		PyDestructor,
 		0,
-		__getattr,
-		__setattr,
-		0, //&MyPyCompare,
-		__repr,
-		0, //&cvalue_as_number,
 		0,
 		0,
 		0,
-		0
+		py_base_repr,
+		0,0,0,0,0,0,
+		py_base_getattro,
+		py_base_setattro,
+		0,0,0,0,0,0,0,0,0,
+		Methods
 };
 
 
 
+
+
+
 PyParentObject KX_GameObject::Parents[] = {
 	&KX_GameObject::Type,
 		&SCA_IObject::Type,
@@ -1338,26 +1416,49 @@ int KX_GameObject::pyattr_set_state(void *self_v, const KX_PYATTRIBUTE_DEF *attr
 	return 0;
 }
 
-PyObject* KX_GameObject::_getattr(const char *attr)
+/* __dict__ only for the purpose of giving useful dir() results */
+PyObject* KX_GameObject::pyattr_get_dir_dict(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
 {
-	PyObject* object = _getattr_self(Attributes, this, attr);
-	if (object != NULL)
-		return object;
+	KX_GameObject* self= static_cast<KX_GameObject*>(self_v);
+	PyObject *dict_str = PyString_FromString("__dict__");
+	PyObject *dict= _getattr_dict(self->SCA_IObject::py_getattro(dict_str), KX_GameObject::Methods, KX_GameObject::Attributes);
+	Py_DECREF(dict_str);
+	
+	if(dict==NULL)
+		return NULL;
 	
-	if (!strcmp(attr, "__dict__")) { /* python 3.0 uses .__dir__()*/
-		return _getattr_dict(SCA_IObject::_getattr(attr), Methods, Attributes);
+	/* Not super fast getting as a list then making into dict keys but its only for dir() */
+	PyObject *list= self->ConvertKeysToPython();
+	if(list)
+	{
+		int i;
+		for(i=0; i<PyList_Size(list); i++)
+			PyDict_SetItem(dict, PyList_GET_ITEM(list, i), Py_None);
 	}
+	else
+		PyErr_Clear();
+	
+	Py_DECREF(list);
+	
+	return dict;
+}
+
+PyObject* KX_GameObject::py_getattro(PyObject *attr)
+{
+	PyObject* object = py_getattro_self(Attributes, this, attr);
+	if (object != NULL)
+		return object;
 	
-	_getattr_up(SCA_IObject);
+	py_getattro_up(SCA_IObject);
 }
 
-int KX_GameObject::_setattr(const char *attr, PyObject *value)	// _setattr method
+int KX_GameObject::py_setattro(PyObject *attr, PyObject *value)	// py_setattro method
 {
-	int ret = _setattr_self(Attributes, this, attr, value);
+	int ret = py_setattro_self(Attributes, this, attr, value);
 	if (ret >= 0)
 		return ret;
 	
-	return SCA_IObject::_setattr(attr, value);
+	return SCA_IObject::py_setattro(attr, value);
 }
 
 PyObject* KX_GameObject::PyApplyForce(PyObject* self, PyObject* args)
diff --git a/source/gameengine/Ketsji/KX_GameObject.h b/source/gameengine/Ketsji/KX_GameObject.h
index 326b3700ad7ab863e55cb9bc8b2eab29aac2f6e4..9ed35b6d26bc50063184b7330edaf0f18cec3cfa 100644
--- a/source/gameengine/Ketsji/KX_GameObject.h
+++ b/source/gameengine/Ketsji/KX_GameObject.h
@@ -756,9 +756,9 @@ public:
 	 * @section Python interface functions.
 	 */
 
-	virtual PyObject* _getattr(const char *attr);
-	virtual int _setattr(const char *attr, PyObject *value);		// _setattr method
-	virtual PyObject* _repr(void) { return PyString_FromString(GetName().ReadPtr()); }
+	virtual PyObject* py_getattro(PyObject *attr);
+	virtual int py_setattro(PyObject *attr, PyObject *value);		// py_setattro method
+	virtual PyObject* py_repr(void) { return PyString_FromString(GetName().ReadPtr()); }
 	
 	KX_PYMETHOD_NOARGS(KX_GameObject,GetPosition);
 	KX_PYMETHOD_O(KX_GameObject,SetPosition);
@@ -822,7 +822,16 @@ public:
 	static PyObject*	pyattr_get_state(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef);
 	static int			pyattr_set_state(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef, PyObject *value);
 	
-
+	/* for dir(), python3 uses __dir__() */
+	static PyObject*	pyattr_get_dir_dict(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef);
+	
+	/* getitem/setitem */
+	static Py_ssize_t			Map_Len(PyObject* self);
+	static PyMappingMethods	Mapping;
+	static PyObject*			Map_GetItem(PyObject *self_v, PyObject *item);
+	static int					Map_SetItem(PyObject *self_v, PyObject *key, PyObject *val);
+	
+	
 private :
 
 	/**	
diff --git a/source/gameengine/Ketsji/KX_IpoActuator.cpp b/source/gameengine/Ketsji/KX_IpoActuator.cpp
index f6fdce9de0fac89f577445155a64839d05a4c848..adb9c284828d2546621d538961136fbe85888f20 100644
--- a/source/gameengine/Ketsji/KX_IpoActuator.cpp
+++ b/source/gameengine/Ketsji/KX_IpoActuator.cpp
@@ -413,22 +413,22 @@ int KX_IpoActuator::string2mode(char* modename) {
 
 /* Integration hooks ------------------------------------------------------- */
 PyTypeObject KX_IpoActuator::Type = {
-	PyObject_HEAD_INIT(&PyType_Type)
+	PyObject_HEAD_INIT(NULL)
 	0,
 	"KX_IpoActuator",
 	sizeof(KX_IpoActuator),
 	0,
 	PyDestructor,
 	0,
-	__getattr,
-	__setattr,
-	0, //&MyPyCompare,
-	__repr,
-	0, //&cvalue_as_number,
 	0,
 	0,
 	0,
-	0
+	py_base_repr,
+	0,0,0,0,0,0,
+	py_base_getattro,
+	py_base_setattro,
+	0,0,0,0,0,0,0,0,0,
+	Methods
 };
 
 PyParentObject KX_IpoActuator::Parents[] = {
@@ -473,25 +473,21 @@ PyAttributeDef KX_IpoActuator::Attributes[] = {
 	{ NULL }	//Sentinel
 };
 
-PyObject* KX_IpoActuator::_getattr(const char *attr) {
-	PyObject* object = _getattr_self(Attributes, this, attr);
+PyObject* KX_IpoActuator::py_getattro(PyObject *attr) {
+	PyObject* object = py_getattro_self(Attributes, this, attr);
 	if (object != NULL)
 		return object;
 	
-	if (!strcmp(attr, "__dict__")) { /* python 3.0 uses .__dir__()*/
-		return _getattr_dict(SCA_IActuator::_getattr(attr), Methods, Attributes);
-	}
-	
-	_getattr_up(SCA_IActuator);
+	py_getattro_up(SCA_IActuator);
 }
 
-int KX_IpoActuator::_setattr(const char *attr, PyObject *value)	// _setattr method
+int KX_IpoActuator::py_setattro(PyObject *attr, PyObject *value)	// py_setattro method
 {
-	int ret = _setattr_self(Attributes, this, attr, value);
+	int ret = py_setattro_self(Attributes, this, attr, value);
 	if (ret >= 0)
 		return ret;
 	
-	return SCA_IActuator::_setattr(attr, value);
+	return SCA_IActuator::py_setattro(attr, value);
 }
 
 /* set --------------------------------------------------------------------- */
diff --git a/source/gameengine/Ketsji/KX_IpoActuator.h b/source/gameengine/Ketsji/KX_IpoActuator.h
index fa8e58ae861bbbefa36e60d55cff2ee50ca83596..7e85a28eb96144ce9e4b3c1cf8b4e5d2ff88a09d 100644
--- a/source/gameengine/Ketsji/KX_IpoActuator.h
+++ b/source/gameengine/Ketsji/KX_IpoActuator.h
@@ -141,8 +141,8 @@ public:
 	/* Python interface ---------------------------------------------------- */
 	/* --------------------------------------------------------------------- */
 
-	virtual PyObject* _getattr(const char *attr);
-	virtual int _setattr(const char *attr, PyObject *value);
+	virtual PyObject* py_getattro(PyObject *attr);
+	virtual int py_setattro(PyObject *attr, PyObject *value);
 	
 	//KX_PYMETHOD_DOC
 	KX_PYMETHOD_DOC(KX_IpoActuator,Set);
diff --git a/source/gameengine/Ketsji/KX_Light.cpp b/source/gameengine/Ketsji/KX_Light.cpp
index 487b8f30e0d2e1dc29ac51f6bf392bfcf8b5e69e..6f9d8b0211b4afa143a14e019070913bca6679b8 100644
--- a/source/gameengine/Ketsji/KX_Light.cpp
+++ b/source/gameengine/Ketsji/KX_Light.cpp
@@ -173,59 +173,62 @@ void KX_LightObject::UnbindShadowBuffer(RAS_IRasterizer *ras)
 	GPU_lamp_shadow_buffer_unbind(lamp);
 }
 
-PyObject* KX_LightObject::_getattr(const char *attr)
+PyObject* KX_LightObject::py_getattro(PyObject *attr)
 {
-	if (!strcmp(attr, "layer"))
+	char *attr_str= PyString_AsString(attr);
+	
+	if (!strcmp(attr_str, "layer"))
 		return PyInt_FromLong(m_lightobj.m_layer);
 	
-	if (!strcmp(attr, "energy"))
+	if (!strcmp(attr_str, "energy"))
 		return PyFloat_FromDouble(m_lightobj.m_energy);
 	
-	if (!strcmp(attr, "distance"))
+	if (!strcmp(attr_str, "distance"))
 		return PyFloat_FromDouble(m_lightobj.m_distance);
 	
-	if (!strcmp(attr, "colour") || !strcmp(attr, "color"))
+	if (!strcmp(attr_str, "colour") || !strcmp(attr_str, "color"))
 		return Py_BuildValue("[fff]", m_lightobj.m_red, m_lightobj.m_green, m_lightobj.m_blue);
 		
-	if (!strcmp(attr, "lin_attenuation"))
+	if (!strcmp(attr_str, "lin_attenuation"))
 		return PyFloat_FromDouble(m_lightobj.m_att1);
 	
-	if (!strcmp(attr, "quad_attenuation"))
+	if (!strcmp(attr_str, "quad_attenuation"))
 		return PyFloat_FromDouble(m_lightobj.m_att2);
 	
-	if (!strcmp(attr, "spotsize"))
+	if (!strcmp(attr_str, "spotsize"))
 		return PyFloat_FromDouble(m_lightobj.m_spotsize);
 	
-	if (!strcmp(attr, "spotblend"))
+	if (!strcmp(attr_str, "spotblend"))
 		return PyFloat_FromDouble(m_lightobj.m_spotblend);
 		
-	if (!strcmp(attr, "SPOT"))
+	if (!strcmp(attr_str, "SPOT"))
 		return PyInt_FromLong(RAS_LightObject::LIGHT_SPOT);
 		
-	if (!strcmp(attr, "SUN"))
+	if (!strcmp(attr_str, "SUN"))
 		return PyInt_FromLong(RAS_LightObject::LIGHT_SUN);
 	
-	if (!strcmp(attr, "NORMAL"))
+	if (!strcmp(attr_str, "NORMAL"))
 		return PyInt_FromLong(RAS_LightObject::LIGHT_NORMAL);
 	
-	if (!strcmp(attr, "type"))
+	if (!strcmp(attr_str, "type"))
 		return PyInt_FromLong(m_lightobj.m_type);
 		
-	_getattr_up(KX_GameObject);
+	py_getattro_up(KX_GameObject);
 }
 
-int       KX_LightObject::_setattr(const char *attr, PyObject *pyvalue)
-{	
+int       KX_LightObject::py_setattro(PyObject *attr, PyObject *pyvalue)
+{
+	char *attr_str= PyString_AsString(attr);
 	if (PyInt_Check(pyvalue))
 	{
 		int value = PyInt_AsLong(pyvalue);
-		if (!strcmp(attr, "layer"))
+		if (!strcmp(attr_str, "layer"))
 		{
 			m_lightobj.m_layer = value;
 			return 0;
 		}
 		
-		if (!strcmp(attr, "type"))
+		if (!strcmp(attr_str, "type"))
 		{
 			if (value >= RAS_LightObject::LIGHT_SPOT && value <= RAS_LightObject::LIGHT_NORMAL)
 				m_lightobj.m_type = (RAS_LightObject::LightType) value;
@@ -236,37 +239,37 @@ int       KX_LightObject::_setattr(const char *attr, PyObject *pyvalue)
 	if (PyFloat_Check(pyvalue))
 	{
 		float value = PyFloat_AsDouble(pyvalue);
-		if (!strcmp(attr, "energy"))
+		if (!strcmp(attr_str, "energy"))
 		{
 			m_lightobj.m_energy = value;
 			return 0;
 		}
 	
-		if (!strcmp(attr, "distance"))
+		if (!strcmp(attr_str, "distance"))
 		{
 			m_lightobj.m_distance = value;
 			return 0;
 		}
 		
-		if (!strcmp(attr, "lin_attenuation"))
+		if (!strcmp(attr_str, "lin_attenuation"))
 		{
 			m_lightobj.m_att1 = value;
 			return 0;
 		}
 		
-		if (!strcmp(attr, "quad_attenuation"))
+		if (!strcmp(attr_str, "quad_attenuation"))
 		{
 			m_lightobj.m_att2 = value;
 			return 0;
 		}
 		
-		if (!strcmp(attr, "spotsize"))
+		if (!strcmp(attr_str, "spotsize"))
 		{
 			m_lightobj.m_spotsize = value;
 			return 0;
 		}
 		
-		if (!strcmp(attr, "spotblend"))
+		if (!strcmp(attr_str, "spotblend"))
 		{
 			m_lightobj.m_spotblend = value;
 			return 0;
@@ -275,7 +278,7 @@ int       KX_LightObject::_setattr(const char *attr, PyObject *pyvalue)
 
 	if (PySequence_Check(pyvalue))
 	{
-		if (!strcmp(attr, "colour") || !strcmp(attr, "color"))
+		if (!strcmp(attr_str, "colour") || !strcmp(attr_str, "color"))
 		{
 			MT_Vector3 color;
 			if (PyVecTo(pyvalue, color))
@@ -289,13 +292,13 @@ int       KX_LightObject::_setattr(const char *attr, PyObject *pyvalue)
 		}
 	}
 	
-	if (!strcmp(attr, "SPOT") || !strcmp(attr, "SUN") || !strcmp(attr, "NORMAL"))
+	if (!strcmp(attr_str, "SPOT") || !strcmp(attr_str, "SUN") || !strcmp(attr_str, "NORMAL"))
 	{
-		PyErr_Format(PyExc_RuntimeError, "Attribute %s is read only.", attr);
+		PyErr_Format(PyExc_RuntimeError, "Attribute %s is read only.", attr_str);
 		return 1;
 	}
 	
-	return KX_GameObject::_setattr(attr, pyvalue);
+	return KX_GameObject::py_setattro(attr, pyvalue);
 }
 
 PyMethodDef KX_LightObject::Methods[] = {
@@ -306,48 +309,24 @@ PyAttributeDef KX_LightObject::Attributes[] = {
 	{ NULL }	//Sentinel
 };
 
-char KX_LightObject::doc[] = "Module KX_LightObject\n\n"
-"Constants:\n"
-"\tSPOT\n"
-"\tSUN\n"
-"\tNORMAL\n"
-"Attributes:\n"
-"\ttype -> SPOT, SUN or NORMAL\n"
-"\t\tThe type of light.\n"
-"\tlayer -> integer bit field.\n"
-"\t\tThe layers this light applies to.\n"
-"\tenergy -> float.\n"
-"\t\tThe brightness of the light.\n"
-"\tdistance -> float.\n"
-"\t\tThe effect radius of the light.\n"
-"\tcolour -> list [r, g, b].\n"
-"\tcolor  -> list [r, g, b].\n"
-"\t\tThe color of the light.\n"
-"\tlin_attenuation -> float.\n"
-"\t\tThe attenuation factor for the light.\n"
-"\tspotsize -> float.\n"
-"\t\tThe size of the spot.\n"
-"\tspotblend -> float.\n"
-"\t\tThe blend? of the spot.\n";
 
 PyTypeObject KX_LightObject::Type = {
-	PyObject_HEAD_INIT(&PyType_Type)
+	PyObject_HEAD_INIT(NULL)
 		0,
 		"KX_LightObject",
 		sizeof(KX_LightObject),
 		0,
 		PyDestructor,
 		0,
-		__getattr,
-		__setattr,
-		0, //&MyPyCompare,
-		__repr,
-		0, //&cvalue_as_number,
 		0,
 		0,
 		0,
-		0, 0, 0, 0, 0, 0,
-		doc
+		py_base_repr,
+		0,0,0,0,0,0,
+		py_base_getattro,
+		py_base_setattro,
+		0,0,0,0,0,0,0,0,0,
+		Methods
 };
 
 PyParentObject KX_LightObject::Parents[] = {
diff --git a/source/gameengine/Ketsji/KX_Light.h b/source/gameengine/Ketsji/KX_Light.h
index 47edd09b5b993ca428be0437a0260b2df00f0999..4559954c8d7152caaba7dbfceff7e070fbf6ac6b 100644
--- a/source/gameengine/Ketsji/KX_Light.h
+++ b/source/gameengine/Ketsji/KX_Light.h
@@ -47,7 +47,6 @@ protected:
 	class RAS_IRenderTools*	m_rendertools;	//needed for registering and replication of lightobj
 	bool				m_glsl;
 	Scene*				m_blenderscene;
-	static char			doc[];
 
 public:
 	KX_LightObject(void* sgReplicationInfo,SG_Callbacks callbacks,class RAS_IRenderTools* rendertools,const struct RAS_LightObject&	lightobj, bool glsl, PyTypeObject *T = &Type);
@@ -63,8 +62,8 @@ public:
 	void UnbindShadowBuffer(class RAS_IRasterizer *ras);
 	void Update();
 	
-	virtual PyObject* _getattr(const char *attr); /* lens, near, far, projection_matrix */
-	virtual int       _setattr(const char *attr, PyObject *pyvalue);
+	virtual PyObject* py_getattro(PyObject *attr); /* lens, near, far, projection_matrix */
+	virtual int       py_setattro(PyObject *attr, PyObject *pyvalue);
 
 	virtual bool IsLight(void) { return true; }
 };
diff --git a/source/gameengine/Ketsji/KX_MeshProxy.cpp b/source/gameengine/Ketsji/KX_MeshProxy.cpp
index a0c0a496c064bf1b5484da6a20db4f53e9ae805b..f464cb798e81220aa807ea8721e98b6fdd5b5140 100644
--- a/source/gameengine/Ketsji/KX_MeshProxy.cpp
+++ b/source/gameengine/Ketsji/KX_MeshProxy.cpp
@@ -46,22 +46,22 @@
 #include "PyObjectPlus.h" 
 
 PyTypeObject KX_MeshProxy::Type = {
-	PyObject_HEAD_INIT(&PyType_Type)
+	PyObject_HEAD_INIT(NULL)
 	0,
 	"KX_MeshProxy",
 	sizeof(KX_MeshProxy),
 	0,
 	PyDestructor,
 	0,
-	__getattr,
-	__setattr,
-	0, //&MyPyCompare,
-	__repr,
-	0, //&cvalue_as_number,
 	0,
 	0,
 	0,
-	0
+	py_base_repr,
+	0,0,0,0,0,0,
+	py_base_getattro,
+	py_base_setattro,
+	0,0,0,0,0,0,0,0,0,
+	Methods
 };
 
 PyParentObject KX_MeshProxy::Parents[] = {
@@ -97,9 +97,11 @@ void KX_MeshProxy::SetMeshModified(bool v)
 
 
 PyObject*
-KX_MeshProxy::_getattr(const char *attr)
+KX_MeshProxy::py_getattro(PyObject *attr)
 {
-	if (!strcmp(attr, "materials"))
+	char *attr_str= PyString_AsString(attr);
+	
+	if (!strcmp(attr_str, "materials"))
 	{
 		PyObject *materials = PyList_New(0);
 		list<RAS_MeshMaterial>::iterator mit = m_meshobj->GetFirstMaterial();
@@ -118,13 +120,13 @@ KX_MeshProxy::_getattr(const char *attr)
 		}
 		return materials;
 	}
- 	_getattr_up(SCA_IObject);
+ 	py_getattro_up(SCA_IObject);
 }
 
 
 
 KX_MeshProxy::KX_MeshProxy(RAS_MeshObject* mesh)
-	:	m_meshobj(mesh)
+	: SCA_IObject(&Type), m_meshobj(mesh)
 {
 }
 
diff --git a/source/gameengine/Ketsji/KX_MeshProxy.h b/source/gameengine/Ketsji/KX_MeshProxy.h
index 34f60a54a3aa0f34e53accf59a30316be3ab13a4..0b9738153ff2d8b46efcef7a996a28885a88624f 100644
--- a/source/gameengine/Ketsji/KX_MeshProxy.h
+++ b/source/gameengine/Ketsji/KX_MeshProxy.h
@@ -47,13 +47,14 @@ public:
 	virtual CValue*		CalcFinal(VALUE_DATA_TYPE dtype, VALUE_OPERATOR op, CValue *val);
 	virtual const STR_String &	GetText();
 	virtual float		GetNumber();
+	virtual RAS_MeshObject* GetMesh() { return m_meshobj; }
 	virtual STR_String	GetName();
 	virtual void		SetName(STR_String name);								// Set the name of the value
 	virtual void		ReplicaSetName(STR_String name);
 	virtual CValue*		GetReplica();
 
 // stuff for python integration
-	virtual PyObject*  _getattr(const char *attr);
+	virtual PyObject*  py_getattro(PyObject *attr);
 	KX_PYMETHOD(KX_MeshProxy,GetNumMaterials);
 	KX_PYMETHOD(KX_MeshProxy,GetMaterialName);
 	KX_PYMETHOD(KX_MeshProxy,GetTextureName);
diff --git a/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp b/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp
index 384034485e7f3cb4de0e230ce66efbd5092eb041..72a0381e8dca052972328c379b451a35e8e80ab6 100644
--- a/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp
+++ b/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp
@@ -293,22 +293,22 @@ bool KX_MouseFocusSensor::ParentObjectHasFocus(void)
 
 /* Integration hooks ------------------------------------------------------- */
 PyTypeObject KX_MouseFocusSensor::Type = {
-	PyObject_HEAD_INIT(&PyType_Type)
+	PyObject_HEAD_INIT(NULL)
 	0,
 	"KX_MouseFocusSensor",
 	sizeof(KX_MouseFocusSensor),
 	0,
 	PyDestructor,
 	0,
-	__getattr,
-	__setattr,
-	0, //&MyPyCompare,
-	__repr,
-	0, //&cvalue_as_number,
 	0,
 	0,
 	0,
-	0
+	py_base_repr,
+	0,0,0,0,0,0,
+	py_base_getattro,
+	py_base_setattro,
+	0,0,0,0,0,0,0,0,0,
+	Methods
 };
 
 PyParentObject KX_MouseFocusSensor::Parents[] = {
@@ -336,8 +336,8 @@ PyAttributeDef KX_MouseFocusSensor::Attributes[] = {
 	{ NULL }	//Sentinel
 };
 
-PyObject* KX_MouseFocusSensor::_getattr(const char *attr) {
-	_getattr_up(SCA_MouseSensor);
+PyObject* KX_MouseFocusSensor::py_getattro(PyObject *attr) {
+	py_getattro_up(SCA_MouseSensor);
 }
 
 
diff --git a/source/gameengine/Ketsji/KX_MouseFocusSensor.h b/source/gameengine/Ketsji/KX_MouseFocusSensor.h
index 4979783032ce1c0712a0d29dae28f946e58844c5..804f34e6076a1c3b70dd655eac60d9c2c601e0a2 100644
--- a/source/gameengine/Ketsji/KX_MouseFocusSensor.h
+++ b/source/gameengine/Ketsji/KX_MouseFocusSensor.h
@@ -87,7 +87,7 @@ class KX_MouseFocusSensor : public SCA_MouseSensor
 	/* --------------------------------------------------------------------- */
 	/* Python interface ---------------------------------------------------- */
 	/* --------------------------------------------------------------------- */
-	virtual PyObject*  _getattr(const char *attr);
+	virtual PyObject*  py_getattro(PyObject *attr);
 
 	KX_PYMETHOD_DOC_NOARGS(KX_MouseFocusSensor,GetRayTarget);
 	KX_PYMETHOD_DOC_NOARGS(KX_MouseFocusSensor,GetRaySource);
diff --git a/source/gameengine/Ketsji/KX_NearSensor.cpp b/source/gameengine/Ketsji/KX_NearSensor.cpp
index 993a6b3d86c55b31830e38b03091714f85412d52..2debfd793c16efccae24b6710728deaa1f771a81 100644
--- a/source/gameengine/Ketsji/KX_NearSensor.cpp
+++ b/source/gameengine/Ketsji/KX_NearSensor.cpp
@@ -287,22 +287,22 @@ bool	KX_NearSensor::NewHandleCollision(void* obj1,void* obj2,const PHY_CollData
 /* ------------------------------------------------------------------------- */
 
 PyTypeObject KX_NearSensor::Type = {
-	PyObject_HEAD_INIT(&PyType_Type)
+	PyObject_HEAD_INIT(NULL)
 	0,
 	"KX_NearSensor",
 	sizeof(KX_NearSensor),
 	0,
 	PyDestructor,
 	0,
-	__getattr,
-	__setattr,
-	0, //&MyPyCompare,
-	__repr,
-	0, //&cvalue_as_number,
 	0,
 	0,
 	0,
-	0
+	py_base_repr,
+	0,0,0,0,0,0,
+	py_base_getattro,
+	py_base_setattro,
+	0,0,0,0,0,0,0,0,0,
+	Methods
 };
 
 
@@ -330,20 +330,20 @@ PyAttributeDef KX_NearSensor::Attributes[] = {
 };
 
 
-PyObject* KX_NearSensor::_getattr(const char *attr)
+PyObject* KX_NearSensor::py_getattro(PyObject *attr)
 {
-	PyObject* object = _getattr_self(Attributes, this, attr);
+	PyObject* object = py_getattro_self(Attributes, this, attr);
 	if (object != NULL)
 		return object;
 
-	_getattr_up(KX_TouchSensor);
+	py_getattro_up(KX_TouchSensor);
 }
 
-int KX_NearSensor::_setattr(const char *attr, PyObject* value)
+int KX_NearSensor::py_setattro(PyObject*attr, PyObject* value)
 {
-	int ret = _setattr_self(Attributes, this, attr, value);
+	int ret = py_setattro_self(Attributes, this, attr, value);
 	if (ret >= 0)
 		return ret;
 
-	return KX_TouchSensor::_setattr(attr, value);
+	return KX_TouchSensor::py_setattro(attr, value);
 }
diff --git a/source/gameengine/Ketsji/KX_NearSensor.h b/source/gameengine/Ketsji/KX_NearSensor.h
index ee03992e734f44899a527d9d82566557c66e2a2a..26c5feb4e67afe7db052eb98ce4680e777f4eb5b 100644
--- a/source/gameengine/Ketsji/KX_NearSensor.h
+++ b/source/gameengine/Ketsji/KX_NearSensor.h
@@ -82,8 +82,8 @@ public:
 	/* --------------------------------------------------------------------- */
 	/* Python interface ---------------------------------------------------- */
 	/* --------------------------------------------------------------------- */
-	virtual PyObject* _getattr(const char *attr);
-	virtual int _setattr(const char *attr, PyObject* value);
+	virtual PyObject* py_getattro(PyObject *attr);
+	virtual int py_setattro(PyObject *attr, PyObject* value);
 
 	//No methods
 
diff --git a/source/gameengine/Ketsji/KX_ObjectActuator.cpp b/source/gameengine/Ketsji/KX_ObjectActuator.cpp
index 0666261b4705e75987e5c8ad111e9ff31a3b2a59..a343eeb71ccd065f9a6ac73395e3183d3e37daa9 100644
--- a/source/gameengine/Ketsji/KX_ObjectActuator.cpp
+++ b/source/gameengine/Ketsji/KX_ObjectActuator.cpp
@@ -277,22 +277,22 @@ bool KX_ObjectActuator::isValid(KX_ObjectActuator::KX_OBJECT_ACT_VEC_TYPE type)
 
 /* Integration hooks ------------------------------------------------------- */
 PyTypeObject KX_ObjectActuator::Type = {
-	PyObject_HEAD_INIT(&PyType_Type)
+	PyObject_HEAD_INIT(NULL)
 	0,
 	"KX_ObjectActuator",
 	sizeof(KX_ObjectActuator),
 	0,
 	PyDestructor,
 	0,
-	__getattr,
-	__setattr,
-	0, //&MyPyCompare,
-	__repr,
-	0, //&cvalue_as_number,
 	0,
 	0,
 	0,
-	0
+	py_base_repr,
+	0,0,0,0,0,0,
+	py_base_getattro,
+	py_base_setattro,
+	0,0,0,0,0,0,0,0,0,
+	Methods
 };
 
 PyParentObject KX_ObjectActuator::Parents[] = {
@@ -336,8 +336,8 @@ PyAttributeDef KX_ObjectActuator::Attributes[] = {
 	{ NULL }	//Sentinel
 };
 
-PyObject* KX_ObjectActuator::_getattr(const char *attr) {
-	_getattr_up(SCA_IActuator);
+PyObject* KX_ObjectActuator::py_getattro(PyObject *attr) {
+	py_getattro_up(SCA_IActuator);
 };
 
 /* 1. set ------------------------------------------------------------------ */
diff --git a/source/gameengine/Ketsji/KX_ObjectActuator.h b/source/gameengine/Ketsji/KX_ObjectActuator.h
index 0331c67617cc84108f3c25b2628a3912d3cfdd78..00c8fb700ae3f505e6e1993cc394080c7a32b30c 100644
--- a/source/gameengine/Ketsji/KX_ObjectActuator.h
+++ b/source/gameengine/Ketsji/KX_ObjectActuator.h
@@ -153,7 +153,7 @@ public:
 	/* Python interface ---------------------------------------------------- */
 	/* --------------------------------------------------------------------- */
 	
-	virtual PyObject* _getattr(const char *attr);
+	virtual PyObject* py_getattro(PyObject *attr);
 
 	KX_PYMETHOD_NOARGS(KX_ObjectActuator,GetForce);
 	KX_PYMETHOD(KX_ObjectActuator,SetForce);
diff --git a/source/gameengine/Ketsji/KX_ParentActuator.cpp b/source/gameengine/Ketsji/KX_ParentActuator.cpp
index 84d7ccb9c056c90f3bf415147f1e81a83ab39f9c..1baf581f8a00700dfefd4468610d69a04d986e5a 100644
--- a/source/gameengine/Ketsji/KX_ParentActuator.cpp
+++ b/source/gameengine/Ketsji/KX_ParentActuator.cpp
@@ -1,7 +1,7 @@
 /**
  * Set or remove an objects parent
  *
- * $Id: SCA_ParentActuator.cpp 13932 2008-03-01 19:05:41Z ben2610 $
+ * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
@@ -139,22 +139,22 @@ bool KX_ParentActuator::Update()
 
 /* Integration hooks ------------------------------------------------------- */
 PyTypeObject KX_ParentActuator::Type = {
-	PyObject_HEAD_INIT(&PyType_Type)
+	PyObject_HEAD_INIT(NULL)
 	0,
 	"KX_ParentActuator",
 	sizeof(KX_ParentActuator),
 	0,
 	PyDestructor,
 	0,
-	__getattr,
-	__setattr,
-	0, //&MyPyCompare,
-	__repr,
-	0, //&cvalue_as_number,
 	0,
 	0,
 	0,
-	0
+	py_base_repr,
+	0,0,0,0,0,0,
+	py_base_getattro,
+	py_base_setattro,
+	0,0,0,0,0,0,0,0,0,
+	Methods
 };
 
 PyParentObject KX_ParentActuator::Parents[] = {
@@ -166,48 +166,64 @@ PyParentObject KX_ParentActuator::Parents[] = {
 };
 
 PyMethodDef KX_ParentActuator::Methods[] = {
-	// ---> deprecated (all)
-	{"setObject",         (PyCFunction) KX_ParentActuator::sPySetObject, METH_O, (PY_METHODCHAR)SetObject_doc},
-	{"getObject",         (PyCFunction) KX_ParentActuator::sPyGetObject, METH_VARARGS, (PY_METHODCHAR)GetObject_doc},
+	// Deprecated ----->
+	{"setObject", (PyCFunction) KX_ParentActuator::sPySetObject, METH_O, (PY_METHODCHAR)SetObject_doc},
+	{"getObject", (PyCFunction) KX_ParentActuator::sPyGetObject, METH_VARARGS, (PY_METHODCHAR)GetObject_doc},
+	// <-----
 	{NULL,NULL} //Sentinel
 };
 
 PyAttributeDef KX_ParentActuator::Attributes[] = {
+	KX_PYATTRIBUTE_RW_FUNCTION("object", KX_ParentActuator, pyattr_get_object, pyattr_set_object),
 	{ NULL }	//Sentinel
 };
 
-PyObject* KX_ParentActuator::_getattr(const char *attr) {	
-	
-	if (!strcmp(attr, "object")) {
-		if (!m_ob)	Py_RETURN_NONE;
-		else		return m_ob->AddRef();
-	}
-	
-	_getattr_up(SCA_IActuator);
+PyObject* KX_ParentActuator::pyattr_get_object(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef)
+{
+	KX_ParentActuator* actuator = static_cast<KX_ParentActuator*>(self);
+	if (!actuator->m_ob)	
+		Py_RETURN_NONE;
+	else
+		return actuator->m_ob->AddRef();
 }
 
-int KX_ParentActuator::_setattr(const char *attr, PyObject* value) {
-	
-	if (!strcmp(attr, "object")) {
-		KX_GameObject *gameobj;
+int KX_ParentActuator::pyattr_set_object(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef, PyObject *value)
+{
+	KX_ParentActuator* actuator = static_cast<KX_ParentActuator*>(self);
+	KX_GameObject *gameobj;
 		
-		if (!ConvertPythonToGameObject(value, &gameobj, true))
-			return 1; // ConvertPythonToGameObject sets the error
+	if (!ConvertPythonToGameObject(value, &gameobj, true))
+		return 1; // ConvertPythonToGameObject sets the error
 		
-		if (m_ob != NULL)
-			m_ob->UnregisterActuator(this);	
+	if (actuator->m_ob != NULL)
+		actuator->m_ob->UnregisterActuator(actuator);	
 
-		m_ob = (SCA_IObject*)gameobj;
+	actuator->m_ob = (SCA_IObject*) gameobj;
 		
-		if (m_ob)
-			m_ob->RegisterActuator(this);
+	if (actuator->m_ob)
+		actuator->m_ob->RegisterActuator(actuator);
 		
-		return 0;
-	}
+	return 0;
+}
+
+
+PyObject* KX_ParentActuator::py_getattro(PyObject *attr) {	
+	
+	PyObject* object = py_getattro_self(Attributes, this, attr);
+	if (object != NULL)
+		return object;
+	py_getattro_up(SCA_IActuator);
+}
+
+int KX_ParentActuator::py_setattro(PyObject *attr, PyObject* value) {
 	
-	return SCA_IActuator::_setattr(attr, value);
+	int ret = py_setattro_self(Attributes, this, attr, value);
+	if (ret >= 0)
+		return ret;
+	return SCA_IActuator::py_setattro(attr, value);
 }
 
+/* Deprecated -----> */
 /* 1. setObject                                                            */
 const char KX_ParentActuator::SetObject_doc[] = 
 "setObject(object)\n"
@@ -255,5 +271,6 @@ PyObject* KX_ParentActuator::PyGetObject(PyObject* self, PyObject* args)
 	else
 		return m_ob->AddRef();
 }
+/* <----- */
 
 /* eof */
diff --git a/source/gameengine/Ketsji/KX_ParentActuator.h b/source/gameengine/Ketsji/KX_ParentActuator.h
index c974001c0d0338d12646e67d89c3307bbeea79e1..f9f0b73b876d76ddab744bfd41dc68932138b339 100644
--- a/source/gameengine/Ketsji/KX_ParentActuator.h
+++ b/source/gameengine/Ketsji/KX_ParentActuator.h
@@ -2,7 +2,7 @@
  * Set or remove an objects parent
  *
  *
- * $Id: KX_ParentActuator.h 3271 2004-10-16 11:41:50Z kester $
+ * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
@@ -76,13 +76,17 @@ class KX_ParentActuator : public SCA_IActuator
 	/* Python interface ---------------------------------------------------- */
 	/* --------------------------------------------------------------------- */
 
-	virtual PyObject* _getattr(const char *attr);
-	virtual int _setattr(const char *attr, PyObject* value);
+	virtual PyObject* py_getattro(PyObject *attr);
+	virtual int py_setattro(PyObject *attr, PyObject* value);
 
-	/* 1. setObject                                                            */
+	/* These are used to get and set m_ob */
+	static PyObject* pyattr_get_object(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef);
+	static int pyattr_set_object(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef, PyObject *value);
+
+	// Deprecated ----->
 	KX_PYMETHOD_DOC_O(KX_ParentActuator,SetObject);
-	/* 2. getObject                                                            */
 	KX_PYMETHOD_DOC_VARARGS(KX_ParentActuator,GetObject);
+	// <-----
 	
 }; /* end of class KX_ParentActuator : public SCA_PropertyActuator */
 
diff --git a/source/gameengine/Ketsji/KX_PhysicsObjectWrapper.cpp b/source/gameengine/Ketsji/KX_PhysicsObjectWrapper.cpp
index 246c63feb21dfc02dc7ef3b9e20150b4608ad095..3bef85e7f93fbe3a3aff6ddfae577938aa50d48d 100644
--- a/source/gameengine/Ketsji/KX_PhysicsObjectWrapper.cpp
+++ b/source/gameengine/Ketsji/KX_PhysicsObjectWrapper.cpp
@@ -115,26 +115,28 @@ PyObject*	KX_PhysicsObjectWrapper::PySetActive(PyObject* self,
 }
 
 
-
+PyAttributeDef KX_PhysicsObjectWrapper::Attributes[] = {
+	{ NULL }	//Sentinel
+};
 
 //python specific stuff
 PyTypeObject KX_PhysicsObjectWrapper::Type = {
-	PyObject_HEAD_INIT(&PyType_Type)
+	PyObject_HEAD_INIT(NULL)
 		0,
 		"KX_PhysicsObjectWrapper",
 		sizeof(KX_PhysicsObjectWrapper),
 		0,
 		PyDestructor,
 		0,
-		__getattr,
-		__setattr,
-		0, //&MyPyCompare,
-		__repr,
-		0, //&cvalue_as_number,
 		0,
 		0,
 		0,
-		0
+		py_base_repr,
+		0,0,0,0,0,0,
+		py_base_getattro,
+		py_base_setattro,
+		0,0,0,0,0,0,0,0,0,
+		Methods
 };
 
 PyParentObject KX_PhysicsObjectWrapper::Parents[] = {
@@ -142,13 +144,13 @@ PyParentObject KX_PhysicsObjectWrapper::Parents[] = {
 	NULL
 };
 
-PyObject*	KX_PhysicsObjectWrapper::_getattr(const char *attr)
+PyObject*	KX_PhysicsObjectWrapper::py_getattro(PyObject *attr)
 {
-	_getattr_up(PyObjectPlus);
+	py_getattro_up(PyObjectPlus);
 }
 
 
-int	KX_PhysicsObjectWrapper::_setattr(const char *attr,PyObject *pyobj)
+int	KX_PhysicsObjectWrapper::py_setattro(PyObject *attr,PyObject *pyobj)
 {
 	int result = 1;
 
@@ -161,7 +163,7 @@ int	KX_PhysicsObjectWrapper::_setattr(const char *attr,PyObject *pyobj)
 		result = 0;
 	}
 	if (result)
-		result = PyObjectPlus::_setattr(attr,pyobj);
+		result = PyObjectPlus::py_setattro(attr,pyobj);
 		
 	return result;
 };
diff --git a/source/gameengine/Ketsji/KX_PhysicsObjectWrapper.h b/source/gameengine/Ketsji/KX_PhysicsObjectWrapper.h
index 9556069889623da70b081db0204c1e99a6af899b..6dc10f030f09bdb4913dceb08bcc7beffa03715c 100644
--- a/source/gameengine/Ketsji/KX_PhysicsObjectWrapper.h
+++ b/source/gameengine/Ketsji/KX_PhysicsObjectWrapper.h
@@ -36,8 +36,8 @@ class	KX_PhysicsObjectWrapper : public PyObjectPlus
 {
 	Py_Header;
 
-	virtual PyObject*		_getattr(const char *attr);
-	virtual int 			_setattr(const char *attr, PyObject *value);
+	virtual PyObject*		py_getattro(PyObject *attr);
+	virtual int 			py_setattro(PyObject *attr, PyObject *value);
 public:
 	KX_PhysicsObjectWrapper(class PHY_IPhysicsController* ctrl,class PHY_IPhysicsEnvironment* physenv,PyTypeObject *T = &Type);
 	virtual ~KX_PhysicsObjectWrapper();
diff --git a/source/gameengine/Ketsji/KX_PolyProxy.cpp b/source/gameengine/Ketsji/KX_PolyProxy.cpp
index b4bdd77fb6677e8afbf6d19b45075c35fb4feece..6f74c3ed3f901782cfed79c00380bf8fa788e5e3 100644
--- a/source/gameengine/Ketsji/KX_PolyProxy.cpp
+++ b/source/gameengine/Ketsji/KX_PolyProxy.cpp
@@ -39,22 +39,22 @@
 #include "KX_PyMath.h"
 
 PyTypeObject KX_PolyProxy::Type = {
-	PyObject_HEAD_INIT(&PyType_Type)
+	PyObject_HEAD_INIT(NULL)
 	0,
 	"KX_PolyProxy",
 	sizeof(KX_PolyProxy),
 	0,
 	PyDestructor,
 	0,
-	__getattr,
-	__setattr,
-	0, //&MyPyCompare,
-	__repr,
-	0, //&cvalue_as_number,
 	0,
 	0,
 	0,
-	0
+	py_base_repr,
+	0,0,0,0,0,0,
+	py_base_getattro,
+	py_base_setattro,
+	0,0,0,0,0,0,0,0,0,
+	Methods
 };
 
 PyParentObject KX_PolyProxy::Parents[] = {
@@ -81,17 +81,18 @@ PyAttributeDef KX_PolyProxy::Attributes[] = {
 	{ NULL }	//Sentinel
 };
 
-PyObject* KX_PolyProxy::_getattr(const char *attr)
+PyObject* KX_PolyProxy::py_getattro(PyObject *attr)
 {
-	if (!strcmp(attr, "matname"))
+	char *attr_str= PyString_AsString(attr);
+	if (!strcmp(attr_str, "matname"))
 	{
 		return PyString_FromString(m_polygon->GetMaterial()->GetPolyMaterial()->GetMaterialName());
 	}
-	if (!strcmp(attr, "texture"))
+	if (!strcmp(attr_str, "texture"))
 	{
 		return PyString_FromString(m_polygon->GetMaterial()->GetPolyMaterial()->GetTextureName());
 	}
-	if (!strcmp(attr, "material"))
+	if (!strcmp(attr_str, "material"))
 	{
 		RAS_IPolyMaterial *polymat = m_polygon->GetMaterial()->GetPolyMaterial();
 		if(polymat->GetFlag() & RAS_BLENDERMAT)
@@ -107,7 +108,7 @@ PyObject* KX_PolyProxy::_getattr(const char *attr)
 			return mat;
 		}
 	}
-	if (!strcmp(attr, "matid"))
+	if (!strcmp(attr_str, "matid"))
 	{
 		// we'll have to scan through the material bucket of the mes and compare with 
 		// the one of the polygon
@@ -122,31 +123,31 @@ PyObject* KX_PolyProxy::_getattr(const char *attr)
 		}
 		return PyInt_FromLong(matid);
 	}
-	if (!strcmp(attr, "v1"))
+	if (!strcmp(attr_str, "v1"))
 	{
 		return PyInt_FromLong(m_polygon->GetVertexOffset(0));
 	}
-	if (!strcmp(attr, "v2"))
+	if (!strcmp(attr_str, "v2"))
 	{
 		return PyInt_FromLong(m_polygon->GetVertexOffset(1));
 	}
-	if (!strcmp(attr, "v3"))
+	if (!strcmp(attr_str, "v3"))
 	{
 		return PyInt_FromLong(m_polygon->GetVertexOffset(2));
 	}
-	if (!strcmp(attr, "v4"))
+	if (!strcmp(attr_str, "v4"))
 	{
 		return PyInt_FromLong(((m_polygon->VertexCount()>3)?m_polygon->GetVertexOffset(3):0));
 	}
-	if (!strcmp(attr, "visible"))
+	if (!strcmp(attr_str, "visible"))
 	{
 		return PyInt_FromLong(m_polygon->IsVisible());
 	}
-	if (!strcmp(attr, "collide"))
+	if (!strcmp(attr_str, "collide"))
 	{
 		return PyInt_FromLong(m_polygon->IsCollider());
 	}
-	_getattr_up(SCA_IObject);
+	py_getattro_up(SCA_IObject);
 }
 
 KX_PolyProxy::KX_PolyProxy(const RAS_MeshObject*mesh, RAS_Polygon* polygon)
diff --git a/source/gameengine/Ketsji/KX_PolyProxy.h b/source/gameengine/Ketsji/KX_PolyProxy.h
index 9b548f9490dfaccd4d743062ccadc4640bcd1d6e..a549d9841cc7761e39c9efdbd7f433abfcae4cc6 100644
--- a/source/gameengine/Ketsji/KX_PolyProxy.h
+++ b/source/gameengine/Ketsji/KX_PolyProxy.h
@@ -53,7 +53,7 @@ public:
 
 
 // stuff for python integration
-	virtual PyObject* _getattr(const char *attr);
+	virtual PyObject* py_getattro(PyObject *attr);
 
 	KX_PYMETHOD_DOC_NOARGS(KX_PolyProxy,getMaterialIndex)
 	KX_PYMETHOD_DOC_NOARGS(KX_PolyProxy,getNumVertex)
diff --git a/source/gameengine/Ketsji/KX_PolygonMaterial.cpp b/source/gameengine/Ketsji/KX_PolygonMaterial.cpp
index bbaf697b1684cf48b1263e95186304de702a353d..6b9a6201d5c668b1d38e7ae716642919c814a85f 100644
--- a/source/gameengine/Ketsji/KX_PolygonMaterial.cpp
+++ b/source/gameengine/Ketsji/KX_PolygonMaterial.cpp
@@ -185,37 +185,42 @@ PyAttributeDef KX_PolygonMaterial::Attributes[] = {
 };
 
 PyTypeObject KX_PolygonMaterial::Type = {
-	PyObject_HEAD_INIT(&PyType_Type)
+	PyObject_HEAD_INIT(NULL)
 		0,
 		"KX_PolygonMaterial",
 		sizeof(KX_PolygonMaterial),
 		0,
 		PyDestructor,
 		0,
-		__getattr,
-		__setattr,
-		0, //&MyPyCompare,
-		__repr,
-		0 //&cvalue_as_number,
+		0,
+		0,
+		0,
+		py_base_repr,
+		0,0,0,0,0,0,
+		py_base_getattro,
+		py_base_setattro,
+		0,0,0,0,0,0,0,0,0,
+		Methods
 };
 
 PyParentObject KX_PolygonMaterial::Parents[] = {
-	&PyObjectPlus::Type,
 	&KX_PolygonMaterial::Type,
+	&PyObjectPlus::Type,
 	NULL
 };
 
-PyObject* KX_PolygonMaterial::_getattr(const char *attr)
+PyObject* KX_PolygonMaterial::py_getattro(PyObject *attr)
 {
-	if (!strcmp(attr, "texture"))
+	char *attr_str= PyString_AsString(attr);
+	if (!strcmp(attr_str, "texture"))
 		return PyString_FromString(m_texturename.ReadPtr());
-	if (!strcmp(attr, "material"))
+	if (!strcmp(attr_str, "material"))
 		return PyString_FromString(m_materialname.ReadPtr());
 		
-	if (!strcmp(attr, "tface"))
+	if (!strcmp(attr_str, "tface"))
 		return PyCObject_FromVoidPtr(m_tface, NULL);
 		
-	if (!strcmp(attr, "gl_texture"))
+	if (!strcmp(attr_str, "gl_texture"))
 	{
 		Image *ima = m_tface->tpage;
 		int bind = 0;
@@ -225,49 +230,50 @@ PyObject* KX_PolygonMaterial::_getattr(const char *attr)
 		return PyInt_FromLong(bind);
 	}
 	
-	if (!strcmp(attr, "tile"))
+	if (!strcmp(attr_str, "tile"))
 		return PyInt_FromLong(m_tile);
-	if (!strcmp(attr, "tilexrep"))
+	if (!strcmp(attr_str, "tilexrep"))
 		return PyInt_FromLong(m_tilexrep);
-	if (!strcmp(attr, "tileyrep"))
+	if (!strcmp(attr_str, "tileyrep"))
 		return PyInt_FromLong(m_tileyrep);
 	
-	if (!strcmp(attr, "drawingmode"))
+	if (!strcmp(attr_str, "drawingmode"))
 		return PyInt_FromLong(m_drawingmode);
-	if (!strcmp(attr, "transparent"))
+	if (!strcmp(attr_str, "transparent"))
 		return PyInt_FromLong(m_alpha);
-	if (!strcmp(attr, "zsort"))
+	if (!strcmp(attr_str, "zsort"))
 		return PyInt_FromLong(m_zsort);
-	if (!strcmp(attr, "lightlayer"))
+	if (!strcmp(attr_str, "lightlayer"))
 		return PyInt_FromLong(m_lightlayer);
-	if (!strcmp(attr, "triangle"))
+	if (!strcmp(attr_str, "triangle"))
 		// deprecated, triangle/quads shouldn't have been a material property
 		return 0;
 		
-	if (!strcmp(attr, "diffuse"))
+	if (!strcmp(attr_str, "diffuse"))
 		return PyObjectFrom(m_diffuse);
-	if (!strcmp(attr, "shininess"))
+	if (!strcmp(attr_str, "shininess"))
 		return PyFloat_FromDouble(m_shininess);
-	if (!strcmp(attr, "specular"))
+	if (!strcmp(attr_str, "specular"))
 		return PyObjectFrom(m_specular);
-	if (!strcmp(attr, "specularity"))
+	if (!strcmp(attr_str, "specularity"))
 		return PyFloat_FromDouble(m_specularity);
 	
-	_getattr_up(PyObjectPlus);
+	py_getattro_up(PyObjectPlus);
 }
 
-int KX_PolygonMaterial::_setattr(const char *attr, PyObject *pyvalue)
+int KX_PolygonMaterial::py_setattro(PyObject *attr, PyObject *pyvalue)
 {
+	char *attr_str= PyString_AsString(attr);
 	if (PyFloat_Check(pyvalue))
 	{
 		float value = PyFloat_AsDouble(pyvalue);
-		if (!strcmp(attr, "shininess"))
+		if (!strcmp(attr_str, "shininess"))
 		{
 			m_shininess = value;
 			return 0;
 		}
 		
-		if (!strcmp(attr, "specularity"))
+		if (!strcmp(attr_str, "specularity"))
 		{
 			m_specularity = value;
 			return 0;
@@ -277,50 +283,50 @@ int KX_PolygonMaterial::_setattr(const char *attr, PyObject *pyvalue)
 	if (PyInt_Check(pyvalue))
 	{
 		int value = PyInt_AsLong(pyvalue);
-		if (!strcmp(attr, "tile"))
+		if (!strcmp(attr_str, "tile"))
 		{
 			m_tile = value;
 			return 0;
 		}
 		
-		if (!strcmp(attr, "tilexrep"))
+		if (!strcmp(attr_str, "tilexrep"))
 		{
 			m_tilexrep = value;
 			return 0;
 		}
 		
-		if (!strcmp(attr, "tileyrep"))
+		if (!strcmp(attr_str, "tileyrep"))
 		{
 			m_tileyrep = value;
 			return 0;
 		}
 		
-		if (!strcmp(attr, "drawingmode"))
+		if (!strcmp(attr_str, "drawingmode"))
 		{
 			m_drawingmode = value;
 			return 0;
 		}
 		
-		if (!strcmp(attr, "transparent"))
+		if (!strcmp(attr_str, "transparent"))
 		{
 			m_alpha = value;
 			return 0;
 		}
 		
-		if (!strcmp(attr, "zsort"))
+		if (!strcmp(attr_str, "zsort"))
 		{
 			m_zsort = value;
 			return 0;
 		}
 		
-		if (!strcmp(attr, "lightlayer"))
+		if (!strcmp(attr_str, "lightlayer"))
 		{
 			m_lightlayer = value;
 			return 0;
 		}
 		
 		// This probably won't work...
-		if (!strcmp(attr, "triangle"))
+		if (!strcmp(attr_str, "triangle"))
 		{
 			// deprecated, triangle/quads shouldn't have been a material property
 			return 0;
@@ -334,13 +340,13 @@ int KX_PolygonMaterial::_setattr(const char *attr, PyObject *pyvalue)
 			MT_Vector3 value;
 			if (PyVecTo(pyvalue, value))
 			{
-				if (!strcmp(attr, "diffuse"))
+				if (!strcmp(attr_str, "diffuse"))
 				{
 					m_diffuse = value;
 					return 0;
 				}
 				
-				if (!strcmp(attr, "specular"))
+				if (!strcmp(attr_str, "specular"))
 				{
 					m_specular = value;
 					return 0;
@@ -349,7 +355,7 @@ int KX_PolygonMaterial::_setattr(const char *attr, PyObject *pyvalue)
 		}
 	}
 
-	return PyObjectPlus::_setattr(attr, pyvalue);
+	return PyObjectPlus::py_setattro(attr, pyvalue);
 }
 
 KX_PYMETHODDEF_DOC(KX_PolygonMaterial, setCustomMaterial, "setCustomMaterial(material)")
diff --git a/source/gameengine/Ketsji/KX_PolygonMaterial.h b/source/gameengine/Ketsji/KX_PolygonMaterial.h
index a3ef4ca51efb5668d951af333ab6b1bd3437afd7..f3eb1979f34b57c5a05502b35747db878776c138 100644
--- a/source/gameengine/Ketsji/KX_PolygonMaterial.h
+++ b/source/gameengine/Ketsji/KX_PolygonMaterial.h
@@ -115,8 +115,8 @@ public:
 	KX_PYMETHOD_DOC(KX_PolygonMaterial, setCustomMaterial);
 	KX_PYMETHOD_DOC(KX_PolygonMaterial, loadProgram);
 
-	virtual PyObject* _getattr(const char *attr);
-	virtual int       _setattr(const char *attr, PyObject *pyvalue);
+	virtual PyObject* py_getattro(PyObject *attr);
+	virtual int       py_setattro(PyObject *attr, PyObject *pyvalue);
 };
 
 #endif // __KX_POLYGONMATERIAL_H__
diff --git a/source/gameengine/Ketsji/KX_PythonInit.cpp b/source/gameengine/Ketsji/KX_PythonInit.cpp
index bc2111571ac82a9006728ce148df1c261128a803..f065eb29c443d5f3df21577b09c034f4c38d2859 100644
--- a/source/gameengine/Ketsji/KX_PythonInit.cpp
+++ b/source/gameengine/Ketsji/KX_PythonInit.cpp
@@ -48,6 +48,8 @@
 
 #include "KX_KetsjiEngine.h"
 #include "KX_RadarSensor.h"
+#include "KX_RaySensor.h"
+#include "KX_SCA_DynamicActuator.h"
 
 #include "SCA_IInputDevice.h"
 #include "SCA_PropertySensor.h"
@@ -69,7 +71,9 @@
 
 #include "KX_PyMath.h"
 
-#include "PyObjectPlus.h" 
+#include "PyObjectPlus.h"
+
+#include "KX_PythonInitTypes.h" 
 
 extern "C" {
 	#include "Mathutils.h" // Blender.Mathutils module copied here so the blenderlayer can use.
@@ -1070,6 +1074,21 @@ PyObject* initGameLogic(KX_KetsjiEngine *engine, KX_Scene* scene) // quick hack
 	KX_MACRO_addTypesToDict(d, KX_RADAR_AXIS_NEG_Y, KX_RadarSensor::KX_RADAR_AXIS_NEG_X);
 	KX_MACRO_addTypesToDict(d, KX_RADAR_AXIS_NEG_Z, KX_RadarSensor::KX_RADAR_AXIS_NEG_Z);
 
+	/* Ray Sensor */
+	KX_MACRO_addTypesToDict(d, KX_RAY_AXIS_POS_X, KX_RaySensor::KX_RAY_AXIS_POS_X);
+	KX_MACRO_addTypesToDict(d, KX_RAY_AXIS_POS_Y, KX_RaySensor::KX_RAY_AXIS_POS_Y);
+	KX_MACRO_addTypesToDict(d, KX_RAY_AXIS_POS_Z, KX_RaySensor::KX_RAY_AXIS_POS_Z);
+	KX_MACRO_addTypesToDict(d, KX_RAY_AXIS_NEG_X, KX_RaySensor::KX_RAY_AXIS_NEG_Y);
+	KX_MACRO_addTypesToDict(d, KX_RAY_AXIS_NEG_Y, KX_RaySensor::KX_RAY_AXIS_NEG_X);
+	KX_MACRO_addTypesToDict(d, KX_RAY_AXIS_NEG_Z, KX_RaySensor::KX_RAY_AXIS_NEG_Z);
+
+	/* Dynamic actuator */
+	KX_MACRO_addTypesToDict(d, KX_DYN_RESTORE_DYNAMICS, KX_SCA_DynamicActuator::KX_DYN_RESTORE_DYNAMICS);
+	KX_MACRO_addTypesToDict(d, KX_DYN_DISABLE_DYNAMICS, KX_SCA_DynamicActuator::KX_DYN_DISABLE_DYNAMICS);
+	KX_MACRO_addTypesToDict(d, KX_DYN_ENABLE_RIGID_BODY, KX_SCA_DynamicActuator::KX_DYN_ENABLE_RIGID_BODY);
+	KX_MACRO_addTypesToDict(d, KX_DYN_DISABLE_RIGID_BODY, KX_SCA_DynamicActuator::KX_DYN_DISABLE_RIGID_BODY);
+	KX_MACRO_addTypesToDict(d, KX_DYN_SET_MASS, KX_SCA_DynamicActuator::KX_DYN_SET_MASS);
+
 	// Check for errors
 	if (PyErr_Occurred())
     {
@@ -1240,6 +1259,7 @@ PyObject* initGamePlayerPythonScripting(const STR_String& progname, TPythonSecur
 	//importBlenderModules()
 	
 	setSandbox(level);
+	initPyTypes();
 
 	PyObject* moduleobj = PyImport_AddModule("__main__");
 	return PyModule_GetDict(moduleobj);
@@ -1261,6 +1281,7 @@ PyObject* initGamePythonScripting(const STR_String& progname, TPythonSecurityLev
 	Py_FrozenFlag=1;
 
 	setSandbox(level);
+	initPyTypes();
 
 	PyObject* moduleobj = PyImport_AddModule("__main__");
 	return PyModule_GetDict(moduleobj);
diff --git a/source/gameengine/Ketsji/KX_PythonInitTypes.cpp b/source/gameengine/Ketsji/KX_PythonInitTypes.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..e2ff4ced12256f5e9c54c922b65395964d1b8329
--- /dev/null
+++ b/source/gameengine/Ketsji/KX_PythonInitTypes.cpp
@@ -0,0 +1,204 @@
+/**
+ * $Id: PyObjectPlus.h 19511 2009-04-03 02:16:56Z campbellbarton $
+ *
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ *
+ * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
+ * All rights reserved.
+ *
+ * The Original Code is: all of this file.
+ *
+ * Contributor(s): Campbell Barton
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+
+
+#ifndef _adr_py_init_types_h_				// only process once,
+#define _adr_py_init_types_h_				// even if multiply included
+
+/* Only for Class::Parents */
+#include "BL_BlenderShader.h"
+#include "BL_ShapeActionActuator.h"
+#include "KX_BlenderMaterial.h"
+#include "KX_CDActuator.h"
+#include "KX_CameraActuator.h"
+#include "KX_ConstraintActuator.h"
+#include "KX_ConstraintWrapper.h"
+#include "KX_GameActuator.h"
+#include "KX_Light.h"
+#include "KX_MeshProxy.h"
+#include "KX_MouseFocusSensor.h"
+#include "KX_NetworkMessageActuator.h"
+#include "KX_NetworkMessageSensor.h"
+#include "KX_ObjectActuator.h"
+#include "KX_ParentActuator.h"
+#include "KX_PhysicsObjectWrapper.h"
+#include "KX_PolyProxy.h"
+#include "KX_PolygonMaterial.h"
+#include "KX_SCA_AddObjectActuator.h"
+#include "KX_SCA_EndObjectActuator.h"
+#include "KX_SCA_ReplaceMeshActuator.h"
+#include "KX_SceneActuator.h"
+#include "KX_StateActuator.h"
+#include "KX_TrackToActuator.h"
+#include "KX_VehicleWrapper.h"
+#include "KX_VertexProxy.h"
+#include "SCA_2DFilterActuator.h"
+#include "SCA_ANDController.h"
+#include "SCA_ActuatorSensor.h"
+#include "SCA_AlwaysSensor.h"
+#include "SCA_DelaySensor.h"
+#include "SCA_JoystickSensor.h"
+#include "SCA_KeyboardSensor.h"
+#include "SCA_MouseSensor.h"
+#include "SCA_NANDController.h"
+#include "SCA_NORController.h"
+#include "SCA_ORController.h"
+#include "SCA_RandomSensor.h"
+#include "SCA_XNORController.h"
+#include "SCA_XORController.h"
+#include "KX_IpoActuator.h"
+#include "KX_NearSensor.h"
+#include "KX_RadarSensor.h"
+#include "KX_RaySensor.h"
+#include "KX_SCA_DynamicActuator.h"
+#include "KX_SoundActuator.h"
+#include "KX_TouchSensor.h"
+#include "SCA_PropertySensor.h"
+#include "SCA_PythonController.h"
+#include "SCA_RandomActuator.h"
+
+
+void initPyObjectPlusType(PyTypeObject **parents)
+{
+	int i;
+
+	for (i=0; parents[i]; i++) {
+		if(PyType_Ready(parents[i]) < 0) {
+			/* This is very very unlikely */
+			printf("Error, pytype could not initialize, Blender may crash \"%s\"\n", parents[i]->tp_name);
+			return;
+		}
+
+#if 0
+		PyObject_Print((PyObject *)parents[i], stderr, 0);
+		fprintf(stderr, "\n");
+		PyObject_Print(parents[i]->tp_dict, stderr, 0);
+		fprintf(stderr, "\n\n");
+#endif
+
+	}
+
+	 PyObject *dict= NULL;
+
+	 while(i) {
+		 i--;
+
+		 if (dict) {
+			PyDict_Update(parents[i]->tp_dict, dict);
+		 }
+		 dict= parents[i]->tp_dict;
+
+#if 1
+		PyObject_Print((PyObject *)parents[i], stderr, 0);
+		fprintf(stderr, "\n");
+		PyObject_Print(parents[i]->tp_dict, stderr, 0);
+		fprintf(stderr, "\n\n");
+#endif
+
+	}
+}
+
+
+
+
+void initPyTypes(void)
+{
+	
+/*
+	initPyObjectPlusType(BL_ActionActuator::Parents);
+	.....
+*/
+
+	/* For now just do PyType_Ready */
+
+	PyType_Ready(&BL_ActionActuator::Type);
+	PyType_Ready(&BL_Shader::Type);
+	PyType_Ready(&BL_ShapeActionActuator::Type);
+	PyType_Ready(&CListValue::Type);
+	PyType_Ready(&CValue::Type);
+	PyType_Ready(&KX_BlenderMaterial::Type);
+	PyType_Ready(&KX_CDActuator::Type);
+	PyType_Ready(&KX_Camera::Type);
+	PyType_Ready(&KX_CameraActuator::Type);
+	PyType_Ready(&KX_ConstraintActuator::Type);
+	PyType_Ready(&KX_ConstraintWrapper::Type);
+	PyType_Ready(&KX_GameActuator::Type);
+	PyType_Ready(&KX_GameObject::Type);
+	PyType_Ready(&KX_IpoActuator::Type);
+	PyType_Ready(&KX_LightObject::Type);
+	PyType_Ready(&KX_MeshProxy::Type);
+	PyType_Ready(&KX_MouseFocusSensor::Type);
+	PyType_Ready(&KX_NearSensor::Type);
+	PyType_Ready(&KX_NetworkMessageActuator::Type);
+	PyType_Ready(&KX_NetworkMessageSensor::Type);
+	PyType_Ready(&KX_ObjectActuator::Type);
+	PyType_Ready(&KX_ParentActuator::Type);
+	PyType_Ready(&KX_PhysicsObjectWrapper::Type);
+	PyType_Ready(&KX_PolyProxy::Type);
+	PyType_Ready(&KX_PolygonMaterial::Type);
+	PyType_Ready(&KX_RadarSensor::Type);
+	PyType_Ready(&KX_RaySensor::Type);
+	PyType_Ready(&KX_SCA_AddObjectActuator::Type);
+	PyType_Ready(&KX_SCA_DynamicActuator::Type);
+	PyType_Ready(&KX_SCA_EndObjectActuator::Type);
+	PyType_Ready(&KX_SCA_ReplaceMeshActuator::Type);
+	PyType_Ready(&KX_Scene::Type);
+	PyType_Ready(&KX_SceneActuator::Type);
+	PyType_Ready(&KX_SoundActuator::Type);
+	PyType_Ready(&KX_StateActuator::Type);
+	PyType_Ready(&KX_TouchSensor::Type);
+	PyType_Ready(&KX_TrackToActuator::Type);
+	PyType_Ready(&KX_VehicleWrapper::Type);
+	PyType_Ready(&KX_VertexProxy::Type);
+	PyType_Ready(&PyObjectPlus::Type);
+	PyType_Ready(&SCA_2DFilterActuator::Type);
+	PyType_Ready(&SCA_ANDController::Type);
+	PyType_Ready(&SCA_ActuatorSensor::Type);
+	PyType_Ready(&SCA_AlwaysSensor::Type);
+	PyType_Ready(&SCA_DelaySensor::Type);
+	PyType_Ready(&SCA_ILogicBrick::Type);
+	PyType_Ready(&SCA_IObject::Type);
+	PyType_Ready(&SCA_ISensor::Type);
+	PyType_Ready(&SCA_JoystickSensor::Type);
+	PyType_Ready(&SCA_KeyboardSensor::Type);
+	PyType_Ready(&SCA_MouseSensor::Type);
+	PyType_Ready(&SCA_NANDController::Type);
+	PyType_Ready(&SCA_NORController::Type);
+	PyType_Ready(&SCA_ORController::Type);
+	PyType_Ready(&SCA_PropertyActuator::Type);
+	PyType_Ready(&SCA_PropertySensor::Type);
+	PyType_Ready(&SCA_PythonController::Type);
+	PyType_Ready(&SCA_RandomActuator::Type);
+	PyType_Ready(&SCA_RandomSensor::Type);
+	PyType_Ready(&SCA_XNORController::Type);
+	PyType_Ready(&SCA_XORController::Type);
+}
+
+#endif
\ No newline at end of file
diff --git a/source/gameengine/Ketsji/KX_PythonInitTypes.h b/source/gameengine/Ketsji/KX_PythonInitTypes.h
new file mode 100644
index 0000000000000000000000000000000000000000..b30f0334b6e30c383dd3f591d7b7ec38b66c2a29
--- /dev/null
+++ b/source/gameengine/Ketsji/KX_PythonInitTypes.h
@@ -0,0 +1,35 @@
+/**
+ * $Id: PyObjectPlus.h 19511 2009-04-03 02:16:56Z campbellbarton $
+ *
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ *
+ * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
+ * All rights reserved.
+ *
+ * The Original Code is: all of this file.
+ *
+ * Contributor(s): Campbell Barton
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#ifndef _adr_py_init_types_h_				// only process once,
+#define _adr_py_init_types_h_				// even if multiply included
+
+void initPyTypes(void);
+
+#endif
diff --git a/source/gameengine/Ketsji/KX_RadarSensor.cpp b/source/gameengine/Ketsji/KX_RadarSensor.cpp
index fa8998cd81df97c704a0e8c4dd55f4b7ae878ca2..77cde79b54db4c68a2f5916031ef1f3c1bd54065 100644
--- a/source/gameengine/Ketsji/KX_RadarSensor.cpp
+++ b/source/gameengine/Ketsji/KX_RadarSensor.cpp
@@ -250,22 +250,22 @@ PyObject* KX_RadarSensor::PyGetConeHeight(PyObject* self) {
 /* Python Integration Hooks                                                  */
 /* ------------------------------------------------------------------------- */
 PyTypeObject KX_RadarSensor::Type = {
-	PyObject_HEAD_INIT(&PyType_Type)
+	PyObject_HEAD_INIT(NULL)
 	0,
 	"KX_RadarSensor",
 	sizeof(KX_RadarSensor),
 	0,
 	PyDestructor,
 	0,
-	__getattr,
-	__setattr,
-	0, //&MyPyCompare,
-	__repr,
-	0, //&cvalue_as_number,
 	0,
 	0,
 	0,
-	0
+	py_base_repr,
+	0,0,0,0,0,0,
+	py_base_getattro,
+	py_base_setattro,
+	0,0,0,0,0,0,0,0,0,
+	Methods
 };
 
 PyParentObject KX_RadarSensor::Parents[] = {
@@ -298,20 +298,20 @@ PyAttributeDef KX_RadarSensor::Attributes[] = {
 	{NULL} //Sentinel
 };
 
-PyObject* KX_RadarSensor::_getattr(const char *attr)
+PyObject* KX_RadarSensor::py_getattro(PyObject *attr)
 {
-	PyObject* object = _getattr_self(Attributes, this, attr);
+	PyObject* object = py_getattro_self(Attributes, this, attr);
 	if (object != NULL)
 		return object;
 
-	_getattr_up(KX_NearSensor);
+	py_getattro_up(KX_NearSensor);
 }
 
-int KX_RadarSensor::_setattr(const char *attr, PyObject* value)
+int KX_RadarSensor::py_setattro(PyObject *attr, PyObject* value)
 {
-	int ret = _setattr_self(Attributes, this, attr, value);
+	int ret = py_setattro_self(Attributes, this, attr, value);
 	if (ret >= 0)
 		return ret;
 
-	return KX_NearSensor::_setattr(attr, value);
+	return KX_NearSensor::py_setattro(attr, value);
 }
diff --git a/source/gameengine/Ketsji/KX_RadarSensor.h b/source/gameengine/Ketsji/KX_RadarSensor.h
index 6dfe0c42f5de5985be38078e24337c34b245e2d4..c3a941696ce940a93cd639b76ab107a6820a889b 100644
--- a/source/gameengine/Ketsji/KX_RadarSensor.h
+++ b/source/gameengine/Ketsji/KX_RadarSensor.h
@@ -89,8 +89,8 @@ public:
 		KX_RADAR_AXIS_NEG_Z
 	};
 
-	virtual PyObject* _getattr(const char *attr);
-	virtual int _setattr(const char *attr, PyObject* value);
+	virtual PyObject* py_getattro(PyObject *attr);
+	virtual int py_setattro(PyObject *attr, PyObject* value);
 
 	//Deprecated ----->
 	KX_PYMETHOD_DOC_NOARGS(KX_RadarSensor,GetConeOrigin);
diff --git a/source/gameengine/Ketsji/KX_RaySensor.cpp b/source/gameengine/Ketsji/KX_RaySensor.cpp
index ce12b98314700d21cd2d05593779e50feb33d68f..cdcb5d74f303266050633d65499fbc62b5bbaa92 100644
--- a/source/gameengine/Ketsji/KX_RaySensor.cpp
+++ b/source/gameengine/Ketsji/KX_RaySensor.cpp
@@ -136,8 +136,13 @@ bool KX_RaySensor::RayHit(KX_ClientObjectInfo* client, KX_RayCast* result, void
 	{
 		m_rayHit = true;
 		m_hitObject = hitKXObj;
-		m_hitPosition = result->m_hitPoint;
-		m_hitNormal = result->m_hitNormal;
+		m_hitPosition[0] = result->m_hitPoint[0];
+		m_hitPosition[1] = result->m_hitPoint[1];
+		m_hitPosition[2] = result->m_hitPoint[2];
+
+		m_hitNormal[0] = result->m_hitNormal[0];
+		m_hitNormal[1] = result->m_hitNormal[1];
+		m_hitNormal[2] = result->m_hitNormal[2];
 			
 	}
 	// no multi-hit search yet
@@ -180,8 +185,13 @@ bool KX_RaySensor::Evaluate(CValue* event)
 	bool reset = m_reset && m_level;
 	m_rayHit = false; 
 	m_hitObject = NULL;
-	m_hitPosition.setValue(0,0,0);
-	m_hitNormal.setValue(1,0,0);
+	m_hitPosition[0] = 0;
+	m_hitPosition[1] = 0;
+	m_hitPosition[2] = 0;
+
+	m_hitNormal[0] = 1;
+	m_hitNormal[1] = 0;
+	m_hitNormal[2] = 0;
 	
 	KX_GameObject* obj = (KX_GameObject*)GetParent();
 	MT_Point3 frompoint = obj->NodeGetWorldPosition();
@@ -236,7 +246,9 @@ bool KX_RaySensor::Evaluate(CValue* event)
 		}
 	}
 	todir.normalize();
-	m_rayDirection = todir;
+	m_rayDirection[0] = todir[0];
+	m_rayDirection[1] = todir[1];
+	m_rayDirection[2] = todir[2];
 
 	MT_Point3 topoint = frompoint + (m_distance) * todir;
 	PHY_IPhysicsEnvironment* pe = m_scene->GetPhysicsEnvironment();
@@ -309,22 +321,23 @@ bool KX_RaySensor::Evaluate(CValue* event)
 
 /* Integration hooks ------------------------------------------------------- */
 PyTypeObject KX_RaySensor::Type = {
-	PyObject_HEAD_INIT(&PyType_Type)
+	PyObject_HEAD_INIT(NULL)
 	0,
 	"KX_RaySensor",
 	sizeof(KX_RaySensor),
 	0,
 	PyDestructor,
 	0,
-	__getattr,
-	__setattr,
-	0, //&MyPyCompare,
-	__repr,
-	0, //&cvalue_as_number,
 	0,
 	0,
 	0,
-	0
+	py_base_repr,
+	0,0,0,0,0,0,
+	py_base_getattro,
+	py_base_setattro,
+	0,0,0,0,0,0,0,0,0,
+	Methods
+
 };
 
 PyParentObject KX_RaySensor::Parents[] = {
@@ -336,22 +349,44 @@ PyParentObject KX_RaySensor::Parents[] = {
 };
 
 PyMethodDef KX_RaySensor::Methods[] = {
+	// Deprecated ----->
 	{"getHitObject",(PyCFunction) KX_RaySensor::sPyGetHitObject,METH_NOARGS, (PY_METHODCHAR)GetHitObject_doc},
 	{"getHitPosition",(PyCFunction) KX_RaySensor::sPyGetHitPosition,METH_NOARGS, (PY_METHODCHAR)GetHitPosition_doc},
 	{"getHitNormal",(PyCFunction) KX_RaySensor::sPyGetHitNormal,METH_NOARGS, (PY_METHODCHAR)GetHitNormal_doc},
 	{"getRayDirection",(PyCFunction) KX_RaySensor::sPyGetRayDirection,METH_NOARGS, (PY_METHODCHAR)GetRayDirection_doc},
+	// <-----
 	{NULL,NULL} //Sentinel
 };
 
 PyAttributeDef KX_RaySensor::Attributes[] = {
+	KX_PYATTRIBUTE_BOOL_RW("useMaterial", KX_RaySensor, m_bFindMaterial),
+	KX_PYATTRIBUTE_BOOL_RW("useXRay", KX_RaySensor, m_bXRay),
+	KX_PYATTRIBUTE_FLOAT_RW("range", 0, 10000, KX_RaySensor, m_distance),
+	KX_PYATTRIBUTE_STRING_RW("property", 0, 100, false, KX_RaySensor, m_propertyname),
+	KX_PYATTRIBUTE_INT_RW("axis", 0, 5, true, KX_RaySensor, m_axis),
+	KX_PYATTRIBUTE_FLOAT_ARRAY_RO("hitPosition", KX_RaySensor, m_hitPosition, 3),
+	KX_PYATTRIBUTE_FLOAT_ARRAY_RO("rayDirection", KX_RaySensor, m_rayDirection, 3),
+	KX_PYATTRIBUTE_FLOAT_ARRAY_RO("hitNormal", KX_RaySensor, m_hitNormal, 3),
+	KX_PYATTRIBUTE_RO_FUNCTION("hitObject", KX_RaySensor, pyattr_get_hitobject),
 	{ NULL }	//Sentinel
 };
 
+PyObject* KX_RaySensor::pyattr_get_hitobject(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
+{
+	KX_RaySensor* self = static_cast<KX_RaySensor*>(self_v);
+	if (self->m_hitObject)
+		return self->m_hitObject->AddRef();
+
+	Py_RETURN_NONE;
+}
+
+// Deprecated ----->
 const char KX_RaySensor::GetHitObject_doc[] = 
 "getHitObject()\n"
 "\tReturns the name of the object that was hit by this ray.\n";
 PyObject* KX_RaySensor::PyGetHitObject(PyObject* self)
 {
+	ShowDeprecationWarning("getHitObject()", "the hitObject property");
 	if (m_hitObject)
 	{
 		return m_hitObject->AddRef();
@@ -365,7 +400,15 @@ const char KX_RaySensor::GetHitPosition_doc[] =
 "\tReturns the position (in worldcoordinates) where the object was hit by this ray.\n";
 PyObject* KX_RaySensor::PyGetHitPosition(PyObject* self)
 {
-	return PyObjectFrom(m_hitPosition);
+	ShowDeprecationWarning("getHitPosition()", "the hitPosition property");
+
+	PyObject *retVal = PyList_New(3);
+
+	PyList_SetItem(retVal, 0, PyFloat_FromDouble(m_hitPosition[0]));
+	PyList_SetItem(retVal, 1, PyFloat_FromDouble(m_hitPosition[1]));
+	PyList_SetItem(retVal, 2, PyFloat_FromDouble(m_hitPosition[2]));
+
+	return retVal;
 }
 
 const char KX_RaySensor::GetRayDirection_doc[] = 
@@ -373,7 +416,15 @@ const char KX_RaySensor::GetRayDirection_doc[] =
 "\tReturns the direction from the ray (in worldcoordinates) .\n";
 PyObject* KX_RaySensor::PyGetRayDirection(PyObject* self)
 {
-	return PyObjectFrom(m_rayDirection);
+	ShowDeprecationWarning("getRayDirection()", "the rayDirection property");
+
+	PyObject *retVal = PyList_New(3);
+	
+	PyList_SetItem(retVal, 0, PyFloat_FromDouble(m_rayDirection[0]));
+	PyList_SetItem(retVal, 1, PyFloat_FromDouble(m_rayDirection[1]));
+	PyList_SetItem(retVal, 2, PyFloat_FromDouble(m_rayDirection[2]));
+
+	return retVal;
 }
 
 const char KX_RaySensor::GetHitNormal_doc[] = 
@@ -381,11 +432,31 @@ const char KX_RaySensor::GetHitNormal_doc[] =
 "\tReturns the normal (in worldcoordinates) of the object at the location where the object was hit by this ray.\n";
 PyObject* KX_RaySensor::PyGetHitNormal(PyObject* self)
 {
-	return PyObjectFrom(m_hitNormal);
+	ShowDeprecationWarning("getHitNormal()", "the hitNormal property");
+
+	PyObject *retVal = PyList_New(3);
+
+	PyList_SetItem(retVal, 0, PyFloat_FromDouble(m_hitNormal[0]));
+	PyList_SetItem(retVal, 1, PyFloat_FromDouble(m_hitNormal[1]));
+	PyList_SetItem(retVal, 2, PyFloat_FromDouble(m_hitNormal[2]));
+
+	return retVal;
 }
 
 
 
-PyObject* KX_RaySensor::_getattr(const char *attr) {
-	_getattr_up(SCA_ISensor);
+PyObject* KX_RaySensor::py_getattro(PyObject *attr) {
+	PyObject* object = py_getattro_self(Attributes, this, attr);
+	if (object != NULL)
+		return object;
+	py_getattro_up(SCA_ISensor);
 }
+
+int KX_RaySensor::py_setattro(PyObject *attr, PyObject *value) {
+	int ret = py_setattro_self(Attributes, this, attr, value);
+	if (ret >= 0)
+		return ret;
+	return SCA_ISensor::py_setattro(attr, value);
+}
+
+// <----- Deprecated
\ No newline at end of file
diff --git a/source/gameengine/Ketsji/KX_RaySensor.h b/source/gameengine/Ketsji/KX_RaySensor.h
index 09d8bc1369a2d505c0c69e67a545dd8dcfcd0f2e..a5d7d15c60caa962e2d6b6b17120dafe79f9c456 100644
--- a/source/gameengine/Ketsji/KX_RaySensor.h
+++ b/source/gameengine/Ketsji/KX_RaySensor.h
@@ -44,15 +44,15 @@ class KX_RaySensor : public SCA_ISensor
 	STR_String		m_propertyname;
 	bool			m_bFindMaterial;
 	bool			m_bXRay;
-	double			m_distance;
+	float			m_distance;
 	class KX_Scene* m_scene;
 	bool			m_bTriggered;
 	int				m_axis;
 	bool			m_rayHit;
-	MT_Point3		m_hitPosition;
+	float			m_hitPosition[3];
 	SCA_IObject*	m_hitObject;
-	MT_Vector3		m_hitNormal;
-	MT_Vector3		m_rayDirection;
+	float			m_hitNormal[3];
+	float			m_rayDirection[3];
 
 public:
 	KX_RaySensor(class SCA_EventManager* eventmgr,
@@ -73,13 +73,31 @@ public:
 
 	bool RayHit(KX_ClientObjectInfo* client, KX_RayCast* result, void * const data);
 	bool NeedRayCast(KX_ClientObjectInfo* client);
+
+
+	//Python Interface
+	enum RayAxis {
+		KX_RAY_AXIS_POS_Y = 0,
+		KX_RAY_AXIS_POS_X,
+		KX_RAY_AXIS_POS_Z,
+		KX_RAY_AXIS_NEG_X,
+		KX_RAY_AXIS_NEG_Y,
+		KX_RAY_AXIS_NEG_Z
+	};
+
+
+	virtual PyObject* py_getattro(PyObject *attr);
+	virtual int py_setattro(PyObject *attr, PyObject *value);
 	
+	// Deprecated ----->
 	KX_PYMETHOD_DOC_NOARGS(KX_RaySensor,GetHitObject);
 	KX_PYMETHOD_DOC_NOARGS(KX_RaySensor,GetHitPosition);
 	KX_PYMETHOD_DOC_NOARGS(KX_RaySensor,GetHitNormal);
 	KX_PYMETHOD_DOC_NOARGS(KX_RaySensor,GetRayDirection);
+	// <-----
 
-	virtual PyObject* _getattr(const char *attr);
+	/* Attributes */
+	static PyObject* pyattr_get_hitobject(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef);
 	
 };
 
diff --git a/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp b/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp
index 7c4f60a7f0aaf9e2226f59239f718c51ae0c13ba..1dd642e0966f0deda5a9d203381a90a7e477574f 100644
--- a/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp
+++ b/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp
@@ -167,25 +167,26 @@ void KX_SCA_AddObjectActuator::Relink(GEN_Map<GEN_HashedPtr, void*> *obj_map)
 
 /* Integration hooks ------------------------------------------------------- */
 PyTypeObject KX_SCA_AddObjectActuator::Type = {
-	PyObject_HEAD_INIT(&PyType_Type)
+	PyObject_HEAD_INIT(NULL)
 	0,
 	"KX_SCA_AddObjectActuator",
 	sizeof(KX_SCA_AddObjectActuator),
 	0,
 	PyDestructor,
 	0,
-	__getattr,
-	__setattr,
-	0, 
-	__repr,
 	0,
 	0,
 	0,
-	0,
-	0
+	py_base_repr,
+	0,0,0,0,0,0,
+	py_base_getattro,
+	py_base_setattro,
+	0,0,0,0,0,0,0,0,0,
+	Methods
 };
 
 PyParentObject KX_SCA_AddObjectActuator::Parents[] = {
+	&KX_SCA_AddObjectActuator::Type,
 	&SCA_IActuator::Type,
 	&SCA_ILogicBrick::Type,
 	&CValue::Type,
@@ -254,20 +255,20 @@ PyObject* KX_SCA_AddObjectActuator::pyattr_get_objectLastCreated(void *self, con
 }
 
 
-PyObject* KX_SCA_AddObjectActuator::_getattr(const char *attr)
+PyObject* KX_SCA_AddObjectActuator::py_getattro(PyObject *attr)
 {
-	PyObject* object = _getattr_self(Attributes, this, attr);
+	PyObject* object = py_getattro_self(Attributes, this, attr);
 	if (object != NULL)
 		return object;
-	_getattr_up(SCA_IActuator);
+	py_getattro_up(SCA_IActuator);
 }
 
-int KX_SCA_AddObjectActuator::_setattr(const char *attr, PyObject* value) 
+int KX_SCA_AddObjectActuator::py_setattro(PyObject *attr, PyObject* value) 
 {
-	int ret = _setattr_self(Attributes, this, attr, value);
+	int ret = py_setattro_self(Attributes, this, attr, value);
 	if (ret >= 0)
 		return ret;
-	return SCA_IActuator::_setattr(attr, value);
+	return SCA_IActuator::py_setattro(attr, value);
 }
 
 /* 1. setObject */
diff --git a/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h b/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h
index c8cc7113347c3f272f11aee93d3032ecce4e1c0c..4ece5a6d83b16171990a8b071ac6f9475f834b2c 100644
--- a/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h
+++ b/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h
@@ -110,8 +110,8 @@ public:
 	virtual bool 
 	Update();
 
-	virtual PyObject* _getattr(const char *attr);
-	virtual int _setattr(const char *attr, PyObject* value);
+	virtual PyObject* py_getattro(PyObject *attr);
+	virtual int py_setattro(PyObject *attr, PyObject* value);
 
 		SCA_IObject*	
 	GetLastCreatedObject(
diff --git a/source/gameengine/Ketsji/KX_SCA_DynamicActuator.cpp b/source/gameengine/Ketsji/KX_SCA_DynamicActuator.cpp
index 394bb667728ed6feb808f9f2c32e94895c803a4d..ae21209fc4e956519386d813b78c3aec7daeadc3 100644
--- a/source/gameengine/Ketsji/KX_SCA_DynamicActuator.cpp
+++ b/source/gameengine/Ketsji/KX_SCA_DynamicActuator.cpp
@@ -36,6 +36,7 @@
 // Please look here for revision history.
 
 #include "KX_SCA_DynamicActuator.h"
+#include "blendef.h"
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
@@ -49,25 +50,23 @@
 
 	PyTypeObject 
 
-KX_SCA_DynamicActuator::
-
-Type = {
-	PyObject_HEAD_INIT(&PyType_Type)
+KX_SCA_DynamicActuator::Type = {
+	PyObject_HEAD_INIT(NULL)
 	0,
 	"KX_SCA_DynamicActuator",
 	sizeof(KX_SCA_DynamicActuator),
 	0,
 	PyDestructor,
 	0,
-	__getattr,
-	__setattr,
-	0, 
-	__repr,
-	0, 
 	0,
 	0,
 	0,
-	0
+	py_base_repr,
+	0,0,0,0,0,0,
+	py_base_getattro,
+	py_base_setattro,
+	0,0,0,0,0,0,0,0,0,
+	Methods
 };
 
 PyParentObject KX_SCA_DynamicActuator::Parents[] = {
@@ -80,21 +79,34 @@ PyParentObject KX_SCA_DynamicActuator::Parents[] = {
 
 
 PyMethodDef KX_SCA_DynamicActuator::Methods[] = {
+	// ---> deprecated
 	KX_PYMETHODTABLE(KX_SCA_DynamicActuator, setOperation),
    	KX_PYMETHODTABLE(KX_SCA_DynamicActuator, getOperation),
 	{NULL,NULL} //Sentinel
 };
 
 PyAttributeDef KX_SCA_DynamicActuator::Attributes[] = {
+	KX_PYATTRIBUTE_SHORT_RW("operation",0,4,false,KX_SCA_DynamicActuator,m_dyn_operation),
+	KX_PYATTRIBUTE_FLOAT_RW("mass",0.0,MAXFLOAT,KX_SCA_DynamicActuator,m_setmass),
 	{ NULL }	//Sentinel
 };
 
 
-PyObject* KX_SCA_DynamicActuator::_getattr(const char *attr)
+PyObject* KX_SCA_DynamicActuator::py_getattro(PyObject *attr)
 {
-  _getattr_up(SCA_IActuator);
+	PyObject* object = py_getattro_self(Attributes, this, attr);
+	if (object != NULL)
+		return object;
+	py_getattro_up(SCA_IActuator);
 }
 
+int KX_SCA_DynamicActuator::py_setattro(PyObject *attr, PyObject* value)
+{
+	int ret = py_setattro_self(Attributes, this, attr, value);
+	if (ret >= 0)
+		return ret;
+	return SCA_IActuator::py_setattro(attr, value);
+}
 
 
 /* 1. setOperation */
@@ -107,6 +119,7 @@ KX_PYMETHODDEF_DOC(KX_SCA_DynamicActuator, setOperation,
 "\t                3 = disable rigid body\n"
 "Change the dynamic status of the parent object.\n")
 {
+	ShowDeprecationWarning("setOperation()", "the operation property");
 	int dyn_operation;
 	
 	if (!PyArg_ParseTuple(args, "i", &dyn_operation))
@@ -126,6 +139,7 @@ KX_PYMETHODDEF_DOC(KX_SCA_DynamicActuator, getOperation,
 "Returns the operation type of this actuator.\n"
 )
 {
+	ShowDeprecationWarning("getOperation()", "the operation property");
 	return PyInt_FromLong((long)m_dyn_operation);
 }
 
diff --git a/source/gameengine/Ketsji/KX_SCA_DynamicActuator.h b/source/gameengine/Ketsji/KX_SCA_DynamicActuator.h
index a82cddd66a7ed98da0f479970ea54bb09222f253..99855124bdb27536c15f4b71568b31eb1902baa0 100644
--- a/source/gameengine/Ketsji/KX_SCA_DynamicActuator.h
+++ b/source/gameengine/Ketsji/KX_SCA_DynamicActuator.h
@@ -64,7 +64,18 @@ class KX_SCA_DynamicActuator : public SCA_IActuator
 	virtual bool 
 	Update();
 
-	virtual PyObject* _getattr(const char *attr);
+	//Python Interface
+	enum DynamicOperation {
+		KX_DYN_RESTORE_DYNAMICS = 0,
+		KX_DYN_DISABLE_DYNAMICS,
+		KX_DYN_ENABLE_RIGID_BODY,
+		KX_DYN_DISABLE_RIGID_BODY,
+		KX_DYN_SET_MASS,
+	};
+
+
+	virtual PyObject* py_getattro(PyObject *attr);
+	virtual int py_setattro(PyObject *attr, PyObject *value);
 
 	/* 1. setOperation */
 	KX_PYMETHOD_DOC(KX_SCA_DynamicActuator,setOperation);
diff --git a/source/gameengine/Ketsji/KX_SCA_EndObjectActuator.cpp b/source/gameengine/Ketsji/KX_SCA_EndObjectActuator.cpp
index 9268a1df5f035b19f35da7bcfb6c6a402873238e..0db9e1c49305ba2c695b2f7e3095cd9ca30782c9 100644
--- a/source/gameengine/Ketsji/KX_SCA_EndObjectActuator.cpp
+++ b/source/gameengine/Ketsji/KX_SCA_EndObjectActuator.cpp
@@ -94,22 +94,22 @@ CValue* KX_SCA_EndObjectActuator::GetReplica()
 /* ------------------------------------------------------------------------- */
 
 PyTypeObject KX_SCA_EndObjectActuator::Type = {
-	PyObject_HEAD_INIT(&PyType_Type)
+	PyObject_HEAD_INIT(NULL)
 	0,
 	"KX_SCA_EndObjectActuator",
 	sizeof(KX_SCA_EndObjectActuator),
 	0,
 	PyDestructor,
 	0,
-	__getattr,
-	__setattr,
-	0, //&MyPyCompare,
-	__repr,
-	0, //&cvalue_as_number,
 	0,
 	0,
 	0,
-	0
+	py_base_repr,
+	0,0,0,0,0,0,
+	py_base_getattro,
+	py_base_setattro,
+	0,0,0,0,0,0,0,0,0,
+	Methods
 };
 
 
@@ -131,9 +131,9 @@ PyAttributeDef KX_SCA_EndObjectActuator::Attributes[] = {
 	{ NULL }	//Sentinel
 };
 
-PyObject* KX_SCA_EndObjectActuator::_getattr(const char *attr)
+PyObject* KX_SCA_EndObjectActuator::py_getattro(PyObject *attr)
 {
-  _getattr_up(SCA_IActuator);
+  py_getattro_up(SCA_IActuator);
 }
 
 /* eof */
diff --git a/source/gameengine/Ketsji/KX_SCA_EndObjectActuator.h b/source/gameengine/Ketsji/KX_SCA_EndObjectActuator.h
index 12118743f0acf93b352e3d1744a3cafe0cfafc99..2940246f443bfa6a2288031eddc71d2bc2280cca 100644
--- a/source/gameengine/Ketsji/KX_SCA_EndObjectActuator.h
+++ b/source/gameengine/Ketsji/KX_SCA_EndObjectActuator.h
@@ -64,7 +64,7 @@ class KX_SCA_EndObjectActuator : public SCA_IActuator
 	/* Python interface ---------------------------------------------------- */
 	/* --------------------------------------------------------------------- */
 
-	virtual PyObject* _getattr(const char *attr);
+	virtual PyObject* py_getattro(PyObject *attr);
 	
 }; /* end of class KX_EditObjectActuator : public SCA_PropertyActuator */
 
diff --git a/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.cpp b/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.cpp
index 502990b2b27aa01df9d2996dee8b029681e2c7c3..0cac07b45856737ddcf61e6ce609ade41869c37d 100644
--- a/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.cpp
+++ b/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.cpp
@@ -36,6 +36,7 @@
 // Please look here for revision history.
 
 #include "KX_SCA_ReplaceMeshActuator.h"
+#include "KX_MeshProxy.h"
 
 #include "PyObjectPlus.h" 
 
@@ -51,28 +52,27 @@
 
 	PyTypeObject 
 
-KX_SCA_ReplaceMeshActuator::
-
-Type = {
-	PyObject_HEAD_INIT(&PyType_Type)
+KX_SCA_ReplaceMeshActuator::Type = {
+	PyObject_HEAD_INIT(NULL)
 	0,
 	"KX_SCA_ReplaceMeshActuator",
 	sizeof(KX_SCA_ReplaceMeshActuator),
 	0,
 	PyDestructor,
 	0,
-	__getattr,
-	__setattr,
-	0, 
-	__repr,
-	0, 
 	0,
 	0,
 	0,
-	0
+	py_base_repr,
+	0,0,0,0,0,0,
+	py_base_getattro,
+	py_base_setattro,
+	0,0,0,0,0,0,0,0,0,
+	Methods
 };
 
 PyParentObject KX_SCA_ReplaceMeshActuator::Parents[] = {
+	&KX_SCA_ReplaceMeshActuator::Type,
 	&SCA_IActuator::Type,
 	&SCA_ILogicBrick::Type,
 	&CValue::Type,
@@ -82,23 +82,64 @@ PyParentObject KX_SCA_ReplaceMeshActuator::Parents[] = {
 
 
 PyMethodDef KX_SCA_ReplaceMeshActuator::Methods[] = {
-	{"setMesh", (PyCFunction) KX_SCA_ReplaceMeshActuator::sPySetMesh, METH_O, (PY_METHODCHAR)SetMesh_doc},
-	
 	KX_PYMETHODTABLE(KX_SCA_ReplaceMeshActuator, instantReplaceMesh),
+	// Deprecated ----->
+	{"setMesh", (PyCFunction) KX_SCA_ReplaceMeshActuator::sPySetMesh, METH_O, (PY_METHODCHAR)SetMesh_doc},
    	KX_PYMETHODTABLE(KX_SCA_ReplaceMeshActuator, getMesh),
 	{NULL,NULL} //Sentinel
 };
 
 PyAttributeDef KX_SCA_ReplaceMeshActuator::Attributes[] = {
+	KX_PYATTRIBUTE_RW_FUNCTION("mesh", KX_SCA_ReplaceMeshActuator, pyattr_get_mesh, pyattr_set_mesh),
 	{ NULL }	//Sentinel
 };
 
-PyObject* KX_SCA_ReplaceMeshActuator::_getattr(const char *attr)
+PyObject* KX_SCA_ReplaceMeshActuator::py_getattro(PyObject *attr)
 {
-  _getattr_up(SCA_IActuator);
+	PyObject* object = py_getattro_self(Attributes, this, attr);
+	if (object != NULL)
+		return object;
+	py_getattro_up(SCA_IActuator);
 }
 
+int KX_SCA_ReplaceMeshActuator::py_setattro(PyObject *attr, PyObject* value) 
+{
+	int ret = py_setattro_self(Attributes, this, attr, value);
+	if (ret >= 0)
+		return ret;
+	return SCA_IActuator::py_setattro(attr, value);
+}
+
+PyObject* KX_SCA_ReplaceMeshActuator::pyattr_get_mesh(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef)
+{
+	KX_SCA_ReplaceMeshActuator* actuator = static_cast<KX_SCA_ReplaceMeshActuator*>(self);
+	if (!actuator->m_mesh)
+		Py_RETURN_NONE;
+	KX_MeshProxy* meshproxy = new KX_MeshProxy(actuator->m_mesh);
+	return meshproxy;
+}
 
+int KX_SCA_ReplaceMeshActuator::pyattr_set_mesh(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef, PyObject *value)
+{
+	KX_SCA_ReplaceMeshActuator* actuator = static_cast<KX_SCA_ReplaceMeshActuator*>(self);
+	if (value == Py_None) {
+		actuator->m_mesh = NULL;
+	} else if (PyString_Check(value)) {
+		void* mesh = SCA_ILogicBrick::m_sCurrentLogicManager->GetMeshByName(STR_String(PyString_AsString(value)));
+		if (mesh==NULL) {
+			PyErr_SetString(PyExc_ValueError, "The mesh name given does not exist");
+			return 1;
+		}
+		actuator->m_mesh= (class RAS_MeshObject*)mesh;
+	} else if PyObject_TypeCheck(value, &KX_MeshProxy::Type) {
+		KX_MeshProxy* proxy = (KX_MeshProxy*)value;
+		actuator->m_mesh= proxy->GetMesh();
+	} else {
+		PyErr_SetString(PyExc_ValueError, "Expected the name of a mesh, a mesh proxy or None");
+		return 1;
+	}
+	return 0;
+}
 
 /* 1. setMesh */
 const char KX_SCA_ReplaceMeshActuator::SetMesh_doc[] = 
@@ -108,6 +149,7 @@ const char KX_SCA_ReplaceMeshActuator::SetMesh_doc[] =
 
 PyObject* KX_SCA_ReplaceMeshActuator::PySetMesh(PyObject* self, PyObject* value)
 {
+	ShowDeprecationWarning("setMesh()", "the mesh property");
 	if (value == Py_None) {
 		m_mesh = NULL;
 	} else {
@@ -133,6 +175,7 @@ KX_PYMETHODDEF_DOC(KX_SCA_ReplaceMeshActuator, getMesh,
 "Returns the name of the mesh to be substituted.\n"
 )
 {
+	ShowDeprecationWarning("getMesh()", "the mesh property");
 	if (!m_mesh)
 		Py_RETURN_NONE;
 
diff --git a/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.h b/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.h
index 0ba6065068390b83de7a38686bf3b472f776e48f..7a18df2356d198cb84e9b457fa192696c589f8d4 100644
--- a/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.h
+++ b/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.h
@@ -69,9 +69,14 @@ class KX_SCA_ReplaceMeshActuator : public SCA_IActuator
 	virtual bool 
 	Update();
 
-	virtual PyObject* _getattr(const char *attr);
 	void	InstantReplaceMesh();
 
+	virtual PyObject* py_getattro(PyObject *attr);
+	virtual int py_setattro(PyObject *attr, PyObject* value);
+
+	static PyObject* pyattr_get_mesh(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef);
+	static int pyattr_set_mesh(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef, PyObject *value);
+
 	/* 1. setMesh */
 	KX_PYMETHOD_DOC_O(KX_SCA_ReplaceMeshActuator,SetMesh);
 	KX_PYMETHOD_DOC(KX_SCA_ReplaceMeshActuator,getMesh);
diff --git a/source/gameengine/Ketsji/KX_Scene.cpp b/source/gameengine/Ketsji/KX_Scene.cpp
index 0fded15f1a150b08b602f27aa60ecd24bcd608b7..94ea234f1bf3ce56821b95daa06f0f29a13d0e93 100644
--- a/source/gameengine/Ketsji/KX_Scene.cpp
+++ b/source/gameengine/Ketsji/KX_Scene.cpp
@@ -32,7 +32,6 @@
 #pragma warning (disable : 4786)
 #endif //WIN32
 
-
 #include "KX_Scene.h"
 #include "MT_assert.h"
 
@@ -1518,22 +1517,22 @@ double KX_Scene::getSuspendedDelta()
 //Python
 
 PyTypeObject KX_Scene::Type = {
-	PyObject_HEAD_INIT(&PyType_Type)
+	PyObject_HEAD_INIT(NULL)
 		0,
 		"KX_Scene",
 		sizeof(KX_Scene),
 		0,
 		PyDestructor,
 		0,
-		__getattr,
-		__setattr,
-		0, //&MyPyCompare,
-		__repr,
-		0, //&cvalue_as_number,
 		0,
 		0,
 		0,
-		0, 0, 0, 0, 0, 0
+		py_base_repr,
+		0,0,0,0,0,0,
+		py_base_getattro,
+		py_base_setattro,
+		0,0,0,0,0,0,0,0,0,
+		Methods
 };
 
 PyParentObject KX_Scene::Parents[] = {
@@ -1551,52 +1550,76 @@ PyMethodDef KX_Scene::Methods[] = {
 	{NULL,NULL} //Sentinel
 };
 
+PyObject* KX_Scene::pyattr_get_name(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
+{
+	KX_Scene* self= static_cast<KX_Scene*>(self_v);
+	return PyString_FromString(self->GetName().ReadPtr());
+}
+
+PyObject* KX_Scene::pyattr_get_objects(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
+{
+	KX_Scene* self= static_cast<KX_Scene*>(self_v);
+	return self->GetObjectList()->AddRef();
+}
+
+PyObject* KX_Scene::pyattr_get_active_camera(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
+{
+	KX_Scene* self= static_cast<KX_Scene*>(self_v);
+	return self->GetActiveCamera()->AddRef();
+}
+
+/* __dict__ only for the purpose of giving useful dir() results */
+PyObject* KX_Scene::pyattr_get_dir_dict(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
+{
+	KX_Scene* self= static_cast<KX_Scene*>(self_v);
+	/* Useually done by py_getattro_up but in this case we want to include m_attrlist dict */
+	PyObject *dict_str= PyString_FromString("__dict__");
+	PyObject *dict= _getattr_dict(self->PyObjectPlus::py_getattro(dict_str), KX_Scene::Methods, KX_Scene::Attributes);
+	Py_DECREF(dict_str);
+	
+	PyDict_Update(dict, self->m_attrlist);
+	return dict;
+}
+
 PyAttributeDef KX_Scene::Attributes[] = {
+	KX_PYATTRIBUTE_RO_FUNCTION("name",			KX_Scene, pyattr_get_name),
+	KX_PYATTRIBUTE_RO_FUNCTION("objects",		KX_Scene, pyattr_get_objects),
+	KX_PYATTRIBUTE_RO_FUNCTION("active_camera",	KX_Scene, pyattr_get_active_camera),
+	KX_PYATTRIBUTE_BOOL_RO("suspended",			KX_Scene, m_suspend),
+	KX_PYATTRIBUTE_BOOL_RO("activity_culling",	KX_Scene, m_activity_culling),
+	KX_PYATTRIBUTE_FLOAT_RW("activity_culling_radius", 0.5f, FLT_MAX, KX_Scene, m_activity_box_radius),
+	KX_PYATTRIBUTE_RO_FUNCTION("__dict__",		KX_Scene, pyattr_get_dir_dict),
 	{ NULL }	//Sentinel
 };
 
-PyObject* KX_Scene::_getattr(const char *attr)
+PyObject* KX_Scene::py_getattro(PyObject *attr)
 {
-	if (!strcmp(attr, "name"))
-		return PyString_FromString(GetName());
-	
-	if (!strcmp(attr, "objects"))
-		return (PyObject*) m_objectlist->AddRef();
-	
-	if (!strcmp(attr, "active_camera"))
-		return (PyObject*) GetActiveCamera()->AddRef();
-	
-	if (!strcmp(attr, "suspended"))
-		return PyInt_FromLong(m_suspend);
-	
-	if (!strcmp(attr, "activity_culling"))
-		return PyInt_FromLong(m_activity_culling);
-	
-	if (!strcmp(attr, "activity_culling_radius"))
-		return PyFloat_FromDouble(m_activity_box_radius);
+	PyObject* object = py_getattro_self(Attributes, this, attr);
+	if (object != NULL)
+		return object;
 	
-	PyObject* value = PyDict_GetItemString(m_attrlist, attr);
-	if (value)
+	object = PyDict_GetItem(m_attrlist, attr);
+	if (object)
 	{
-		Py_INCREF(value);
-		return value;
+		Py_INCREF(object);
+		return object;
 	}
 	
-	_getattr_up(PyObjectPlus);
+	py_getattro_up(PyObjectPlus);
 }
 
-int KX_Scene::_delattr(const char *attr)
+int KX_Scene::py_delattro(PyObject *attr)
 {
-	PyDict_DelItemString(m_attrlist, attr);
+	PyDict_DelItem(m_attrlist, attr);
 	return 0;
 }
 
-int KX_Scene::_setattr(const char *attr, PyObject *pyvalue)
+int KX_Scene::py_setattro(PyObject *attr, PyObject *pyvalue)
 {
-	if (!PyDict_SetItemString(m_attrlist, attr, pyvalue))
+	if (!PyDict_SetItem(m_attrlist, attr, pyvalue))
 		return 0;
 
-	return PyObjectPlus::_setattr(attr, pyvalue);
+	return PyObjectPlus::py_setattro(attr, pyvalue);
 }
 
 KX_PYMETHODDEF_DOC_NOARGS(KX_Scene, getLightList,
diff --git a/source/gameengine/Ketsji/KX_Scene.h b/source/gameengine/Ketsji/KX_Scene.h
index 962db1a9b9641dde422878e3eb9ba319d7472bde..df51fcec8f7ca19f52bd33ffb576e5ed920f7292 100644
--- a/source/gameengine/Ketsji/KX_Scene.h
+++ b/source/gameengine/Ketsji/KX_Scene.h
@@ -565,10 +565,19 @@ public:
 	KX_PYMETHOD_DOC(KX_Scene, setSceneViewport);
 	*/
 
-	virtual PyObject* _getattr(const char *attr); /* name, active_camera, gravity, suspended, viewport, framing, activity_culling, activity_culling_radius */
-	virtual int _setattr(const char *attr, PyObject *pyvalue);
-	virtual int _delattr(const char *attr);
-	virtual PyObject* _repr(void) { return PyString_FromString(GetName().ReadPtr()); }
+	/* attributes */
+	static PyObject*	pyattr_get_name(void* self_v, const KX_PYATTRIBUTE_DEF *attrdef);
+	static PyObject*	pyattr_get_objects(void* self_v, const KX_PYATTRIBUTE_DEF *attrdef);
+	static PyObject*	pyattr_get_active_camera(void* self_v, const KX_PYATTRIBUTE_DEF *attrdef);
+	
+	/* for dir(), python3 uses __dir__() */
+	static PyObject*	pyattr_get_dir_dict(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef);
+	
+
+	virtual PyObject* py_getattro(PyObject *attr); /* name, active_camera, gravity, suspended, viewport, framing, activity_culling, activity_culling_radius */
+	virtual int py_setattro(PyObject *attr, PyObject *pyvalue);
+	virtual int py_delattro(PyObject *attr);
+	virtual PyObject* py_repr(void) { return PyString_FromString(GetName().ReadPtr()); }
 
 		
 	/**
diff --git a/source/gameengine/Ketsji/KX_SceneActuator.cpp b/source/gameengine/Ketsji/KX_SceneActuator.cpp
index 579c53974d52b7c0209d64783722b630bf95b55e..40a2ff2ef66bfefc8e9d761422371b760e816517 100644
--- a/source/gameengine/Ketsji/KX_SceneActuator.cpp
+++ b/source/gameengine/Ketsji/KX_SceneActuator.cpp
@@ -226,22 +226,22 @@ KX_Scene* KX_SceneActuator::FindScene(char * sceneName)
 
 /* Integration hooks ------------------------------------------------------- */
 PyTypeObject KX_SceneActuator::Type = {
-	PyObject_HEAD_INIT(&PyType_Type)
+	PyObject_HEAD_INIT(NULL)
 		0,
 		"KX_SceneActuator",
 		sizeof(KX_SceneActuator),
 		0,
 		PyDestructor,
 		0,
-		__getattr,
-		__setattr,
-		0, //&MyPyCompare,
-		__repr,
-		0, //&cvalue_as_number,
 		0,
 		0,
 		0,
-		0
+		py_base_repr,
+		0,0,0,0,0,0,
+		py_base_getattro,
+		py_base_setattro,
+		0,0,0,0,0,0,0,0,0,
+		Methods
 };
 
 
@@ -276,20 +276,20 @@ PyAttributeDef KX_SceneActuator::Attributes[] = {
 	{ NULL }	//Sentinel
 };
 
-PyObject* KX_SceneActuator::_getattr(const char *attr)
+PyObject* KX_SceneActuator::py_getattro(PyObject *attr)
 {
-	PyObject* object = _getattr_self(Attributes, this, attr);
+	PyObject* object = py_getattro_self(Attributes, this, attr);
 	if (object != NULL)
 		return object;
-	_getattr_up(SCA_IActuator);
+	py_getattro_up(SCA_IActuator);
 }
 
-int KX_SceneActuator::_setattr(const char *attr, PyObject *value)
+int KX_SceneActuator::py_setattro(PyObject *attr, PyObject *value)
 {
-	int ret = _setattr_self(Attributes, this, attr, value);
+	int ret = py_setattro_self(Attributes, this, attr, value);
 	if (ret >= 0)
 		return ret;
-	return SCA_IActuator::_setattr(attr, value);
+	return SCA_IActuator::py_setattro(attr, value);
 }
 
 PyObject* KX_SceneActuator::pyattr_get_camera(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef)
diff --git a/source/gameengine/Ketsji/KX_SceneActuator.h b/source/gameengine/Ketsji/KX_SceneActuator.h
index 83b0d63bcd2d6f1445e5e84fa7c88759aecd2821..f1904f95c2abd6bc286728483c95f544b3bcfade 100644
--- a/source/gameengine/Ketsji/KX_SceneActuator.h
+++ b/source/gameengine/Ketsji/KX_SceneActuator.h
@@ -92,8 +92,8 @@ class KX_SceneActuator : public SCA_IActuator
 	/* Python interface ---------------------------------------------------- */
 	/* --------------------------------------------------------------------- */
 
-	virtual PyObject* _getattr(const char *attr);
-	virtual int _setattr(const char *attr, PyObject *value);
+	virtual PyObject* py_getattro(PyObject *attr);
+	virtual int py_setattro(PyObject *attr, PyObject *value);
 
 	/* 1. set                                                                */
 	/* Removed */
diff --git a/source/gameengine/Ketsji/KX_SoundActuator.cpp b/source/gameengine/Ketsji/KX_SoundActuator.cpp
index 6de1d67bfdb2cd1c5a25564dcb7280def91332ff..b8d660daa08396a0679de14e7a4e2d3d21f1235e 100644
--- a/source/gameengine/Ketsji/KX_SoundActuator.cpp
+++ b/source/gameengine/Ketsji/KX_SoundActuator.cpp
@@ -233,22 +233,22 @@ void KX_SoundActuator::setSoundObject(class SND_SoundObject* soundobject)
 
 /* Integration hooks ------------------------------------------------------- */
 PyTypeObject KX_SoundActuator::Type = {
-	PyObject_HEAD_INIT(&PyType_Type)
+	PyObject_HEAD_INIT(NULL)
 		0,
 		"KX_SoundActuator",
 		sizeof(KX_SoundActuator),
 		0,
 		PyDestructor,
 		0,
-		__getattr,
-		__setattr,
-		0, //&MyPyCompare,
-		__repr,
-		0, //&cvalue_as_number,
 		0,
 		0,
 		0,
-		0
+		py_base_repr,
+		0,0,0,0,0,0,
+		py_base_getattro,
+		py_base_setattro,
+		0,0,0,0,0,0,0,0,0,
+		Methods
 };
 
 
@@ -289,9 +289,9 @@ PyAttributeDef KX_SoundActuator::Attributes[] = {
 	{ NULL }	//Sentinel
 };
 
-PyObject* KX_SoundActuator::_getattr(const char *attr)
+PyObject* KX_SoundActuator::py_getattro(PyObject *attr)
 {
-	_getattr_up(SCA_IActuator);
+	py_getattro_up(SCA_IActuator);
 }
 
 
diff --git a/source/gameengine/Ketsji/KX_SoundActuator.h b/source/gameengine/Ketsji/KX_SoundActuator.h
index 68d5b792729fdcd876815b3502dddfbf0f406879..3e4a4168434717d1b0d7fe8332c486c2934b67f6 100644
--- a/source/gameengine/Ketsji/KX_SoundActuator.h
+++ b/source/gameengine/Ketsji/KX_SoundActuator.h
@@ -80,7 +80,7 @@ public:
 	/* Python interface --------------------------------------------------- */
 	/* -------------------------------------------------------------------- */
 
-	virtual PyObject*  _getattr(const char *attr);
+	virtual PyObject*  py_getattro(PyObject *attr);
 
 	KX_PYMETHOD(KX_SoundActuator,SetFilename);
 	KX_PYMETHOD(KX_SoundActuator,GetFilename);
diff --git a/source/gameengine/Ketsji/KX_StateActuator.cpp b/source/gameengine/Ketsji/KX_StateActuator.cpp
index 0de4da79bd8aa1eafb3e3e77e0581b1a288dc5d7..31457230f60668474606f489a9ad08d0af35b907 100644
--- a/source/gameengine/Ketsji/KX_StateActuator.cpp
+++ b/source/gameengine/Ketsji/KX_StateActuator.cpp
@@ -108,24 +108,23 @@ KX_StateActuator::Update()
 
 
 /* Integration hooks ------------------------------------------------------- */
-PyTypeObject 
-KX_StateActuator::Type = {
-	PyObject_HEAD_INIT(&PyType_Type)
+PyTypeObject KX_StateActuator::Type = {
+	PyObject_HEAD_INIT(NULL)
 	0,
 	"KX_StateActuator",
 	sizeof(KX_StateActuator),
 	0,
 	PyDestructor,
 	0,
-	__getattr,
-	__setattr,
-	0, //&MyPyCompare,
-	__repr,
-	0, //&cvalue_as_number,
 	0,
 	0,
 	0,
-	0
+	py_base_repr,
+	0,0,0,0,0,0,
+	py_base_getattro,
+	py_base_setattro,
+	0,0,0,0,0,0,0,0,0,
+	Methods
 };
 
 PyParentObject 
@@ -150,9 +149,9 @@ PyAttributeDef KX_StateActuator::Attributes[] = {
 	{ NULL }	//Sentinel
 };
 
-PyObject* KX_StateActuator::_getattr(const char *attr)
+PyObject* KX_StateActuator::py_getattro(PyObject *attr)
 {
-	_getattr_up(SCA_IActuator);
+	py_getattro_up(SCA_IActuator);
 };
 
 
diff --git a/source/gameengine/Ketsji/KX_StateActuator.h b/source/gameengine/Ketsji/KX_StateActuator.h
index 023b8993d7c46fbf5985bde808fa944c56b75415..b6f1acf4a00b13d6cf406f599e9c59b2dd46f39d 100644
--- a/source/gameengine/Ketsji/KX_StateActuator.h
+++ b/source/gameengine/Ketsji/KX_StateActuator.h
@@ -73,7 +73,7 @@ class KX_StateActuator : public SCA_IActuator
 	/* Python interface ---------------------------------------------------- */
 	/* --------------------------------------------------------------------- */
 
-	virtual PyObject* _getattr(const char *attr);
+	virtual PyObject* py_getattro(PyObject *attr);
 	//KX_PYMETHOD_DOC
 	KX_PYMETHOD_DOC(KX_StateActuator,SetOperation);
 	KX_PYMETHOD_DOC(KX_StateActuator,SetMask);
diff --git a/source/gameengine/Ketsji/KX_TouchSensor.cpp b/source/gameengine/Ketsji/KX_TouchSensor.cpp
index 705b54edd3784dfd17c5b0c6e0188b99b755fa54..49d3d20dc3d43d90e4803a3ec34eb56e1cda88f4 100644
--- a/source/gameengine/Ketsji/KX_TouchSensor.cpp
+++ b/source/gameengine/Ketsji/KX_TouchSensor.cpp
@@ -242,22 +242,22 @@ bool	KX_TouchSensor::NewHandleCollision(void*object1,void*object2,const PHY_Coll
 /* ------------------------------------------------------------------------- */
 /* Integration hooks ------------------------------------------------------- */
 PyTypeObject KX_TouchSensor::Type = {
-	PyObject_HEAD_INIT(&PyType_Type)
+	PyObject_HEAD_INIT(NULL)
 	0,
 	"KX_TouchSensor",
 	sizeof(KX_TouchSensor),
 	0,
 	PyDestructor,
 	0,
-	__getattr,
-	__setattr,
-	0, //&MyPyCompare,
-	__repr,
-	0, //&cvalue_as_number,
 	0,
 	0,
 	0,
-	0
+	py_base_repr,
+	0,0,0,0,0,0,
+	py_base_getattro,
+	py_base_setattro,
+	0,0,0,0,0,0,0,0,0,
+	Methods
 };
 
 PyParentObject KX_TouchSensor::Parents[] = {
@@ -291,29 +291,31 @@ PyAttributeDef KX_TouchSensor::Attributes[] = {
 	{ NULL }	//Sentinel
 };
 
-PyObject* KX_TouchSensor::_getattr(const char *attr)
+PyObject* KX_TouchSensor::py_getattro(PyObject *attr)
 {	
-	if (!strcmp(attr, "objectHit")) {
+	PyObject* object= py_getattro_self(Attributes, this, attr);
+	if (object != NULL)
+		return object;
+	
+	char *attr_str= PyString_AsString(attr);
+	if (!strcmp(attr_str, "objectHit")) {
 		if (m_hitObject)	return m_hitObject->AddRef();
 		else				Py_RETURN_NONE;
 	}
-	if (!strcmp(attr, "objectHitList")) {
+	if (!strcmp(attr_str, "objectHitList")) {
 		return m_colliders->AddRef();
 	}
-
-	PyObject* object= _getattr_self(Attributes, this, attr);
-	if (object != NULL)
-		return object;
-	_getattr_up(SCA_ISensor);
+	
+	py_getattro_up(SCA_ISensor);
 }
 
-int KX_TouchSensor::_setattr(const char *attr, PyObject *value)
+int KX_TouchSensor::py_setattro(PyObject *attr, PyObject *value)
 {
-	int ret = _setattr_self(Attributes, this, attr, value);
+	int ret = py_setattro_self(Attributes, this, attr, value);
 	if (ret >= 0)
 		return ret;
 	
-	return SCA_ISensor::_setattr(attr, value);
+	return SCA_ISensor::py_setattro(attr, value);
 }
 
 /* Python API */
diff --git a/source/gameengine/Ketsji/KX_TouchSensor.h b/source/gameengine/Ketsji/KX_TouchSensor.h
index 18ce9406a9ba4466715b191c55536315d0bc934f..93fadef4abd116c0948cb35919e8e03849ca6b6a 100644
--- a/source/gameengine/Ketsji/KX_TouchSensor.h
+++ b/source/gameengine/Ketsji/KX_TouchSensor.h
@@ -120,8 +120,8 @@ public:
 	/* Python interface ---------------------------------------------------- */
 	/* --------------------------------------------------------------------- */
 	
-	virtual PyObject* _getattr(const char *attr);
-	virtual int _setattr(const char *attr, PyObject *value);
+	virtual PyObject* py_getattro(PyObject *attr);
+	virtual int py_setattro(PyObject *attr, PyObject *value);
 
 	//Deprecated ----->
 	/* 1. setProperty */
diff --git a/source/gameengine/Ketsji/KX_TrackToActuator.cpp b/source/gameengine/Ketsji/KX_TrackToActuator.cpp
index 8637bc92d3953459cf5a6510d11d701a46bdb6cd..58e17785b816c0bffe262fdab5175dd097014112 100644
--- a/source/gameengine/Ketsji/KX_TrackToActuator.cpp
+++ b/source/gameengine/Ketsji/KX_TrackToActuator.cpp
@@ -402,7 +402,7 @@ bool KX_TrackToActuator::Update(double curtime, bool frame)
 			// set the models tranformation properties
 			curobj->NodeSetLocalOrientation(mat);
 			curobj->NodeSetLocalPosition(localpos);
-			curobj->UpdateTransform();
+			//curobj->UpdateTransform();
 		}
 		else
 		{
@@ -425,22 +425,22 @@ bool KX_TrackToActuator::Update(double curtime, bool frame)
 
 /* Integration hooks ------------------------------------------------------- */
 PyTypeObject KX_TrackToActuator::Type = {
-	PyObject_HEAD_INIT(&PyType_Type)
+	PyObject_HEAD_INIT(NULL)
 	0,
 	"KX_TrackToActuator",
 	sizeof(KX_TrackToActuator),
 	0,
 	PyDestructor,
 	0,
-	__getattr,
-	__setattr,
-	0, //&MyPyCompare,
-	__repr,
-	0, //&cvalue_as_number,
 	0,
 	0,
 	0,
-	0
+	py_base_repr,
+	0,0,0,0,0,0,
+	py_base_getattro,
+	py_base_setattro,
+	0,0,0,0,0,0,0,0,0,
+	Methods
 };
 
 
@@ -456,12 +456,11 @@ PyParentObject KX_TrackToActuator::Parents[] = {
 
 
 PyMethodDef KX_TrackToActuator::Methods[] = {
+	// ---> deprecated
 	{"setTime", (PyCFunction) KX_TrackToActuator::sPySetTime, METH_VARARGS, (PY_METHODCHAR)SetTime_doc},
 	{"getTime", (PyCFunction) KX_TrackToActuator::sPyGetTime, METH_VARARGS, (PY_METHODCHAR)GetTime_doc},
 	{"setUse3D", (PyCFunction) KX_TrackToActuator::sPySetUse3D, METH_VARARGS, (PY_METHODCHAR)SetUse3D_doc},
 	{"getUse3D", (PyCFunction) KX_TrackToActuator::sPyGetUse3D, METH_VARARGS, (PY_METHODCHAR)GetUse3D_doc},
-	
-	// ---> deprecated
 	{"setObject", (PyCFunction) KX_TrackToActuator::sPySetObject, METH_O, (PY_METHODCHAR)SetObject_doc},
 	{"getObject", (PyCFunction) KX_TrackToActuator::sPyGetObject, METH_VARARGS, (PY_METHODCHAR)GetObject_doc},
 	
@@ -469,40 +468,56 @@ PyMethodDef KX_TrackToActuator::Methods[] = {
 };
 
 PyAttributeDef KX_TrackToActuator::Attributes[] = {
+	KX_PYATTRIBUTE_INT_RW("time",0,1000,true,KX_TrackToActuator,m_time),
+	KX_PYATTRIBUTE_BOOL_RW("user3D",KX_TrackToActuator,m_allow3D),
+	KX_PYATTRIBUTE_RW_FUNCTION("object", KX_TrackToActuator, pyattr_get_object, pyattr_set_object),
+
 	{ NULL }	//Sentinel
 };
 
-
-PyObject* KX_TrackToActuator::_getattr(const char *attr)
+PyObject* KX_TrackToActuator::pyattr_get_object(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef)
 {
-	if (!strcmp(attr, "object")) {
-		if (!m_object)		Py_RETURN_NONE;
-		else				return m_object->AddRef();
-	}
-	
-	_getattr_up(SCA_IActuator);
+	KX_TrackToActuator* actuator = static_cast<KX_TrackToActuator*>(self);
+	if (!actuator->m_object)	
+		Py_RETURN_NONE;
+	else
+		return actuator->m_object->AddRef();
 }
 
-int KX_TrackToActuator::_setattr(const char *attr, PyObject* value)
+int KX_TrackToActuator::pyattr_set_object(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef, PyObject *value)
 {
-	if (!strcmp(attr, "object")) {
-		KX_GameObject *gameobj;
+	KX_TrackToActuator* actuator = static_cast<KX_TrackToActuator*>(self);
+	KX_GameObject *gameobj;
 		
-		if (!ConvertPythonToGameObject(value, &gameobj, true))
-			return 1; // ConvertPythonToGameObject sets the error
+	if (!ConvertPythonToGameObject(value, &gameobj, true))
+		return 1; // ConvertPythonToGameObject sets the error
 		
-		if (m_object != NULL)
-			m_object->UnregisterActuator(this);	
+	if (actuator->m_object != NULL)
+		actuator->m_object->UnregisterActuator(actuator);	
 
-		m_object = (SCA_IObject*)gameobj;
+	actuator->m_object = (SCA_IObject*) gameobj;
 		
-		if (m_object)
-			m_object->RegisterActuator(this);
+	if (actuator->m_object)
+		actuator->m_object->RegisterActuator(actuator);
 		
-		return 0;
-	}
-	
-	return SCA_IActuator::_setattr(attr, value);
+	return 0;
+}
+
+
+PyObject* KX_TrackToActuator::py_getattro(PyObject *attr)
+{
+	PyObject* object = py_getattro_self(Attributes, this, attr);
+	if (object != NULL)
+		return object;
+	py_getattro_up(SCA_IActuator);
+}
+
+int KX_TrackToActuator::py_setattro(PyObject *attr, PyObject* value)
+{
+	int ret = py_setattro_self(Attributes, this, attr, value);
+	if (ret >= 0)
+		return ret;
+	return SCA_IActuator::py_setattro(attr, value);
 }
 
 /* 1. setObject */
@@ -563,6 +578,7 @@ const char KX_TrackToActuator::SetTime_doc[] =
 "\tSet the time in frames with which to delay the tracking motion.\n";
 PyObject* KX_TrackToActuator::PySetTime(PyObject* self, PyObject* args, PyObject* kwds)
 {
+	ShowDeprecationWarning("setTime()", "the timer property");
 	int timeArg;
 	
 	if (!PyArg_ParseTuple(args, "i", &timeArg))
@@ -584,6 +600,7 @@ const char KX_TrackToActuator::GetTime_doc[] =
 "\tReturn the time in frames with which the tracking motion is delayed.\n";
 PyObject* KX_TrackToActuator::PyGetTime(PyObject* self, PyObject* args, PyObject* kwds)
 {
+	ShowDeprecationWarning("getTime()", "the timer property");
 	return PyInt_FromLong(m_time);
 }
 
@@ -595,6 +612,7 @@ const char KX_TrackToActuator::GetUse3D_doc[] =
 "\tReturns 1 if the motion is allowed to extend in the z-direction.\n";
 PyObject* KX_TrackToActuator::PyGetUse3D(PyObject* self, PyObject* args, PyObject* kwds)
 {
+	ShowDeprecationWarning("setTime()", "the use3D property");
 	return PyInt_FromLong(!(m_allow3D == 0));
 }
 
@@ -608,6 +626,7 @@ const char KX_TrackToActuator::SetUse3D_doc[] =
 "\tset to 0 to lock the tracking motion to the x-y plane.\n";
 PyObject* KX_TrackToActuator::PySetUse3D(PyObject* self, PyObject* args, PyObject* kwds)
 {
+	ShowDeprecationWarning("setTime()", "the use3D property");
 	int boolArg;
 	
 	if (!PyArg_ParseTuple(args, "i", &boolArg)) {
diff --git a/source/gameengine/Ketsji/KX_TrackToActuator.h b/source/gameengine/Ketsji/KX_TrackToActuator.h
index 392e55402f1275d54b004890003907dcf41a09a9..cc4049e19a8b9f71cbf1099417faea7e84ff73b5 100644
--- a/source/gameengine/Ketsji/KX_TrackToActuator.h
+++ b/source/gameengine/Ketsji/KX_TrackToActuator.h
@@ -72,9 +72,13 @@ class KX_TrackToActuator : public SCA_IActuator
 	virtual bool Update(double curtime, bool frame);
 
 	/* Python part */
-	virtual PyObject* _getattr(const char *attr);
-	virtual int _setattr(const char *attr, PyObject* value);
-	
+	virtual PyObject* py_getattro(PyObject *attr);
+	virtual int py_setattro(PyObject *attr, PyObject* value);
+
+	/* These are used to get and set m_ob */
+	static PyObject* pyattr_get_object(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef);
+	static int pyattr_set_object(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef, PyObject *value);
+
 	/* 1. setObject */
 	KX_PYMETHOD_DOC_O(KX_TrackToActuator,SetObject);
 	/* 2. getObject */
diff --git a/source/gameengine/Ketsji/KX_VehicleWrapper.cpp b/source/gameengine/Ketsji/KX_VehicleWrapper.cpp
index 8d5af1b92164420787c109ef8e9ad8bb6f71b055..6afea4d3227bd62f5641c24424ea68163264aa56 100644
--- a/source/gameengine/Ketsji/KX_VehicleWrapper.cpp
+++ b/source/gameengine/Ketsji/KX_VehicleWrapper.cpp
@@ -299,36 +299,37 @@ PyObject* KX_VehicleWrapper::PyGetConstraintType(PyObject* self,
 
 //python specific stuff
 PyTypeObject KX_VehicleWrapper::Type = {
-	PyObject_HEAD_INIT(&PyType_Type)
+	PyObject_HEAD_INIT(NULL)
 		0,
 		"KX_VehicleWrapper",
 		sizeof(KX_VehicleWrapper),
 		0,
 		PyDestructor,
 		0,
-		__getattr,
-		__setattr,
-		0, //&MyPyCompare,
-		__repr,
-		0, //&cvalue_as_number,
 		0,
 		0,
 		0,
-		0
+		py_base_repr,
+		0,0,0,0,0,0,
+		py_base_getattro,
+		py_base_setattro,
+		0,0,0,0,0,0,0,0,0,
+		Methods
 };
 
 PyParentObject KX_VehicleWrapper::Parents[] = {
 	&KX_VehicleWrapper::Type,
+	&PyObjectPlus::Type,
 	NULL
 };
 
-PyObject*	KX_VehicleWrapper::_getattr(const char *attr)
+PyObject*	KX_VehicleWrapper::py_getattro(PyObject *attr)
 {
 	//here you can search for existing data members (like mass,friction etc.)
-	_getattr_up(PyObjectPlus);
+	py_getattro_up(PyObjectPlus);
 }
 
-int	KX_VehicleWrapper::_setattr(const char *attr,PyObject* pyobj)
+int	KX_VehicleWrapper::py_setattro(PyObject *attr,PyObject* pyobj)
 {
 	
 	PyTypeObject* type = pyobj->ob_type;
@@ -352,7 +353,7 @@ int	KX_VehicleWrapper::_setattr(const char *attr,PyObject* pyobj)
 		result = 0;
 	}
 	if (result)
-		result = PyObjectPlus::_setattr(attr,pyobj);
+		result = PyObjectPlus::py_setattro(attr,pyobj);
 	return result;
 };
 
diff --git a/source/gameengine/Ketsji/KX_VehicleWrapper.h b/source/gameengine/Ketsji/KX_VehicleWrapper.h
index cad926ce85a4e213624ce130b7d1d5d3dbe3afd6..4e03183bf8517f900d8d35b6a8d479277c1aa618 100644
--- a/source/gameengine/Ketsji/KX_VehicleWrapper.h
+++ b/source/gameengine/Ketsji/KX_VehicleWrapper.h
@@ -12,8 +12,8 @@ class PHY_IMotionState;
 class	KX_VehicleWrapper : public PyObjectPlus
 {
 	Py_Header;
-	virtual PyObject*		_getattr(const char *attr);
-	virtual int 			_setattr(const char *attr, PyObject *value);
+	virtual PyObject*		py_getattro(PyObject *attr);
+	virtual int 			py_setattro(PyObject *attr, PyObject *value);
 
 	std::vector<PHY_IMotionState*> m_motionStates;
 
diff --git a/source/gameengine/Ketsji/KX_VertexProxy.cpp b/source/gameengine/Ketsji/KX_VertexProxy.cpp
index da0e3dbdd8d007506276049b536280c34504f535..8c8291ef7914af512065cdd013eb02b10df9bf80 100644
--- a/source/gameengine/Ketsji/KX_VertexProxy.cpp
+++ b/source/gameengine/Ketsji/KX_VertexProxy.cpp
@@ -37,22 +37,22 @@
 #include "KX_PyMath.h"
 
 PyTypeObject KX_VertexProxy::Type = {
-	PyObject_HEAD_INIT(&PyType_Type)
+	PyObject_HEAD_INIT(NULL)
 	0,
 	"KX_VertexProxy",
 	sizeof(KX_VertexProxy),
 	0,
 	PyDestructor,
 	0,
-	__getattr,
-	__setattr,
-	0, //&MyPyCompare,
-	__repr,
-	0, //&cvalue_as_number,
 	0,
 	0,
 	0,
-	0
+	py_base_repr,
+	0,0,0,0,0,0,
+	py_base_getattro,
+	py_base_setattro,
+	0,0,0,0,0,0,0,0,0,
+	Methods
 };
 
 PyParentObject KX_VertexProxy::Parents[] = {
@@ -83,43 +83,43 @@ PyAttributeDef KX_VertexProxy::Attributes[] = {
 };
 
 PyObject*
-KX_VertexProxy::_getattr(const char *attr)
+KX_VertexProxy::py_getattro(PyObject *attr)
 {
-  
-  if (attr[1]=='\0') { // Group single letters
+  char *attr_str= PyString_AsString(attr);
+  if (attr_str[1]=='\0') { // Group single letters
     // pos
-    if (attr[0]=='x')
+    if (attr_str[0]=='x')
     	return PyFloat_FromDouble(m_vertex->getXYZ()[0]);
-    if (attr[0]=='y')
+    if (attr_str[0]=='y')
     	return PyFloat_FromDouble(m_vertex->getXYZ()[1]);
-    if (attr[0]=='z')
+    if (attr_str[0]=='z')
     	return PyFloat_FromDouble(m_vertex->getXYZ()[2]);
 
     // Col
-    if (attr[0]=='r')
+    if (attr_str[0]=='r')
     	return PyFloat_FromDouble(m_vertex->getRGBA()[0]/255.0);
-    if (attr[0]=='g')
+    if (attr_str[0]=='g')
     	return PyFloat_FromDouble(m_vertex->getRGBA()[1]/255.0);
-    if (attr[0]=='b')
+    if (attr_str[0]=='b')
     	return PyFloat_FromDouble(m_vertex->getRGBA()[2]/255.0);
-    if (attr[0]=='a')
+    if (attr_str[0]=='a')
     	return PyFloat_FromDouble(m_vertex->getRGBA()[3]/255.0);
 
     // UV
-    if (attr[0]=='u')
+    if (attr_str[0]=='u')
     	return PyFloat_FromDouble(m_vertex->getUV1()[0]);
-    if (attr[0]=='v')
+    if (attr_str[0]=='v')
     	return PyFloat_FromDouble(m_vertex->getUV1()[1]);
   }
   
   
-  if (!strcmp(attr, "XYZ"))
+  if (!strcmp(attr_str, "XYZ"))
   	return PyObjectFrom(MT_Vector3(m_vertex->getXYZ()));
 
-  if (!strcmp(attr, "UV"))
+  if (!strcmp(attr_str, "UV"))
   	return PyObjectFrom(MT_Point2(m_vertex->getUV1()));
 
-  if (!strcmp(attr, "color") || !strcmp(attr, "colour"))
+  if (!strcmp(attr_str, "color") || !strcmp(attr_str, "colour"))
   {
   	const unsigned char *colp = m_vertex->getRGBA();
 	MT_Vector4 color(colp[0], colp[1], colp[2], colp[3]);
@@ -127,19 +127,20 @@ KX_VertexProxy::_getattr(const char *attr)
   	return PyObjectFrom(color);
   }
   
-  if (!strcmp(attr, "normal"))
+  if (!strcmp(attr_str, "normal"))
   {
 	return PyObjectFrom(MT_Vector3(m_vertex->getNormal()));
   }
   
-  _getattr_up(SCA_IObject);
+  py_getattro_up(SCA_IObject);
 }
 
-int    KX_VertexProxy::_setattr(const char *attr, PyObject *pyvalue)
+int    KX_VertexProxy::py_setattro(PyObject *attr, PyObject *pyvalue)
 {
+  char *attr_str= PyString_AsString(attr);
   if (PySequence_Check(pyvalue))
   {
-	if (!strcmp(attr, "XYZ"))
+	if (!strcmp(attr_str, "XYZ"))
 	{
 		MT_Point3 vec;
 		if (PyVecTo(pyvalue, vec))
@@ -151,7 +152,7 @@ int    KX_VertexProxy::_setattr(const char *attr, PyObject *pyvalue)
 		return 1;
 	}
 	
-	if (!strcmp(attr, "UV"))
+	if (!strcmp(attr_str, "UV"))
 	{
 		MT_Point2 vec;
 		if (PyVecTo(pyvalue, vec))
@@ -163,7 +164,7 @@ int    KX_VertexProxy::_setattr(const char *attr, PyObject *pyvalue)
 		return 1;
 	}
 	
-	if (!strcmp(attr, "color") || !strcmp(attr, "colour"))
+	if (!strcmp(attr_str, "color") || !strcmp(attr_str, "colour"))
 	{
 		MT_Vector4 vec;
 		if (PyVecTo(pyvalue, vec))
@@ -175,7 +176,7 @@ int    KX_VertexProxy::_setattr(const char *attr, PyObject *pyvalue)
 		return 1;
 	}
 	
-	if (!strcmp(attr, "normal"))
+	if (!strcmp(attr_str, "normal"))
 	{
 		MT_Vector3 vec;
 		if (PyVecTo(pyvalue, vec))
@@ -193,7 +194,7 @@ int    KX_VertexProxy::_setattr(const char *attr, PyObject *pyvalue)
   	float val = PyFloat_AsDouble(pyvalue);
   	// pos
 	MT_Point3 pos(m_vertex->getXYZ());
-  	if (!strcmp(attr, "x"))
+  	if (!strcmp(attr_str, "x"))
 	{
 		pos.x() = val;
 		m_vertex->SetXYZ(pos);
@@ -201,7 +202,7 @@ int    KX_VertexProxy::_setattr(const char *attr, PyObject *pyvalue)
 		return 0;
 	}
 	
-  	if (!strcmp(attr, "y"))
+  	if (!strcmp(attr_str, "y"))
 	{
 		pos.y() = val;
 		m_vertex->SetXYZ(pos);
@@ -209,7 +210,7 @@ int    KX_VertexProxy::_setattr(const char *attr, PyObject *pyvalue)
 		return 0;
 	}
 	
-	if (!strcmp(attr, "z"))
+	if (!strcmp(attr_str, "z"))
 	{
 		pos.z() = val;
 		m_vertex->SetXYZ(pos);
@@ -219,7 +220,7 @@ int    KX_VertexProxy::_setattr(const char *attr, PyObject *pyvalue)
 	
 	// uv
 	MT_Point2 uv = m_vertex->getUV1();
-	if (!strcmp(attr, "u"))
+	if (!strcmp(attr_str, "u"))
 	{
 		uv[0] = val;
 		m_vertex->SetUV(uv);
@@ -227,7 +228,7 @@ int    KX_VertexProxy::_setattr(const char *attr, PyObject *pyvalue)
 		return 0;
 	}
 
-	if (!strcmp(attr, "v"))
+	if (!strcmp(attr_str, "v"))
 	{
 		uv[1] = val;
 		m_vertex->SetUV(uv);
@@ -237,7 +238,7 @@ int    KX_VertexProxy::_setattr(const char *attr, PyObject *pyvalue)
 
 	// uv
 	MT_Point2 uv2 = m_vertex->getUV2();
-	if (!strcmp(attr, "u2"))
+	if (!strcmp(attr_str, "u2"))
 	{
 		uv[0] = val;
 		m_vertex->SetUV2(uv);
@@ -245,7 +246,7 @@ int    KX_VertexProxy::_setattr(const char *attr, PyObject *pyvalue)
 		return 0;
 	}
 
-	if (!strcmp(attr, "v2"))
+	if (!strcmp(attr_str, "v2"))
 	{
 		uv[1] = val;
 		m_vertex->SetUV2(uv);
@@ -257,28 +258,28 @@ int    KX_VertexProxy::_setattr(const char *attr, PyObject *pyvalue)
 	unsigned int icol = *((const unsigned int *)m_vertex->getRGBA());
 	unsigned char *cp = (unsigned char*) &icol;
 	val *= 255.0;
-	if (!strcmp(attr, "r"))
+	if (!strcmp(attr_str, "r"))
 	{
 		cp[0] = (unsigned char) val;
 		m_vertex->SetRGBA(icol);
 		m_mesh->SetMeshModified(true);
 		return 0;
 	}
-	if (!strcmp(attr, "g"))
+	if (!strcmp(attr_str, "g"))
 	{
 		cp[1] = (unsigned char) val;
 		m_vertex->SetRGBA(icol);
 		m_mesh->SetMeshModified(true);
 		return 0;
 	}
-	if (!strcmp(attr, "b"))
+	if (!strcmp(attr_str, "b"))
 	{
 		cp[2] = (unsigned char) val;
 		m_vertex->SetRGBA(icol);
 		m_mesh->SetMeshModified(true);
 		return 0;
 	}
-	if (!strcmp(attr, "a"))
+	if (!strcmp(attr_str, "a"))
 	{
 		cp[3] = (unsigned char) val;
 		m_vertex->SetRGBA(icol);
@@ -287,7 +288,7 @@ int    KX_VertexProxy::_setattr(const char *attr, PyObject *pyvalue)
 	}
   }
   
-  return SCA_IObject::_setattr(attr, pyvalue);
+  return SCA_IObject::py_setattro(attr, pyvalue);
 }
 
 KX_VertexProxy::KX_VertexProxy(KX_MeshProxy*mesh, RAS_TexVert* vertex)
diff --git a/source/gameengine/Ketsji/KX_VertexProxy.h b/source/gameengine/Ketsji/KX_VertexProxy.h
index 2819607590460e9e753090aa3d2525b1a90d7229..26772fc7d60aed75ba2c89397d1cc00f5af02e19 100644
--- a/source/gameengine/Ketsji/KX_VertexProxy.h
+++ b/source/gameengine/Ketsji/KX_VertexProxy.h
@@ -54,8 +54,8 @@ public:
 
 
 // stuff for python integration
-	virtual PyObject* _getattr(const char *attr);
-	virtual int    _setattr(const char *attr, PyObject *pyvalue);
+	virtual PyObject* py_getattro(PyObject *attr);
+	virtual int    py_setattro(PyObject *attr, PyObject *pyvalue);
 
 	KX_PYMETHOD_NOARGS(KX_VertexProxy,GetXYZ);
 	KX_PYMETHOD_O(KX_VertexProxy,SetXYZ);
diff --git a/source/gameengine/Ketsji/KX_VisibilityActuator.cpp b/source/gameengine/Ketsji/KX_VisibilityActuator.cpp
index 0ec280080bd582546e684f6fa565cda14719dde5..35edd84f994dfb548e997b8bdb48c30f80f47ae3 100644
--- a/source/gameengine/Ketsji/KX_VisibilityActuator.cpp
+++ b/source/gameengine/Ketsji/KX_VisibilityActuator.cpp
@@ -90,24 +90,24 @@ KX_VisibilityActuator::Update()
 
 
 /* Integration hooks ------------------------------------------------------- */
-PyTypeObject 
-KX_VisibilityActuator::Type = {
-	PyObject_HEAD_INIT(&PyType_Type)
+PyTypeObject KX_VisibilityActuator::Type = {
+	PyObject_HEAD_INIT(NULL)
 	0,
 	"KX_VisibilityActuator",
 	sizeof(KX_VisibilityActuator),
 	0,
 	PyDestructor,
 	0,
-	__getattr,
-	__setattr,
-	0, //&MyPyCompare,
-	__repr,
-	0, //&cvalue_as_number,
 	0,
 	0,
 	0,
-	0
+	py_base_repr,
+	0,0,0,0,0,0,
+	py_base_getattro,
+	py_base_setattro,
+	0,0,0,0,0,0,0,0,0,
+	Methods
+
 };
 
 PyParentObject 
@@ -121,20 +121,34 @@ KX_VisibilityActuator::Parents[] = {
 
 PyMethodDef 
 KX_VisibilityActuator::Methods[] = {
-	{"set", (PyCFunction) KX_VisibilityActuator::sPySetVisible, 
-	 METH_VARARGS, (PY_METHODCHAR)SetVisible_doc},
+	// Deprecated ----->
+	{"set", (PyCFunction) KX_VisibilityActuator::sPySetVisible, METH_VARARGS,
+		(PY_METHODCHAR) SetVisible_doc},
+	// <-----
 	{NULL,NULL} //Sentinel
 };
 
 PyAttributeDef KX_VisibilityActuator::Attributes[] = {
+	KX_PYATTRIBUTE_BOOL_RW("visibility", KX_VisibilityActuator, m_visible),
+	KX_PYATTRIBUTE_BOOL_RW("recursion", KX_VisibilityActuator, m_recursive),
 	{ NULL }	//Sentinel
 };
 
-PyObject* KX_VisibilityActuator::_getattr(const char *attr) 
+PyObject* KX_VisibilityActuator::py_getattro(PyObject *attr)
 {
-	_getattr_up(SCA_IActuator);
-};
+	PyObject* object = py_getattro_self(Attributes, this, attr);
+	if (object != NULL)
+		return object;
+	py_getattro_up(SCA_IActuator);
+}
 
+int KX_VisibilityActuator::py_setattro(PyObject *attr, PyObject *value)
+{
+	int ret = py_setattro_self(Attributes, this, attr, value);
+	if (ret >= 0)
+		return ret;
+	return SCA_IActuator::py_setattro(attr, value);
+}
 
 
 /* set visibility ---------------------------------------------------------- */
@@ -149,6 +163,7 @@ KX_VisibilityActuator::PySetVisible(PyObject* self,
 				    PyObject* args, 
 				    PyObject* kwds) {
 	int vis;
+	ShowDeprecationWarning("SetVisible()", "the visible property");
 
 	if(!PyArg_ParseTuple(args, "i", &vis)) {
 		return NULL;
diff --git a/source/gameengine/Ketsji/KX_VisibilityActuator.h b/source/gameengine/Ketsji/KX_VisibilityActuator.h
index 323280de8cbc137ce0cb2d25dd915718dd74071c..fca375009157909b22466e7c927b45b2d0b322d1 100644
--- a/source/gameengine/Ketsji/KX_VisibilityActuator.h
+++ b/source/gameengine/Ketsji/KX_VisibilityActuator.h
@@ -67,9 +67,13 @@ class KX_VisibilityActuator : public SCA_IActuator
 	/* Python interface ---------------------------------------------------- */
 	/* --------------------------------------------------------------------- */
 
-	virtual PyObject* _getattr(const char *attr);
-	//KX_PYMETHOD_DOC
+	virtual PyObject* py_getattro(PyObject *attr);
+	virtual int py_setattro(PyObject *attr, PyObject *value);
+
+	// Deprecated ----->
 	KX_PYMETHOD_DOC(KX_VisibilityActuator,SetVisible);
+	// <-----
+
 
 };
 
diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp b/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
index 35602b4095a85c2980914716845e917341258f14..bb2f53a19883c90d069a160facc2133f1ae397fa 100644
--- a/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
+++ b/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
@@ -1569,14 +1569,35 @@ btCollisionShape* CcdShapeConstructionInfo::CreateBulletShape()
 			if (!m_unscaledShape)
 			{
 			
-				btTriangleIndexVertexArray* indexVertexArrays = new btTriangleIndexVertexArray(
-						m_polygonIndexArray.size(),
-						&m_triFaceArray[0],
-						3*sizeof(int),
-						m_vertexArray.size(),
-						(btScalar*) &m_vertexArray[0].x(),
-						sizeof(btVector3)
-				);
+				btTriangleIndexVertexArray* indexVertexArrays = 0;
+
+				///enable welding, only for the objects that need it (such as soft bodies)
+				if (0.f != m_weldingThreshold1)
+				{
+					btTriangleMesh* collisionMeshData = new btTriangleMesh(true,false);
+					collisionMeshData->m_weldingThreshold = m_weldingThreshold1;
+					bool removeDuplicateVertices=true;
+					// m_vertexArray not in multiple of 3 anymore, use m_triFaceArray
+					for(int i=0; i<m_triFaceArray.size(); i+=3) {
+						collisionMeshData->addTriangle(
+								m_vertexArray[m_triFaceArray[i]],
+								m_vertexArray[m_triFaceArray[i+1]],
+								m_vertexArray[m_triFaceArray[i+2]],
+								removeDuplicateVertices
+						);
+					}
+					indexVertexArrays = collisionMeshData;
+
+				} else
+				{
+					indexVertexArrays = new btTriangleIndexVertexArray(
+							m_polygonIndexArray.size(),
+							&m_triFaceArray[0],
+							3*sizeof(int),
+							m_vertexArray.size(),
+							(btScalar*) &m_vertexArray[0].x(),
+							sizeof(btVector3));
+				}
 				
 				// this shape will be shared and not deleted until shapeInfo is deleted
 				m_unscaledShape = new btBvhTriangleMeshShape( indexVertexArrays, true );
diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsController.h b/source/gameengine/Physics/Bullet/CcdPhysicsController.h
index 67dd82db5cc17add818a4d66b7829d46afc19ded..510454a7b630b61c41e0913dd3210fbbb74430fc 100644
--- a/source/gameengine/Physics/Bullet/CcdPhysicsController.h
+++ b/source/gameengine/Physics/Bullet/CcdPhysicsController.h
@@ -72,7 +72,7 @@ public:
 		m_meshObject(NULL),
 		m_unscaledShape(NULL),
 		m_useGimpact(false),
-		m_weldingThreshold(0.f),
+		m_weldingThreshold1(0.f),
 		m_shapeProxy(NULL)
 	{
 		m_childTrans.setIdentity();
@@ -171,13 +171,13 @@ public:
 	std::vector<int>		m_triFaceArray;	// Contains an array of triplets of face indicies
 											// quads turn into 2 tris
 
-	void	setVertexWeldingThreshold(float threshold)
+	void	setVertexWeldingThreshold1(float threshold)
 	{
-		m_weldingThreshold  = threshold;
+		m_weldingThreshold1  = threshold;
 	}
-	float	getVertexWeldingThreshold() const
+	float	getVertexWeldingThreshold1() const
 	{
-		return m_weldingThreshold;
+		return m_weldingThreshold1;
 	}
 protected:
 	static std::map<RAS_MeshObject*, CcdShapeConstructionInfo*> m_meshShapeMap;
@@ -188,7 +188,7 @@ protected:
 											// the actual shape is of type btScaledBvhTriangleMeshShape
 	std::vector<CcdShapeConstructionInfo*> m_shapeArray;	// for compound shapes
 	bool	m_useGimpact; //use gimpact for concave dynamic/moving collision detection
-	float	m_weldingThreshold;	//welding closeby vertices together can improve softbody stability etc. // Not used at the moment, maybe remove?
+	float	m_weldingThreshold1;	//welding closeby vertices together can improve softbody stability etc.
 	CcdShapeConstructionInfo* m_shapeProxy;	// only used for PHY_SHAPE_PROXY, pointer to actual shape info
 };
 
diff --git a/source/gameengine/PyDoc/GameLogic.py b/source/gameengine/PyDoc/GameLogic.py
index 0524a9df355cb460f4189b0c767d06e71cfcea25..f158b41097534d9829eecc7c86ced84318ea87eb 100644
--- a/source/gameengine/PyDoc/GameLogic.py
+++ b/source/gameengine/PyDoc/GameLogic.py
@@ -72,6 +72,7 @@ Documentation for the GameLogic Module.
 		- L{SoundActuator<KX_SoundActuator.KX_SoundActuator>}
 		- L{TrackToActuator<KX_TrackToActuator.KX_TrackToActuator>}
 		- L{VisibilityActuator<KX_VisibilityActuator.KX_VisibilityActuator>}
+		- L{DynamicActuator<KX_SCA_DynamicActuator.KX_SCA_DynamicActuator>}
 	
 	Most logic brick's methods are accessors for the properties available in the logic buttons.
 	Consult the logic bricks documentation for more information on how each logic brick works.
@@ -148,6 +149,22 @@ Documentation for the GameLogic Module.
 @var KX_RADAR_AXIS_NEG_X:		    See L{KX_RadarSensor}
 @var KX_RADAR_AXIS_NEG_Y:		    See L{KX_RadarSensor}
 @var KX_RADAR_AXIS_NEG_Z:		    See L{KX_RadarSensor}
+
+@group Ray Sensor: KX_RAY_AXIS_POS_X, KX_RAY_AXIS_POS_Y, KX_RAY_AXIS_POS_Z, KX_RAY_AXIS_NEG_X, KX_RAY_AXIS_NEG_Y, KX_RAY_AXIS_NEG_Z
+@var KX_RAY_AXIS_POS_X:		    See L{KX_RaySensor}
+@var KX_RAY_AXIS_POS_Y:		    See L{KX_RaySensor}
+@var KX_RAY_AXIS_POS_Z:		    See L{KX_RaySensor}
+@var KX_RAY_AXIS_NEG_X:		    See L{KX_RaySensor}
+@var KX_RAY_AXIS_NEG_Y:		    See L{KX_RaySensor}
+@var KX_RAY_AXIS_NEG_Z:		    See L{KX_RaySensor}
+
+@group Dynamic Actuator: KX_DYN_RESTORE_DYNAMICS, KX_DYN_DISABLE_DYNAMICS, KX_DYN_ENABLE_RIGID_BODY, KX_DYN_DISABLE_RIGID_BODY,	KX_DYN_SET_MASS
+@var KX_DYN_RESTORE_DYNAMICS:	See L{KX_SCA_DynamicActuator}
+@var KX_DYN_DISABLE_DYNAMICS:	See L{KX_SCA_DynamicActuator}
+@var KX_DYN_ENABLE_RIGID_BODY:	See L{KX_SCA_DynamicActuator}
+@var KX_DYN_DISABLE_RIGID_BODY:	See L{KX_SCA_DynamicActuator}
+@var KX_DYN_SET_MASS:			See L{KX_SCA_DynamicActuator}
+
 """
 
 
diff --git a/source/gameengine/PyDoc/KX_CDActuator.py b/source/gameengine/PyDoc/KX_CDActuator.py
index 2c202476584548618f50cd6e07cf0246688c0081..ffc8ddefa43344acc15cd697a7f76c9c55f816b6 100644
--- a/source/gameengine/PyDoc/KX_CDActuator.py
+++ b/source/gameengine/PyDoc/KX_CDActuator.py
@@ -3,6 +3,13 @@
 from SCA_IActuator import *
 
 class KX_CDActuator(SCA_IActuator):
+    """
+    CD Controller actuator.
+    @ivar volume: controls the volume to set the CD to. 0.0 = silent, 1.0 = max volume.
+    @type volume: float
+    @ivar track: the track selected to be played
+    @type track: integer
+    """
 	def startCD():
 		"""
 		Starts the CD playing.
@@ -15,8 +22,21 @@ class KX_CDActuator(SCA_IActuator):
 		"""
 		Pauses the CD.
 		"""
+	def resumeCD():
+		"""
+		Resumes the CD after a pause.
+		"""
+    def playAll():
+        """
+        Plays the CD from the beginning.
+        """
+    def playTrack(trackNumber):
+        """
+        Plays the track selected.
+        """
 	def setGain(gain):
 		"""
+        DEPRECATED: Use the volume property.
 		Sets the gain (volume) of the CD.
 		
 		@type gain: float
@@ -24,6 +44,7 @@ class KX_CDActuator(SCA_IActuator):
 		"""
 	def getGain():
 		"""
+        DEPRECATED: Use the volume property.
 		Gets the current gain (volume) of the CD.
 		
 		@rtype: float
diff --git a/source/gameengine/PyDoc/KX_NetworkMessageActuator.py b/source/gameengine/PyDoc/KX_NetworkMessageActuator.py
index aecd28977434d93eeea79c00820e498c06b0eb35..c9f48d47eb80d56159c8ce9f6715fd3f6fa38584 100644
--- a/source/gameengine/PyDoc/KX_NetworkMessageActuator.py
+++ b/source/gameengine/PyDoc/KX_NetworkMessageActuator.py
@@ -5,21 +5,33 @@ from SCA_IActuator import *
 class KX_NetworkMessageActuator(SCA_IActuator):
 	"""
 	Message Actuator
+	
+	@ivar propName: Messages will only be sent to objects with the given property name.
+	@type propName: string
+	@ivar subject: The subject field of the message.
+	@type subject: string
+	@ivar body: The body of the message.
+	@type body: string
+	@ivar usePropBody: Send a property instead of a regular body message.
+	@type usePropBody: boolean
 	"""
 	def setToPropName(name):
 		"""
+		DEPRECATED: Use the propName property instead.
 		Messages will only be sent to objects with the given property name.
 		
 		@type name: string
 		"""
 	def setSubject(subject):
 		"""
+		DEPRECATED: Use the subject property instead.
 		Sets the subject field of the message.
 		
 		@type subject: string
 		"""
 	def setBodyType(bodytype):
 		"""
+		DEPRECATED: Use the usePropBody property instead.
 		Sets the type of body to send.
 		
 		@type bodytype: boolean
@@ -27,6 +39,7 @@ class KX_NetworkMessageActuator(SCA_IActuator):
 		"""
 	def setBody(body):
 		"""
+		DEPRECATED: Use the body property instead.
 		Sets the message body.
 		
 		@type body: string
diff --git a/source/gameengine/PyDoc/KX_NetworkMessageSensor.py b/source/gameengine/PyDoc/KX_NetworkMessageSensor.py
index 8f5f3609df753fb66371d95400d7ef97b27c98b9..0fecad58437598e3e17f1181a29596d56eab3d0c 100644
--- a/source/gameengine/PyDoc/KX_NetworkMessageSensor.py
+++ b/source/gameengine/PyDoc/KX_NetworkMessageSensor.py
@@ -7,9 +7,22 @@ class KX_NetworkMessageSensor(SCA_ISensor):
 	The Message Sensor logic brick.
 	
 	Currently only loopback (local) networks are supported.
+	
+	@ivar subject: The subject the sensor is looking for.
+	@type subject: string
+	@ivar frameMessageCount: The number of messages received since the last frame.
+								(Read-only)
+	@type framemessageCount: int
+	@ivar subjects: The list of message subjects received. (Read-only)
+	@type subjects: list of strings
+	@ivar bodies: The list of message bodies received. (Read-only)
+	@type bodies: list of strings
 	"""
+	
+	
 	def setSubjectFilterText(subject):
 		"""
+		DEPRECATED: Use the subject property instead.
 		Change the message subject text that this sensor is listening to.
 		
 		@type subject: string
@@ -18,24 +31,28 @@ class KX_NetworkMessageSensor(SCA_ISensor):
 	
 	def getFrameMessageCount():
 		"""
+		DEPRECATED: Use the frameMessageCount property instead.
 		Get the number of messages received since the last frame.
 		
 		@rtype: integer
 		"""
 	def getBodies():
 		"""
+		DEPRECATED: Use the bodies property instead.
 		Gets the list of message bodies.
 		
 		@rtype: list
 		"""
 	def getSubject():
 		"""
+		DEPRECATED: Use the subject property instead.
 		Gets the message subject this sensor is listening for from the Subject: field.
 		
 		@rtype: string
 		"""
 	def getSubjects():
 		"""
+		DEPRECATED: Use the subjects property instead.
 		Gets the list of message subjects received.
 		
 		@rtype: list
diff --git a/source/gameengine/PyDoc/KX_ParentActuator.py b/source/gameengine/PyDoc/KX_ParentActuator.py
index 7b5625ec82dcd532699c4e6382efae1ba4614e29..4a5f72e7cc289960f671735c5f4cbc4a6bbfd0a7 100644
--- a/source/gameengine/PyDoc/KX_ParentActuator.py
+++ b/source/gameengine/PyDoc/KX_ParentActuator.py
@@ -1,16 +1,16 @@
-# $Id: KX_ParentActuator.py 2615 2004-06-02 12:43:27Z kester $
+# $Id$
 # Documentation for KX_ParentActuator
 from SCA_IActuator import *
 
 class KX_ParentActuator(SCA_IActuator):
 	"""
-	The parent actuator can set or remove an objects parent object.
-	
+	The parent actuator can set or remove an objects parent object.	
 	@ivar object: the object this actuator sets the parent too.
 	@type object: KX_GameObject or None
 	"""
 	def setObject(object):
 		"""
+        DEPRECATED: Use the object property.
 		Sets the object to set as parent.
 		
 		Object can be either a L{KX_GameObject} or the name of the object.
@@ -19,6 +19,7 @@ class KX_ParentActuator(SCA_IActuator):
 		"""
 	def getObject(name_only = 1):
 		"""
+        DEPRECATED: Use the object property.
 		Returns the name of the object to change to.
 		@type name_only: bool
 		@param name_only: optional argument, when 0 return a KX_GameObject
diff --git a/source/gameengine/PyDoc/KX_RaySensor.py b/source/gameengine/PyDoc/KX_RaySensor.py
index e487edcb655113610bb203ec60493d8c1b29b338..b9de54e92a5e59be21be24648ad67b94f9dd6e19 100644
--- a/source/gameengine/PyDoc/KX_RaySensor.py
+++ b/source/gameengine/PyDoc/KX_RaySensor.py
@@ -5,28 +5,53 @@ from SCA_ISensor import *
 class KX_RaySensor(SCA_ISensor):
 	"""
 	A ray sensor detects the first object in a given direction.
+	
+	@ivar property: The property the ray is looking for.
+	@type property: string
+	@ivar range: The distance of the ray.
+	@type range: float
+	@ivar useMaterial: Whether or not to look for a material (false = property)
+	@type useMaterial: boolean
+	@ivar useXRay: Whether or not to use XRay.
+	@type useXRay: boolean
+	@ivar hitObject: The game object that was hit by the ray. (Read-only)
+	@type hitObject: KX_GameObject
+	@ivar hitPosition: The position (in worldcoordinates) where the object was hit by the ray. (Read-only)
+	@type hitPosition: list [x, y, z]
+	@ivar hitNormal: The normal (in worldcoordinates) of the object at the location where the object was hit by the ray. (Read-only)
+	@type hitNormal: list [x, y, z]
+	@ivar rayDirection: The direction from the ray (in worldcoordinates). (Read-only)
+	@type rayDirection: list [x, y, z]
+	@ivar axis: The axis the ray is pointing on.
+	@type axis: int from 0 to 5
+		KX_RAY_AXIS_POS_X, KX_RAY_AXIS_POS_Y, KX_RAY_AXIS_POS_Z,
+		KX_RAY_AXIS_NEG_X, KX_RAY_AXIS_NEG_Y, KX_RAY_AXIS_NEG_Z
 	"""
 	
 	def getHitObject():
 		"""
+		DEPRECATED: Use the hitObject property instead.
 		Returns the game object that was hit by this ray.
 		
 		@rtype: KX_GameObject
 		"""
 	def getHitPosition():
 		"""
+		DEPRECATED: Use the hitPosition property instead.
 		Returns the position (in worldcoordinates) where the object was hit by this ray.
 		
 		@rtype: list [x, y, z]
 		"""
 	def getHitNormal():
 		"""
+		DEPRECATED: Use the hitNormal property instead.
 		Returns the normal (in worldcoordinates) of the object at the location where the object was hit by this ray.
 		
 		@rtype: list [nx, ny, nz]
 		"""
 	def getRayDirection():
 		"""
+		DEPRECATED: Use the rayDirection property instead.
 		Returns the direction from the ray (in worldcoordinates)
 		
 		@rtype: list [dx, dy, dz]
diff --git a/source/gameengine/PyDoc/KX_SCA_DynamicActuator.py b/source/gameengine/PyDoc/KX_SCA_DynamicActuator.py
new file mode 100644
index 0000000000000000000000000000000000000000..a6a3bce1f31323163041611a3a94fd50e664a184
--- /dev/null
+++ b/source/gameengine/PyDoc/KX_SCA_DynamicActuator.py
@@ -0,0 +1,30 @@
+# $Id$
+# Documentation for  KX_SCA_DynamicActuator
+from SCA_IActuator import *
+
+class KX_SCA_DynamicActuator(SCA_IActuator):
+	"""
+	Dynamic Actuator.
+    @ivar operation: the type of operation of the actuator, 0-4
+                     KX_DYN_RESTORE_DYNAMICS, KX_DYN_DISABLE_DYNAMICS, 
+                     KX_DYN_ENABLE_RIGID_BODY, KX_DYN_DISABLE_RIGID_BODY, KX_DYN_SET_MASS
+    @type operation: integer
+    @ivar mass: the mass value for the KX_DYN_SET_MASS operation
+    @type mass: float
+	"""
+	def setOperation(operation):
+		"""
+        DEPRECATED: Use the operation property instead.
+		Set the type of operation when the actuator is activated:
+                0 = restore dynamics
+                1 = disable dynamics
+                2 = enable rigid body
+                3 = disable rigid body
+                4 = set mass
+        """
+	def getOperatoin()
+		"""
+        DEPRECATED: Use the operation property instead.
+		return the type of operation
+		"""
+	
diff --git a/source/gameengine/PyDoc/KX_SCA_ReplaceMeshActuator.py b/source/gameengine/PyDoc/KX_SCA_ReplaceMeshActuator.py
index 498f6072e23afd7df3e6c97d54d5d0a59616069e..1013dd53cb966aa52680d5c1a9eabedeca8d0f86 100644
--- a/source/gameengine/PyDoc/KX_SCA_ReplaceMeshActuator.py
+++ b/source/gameengine/PyDoc/KX_SCA_ReplaceMeshActuator.py
@@ -55,9 +55,15 @@ class KX_SCA_ReplaceMeshActuator(SCA_IActuator):
 		This will generate a warning in the console:
 		
 		C{ERROR: GameObject I{OBName} ReplaceMeshActuator I{ActuatorName} without object}
+		
+	Properties:
+	@ivar mesh: L{KX_MeshProxy} or the name of the mesh that will replace the current one
+	            Set to None to disable actuator
+	@type mesh: L{KX_MeshProxy} or None if no mesh is set
 	"""
 	def setMesh(name):
 		"""
+        DEPRECATED: Use the mesh property instead.
 		Sets the name of the mesh that will replace the current one.
 		When the name is None it will unset the mesh value so no action is taken.
 		
@@ -65,6 +71,7 @@ class KX_SCA_ReplaceMeshActuator(SCA_IActuator):
 		"""
 	def getMesh():
 		"""
+        DEPRECATED: Use the mesh property instead.
 		Returns the name of the mesh that will replace the current one.
 		
 		Returns None if no mesh has been scheduled to be added.
diff --git a/source/gameengine/PyDoc/KX_TrackToActuator.py b/source/gameengine/PyDoc/KX_TrackToActuator.py
index 730ab21166bda5375db484f25e0f24ecf602d18b..ff533e22ac0fea6192608f5c07bbffe9ba2c3929 100644
--- a/source/gameengine/PyDoc/KX_TrackToActuator.py
+++ b/source/gameengine/PyDoc/KX_TrackToActuator.py
@@ -15,9 +15,15 @@ class KX_TrackToActuator(SCA_IActuator):
 
 	@ivar object: the object this actuator tracks.
 	@type object: KX_GameObject or None
+	@ivar time: the time in frames with which to delay the tracking motion
+	@type time: integer
+	@ivar use3D: the tracking motion to use 3D
+	@type use3D: boolean
+	
 	"""
 	def setObject(object):
 		"""
+        DEPRECATED: Use the object property.
 		Sets the object to track.
 		
 		@type object: L{KX_GameObject}, string or None
@@ -25,6 +31,7 @@ class KX_TrackToActuator(SCA_IActuator):
 		"""
 	def getObject(name_only):
 		"""
+        DEPRECATED: Use the object property.
 		Returns the name of the object to track.
 		
 		@type name_only: bool
@@ -33,18 +40,21 @@ class KX_TrackToActuator(SCA_IActuator):
 		"""
 	def setTime(time):
 		"""
+        DEPRECATED: Use the time property.
 		Sets the time in frames with which to delay the tracking motion.
 		
 		@type time: integer
 		"""
 	def getTime():
 		"""
+        DEPRECATED: Use the time property.
 		Returns the time in frames with which the tracking motion is delayed.
 		
 		@rtype: integer
 		"""
 	def setUse3D(use3d):
 		"""
+        DEPRECATED: Use the use3D property.
 		Sets the tracking motion to use 3D.
 		
 		@type use3d: boolean
@@ -53,6 +63,7 @@ class KX_TrackToActuator(SCA_IActuator):
 		"""
 	def getUse3D():
 		"""
+        DEPRECATED: Use the use3D property.
 		Returns True if the tracking motion will track in the z direction.
 		
 		@rtype: boolean
diff --git a/source/gameengine/PyDoc/KX_VisibilityActuator.py b/source/gameengine/PyDoc/KX_VisibilityActuator.py
index 22499f25d8100d4bd5c6a2811bb539696681c6d8..17d22fa5f83502ac4d8fe0dc850e0a3704f5b6ac 100644
--- a/source/gameengine/PyDoc/KX_VisibilityActuator.py
+++ b/source/gameengine/PyDoc/KX_VisibilityActuator.py
@@ -5,13 +5,18 @@ from SCA_IActuator import *
 class KX_VisibilityActuator(SCA_IActuator):
 	"""
 	Visibility Actuator.
+    @ivar visibility: whether the actuator makes its parent object visible or invisible
+    @type visibility: boolean
+    @ivar recursion: whether the visibility/invisibility should be propagated to all children of the object
+    @type recursion: boolean
 	"""
 	def set(visible):
 		"""
+        DEPRECATED: Use the visibility property instead.
 		Sets whether the actuator makes its parent object visible or invisible.
 		
 		@param visible: - True: Makes its parent visible.
 		                - False: Makes its parent invisible.
 		"""
 
-	
\ No newline at end of file
+	
diff --git a/source/gameengine/PyDoc/SCA_JoystickSensor.py b/source/gameengine/PyDoc/SCA_JoystickSensor.py
index 111ee7f4cfaea595d795b76dc6b00eabfb736a70..944ff64dc64a98b0868f77872e8a5536671903a6 100644
--- a/source/gameengine/PyDoc/SCA_JoystickSensor.py
+++ b/source/gameengine/PyDoc/SCA_JoystickSensor.py
@@ -1,4 +1,4 @@
-# $Id: SCA_RandomSensor.py 15444 2008-07-05 17:05:05Z lukep $
+# $Id$
 # Documentation for SCA_RandomSensor
 from SCA_ISensor import *