From cff2bc02a1bbe987070e5b072fc8c68dfad09ddb Mon Sep 17 00:00:00 2001
From: James Turk <james.p.turk@gmail.com>
Date: Sun, 27 Apr 2003 19:18:07 +0000
Subject: [PATCH] 0.8.3

---
 vc6/ZEngine.dsp    | 108 ++++++++++++++++++++--------------------
 vc6/ZEngine.dsw    |  37 +++++++++++---
 vc6/ZFontTest.dsp  | 119 ++++++++++-----------------------------------
 vc6/ZImageTest.dsp | 119 ++++++++++-----------------------------------
 vc6/ZMouseTest.dsp | 119 ++++++++++-----------------------------------
 vc6/ZMusicTest.dsp |  72 ++++++++++-----------------
 vc6/ZRectTest.dsp  |  72 ++++++++++-----------------
 vc6/ZSoundTest.dsp |  72 ++++++++++-----------------
 vc6/ZTimerTest.dsp |  72 ++++++++++-----------------
 9 files changed, 271 insertions(+), 519 deletions(-)

diff --git a/vc6/ZEngine.dsp b/vc6/ZEngine.dsp
index 9315fa0..d61ff42 100755
--- a/vc6/ZEngine.dsp
+++ b/vc6/ZEngine.dsp
@@ -4,7 +4,7 @@
 
 # TARGTYPE "Win32 (x86) Static Library" 0x0104
 
-CFG=ZEngine - Win32 Debug
+CFG=ZEngine - Win32 Release
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
@@ -13,12 +13,11 @@ CFG=ZEngine - Win32 Debug
 !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 "ZEngine.mak" CFG="ZEngine - Win32 Debug"
+!MESSAGE NMAKE /f "ZEngine.mak" CFG="ZEngine - Win32 Release"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
 !MESSAGE "ZEngine - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "ZEngine - Win32 Debug" (based on "Win32 (x86) Static Library")
 !MESSAGE 
 
 # Begin Project
@@ -26,6 +25,7 @@ CFG=ZEngine - Win32 Debug
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
 CPP=cl.exe
+MTL=midl.exe
 RSC=rc.exe
 
 !IF  "$(CFG)" == "ZEngine - Win32 Release"
@@ -40,60 +40,38 @@ RSC=rc.exe
 # PROP Output_Dir "Release"
 # PROP Intermediate_Dir "Release"
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
+# ADD BASE CPP /nologo /MD /I "../include" /Zi /W4 /WX /O2 /Ob1 /Oy /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /GF /Gy PRECOMP_VC7_TOBEREMOVED /c /GX 
+# ADD CPP /nologo /MD /I "../include" /Zi /W4 /WX /O2 /Ob1 /Oy /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /GF /Gy PRECOMP_VC7_TOBEREMOVED /c /GX 
+# ADD BASE MTL /nologo /win32 
+# ADD MTL /nologo /win32 
+# ADD BASE RSC /l 1033 
+# ADD RSC /l 1033 
 BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
+# ADD BASE BSC32 /nologo 
+# ADD BSC32 /nologo 
 LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"../lib\ZEngineS.lib"
+# ADD BASE LIB32 /nologo /out:"..\lib\ZEngineS.lib" 
+# ADD LIB32 /nologo /out:"..\lib\ZEngineS.lib" 
 
-!ELSEIF  "$(CFG)" == "ZEngine - 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 "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /MD /W3 /Gm /GX /ZI /Od /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 /o"../lib/ZEngine.bsc"
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"../lib\ZEngineSD.lib"
-
-!ENDIF 
+!ENDIF
 
 # Begin Target
 
 # Name "ZEngine - Win32 Release"
-# Name "ZEngine - Win32 Debug"
-# Begin Group "Source Files"
+# Begin Group "Source Implementations"
 
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\src\external\physfsrwops.cpp
-# End Source File
+# PROP Default_Filter "cpp;c;cxx;def;odl;idl;hpj;bat;asm"
 # Begin Source File
 
 SOURCE=..\src\external\SDLGL_Util.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\ZE_ZError.cpp
+SOURCE=..\src\ZE_Utility.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\ZE_ZClient.cpp
 # End Source File
 # Begin Source File
 
@@ -105,6 +83,10 @@ SOURCE=..\src\ZE_ZEngine.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\src\ZE_ZError.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\src\ZE_ZFont.cpp
 # End Source File
 # Begin Source File
@@ -118,10 +100,17 @@ SOURCE=..\src\ZE_ZMusic.cpp
 # Begin Source File
 
 SOURCE=..\src\ZE_ZRect.cpp
+
+!IF  "$(CFG)" == "ZEngine - Win32 Release"
+
+# PROP Intermediate_Dir "$(IntDir)/$(InputName)1.obj"
+# ADD CPP /nologo /Fo"$(IntDir)/$(InputName)1.obj" /GX 
+!ENDIF
+
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\ZE_Utility.cpp
+SOURCE=..\src\ZE_ZServer.cpp
 # End Source File
 # Begin Source File
 
@@ -131,14 +120,14 @@ SOURCE=..\src\ZE_ZSound.cpp
 
 SOURCE=..\src\ZE_ZTimer.cpp
 # End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
 # Begin Source File
 
-SOURCE=..\include\external\physfsrwops.h
+SOURCE=..\src\external\physfsrwops.cpp
 # End Source File
+# End Group
+# Begin Group "Source Headers"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl;inc"
 # Begin Source File
 
 SOURCE=..\include\external\SDLGL_Util.h
@@ -149,10 +138,6 @@ SOURCE=..\include\ZE_Defines.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\ZE_ZError.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\include\ZE_Includes.h
 # End Source File
 # Begin Source File
@@ -161,6 +146,10 @@ SOURCE=..\include\ZE_Utility.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\ZE_ZClient.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\ZE_ZConfigFile.h
 # End Source File
 # Begin Source File
@@ -169,6 +158,10 @@ SOURCE=..\include\ZE_ZEngine.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\ZE_ZError.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\ZE_ZFont.h
 # End Source File
 # Begin Source File
@@ -181,11 +174,11 @@ SOURCE=..\include\ZE_ZMusic.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\ZE_ZObject.h
+SOURCE=..\include\ZE_ZRect.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\ZE_ZRect.h
+SOURCE=..\include\ZE_ZServer.h
 # End Source File
 # Begin Source File
 
@@ -199,6 +192,11 @@ SOURCE=..\include\ZE_ZTimer.h
 
 SOURCE=..\include\ZEngine.h
 # End Source File
+# Begin Source File
+
+SOURCE=..\include\external\physfsrwops.h
+# End Source File
 # End Group
 # End Target
 # End Project
