New VisualC6 setup, hoping that it will load on VC2008 and VC2010.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7583 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
author: Matthias Melcher <fltk@matthiasm.com> 2010-05-02 20:55:20 +0000
committer: Matthias Melcher <fltk@matthiasm.com> 2010-05-02 20:55:20 +0000
commit: 08d62246afa1fe553e335307be5b6fcf06ff0fed (patch)
tree: cceafe30c65c5b2121862a637264c351853af18a /ide
parent: c2c054c595ff3428ad25463858e0636d2810467b (diff)
84 files changed, 1195 insertions, 929 deletions
diff --git a/ide/VisualC6/CubeView.dsp b/ide/VisualC6/CubeView.dsp
index 4438f663c..68bbe7506 100644
--- a/ide/VisualC6/CubeView.dsp
+++ b/ide/VisualC6/CubeView.dsp
@@ -33,13 +33,13 @@ RSC=rc.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Output_Dir "Release/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Release/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
+# PROP Output_Dir "Release/$(ProjectName)"
+# PROP Intermediate_Dir "Release/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
@@ -53,20 +53,20 @@ BSC32=bscmake.exe
 # 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 fltk.lib fltkgl.lib glu32.lib opengl32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/CubeView.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk.lib fltk_gl.lib glu32.lib opengl32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/CubeView.exe" /pdbtype:sept /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:yes
 
 !ELSEIF  "$(CFG)" == "CubeView - Win32 Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "CubeView_"
-# PROP BASE Intermediate_Dir "CubeView_"
+# PROP BASE Output_Dir "Debug/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Debug/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "CubeView_"
-# PROP Intermediate_Dir "CubeView_"
+# PROP Output_Dir "Debug/$(ProjectName)"
+# PROP Intermediate_Dir "Debug/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
@@ -80,7 +80,7 @@ BSC32=bscmake.exe
 # 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 fltkd.lib fltkgld.lib glu32.lib opengl32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/CubeViewd.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltkd.lib fltk_gld.lib glu32.lib opengl32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/CubeViewd.exe" /pdbtype:sept /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:no
 
 !ENDIF 
diff --git a/ide/VisualC6/Demo.dsp b/ide/VisualC6/Demo.dsp
index faa4cf490..2e3975f8b 100644
--- a/ide/VisualC6/Demo.dsp
+++ b/ide/VisualC6/Demo.dsp
@@ -33,13 +33,13 @@ RSC=rc.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Output_Dir "Release/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Release/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
+# PROP Output_Dir "Release/$(ProjectName)"
+# PROP Intermediate_Dir "Release/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
@@ -60,13 +60,13 @@ LINK32=link.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Demo_"
-# PROP BASE Intermediate_Dir "Demo_"
+# PROP BASE Output_Dir "Debug/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Debug/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Demo_"
-# PROP Intermediate_Dir "Demo_"
+# PROP Output_Dir "Debug/$(ProjectName)"
+# PROP Intermediate_Dir "Debug/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
diff --git a/ide/VisualC6/Fluid.dsp b/ide/VisualC6/Fluid.dsp
index a1ae14f53..3842e8d71 100644
--- a/ide/VisualC6/Fluid.dsp
+++ b/ide/VisualC6/Fluid.dsp
@@ -33,13 +33,13 @@ RSC=rc.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Output_Dir "Release/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Release/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
+# PROP Output_Dir "Release/$(ProjectName)"
+# PROP Intermediate_Dir "Release/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
@@ -53,20 +53,20 @@ BSC32=bscmake.exe
 # 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 fltk.lib fltkforms.lib fltkimages.lib fltkjpeg.lib fltkpng.lib zlib.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../Fluid/Fluid.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk.lib fltk_forms.lib fltk_images.lib fltk_jpeg.lib fltk_png.lib fltk_zlib.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../Fluid/Fluid.exe" /pdbtype:sept /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:yes
 
 !ELSEIF  "$(CFG)" == "Fluid - Win32 Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Fluid_"
-# PROP BASE Intermediate_Dir "Fluid_"
+# PROP BASE Output_Dir "Debug/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Debug/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Fluid_"
-# PROP Intermediate_Dir "Fluid_"
+# PROP Output_Dir "Debug/$(ProjectName)"
+# PROP Intermediate_Dir "Debug/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
@@ -80,7 +80,7 @@ BSC32=bscmake.exe
 # 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 fltkd.lib fltkformsd.lib fltkimagesd.lib fltkjpegd.lib fltkpngd.lib zlibd.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../Fluid/Fluidd.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltkd.lib fltk_formsd.lib fltk_imagesd.lib fltk_jpegd.lib fltk_pngd.lib fltk_zlibd.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../Fluid/Fluidd.exe" /pdbtype:sept /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:no
 
 !ENDIF 
diff --git a/ide/VisualC6/adjuster.dsp b/ide/VisualC6/adjuster.dsp
index 31ef8b232..706e008d9 100644
--- a/ide/VisualC6/adjuster.dsp
+++ b/ide/VisualC6/adjuster.dsp
@@ -33,13 +33,13 @@ RSC=rc.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Output_Dir "Release/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Release/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
+# PROP Output_Dir "Release/$(ProjectName)"
+# PROP Intermediate_Dir "Release/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
@@ -60,13 +60,13 @@ LINK32=link.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "adjuster_"
-# PROP BASE Intermediate_Dir "adjuster_"
+# PROP BASE Output_Dir "Debug/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Debug/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "adjuster_"
-# PROP Intermediate_Dir "adjuster_"
+# PROP Output_Dir "Debug/$(ProjectName)"
+# PROP Intermediate_Dir "Debug/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
diff --git a/ide/VisualC6/arc.dsp b/ide/VisualC6/arc.dsp
index 236a9b358..e4e2e5412 100644
--- a/ide/VisualC6/arc.dsp
+++ b/ide/VisualC6/arc.dsp
@@ -33,13 +33,13 @@ RSC=rc.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Output_Dir "Release/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Release/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
+# PROP Output_Dir "Release/$(ProjectName)"
+# PROP Intermediate_Dir "Release/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
@@ -60,13 +60,13 @@ LINK32=link.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "arc_"
-# PROP BASE Intermediate_Dir "arc_"
+# PROP BASE Output_Dir "Debug/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Debug/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "arc_"
-# PROP Intermediate_Dir "arc_"
+# PROP Output_Dir "Debug/$(ProjectName)"
+# PROP Intermediate_Dir "Debug/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
diff --git a/ide/VisualC6/ask.dsp b/ide/VisualC6/ask.dsp
index fd6c09545..4e989d9f0 100644
--- a/ide/VisualC6/ask.dsp
+++ b/ide/VisualC6/ask.dsp
@@ -33,13 +33,13 @@ RSC=rc.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Output_Dir "Release/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Release/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
+# PROP Output_Dir "Release/$(ProjectName)"
+# PROP Intermediate_Dir "Release/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
@@ -60,13 +60,13 @@ LINK32=link.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "ask_"
-# PROP BASE Intermediate_Dir "ask_"
+# PROP BASE Output_Dir "Debug/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Debug/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "ask_"
-# PROP Intermediate_Dir "ask_"
+# PROP Output_Dir "Debug/$(ProjectName)"
+# PROP Intermediate_Dir "Debug/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
diff --git a/ide/VisualC6/bitmap.dsp b/ide/VisualC6/bitmap.dsp
index 32b075126..4bdce331b 100644
--- a/ide/VisualC6/bitmap.dsp
+++ b/ide/VisualC6/bitmap.dsp
@@ -33,13 +33,13 @@ RSC=rc.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Output_Dir "Release/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Release/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
+# PROP Output_Dir "Release/$(ProjectName)"
+# PROP Intermediate_Dir "Release/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
@@ -60,13 +60,13 @@ LINK32=link.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "bitmap_"
-# PROP BASE Intermediate_Dir "bitmap_"
+# PROP BASE Output_Dir "Debug/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Debug/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "bitmap_"
-# PROP Intermediate_Dir "bitmap_"
+# PROP Output_Dir "Debug/$(ProjectName)"
+# PROP Intermediate_Dir "Debug/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
diff --git a/ide/VisualC6/blocks.dsp b/ide/VisualC6/blocks.dsp
index f62f81a33..28a0cc22a 100644
--- a/ide/VisualC6/blocks.dsp
+++ b/ide/VisualC6/blocks.dsp
@@ -33,13 +33,13 @@ RSC=rc.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Output_Dir "Release/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Release/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
+# PROP Output_Dir "Release/$(ProjectName)"
+# PROP Intermediate_Dir "Release/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
@@ -60,13 +60,13 @@ LINK32=link.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "blocks_"
-# PROP BASE Intermediate_Dir "blocks_"
+# PROP BASE Output_Dir "Debug/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Debug/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "blocks_"
-# PROP Intermediate_Dir "blocks_"
+# PROP Output_Dir "Debug/$(ProjectName)"
+# PROP Intermediate_Dir "Debug/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
diff --git a/ide/VisualC6/boxtype.dsp b/ide/VisualC6/boxtype.dsp
index 0d31e115f..44b9f30d4 100644
--- a/ide/VisualC6/boxtype.dsp
+++ b/ide/VisualC6/boxtype.dsp
@@ -33,13 +33,13 @@ RSC=rc.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Output_Dir "Release/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Release/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
+# PROP Output_Dir "Release/$(ProjectName)"
+# PROP Intermediate_Dir "Release/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
@@ -60,13 +60,13 @@ LINK32=link.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "boxtype_"
-# PROP BASE Intermediate_Dir "boxtype_"
+# PROP BASE Output_Dir "Debug/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Debug/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "boxtype_"
-# PROP Intermediate_Dir "boxtype_"
+# PROP Output_Dir "Debug/$(ProjectName)"
+# PROP Intermediate_Dir "Debug/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
diff --git a/ide/VisualC6/browser.dsp b/ide/VisualC6/browser.dsp
index 2de23aa67..73ee838df 100644
--- a/ide/VisualC6/browser.dsp
+++ b/ide/VisualC6/browser.dsp
@@ -33,13 +33,13 @@ RSC=rc.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Output_Dir "Release/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Release/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
+# PROP Output_Dir "Release/$(ProjectName)"
+# PROP Intermediate_Dir "Release/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
@@ -60,13 +60,13 @@ LINK32=link.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "browser_"
-# PROP BASE Intermediate_Dir "browser_"
+# PROP BASE Output_Dir "Debug/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Debug/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "browser_"
-# PROP Intermediate_Dir "browser_"
+# PROP Output_Dir "Debug/$(ProjectName)"
+# PROP Intermediate_Dir "Debug/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
diff --git a/ide/VisualC6/button.dsp b/ide/VisualC6/button.dsp
index 14d6d3759..8416eb38a 100644
--- a/ide/VisualC6/button.dsp
+++ b/ide/VisualC6/button.dsp
@@ -33,13 +33,13 @@ RSC=rc.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Output_Dir "Release/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Release/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
+# PROP Output_Dir "Release/$(ProjectName)"
+# PROP Intermediate_Dir "Release/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
@@ -60,13 +60,13 @@ LINK32=link.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "button_"
-# PROP BASE Intermediate_Dir "button_"
+# PROP BASE Output_Dir "Debug/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Debug/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "button_"
-# PROP Intermediate_Dir "button_"
+# PROP Output_Dir "Debug/$(ProjectName)"
+# PROP Intermediate_Dir "Debug/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
diff --git a/ide/VisualC6/buttons.dsp b/ide/VisualC6/buttons.dsp
index c59708008..e7d5b1110 100644
--- a/ide/VisualC6/buttons.dsp
+++ b/ide/VisualC6/buttons.dsp
@@ -33,13 +33,13 @@ RSC=rc.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Output_Dir "Release/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Release/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
+# PROP Output_Dir "Release/$(ProjectName)"
+# PROP Intermediate_Dir "Release/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
@@ -60,13 +60,13 @@ LINK32=link.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "buttons_"
-# PROP BASE Intermediate_Dir "buttons_"
+# PROP BASE Output_Dir "Debug/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Debug/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "buttons_"
-# PROP Intermediate_Dir "buttons_"
+# PROP Output_Dir "Debug/$(ProjectName)"
+# PROP Intermediate_Dir "Debug/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
diff --git a/ide/VisualC6/checkers.dsp b/ide/VisualC6/checkers.dsp
index 86d3e7134..3ea308b11 100644
--- a/ide/VisualC6/checkers.dsp
+++ b/ide/VisualC6/checkers.dsp
@@ -33,13 +33,13 @@ RSC=rc.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Output_Dir "Release/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Release/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
+# PROP Output_Dir "Release/$(ProjectName)"
+# PROP Intermediate_Dir "Release/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
@@ -60,13 +60,13 @@ LINK32=link.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "checkers_"
-# PROP BASE Intermediate_Dir "checkers_"
+# PROP BASE Output_Dir "Debug/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Debug/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "checkers_"
-# PROP Intermediate_Dir "checkers_"
+# PROP Output_Dir "Debug/$(ProjectName)"
+# PROP Intermediate_Dir "Debug/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
diff --git a/ide/VisualC6/clock.dsp b/ide/VisualC6/clock.dsp
index a1e20128d..8ab011dab 100644
--- a/ide/VisualC6/clock.dsp
+++ b/ide/VisualC6/clock.dsp
@@ -33,13 +33,13 @@ RSC=rc.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Output_Dir "Release/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Release/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
+# PROP Output_Dir "Release/$(ProjectName)"
+# PROP Intermediate_Dir "Release/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
@@ -60,13 +60,13 @@ LINK32=link.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "clock_"
-# PROP BASE Intermediate_Dir "clock_"
+# PROP BASE Output_Dir "Debug/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Debug/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "clock_"
-# PROP Intermediate_Dir "clock_"
+# PROP Output_Dir "Debug/$(ProjectName)"
+# PROP Intermediate_Dir "Debug/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
diff --git a/ide/VisualC6/colbrowser.dsp b/ide/VisualC6/colbrowser.dsp
index b0e1170b3..3c986cf96 100644
--- a/ide/VisualC6/colbrowser.dsp
+++ b/ide/VisualC6/colbrowser.dsp
@@ -33,13 +33,13 @@ RSC=rc.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Output_Dir "Release/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Release/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
+# PROP Output_Dir "Release/$(ProjectName)"
+# PROP Intermediate_Dir "Release/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
@@ -53,20 +53,20 @@ BSC32=bscmake.exe
 # 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 fltk.lib fltkforms.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/colbrowser.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk.lib fltk_forms.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/colbrowser.exe" /pdbtype:sept /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:yes
 
 !ELSEIF  "$(CFG)" == "colbrowser - Win32 Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "colbrowser_"
-# PROP BASE Intermediate_Dir "colbrowser_"
+# PROP BASE Output_Dir "Debug/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Debug/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "colbrowser_"
-# PROP Intermediate_Dir "colbrowser_"
+# PROP Output_Dir "Debug/$(ProjectName)"
+# PROP Intermediate_Dir "Debug/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
@@ -80,7 +80,7 @@ BSC32=bscmake.exe
 # 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 fltkd.lib fltkformsd.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/colbrowserd.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltkd.lib fltk_formsd.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/colbrowserd.exe" /pdbtype:sept /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:no
 
 !ENDIF 