+
diff --git a/vc6/ZEngine.dsw b/vc6/ZEngine.dsw
index d9e48d1..0b7375c 100755
--- a/vc6/ZEngine.dsw
+++ b/vc6/ZEngine.dsw
@@ -3,7 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
 
 ###############################################################################
 
-Project: "ZEngine"=".\ZEngine.dsp" - Package Owner=<4>
+Project: "ZEngine"=ZEngine.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -15,7 +15,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "ZFontTest"=".\ZFontTest.dsp" - Package Owner=<4>
+Project: "ZImageTest"=ZImageTest.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -23,11 +23,14 @@ Package=<5>
 
 Package=<4>
 {{{
+    Begin Project Dependency
+    Project_Dep_Name ZEngine
+    End Project Dependency
 }}}
 
 ###############################################################################
 
-Project: "ZImageTest"=".\ZImageTest.dsp" - Package Owner=<4>
+Project: "ZFontTest"=ZFontTest.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -35,11 +38,14 @@ Package=<5>
 
 Package=<4>
 {{{
+    Begin Project Dependency
+    Project_Dep_Name ZEngine
+    End Project Dependency
 }}}
 
 ###############################################################################
 
-Project: "ZMouseTest"=".\ZMouseTest.dsp" - Package Owner=<4>
+Project: "ZTimerTest"=ZTimerTest.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -47,11 +53,14 @@ Package=<5>
 
 Package=<4>
 {{{
+    Begin Project Dependency
+    Project_Dep_Name ZEngine
+    End Project Dependency
 }}}
 
 ###############################################################################
 
-Project: "ZMusicTest"=".\ZMusicTest.dsp" - Package Owner=<4>
+Project: "ZMusicTest"=ZMusicTest.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -59,11 +68,14 @@ Package=<5>
 
 Package=<4>
 {{{
+    Begin Project Dependency
+    Project_Dep_Name ZEngine
+    End Project Dependency
 }}}
 
 ###############################################################################
 
-Project: "ZRectTest"=".\ZRectTest.dsp" - Package Owner=<4>
+Project: "ZSoundTest"=ZSoundTest.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -71,11 +83,14 @@ Package=<5>
 
 Package=<4>
 {{{
+    Begin Project Dependency
+    Project_Dep_Name ZEngine
+    End Project Dependency
 }}}
 
 ###############################################################################
 
-Project: "ZSoundTest"=".\ZSoundTest.dsp" - Package Owner=<4>
+Project: "ZMouseTest"=ZMouseTest.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -83,11 +98,14 @@ Package=<5>
 
 Package=<4>
 {{{
+    Begin Project Dependency
+    Project_Dep_Name ZEngine
+    End Project Dependency
 }}}
 
 ###############################################################################
 
-Project: "ZTimerTest"=".\ZTimerTest.dsp" - Package Owner=<4>
+Project: "ZRectTest"=ZRectTest.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -95,6 +113,9 @@ Package=<5>
 
 Package=<4>
 {{{
+    Begin Project Dependency
+    Project_Dep_Name ZEngine
+    End Project Dependency
 }}}
 
 ###############################################################################
diff --git a/vc6/ZFontTest.dsp b/vc6/ZFontTest.dsp
index a3a20c3..f254cc4 100755
--- a/vc6/ZFontTest.dsp
+++ b/vc6/ZFontTest.dsp
@@ -4,7 +4,7 @@
 
 # TARGTYPE "Win32 (x86) Application" 0x0101
 
-CFG=ZFontTest - Win32 Debug
+CFG=ZFontTest - Win32 Release
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
@@ -13,11 +13,10 @@ CFG=ZFontTest - Win32 Debug
 !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 "ZFontTest.mak" CFG="ZFontTest - Win32 Debug"
+!MESSAGE NMAKE /f "ZFontTest.mak" CFG="ZFontTest - Win32 Release"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "ZFontTest - Win32 Debug" (based on "Win32 (x86) Application")
 !MESSAGE "ZFontTest - Win32 Release" (based on "Win32 (x86) Application")
 !MESSAGE 
 
@@ -29,35 +28,7 @@ CPP=cl.exe
 MTL=midl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "ZFontTest - 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 /MD /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /GZ PRECOMP_VC7_TOBEREMOVED /c
-# ADD CPP /nologo /MD /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /GZ PRECOMP_VC7_TOBEREMOVED /c
-# ADD BASE MTL /nologo /win32
-# ADD MTL /nologo /win32
-# ADD BASE RSC /l 0x409
-# 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 sdl.lib sdlmain.lib opengl32.lib sdl_ttf.lib sdl_mixer.lib sdl_image.lib physfs.lib ZEngineSD.lib /nologo /subsystem:windows /pdb:"Debug\ZFontTest.pdb" /debug /machine:IX86 /out:"..\test\bin\ZFontTestD.exe" /pdbtype:sept
-# SUBTRACT BASE LINK32 /pdb:none
-# 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 sdl.lib sdlmain.lib opengl32.lib sdl_ttf.lib sdl_mixer.lib sdl_image.lib ZEngineSD.lib /nologo /subsystem:windows /pdb:"Debug\ZFontTest.pdb" /debug /machine:IX86 /out:"..\test\bin\ZFontTestD.exe" /pdbtype:sept
-# SUBTRACT LINK32 /pdb:none
-
-!ELSEIF  "$(CFG)" == "ZFontTest - Win32 Release"
+!IF  "$(CFG)" == "ZFontTest - Win32 Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -68,77 +39,41 @@ LINK32=link.exe
 # 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 /MD /W3 /GX /Zi /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /GF PRECOMP_VC7_TOBEREMOVED /c
-# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /GF PRECOMP_VC7_TOBEREMOVED /c
-# ADD BASE MTL /nologo /win32
-# ADD MTL /nologo /win32
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
+# ADD BASE CPP /nologo /MD /I "../include" /Zi /W3 /O2 /Ob1 /Oy /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /GF /Gy PRECOMP_VC7_TOBEREMOVED /c /GX 
+# ADD CPP /nologo /MD /I "../include" /Zi /W3 /O2 /Ob1 /Oy /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /GF /Gy PRECOMP_VC7_TOBEREMOVED /c /GX 
+# ADD BASE MTL /nologo /win32 
+# ADD MTL /nologo /win32 
+# ADD BASE RSC /l 1033 
+# ADD RSC /l 1033 
 BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
+# 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 sdl.lib sdlmain.lib opengl32.lib sdl_ttf.lib sdl_mixer.lib sdl_image.lib physfs.lib ZEngineS.lib /nologo /subsystem:windows /debug /machine:IX86 /out:"..\test\bin\ZFontTest.exe" /pdbtype:sept /opt:ref /opt:icf
-# 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 sdl.lib sdlmain.lib opengl32.lib sdl_ttf.lib sdl_mixer.lib sdl_image.lib ZEngineS.lib /nologo /subsystem:windows /debug /machine:IX86 /out:"..\test\bin\ZFontTest.exe" /pdbtype:sept /opt:ref /opt:icf
+# 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 /out:"..\test\bin\ZFontTest.exe" /incremental:no /libpath:"../lib" /debug /pdbtype:sept /subsystem:windows /opt:ref /opt:icf /machine:ix86 sdl.lib
+sdlmain.lib
+opengl32.lib
+sdl_ttf.lib
+sdl_mixer.lib
+sdl_image.lib
+ZEngineS.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 /nologo /out:"..\test\bin\ZFontTest.exe" /incremental:no /libpath:"../lib" /debug /pdbtype:sept /subsystem:windows /opt:ref /opt:icf /machine:ix86 sdl.lib
+sdlmain.lib
+opengl32.lib
+sdl_ttf.lib
+sdl_mixer.lib
+sdl_image.lib
+ZEngineS.lib
 
-!ENDIF 
+!ENDIF
 
 # Begin Target
 
-# Name "ZFontTest - Win32 Debug"
 # Name "ZFontTest - Win32 Release"
 # Begin Source File
 
 SOURCE=..\test\ZFontTest.cpp
-DEP_CPP_ZFONT=\
-	{$(INCLUDE)}"begin_code.h"\
-	{$(INCLUDE)}"close_code.h"\
-	{$(INCLUDE)}"external\physfsrwops.h"\
-	{$(INCLUDE)}"external\SDLGL_Util.h"\
-	{$(INCLUDE)}"SDL.h"\
-	{$(INCLUDE)}"SDL_active.h"\
-	{$(INCLUDE)}"SDL_audio.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"SDL_cdrom.h"\
-	{$(INCLUDE)}"SDL_error.h"\
-	{$(INCLUDE)}"SDL_events.h"\
-	{$(INCLUDE)}"SDL_getenv.h"\
-	{$(INCLUDE)}"SDL_image.h"\
-	{$(INCLUDE)}"SDL_joystick.h"\
-	{$(INCLUDE)}"SDL_keyboard.h"\
-	{$(INCLUDE)}"SDL_keysym.h"\
-	{$(INCLUDE)}"SDL_main.h"\
-	{$(INCLUDE)}"SDL_mixer.h"\
-	{$(INCLUDE)}"SDL_mouse.h"\
-	{$(INCLUDE)}"SDL_mutex.h"\
-	{$(INCLUDE)}"SDL_opengl.h"\
-	{$(INCLUDE)}"SDL_quit.h"\
-	{$(INCLUDE)}"SDL_rwops.h"\
-	{$(INCLUDE)}"SDL_timer.h"\
-	{$(INCLUDE)}"SDL_ttf.h"\
-	{$(INCLUDE)}"SDL_types.h"\
-	{$(INCLUDE)}"SDL_version.h"\
-	{$(INCLUDE)}"SDL_video.h"\
-	{$(INCLUDE)}"ZE_Defines.h"\
-	{$(INCLUDE)}"ZE_Error.h"\
-	{$(INCLUDE)}"ZE_Includes.h"\
-	{$(INCLUDE)}"ZE_Macros.h"\
-	{$(INCLUDE)}"ZE_ZConfigFile.h"\
-	{$(INCLUDE)}"ZE_ZEngine.h"\
-	{$(INCLUDE)}"ZE_ZFont.h"\
-	{$(INCLUDE)}"ZE_ZImage.h"\
-	{$(INCLUDE)}"ZE_ZMusic.h"\
-	{$(INCLUDE)}"ZE_ZObject.h"\
-	{$(INCLUDE)}"ZE_ZRect.h"\
-	{$(INCLUDE)}"ZE_ZSound.h"\
-	{$(INCLUDE)}"ZE_ZTimer.h"\
-	{$(INCLUDE)}"ZEngine.h"\
-	
-NODEP_CPP_ZFONT=\
-	"..\include\physfs.h"\
-	
 # End Source File
 # End Target
 # End Project
+
diff --git a/vc6/ZImageTest.dsp b/vc6/ZImageTest.dsp
index 8a6dfdd..f2b6883 100755
--- a/vc6/ZImageTest.dsp
+++ b/vc6/ZImageTest.dsp
@@ -4,7 +4,7 @@
 
 # TARGTYPE "Win32 (x86) Application" 0x0101
 
-CFG=ZImageTest - Win32 Debug
+CFG=ZImageTest - Win32 Release
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
@@ -13,11 +13,10 @@ CFG=ZImageTest - Win32 Debug
 !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 "ZImageTest.mak" CFG="ZImageTest - Win32 Debug"
+!MESSAGE NMAKE /f "ZImageTest.mak" CFG="ZImageTest - Win32 Release"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "ZImageTest - Win32 Debug" (based on "Win32 (x86) Application")
 !MESSAGE "ZImageTest - Win32 Release" (based on "Win32 (x86) Application")
 !MESSAGE 
 
@@ -29,35 +28,7 @@ CPP=cl.exe
 MTL=midl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "ZImageTest - 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 /MD /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /GZ PRECOMP_VC7_TOBEREMOVED /c
-# ADD CPP /nologo /MD /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /GZ PRECOMP_VC7_TOBEREMOVED /c
-# ADD BASE MTL /nologo /win32
-# ADD MTL /nologo /win32
-# ADD BASE RSC /l 0x409
-# 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 sdl.lib sdlmain.lib opengl32.lib sdl_ttf.lib sdl_mixer.lib sdl_image.lib physfs.lib ZEngineSD.lib /nologo /subsystem:windows /debug /machine:IX86 /out:"..\test\bin\ZImageTestD.exe" /pdbtype:sept
-# SUBTRACT BASE LINK32 /pdb:none
-# 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 sdl.lib sdlmain.lib opengl32.lib sdl_ttf.lib sdl_mixer.lib sdl_image.lib  ZEngineSD.lib /nologo /subsystem:windows /debug /machine:IX86 /out:"..\test\bin\ZImageTestD.exe" /pdbtype:sept
-# SUBTRACT LINK32 /pdb:none
-
-!ELSEIF  "$(CFG)" == "ZImageTest - Win32 Release"
+!IF  "$(CFG)" == "ZImageTest - Win32 Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -68,77 +39,41 @@ LINK32=link.exe
 # 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 /MD /W3 /GX /Zi /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /GF PRECOMP_VC7_TOBEREMOVED /c
-# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /GF PRECOMP_VC7_TOBEREMOVED /c
-# ADD BASE MTL /nologo /win32
-# ADD MTL /nologo /win32
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
+# ADD BASE CPP /nologo /MD /I "../include" /Zi /W3 /O2 /Ob1 /Oy /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /GF /Gy PRECOMP_VC7_TOBEREMOVED /c /GX 
+# ADD CPP /nologo /MD /I "../include" /Zi /W3 /O2 /Ob1 /Oy /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /GF /Gy PRECOMP_VC7_TOBEREMOVED /c /GX 
+# ADD BASE MTL /nologo /win32 
+# ADD MTL /nologo /win32 
+# ADD BASE RSC /l 1033 
+# ADD RSC /l 1033 
 BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
+# 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 sdl.lib sdlmain.lib opengl32.lib sdl_ttf.lib sdl_mixer.lib sdl_image.lib physfs.lib ZEngineS.lib /nologo /subsystem:windows /debug /machine:IX86 /out:"..\test\bin\ZImageTest.exe" /pdbtype:sept /opt:ref /opt:icf
-# 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 sdl.lib sdlmain.lib opengl32.lib sdl_ttf.lib sdl_mixer.lib sdl_image.lib ZEngineS.lib /nologo /subsystem:windows /debug /machine:IX86 /out:"..\test\bin\ZImageTest.exe" /pdbtype:sept /opt:ref /opt:icf
+# 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 /out:"..\test\bin\ZImageTest.exe" /incremental:no /libpath:"../lib" /debug /pdbtype:sept /subsystem:windows /opt:ref /opt:icf /machine:ix86 sdl.lib
+sdlmain.lib
+opengl32.lib
+sdl_ttf.lib
+sdl_mixer.lib
+sdl_image.lib
+ZEngineS.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 /nologo /out:"..\test\bin\ZImageTest.exe" /incremental:no /libpath:"../lib" /debug /pdbtype:sept /subsystem:windows /opt:ref /opt:icf /machine:ix86 sdl.lib
+sdlmain.lib
+opengl32.lib
+sdl_ttf.lib
+sdl_mixer.lib
+sdl_image.lib
+ZEngineS.lib
 
-!ENDIF 
+!ENDIF
 
 # Begin Target
 
-# Name "ZImageTest - Win32 Debug"
 # Name "ZImageTest - Win32 Release"
 # Begin Source File
 
 SOURCE=..\test\ZImageTest.cpp
-DEP_CPP_ZIMAG=\
-	{$(INCLUDE)}"begin_code.h"\
-	{$(INCLUDE)}"close_code.h"\
-	{$(INCLUDE)}"external\physfsrwops.h"\
-	{$(INCLUDE)}"external\SDLGL_Util.h"\
-	{$(INCLUDE)}"SDL.h"\
-	{$(INCLUDE)}"SDL_active.h"\
-	{$(INCLUDE)}"SDL_audio.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"SDL_cdrom.h"\
-	{$(INCLUDE)}"SDL_error.h"\
-	{$(INCLUDE)}"SDL_events.h"\
-	{$(INCLUDE)}"SDL_getenv.h"\
-	{$(INCLUDE)}"SDL_image.h"\
-	{$(INCLUDE)}"SDL_joystick.h"\
-	{$(INCLUDE)}"SDL_keyboard.h"\
-	{$(INCLUDE)}"SDL_keysym.h"\
-	{$(INCLUDE)}"SDL_main.h"\
-	{$(INCLUDE)}"SDL_mixer.h"\
-	{$(INCLUDE)}"SDL_mouse.h"\
-	{$(INCLUDE)}"SDL_mutex.h"\
-	{$(INCLUDE)}"SDL_opengl.h"\
-	{$(INCLUDE)}"SDL_quit.h"\
-	{$(INCLUDE)}"SDL_rwops.h"\
-	{$(INCLUDE)}"SDL_timer.h"\
-	{$(INCLUDE)}"SDL_ttf.h"\
-	{$(INCLUDE)}"SDL_types.h"\
-	{$(INCLUDE)}"SDL_version.h"\
-	{$(INCLUDE)}"SDL_video.h"\
-	{$(INCLUDE)}"ZE_Defines.h"\
-	{$(INCLUDE)}"ZE_Error.h"\
-	{$(INCLUDE)}"ZE_Includes.h"\
-	{$(INCLUDE)}"ZE_Macros.h"\
-	{$(INCLUDE)}"ZE_ZConfigFile.h"\
-	{$(INCLUDE)}"ZE_ZEngine.h"\
-	{$(INCLUDE)}"ZE_ZFont.h"\
-	{$(INCLUDE)}"ZE_ZImage.h"\
-	{$(INCLUDE)}"ZE_ZMusic.h"\
-	{$(INCLUDE)}"ZE_ZObject.h"\
-	{$(INCLUDE)}"ZE_ZRect.h"\
-	{$(INCLUDE)}"ZE_ZSound.h"\
-	{$(INCLUDE)}"ZE_ZTimer.h"\
-	{$(INCLUDE)}"ZEngine.h"\
-	
-NODEP_CPP_ZIMAG=\
-	"..\include\physfs.h"\
-	
 # End Source File
 # End Target
 # End Project
+
diff --git a/vc6/ZMouseTest.dsp b/vc6/ZMouseTest.dsp
index 60b04d5..2e6d301 100755
--- a/vc6/ZMouseTest.dsp
+++ b/vc6/ZMouseTest.dsp
@@ -4,7 +4,7 @@
 
 # TARGTYPE "Win32 (x86) Application" 0x0101
 
-CFG=ZMouseTest - Win32 Debug
+CFG=ZMouseTest - Win32 Release
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
@@ -13,11 +13,10 @@ CFG=ZMouseTest - Win32 Debug
 !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 "ZMouseTest.mak" CFG="ZMouseTest - Win32 Debug"
+!MESSAGE NMAKE /f "ZMouseTest.mak" CFG="ZMouseTest - Win32 Release"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "ZMouseTest - Win32 Debug" (based on "Win32 (x86) Application")
 !MESSAGE "ZMouseTest - Win32 Release" (based on "Win32 (x86) Application")
 !MESSAGE 
 
@@ -29,35 +28,7 @@ CPP=cl.exe
 MTL=midl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "ZMouseTest - 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 /MD /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /GZ PRECOMP_VC7_TOBEREMOVED /c