diff --git a/ide/VisualC6/color_chooser.dsp b/ide/VisualC6/color_chooser.dsp
index eeab8c029..c9d19a2e6 100644
--- a/ide/VisualC6/color_chooser.dsp
+++ b/ide/VisualC6/color_chooser.dsp
@@ -33,13 +33,13 @@ RSC=rc.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Output_Dir "Release/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Release/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
+# PROP Output_Dir "Release/$(ProjectName)"
+# PROP Intermediate_Dir "Release/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
@@ -60,13 +60,13 @@ LINK32=link.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "color_chooser_"
-# PROP BASE Intermediate_Dir "color_chooser_"
+# PROP BASE Output_Dir "Debug/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Debug/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "color_chooser_"
-# PROP Intermediate_Dir "color_chooser_"
+# PROP Output_Dir "Debug/$(ProjectName)"
+# PROP Intermediate_Dir "Debug/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
diff --git a/ide/VisualC6/cube.dsp b/ide/VisualC6/cube.dsp
index 57c827247..4db06d45a 100644
--- a/ide/VisualC6/cube.dsp
+++ b/ide/VisualC6/cube.dsp
@@ -33,13 +33,13 @@ RSC=rc.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Output_Dir "Release/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Release/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
+# PROP Output_Dir "Release/$(ProjectName)"
+# PROP Intermediate_Dir "Release/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
@@ -53,20 +53,20 @@ BSC32=bscmake.exe
 # 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 fltk.lib fltkgl.lib glu32.lib opengl32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/cube.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk.lib fltk_gl.lib glu32.lib opengl32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/cube.exe" /pdbtype:sept /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:yes
 
 !ELSEIF  "$(CFG)" == "cube - Win32 Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "cube_"
-# PROP BASE Intermediate_Dir "cube_"
+# PROP BASE Output_Dir "Debug/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Debug/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "cube_"
-# PROP Intermediate_Dir "cube_"
+# PROP Output_Dir "Debug/$(ProjectName)"
+# PROP Intermediate_Dir "Debug/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
@@ -80,7 +80,7 @@ BSC32=bscmake.exe
 # 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 fltkd.lib fltkgld.lib glu32.lib opengl32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/cubed.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltkd.lib fltk_gld.lib glu32.lib opengl32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/cubed.exe" /pdbtype:sept /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:no
 
 !ENDIF 
diff --git a/ide/VisualC6/cursor.dsp b/ide/VisualC6/cursor.dsp
index 89db68c9c..50016310b 100644
--- a/ide/VisualC6/cursor.dsp
+++ b/ide/VisualC6/cursor.dsp
@@ -33,13 +33,13 @@ RSC=rc.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Output_Dir "Release/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Release/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
+# PROP Output_Dir "Release/$(ProjectName)"
+# PROP Intermediate_Dir "Release/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
@@ -60,13 +60,13 @@ LINK32=link.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "cursor_"
-# PROP BASE Intermediate_Dir "cursor_"
+# PROP BASE Output_Dir "Debug/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Debug/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "cursor_"
-# PROP Intermediate_Dir "cursor_"
+# PROP Output_Dir "Debug/$(ProjectName)"
+# PROP Intermediate_Dir "Debug/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
diff --git a/ide/VisualC6/curve.dsp b/ide/VisualC6/curve.dsp
index 0130fb734..c05136758 100644
--- a/ide/VisualC6/curve.dsp
+++ b/ide/VisualC6/curve.dsp
@@ -33,13 +33,13 @@ RSC=rc.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Output_Dir "Release/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Release/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
+# PROP Output_Dir "Release/$(ProjectName)"
+# PROP Intermediate_Dir "Release/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
@@ -60,13 +60,13 @@ LINK32=link.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "curve_"
-# PROP BASE Intermediate_Dir "curve_"
+# PROP BASE Output_Dir "Debug/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Debug/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "curve_"
-# PROP Intermediate_Dir "curve_"
+# PROP Output_Dir "Debug/$(ProjectName)"
+# PROP Intermediate_Dir "Debug/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
diff --git a/ide/VisualC6/device.dsp b/ide/VisualC6/device.dsp
index 27dcb0e32..b69bcc5f4 100644
--- a/ide/VisualC6/device.dsp
+++ b/ide/VisualC6/device.dsp
@@ -33,13 +33,13 @@ RSC=rc.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Output_Dir "Release/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Release/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
+# PROP Output_Dir "Release/$(ProjectName)"
+# PROP Intermediate_Dir "Release/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
@@ -53,20 +53,20 @@ BSC32=bscmake.exe
 # 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 fltk.lib fltkimages.lib fltkjpeg.lib fltkpng.lib zlib.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/device.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk.lib fltk_images.lib fltk_jpeg.lib fltk_png.lib fltk_zlib.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/device.exe" /pdbtype:sept /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:yes
 
 !ELSEIF  "$(CFG)" == "device - Win32 Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "device_"
-# PROP BASE Intermediate_Dir "device_"
+# PROP BASE Output_Dir "Debug/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Debug/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "device_"
-# PROP Intermediate_Dir "device_"
+# PROP Output_Dir "Debug/$(ProjectName)"
+# PROP Intermediate_Dir "Debug/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
@@ -80,7 +80,7 @@ BSC32=bscmake.exe
 # 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 fltkd.lib fltkimagesd.lib fltkjpegd.lib fltkpngd.lib zlibd.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/deviced.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltkd.lib fltk_imagesd.lib fltk_jpegd.lib fltk_pngd.lib fltk_zlibd.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/deviced.exe" /pdbtype:sept /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:no
 
 !ENDIF 
diff --git a/ide/VisualC6/doublebuffer.dsp b/ide/VisualC6/doublebuffer.dsp
index b6fcd7ecd..d2a6dbe65 100644
--- a/ide/VisualC6/doublebuffer.dsp
+++ b/ide/VisualC6/doublebuffer.dsp
@@ -33,13 +33,13 @@ RSC=rc.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Output_Dir "Release/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Release/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
+# PROP Output_Dir "Release/$(ProjectName)"
+# PROP Intermediate_Dir "Release/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
@@ -60,13 +60,13 @@ LINK32=link.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "doublebuffer_"
-# PROP BASE Intermediate_Dir "doublebuffer_"
+# PROP BASE Output_Dir "Debug/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Debug/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "doublebuffer_"
-# PROP Intermediate_Dir "doublebuffer_"
+# PROP Output_Dir "Debug/$(ProjectName)"
+# PROP Intermediate_Dir "Debug/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
diff --git a/ide/VisualC6/editor.dsp b/ide/VisualC6/editor.dsp
index 353fe4530..e2f54630c 100644
--- a/ide/VisualC6/editor.dsp
+++ b/ide/VisualC6/editor.dsp
@@ -33,13 +33,13 @@ RSC=rc.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Output_Dir "Release/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Release/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
+# PROP Output_Dir "Release/$(ProjectName)"
+# PROP Intermediate_Dir "Release/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
@@ -60,13 +60,13 @@ LINK32=link.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "editor_"
-# PROP BASE Intermediate_Dir "editor_"
+# PROP BASE Output_Dir "Debug/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Debug/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "editor_"
-# PROP Intermediate_Dir "editor_"
+# PROP Output_Dir "Debug/$(ProjectName)"
+# PROP Intermediate_Dir "Debug/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
diff --git a/ide/VisualC6/fast_slow.dsp b/ide/VisualC6/fast_slow.dsp
index a4c162194..31dc7299d 100644
--- a/ide/VisualC6/fast_slow.dsp
+++ b/ide/VisualC6/fast_slow.dsp
@@ -33,13 +33,13 @@ RSC=rc.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Output_Dir "Release/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Release/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
+# PROP Output_Dir "Release/$(ProjectName)"
+# PROP Intermediate_Dir "Release/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
@@ -60,13 +60,13 @@ LINK32=link.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "fast_slow_"
-# PROP BASE Intermediate_Dir "fast_slow_"
+# PROP BASE Output_Dir "Debug/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Debug/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "fast_slow_"
-# PROP Intermediate_Dir "fast_slow_"
+# PROP Output_Dir "Debug/$(ProjectName)"
+# PROP Intermediate_Dir "Debug/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
diff --git a/ide/VisualC6/file_chooser.dsp b/ide/VisualC6/file_chooser.dsp
index 0d0a45efa..e8fbada2f 100644
--- a/ide/VisualC6/file_chooser.dsp
+++ b/ide/VisualC6/file_chooser.dsp
@@ -33,13 +33,13 @@ RSC=rc.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Output_Dir "Release/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Release/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
+# PROP Output_Dir "Release/$(ProjectName)"
+# PROP Intermediate_Dir "Release/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
@@ -53,20 +53,20 @@ BSC32=bscmake.exe
 # 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 fltk.lib fltkimages.lib fltkjpeg.lib fltkpng.lib zlib.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/file_chooser.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk.lib fltk_images.lib fltk_jpeg.lib fltk_png.lib fltk_zlib.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/file_chooser.exe" /pdbtype:sept /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:yes
 
 !ELSEIF  "$(CFG)" == "file_chooser - Win32 Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "file_chooser_"
-# PROP BASE Intermediate_Dir "file_chooser_"
+# PROP BASE Output_Dir "Debug/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Debug/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "file_chooser_"
-# PROP Intermediate_Dir "file_chooser_"
+# PROP Output_Dir "Debug/$(ProjectName)"
+# PROP Intermediate_Dir "Debug/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
@@ -80,7 +80,7 @@ BSC32=bscmake.exe
 # 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 fltkd.lib fltkimagesd.lib fltkjpegd.lib fltkpngd.lib zlibd.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/file_chooserd.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltkd.lib fltk_imagesd.lib fltk_jpegd.lib fltk_pngd.lib fltk_zlibd.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/file_chooserd.exe" /pdbtype:sept /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:no
 
 !ENDIF 
diff --git a/ide/VisualC6/fltk.dsp b/ide/VisualC6/fltk.dsp
index 189b521e5..b4c0d35d3 100644
--- a/ide/VisualC6/fltk.dsp
+++ b/ide/VisualC6/fltk.dsp
@@ -32,13 +32,13 @@ RSC=rc.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Output_Dir "Release/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Release/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
+# PROP Output_Dir "Release/$(ProjectName)"
+# PROP Intermediate_Dir "Release/$(ProjectName)"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
 # ADD CPP /nologo /MD /GX /Ot /Op /Ob2 /I "." /I "../.." /I "../../zlib" /I "../../png" /I "../../jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
@@ -56,13 +56,13 @@ LIB32=link.exe -lib
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Output_Dir "Debug/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Debug/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
+# PROP Output_Dir "Debug/$(ProjectName)"
+# PROP Intermediate_Dir "Debug/$(ProjectName)"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
 # ADD CPP /nologo /MDd /GX /Z7 /Od /I "." /I "../.." /I "../../zlib" /I "../../png" /I "../../jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /FR /YX /FD /c
@@ -87,6 +87,10 @@ SOURCE=..\..\src\Fl.cxx
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\src\Fl_Abstract_Printer.cxx
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\Fl_Adjuster.cxx
 # End Source File
 # Begin Source File
@@ -143,6 +147,10 @@ SOURCE=..\..\src\Fl_Counter.cxx
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\src\Fl_Device.cxx
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\Fl_Dial.cxx
 # End Source File
 # Begin Source File
@@ -247,6 +255,10 @@ SOURCE=..\..\src\Fl_Positioner.cxx
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\src\Fl_Printer.cxx
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\Fl_Preferences.cxx
 # End Source File
 # Begin Source File
@@ -643,6 +655,10 @@ SOURCE=..\..\src\numericsort.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\src\ps_image.cxx
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\scandir.c
 # End Source File
 # Begin Source File
@@ -665,21 +681,5 @@ SOURCE=..\..\src\xutf8\is_right2left.c
 
 SOURCE=..\..\src\xutf8\is_spacing.c
 # End Source File
-# Begin Source File
-
-SOURCE=..\..\src\Fl_Device.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\Fl_Printer.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\ps_image.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\Fl_Abstract_Printer.cxx
-# End Source File
 # End Target
 # End Project
diff --git a/ide/VisualC6/fltk.dsw b/ide/VisualC6/fltk.dsw
index c818cf921..b00d41274 100644
--- a/ide/VisualC6/fltk.dsw
+++ b/ide/VisualC6/fltk.dsw
@@ -15,19 +15,19 @@ Package=<4>
     Project_Dep_Name fltk
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name fltkforms
+    Project_Dep_Name fltk_forms
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name fltkimages
+    Project_Dep_Name fltk_images
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name fltkjpeg
+    Project_Dep_Name fltk_jpeg
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name fltkpng
+    Project_Dep_Name fltk_png
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name zlib
+    Project_Dep_Name fltk_zlib
     End Project Dependency
 }}}
 
@@ -45,7 +45,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "fltkgl"=".\fltkgl.dsp" - Package Owner=<4>
+Project: "fltk_gl"=".\fltk_gl.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -60,7 +60,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "fltkimages"=".\fltkimages.dsp" - Package Owner=<4>
+Project: "fltk_images"=".\fltk_images.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -72,16 +72,16 @@ Package=<4>
     Project_Dep_Name fltk
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name fltkpng
+    Project_Dep_Name fltk_png
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name fltkjpeg
+    Project_Dep_Name fltk_jpeg
     End Project Dependency
 }}}
 
 ###############################################################################
 
-Project: "fltkpng"=".\fltkpng.dsp" - Package Owner=<4>
+Project: "fltk_png"=".\fltk_png.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -90,13 +90,13 @@ Package=<5>
 Package=<4>
 {{{
     Begin Project Dependency
-    Project_Dep_Name zlib
+    Project_Dep_Name fltk_zlib
     End Project Dependency
 }}}
 
 ###############################################################################
 
-Project: "fltkjpeg"=".\fltkjpeg.dsp" - Package Owner=<4>
+Project: "fltk_jpeg"=".\fltk_jpeg.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -111,7 +111,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "fltkforms"=".\fltkforms.dsp" - Package Owner=<4>
+Project: "fltk_forms"=".\fltk_forms.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -126,7 +126,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "zlib"=".\zlib.dsp" - Package Owner=<4>
+Project: "fltk_zlib"=".\fltk_zlib.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -150,7 +150,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "fltkgldll"=".\fltkgldll.dsp" - Package Owner=<4>
+Project: "fltk_gldll"=".\fltk_gldll.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -165,7 +165,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "fltkimagesdll"=".\fltkimagesdll.dsp" - Package Owner=<4>
+Project: "fltk_imagesdll"=".\fltk_imagesdll.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -177,16 +177,16 @@ Package=<4>
     Project_Dep_Name fltk
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name fltkpng
+    Project_Dep_Name fltk_png
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name fltkjpeg
+    Project_Dep_Name fltk_jpeg
     End Project Dependency
 }}}
 
 ###############################################################################
 
-Project: "fltkpngdll"=".\fltkpngdll.dsp" - Package Owner=<4>
+Project: "fltk_pngdll"=".\fltk_pngdll.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -195,13 +195,13 @@ Package=<5>
 Package=<4>
 {{{
     Begin Project Dependency
-    Project_Dep_Name zlib
+    Project_Dep_Name fltk_zlib
     End Project Dependency
 }}}
 
 ###############################################################################
 
-Project: "fltkjpegdll"=".\fltkjpegdll.dsp" - Package Owner=<4>
+Project: "fltk_jpegdll"=".\fltk_jpegdll.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -216,7 +216,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "fltkformsdll"=".\fltkformsdll.dsp" - Package Owner=<4>
+Project: "fltk_formsdll"=".\fltk_formsdll.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -231,7 +231,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "zlibdll"=".\zlibdll.dsp" - Package Owner=<4>
+Project: "fltk_zlibdll"=".\fltk_zlibdll.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -309,6 +309,9 @@ Package=<4>
     Project_Dep_Name curve
     End Project Dependency
     Begin Project Dependency
+    Project_Dep_Name device
+    End Project Dependency
+    Begin Project Dependency
     Project_Dep_Name doublebuffer
     End Project Dependency
     Begin Project Dependency
@@ -455,9 +458,6 @@ Package=<4>
     Begin Project Dependency
     Project_Dep_Name valuators
     End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name device
-    End Project Dependency
 }}}
 
 ###############################################################################
@@ -639,7 +639,7 @@ Package=<4>
     Project_Dep_Name fltk
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name fltkforms
+    Project_Dep_Name fltk_forms
     End Project Dependency
 }}}
 
@@ -672,7 +672,7 @@ Package=<4>
     Project_Dep_Name fltk
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name fltkgl
+    Project_Dep_Name fltk_gl
     End Project Dependency
 }}}
 
@@ -690,7 +690,7 @@ Package=<4>
     Project_Dep_Name fltk
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name fltkgl
+    Project_Dep_Name fltk_gl
     End Project Dependency
     Begin Project Dependency
     Project_Dep_Name Fluid
@@ -729,6 +729,33 @@ Package=<4>
 
 ###############################################################################
 
+Project: "device"=".\device.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name fltk
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name fltk_images
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name fltk_jpeg
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name fltk_png
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name fltk_zlib
+    End Project Dependency
+}}}
+
+###############################################################################
+
 Project: "doublebuffer"=".\doublebuffer.dsp" - Package Owner=<4>
 
 Package=<5>
@@ -789,16 +816,16 @@ Package=<4>
     Project_Dep_Name fltk
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name fltkimages
+    Project_Dep_Name fltk_images
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name fltkjpeg
+    Project_Dep_Name fltk_jpeg
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name fltkpng
+    Project_Dep_Name fltk_png
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name zlib
+    Project_Dep_Name fltk_zlib
     End Project Dependency
 }}}
 
@@ -831,7 +858,7 @@ Package=<4>
     Project_Dep_Name fltk
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name fltkforms
+    Project_Dep_Name fltk_forms
     End Project Dependency
 }}}
 
@@ -849,10 +876,10 @@ Package=<4>
     Project_Dep_Name fltk
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name fltkgl
+    Project_Dep_Name fltk_gl
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name fltkforms
+    Project_Dep_Name fltk_forms
     End Project Dependency
 }}}
 
@@ -870,7 +897,7 @@ Package=<4>
     Project_Dep_Name fltk
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name fltkgl
+    Project_Dep_Name fltk_gl
     End Project Dependency
 }}}
 
@@ -888,7 +915,7 @@ Package=<4>
     Project_Dep_Name fltk
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name fltkgl
+    Project_Dep_Name fltk_gl
     End Project Dependency
 }}}
 
@@ -906,7 +933,7 @@ Package=<4>
     Project_Dep_Name fltk
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name fltkgl
+    Project_Dep_Name fltk_gl
     End Project Dependency
 }}}
 
@@ -939,16 +966,16 @@ Package=<4>
     Project_Dep_Name fltk
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name fltkimages
+    Project_Dep_Name fltk_images
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name fltkjpeg
+    Project_Dep_Name fltk_jpeg
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name fltkpng
+    Project_Dep_Name fltk_png
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name zlib
+    Project_Dep_Name fltk_zlib
     End Project Dependency
 }}}
 
@@ -1062,7 +1089,7 @@ Package=<4>
     Project_Dep_Name fltk
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name fltkforms
+    Project_Dep_Name fltk_forms
     End Project Dependency
 }}}
 
@@ -1203,7 +1230,7 @@ Package=<4>
     Project_Dep_Name fltk
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name fltkforms
+    Project_Dep_Name fltk_forms
     End Project Dependency
 }}}
 
@@ -1251,16 +1278,16 @@ Package=<4>
     Project_Dep_Name fltk
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name fltkimages
+    Project_Dep_Name fltk_images
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name fltkjpeg
+    Project_Dep_Name fltk_jpeg
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name fltkpng
+    Project_Dep_Name fltk_png
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name zlib
+    Project_Dep_Name fltk_zlib
     End Project Dependency
 }}}
 
@@ -1377,7 +1404,7 @@ Package=<4>
     Project_Dep_Name fltk
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name fltkgl
+    Project_Dep_Name fltk_gl
     End Project Dependency
 }}}
 
@@ -1410,16 +1437,16 @@ Package=<4>
     Project_Dep_Name fltk
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name fltkimages
+    Project_Dep_Name fltk_images
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name fltkjpeg
+    Project_Dep_Name fltk_jpeg
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name fltkpng
+    Project_Dep_Name fltk_png
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name zlib
+    Project_Dep_Name fltk_zlib
     End Project Dependency
 }}}
 
@@ -1515,16 +1542,16 @@ Package=<4>
     Project_Dep_Name fltk
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name fltkimages
+    Project_Dep_Name fltk_images
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name fltkjpeg
+    Project_Dep_Name fltk_jpeg
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name fltkpng
+    Project_Dep_Name fltk_png
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name zlib
+    Project_Dep_Name fltk_zlib
     End Project Dependency
 }}}
 
@@ -1578,30 +1605,3 @@ Package=<4>
 
 ###############################################################################
 
-Project: "device"=".\device.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name fltk
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name fltkimages
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name fltkjpeg
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name fltkpng
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name zlib
-    End Project Dependency
-}}}
-
-###############################################################################
-
diff --git a/ide/VisualC6/fltkforms.dsp b/ide/VisualC6/fltk_forms.dsp
index 29a41103f..683f3b461 100644
--- a/ide/VisualC6/fltkforms.dsp
+++ b/ide/VisualC6/fltk_forms.dsp
@@ -1,24 +1,24 @@
-# Microsoft Developer Studio Project File - Name="fltkforms" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="fltk_forms" - Package Owner=<4>
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
 # TARGTYPE "Win32 (x86) Static Library" 0x0104
 
-CFG=fltkforms - Win32 Debug
+CFG=fltk_forms - 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 "fltkforms.mak".
+!MESSAGE NMAKE /f "fltk_forms.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 "fltkforms.mak" CFG="fltkforms - Win32 Debug"
+!MESSAGE NMAKE /f "fltk_forms.mak" CFG="fltk_forms - Win32 Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "fltkforms - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "fltkforms - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "fltk_forms - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "fltk_forms - Win32 Debug" (based on "Win32 (x86) Static Library")
 !MESSAGE 
 
 # Begin Project
@@ -28,17 +28,17 @@ CFG=fltkforms - Win32 Debug
 CPP=cl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "fltkforms - Win32 Release"
+!IF  "$(CFG)" == "fltk_forms - 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 Output_Dir "Release/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Release/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
+# PROP Output_Dir "Release/$(ProjectName)"
+# PROP Intermediate_Dir "Release/$(ProjectName)"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
 # ADD CPP /nologo /MD /GX /Ot /Op /Ob2 /I "." /I "../.." /I "../../zlib" /I "../../png" /I "../../jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
@@ -50,19 +50,19 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\lib\fltkforms.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\fltk_forms.lib"
 
-!ELSEIF  "$(CFG)" == "fltkforms - Win32 Debug"
+!ELSEIF  "$(CFG)" == "fltk_forms - 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 Output_Dir "Debug/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Debug/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
+# PROP Output_Dir "Debug/$(ProjectName)"
+# PROP Intermediate_Dir "Debug/$(ProjectName)"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
 # ADD CPP /nologo /MDd /GX /Z7 /Od /I "." /I "../.." /I "../../zlib" /I "../../png" /I "../../jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /FR /YX /FD /c
@@ -73,14 +73,14 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\lib\fltkformsd.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\fltk_formsd.lib"
 
 !ENDIF 
 
 # Begin Target
 
-# Name "fltkforms - Win32 Release"
-# Name "fltkforms - Win32 Debug"
+# Name "fltk_forms - Win32 Release"
+# Name "fltk_forms - Win32 Debug"
 # Begin Source File
 
 SOURCE=..\..\src\forms_bitmap.cxx
diff --git a/ide/VisualC6/fltkformsdll.dsp b/ide/VisualC6/fltk_formsdll.dsp
index a6fb9fb97..774c023a9 100644
--- a/ide/VisualC6/fltkformsdll.dsp
+++ b/ide/VisualC6/fltk_formsdll.dsp
@@ -1,24 +1,24 @@
-# Microsoft Developer Studio Project File - Name="fltkformsdll" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="fltk_formsdll" - Package Owner=<4>
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
 
-CFG=fltkformsdll - Win32 Debug
+CFG=fltk_formsdll - 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 "fltkformsdll.mak".
+!MESSAGE NMAKE /f "fltk_formsdll.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 "fltkformsdll.mak" CFG="fltkformsdll - Win32 Debug"
+!MESSAGE NMAKE /f "fltk_formsdll.mak" CFG="fltk_formsdll - Win32 Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "fltkformsdll - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "fltkformsdll - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "fltk_formsdll - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "fltk_formsdll - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
 !MESSAGE 
 
 # Begin Project
@@ -29,17 +29,17 @@ CPP=cl.exe
 MTL=midl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "fltkformsdll - Win32 Release"
+!IF  "$(CFG)" == "fltk_formsdll - Win32 Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "fltkformsdll0"
-# PROP BASE Intermediate_Dir "fltkformsdll0"
+# PROP BASE Output_Dir "Release/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Release/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../test"
-# PROP Intermediate_Dir "fltkformsdll"
+# PROP Output_Dir "Release/$(ProjectName)"
+# PROP Intermediate_Dir "Release/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
@@ -53,20 +53,20 @@ BSC32=bscmake.exe
 # 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 /nologo /subsystem:windows /dll /machine:I386
-# ADD LINK32 opengl32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /version:1.0 /subsystem:windows /dll /pdb:"fltkformsdll.pdb" /machine:I386
+# ADD LINK32 opengl32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /version:1.0 /subsystem:windows /dll /pdb:"fltk_formsdll.pdb" /machine:I386
 # SUBTRACT LINK32 /pdb:none
 
-!ELSEIF  "$(CFG)" == "fltkformsdll - Win32 Debug"
+!ELSEIF  "$(CFG)" == "fltk_formsdll - Win32 Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "fltkformsdll1"
-# PROP BASE Intermediate_Dir "fltkformsdll1"
+# PROP BASE Output_Dir "Debug/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Debug/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../test"
-# PROP Intermediate_Dir "fltkformsdlld"
+# PROP Output_Dir "Debug/$(ProjectName)"
+# PROP Intermediate_Dir "Debug/$(ProjectName)"
 # 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 /FD /c
@@ -80,15 +80,15 @@ BSC32=bscmake.exe
 # 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 /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 opengl32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /version:1.0 /subsystem:windows /dll /pdb:"fltkformsdlld.pdb" /debug /machine:I386 /out:"../../test/fltkformsdlld.dll" /pdbtype:sept
+# ADD LINK32 opengl32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /version:1.0 /subsystem:windows /dll /pdb:"fltk_formsdlld.pdb" /debug /machine:I386 /out:"../../test/fltk_formsdlld.dll" /pdbtype:sept
 # SUBTRACT LINK32 /pdb:none /incremental:no
 
 !ENDIF 
 
 # Begin Target
 
-# Name "fltkformsdll - Win32 Release"
-# Name "fltkformsdll - Win32 Debug"
+# Name "fltk_formsdll - Win32 Release"
+# Name "fltk_formsdll - Win32 Debug"
 # Begin Source File
 
 SOURCE=..\..\src\forms_bitmap.cxx
diff --git a/ide/VisualC6/fltkgl.dsp b/ide/VisualC6/fltk_gl.dsp
index 125a7200f..452a01ab4 100644
--- a/ide/VisualC6/fltkgl.dsp
+++ b/ide/VisualC6/fltk_gl.dsp
@@ -1,24 +1,24 @@
-# Microsoft Developer Studio Project File - Name="fltkgl" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="fltk_gl" - Package Owner=<4>
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
 # TARGTYPE "Win32 (x86) Static Library" 0x0104
 
-CFG=fltkgl - Win32 Debug
+CFG=fltk_gl - 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 "fltkgl.mak".
+!MESSAGE NMAKE /f "fltk_gl.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 "fltkgl.mak" CFG="fltkgl - Win32 Debug"
+!MESSAGE NMAKE /f "fltk_gl.mak" CFG="fltk_gl - Win32 Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "fltkgl - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "fltkgl - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "fltk_gl - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "fltk_gl - Win32 Debug" (based on "Win32 (x86) Static Library")
 !MESSAGE 
 
 # Begin Project
@@ -28,17 +28,17 @@ CFG=fltkgl - Win32 Debug
 CPP=cl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "fltkgl - Win32 Release"
+!IF  "$(CFG)" == "fltk_gl - 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 Output_Dir "Release/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Release/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
+# PROP Output_Dir "Release/$(ProjectName)"
+# PROP Intermediate_Dir "Release/$(ProjectName)"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
 # ADD CPP /nologo /MD /GX /Ot /Op /Ob2 /I "." /I "../.." /I "../../zlib" /I "../../png" /I "../../jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
@@ -50,19 +50,19 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\lib\fltkgl.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\fltk_gl.lib"
 
-!ELSEIF  "$(CFG)" == "fltkgl - Win32 Debug"
+!ELSEIF  "$(CFG)" == "fltk_gl - 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 Output_Dir "Debug/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Debug/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
+# PROP Output_Dir "Debug/$(ProjectName)"
+# PROP Intermediate_Dir "Debug/$(ProjectName)"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
 # ADD CPP /nologo /MDd /GX /Z7 /Od /I "." /I "../.." /I "../../zlib" /I "../../png" /I "../../jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /FR /YX /FD /c
@@ -73,20 +73,24 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\lib\fltkgld.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\fltk_gld.lib"
 
 !ENDIF 
 
 # Begin Target
 
-# Name "fltkgl - Win32 Release"
-# Name "fltkgl - Win32 Debug"
+# Name "fltk_gl - Win32 Release"
+# Name "fltk_gl - Win32 Debug"
 # Begin Source File
 
 SOURCE=..\..\src\Fl_Gl_Choice.cxx
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\src\Fl_Gl_Device_Plugin.cxx
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\Fl_Gl_Overlay.cxx
 # End Source File
 # Begin Source File
@@ -121,9 +125,5 @@ SOURCE=..\..\src\glut_compatability.cxx
 
 SOURCE=..\..\src\glut_font.cxx
 # End Source File