-# ADD CPP /nologo /MD /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /GZ PRECOMP_VC7_TOBEREMOVED /c
-# ADD BASE MTL /nologo /win32
-# ADD MTL /nologo /win32
-# ADD BASE RSC /l 0x409
-# 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 sdl.lib sdlmain.lib opengl32.lib sdl_ttf.lib sdl_mixer.lib sdl_image.lib physfs.lib ZEngineSD.lib /nologo /subsystem:windows /pdb:"Debug\ZMouseTest.pdb" /debug /machine:IX86 /out:"..\test\bin\ZMouseTestD.exe" /pdbtype:sept
-# SUBTRACT BASE LINK32 /pdb:none
-# 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 sdl.lib sdlmain.lib opengl32.lib sdl_ttf.lib sdl_mixer.lib sdl_image.lib ZEngineSD.lib /nologo /subsystem:windows /pdb:"Debug\ZMouseTest.pdb" /debug /machine:IX86 /out:"..\test\bin\ZMouseTestD.exe" /pdbtype:sept
-# SUBTRACT LINK32 /pdb:none
-
-!ELSEIF  "$(CFG)" == "ZMouseTest - Win32 Release"
+!IF  "$(CFG)" == "ZMouseTest - Win32 Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -68,77 +39,41 @@ LINK32=link.exe
 # 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 /MD /W3 /GX /Zi /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /GF PRECOMP_VC7_TOBEREMOVED /c
-# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /GF PRECOMP_VC7_TOBEREMOVED /c
-# ADD BASE MTL /nologo /win32
-# ADD MTL /nologo /win32
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
+# ADD BASE CPP /nologo /MD /I "../include" /Zi /W3 /O2 /Ob1 /Oy /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /GF /Gy PRECOMP_VC7_TOBEREMOVED /c /GX 
+# ADD CPP /nologo /MD /I "../include" /Zi /W3 /O2 /Ob1 /Oy /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /GF /Gy PRECOMP_VC7_TOBEREMOVED /c /GX 
+# ADD BASE MTL /nologo /win32 
+# ADD MTL /nologo /win32 
+# ADD BASE RSC /l 1033 
+# ADD RSC /l 1033 
 BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
+# 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 sdl.lib sdlmain.lib opengl32.lib sdl_ttf.lib sdl_mixer.lib sdl_image.lib physfs.lib ZEngineS.lib /nologo /subsystem:windows /debug /machine:IX86 /out:"..\test\bin\ZMouseTest.exe" /pdbtype:sept /opt:ref /opt:icf
-# 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 sdl.lib sdlmain.lib opengl32.lib sdl_ttf.lib sdl_mixer.lib sdl_image.lib ZEngineS.lib /nologo /subsystem:windows /debug /machine:IX86 /out:"..\test\bin\ZMouseTest.exe" /pdbtype:sept /opt:ref /opt:icf
+# 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 /out:"..\test\bin\ZMouseTest.exe" /incremental:no /libpath:"../lib" /debug /pdbtype:sept /subsystem:windows /opt:ref /opt:icf /machine:ix86 sdl.lib
+sdlmain.lib
+opengl32.lib
+sdl_ttf.lib
+sdl_mixer.lib
+sdl_image.lib
+ZEngineS.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 /nologo /out:"..\test\bin\ZMouseTest.exe" /incremental:no /libpath:"../lib" /debug /pdbtype:sept /subsystem:windows /opt:ref /opt:icf /machine:ix86 sdl.lib
+sdlmain.lib
+opengl32.lib
+sdl_ttf.lib
+sdl_mixer.lib
+sdl_image.lib
+ZEngineS.lib
 
-!ENDIF 
+!ENDIF
 
 # Begin Target
 
-# Name "ZMouseTest - Win32 Debug"
 # Name "ZMouseTest - Win32 Release"
 # Begin Source File
 
 SOURCE=..\test\ZMouseTest.cpp
-DEP_CPP_ZMOUS=\
-	{$(INCLUDE)}"begin_code.h"\
-	{$(INCLUDE)}"close_code.h"\
-	{$(INCLUDE)}"external\physfsrwops.h"\
-	{$(INCLUDE)}"external\SDLGL_Util.h"\
-	{$(INCLUDE)}"SDL.h"\
-	{$(INCLUDE)}"SDL_active.h"\
-	{$(INCLUDE)}"SDL_audio.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"SDL_cdrom.h"\
-	{$(INCLUDE)}"SDL_error.h"\
-	{$(INCLUDE)}"SDL_events.h"\
-	{$(INCLUDE)}"SDL_getenv.h"\
-	{$(INCLUDE)}"SDL_image.h"\
-	{$(INCLUDE)}"SDL_joystick.h"\
-	{$(INCLUDE)}"SDL_keyboard.h"\
-	{$(INCLUDE)}"SDL_keysym.h"\
-	{$(INCLUDE)}"SDL_main.h"\
-	{$(INCLUDE)}"SDL_mixer.h"\
-	{$(INCLUDE)}"SDL_mouse.h"\
-	{$(INCLUDE)}"SDL_mutex.h"\
-	{$(INCLUDE)}"SDL_opengl.h"\
-	{$(INCLUDE)}"SDL_quit.h"\
-	{$(INCLUDE)}"SDL_rwops.h"\
-	{$(INCLUDE)}"SDL_timer.h"\
-	{$(INCLUDE)}"SDL_ttf.h"\
-	{$(INCLUDE)}"SDL_types.h"\
-	{$(INCLUDE)}"SDL_version.h"\
-	{$(INCLUDE)}"SDL_video.h"\
-	{$(INCLUDE)}"ZE_Defines.h"\
-	{$(INCLUDE)}"ZE_Error.h"\
-	{$(INCLUDE)}"ZE_Includes.h"\
-	{$(INCLUDE)}"ZE_Macros.h"\
-	{$(INCLUDE)}"ZE_ZConfigFile.h"\
-	{$(INCLUDE)}"ZE_ZEngine.h"\
-	{$(INCLUDE)}"ZE_ZFont.h"\
-	{$(INCLUDE)}"ZE_ZImage.h"\
-	{$(INCLUDE)}"ZE_ZMusic.h"\
-	{$(INCLUDE)}"ZE_ZObject.h"\
-	{$(INCLUDE)}"ZE_ZRect.h"\
-	{$(INCLUDE)}"ZE_ZSound.h"\
-	{$(INCLUDE)}"ZE_ZTimer.h"\
-	{$(INCLUDE)}"ZEngine.h"\
-	
-NODEP_CPP_ZMOUS=\
-	"..\include\physfs.h"\
-	
 # End Source File
 # End Target
 # End Project
+
diff --git a/vc6/ZMusicTest.dsp b/vc6/ZMusicTest.dsp
index ec03dea..ea312b7 100755
--- a/vc6/ZMusicTest.dsp
+++ b/vc6/ZMusicTest.dsp
@@ -4,7 +4,7 @@
 
 # TARGTYPE "Win32 (x86) Application" 0x0101
 