-# Begin Source File
-
-SOURCE=..\..\src\Fl_Gl_Device_Plugin.cxx
-# End Source File
 # End Target
 # End Project
diff --git a/ide/VisualC6/fltkgldll.dsp b/ide/VisualC6/fltk_gldll.dsp
index 70ce28835..670f712c8 100644
--- a/ide/VisualC6/fltkgldll.dsp
+++ b/ide/VisualC6/fltk_gldll.dsp
@@ -1,24 +1,24 @@
-# Microsoft Developer Studio Project File - Name="fltkgldll" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="fltk_gldll" - Package Owner=<4>
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
 
-CFG=fltkgldll - Win32 Debug
+CFG=fltk_gldll - 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 "fltkgldll.mak".
+!MESSAGE NMAKE /f "fltk_gldll.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 "fltkgldll.mak" CFG="fltkgldll - Win32 Debug"
+!MESSAGE NMAKE /f "fltk_gldll.mak" CFG="fltk_gldll - Win32 Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "fltkgldll - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "fltkgldll - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "fltk_gldll - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "fltk_gldll - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
 !MESSAGE 
 
 # Begin Project
@@ -29,17 +29,17 @@ CPP=cl.exe
 MTL=midl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "fltkgldll - Win32 Release"
+!IF  "$(CFG)" == "fltk_gldll - Win32 Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "fltkgldll0"
-# PROP BASE Intermediate_Dir "fltkgldll0"
+# PROP BASE Output_Dir "Release/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Release/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../test"
-# PROP Intermediate_Dir "fltkgldll"
+# PROP Output_Dir "Release/$(ProjectName)"
+# PROP Intermediate_Dir "Release/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
@@ -53,20 +53,20 @@ BSC32=bscmake.exe
 # 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 /nologo /subsystem:windows /dll /machine:I386
-# ADD LINK32 opengl32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /version:1.0 /subsystem:windows /dll /pdb:"fltkgldll.pdb" /machine:I386
+# ADD LINK32 opengl32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /version:1.0 /subsystem:windows /dll /pdb:"fltk_gldll.pdb" /machine:I386
 # SUBTRACT LINK32 /pdb:none
 
-!ELSEIF  "$(CFG)" == "fltkgldll - Win32 Debug"
+!ELSEIF  "$(CFG)" == "fltk_gldll - Win32 Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "fltkgldll1"
-# PROP BASE Intermediate_Dir "fltkgldll1"
+# PROP BASE Output_Dir "Debug/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Debug/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../test"
-# PROP Intermediate_Dir "fltkgldlld"
+# PROP Output_Dir "Debug/$(ProjectName)"
+# PROP Intermediate_Dir "Debug/$(ProjectName)"
 # 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 /FD /c
@@ -80,21 +80,25 @@ BSC32=bscmake.exe
 # 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 /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 opengl32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /version:1.0 /subsystem:windows /dll /pdb:"fltkgldlld.pdb" /debug /machine:I386 /out:"../../test/fltkgldlld.dll" /pdbtype:sept
+# ADD LINK32 opengl32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /version:1.0 /subsystem:windows /dll /pdb:"fltk_gldlld.pdb" /debug /machine:I386 /out:"../../test/fltk_gldlld.dll" /pdbtype:sept
 # SUBTRACT LINK32 /pdb:none /incremental:no
 
 !ENDIF 
 
 # Begin Target
 
-# Name "fltkgldll - Win32 Release"
-# Name "fltkgldll - Win32 Debug"
+# Name "fltk_gldll - Win32 Release"
+# Name "fltk_gldll - Win32 Debug"
 # Begin Source File
 
 SOURCE=..\..\src\Fl_Gl_Choice.cxx
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\src\Fl_Gl_Device_Plugin.cxx
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\Fl_Gl_Overlay.cxx
 # End Source File
 # Begin Source File
@@ -129,9 +133,5 @@ SOURCE=..\..\src\glut_compatability.cxx
 
 SOURCE=..\..\src\glut_font.cxx
 # End Source File
-# Begin Source File
-
-SOURCE=..\..\src\Fl_Gl_Device_Plugin.cxx
-# End Source File
 # End Target
 # End Project
diff --git a/ide/VisualC6/fltkimages.dsp b/ide/VisualC6/fltk_images.dsp
index 770ad39e6..fda329bcf 100644
--- a/ide/VisualC6/fltkimages.dsp
+++ b/ide/VisualC6/fltk_images.dsp
@@ -1,24 +1,24 @@
-# Microsoft Developer Studio Project File - Name="fltkimages" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="fltk_images" - Package Owner=<4>
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
 # TARGTYPE "Win32 (x86) Static Library" 0x0104
 
-CFG=fltkimages - Win32 Debug
+CFG=fltk_images - 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 "fltkimages.mak".
+!MESSAGE NMAKE /f "fltk_images.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 "fltkimages.mak" CFG="fltkimages - Win32 Debug"
+!MESSAGE NMAKE /f "fltk_images.mak" CFG="fltk_images - Win32 Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "fltkimages - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "fltkimages - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "fltk_images - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "fltk_images - Win32 Debug" (based on "Win32 (x86) Static Library")
 !MESSAGE 
 
 # Begin Project
@@ -28,17 +28,17 @@ CFG=fltkimages - Win32 Debug
 CPP=cl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "fltkimages - Win32 Release"
+!IF  "$(CFG)" == "fltk_images - 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 Output_Dir "Release/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Release/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
+# PROP Output_Dir "Release/$(ProjectName)"
+# PROP Intermediate_Dir "Release/$(ProjectName)"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
 # ADD CPP /nologo /MD /GX /Ot /Op /Ob2 /I "." /I "../.." /I "../../zlib" /I "../../png" /I "../../jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
@@ -50,19 +50,19 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\lib\fltkimages.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\fltk_images.lib"
 
-!ELSEIF  "$(CFG)" == "fltkimages - Win32 Debug"
+!ELSEIF  "$(CFG)" == "fltk_images - 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 Output_Dir "Debug/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Debug/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
+# PROP Output_Dir "Debug/$(ProjectName)"
+# PROP Intermediate_Dir "Debug/$(ProjectName)"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
 # ADD CPP /nologo /MDd /GX /Z7 /Od /I "." /I "../.." /I "../../zlib" /I "../../png" /I "../../jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /FR /YX /FD /c
@@ -73,14 +73,14 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\lib\fltkimagesd.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\fltk_imagesd.lib"
 
 !ENDIF 
 
 # Begin Target
 
-# Name "fltkimages - Win32 Release"
-# Name "fltkimages - Win32 Debug"
+# Name "fltk_images - Win32 Release"
+# Name "fltk_images - Win32 Debug"
 # Begin Source File
 
 SOURCE=..\..\src\Fl_BMP_Image.cxx
diff --git a/ide/VisualC6/fltkimagesdll.dsp b/ide/VisualC6/fltk_imagesdll.dsp
index 4a2e1ed55..d58540ebc 100644
--- a/ide/VisualC6/fltkimagesdll.dsp
+++ b/ide/VisualC6/fltk_imagesdll.dsp
@@ -1,24 +1,24 @@
-# Microsoft Developer Studio Project File - Name="fltkimagesdll" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="fltk_imagesdll" - Package Owner=<4>
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
 
-CFG=fltkimagesdll - Win32 Debug
+CFG=fltk_imagesdll - 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 "fltkimagesdll.mak".
+!MESSAGE NMAKE /f "fltk_imagesdll.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 "fltkimagesdll.mak" CFG="fltkimagesdll - Win32 Debug"
+!MESSAGE NMAKE /f "fltk_imagesdll.mak" CFG="fltk_imagesdll - Win32 Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "fltkimagesdll - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "fltkimagesdll - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "fltk_imagesdll - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "fltk_imagesdll - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
 !MESSAGE 
 
 # Begin Project
@@ -29,17 +29,17 @@ CPP=cl.exe
 MTL=midl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "fltkimagesdll - Win32 Release"
+!IF  "$(CFG)" == "fltk_imagesdll - Win32 Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "fltkimagesdll0"
-# PROP BASE Intermediate_Dir "fltkimagesdll0"
+# PROP BASE Output_Dir "Release/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Release/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../test"
-# PROP Intermediate_Dir "fltkimagesdll"
+# PROP Output_Dir "Release/$(ProjectName)"
+# PROP Intermediate_Dir "Release/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
@@ -53,20 +53,20 @@ BSC32=bscmake.exe
 # 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 /nologo /subsystem:windows /dll /machine:I386
-# ADD LINK32 opengl32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /version:1.0 /subsystem:windows /dll /pdb:"fltkimagesdll.pdb" /machine:I386
+# ADD LINK32 opengl32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /version:1.0 /subsystem:windows /dll /pdb:"fltk_imagesdll.pdb" /machine:I386
 # SUBTRACT LINK32 /pdb:none
 
-!ELSEIF  "$(CFG)" == "fltkimagesdll - Win32 Debug"
+!ELSEIF  "$(CFG)" == "fltk_imagesdll - Win32 Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "fltkimagesdll1"
-# PROP BASE Intermediate_Dir "fltkimagesdll1"
+# PROP BASE Output_Dir "Debug/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Debug/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../test"
-# PROP Intermediate_Dir "fltkimagesdlld"
+# PROP Output_Dir "Debug/$(ProjectName)"
+# PROP Intermediate_Dir "Debug/$(ProjectName)"
 # 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 /FD /c
@@ -80,15 +80,15 @@ BSC32=bscmake.exe
 # 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 /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 opengl32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /version:1.0 /subsystem:windows /dll /pdb:"fltkimagesdlld.pdb" /debug /machine:I386 /out:"../../test/fltkimagesdlld.dll" /pdbtype:sept
+# ADD LINK32 opengl32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /version:1.0 /subsystem:windows /dll /pdb:"fltk_imagesdlld.pdb" /debug /machine:I386 /out:"../../test/fltk_imagesdlld.dll" /pdbtype:sept
 # SUBTRACT LINK32 /pdb:none /incremental:no
 
 !ENDIF 
 
 # Begin Target
 
-# Name "fltkimagesdll - Win32 Release"
-# Name "fltkimagesdll - Win32 Debug"
+# Name "fltk_imagesdll - Win32 Release"
+# Name "fltk_imagesdll - Win32 Debug"
 # Begin Source File
 
 SOURCE=..\..\src\Fl_BMP_Image.cxx
diff --git a/ide/VisualC6/fltkjpeg.dsp b/ide/VisualC6/fltk_jpeg.dsp
index 218f95ec2..8b24080bb 100644
--- a/ide/VisualC6/fltkjpeg.dsp
+++ b/ide/VisualC6/fltk_jpeg.dsp
@@ -1,24 +1,24 @@
-# Microsoft Developer Studio Project File - Name="fltkjpeg" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="fltk_jpeg" - Package Owner=<4>
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
 # TARGTYPE "Win32 (x86) Static Library" 0x0104
 
-CFG=fltkjpeg - Win32 Debug
+CFG=fltk_jpeg - 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 "fltkjpeg.mak".
+!MESSAGE NMAKE /f "fltk_jpeg.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 "fltkjpeg.mak" CFG="fltkjpeg - Win32 Debug"
+!MESSAGE NMAKE /f "fltk_jpeg.mak" CFG="fltk_jpeg - Win32 Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "fltkjpeg - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "fltkjpeg - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "fltk_jpeg - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "fltk_jpeg - Win32 Debug" (based on "Win32 (x86) Static Library")
 !MESSAGE 
 
 # Begin Project
@@ -28,17 +28,17 @@ CFG=fltkjpeg - Win32 Debug
 CPP=cl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "fltkjpeg - Win32 Release"
+!IF  "$(CFG)" == "fltk_jpeg - 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 Output_Dir "Release/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Release/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
+# PROP Output_Dir "Release/$(ProjectName)"
+# PROP Intermediate_Dir "Release/$(ProjectName)"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
 # ADD CPP /nologo /MD /GX /Ot /Op /Ob2 /I "." /I "../.." /I "../../zlib" /I "../../png" /I "../../jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
@@ -50,19 +50,19 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\lib\fltkjpeg.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\fltk_jpeg.lib"
 
-!ELSEIF  "$(CFG)" == "fltkjpeg - Win32 Debug"
+!ELSEIF  "$(CFG)" == "fltk_jpeg - 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 Output_Dir "Debug/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Debug/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
+# PROP Output_Dir "Debug/$(ProjectName)"
+# PROP Intermediate_Dir "Debug/$(ProjectName)"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
 # ADD CPP /nologo /MDd /GX /Z7 /Od /I "." /I "../.." /I "../../zlib" /I "../../png" /I "../../jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /FR /YX /FD /c
@@ -73,14 +73,14 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\lib\fltkjpegd.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\fltk_jpegd.lib"
 
 !ENDIF 
 
 # Begin Target
 
-# Name "fltkjpeg - Win32 Release"
-# Name "fltkjpeg - Win32 Debug"
+# Name "fltk_jpeg - Win32 Release"
+# Name "fltk_jpeg - Win32 Debug"
 # Begin Source File
 
 SOURCE=..\..\jpeg\jcapimin.c
diff --git a/ide/VisualC6/fltkjpegdll.dsp b/ide/VisualC6/fltk_jpegdll.dsp
index 61c7d5882..78601a9a0 100644
--- a/ide/VisualC6/fltkjpegdll.dsp
+++ b/ide/VisualC6/fltk_jpegdll.dsp
@@ -1,24 +1,24 @@
-# Microsoft Developer Studio Project File - Name="fltkjpegdll" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="fltk_jpegdll" - Package Owner=<4>
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
 
-CFG=fltkjpegdll - Win32 Debug
+CFG=fltk_jpegdll - 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 "fltkjpegdll.mak".
+!MESSAGE NMAKE /f "fltk_jpegdll.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 "fltkjpegdll.mak" CFG="fltkjpegdll - Win32 Debug"
+!MESSAGE NMAKE /f "fltk_jpegdll.mak" CFG="fltk_jpegdll - Win32 Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "fltkjpegdll - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "fltkjpegdll - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "fltk_jpegdll - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "fltk_jpegdll - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
 !MESSAGE 
 
 # Begin Project
@@ -29,17 +29,17 @@ CPP=cl.exe
 MTL=midl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "fltkjpegdll - Win32 Release"
+!IF  "$(CFG)" == "fltk_jpegdll - Win32 Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "fltkjpegdll0"
-# PROP BASE Intermediate_Dir "fltkjpegdll0"
+# PROP BASE Output_Dir "Release/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Release/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../test"
-# PROP Intermediate_Dir "fltkjpegdll"
+# PROP Output_Dir "Release/$(ProjectName)"
+# PROP Intermediate_Dir "Release/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
@@ -53,20 +53,20 @@ BSC32=bscmake.exe
 # 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 /nologo /subsystem:windows /dll /machine:I386
-# ADD LINK32 opengl32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /version:1.0 /subsystem:windows /dll /pdb:"fltkjpegdll.pdb" /machine:I386
+# ADD LINK32 opengl32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /version:1.0 /subsystem:windows /dll /pdb:"fltk_jpegdll.pdb" /machine:I386
 # SUBTRACT LINK32 /pdb:none
 
-!ELSEIF  "$(CFG)" == "fltkjpegdll - Win32 Debug"
+!ELSEIF  "$(CFG)" == "fltk_jpegdll - Win32 Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "fltkjpegdll1"
-# PROP BASE Intermediate_Dir "fltkjpegdll1"
+# PROP BASE Output_Dir "Debug/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Debug/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../test"
-# PROP Intermediate_Dir "fltkjpegdlld"
+# PROP Output_Dir "Debug/$(ProjectName)"
+# PROP Intermediate_Dir "Debug/$(ProjectName)"
 # 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 /FD /c
@@ -80,15 +80,15 @@ BSC32=bscmake.exe
 # 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 /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 opengl32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /version:1.0 /subsystem:windows /dll /pdb:"fltkjpegdlld.pdb" /debug /machine:I386 /out:"../../test/fltkjpegdlld.dll" /pdbtype:sept
+# ADD LINK32 opengl32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /version:1.0 /subsystem:windows /dll /pdb:"fltk_jpegdlld.pdb" /debug /machine:I386 /out:"../../test/fltk_jpegdlld.dll" /pdbtype:sept
 # SUBTRACT LINK32 /pdb:none /incremental:no
 
 !ENDIF 
 
 # Begin Target
 
-# Name "fltkjpegdll - Win32 Release"
-# Name "fltkjpegdll - Win32 Debug"
+# Name "fltk_jpegdll - Win32 Release"
+# Name "fltk_jpegdll - Win32 Debug"
 # Begin Source File
 
 SOURCE=..\..\jpeg\jcapimin.c
diff --git a/ide/VisualC6/fltkpng.dsp b/ide/VisualC6/fltk_png.dsp
index 78fa878e3..a9acc38a2 100644
--- a/ide/VisualC6/fltkpng.dsp
+++ b/ide/VisualC6/fltk_png.dsp
@@ -1,24 +1,24 @@
-# Microsoft Developer Studio Project File - Name="fltkpng" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="fltk_png" - Package Owner=<4>
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
 # TARGTYPE "Win32 (x86) Static Library" 0x0104
 
-CFG=fltkpng - Win32 Debug
+CFG=fltk_png - 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 "fltkpng.mak".
+!MESSAGE NMAKE /f "fltk_png.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 "fltkpng.mak" CFG="fltkpng - Win32 Debug"
+!MESSAGE NMAKE /f "fltk_png.mak" CFG="fltk_png - Win32 Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "fltkpng - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "fltkpng - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "fltk_png - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "fltk_png - Win32 Debug" (based on "Win32 (x86) Static Library")
 !MESSAGE 
 
 # Begin Project
@@ -28,17 +28,17 @@ CFG=fltkpng - Win32 Debug
 CPP=cl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "fltkpng - Win32 Release"
+!IF  "$(CFG)" == "fltk_png - 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 Output_Dir "Release/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Release/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
+# PROP Output_Dir "Release/$(ProjectName)"
+# PROP Intermediate_Dir "Release/$(ProjectName)"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
 # ADD CPP /nologo /MD /GX /Ot /Op /Ob2 /I "." /I "../.." /I "../../zlib" /I "../../png" /I "../../jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
@@ -50,19 +50,19 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\lib\fltkpng.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\fltk_png.lib"
 
-!ELSEIF  "$(CFG)" == "fltkpng - Win32 Debug"
+!ELSEIF  "$(CFG)" == "fltk_png - 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 Output_Dir "Debug/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Debug/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
+# PROP Output_Dir "Debug/$(ProjectName)"
+# PROP Intermediate_Dir "Debug/$(ProjectName)"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
 # ADD CPP /nologo /MDd /GX /Z7 /Od /I "." /I "../.." /I "../../zlib" /I "../../png" /I "../../jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /FR /YX /FD /c
@@ -73,14 +73,14 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\lib\fltkpngd.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\fltk_pngd.lib"
 
 !ENDIF 
 
 # Begin Target
 
-# Name "fltkpng - Win32 Release"
-# Name "fltkpng - Win32 Debug"
+# Name "fltk_png - Win32 Release"
+# Name "fltk_png - Win32 Debug"
 # Begin Source File
 
 SOURCE=..\..\png\png.c
diff --git a/ide/VisualC6/fltkpngdll.dsp b/ide/VisualC6/fltk_pngdll.dsp
index e70709918..1b6245742 100644
--- a/ide/VisualC6/fltkpngdll.dsp
+++ b/ide/VisualC6/fltk_pngdll.dsp
@@ -1,24 +1,24 @@
-# Microsoft Developer Studio Project File - Name="fltkpngdll" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="fltk_pngdll" - Package Owner=<4>
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
 
-CFG=fltkpngdll - Win32 Debug
+CFG=fltk_pngdll - 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 "fltkpngdll.mak".
+!MESSAGE NMAKE /f "fltk_pngdll.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 "fltkpngdll.mak" CFG="fltkpngdll - Win32 Debug"
+!MESSAGE NMAKE /f "fltk_pngdll.mak" CFG="fltk_pngdll - Win32 Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "fltkpngdll - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "fltkpngdll - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "fltk_pngdll - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "fltk_pngdll - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
 !MESSAGE 
 
 # Begin Project
@@ -29,17 +29,17 @@ CPP=cl.exe
 MTL=midl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "fltkpngdll - Win32 Release"
+!IF  "$(CFG)" == "fltk_pngdll - Win32 Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "fltkpngdll0"
-# PROP BASE Intermediate_Dir "fltkpngdll0"
+# PROP BASE Output_Dir "Release/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Release/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../test"
-# PROP Intermediate_Dir "fltkpngdll"
+# PROP Output_Dir "Release/$(ProjectName)"
+# PROP Intermediate_Dir "Release/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
@@ -53,20 +53,20 @@ BSC32=bscmake.exe
 # 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 /nologo /subsystem:windows /dll /machine:I386
-# ADD LINK32 opengl32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /version:1.0 /subsystem:windows /dll /pdb:"fltkpngdll.pdb" /machine:I386
+# ADD LINK32 opengl32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /version:1.0 /subsystem:windows /dll /pdb:"fltk_pngdll.pdb" /machine:I386
 # SUBTRACT LINK32 /pdb:none
 
-!ELSEIF  "$(CFG)" == "fltkpngdll - Win32 Debug"
+!ELSEIF  "$(CFG)" == "fltk_pngdll - Win32 Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "fltkpngdll1"
-# PROP BASE Intermediate_Dir "fltkpngdll1"
+# PROP BASE Output_Dir "Debug/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Debug/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../test"
-# PROP Intermediate_Dir "fltkpngdlld"
+# PROP Output_Dir "Debug/$(ProjectName)"
+# PROP Intermediate_Dir "Debug/$(ProjectName)"
 # 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 /FD /c
@@ -80,15 +80,15 @@ BSC32=bscmake.exe
 # 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 /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 opengl32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /version:1.0 /subsystem:windows /dll /pdb:"fltkpngdlld.pdb" /debug /machine:I386 /out:"../../test/fltkpngdlld.dll" /pdbtype:sept
+# ADD LINK32 opengl32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /version:1.0 /subsystem:windows /dll /pdb:"fltk_pngdlld.pdb" /debug /machine:I386 /out:"../../test/fltk_pngdlld.dll" /pdbtype:sept
 # SUBTRACT LINK32 /pdb:none /incremental:no
 
 !ENDIF 
 
 # Begin Target
 
-# Name "fltkpngdll - Win32 Release"
-# Name "fltkpngdll - Win32 Debug"
+# Name "fltk_pngdll - Win32 Release"
+# Name "fltk_pngdll - Win32 Debug"
 # Begin Source File
 
 SOURCE=..\..\png\png.c
diff --git a/ide/VisualC6/fltk_zlib.dsp b/ide/VisualC6/fltk_zlib.dsp
new file mode 100644
index 000000000..bfd1b8563
--- /dev/null
+++ b/ide/VisualC6/fltk_zlib.dsp
@@ -0,0 +1,129 @@
+# Microsoft Developer Studio Project File - Name="fltk_zlib" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=fltk_zlib - 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 "fltk_zlib.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 "fltk_zlib.mak" CFG="fltk_zlib - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "fltk_zlib - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "fltk_zlib - 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)" == "fltk_zlib - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Release/$(ProjectName)"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release/$(ProjectName)"
+# PROP Intermediate_Dir "Release/$(ProjectName)"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Ot /Op /Ob2 /I "." /I "../.." /I "../../zlib" /I "../../png" /I "../../jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# SUBTRACT CPP /Os
+# ADD BASE RSC /l 0x409
+# 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 /out:"..\..\lib\fltk_zlib.lib"
+
+!ELSEIF  "$(CFG)" == "fltk_zlib - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Debug/$(ProjectName)"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug/$(ProjectName)"
+# PROP Intermediate_Dir "Debug/$(ProjectName)"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MDd /GX /Z7 /Od /I "." /I "../.." /I "../../zlib" /I "../../png" /I "../../jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /FR /YX /FD /c
+# ADD BASE RSC /l 0x409
+# 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 /out:"..\..\lib\fltk_zlibd.lib"
+
+!ENDIF 
+
+# Begin Target
+
+# Name "fltk_zlib - Win32 Release"
+# Name "fltk_zlib - Win32 Debug"
+# Begin Source File
+
+SOURCE=..\..\zlib\adler32.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\zlib\compress.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\zlib\crc32.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\zlib\deflate.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\zlib\gzio.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\zlib\inffast.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\zlib\inflate.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\zlib\inftrees.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\zlib\trees.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\zlib\uncompr.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\zlib\zutil.c
+# End Source File
+# End Target
+# End Project
diff --git a/ide/VisualC6/fltk_zlibdll.dsp b/ide/VisualC6/fltk_zlibdll.dsp
new file mode 100644
index 000000000..0964e762e
--- /dev/null
+++ b/ide/VisualC6/fltk_zlibdll.dsp
@@ -0,0 +1,137 @@
+# Microsoft Developer Studio Project File - Name="fltk_zlibdll" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
+
+CFG=fltk_zlibdll - 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 "fltk_zlibdll.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 "fltk_zlibdll.mak" CFG="fltk_zlibdll - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "fltk_zlibdll - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "fltk_zlibdll - 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)" == "fltk_zlibdll - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Release/$(ProjectName)"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release/$(ProjectName)"
+# PROP Intermediate_Dir "Release/$(ProjectName)"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /Os /Ob2 /I "../../zlib" /I "../../png" /I "../../jpeg" /I "." /I "../.." /D "FL_DLL" /D "FL_LIBRARY" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /c
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
+# 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 /nologo /subsystem:windows /dll /machine:I386
+# ADD LINK32 opengl32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /version:1.0 /subsystem:windows /dll /pdb:"fltk_zlibdll.pdb" /machine:I386
+# SUBTRACT LINK32 /pdb:none
+
+!ELSEIF  "$(CFG)" == "fltk_zlibdll - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Debug/$(ProjectName)"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug/$(ProjectName)"
+# PROP Intermediate_Dir "Debug/$(ProjectName)"
+# 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 /FD /c
+# ADD CPP /nologo /MDd /GX /ZI /Od /I "." /I "../.." /I "..\..\zlib" /I "..\..\png" /I "..\..\jpeg" /D "FL_DLL" /D "FL_LIBRARY" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /c
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
+# 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 /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 opengl32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /version:1.0 /subsystem:windows /dll /pdb:"fltk_zlibdlld.pdb" /debug /machine:I386 /out:"../../test/fltk_zlibdlld.dll" /pdbtype:sept
+# SUBTRACT LINK32 /pdb:none /incremental:no
+
+!ENDIF 
+
+# Begin Target
+
+# Name "fltk_zlibdll - Win32 Release"
+# Name "fltk_zlibdll - Win32 Debug"
+# Begin Source File
+
+SOURCE=..\..\zlib\adler32.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\zlib\compress.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\zlib\crc32.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\zlib\deflate.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\zlib\gzio.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\zlib\inffast.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\zlib\inflate.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\zlib\inftrees.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\zlib\trees.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\zlib\uncompr.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\zlib\zutil.c
+# End Source File
+# End Target
+# End Project
diff --git a/ide/VisualC6/fltkdll.dsp b/ide/VisualC6/fltkdll.dsp
index 7265ca80f..9fbc3a094 100644
--- a/ide/VisualC6/fltkdll.dsp
+++ b/ide/VisualC6/fltkdll.dsp
@@ -33,13 +33,13 @@ RSC=rc.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "fltkdll0"
-# PROP BASE Intermediate_Dir "fltkdll0"
+# PROP BASE Output_Dir "Release/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Release/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../test"
-# PROP Intermediate_Dir "fltkdll"
+# PROP Output_Dir "Release/$(ProjectName)"
+# PROP Intermediate_Dir "Release/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
@@ -60,13 +60,13 @@ LINK32=link.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "fltkdll1"
-# PROP BASE Intermediate_Dir "fltkdll1"
+# PROP BASE Output_Dir "Debug/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Debug/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../test"
-# PROP Intermediate_Dir "fltkdlld"
+# PROP Output_Dir "Debug/$(ProjectName)"
+# PROP Intermediate_Dir "Debug/$(ProjectName)"
 # 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 /FD /c
@@ -95,6 +95,10 @@ SOURCE=..\..\src\Fl.cxx
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\src\Fl_Abstract_Printer.cxx
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\Fl_Adjuster.cxx
 # End Source File
 # Begin Source File
@@ -151,6 +155,10 @@ SOURCE=..\..\src\Fl_Counter.cxx
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\src\Fl_Device.cxx
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\Fl_Dial.cxx
 # End Source File
 # Begin Source File
@@ -255,6 +263,10 @@ SOURCE=..\..\src\Fl_Positioner.cxx
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\src\Fl_Printer.cxx
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\Fl_Preferences.cxx
 # End Source File
 # Begin Source File
@@ -651,6 +663,10 @@ SOURCE=..\..\src\numericsort.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\src\ps_image.cxx
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\scandir.c
 # End Source File
 # Begin Source File
@@ -673,21 +689,5 @@ SOURCE=..\..\src\xutf8\is_right2left.c
 
 SOURCE=..\..\src\xutf8\is_spacing.c
 # End Source File
-# Begin Source File
-
-SOURCE=..\..\src\Fl_Device.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\Fl_Printer.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\ps_image.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\Fl_Abstract_Printer.cxx
-# End Source File
 # End Target
 # End Project