-CFG=ZMusicTest - Win32 Debug
+CFG=ZMusicTest - Win32 Release
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
@@ -13,11 +13,10 @@ CFG=ZMusicTest - Win32 Debug
 !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 "ZMusicTest.mak" CFG="ZMusicTest - Win32 Debug"
+!MESSAGE NMAKE /f "ZMusicTest.mak" CFG="ZMusicTest - Win32 Release"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "ZMusicTest - Win32 Debug" (based on "Win32 (x86) Application")
 !MESSAGE "ZMusicTest - Win32 Release" (based on "Win32 (x86) Application")
 !MESSAGE 
 
@@ -29,35 +28,7 @@ CPP=cl.exe
 MTL=midl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "ZMusicTest - 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 /MD /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /GZ PRECOMP_VC7_TOBEREMOVED /c
-# ADD CPP /nologo /MD /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /GZ PRECOMP_VC7_TOBEREMOVED /c
-# ADD BASE MTL /nologo /win32
-# ADD MTL /nologo /win32
-# ADD BASE RSC /l 0x409
-# 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 sdl.lib sdlmain.lib opengl32.lib sdl_ttf.lib sdl_mixer.lib sdl_image.lib physfs.lib ZEngineSD.lib /nologo /subsystem:windows /pdb:"Debug\ZMusicTest.pdb" /debug /machine:IX86 /out:"..\test\bin\ZMusicTestD.exe" /pdbtype:sept
-# SUBTRACT BASE LINK32 /pdb:none
-# 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 sdl.lib sdlmain.lib opengl32.lib sdl_ttf.lib sdl_mixer.lib sdl_image.lib ZEngineSD.lib /nologo /subsystem:windows /pdb:"Debug\ZMusicTest.pdb" /debug /machine:IX86 /out:"..\test\bin\ZMusicTestD.exe" /pdbtype:sept
-# SUBTRACT LINK32 /pdb:none
-
-!ELSEIF  "$(CFG)" == "ZMusicTest - Win32 Release"
+!IF  "$(CFG)" == "ZMusicTest - Win32 Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -68,26 +39,36 @@ LINK32=link.exe
 # 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 /MD /W3 /GX /Zi /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /GF PRECOMP_VC7_TOBEREMOVED /c
-# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /GF PRECOMP_VC7_TOBEREMOVED /c
-# ADD BASE MTL /nologo /win32
-# ADD MTL /nologo /win32
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
+# ADD BASE CPP /nologo /MD /I "../include" /Zi /W3 /O2 /Ob1 /Oy /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /GF /Gy PRECOMP_VC7_TOBEREMOVED /c /GX 
+# ADD CPP /nologo /MD /I "../include" /Zi /W3 /O2 /Ob1 /Oy /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /GF /Gy PRECOMP_VC7_TOBEREMOVED /c /GX 
+# ADD BASE MTL /nologo /win32 
+# ADD MTL /nologo /win32 
+# ADD BASE RSC /l 1033 
+# ADD RSC /l 1033 
 BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
+# 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 sdl.lib sdlmain.lib opengl32.lib sdl_ttf.lib sdl_mixer.lib sdl_image.lib physfs.lib ZEngineS.lib /nologo /subsystem:windows /debug /machine:IX86 /out:"..\test\bin\ZMusicTest.exe" /pdbtype:sept /opt:ref /opt:icf
-# 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 sdl.lib sdlmain.lib opengl32.lib sdl_ttf.lib sdl_mixer.lib sdl_image.lib ZEngineS.lib /nologo /subsystem:windows /debug /machine:IX86 /out:"..\test\bin\ZMusicTest.exe" /pdbtype:sept /opt:ref /opt:icf
+# 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 /out:"..\test\bin\ZMusicTest.exe" /incremental:no /libpath:"../lib" /debug /pdbtype:sept /subsystem:windows /opt:ref /opt:icf /machine:ix86 sdl.lib
+sdlmain.lib
+opengl32.lib
+sdl_ttf.lib
+sdl_mixer.lib
+sdl_image.lib
+ZEngineS.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 /nologo /out:"..\test\bin\ZMusicTest.exe" /incremental:no /libpath:"../lib" /debug /pdbtype:sept /subsystem:windows /opt:ref /opt:icf /machine:ix86 sdl.lib
+sdlmain.lib
+opengl32.lib
+sdl_ttf.lib
+sdl_mixer.lib
+sdl_image.lib
+ZEngineS.lib
 
-!ENDIF 
+!ENDIF
 
 # Begin Target
 
-# Name "ZMusicTest - Win32 Debug"
 # Name "ZMusicTest - Win32 Release"
 # Begin Source File
 
@@ -95,3 +76,4 @@ SOURCE=..\test\ZMusicTest.cpp
 # End Source File
 # End Target
 # End Project
+
diff --git a/vc6/ZRectTest.dsp b/vc6/ZRectTest.dsp
index 67b7fde..d7f1be8 100755
--- a/vc6/ZRectTest.dsp
+++ b/vc6/ZRectTest.dsp
@@ -4,7 +4,7 @@
 
 # TARGTYPE "Win32 (x86) Application" 0x0101
 
-CFG=ZRectTest - Win32 Debug
+CFG=ZRectTest - Win32 Release
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
@@ -13,11 +13,10 @@ CFG=ZRectTest - Win32 Debug
 !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 "ZRectTest.mak" CFG="ZRectTest - Win32 Debug"
+!MESSAGE NMAKE /f "ZRectTest.mak" CFG="ZRectTest - Win32 Release"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "ZRectTest - Win32 Debug" (based on "Win32 (x86) Application")
 !MESSAGE "ZRectTest - Win32 Release" (based on "Win32 (x86) Application")
 !MESSAGE 
 
@@ -29,35 +28,7 @@ CPP=cl.exe
 MTL=midl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "ZRectTest - 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 /MD /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /GZ PRECOMP_VC7_TOBEREMOVED /c
-# ADD CPP /nologo /MD /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /GZ PRECOMP_VC7_TOBEREMOVED /c
-# ADD BASE MTL /nologo /win32
-# ADD MTL /nologo /win32
-# ADD BASE RSC /l 0x409
-# 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 sdl.lib sdlmain.lib opengl32.lib sdl_ttf.lib sdl_mixer.lib sdl_image.lib physfs.lib ZEngineSD.lib /nologo /subsystem:windows /pdb:"Debug\ZRectTest.pdb" /debug /machine:IX86 /out:"..\test\bin\ZRectTestD.exe" /pdbtype:sept
-# SUBTRACT BASE LINK32 /pdb:none
-# 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 sdl.lib sdlmain.lib opengl32.lib sdl_ttf.lib sdl_mixer.lib sdl_image.lib ZEngineSD.lib /nologo /subsystem:windows /pdb:"Debug\ZRectTest.pdb" /debug /machine:IX86 /out:"..\test\bin\ZRectTestD.exe" /pdbtype:sept
-# SUBTRACT LINK32 /pdb:none
-
-!ELSEIF  "$(CFG)" == "ZRectTest - Win32 Release"
+!IF  "$(CFG)" == "ZRectTest - Win32 Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -68,26 +39,36 @@ LINK32=link.exe
 # 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 /MD /W3 /GX /Zi /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /GF PRECOMP_VC7_TOBEREMOVED /c
-# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /GF PRECOMP_VC7_TOBEREMOVED /c
-# ADD BASE MTL /nologo /win32
-# ADD MTL /nologo /win32
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
+# ADD BASE CPP /nologo /MD /I "../include" /Zi /W3 /O2 /Ob1 /Oy /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /GF /Gy PRECOMP_VC7_TOBEREMOVED /c /GX 
+# ADD CPP /nologo /MD /I "../include" /Zi /W3 /O2 /Ob1 /Oy /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /GF /Gy PRECOMP_VC7_TOBEREMOVED /c /GX 
+# ADD BASE MTL /nologo /win32 
+# ADD MTL /nologo /win32 
+# ADD BASE RSC /l 1033 
+# ADD RSC /l 1033 
 BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
+# 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 sdl.lib sdlmain.lib opengl32.lib sdl_ttf.lib sdl_mixer.lib sdl_image.lib physfs.lib ZEngineS.lib /nologo /subsystem:windows /debug /machine:IX86 /out:"..\test\bin\ZRectTest.exe" /pdbtype:sept /opt:ref /opt:icf
-# 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 sdl.lib sdlmain.lib opengl32.lib sdl_ttf.lib sdl_mixer.lib sdl_image.lib ZEngineS.lib /nologo /subsystem:windows /debug /machine:IX86 /out:"..\test\bin\ZRectTest.exe" /pdbtype:sept /opt:ref /opt:icf
+# 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 /out:"..\test\bin\ZRectTest.exe" /incremental:no /libpath:"../lib" /debug /pdbtype:sept /subsystem:windows /opt:ref /opt:icf /machine:ix86 sdl.lib
+sdlmain.lib
+opengl32.lib
+sdl_ttf.lib
+sdl_mixer.lib
+sdl_image.lib
+ZEngineS.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 /nologo /out:"..\test\bin\ZRectTest.exe" /incremental:no /libpath:"../lib" /debug /pdbtype:sept /subsystem:windows /opt:ref /opt:icf /machine:ix86 sdl.lib
+sdlmain.lib
+opengl32.lib
+sdl_ttf.lib
+sdl_mixer.lib
+sdl_image.lib
+ZEngineS.lib
 
-!ENDIF 
+!ENDIF
 
 # Begin Target
 
-# Name "ZRectTest - Win32 Debug"
 # Name "ZRectTest - Win32 Release"
 # Begin Source File
 
@@ -95,3 +76,4 @@ SOURCE=..\test\ZRectTest.cpp
 # End Source File
 # End Target
 # End Project
+
diff --git a/vc6/ZSoundTest.dsp b/vc6/ZSoundTest.dsp
index eba7d0f..a7c0016 100755
--- a/vc6/ZSoundTest.dsp
+++ b/vc6/ZSoundTest.dsp
@@ -4,7 +4,7 @@
 
 # TARGTYPE "Win32 (x86) Application" 0x0101
 
-CFG=ZSoundTest - Win32 Debug
+CFG=ZSoundTest - Win32 Release
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
@@ -13,11 +13,10 @@ CFG=ZSoundTest - Win32 Debug
 !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 "ZSoundTest.mak" CFG="ZSoundTest - Win32 Debug"
+!MESSAGE NMAKE /f "ZSoundTest.mak" CFG="ZSoundTest - Win32 Release"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "ZSoundTest - Win32 Debug" (based on "Win32 (x86) Application")
 !MESSAGE "ZSoundTest - Win32 Release" (based on "Win32 (x86) Application")
 !MESSAGE 
 
@@ -29,35 +28,7 @@ CPP=cl.exe
 MTL=midl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "ZSoundTest - 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 /MD /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /GZ PRECOMP_VC7_TOBEREMOVED /c
-# ADD CPP /nologo /MD /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /GZ PRECOMP_VC7_TOBEREMOVED /c
-# ADD BASE MTL /nologo /win32
-# ADD MTL /nologo /win32
-# ADD BASE RSC /l 0x409
-# 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 sdl.lib sdlmain.lib opengl32.lib sdl_ttf.lib sdl_mixer.lib sdl_image.lib physfs.lib ZEngineSD.lib /nologo /subsystem:windows /pdb:"Debug\ZSoundTest.pdb" /debug /machine:IX86 /out:"..\test\bin\ZSoundTestD.exe" /pdbtype:sept
-# SUBTRACT BASE LINK32 /pdb:none
-# 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 sdl.lib sdlmain.lib opengl32.lib sdl_ttf.lib sdl_mixer.lib sdl_image.lib ZEngineSD.lib /nologo /subsystem:windows /pdb:"Debug\ZSoundTest.pdb" /debug /machine:IX86 /out:"..\test\bin\ZSoundTestD.exe" /pdbtype:sept
-# SUBTRACT LINK32 /pdb:none
-
-!ELSEIF  "$(CFG)" == "ZSoundTest - Win32 Release"
+!IF  "$(CFG)" == "ZSoundTest - Win32 Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -68,26 +39,36 @@ LINK32=link.exe
 # 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 /MD /W3 /GX /Zi /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /GF PRECOMP_VC7_TOBEREMOVED /c
-# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /GF PRECOMP_VC7_TOBEREMOVED /c
-# ADD BASE MTL /nologo /win32
-# ADD MTL /nologo /win32
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
+# ADD BASE CPP /nologo /MD /I "../include" /Zi /W3 /O2 /Ob1 /Oy /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /GF /Gy PRECOMP_VC7_TOBEREMOVED /c /GX 
+# ADD CPP /nologo /MD /I "../include" /Zi /W3 /O2 /Ob1 /Oy /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /GF /Gy PRECOMP_VC7_TOBEREMOVED /c /GX 
+# ADD BASE MTL /nologo /win32 
+# ADD MTL /nologo /win32 
+# ADD BASE RSC /l 1033 
+# ADD RSC /l 1033 
 BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