diff --git a/ide/VisualC6/fonts.dsp b/ide/VisualC6/fonts.dsp
index 5fe3d7769..5d900793b 100644
--- a/ide/VisualC6/fonts.dsp
+++ b/ide/VisualC6/fonts.dsp
@@ -33,13 +33,13 @@ RSC=rc.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Output_Dir "Release/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Release/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
+# PROP Output_Dir "Release/$(ProjectName)"
+# PROP Intermediate_Dir "Release/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
@@ -60,13 +60,13 @@ LINK32=link.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "fonts_"
-# PROP BASE Intermediate_Dir "fonts_"
+# PROP BASE Output_Dir "Debug/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Debug/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "fonts_"
-# PROP Intermediate_Dir "fonts_"
+# PROP Output_Dir "Debug/$(ProjectName)"
+# PROP Intermediate_Dir "Debug/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
diff --git a/ide/VisualC6/forms.dsp b/ide/VisualC6/forms.dsp
index 4f74d65c8..5435dfd26 100644
--- a/ide/VisualC6/forms.dsp
+++ b/ide/VisualC6/forms.dsp
@@ -33,13 +33,13 @@ RSC=rc.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Output_Dir "Release/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Release/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
+# PROP Output_Dir "Release/$(ProjectName)"
+# PROP Intermediate_Dir "Release/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
@@ -53,20 +53,20 @@ BSC32=bscmake.exe
 # 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 fltk.lib fltkforms.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/forms.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk.lib fltk_forms.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/forms.exe" /pdbtype:sept /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:yes
 
 !ELSEIF  "$(CFG)" == "forms - Win32 Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "forms_"
-# PROP BASE Intermediate_Dir "forms_"
+# PROP BASE Output_Dir "Debug/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Debug/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "forms_"
-# PROP Intermediate_Dir "forms_"
+# PROP Output_Dir "Debug/$(ProjectName)"
+# PROP Intermediate_Dir "Debug/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
@@ -80,7 +80,7 @@ BSC32=bscmake.exe
 # 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 fltkd.lib fltkformsd.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/formsd.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltkd.lib fltk_formsd.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/formsd.exe" /pdbtype:sept /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:no
 
 !ENDIF 
diff --git a/ide/VisualC6/fractals.dsp b/ide/VisualC6/fractals.dsp
index 9f119fb6a..6af97ae89 100644
--- a/ide/VisualC6/fractals.dsp
+++ b/ide/VisualC6/fractals.dsp
@@ -33,13 +33,13 @@ RSC=rc.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Output_Dir "Release/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Release/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
+# PROP Output_Dir "Release/$(ProjectName)"
+# PROP Intermediate_Dir "Release/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
@@ -53,20 +53,20 @@ BSC32=bscmake.exe
 # 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 fltk.lib fltkgl.lib fltkforms.lib glu32.lib opengl32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/fractals.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk.lib fltk_gl.lib fltk_forms.lib glu32.lib opengl32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/fractals.exe" /pdbtype:sept /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:yes
 
 !ELSEIF  "$(CFG)" == "fractals - Win32 Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "fractals_"
-# PROP BASE Intermediate_Dir "fractals_"
+# PROP BASE Output_Dir "Debug/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Debug/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "fractals_"
-# PROP Intermediate_Dir "fractals_"
+# PROP Output_Dir "Debug/$(ProjectName)"
+# PROP Intermediate_Dir "Debug/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
@@ -80,7 +80,7 @@ BSC32=bscmake.exe
 # 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 fltkd.lib fltkgld.lib fltkformsd.lib glu32.lib opengl32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/fractalsd.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltkd.lib fltk_gld.lib fltk_formsd.lib glu32.lib opengl32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/fractalsd.exe" /pdbtype:sept /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:no
 
 !ENDIF 
diff --git a/ide/VisualC6/fullscreen.dsp b/ide/VisualC6/fullscreen.dsp
index e716894ab..78dc11683 100644
--- a/ide/VisualC6/fullscreen.dsp
+++ b/ide/VisualC6/fullscreen.dsp
@@ -33,13 +33,13 @@ RSC=rc.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Output_Dir "Release/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Release/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
+# PROP Output_Dir "Release/$(ProjectName)"
+# PROP Intermediate_Dir "Release/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
@@ -53,20 +53,20 @@ BSC32=bscmake.exe
 # 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 fltk.lib fltkgl.lib glu32.lib opengl32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/fullscreen.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk.lib fltk_gl.lib glu32.lib opengl32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/fullscreen.exe" /pdbtype:sept /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:yes
 
 !ELSEIF  "$(CFG)" == "fullscreen - Win32 Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "fullscreen_"
-# PROP BASE Intermediate_Dir "fullscreen_"
+# PROP BASE Output_Dir "Debug/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Debug/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "fullscreen_"
-# PROP Intermediate_Dir "fullscreen_"
+# PROP Output_Dir "Debug/$(ProjectName)"
+# PROP Intermediate_Dir "Debug/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
@@ -80,7 +80,7 @@ BSC32=bscmake.exe
 # 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 fltkd.lib fltkgld.lib glu32.lib opengl32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/fullscreend.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltkd.lib fltk_gld.lib glu32.lib opengl32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/fullscreend.exe" /pdbtype:sept /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:no
 
 !ENDIF 
diff --git a/ide/VisualC6/gl_overlay.dsp b/ide/VisualC6/gl_overlay.dsp
index 303b7018a..acb12fc10 100644
--- a/ide/VisualC6/gl_overlay.dsp
+++ b/ide/VisualC6/gl_overlay.dsp
@@ -33,13 +33,13 @@ RSC=rc.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Output_Dir "Release/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Release/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
+# PROP Output_Dir "Release/$(ProjectName)"
+# PROP Intermediate_Dir "Release/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
@@ -53,20 +53,20 @@ BSC32=bscmake.exe
 # 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 fltk.lib fltkgl.lib glu32.lib opengl32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/gl_overlay.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk.lib fltk_gl.lib glu32.lib opengl32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/gl_overlay.exe" /pdbtype:sept /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:yes
 
 !ELSEIF  "$(CFG)" == "gl_overlay - Win32 Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "gl_overlay_"
-# PROP BASE Intermediate_Dir "gl_overlay_"
+# PROP BASE Output_Dir "Debug/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Debug/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "gl_overlay_"
-# PROP Intermediate_Dir "gl_overlay_"
+# PROP Output_Dir "Debug/$(ProjectName)"
+# PROP Intermediate_Dir "Debug/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
@@ -80,7 +80,7 @@ BSC32=bscmake.exe
 # 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 fltkd.lib fltkgld.lib glu32.lib opengl32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/gl_overlayd.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltkd.lib fltk_gld.lib glu32.lib opengl32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/gl_overlayd.exe" /pdbtype:sept /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:no
 
 !ENDIF 
diff --git a/ide/VisualC6/glpuzzle.dsp b/ide/VisualC6/glpuzzle.dsp
index 0cc31a469..81667a1d6 100644
--- a/ide/VisualC6/glpuzzle.dsp
+++ b/ide/VisualC6/glpuzzle.dsp
@@ -33,13 +33,13 @@ RSC=rc.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Output_Dir "Release/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Release/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
+# PROP Output_Dir "Release/$(ProjectName)"
+# PROP Intermediate_Dir "Release/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
@@ -53,20 +53,20 @@ BSC32=bscmake.exe
 # 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 fltk.lib fltkgl.lib glu32.lib opengl32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/glpuzzle.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk.lib fltk_gl.lib glu32.lib opengl32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/glpuzzle.exe" /pdbtype:sept /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:yes
 
 !ELSEIF  "$(CFG)" == "glpuzzle - Win32 Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "glpuzzle_"
-# PROP BASE Intermediate_Dir "glpuzzle_"
+# PROP BASE Output_Dir "Debug/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Debug/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "glpuzzle_"
-# PROP Intermediate_Dir "glpuzzle_"
+# PROP Output_Dir "Debug/$(ProjectName)"
+# PROP Intermediate_Dir "Debug/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
@@ -80,7 +80,7 @@ BSC32=bscmake.exe
 # 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 fltkd.lib fltkgld.lib glu32.lib opengl32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/glpuzzled.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltkd.lib fltk_gld.lib glu32.lib opengl32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/glpuzzled.exe" /pdbtype:sept /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:no
 
 !ENDIF 
diff --git a/ide/VisualC6/hello.dsp b/ide/VisualC6/hello.dsp
index c2849c9fe..c1d7d2f02 100644
--- a/ide/VisualC6/hello.dsp
+++ b/ide/VisualC6/hello.dsp
@@ -33,13 +33,13 @@ RSC=rc.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Output_Dir "Release/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Release/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
+# PROP Output_Dir "Release/$(ProjectName)"
+# PROP Intermediate_Dir "Release/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
@@ -60,13 +60,13 @@ LINK32=link.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "hello_"
-# PROP BASE Intermediate_Dir "hello_"
+# PROP BASE Output_Dir "Debug/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Debug/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "hello_"
-# PROP Intermediate_Dir "hello_"
+# PROP Output_Dir "Debug/$(ProjectName)"
+# PROP Intermediate_Dir "Debug/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
diff --git a/ide/VisualC6/help.dsp b/ide/VisualC6/help.dsp
index ff661c65a..8db160410 100644
--- a/ide/VisualC6/help.dsp
+++ b/ide/VisualC6/help.dsp
@@ -33,13 +33,13 @@ RSC=rc.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Output_Dir "Release/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Release/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
+# PROP Output_Dir "Release/$(ProjectName)"
+# PROP Intermediate_Dir "Release/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
@@ -53,20 +53,20 @@ BSC32=bscmake.exe
 # 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 fltk.lib fltkimages.lib fltkjpeg.lib fltkpng.lib zlib.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/help.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk.lib fltk_images.lib fltk_jpeg.lib fltk_png.lib fltk_zlib.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/help.exe" /pdbtype:sept /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:yes
 
 !ELSEIF  "$(CFG)" == "help - Win32 Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "help_"
-# PROP BASE Intermediate_Dir "help_"
+# PROP BASE Output_Dir "Debug/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Debug/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "help_"
-# PROP Intermediate_Dir "help_"
+# PROP Output_Dir "Debug/$(ProjectName)"
+# PROP Intermediate_Dir "Debug/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
@@ -80,7 +80,7 @@ BSC32=bscmake.exe
 # 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 fltkd.lib fltkimagesd.lib fltkjpegd.lib fltkpngd.lib zlibd.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/helpd.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltkd.lib fltk_imagesd.lib fltk_jpegd.lib fltk_pngd.lib fltk_zlibd.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/helpd.exe" /pdbtype:sept /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:no
 
 !ENDIF 
diff --git a/ide/VisualC6/iconize.dsp b/ide/VisualC6/iconize.dsp
index 01483a623..90f2cd727 100644
--- a/ide/VisualC6/iconize.dsp
+++ b/ide/VisualC6/iconize.dsp
@@ -33,13 +33,13 @@ RSC=rc.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Output_Dir "Release/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Release/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
+# PROP Output_Dir "Release/$(ProjectName)"
+# PROP Intermediate_Dir "Release/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
@@ -60,13 +60,13 @@ LINK32=link.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "iconize_"
-# PROP BASE Intermediate_Dir "iconize_"
+# PROP BASE Output_Dir "Debug/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Debug/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "iconize_"
-# PROP Intermediate_Dir "iconize_"
+# PROP Output_Dir "Debug/$(ProjectName)"
+# PROP Intermediate_Dir "Debug/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
diff --git a/ide/VisualC6/image.dsp b/ide/VisualC6/image.dsp
index 6ff225d9a..027c19355 100644
--- a/ide/VisualC6/image.dsp
+++ b/ide/VisualC6/image.dsp
@@ -33,13 +33,13 @@ RSC=rc.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Output_Dir "Release/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Release/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
+# PROP Output_Dir "Release/$(ProjectName)"
+# PROP Intermediate_Dir "Release/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
@@ -60,13 +60,13 @@ LINK32=link.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "image_"
-# PROP BASE Intermediate_Dir "image_"
+# PROP BASE Output_Dir "Debug/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Debug/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "image_"
-# PROP Intermediate_Dir "image_"
+# PROP Output_Dir "Debug/$(ProjectName)"
+# PROP Intermediate_Dir "Debug/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
diff --git a/ide/VisualC6/inactive.dsp b/ide/VisualC6/inactive.dsp
index d8f9b0c65..fc7eeee50 100644
--- a/ide/VisualC6/inactive.dsp
+++ b/ide/VisualC6/inactive.dsp
@@ -33,13 +33,13 @@ RSC=rc.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Output_Dir "Release/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Release/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
+# PROP Output_Dir "Release/$(ProjectName)"
+# PROP Intermediate_Dir "Release/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
@@ -60,13 +60,13 @@ LINK32=link.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "inactive_"
-# PROP BASE Intermediate_Dir "inactive_"
+# PROP BASE Output_Dir "Debug/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Debug/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "inactive_"
-# PROP Intermediate_Dir "inactive_"
+# PROP Output_Dir "Debug/$(ProjectName)"
+# PROP Intermediate_Dir "Debug/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
diff --git a/ide/VisualC6/input.dsp b/ide/VisualC6/input.dsp
index 25d93e738..f4c7eee52 100644
--- a/ide/VisualC6/input.dsp
+++ b/ide/VisualC6/input.dsp
@@ -33,13 +33,13 @@ RSC=rc.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Output_Dir "Release/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Release/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
+# PROP Output_Dir "Release/$(ProjectName)"
+# PROP Intermediate_Dir "Release/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
@@ -60,13 +60,13 @@ LINK32=link.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "input_"
-# PROP BASE Intermediate_Dir "input_"
+# PROP BASE Output_Dir "Debug/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Debug/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "input_"
-# PROP Intermediate_Dir "input_"
+# PROP Output_Dir "Debug/$(ProjectName)"
+# PROP Intermediate_Dir "Debug/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
diff --git a/ide/VisualC6/input_choice.dsp b/ide/VisualC6/input_choice.dsp
index f8fa76173..b154e14b5 100644
--- a/ide/VisualC6/input_choice.dsp
+++ b/ide/VisualC6/input_choice.dsp
@@ -33,13 +33,13 @@ RSC=rc.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Output_Dir "Release/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Release/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
+# PROP Output_Dir "Release/$(ProjectName)"
+# PROP Intermediate_Dir "Release/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
@@ -60,13 +60,13 @@ LINK32=link.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "input_choice_"
-# PROP BASE Intermediate_Dir "input_choice_"
+# PROP BASE Output_Dir "Debug/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Debug/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "input_choice_"
-# PROP Intermediate_Dir "input_choice_"
+# PROP Output_Dir "Debug/$(ProjectName)"
+# PROP Intermediate_Dir "Debug/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
diff --git a/ide/VisualC6/keyboard.dsp b/ide/VisualC6/keyboard.dsp
index 9a8c5ea21..67b4e9538 100644
--- a/ide/VisualC6/keyboard.dsp
+++ b/ide/VisualC6/keyboard.dsp
@@ -33,13 +33,13 @@ RSC=rc.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Output_Dir "Release/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Release/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
+# PROP Output_Dir "Release/$(ProjectName)"
+# PROP Intermediate_Dir "Release/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
@@ -60,13 +60,13 @@ LINK32=link.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "keyboard_"
-# PROP BASE Intermediate_Dir "keyboard_"
+# PROP BASE Output_Dir "Debug/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Debug/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "keyboard_"
-# PROP Intermediate_Dir "keyboard_"
+# PROP Output_Dir "Debug/$(ProjectName)"
+# PROP Intermediate_Dir "Debug/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
diff --git a/ide/VisualC6/label.dsp b/ide/VisualC6/label.dsp
index 0da405b0b..a28f998f3 100644
--- a/ide/VisualC6/label.dsp
+++ b/ide/VisualC6/label.dsp
@@ -33,13 +33,13 @@ RSC=rc.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Output_Dir "Release/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Release/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
+# PROP Output_Dir "Release/$(ProjectName)"
+# PROP Intermediate_Dir "Release/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
@@ -53,20 +53,20 @@ BSC32=bscmake.exe
 # 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 fltk.lib fltkforms.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/label.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk.lib fltk_forms.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/label.exe" /pdbtype:sept /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:yes
 
 !ELSEIF  "$(CFG)" == "label - Win32 Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "label_"
-# PROP BASE Intermediate_Dir "label_"
+# PROP BASE Output_Dir "Debug/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Debug/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "label_"
-# PROP Intermediate_Dir "label_"
+# PROP Output_Dir "Debug/$(ProjectName)"
+# PROP Intermediate_Dir "Debug/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
@@ -80,7 +80,7 @@ BSC32=bscmake.exe
 # 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 fltkd.lib fltkformsd.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/labeld.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltkd.lib fltk_formsd.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/labeld.exe" /pdbtype:sept /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:no
 
 !ENDIF 
diff --git a/ide/VisualC6/line_style.dsp b/ide/VisualC6/line_style.dsp
index 440ef28d0..8319c5a19 100644
--- a/ide/VisualC6/line_style.dsp
+++ b/ide/VisualC6/line_style.dsp
@@ -33,13 +33,13 @@ RSC=rc.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Output_Dir "Release/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Release/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
+# PROP Output_Dir "Release/$(ProjectName)"
+# PROP Intermediate_Dir "Release/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
@@ -60,13 +60,13 @@ LINK32=link.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "line_style_"
-# PROP BASE Intermediate_Dir "line_style_"
+# PROP BASE Output_Dir "Debug/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Debug/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "line_style_"
-# PROP Intermediate_Dir "line_style_"
+# PROP Output_Dir "Debug/$(ProjectName)"
+# PROP Intermediate_Dir "Debug/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
diff --git a/ide/VisualC6/list_visuals.dsp b/ide/VisualC6/list_visuals.dsp
index ec515e6ee..d1572527a 100644
--- a/ide/VisualC6/list_visuals.dsp
+++ b/ide/VisualC6/list_visuals.dsp
@@ -33,13 +33,13 @@ RSC=rc.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Output_Dir "Release/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Release/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
+# PROP Output_Dir "Release/$(ProjectName)"
+# PROP Intermediate_Dir "Release/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
@@ -60,13 +60,13 @@ LINK32=link.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "list_visuals_"
-# PROP BASE Intermediate_Dir "list_visuals_"
+# PROP BASE Output_Dir "Debug/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Debug/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "list_visuals_"
-# PROP Intermediate_Dir "list_visuals_"
+# PROP Output_Dir "Debug/$(ProjectName)"
+# PROP Intermediate_Dir "Debug/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
diff --git a/ide/VisualC6/mandelbrot.dsp b/ide/VisualC6/mandelbrot.dsp
index 6b868e3fc..84f57247f 100644
--- a/ide/VisualC6/mandelbrot.dsp
+++ b/ide/VisualC6/mandelbrot.dsp
@@ -33,13 +33,13 @@ RSC=rc.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Output_Dir "Release/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Release/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
+# PROP Output_Dir "Release/$(ProjectName)"
+# PROP Intermediate_Dir "Release/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
@@ -60,13 +60,13 @@ LINK32=link.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "mandelbrot_"
-# PROP BASE Intermediate_Dir "mandelbrot_"
+# PROP BASE Output_Dir "Debug/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Debug/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "mandelbrot_"
-# PROP Intermediate_Dir "mandelbrot_"
+# PROP Output_Dir "Debug/$(ProjectName)"
+# PROP Intermediate_Dir "Debug/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
diff --git a/ide/VisualC6/menubar.dsp b/ide/VisualC6/menubar.dsp
index d89d67949..408c9dff6 100644
--- a/ide/VisualC6/menubar.dsp
+++ b/ide/VisualC6/menubar.dsp
@@ -33,13 +33,13 @@ RSC=rc.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Output_Dir "Release/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Release/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
+# PROP Output_Dir "Release/$(ProjectName)"
+# PROP Intermediate_Dir "Release/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
@@ -60,13 +60,13 @@ LINK32=link.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "menubar_"
-# PROP BASE Intermediate_Dir "menubar_"
+# PROP BASE Output_Dir "Debug/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Debug/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "menubar_"
-# PROP Intermediate_Dir "menubar_"
+# PROP Output_Dir "Debug/$(ProjectName)"
+# PROP Intermediate_Dir "Debug/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
diff --git a/ide/VisualC6/message.dsp b/ide/VisualC6/message.dsp
index 77f18bb47..03d9b1b0c 100644
--- a/ide/VisualC6/message.dsp
+++ b/ide/VisualC6/message.dsp
@@ -33,13 +33,13 @@ RSC=rc.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Output_Dir "Release/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Release/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
+# PROP Output_Dir "Release/$(ProjectName)"
+# PROP Intermediate_Dir "Release/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
@@ -60,13 +60,13 @@ LINK32=link.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "message_"
-# PROP BASE Intermediate_Dir "message_"
+# PROP BASE Output_Dir "Debug/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Debug/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "message_"
-# PROP Intermediate_Dir "message_"
+# PROP Output_Dir "Debug/$(ProjectName)"
+# PROP Intermediate_Dir "Debug/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
diff --git a/ide/VisualC6/minimum.dsp b/ide/VisualC6/minimum.dsp
index f657350e0..60b11d326 100644
--- a/ide/VisualC6/minimum.dsp
+++ b/ide/VisualC6/minimum.dsp
@@ -33,13 +33,13 @@ RSC=rc.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Output_Dir "Release/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Release/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
+# PROP Output_Dir "Release/$(ProjectName)"
+# PROP Intermediate_Dir "Release/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
@@ -60,13 +60,13 @@ LINK32=link.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "minimum_"
-# PROP BASE Intermediate_Dir "minimum_"
+# PROP BASE Output_Dir "Debug/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Debug/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "minimum_"
-# PROP Intermediate_Dir "minimum_"
+# PROP Output_Dir "Debug/$(ProjectName)"
+# PROP Intermediate_Dir "Debug/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
diff --git a/ide/VisualC6/native-filechooser.dsp b/ide/VisualC6/native-filechooser.dsp
index 122b3ae0c..a3720397d 100644
--- a/ide/VisualC6/native-filechooser.dsp
+++ b/ide/VisualC6/native-filechooser.dsp
@@ -33,13 +33,13 @@ RSC=rc.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Output_Dir "Release/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Release/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
+# PROP Output_Dir "Release/$(ProjectName)"
+# PROP Intermediate_Dir "Release/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
@@ -60,13 +60,13 @@ LINK32=link.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "native-filechooser_"
-# PROP BASE Intermediate_Dir "native-filechooser_"
+# PROP BASE Output_Dir "Debug/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Debug/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "native-filechooser_"
-# PROP Intermediate_Dir "native-filechooser_"
+# PROP Output_Dir "Debug/$(ProjectName)"
+# PROP Intermediate_Dir "Debug/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
diff --git a/ide/VisualC6/navigation.dsp b/ide/VisualC6/navigation.dsp
index 730b335ab..31f193c8f 100644
--- a/ide/VisualC6/navigation.dsp
+++ b/ide/VisualC6/navigation.dsp
@@ -33,13 +33,13 @@ RSC=rc.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Output_Dir "Release/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Release/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
+# PROP Output_Dir "Release/$(ProjectName)"
+# PROP Intermediate_Dir "Release/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
@@ -60,13 +60,13 @@ LINK32=link.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "navigation_"
-# PROP BASE Intermediate_Dir "navigation_"
+# PROP BASE Output_Dir "Debug/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Debug/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "navigation_"
-# PROP Intermediate_Dir "navigation_"
+# PROP Output_Dir "Debug/$(ProjectName)"
+# PROP Intermediate_Dir "Debug/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
diff --git a/ide/VisualC6/output.dsp b/ide/VisualC6/output.dsp
index 4908ed053..169da5057 100644
--- a/ide/VisualC6/output.dsp
+++ b/ide/VisualC6/output.dsp
@@ -33,13 +33,13 @@ RSC=rc.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Output_Dir "Release/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Release/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
+# PROP Output_Dir "Release/$(ProjectName)"
+# PROP Intermediate_Dir "Release/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
@@ -53,20 +53,20 @@ BSC32=bscmake.exe
 # 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 fltk.lib fltkforms.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/output.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk.lib fltk_forms.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/output.exe" /pdbtype:sept /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:yes
 
 !ELSEIF  "$(CFG)" == "output - Win32 Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "output_"
-# PROP BASE Intermediate_Dir "output_"
+# PROP BASE Output_Dir "Debug/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Debug/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "output_"
-# PROP Intermediate_Dir "output_"
+# PROP Output_Dir "Debug/$(ProjectName)"
+# PROP Intermediate_Dir "Debug/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
@@ -80,7 +80,7 @@ BSC32=bscmake.exe
 # 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 fltkd.lib fltkformsd.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/outputd.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltkd.lib fltk_formsd.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/outputd.exe" /pdbtype:sept /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:no
 
 !ENDIF 
diff --git a/ide/VisualC6/overlay.dsp b/ide/VisualC6/overlay.dsp
index c09f89a40..65d048fd0 100644
--- a/ide/VisualC6/overlay.dsp
+++ b/ide/VisualC6/overlay.dsp
@@ -33,13 +33,13 @@ RSC=rc.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Output_Dir "Release/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Release/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
+# PROP Output_Dir "Release/$(ProjectName)"
+# PROP Intermediate_Dir "Release/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
@@ -60,13 +60,13 @@ LINK32=link.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "overlay_"
-# PROP BASE Intermediate_Dir "overlay_"
+# PROP BASE Output_Dir "Debug/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Debug/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "overlay_"
-# PROP Intermediate_Dir "overlay_"
+# PROP Output_Dir "Debug/$(ProjectName)"
+# PROP Intermediate_Dir "Debug/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
diff --git a/ide/VisualC6/pack.dsp b/ide/VisualC6/pack.dsp
index f5f17352f..c462ce64f 100644
--- a/ide/VisualC6/pack.dsp
+++ b/ide/VisualC6/pack.dsp
@@ -33,13 +33,13 @@ RSC=rc.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Output_Dir "Release/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Release/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
+# PROP Output_Dir "Release/$(ProjectName)"
+# PROP Intermediate_Dir "Release/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
@@ -60,13 +60,13 @@ LINK32=link.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "pack_"
-# PROP BASE Intermediate_Dir "pack_"
+# PROP BASE Output_Dir "Debug/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Debug/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "pack_"
-# PROP Intermediate_Dir "pack_"
+# PROP Output_Dir "Debug/$(ProjectName)"
+# PROP Intermediate_Dir "Debug/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
diff --git a/ide/VisualC6/pixmap.dsp b/ide/VisualC6/pixmap.dsp
index 83c1fb933..aa0c9a733 100644
--- a/ide/VisualC6/pixmap.dsp
+++ b/ide/VisualC6/pixmap.dsp
@@ -33,13 +33,13 @@ RSC=rc.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Output_Dir "Release/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Release/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
+# PROP Output_Dir "Release/$(ProjectName)"
+# PROP Intermediate_Dir "Release/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
@@ -60,13 +60,13 @@ LINK32=link.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "pixmap_"
-# PROP BASE Intermediate_Dir "pixmap_"
+# PROP BASE Output_Dir "Debug/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Debug/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "pixmap_"
-# PROP Intermediate_Dir "pixmap_"
+# PROP Output_Dir "Debug/$(ProjectName)"
+# PROP Intermediate_Dir "Debug/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
diff --git a/ide/VisualC6/pixmap_browser.dsp b/ide/VisualC6/pixmap_browser.dsp
index 491bc94b4..dca87138e 100644
--- a/ide/VisualC6/pixmap_browser.dsp
+++ b/ide/VisualC6/pixmap_browser.dsp
@@ -33,13 +33,13 @@ RSC=rc.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Output_Dir "Release/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Release/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
+# PROP Output_Dir "Release/$(ProjectName)"
+# PROP Intermediate_Dir "Release/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
@@ -53,20 +53,20 @@ BSC32=bscmake.exe
 # 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 fltk.lib fltkimages.lib fltkjpeg.lib fltkpng.lib zlib.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/pixmap_browser.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk.lib fltk_images.lib fltk_jpeg.lib fltk_png.lib fltk_zlib.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/pixmap_browser.exe" /pdbtype:sept /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:yes
 
 !ELSEIF  "$(CFG)" == "pixmap_browser - Win32 Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "pixmap_browser_"
-# PROP BASE Intermediate_Dir "pixmap_browser_"
+# PROP BASE Output_Dir "Debug/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Debug/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "pixmap_browser_"
-# PROP Intermediate_Dir "pixmap_browser_"
+# PROP Output_Dir "Debug/$(ProjectName)"
+# PROP Intermediate_Dir "Debug/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
@@ -80,7 +80,7 @@ BSC32=bscmake.exe
 # 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 fltkd.lib fltkimagesd.lib fltkjpegd.lib fltkpngd.lib zlibd.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/pixmap_browserd.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltkd.lib fltk_imagesd.lib fltk_jpegd.lib fltk_pngd.lib fltk_zlibd.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/pixmap_browserd.exe" /pdbtype:sept /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:no
 
 !ENDIF 