+# 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 sdl.lib sdlmain.lib opengl32.lib sdl_ttf.lib sdl_mixer.lib sdl_image.lib physfs.lib ZEngineS.lib /nologo /subsystem:windows /debug /machine:IX86 /out:"..\test\bin\ZSoundTest.exe" /pdbtype:sept /opt:ref /opt:icf
-# 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 sdl.lib sdlmain.lib opengl32.lib sdl_ttf.lib sdl_mixer.lib sdl_image.lib ZEngineS.lib /nologo /subsystem:windows /debug /machine:IX86 /out:"..\test\bin\ZSoundTest.exe" /pdbtype:sept /opt:ref /opt:icf
+# 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 /out:"..\test\bin\ZSoundTest.exe" /incremental:no /libpath:"../lib" /debug /pdbtype:sept /subsystem:windows /opt:ref /opt:icf /machine:ix86 sdl.lib
+sdlmain.lib
+opengl32.lib
+sdl_ttf.lib
+sdl_mixer.lib
+sdl_image.lib
+ZEngineS.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 /nologo /out:"..\test\bin\ZSoundTest.exe" /incremental:no /libpath:"../lib" /debug /pdbtype:sept /subsystem:windows /opt:ref /opt:icf /machine:ix86 sdl.lib
+sdlmain.lib
+opengl32.lib
+sdl_ttf.lib
+sdl_mixer.lib
+sdl_image.lib
+ZEngineS.lib
 
-!ENDIF 
+!ENDIF
 
 # Begin Target
 
-# Name "ZSoundTest - Win32 Debug"
 # Name "ZSoundTest - Win32 Release"
 # Begin Source File
 
@@ -95,3 +76,4 @@ SOURCE=..\test\ZSoundTest.cpp
 # End Source File
 # End Target
 # End Project
+
diff --git a/vc6/ZTimerTest.dsp b/vc6/ZTimerTest.dsp
index c7d5613..342ae02 100755
--- a/vc6/ZTimerTest.dsp
+++ b/vc6/ZTimerTest.dsp
@@ -4,7 +4,7 @@
 
 # TARGTYPE "Win32 (x86) Application" 0x0101
 
-CFG=ZTimerTest - Win32 Debug
+CFG=ZTimerTest - Win32 Release
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
@@ -13,11 +13,10 @@ CFG=ZTimerTest - Win32 Debug
 !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 "ZTimerTest.mak" CFG="ZTimerTest - Win32 Debug"
+!MESSAGE NMAKE /f "ZTimerTest.mak" CFG="ZTimerTest - Win32 Release"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "ZTimerTest - Win32 Debug" (based on "Win32 (x86) Application")
 !MESSAGE "ZTimerTest - Win32 Release" (based on "Win32 (x86) Application")
 !MESSAGE 
 
@@ -29,35 +28,7 @@ CPP=cl.exe
 MTL=midl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "ZTimerTest - 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 /MD /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /GZ PRECOMP_VC7_TOBEREMOVED /c
-# ADD CPP /nologo /MD /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /GZ PRECOMP_VC7_TOBEREMOVED /c
-# ADD BASE MTL /nologo /win32
-# ADD MTL /nologo /win32
-# ADD BASE RSC /l 0x409
-# 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 sdl.lib sdlmain.lib opengl32.lib sdl_ttf.lib sdl_mixer.lib sdl_image.lib physfs.lib ZEngineSD.lib /nologo /subsystem:windows /pdb:"Debug\ZTimerTest.pdb" /debug /machine:IX86 /out:"..\test\bin\ZTimerTestD.exe" /pdbtype:sept
-# SUBTRACT BASE LINK32 /pdb:none
-# 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 sdl.lib sdlmain.lib opengl32.lib sdl_ttf.lib sdl_mixer.lib sdl_image.lib ZEngineSD.lib /nologo /subsystem:windows /pdb:"Debug\ZTimerTest.pdb" /debug /machine:IX86 /out:"..\test\bin\ZTimerTestD.exe" /pdbtype:sept
-# SUBTRACT LINK32 /pdb:none
-
-!ELSEIF  "$(CFG)" == "ZTimerTest - Win32 Release"
+!IF  "$(CFG)" == "ZTimerTest - Win32 Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -68,26 +39,36 @@ LINK32=link.exe
 # 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 /MD /W3 /GX /Zi /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /GF PRECOMP_VC7_TOBEREMOVED /c
-# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /GF PRECOMP_VC7_TOBEREMOVED /c
-# ADD BASE MTL /nologo /win32
-# ADD MTL /nologo /win32
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
+# ADD BASE CPP /nologo /MD /I "../include" /Zi /W3 /O2 /Ob1 /Oy /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /GF /Gy PRECOMP_VC7_TOBEREMOVED /c /GX 
+# ADD CPP /nologo /MD /I "../include" /Zi /W3 /O2 /Ob1 /Oy /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /GF /Gy PRECOMP_VC7_TOBEREMOVED /c /GX 
+# ADD BASE MTL /nologo /win32 
+# ADD MTL /nologo /win32 
+# ADD BASE RSC /l 1033 
+# ADD RSC /l 1033 
 BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
+# 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 sdl.lib sdlmain.lib opengl32.lib sdl_ttf.lib sdl_mixer.lib sdl_image.lib physfs.lib ZEngineS.lib /nologo /subsystem:windows /debug /machine:IX86 /out:"..\test\bin\ZTimerTest.exe" /pdbtype:sept /opt:ref /opt:icf
-# 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 sdl.lib sdlmain.lib opengl32.lib sdl_ttf.lib sdl_mixer.lib sdl_image.lib ZEngineS.lib /nologo /subsystem:windows /debug /machine:IX86 /out:"..\test\bin\ZTimerTest.exe" /pdbtype:sept /opt:ref /opt:icf
+# 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 /out:"..\test\bin\ZTimerTest.exe" /incremental:no /libpath:"../lib" /debug /pdbtype:sept /subsystem:windows /opt:ref /opt:icf /machine:ix86 sdl.lib
+sdlmain.lib
+opengl32.lib
+sdl_ttf.lib
+sdl_mixer.lib
+sdl_image.lib
+ZEngineS.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 /nologo /out:"..\test\bin\ZTimerTest.exe" /incremental:no /libpath:"../lib" /debug /pdbtype:sept /subsystem:windows /opt:ref /opt:icf /machine:ix86 sdl.lib
+sdlmain.lib
+opengl32.lib
+sdl_ttf.lib
+sdl_mixer.lib
+sdl_image.lib
+ZEngineS.lib
 
-!ENDIF 
+!ENDIF
 
 # Begin Target
 
-# Name "ZTimerTest - Win32 Debug"
 # Name "ZTimerTest - Win32 Release"
 # Begin Source File
 
@@ -95,3 +76,4 @@ SOURCE=..\test\ZTimerTest.cpp
 # End Source File
 # End Target
 # End Project
+