diff --git a/ide/VisualC6/preferences.dsp b/ide/VisualC6/preferences.dsp
index 923505ad2..fa8c77e82 100644
--- a/ide/VisualC6/preferences.dsp
+++ b/ide/VisualC6/preferences.dsp
@@ -33,13 +33,13 @@ RSC=rc.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Output_Dir "Release/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Release/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
+# PROP Output_Dir "Release/$(ProjectName)"
+# PROP Intermediate_Dir "Release/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
@@ -60,13 +60,13 @@ LINK32=link.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "preferences_"
-# PROP BASE Intermediate_Dir "preferences_"
+# PROP BASE Output_Dir "Debug/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Debug/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "preferences_"
-# PROP Intermediate_Dir "preferences_"
+# PROP Output_Dir "Debug/$(ProjectName)"
+# PROP Intermediate_Dir "Debug/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
diff --git a/ide/VisualC6/radio.dsp b/ide/VisualC6/radio.dsp
index 0558444fd..752fcd734 100644
--- a/ide/VisualC6/radio.dsp
+++ b/ide/VisualC6/radio.dsp
@@ -33,13 +33,13 @@ RSC=rc.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Output_Dir "Release/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Release/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
+# PROP Output_Dir "Release/$(ProjectName)"
+# PROP Intermediate_Dir "Release/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
@@ -60,13 +60,13 @@ LINK32=link.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "radio_"
-# PROP BASE Intermediate_Dir "radio_"
+# PROP BASE Output_Dir "Debug/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Debug/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "radio_"
-# PROP Intermediate_Dir "radio_"
+# PROP Output_Dir "Debug/$(ProjectName)"
+# PROP Intermediate_Dir "Debug/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
diff --git a/ide/VisualC6/resize.dsp b/ide/VisualC6/resize.dsp
index d0bbb2a28..6742e8936 100644
--- a/ide/VisualC6/resize.dsp
+++ b/ide/VisualC6/resize.dsp
@@ -33,13 +33,13 @@ RSC=rc.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Output_Dir "Release/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Release/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
+# PROP Output_Dir "Release/$(ProjectName)"
+# PROP Intermediate_Dir "Release/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
@@ -60,13 +60,13 @@ LINK32=link.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "resize_"
-# PROP BASE Intermediate_Dir "resize_"
+# PROP BASE Output_Dir "Debug/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Debug/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "resize_"
-# PROP Intermediate_Dir "resize_"
+# PROP Output_Dir "Debug/$(ProjectName)"
+# PROP Intermediate_Dir "Debug/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
diff --git a/ide/VisualC6/resizebox.dsp b/ide/VisualC6/resizebox.dsp
index 55a984659..561b3d6df 100644
--- a/ide/VisualC6/resizebox.dsp
+++ b/ide/VisualC6/resizebox.dsp
@@ -33,13 +33,13 @@ RSC=rc.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Output_Dir "Release/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Release/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
+# PROP Output_Dir "Release/$(ProjectName)"
+# PROP Intermediate_Dir "Release/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
@@ -60,13 +60,13 @@ LINK32=link.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "resizebox_"
-# PROP BASE Intermediate_Dir "resizebox_"
+# PROP BASE Output_Dir "Debug/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Debug/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "resizebox_"
-# PROP Intermediate_Dir "resizebox_"
+# PROP Output_Dir "Debug/$(ProjectName)"
+# PROP Intermediate_Dir "Debug/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
diff --git a/ide/VisualC6/scroll.dsp b/ide/VisualC6/scroll.dsp
index 77c8ede17..7310f68ac 100644
--- a/ide/VisualC6/scroll.dsp
+++ b/ide/VisualC6/scroll.dsp
@@ -33,13 +33,13 @@ RSC=rc.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Output_Dir "Release/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Release/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
+# PROP Output_Dir "Release/$(ProjectName)"
+# PROP Intermediate_Dir "Release/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
@@ -60,13 +60,13 @@ LINK32=link.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "scroll_"
-# PROP BASE Intermediate_Dir "scroll_"
+# PROP BASE Output_Dir "Debug/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Debug/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "scroll_"
-# PROP Intermediate_Dir "scroll_"
+# PROP Output_Dir "Debug/$(ProjectName)"
+# PROP Intermediate_Dir "Debug/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
diff --git a/ide/VisualC6/shape.dsp b/ide/VisualC6/shape.dsp
index 4f34d8fec..68a18ee1a 100644
--- a/ide/VisualC6/shape.dsp
+++ b/ide/VisualC6/shape.dsp
@@ -33,13 +33,13 @@ RSC=rc.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Output_Dir "Release/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Release/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
+# PROP Output_Dir "Release/$(ProjectName)"
+# PROP Intermediate_Dir "Release/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
@@ -53,20 +53,20 @@ BSC32=bscmake.exe
 # 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 fltk.lib fltkgl.lib glu32.lib opengl32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/shape.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk.lib fltk_gl.lib glu32.lib opengl32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/shape.exe" /pdbtype:sept /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:yes
 
 !ELSEIF  "$(CFG)" == "shape - Win32 Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "shape_"
-# PROP BASE Intermediate_Dir "shape_"
+# PROP BASE Output_Dir "Debug/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Debug/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "shape_"
-# PROP Intermediate_Dir "shape_"
+# PROP Output_Dir "Debug/$(ProjectName)"
+# PROP Intermediate_Dir "Debug/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
@@ -80,7 +80,7 @@ BSC32=bscmake.exe
 # 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 fltkd.lib fltkgld.lib glu32.lib opengl32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/shaped.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltkd.lib fltk_gld.lib glu32.lib opengl32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/shaped.exe" /pdbtype:sept /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:no
 
 !ENDIF 
diff --git a/ide/VisualC6/subwindow.dsp b/ide/VisualC6/subwindow.dsp
index 16d597f1a..fdb8bf3a2 100644
--- a/ide/VisualC6/subwindow.dsp
+++ b/ide/VisualC6/subwindow.dsp
@@ -33,13 +33,13 @@ RSC=rc.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Output_Dir "Release/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Release/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
+# PROP Output_Dir "Release/$(ProjectName)"
+# PROP Intermediate_Dir "Release/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
@@ -60,13 +60,13 @@ LINK32=link.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "subwindow_"
-# PROP BASE Intermediate_Dir "subwindow_"
+# PROP BASE Output_Dir "Debug/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Debug/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "subwindow_"
-# PROP Intermediate_Dir "subwindow_"
+# PROP Output_Dir "Debug/$(ProjectName)"
+# PROP Intermediate_Dir "Debug/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
diff --git a/ide/VisualC6/sudoku.dsp b/ide/VisualC6/sudoku.dsp
index ba15dfa98..2dad366a9 100644
--- a/ide/VisualC6/sudoku.dsp
+++ b/ide/VisualC6/sudoku.dsp
@@ -33,13 +33,13 @@ RSC=rc.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Output_Dir "Release/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Release/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
+# PROP Output_Dir "Release/$(ProjectName)"
+# PROP Intermediate_Dir "Release/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
@@ -53,20 +53,20 @@ BSC32=bscmake.exe
 # 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 fltk.lib fltkimages.lib fltkjpeg.lib fltkpng.lib zlib.lib winmm.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/sudoku.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk.lib fltk_images.lib fltk_jpeg.lib fltk_png.lib fltk_zlib.lib winmm.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/sudoku.exe" /pdbtype:sept /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:yes
 
 !ELSEIF  "$(CFG)" == "sudoku - Win32 Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "sudoku_"
-# PROP BASE Intermediate_Dir "sudoku_"
+# PROP BASE Output_Dir "Debug/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Debug/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "sudoku_"
-# PROP Intermediate_Dir "sudoku_"
+# PROP Output_Dir "Debug/$(ProjectName)"
+# PROP Intermediate_Dir "Debug/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
@@ -80,7 +80,7 @@ BSC32=bscmake.exe
 # 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 fltkd.lib fltkimagesd.lib fltkjpegd.lib fltkpngd.lib zlibd.lib winmm.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/sudokud.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltkd.lib fltk_imagesd.lib fltk_jpegd.lib fltk_pngd.lib fltk_zlibd.lib winmm.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/sudokud.exe" /pdbtype:sept /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:no
 
 !ENDIF 
diff --git a/ide/VisualC6/symbols.dsp b/ide/VisualC6/symbols.dsp
index 9e7153823..525694e35 100644
--- a/ide/VisualC6/symbols.dsp
+++ b/ide/VisualC6/symbols.dsp
@@ -33,13 +33,13 @@ RSC=rc.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Output_Dir "Release/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Release/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
+# PROP Output_Dir "Release/$(ProjectName)"
+# PROP Intermediate_Dir "Release/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
@@ -60,13 +60,13 @@ LINK32=link.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "symbols_"
-# PROP BASE Intermediate_Dir "symbols_"
+# PROP BASE Output_Dir "Debug/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Debug/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "symbols_"
-# PROP Intermediate_Dir "symbols_"
+# PROP Output_Dir "Debug/$(ProjectName)"
+# PROP Intermediate_Dir "Debug/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
diff --git a/ide/VisualC6/table.dsp b/ide/VisualC6/table.dsp
index f72d3a72b..01a8b06c6 100644
--- a/ide/VisualC6/table.dsp
+++ b/ide/VisualC6/table.dsp
@@ -33,13 +33,13 @@ RSC=rc.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Output_Dir "Release/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Release/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
+# PROP Output_Dir "Release/$(ProjectName)"
+# PROP Intermediate_Dir "Release/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
@@ -60,13 +60,13 @@ LINK32=link.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "table_"
-# PROP BASE Intermediate_Dir "table_"
+# PROP BASE Output_Dir "Debug/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Debug/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "table_"
-# PROP Intermediate_Dir "table_"
+# PROP Output_Dir "Debug/$(ProjectName)"
+# PROP Intermediate_Dir "Debug/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
diff --git a/ide/VisualC6/tabs.dsp b/ide/VisualC6/tabs.dsp
index 6c01fb7c5..ba6e9fb42 100644
--- a/ide/VisualC6/tabs.dsp
+++ b/ide/VisualC6/tabs.dsp
@@ -33,13 +33,13 @@ RSC=rc.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Output_Dir "Release/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Release/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
+# PROP Output_Dir "Release/$(ProjectName)"
+# PROP Intermediate_Dir "Release/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
@@ -60,13 +60,13 @@ LINK32=link.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "tabs_"
-# PROP BASE Intermediate_Dir "tabs_"
+# PROP BASE Output_Dir "Debug/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Debug/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "tabs_"
-# PROP Intermediate_Dir "tabs_"
+# PROP Output_Dir "Debug/$(ProjectName)"
+# PROP Intermediate_Dir "Debug/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
diff --git a/ide/VisualC6/threads.dsp b/ide/VisualC6/threads.dsp
index 22b9d97ad..af6ef3375 100644
--- a/ide/VisualC6/threads.dsp
+++ b/ide/VisualC6/threads.dsp
@@ -33,13 +33,13 @@ RSC=rc.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Output_Dir "Release/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Release/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
+# PROP Output_Dir "Release/$(ProjectName)"
+# PROP Intermediate_Dir "Release/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
@@ -60,13 +60,13 @@ LINK32=link.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "threads_"
-# PROP BASE Intermediate_Dir "threads_"
+# PROP BASE Output_Dir "Debug/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Debug/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "threads_"
-# PROP Intermediate_Dir "threads_"
+# PROP Output_Dir "Debug/$(ProjectName)"
+# PROP Intermediate_Dir "Debug/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
diff --git a/ide/VisualC6/tile.dsp b/ide/VisualC6/tile.dsp
index 0bd50c9fc..3fda3ba10 100644
--- a/ide/VisualC6/tile.dsp
+++ b/ide/VisualC6/tile.dsp
@@ -33,13 +33,13 @@ RSC=rc.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Output_Dir "Release/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Release/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
+# PROP Output_Dir "Release/$(ProjectName)"
+# PROP Intermediate_Dir "Release/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
@@ -60,13 +60,13 @@ LINK32=link.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "tile_"
-# PROP BASE Intermediate_Dir "tile_"
+# PROP BASE Output_Dir "Debug/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Debug/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "tile_"
-# PROP Intermediate_Dir "tile_"
+# PROP Output_Dir "Debug/$(ProjectName)"
+# PROP Intermediate_Dir "Debug/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
diff --git a/ide/VisualC6/tiled_image.dsp b/ide/VisualC6/tiled_image.dsp
index c09475cc1..4b79ad784 100644
--- a/ide/VisualC6/tiled_image.dsp
+++ b/ide/VisualC6/tiled_image.dsp
@@ -33,13 +33,13 @@ RSC=rc.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Output_Dir "Release/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Release/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
+# PROP Output_Dir "Release/$(ProjectName)"
+# PROP Intermediate_Dir "Release/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
@@ -53,20 +53,20 @@ BSC32=bscmake.exe
 # 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 fltk.lib fltkimages.lib fltkjpeg.lib fltkpng.lib zlib.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/tiled_image.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk.lib fltk_images.lib fltk_jpeg.lib fltk_png.lib fltk_zlib.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/tiled_image.exe" /pdbtype:sept /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:yes
 
 !ELSEIF  "$(CFG)" == "tiled_image - Win32 Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "tiled_image_"
-# PROP BASE Intermediate_Dir "tiled_image_"
+# PROP BASE Output_Dir "Debug/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Debug/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "tiled_image_"
-# PROP Intermediate_Dir "tiled_image_"
+# PROP Output_Dir "Debug/$(ProjectName)"
+# PROP Intermediate_Dir "Debug/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
@@ -80,7 +80,7 @@ BSC32=bscmake.exe
 # 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 fltkd.lib fltkimagesd.lib fltkjpegd.lib fltkpngd.lib zlibd.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/tiled_imaged.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltkd.lib fltk_imagesd.lib fltk_jpegd.lib fltk_pngd.lib fltk_zlibd.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/tiled_imaged.exe" /pdbtype:sept /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:no
 
 !ENDIF 
diff --git a/ide/VisualC6/tree.dsp b/ide/VisualC6/tree.dsp
index 7a42cf680..a5a867933 100644
--- a/ide/VisualC6/tree.dsp
+++ b/ide/VisualC6/tree.dsp
@@ -33,13 +33,13 @@ RSC=rc.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Output_Dir "Release/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Release/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
+# PROP Output_Dir "Release/$(ProjectName)"
+# PROP Intermediate_Dir "Release/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
@@ -60,13 +60,13 @@ LINK32=link.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "tree_"
-# PROP BASE Intermediate_Dir "tree_"
+# PROP BASE Output_Dir "Debug/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Debug/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "tree_"
-# PROP Intermediate_Dir "tree_"
+# PROP Output_Dir "Debug/$(ProjectName)"
+# PROP Intermediate_Dir "Debug/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
diff --git a/ide/VisualC6/utf8.dsp b/ide/VisualC6/utf8.dsp
index 16f82db21..1288b4d18 100644
--- a/ide/VisualC6/utf8.dsp
+++ b/ide/VisualC6/utf8.dsp
@@ -33,13 +33,13 @@ RSC=rc.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Output_Dir "Release/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Release/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
+# PROP Output_Dir "Release/$(ProjectName)"
+# PROP Intermediate_Dir "Release/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
@@ -60,13 +60,13 @@ LINK32=link.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "utf8_"
-# PROP BASE Intermediate_Dir "utf8_"
+# PROP BASE Output_Dir "Debug/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Debug/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "utf8_"
-# PROP Intermediate_Dir "utf8_"
+# PROP Output_Dir "Debug/$(ProjectName)"
+# PROP Intermediate_Dir "Debug/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
diff --git a/ide/VisualC6/valuators.dsp b/ide/VisualC6/valuators.dsp
index 0ddf0e5b2..1a0a25cc6 100644
--- a/ide/VisualC6/valuators.dsp
+++ b/ide/VisualC6/valuators.dsp
@@ -33,13 +33,13 @@ RSC=rc.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Output_Dir "Release/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Release/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
+# PROP Output_Dir "Release/$(ProjectName)"
+# PROP Intermediate_Dir "Release/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
@@ -60,13 +60,13 @@ LINK32=link.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "valuators_"
-# PROP BASE Intermediate_Dir "valuators_"
+# PROP BASE Output_Dir "Debug/$(ProjectName)"
+# PROP BASE Intermediate_Dir "Debug/$(ProjectName)"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "valuators_"
-# PROP Intermediate_Dir "valuators_"
+# PROP Output_Dir "Debug/$(ProjectName)"
+# PROP Intermediate_Dir "Debug/$(ProjectName)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
author	Matthias Melcher <fltk@matthiasm.com>	2010-05-02 20:55:20 +0000
committer	Matthias Melcher <fltk@matthiasm.com>	2010-05-02 20:55:20 +0000
commit	08d62246afa1fe553e335307be5b6fcf06ff0fed (patch)
tree	cceafe30c65c5b2121862a637264c351853af18a /ide
parent	c2c054c595ff3428ad25463858e0636d2810467b (diff)