Moved visualc6 env to ide, no cairo stuff yet. builds ok rel. and debug.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6472 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
author: Fabien Costantini <fabien@onepost.net> 2008-10-19 16:40:38 +0000
committer: Fabien Costantini <fabien@onepost.net> 2008-10-19 16:40:38 +0000
commit: f3180baff0cf3958e4eef70a634def5d46ec2244 (patch)
tree: 6d38933a6c0ba1b11cb5c801776a14246dc3b1b6
parent: a8450fee4f0a32d5bc8e99e7901e9aabc7371440 (diff)
75 files changed, 4100 insertions, 3500 deletions
diff --git a/visualc/CubeView.dsp b/ide/visualc/CubeView.dsp
index fa568da4d..d1f3f0d7e 100644
--- a/visualc/CubeView.dsp
+++ b/ide/visualc/CubeView.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I ".." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "../.." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,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 /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 /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../test/CubeView.exe" /libpath:"..\lib"
+# 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 /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/CubeView.exe" /libpath:"..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:yes
 
 !ELSEIF  "$(CFG)" == "CubeView - Win32 Debug"
@@ -70,7 +70,7 @@ LINK32=link.exe
 # 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
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I ".." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "../.." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -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 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 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 
@@ -91,41 +91,41 @@ LINK32=link.exe
 # Name "CubeView - Win32 Debug"
 # Begin Source File
 
-SOURCE=..\test\CubeMain.cxx
+SOURCE=..\..\test\CubeMain.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\test\CubeView.cxx
+SOURCE=..\..\test\CubeView.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\test\CubeViewUI.cxx
+SOURCE=..\..\test\CubeViewUI.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\test\CubeViewUI.fl
+SOURCE=..\..\test\CubeViewUI.fl
 
 !IF  "$(CFG)" == "CubeView - Win32 Release"
 
 # Begin Custom Build - Create .cxx and .h file with fluid
-InputPath=..\test\CubeViewUI.fl
+InputPath=..\..\test\CubeViewUI.fl
 
-"..\test\CubeViewUI.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cd ..\test 
+"..\..\test\CubeViewUI.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	cd ..\..\test 
 	..\fluid\fluid -c CubeViewUI.fl 
-	cd ..\visualc 
+	cd ..\ide\visualc 
 	
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "CubeView - Win32 Debug"
 
 # Begin Custom Build - Create .cxx and .h file with fluidd
-InputPath=..\test\CubeViewUI.fl
+InputPath=..\..\test\CubeViewUI.fl
 
-"..\test\CubeViewUI.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cd ..\test 
+"..\..\test\CubeViewUI.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	cd ..\..\test 
 	..\fluid\fluidd -c CubeViewUI.fl 
-	cd ..\visualc 
+	cd ..\ide\visualc 
 	
 # End Custom Build
 
diff --git a/visualc/adjuster.dsp b/ide/visualc/adjuster.dsp
index 15657b258..eec86727c 100644
--- a/visualc/adjuster.dsp
+++ b/ide/visualc/adjuster.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I ".." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "../.." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,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 /machine:I386
-# ADD LINK32 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 /machine:I386 /nodefaultlib:"libcd" /out:"../test/adjuster.exe" /libpath:"..\lib"
+# ADD LINK32 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 /machine:I386 /nodefaultlib:"libcd" /out:"../../test/adjuster.exe" /libpath:"..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:yes
 
 !ELSEIF  "$(CFG)" == "adjuster - Win32 Debug"
@@ -70,7 +70,7 @@ LINK32=link.exe
 # 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
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I ".." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "../.." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -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 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/adjusterd.exe" /pdbtype:sept /libpath:"..\lib"
+# ADD LINK32 fltkd.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/adjusterd.exe" /pdbtype:sept /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:no
 
 !ENDIF 
@@ -91,7 +91,7 @@ LINK32=link.exe
 # Name "adjuster - Win32 Debug"
 # Begin Source File
 
-SOURCE=..\test\adjuster.cxx
+SOURCE=..\..\test\adjuster.cxx
 # End Source File
 # End Target
 # End Project
diff --git a/visualc/arc.dsp b/ide/visualc/arc.dsp
index 4578322bf..a3ba02a37 100644
--- a/visualc/arc.dsp
+++ b/ide/visualc/arc.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I ".." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "../.." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,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 /machine:I386
-# ADD LINK32 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 /machine:I386 /nodefaultlib:"libcd" /out:"../test/arc.exe" /libpath:"..\lib"
+# ADD LINK32 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 /machine:I386 /nodefaultlib:"libcd" /out:"../../test/arc.exe" /libpath:"..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:yes
 
 !ELSEIF  "$(CFG)" == "arc - Win32 Debug"
@@ -70,7 +70,7 @@ LINK32=link.exe
 # 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
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I ".." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "../.." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -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 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/arcd.exe" /pdbtype:sept /libpath:"..\lib"
+# ADD LINK32 fltkd.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/arcd.exe" /pdbtype:sept /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:no
 
 !ENDIF 
@@ -91,7 +91,7 @@ LINK32=link.exe
 # Name "arc - Win32 Debug"
 # Begin Source File
 
-SOURCE=..\test\arc.cxx
+SOURCE=..\..\test\arc.cxx
 # End Source File
 # End Target
 # End Project
diff --git a/visualc/ask.dsp b/ide/visualc/ask.dsp
index dc991dc71..0eb5c5937 100644
--- a/visualc/ask.dsp
+++ b/ide/visualc/ask.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I ".." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "../.." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,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 /machine:I386
-# ADD LINK32 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 /machine:I386 /nodefaultlib:"libcd" /out:"../test/ask.exe" /libpath:"..\lib"
+# ADD LINK32 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 /machine:I386 /nodefaultlib:"libcd" /out:"../../test/ask.exe" /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:yes
 
 !ELSEIF  "$(CFG)" == "ask - Win32 Debug"
@@ -70,7 +70,7 @@ LINK32=link.exe
 # 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
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I ".." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "../.." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -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 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/askd.exe" /pdbtype:sept /libpath:"..\lib"
+# ADD LINK32 fltkd.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/askd.exe" /pdbtype:sept /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:no
 
 !ENDIF 
@@ -91,7 +91,7 @@ LINK32=link.exe
 # Name "ask - Win32 Debug"
 # Begin Source File
 
-SOURCE=..\test\ask.cxx
+SOURCE=..\..\test\ask.cxx
 # End Source File
 # End Target
 # End Project
diff --git a/visualc/bitmap.dsp b/ide/visualc/bitmap.dsp
index ad361d0a6..07b74b801 100644
--- a/visualc/bitmap.dsp
+++ b/ide/visualc/bitmap.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I ".." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "../.." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,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 /machine:I386
-# ADD LINK32 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 /machine:I386 /nodefaultlib:"libcd" /out:"../test/bitmap.exe" /libpath:"..\lib"
+# ADD LINK32 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 /machine:I386 /nodefaultlib:"libcd" /out:"../../test/bitmap.exe" /libpath:"..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:yes
 
 !ELSEIF  "$(CFG)" == "bitmap - Win32 Debug"
@@ -70,7 +70,7 @@ LINK32=link.exe
 # 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
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I ".." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "../.." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -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 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/bitmapd.exe" /pdbtype:sept /libpath:"..\lib"
+# ADD LINK32 fltkd.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/bitmapd.exe" /pdbtype:sept /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:no
 
 !ENDIF 
@@ -91,7 +91,7 @@ LINK32=link.exe
 # Name "bitmap - Win32 Debug"
 # Begin Source File
 
-SOURCE=..\test\bitmap.cxx
+SOURCE=..\..\test\bitmap.cxx
 # End Source File
 # End Target
 # End Project
diff --git a/visualc/blocks.dsp b/ide/visualc/blocks.dsp
index 5f1149281..ab47a40a6 100644
--- a/visualc/blocks.dsp
+++ b/ide/visualc/blocks.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I ".." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "../.." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,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 /machine:I386
-# ADD LINK32 winmm.lib fltk.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 /machine:I386 /nodefaultlib:"libcd" /out:"../test/blocks.exe" /libpath:"..\lib"
+# ADD LINK32 winmm.lib fltk.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 /machine:I386 /nodefaultlib:"libcd" /out:"../../test/blocks.exe" /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:yes
 
 !ELSEIF  "$(CFG)" == "blocks - Win32 Debug"
@@ -70,7 +70,7 @@ LINK32=link.exe
 # 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
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I ".." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "../.." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -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 winmm.lib fltkd.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/blocksd.exe" /pdbtype:sept /libpath:"..\lib"
+# ADD LINK32 winmm.lib fltkd.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/blocksd.exe" /pdbtype:sept /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:no
 
 !ENDIF 
@@ -91,7 +91,7 @@ LINK32=link.exe
 # Name "blocks - Win32 Debug"
 # Begin Source File
 
-SOURCE=..\test\blocks.cxx
+SOURCE=..\..\test\blocks.cxx
 # End Source File
 # End Target
 # End Project
diff --git a/visualc/boxtype.dsp b/ide/visualc/boxtype.dsp
index 5647f93cb..d46cd80ac 100644
--- a/visualc/boxtype.dsp
+++ b/ide/visualc/boxtype.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I ".." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "../.." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,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 /machine:I386
-# ADD LINK32 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 /machine:I386 /nodefaultlib:"libcd" /out:"../test/boxtype.exe" /libpath:"..\lib"
+# ADD LINK32 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 /machine:I386 /nodefaultlib:"libcd" /out:"../../test/boxtype.exe" /libpath:"..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:yes
 
 !ELSEIF  "$(CFG)" == "boxtype - Win32 Debug"
@@ -70,7 +70,7 @@ LINK32=link.exe
 # 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
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I ".." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "../.." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -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 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/boxtyped.exe" /pdbtype:sept /libpath:"..\lib"
+# ADD LINK32 fltkd.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/boxtyped.exe" /pdbtype:sept /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:no
 
 !ENDIF 
@@ -91,7 +91,7 @@ LINK32=link.exe
 # Name "boxtype - Win32 Debug"
 # Begin Source File
 
-SOURCE=..\test\boxtype.cxx
+SOURCE=..\..\test\boxtype.cxx
 # End Source File
 # End Target
 # End Project
diff --git a/visualc/browser.dsp b/ide/visualc/browser.dsp
index ff094d367..53c981cc9 100644
--- a/visualc/browser.dsp
+++ b/ide/visualc/browser.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I ".." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "../.." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,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 /machine:I386
-# ADD LINK32 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 /machine:I386 /nodefaultlib:"libcd" /out:"../test/browser.exe" /libpath:"..\lib"
+# ADD LINK32 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 /machine:I386 /nodefaultlib:"libcd" /out:"../../test/browser.exe" /libpath:"..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:yes
 
 !ELSEIF  "$(CFG)" == "browser - Win32 Debug"
@@ -70,7 +70,7 @@ LINK32=link.exe
 # 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
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I ".." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "../.." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -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 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/browserd.exe" /pdbtype:sept /libpath:"..\lib"
+# ADD LINK32 fltkd.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/browserd.exe" /pdbtype:sept /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:no
 
 !ENDIF 
@@ -91,7 +91,7 @@ LINK32=link.exe
 # Name "browser - Win32 Debug"
 # Begin Source File
 
-SOURCE=..\test\browser.cxx
+SOURCE=..\..\test\browser.cxx
 # End Source File
 # End Target
 # End Project
diff --git a/visualc/button.dsp b/ide/visualc/button.dsp
index b9900d747..d0efd8b53 100644
--- a/visualc/button.dsp
+++ b/ide/visualc/button.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I ".." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "../.." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,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 /machine:I386
-# ADD LINK32 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 /machine:I386 /nodefaultlib:"libcd" /out:"../test/button.exe" /libpath:"..\lib"
+# ADD LINK32 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 /machine:I386 /nodefaultlib:"libcd" /out:"../../test/button.exe" /libpath:"..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:yes
 
 !ELSEIF  "$(CFG)" == "button - Win32 Debug"
@@ -70,7 +70,7 @@ LINK32=link.exe
 # 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
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I ".." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "../.." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -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 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/buttond.exe" /pdbtype:sept /libpath:"..\lib"
+# ADD LINK32 fltkd.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/buttond.exe" /pdbtype:sept /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:no
 
 !ENDIF 
@@ -91,7 +91,7 @@ LINK32=link.exe
 # Name "button - Win32 Debug"
 # Begin Source File
 
-SOURCE=..\test\button.cxx
+SOURCE=..\..\test\button.cxx
 # End Source File
 # End Target
 # End Project
diff --git a/visualc/buttons.dsp b/ide/visualc/buttons.dsp
index 8c995c0e2..fdca3a827 100644
--- a/visualc/buttons.dsp
+++ b/ide/visualc/buttons.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I ".." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "../.." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,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 /machine:I386
-# ADD LINK32 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 /machine:I386 /nodefaultlib:"libcd" /out:"../test/buttons.exe" /libpath:"..\lib"
+# ADD LINK32 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 /machine:I386 /nodefaultlib:"libcd" /out:"../../test/buttons.exe" /libpath:"..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:yes
 
 !ELSEIF  "$(CFG)" == "buttons - Win32 Debug"
@@ -70,7 +70,7 @@ LINK32=link.exe
 # 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
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I ".." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "../.." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -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 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/buttonsd.exe" /pdbtype:sept /libpath:"..\lib"
+# ADD LINK32 fltkd.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/buttonsd.exe" /pdbtype:sept /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:no
 
 !ENDIF 
@@ -91,7 +91,7 @@ LINK32=link.exe
 # Name "buttons - Win32 Debug"
 # Begin Source File
 
-SOURCE=..\test\buttons.cxx
+SOURCE=..\..\test\buttons.cxx
 # End Source File
 # End Target
 # End Project
diff --git a/visualc/checkers.dsp b/ide/visualc/checkers.dsp
index 30fa7348a..cee86aec1 100644
--- a/visualc/checkers.dsp
+++ b/ide/visualc/checkers.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I ".." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "../.." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,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 /machine:I386
-# ADD LINK32 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 /machine:I386 /nodefaultlib:"libcd" /out:"../test/checkers.exe" /libpath:"..\lib"
+# ADD LINK32 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 /machine:I386 /nodefaultlib:"libcd" /out:"../../test/checkers.exe" /libpath:"..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:yes
 
 !ELSEIF  "$(CFG)" == "checkers - Win32 Debug"
@@ -70,7 +70,7 @@ LINK32=link.exe
 # 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
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I ".." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "../.." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -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 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/checkersd.exe" /pdbtype:sept /libpath:"..\lib"
+# ADD LINK32 fltkd.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/checkersd.exe" /pdbtype:sept /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:no
 
 !ENDIF 
@@ -91,7 +91,7 @@ LINK32=link.exe
 # Name "checkers - Win32 Debug"
 # Begin Source File
 
-SOURCE=..\test\checkers.cxx
+SOURCE=..\..\test\checkers.cxx
 # End Source File
 # End Target
 # End Project
diff --git a/visualc/clock.dsp b/ide/visualc/clock.dsp
index e960a832e..8790778b1 100644
--- a/visualc/clock.dsp
+++ b/ide/visualc/clock.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I ".." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "../.." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,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 /machine:I386
-# ADD LINK32 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 /machine:I386 /nodefaultlib:"libcd" /out:"../test/clock.exe" /libpath:"..\lib"
+# ADD LINK32 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 /machine:I386 /nodefaultlib:"libcd" /out:"../../test/clock.exe" /libpath:"..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:yes
 
 !ELSEIF  "$(CFG)" == "clock - Win32 Debug"
@@ -70,7 +70,7 @@ LINK32=link.exe
 # 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
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I ".." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "../.." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -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 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/clockd.exe" /pdbtype:sept /libpath:"..\lib"
+# ADD LINK32 fltkd.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/clockd.exe" /pdbtype:sept /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:no
 
 !ENDIF 
@@ -91,7 +91,7 @@ LINK32=link.exe
 # Name "clock - Win32 Debug"
 # Begin Source File
 
-SOURCE=..\test\clock.cxx
+SOURCE=..\..\test\clock.cxx
 # End Source File
 # End Target
 # End Project
diff --git a/visualc/colbrowser.dsp b/ide/visualc/colbrowser.dsp
index b07782a13..c870b714e 100644
--- a/visualc/colbrowser.dsp
+++ b/ide/visualc/colbrowser.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I ".." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "../.." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,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 /machine:I386
-# ADD LINK32 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 /machine:I386 /nodefaultlib:"libcd" /out:"../test/colbrowser.exe" /libpath:"..\lib"
+# ADD LINK32 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 /machine:I386 /nodefaultlib:"libcd" /out:"../../test/colbrowser.exe" /libpath:"..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:yes
 
 !ELSEIF  "$(CFG)" == "colbrowser - Win32 Debug"
@@ -70,7 +70,7 @@ LINK32=link.exe
 # 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
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I ".." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "../.." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -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 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 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 
@@ -91,7 +91,7 @@ LINK32=link.exe
 # Name "colbrowser - Win32 Debug"
 # Begin Source File
 
-SOURCE=..\test\colbrowser.cxx
+SOURCE=..\..\test\colbrowser.cxx
 # End Source File
 # End Target
 # End Project
diff --git a/visualc/color_chooser.dsp b/ide/visualc/color_chooser.dsp
index fec874c5b..7d12d0b3f 100644
--- a/visualc/color_chooser.dsp
+++ b/ide/visualc/color_chooser.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I ".." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "../.." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,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 /machine:I386
-# ADD LINK32 comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /machine:I386 /nodefaultlib:"libcd" /out:"../test/color_chooser.exe" /libpath:"..\lib"
+# ADD LINK32 comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /machine:I386 /nodefaultlib:"libcd" /out:"../../test/color_chooser.exe" /libpath:"..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:yes
 
 !ELSEIF  "$(CFG)" == "color_chooser - Win32 Debug"
@@ -70,7 +70,7 @@ LINK32=link.exe
 # 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
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I ".." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "../.." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -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 comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /debug /machine:I386 /nodefaultlib:"libcd" /out:"../test/color_chooserd.exe" /pdbtype:sept /libpath:"..\lib"
+# ADD LINK32 fltkd.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/color_chooserd.exe" /pdbtype:sept /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:no
 
 !ENDIF 
@@ -91,7 +91,7 @@ LINK32=link.exe
 # Name "color_chooser - Win32 Debug"
 # Begin Source File
 
-SOURCE=..\test\color_chooser.cxx
+SOURCE=..\..\test\color_chooser.cxx
 # End Source File
 # End Target
 # End Project
diff --git a/visualc/config.h b/ide/visualc/config.h
index e5a25f105..e5a25f105 100644
--- a/visualc/config.h
+++ b/ide/visualc/config.h
diff --git a/visualc/cube.dsp b/ide/visualc/cube.dsp
index 61cfb17a2..7d3f5dac3 100644
--- a/visualc/cube.dsp
+++ b/ide/visualc/cube.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I ".." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "../.." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,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 /machine:I386
-# ADD LINK32 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 /machine:I386 /nodefaultlib:"libcd" /out:"../test/cube.exe" /libpath:"..\lib"
+# ADD LINK32 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 /machine:I386 /nodefaultlib:"libcd" /out:"../../test/cube.exe" /libpath:"..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:yes
 
 !ELSEIF  "$(CFG)" == "cube - Win32 Debug"
@@ -70,7 +70,7 @@ LINK32=link.exe
 # 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
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I ".." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "../.." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -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 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 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 
@@ -91,7 +91,7 @@ LINK32=link.exe
 # Name "cube - Win32 Debug"
 # Begin Source File
 
-SOURCE=..\test\cube.cxx
+SOURCE=..\..\test\cube.cxx
 # End Source File
 # End Target
 # End Project
diff --git a/visualc/cursor.dsp b/ide/visualc/cursor.dsp
index cb4a45981..dd236dec9 100644
--- a/visualc/cursor.dsp
+++ b/ide/visualc/cursor.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I ".." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "../.." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,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 /machine:I386
-# ADD LINK32 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 /machine:I386 /nodefaultlib:"libcd" /out:"../test/cursor.exe" /libpath:"..\lib"
+# ADD LINK32 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 /machine:I386 /nodefaultlib:"libcd" /out:"../../test/cursor.exe" /libpath:"..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:yes
 
 !ELSEIF  "$(CFG)" == "cursor - Win32 Debug"
@@ -70,7 +70,7 @@ LINK32=link.exe
 # 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
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I ".." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "../.." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -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 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/cursord.exe" /pdbtype:sept /libpath:"..\lib"
+# ADD LINK32 fltkd.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/cursord.exe" /pdbtype:sept /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:no
 
 !ENDIF 
@@ -91,7 +91,7 @@ LINK32=link.exe
 # Name "cursor - Win32 Debug"
 # Begin Source File
 
-SOURCE=..\test\cursor.cxx
+SOURCE=..\..\test\cursor.cxx
 # End Source File
 # End Target
 # End Project
diff --git a/visualc/curve.dsp b/ide/visualc/curve.dsp
index 4b80dbfb0..468d61ff1 100644
--- a/visualc/curve.dsp
+++ b/ide/visualc/curve.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I ".." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "../.." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,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 /machine:I386
-# ADD LINK32 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 /machine:I386 /nodefaultlib:"libcd" /out:"../test/curve.exe" /libpath:"..\lib"
+# ADD LINK32 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 /machine:I386 /nodefaultlib:"libcd" /out:"../../test/curve.exe" /libpath:"..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:yes
 
 !ELSEIF  "$(CFG)" == "curve - Win32 Debug"
@@ -70,7 +70,7 @@ LINK32=link.exe
 # 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
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I ".." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "../.." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -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 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/curved.exe" /pdbtype:sept /libpath:"..\lib"
+# ADD LINK32 fltkd.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/curved.exe" /pdbtype:sept /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:no
 
 !ENDIF 
@@ -91,7 +91,7 @@ LINK32=link.exe
 # Name "curve - Win32 Debug"
 # Begin Source File
 
-SOURCE=..\test\curve.cxx
+SOURCE=..\..\test\curve.cxx
 # End Source File
 # End Target
 # End Project
diff --git a/visualc/demo.dsp b/ide/visualc/demo.dsp
index ef3ee8a34..4969417a5 100644
--- a/visualc/demo.dsp
+++ b/ide/visualc/demo.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I ".." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "../.." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,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 /machine:I386
-# ADD LINK32 fltk.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 /machine:I386 /nodefaultlib:"libcd" /out:"../test/demo.exe" /libpath:"..\lib"
+# ADD LINK32 fltk.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 /machine:I386 /nodefaultlib:"libcd" /out:"../../test/demo.exe" /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:yes
 
 !ELSEIF  "$(CFG)" == "demo - Win32 Debug"
@@ -70,7 +70,7 @@ LINK32=link.exe
 # 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
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I ".." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "../.." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -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 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/demod.exe" /pdbtype:sept /libpath:"..\lib"
+# ADD LINK32 fltkd.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/demod.exe" /pdbtype:sept /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:no
 
 !ENDIF 
@@ -91,7 +91,7 @@ LINK32=link.exe
 # Name "demo - Win32 Debug"
 # Begin Source File
 
-SOURCE=..\test\demo.cxx
+SOURCE=..\..\test\demo.cxx
 # End Source File
 # End Target
 # End Project
diff --git a/visualc/doublebuffer.dsp b/ide/visualc/doublebuffer.dsp
index 6b9a04428..e463be685 100644
--- a/visualc/doublebuffer.dsp
+++ b/ide/visualc/doublebuffer.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I ".." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "../.." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,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 /machine:I386
-# ADD LINK32 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 /machine:I386 /nodefaultlib:"libcd" /out:"../test/doublebuffer.exe" /libpath:"..\lib"
+# ADD LINK32 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 /machine:I386 /nodefaultlib:"libcd" /out:"../../test/doublebuffer.exe" /libpath:"..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:yes
 
 !ELSEIF  "$(CFG)" == "doublebuffer - Win32 Debug"
@@ -70,7 +70,7 @@ LINK32=link.exe
 # 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
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I ".." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "../.." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -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 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/doublebufferd.exe" /pdbtype:sept /libpath:"..\lib"
+# ADD LINK32 fltkd.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/doublebufferd.exe" /pdbtype:sept /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:no
 
 !ENDIF 
@@ -91,7 +91,7 @@ LINK32=link.exe
 # Name "doublebuffer - Win32 Debug"
 # Begin Source File
 
-SOURCE=..\test\doublebuffer.cxx
+SOURCE=..\..\test\doublebuffer.cxx
 # End Source File
 # End Target
 # End Project
diff --git a/visualc/editor.dsp b/ide/visualc/editor.dsp
index 03d8bc672..bf77715d8 100644
--- a/visualc/editor.dsp
+++ b/ide/visualc/editor.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I ".." /D "FL_DLL" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "../.." /D "FL_DLL" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,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 /machine:I386
-# ADD LINK32 comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /entry:"mainCRTStartup" /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../test/editor.exe" /libpath:"..\lib"
+# ADD LINK32 comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /entry:"mainCRTStartup" /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/editor.exe" /libpath:"..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:yes
 
 !ELSEIF  "$(CFG)" == "editor - Win32 Debug"
@@ -70,7 +70,7 @@ LINK32=link.exe
 # 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
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I ".." /D "FL_DLL" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "../.." /D "FL_DLL" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -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 comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /entry:"mainCRTStartup" /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../test/editord.exe" /pdbtype:sept /libpath:"..\lib"
+# ADD LINK32 comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /entry:"mainCRTStartup" /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/editord.exe" /pdbtype:sept /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:no
 
 !ENDIF 
@@ -91,7 +91,7 @@ LINK32=link.exe
 # Name "editor - Win32 Debug"
 # Begin Source File
 
-SOURCE=..\test\editor.cxx
+SOURCE=..\..\test\editor.cxx
 # End Source File
 # End Target
 # End Project
diff --git a/visualc/fast_slow.dsp b/ide/visualc/fast_slow.dsp
index 85a3c24a9..6e29a3c99 100644
--- a/visualc/fast_slow.dsp
+++ b/ide/visualc/fast_slow.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I ".." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "../.." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,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 /machine:I386
-# ADD LINK32 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 /machine:I386 /nodefaultlib:"libcd" /out:"../test/fast_slow.exe" /libpath:"..\lib"
+# ADD LINK32 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 /machine:I386 /nodefaultlib:"libcd" /out:"../../test/fast_slow.exe" /libpath:"..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:yes
 
 !ELSEIF  "$(CFG)" == "fast_slow - Win32 Debug"
@@ -70,7 +70,7 @@ LINK32=link.exe
 # 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
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I ".." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "../.." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -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 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/fast_slowd.exe" /pdbtype:sept /libpath:"..\lib"
+# ADD LINK32 fltkd.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/fast_slowd.exe" /pdbtype:sept /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:no
 
 !ENDIF 
@@ -91,33 +91,33 @@ LINK32=link.exe
 # Name "fast_slow - Win32 Debug"
 # Begin Source File
 
-SOURCE=..\test\fast_slow.cxx
+SOURCE=..\..\test\fast_slow.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\test\fast_slow.fl
+SOURCE=..\..\test\fast_slow.fl
 
 !IF  "$(CFG)" == "fast_slow - Win32 Release"
 
 # Begin Custom Build - Create .cxx and .h file with fluid
-InputPath=..\test\fast_slow.fl
+InputPath=..\..\test\fast_slow.fl
 
-"..\test\fast_slow.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cd ..\test 
+"..\..\test\fast_slow.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	cd ..\..\test 
 	..\fluid\fluid -c fast_slow.fl 
-	cd ..\visualc 
+	cd ..\ide\visualc 
 	
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "fast_slow - Win32 Debug"
 
 # Begin Custom Build - Create .cxx and .h file with fluidd
-InputPath=..\test\fast_slow.fl
+InputPath=..\..\test\fast_slow.fl
 
-"..\test\fast_slow.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"..\..\test\fast_slow.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	cd ..\test 
 	..\fluid\fluidd -c fast_slow.fl 
-	cd ..\visualc 
+	cd ..\ide\visualc 
 	
 # End Custom Build
 
diff --git a/visualc/file_chooser.dsp b/ide/visualc/file_chooser.dsp
index 01248bf57..05dc0b59a 100644
--- a/visualc/file_chooser.dsp
+++ b/ide/visualc/file_chooser.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I ".." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "../.." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,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 /machine:I386
-# ADD LINK32 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 /machine:I386 /nodefaultlib:"libcd" /nodefaultlib:"libcmt" /out:"../test/file_chooser.exe" /libpath:"..\lib"
+# ADD LINK32 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 /machine:I386 /nodefaultlib:"libcd" /nodefaultlib:"libcmt" /out:"../../test/file_chooser.exe" /libpath:"..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:yes
 
 !ELSEIF  "$(CFG)" == "file_chooser - Win32 Debug"
@@ -70,7 +70,7 @@ LINK32=link.exe
 # 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
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I ".." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "../.." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -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 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:"libc" /nodefaultlib:"libcd" /nodefaultlib:"libcmt" /nodefaultlib:"libcmtd" /out:"../test/file_chooserd.exe" /pdbtype:sept /libpath:"..\lib"
+# ADD LINK32 fltkd.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:"libc" /nodefaultlib:"libcd" /nodefaultlib:"libcmt" /nodefaultlib:"libcmtd" /out:"../../test/file_chooserd.exe" /pdbtype:sept /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:no
 
 !ENDIF 
@@ -91,7 +91,7 @@ LINK32=link.exe
 # Name "file_chooser - Win32 Debug"
 # Begin Source File
 
-SOURCE=..\test\file_chooser.cxx
+SOURCE=..\..\test\file_chooser.cxx
 # End Source File
 # End Target
 # End Project
diff --git a/visualc/fltk.dsw b/ide/visualc/fltk.dsw
index 30259cf69..30259cf69 100644
--- a/visualc/fltk.dsw
+++ b/ide/visualc/fltk.dsw
diff --git a/visualc/fltk.lib.dsp b/ide/visualc/fltk.lib.dsp
index 0e8955328..114d79567 100644
--- a/visualc/fltk.lib.dsp
+++ b/ide/visualc/fltk.lib.dsp
@@ -41,7 +41,7 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"
 # 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 "../visualc" /I ".." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Ot /Op /Ob2 /I "." /I "../.." /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
@@ -50,7 +50,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\lib\fltk.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\fltk.lib"
 
 !ELSEIF  "$(CFG)" == "fltk - Win32 Debug"
 
@@ -65,7 +65,7 @@ LIB32=link.exe -lib
 # PROP Intermediate_Dir "Debug"
 # 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 "../visualc" /I ".." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /FR /YX /FD /c
+# ADD CPP /nologo /MDd /GX /Z7 /Od /I "." /I "../.." /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
@@ -73,7 +73,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\lib\fltkd.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\fltkd.lib"
 
 !ENDIF 
 
@@ -83,551 +83,551 @@ LIB32=link.exe -lib
 # Name "fltk - Win32 Debug"
 # Begin Source File
 
-SOURCE=..\src\xutf8\case.c
+SOURCE=..\..\src\xutf8\case.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\filename_absolute.cxx
+SOURCE=..\..\src\filename_absolute.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\filename_expand.cxx
+SOURCE=..\..\src\filename_expand.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\filename_ext.cxx
+SOURCE=..\..\src\filename_ext.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\filename_isdir.cxx
+SOURCE=..\..\src\filename_isdir.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\filename_list.cxx
+SOURCE=..\..\src\filename_list.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\filename_match.cxx
+SOURCE=..\..\src\filename_match.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\filename_setext.cxx
+SOURCE=..\..\src\filename_setext.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\Fl.cxx
+SOURCE=..\..\src\Fl.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\Fl_abort.cxx
+SOURCE=..\..\src\Fl_abort.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\Fl_add_idle.cxx
+SOURCE=..\..\src\Fl_add_idle.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\Fl_Adjuster.cxx
+SOURCE=..\..\src\Fl_Adjuster.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\fl_arc.cxx
+SOURCE=..\..\src\fl_arc.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\fl_arci.cxx
+SOURCE=..\..\src\fl_arci.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\Fl_arg.cxx
+SOURCE=..\..\src\Fl_arg.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\fl_ask.cxx
+SOURCE=..\..\src\fl_ask.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\Fl_Bitmap.cxx
+SOURCE=..\..\src\Fl_Bitmap.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\Fl_Box.cxx
+SOURCE=..\..\src\Fl_Box.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\fl_boxtype.cxx
+SOURCE=..\..\src\fl_boxtype.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\Fl_Browser.cxx
+SOURCE=..\..\src\Fl_Browser.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\Fl_Browser_.cxx
+SOURCE=..\..\src\Fl_Browser_.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\Fl_Browser_load.cxx
+SOURCE=..\..\src\Fl_Browser_load.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\Fl_Button.cxx
+SOURCE=..\..\src\Fl_Button.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\fl_call_main.c
+SOURCE=..\..\src\fl_call_main.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\Fl_Chart.cxx
+SOURCE=..\..\src\Fl_Chart.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\Fl_Check_Browser.cxx
+SOURCE=..\..\src\Fl_Check_Browser.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\Fl_Check_Button.cxx
+SOURCE=..\..\src\Fl_Check_Button.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\Fl_Choice.cxx
+SOURCE=..\..\src\Fl_Choice.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\Fl_Clock.cxx
+SOURCE=..\..\src\Fl_Clock.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\fl_color.cxx
+SOURCE=..\..\src\fl_color.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\Fl_Color_Chooser.cxx
+SOURCE=..\..\src\Fl_Color_Chooser.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\Fl_compose.cxx
+SOURCE=..\..\src\Fl_compose.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\Fl_Counter.cxx
+SOURCE=..\..\src\Fl_Counter.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\fl_cursor.cxx
+SOURCE=..\..\src\fl_cursor.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\fl_curve.cxx
+SOURCE=..\..\src\fl_curve.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\Fl_Dial.cxx
+SOURCE=..\..\src\Fl_Dial.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\fl_diamond_box.cxx
+SOURCE=..\..\src\fl_diamond_box.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\Fl_display.cxx
+SOURCE=..\..\src\Fl_display.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\fl_dnd.cxx
+SOURCE=..\..\src\fl_dnd.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\Fl_Double_Window.cxx
+SOURCE=..\..\src\Fl_Double_Window.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\fl_draw.cxx
+SOURCE=..\..\src\fl_draw.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\fl_draw_image.cxx
+SOURCE=..\..\src\fl_draw_image.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\fl_draw_pixmap.cxx
+SOURCE=..\..\src\fl_draw_pixmap.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\fl_encoding_latin1.cxx
+SOURCE=..\..\src\fl_encoding_latin1.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\fl_encoding_mac_roman.cxx
+SOURCE=..\..\src\fl_encoding_mac_roman.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\fl_engraved_label.cxx
+SOURCE=..\..\src\fl_engraved_label.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\Fl_File_Browser.cxx
+SOURCE=..\..\src\Fl_File_Browser.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\Fl_File_Chooser.cxx
+SOURCE=..\..\src\Fl_File_Chooser.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\Fl_File_Chooser2.cxx
+SOURCE=..\..\src\Fl_File_Chooser2.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\fl_file_dir.cxx
+SOURCE=..\..\src\fl_file_dir.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\Fl_File_Icon.cxx
+SOURCE=..\..\src\Fl_File_Icon.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\Fl_File_Input.cxx
+SOURCE=..\..\src\Fl_File_Input.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\fl_font.cxx
+SOURCE=..\..\src\fl_font.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\Fl_get_key.cxx
+SOURCE=..\..\src\Fl_get_key.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\Fl_get_system_colors.cxx
+SOURCE=..\..\src\Fl_get_system_colors.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\Fl_grab.cxx
+SOURCE=..\..\src\Fl_grab.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\Fl_Group.cxx
+SOURCE=..\..\src\Fl_Group.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\fl_gtk.cxx
+SOURCE=..\..\src\fl_gtk.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\Fl_Help_View.cxx
+SOURCE=..\..\src\Fl_Help_View.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\Fl_Image.cxx
+SOURCE=..\..\src\Fl_Image.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\Fl_Input.cxx
+SOURCE=..\..\src\Fl_Input.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\Fl_Input_.cxx
+SOURCE=..\..\src\Fl_Input_.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\fl_labeltype.cxx
+SOURCE=..\..\src\fl_labeltype.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\Fl_Light_Button.cxx
+SOURCE=..\..\src\Fl_Light_Button.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\fl_line_style.cxx
+SOURCE=..\..\src\fl_line_style.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\Fl_lock.cxx
+SOURCE=..\..\src\Fl_lock.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\Fl_Menu.cxx
+SOURCE=..\..\src\Fl_Menu.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\Fl_Menu_.cxx
+SOURCE=..\..\src\Fl_Menu_.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\Fl_Menu_add.cxx
+SOURCE=..\..\src\Fl_Menu_add.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\Fl_Menu_Bar.cxx
+SOURCE=..\..\src\Fl_Menu_Bar.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\Fl_Menu_Button.cxx
+SOURCE=..\..\src\Fl_Menu_Button.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\Fl_Menu_global.cxx
+SOURCE=..\..\src\Fl_Menu_global.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\Fl_Menu_Window.cxx
+SOURCE=..\..\src\Fl_Menu_Window.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\Fl_Multi_Label.cxx
+SOURCE=..\..\src\Fl_Multi_Label.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\fl_open_uri.cxx
+SOURCE=..\..\src\fl_open_uri.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\fl_oval_box.cxx
+SOURCE=..\..\src\fl_oval_box.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\fl_overlay.cxx
+SOURCE=..\..\src\fl_overlay.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\fl_overlay_visual.cxx
+SOURCE=..\..\src\fl_overlay_visual.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\Fl_Overlay_Window.cxx
+SOURCE=..\..\src\Fl_Overlay_Window.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\Fl_own_colormap.cxx
+SOURCE=..\..\src\Fl_own_colormap.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\Fl_Pack.cxx
+SOURCE=..\..\src\Fl_Pack.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\Fl_Pixmap.cxx
+SOURCE=..\..\src\Fl_Pixmap.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\fl_plastic.cxx
+SOURCE=..\..\src\fl_plastic.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\Fl_Positioner.cxx
+SOURCE=..\..\src\Fl_Positioner.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\Fl_Preferences.cxx
+SOURCE=..\..\src\Fl_Preferences.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\Fl_Progress.cxx
+SOURCE=..\..\src\Fl_Progress.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\fl_read_image.cxx
+SOURCE=..\..\src\fl_read_image.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\fl_rect.cxx
+SOURCE=..\..\src\fl_rect.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\Fl_Repeat_Button.cxx
+SOURCE=..\..\src\Fl_Repeat_Button.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\Fl_Return_Button.cxx
+SOURCE=..\..\src\Fl_Return_Button.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\Fl_Roller.cxx
+SOURCE=..\..\src\Fl_Roller.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\fl_round_box.cxx
+SOURCE=..\..\src\fl_round_box.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\Fl_Round_Button.cxx
+SOURCE=..\..\src\Fl_Round_Button.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\fl_rounded_box.cxx
+SOURCE=..\..\src\fl_rounded_box.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\Fl_Scroll.cxx
+SOURCE=..\..\src\Fl_Scroll.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\fl_scroll_area.cxx
+SOURCE=..\..\src\fl_scroll_area.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\Fl_Scrollbar.cxx
+SOURCE=..\..\src\Fl_Scrollbar.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\fl_set_font.cxx
+SOURCE=..\..\src\fl_set_font.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\fl_set_fonts.cxx
+SOURCE=..\..\src\fl_set_fonts.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\fl_shadow_box.cxx
+SOURCE=..\..\src\fl_shadow_box.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\Fl_Shared_Image.cxx
+SOURCE=..\..\src\Fl_Shared_Image.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\fl_shortcut.cxx
+SOURCE=..\..\src\fl_shortcut.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\fl_show_colormap.cxx
+SOURCE=..\..\src\fl_show_colormap.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\Fl_Single_Window.cxx
+SOURCE=..\..\src\Fl_Single_Window.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\Fl_Slider.cxx
+SOURCE=..\..\src\Fl_Slider.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\fl_symbols.cxx
+SOURCE=..\..\src\fl_symbols.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\Fl_Tabs.cxx
+SOURCE=..\..\src\Fl_Tabs.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\Fl_Text_Buffer.cxx
+SOURCE=..\..\src\Fl_Text_Buffer.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\Fl_Text_Display.cxx
+SOURCE=..\..\src\Fl_Text_Display.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\Fl_Text_Editor.cxx
+SOURCE=..\..\src\Fl_Text_Editor.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\Fl_Tile.cxx
+SOURCE=..\..\src\Fl_Tile.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\Fl_Tiled_Image.cxx
+SOURCE=..\..\src\Fl_Tiled_Image.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\Fl_Tooltip.cxx
+SOURCE=..\..\src\Fl_Tooltip.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\fl_utf.c
+SOURCE=..\..\src\fl_utf.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\fl_utf8.cxx
+SOURCE=..\..\src\fl_utf8.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\Fl_Valuator.cxx
+SOURCE=..\..\src\Fl_Valuator.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\Fl_Value_Input.cxx
+SOURCE=..\..\src\Fl_Value_Input.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\Fl_Value_Output.cxx
+SOURCE=..\..\src\Fl_Value_Output.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\Fl_Value_Slider.cxx
+SOURCE=..\..\src\Fl_Value_Slider.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\fl_vertex.cxx
+SOURCE=..\..\src\fl_vertex.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\Fl_visual.cxx
+SOURCE=..\..\src\Fl_visual.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\Fl_Widget.cxx
+SOURCE=..\..\src\Fl_Widget.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\Fl_Window.cxx
+SOURCE=..\..\src\Fl_Window.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\Fl_Window_fullscreen.cxx
+SOURCE=..\..\src\Fl_Window_fullscreen.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\Fl_Window_hotspot.cxx
+SOURCE=..\..\src\Fl_Window_hotspot.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\Fl_Window_iconize.cxx
+SOURCE=..\..\src\Fl_Window_iconize.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\Fl_Wizard.cxx
+SOURCE=..\..\src\Fl_Wizard.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\Fl_x.cxx
+SOURCE=..\..\src\Fl_x.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\Fl_XBM_Image.cxx
+SOURCE=..\..\src\Fl_XBM_Image.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\Fl_XPM_Image.cxx
+SOURCE=..\..\src\Fl_XPM_Image.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\flstring.c
+SOURCE=..\..\src\flstring.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\xutf8\is_right2left.c
+SOURCE=..\..\src\xutf8\is_right2left.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\xutf8\is_spacing.c
+SOURCE=..\..\src\xutf8\is_spacing.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\numericsort.c
+SOURCE=..\..\src\numericsort.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\scandir.c
+SOURCE=..\..\src\scandir.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\screen_xywh.cxx
+SOURCE=..\..\src\screen_xywh.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\vsnprintf.c
+SOURCE=..\..\src\vsnprintf.c
 # End Source File
 # End Target
 # End Project
diff --git a/ide/visualc/fltkdll.dsp b/ide/visualc/fltkdll.dsp
new file mode 100644
index 000000000..3063cf7bf
--- /dev/null
+++ b/ide/visualc/fltkdll.dsp
@@ -0,0 +1,3406 @@
+# Microsoft Developer Studio Project File - Name="fltkdll" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
+
+CFG=fltkdll - 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 "fltkdll.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 "fltkdll.mak" CFG="fltkdll - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "fltkdll - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "fltkdll - 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)" == "fltkdll - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "fltkdll0"
+# PROP BASE Intermediate_Dir "fltkdll0"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "../test"
+# PROP Intermediate_Dir "fltkdll"
+# 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:"fltkdll.pdb" /machine:I386 /out:"fltkdll.dll"
+# SUBTRACT LINK32 /pdb:none
+
+!ELSEIF  "$(CFG)" == "fltkdll - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "fltkdll1"
+# PROP BASE Intermediate_Dir "fltkdll1"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "../test"
+# PROP Intermediate_Dir "fltkdlld"
+# 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:"fltkdlld.pdb" /debug /machine:I386 /out:"fltkdlld.dll" /pdbtype:sept
+# SUBTRACT LINK32 /pdb:none /incremental:no
+
+!ENDIF 
+
+# Begin Target
+
+# Name "fltkdll - Win32 Release"
+# Name "fltkdll - Win32 Debug"
+# Begin Source File
+
+SOURCE=..\..\src\xutf8\case.c
+DEP_CPP_CASE_=\
+	"..\..\src\xutf8\headers\case.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\filename_absolute.cxx
+DEP_CPP_FILEN=\
+	"..\..\FL\filename.h"\
+	"..\..\FL\fl_export.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\Xutf8.h"\
+	"..\..\src\flstring.h"\
+	".\config.h"\
+	
+NODEP_CPP_FILEN=\
+	"..\..\..\..\usr\include\dirent.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\filename_expand.cxx
+DEP_CPP_FILENA=\
+	"..\..\FL\filename.h"\
+	"..\..\FL\fl_export.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\Xutf8.h"\
+	"..\..\src\flstring.h"\
+	".\config.h"\
+	
+NODEP_CPP_FILENA=\
+	"..\..\..\..\usr\include\dirent.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\filename_ext.cxx
+DEP_CPP_FILENAM=\
+	"..\..\FL\filename.h"\
+	"..\..\FL\fl_export.h"\
+	
+NODEP_CPP_FILENAM=\
+	"..\..\..\..\usr\include\dirent.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\filename_isdir.cxx
+DEP_CPP_FILENAME=\
+	"..\..\FL\filename.h"\
+	"..\..\FL\fl_export.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\Xutf8.h"\
+	"..\..\src\flstring.h"\
+	".\config.h"\
+	
+NODEP_CPP_FILENAME=\
+	"..\..\..\..\usr\include\dirent.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\filename_list.cxx
+DEP_CPP_FILENAME_=\
+	"..\..\FL\filename.h"\
+	"..\..\FL\fl_export.h"\
+	"..\..\src\flstring.h"\
+	".\config.h"\
+	
+NODEP_CPP_FILENAME_=\
+	"..\..\..\..\usr\include\dirent.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\filename_match.cxx
+DEP_CPP_FILENAME_M=\
+	"..\..\FL\filename.h"\
+	"..\..\FL\fl_export.h"\
+	
+NODEP_CPP_FILENAME_M=\
+	"..\..\..\..\usr\include\dirent.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\filename_setext.cxx
+DEP_CPP_FILENAME_S=\
+	"..\..\FL\filename.h"\
+	"..\..\FL\fl_export.h"\
+	"..\..\src\flstring.h"\
+	".\config.h"\
+	
+NODEP_CPP_FILENAME_S=\
+	"..\..\..\..\usr\include\dirent.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl.cxx
+DEP_CPP_FL_CX=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\filename.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_draw.h"\
+	"..\..\FL\fl_export.h"\
+	"..\..\FL\fl_group.h"\
+	"..\..\FL\fl_image.h"\
+	"..\..\FL\fl_menu_.h"\
+	"..\..\FL\fl_menu_bar.h"\
+	"..\..\FL\fl_menu_item.h"\
+	"..\..\FL\Fl_Sys_Menu_Bar.H"\
+	"..\..\FL\fl_tooltip.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\fl_widget.h"\
+	"..\..\FL\fl_window.h"\
+	"..\..\FL\mac.H"\
+	"..\..\FL\win32.h"\
+	"..\..\FL\x.h"\
+	"..\..\FL\Xutf8.h"\
+	"..\..\src\aimm.h"\
+	"..\..\src\fl_font.h"\
+	"..\..\src\Fl_mac.cxx"\
+	"..\..\src\fl_win32.cxx"\
+	"..\..\src\flstring.h"\
+	".\config.h"\
+	
+NODEP_CPP_FL_CX=\
+	"..\..\..\..\usr\include\dirent.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_abort.cxx
+DEP_CPP_FL_AB=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_export.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\Xutf8.h"\
+	"..\..\src\flstring.h"\
+	".\config.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_add_idle.cxx
+DEP_CPP_FL_AD=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_export.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\Xutf8.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Adjuster.cxx
+DEP_CPP_FL_ADJ=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\fl_adjuster.h"\
+	"..\..\FL\fl_bitmap.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_draw.h"\
+	"..\..\FL\fl_export.h"\
+	"..\..\FL\fl_image.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\fl_valuator.h"\
+	"..\..\FL\fl_widget.h"\
+	"..\..\FL\Xutf8.h"\
+	"..\..\src\fastarrow.h"\
+	"..\..\src\mediumarrow.h"\
+	"..\..\src\slowarrow.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\fl_arc.cxx
+DEP_CPP_FL_AR=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl_draw.h"\
+	"..\..\FL\fl_export.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\FL\math.h"\
+	
+NODEP_CPP_FL_AR=\
+	"..\..\..\..\usr\include\math.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\fl_arci.cxx
+DEP_CPP_FL_ARC=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl_draw.h"\
+	"..\..\FL\fl_export.h"\
+	"..\..\FL\fl_group.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\FL\fl_widget.h"\
+	"..\..\FL\fl_window.h"\
+	"..\..\FL\mac.H"\
+	"..\..\FL\math.h"\
+	"..\..\FL\win32.h"\
+	"..\..\FL\x.h"\
+	"..\..\FL\Xutf8.h"\
+	".\config.h"\
+	
+NODEP_CPP_FL_ARC=\
+	"..\..\..\..\usr\include\math.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_arg.cxx
+DEP_CPP_FL_ARG=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\filename.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_draw.h"\
+	"..\..\FL\fl_export.h"\
+	"..\..\FL\fl_group.h"\
+	"..\..\FL\fl_tooltip.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\fl_widget.h"\
+	"..\..\FL\fl_window.h"\
+	"..\..\FL\mac.H"\
+	"..\..\FL\win32.h"\
+	"..\..\FL\x.h"\
+	"..\..\FL\Xutf8.h"\
+	"..\..\src\flstring.h"\
+	".\config.h"\
+	
+NODEP_CPP_FL_ARG=\
+	"..\..\..\..\usr\include\dirent.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\fl_ask.cxx
+DEP_CPP_FL_AS=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\fl_ask.h"\
+	"..\..\FL\fl_box.h"\
+	"..\..\FL\fl_button.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_draw.h"\
+	"..\..\FL\fl_export.h"\
+	"..\..\FL\fl_group.h"\
+	"..\..\FL\fl_input.h"\
+	"..\..\FL\fl_input_.h"\
+	"..\..\FL\fl_return_button.h"\
+	"..\..\FL\fl_secret_input.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\fl_widget.h"\
+	"..\..\FL\fl_window.h"\
+	"..\..\FL\mac.H"\
+	"..\..\FL\win32.h"\
+	"..\..\FL\x.h"\
+	"..\..\FL\Xutf8.h"\
+	"..\..\src\flstring.h"\
+	".\config.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Bitmap.cxx
+DEP_CPP_FL_BI=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\fl_bitmap.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_draw.h"\
+	"..\..\FL\fl_export.h"\
+	"..\..\FL\fl_group.h"\
+	"..\..\FL\fl_image.h"\
+	"..\..\FL\fl_menu_item.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\fl_widget.h"\
+	"..\..\FL\fl_window.h"\
+	"..\..\FL\mac.H"\
+	"..\..\FL\win32.h"\
+	"..\..\FL\x.h"\
+	"..\..\FL\Xutf8.h"\
+	"..\..\src\flstring.h"\
+	".\config.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_BMP_Image.cxx
+DEP_CPP_FL_BM=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl_bmp_image.h"\
+	"..\..\FL\fl_export.h"\
+	"..\..\FL\fl_image.h"\
+	"..\..\fl\fl_types.h"\
+	".\config.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Box.cxx
+DEP_CPP_FL_BO=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl_box.h"\
+	"..\..\FL\fl_export.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\FL\fl_widget.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\fl_boxtype.cxx
+DEP_CPP_FL_BOX=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_draw.h"\
+	"..\..\FL\fl_export.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\fl_widget.h"\
+	"..\..\FL\Xutf8.h"\
+	".\config.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Browser.cxx
+DEP_CPP_FL_BR=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\fl_browser.h"\
+	"..\..\FL\fl_browser_.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_draw.h"\
+	"..\..\FL\fl_export.h"\
+	"..\..\FL\fl_group.h"\
+	"..\..\FL\fl_scrollbar.h"\
+	"..\..\FL\fl_slider.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\fl_valuator.h"\
+	"..\..\FL\fl_widget.h"\
+	"..\..\FL\Xutf8.h"\
+	"..\..\src\flstring.h"\
+	".\config.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Browser_.cxx
+DEP_CPP_FL_BRO=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\fl_browser_.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_draw.h"\
+	"..\..\FL\fl_export.h"\
+	"..\..\FL\fl_group.h"\
+	"..\..\FL\fl_scrollbar.h"\
+	"..\..\FL\fl_slider.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\fl_valuator.h"\
+	"..\..\FL\fl_widget.h"\
+	"..\..\FL\Xutf8.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Browser_load.cxx
+DEP_CPP_FL_BROW=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\fl_browser.h"\
+	"..\..\FL\fl_browser_.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_export.h"\
+	"..\..\FL\fl_group.h"\
+	"..\..\FL\fl_scrollbar.h"\
+	"..\..\FL\fl_slider.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\fl_valuator.h"\
+	"..\..\FL\fl_widget.h"\
+	"..\..\FL\Xutf8.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Button.cxx
+DEP_CPP_FL_BU=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\fl_button.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_export.h"\
+	"..\..\FL\fl_group.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\fl_widget.h"\
+	"..\..\FL\fl_window.h"\
+	"..\..\FL\Xutf8.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Chart.cxx
+DEP_CPP_FL_CH=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_chart.h"\
+	"..\..\FL\fl_draw.h"\
+	"..\..\FL\fl_export.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\fl_widget.h"\
+	"..\..\FL\math.h"\
+	"..\..\FL\Xutf8.h"\
+	"..\..\src\flstring.h"\
+	".\config.h"\
+	
+NODEP_CPP_FL_CH=\
+	"..\..\..\..\usr\include\math.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Check_Browser.cxx
+DEP_CPP_FL_CHE=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\fl_browser_.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_check_browser.h"\
+	"..\..\FL\fl_draw.h"\
+	"..\..\FL\fl_export.h"\
+	"..\..\FL\fl_group.h"\
+	"..\..\FL\fl_scrollbar.h"\
+	"..\..\FL\fl_slider.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\fl_valuator.h"\
+	"..\..\FL\fl_widget.h"\
+	"..\..\FL\Xutf8.h"\
+	"..\..\src\flstring.h"\
+	".\config.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Check_Button.cxx
+DEP_CPP_FL_CHEC=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\fl_button.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_check_button.h"\
+	"..\..\FL\fl_export.h"\
+	"..\..\FL\fl_light_button.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\fl_widget.h"\
+	"..\..\FL\Xutf8.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Choice.cxx
+DEP_CPP_FL_CHO=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_choice.h"\
+	"..\..\FL\fl_draw.h"\
+	"..\..\FL\fl_export.h"\
+	"..\..\FL\fl_image.h"\
+	"..\..\FL\fl_menu_.h"\
+	"..\..\FL\fl_menu_item.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\fl_widget.h"\
+	"..\..\FL\Xutf8.h"\
+	"..\..\src\flstring.h"\
+	".\config.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Clock.cxx
+DEP_CPP_FL_CL=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_clock.h"\
+	"..\..\FL\fl_draw.h"\
+	"..\..\FL\fl_export.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\fl_widget.h"\
+	"..\..\FL\Xutf8.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\fl_color.cxx
+DEP_CPP_FL_CO=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_draw.h"\
+	"..\..\FL\fl_export.h"\
+	"..\..\FL\fl_group.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\fl_widget.h"\
+	"..\..\FL\fl_window.h"\
+	"..\..\FL\mac.H"\
+	"..\..\FL\win32.h"\
+	"..\..\FL\x.h"\
+	"..\..\FL\Xutf8.h"\
+	"..\..\src\fl_cmap.h"\
+	"..\..\src\fl_color_mac.cxx"\
+	"..\..\src\fl_color_win32.cxx"\
+	"..\..\src\Fl_XColor.H"\
+	".\config.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Color_Chooser.cxx
+DEP_CPP_FL_COL=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\fl_box.h"\
+	"..\..\FL\fl_button.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_choice.h"\
+	"..\..\FL\fl_color_chooser.h"\
+	"..\..\FL\fl_draw.h"\
+	"..\..\FL\fl_export.h"\
+	"..\..\FL\fl_group.h"\
+	"..\..\FL\fl_image.h"\
+	"..\..\FL\fl_input.h"\
+	"..\..\FL\fl_input_.h"\
+	"..\..\FL\fl_menu_.h"\
+	"..\..\FL\fl_menu_item.h"\
+	"..\..\FL\fl_return_button.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\fl_valuator.h"\
+	"..\..\FL\fl_value_input.h"\
+	"..\..\FL\fl_widget.h"\
+	"..\..\FL\fl_window.h"\
+	"..\..\FL\math.h"\
+	"..\..\FL\Xutf8.h"\
+	
+NODEP_CPP_FL_COL=\
+	"..\..\..\..\usr\include\math.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_compose.cxx
+DEP_CPP_FL_COM=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_export.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\Xutf8.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Counter.cxx
+DEP_CPP_FL_COU=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_counter.h"\
+	"..\..\FL\fl_draw.h"\
+	"..\..\FL\fl_export.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\fl_valuator.h"\
+	"..\..\FL\fl_widget.h"\
+	"..\..\FL\Xutf8.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\fl_cursor.cxx
+DEP_CPP_FL_CU=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_draw.h"\
+	"..\..\FL\fl_export.h"\
+	"..\..\FL\fl_group.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\fl_widget.h"\
+	"..\..\FL\fl_window.h"\
+	"..\..\FL\mac.H"\
+	"..\..\FL\win32.h"\
+	"..\..\FL\x.h"\
+	"..\..\FL\Xutf8.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\fl_curve.cxx
+DEP_CPP_FL_CUR=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl_draw.h"\
+	"..\..\FL\fl_export.h"\
+	"..\..\fl\fl_types.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Dial.cxx
+DEP_CPP_FL_DI=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_dial.h"\
+	"..\..\FL\fl_draw.h"\
+	"..\..\FL\fl_export.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\fl_valuator.h"\
+	"..\..\FL\fl_widget.h"\
+	"..\..\FL\math.h"\
+	"..\..\FL\Xutf8.h"\
+	
+NODEP_CPP_FL_DI=\
+	"..\..\..\..\usr\include\math.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\fl_diamond_box.cxx
+DEP_CPP_FL_DIA=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_draw.h"\
+	"..\..\FL\fl_export.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\Xutf8.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_display.cxx
+DEP_CPP_FL_DIS=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_export.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\Xutf8.h"\
+	"..\..\src\flstring.h"\
+	".\config.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\fl_dnd.cxx
+DEP_CPP_FL_DN=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_export.h"\
+	"..\..\FL\fl_group.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\fl_widget.h"\
+	"..\..\FL\fl_window.h"\
+	"..\..\FL\mac.H"\
+	"..\..\FL\win32.h"\
+	"..\..\FL\x.h"\
+	"..\..\FL\Xutf8.h"\
+	"..\..\src\fl_dnd_mac.cxx"\
+	"..\..\src\fl_dnd_win32.cxx"\
+	"..\..\src\fl_dnd_x.cxx"\
+	"..\..\src\flstring.h"\
+	".\config.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Double_Window.cxx
+DEP_CPP_FL_DO=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_double_window.h"\
+	"..\..\FL\fl_draw.h"\
+	"..\..\FL\fl_export.h"\
+	"..\..\FL\fl_group.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\fl_widget.h"\
+	"..\..\FL\fl_window.h"\
+	"..\..\FL\mac.H"\
+	"..\..\FL\win32.h"\
+	"..\..\FL\x.h"\
+	"..\..\FL\Xutf8.h"\
+	".\config.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\fl_draw.cxx
+DEP_CPP_FL_DR=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_draw.h"\
+	"..\..\FL\fl_export.h"\
+	"..\..\FL\fl_image.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\Xutf8.h"\
+	"..\..\src\flstring.h"\
+	".\config.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\fl_draw_image.cxx
+DEP_CPP_FL_DRA=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_draw.h"\
+	"..\..\FL\fl_export.h"\
+	"..\..\FL\fl_group.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\fl_widget.h"\
+	"..\..\FL\fl_window.h"\
+	"..\..\FL\mac.H"\
+	"..\..\FL\win32.h"\
+	"..\..\FL\x.h"\
+	"..\..\FL\Xutf8.h"\
+	"..\..\src\fl_draw_image_mac.cxx"\
+	"..\..\src\fl_draw_image_win32.cxx"\
+	"..\..\src\Fl_XColor.H"\
+	"..\..\src\flstring.h"\
+	".\config.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\fl_draw_pixmap.cxx
+DEP_CPP_FL_DRAW=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_draw.h"\
+	"..\..\FL\fl_export.h"\
+	"..\..\FL\fl_group.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\fl_widget.h"\
+	"..\..\FL\fl_window.h"\
+	"..\..\FL\mac.H"\
+	"..\..\FL\win32.h"\
+	"..\..\FL\x.h"\
+	"..\..\FL\Xutf8.h"\
+	"..\..\src\flstring.h"\
+	".\config.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\fl_encoding_latin1.cxx
+DEP_CPP_FL_EN=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl_draw.h"\
+	"..\..\FL\fl_export.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\src\flstring.h"\
+	".\config.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\fl_encoding_mac_roman.cxx
+DEP_CPP_FL_ENC=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl_draw.h"\
+	"..\..\FL\fl_export.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\src\flstring.h"\
+	".\config.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\fl_engraved_label.cxx
+DEP_CPP_FL_ENG=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_draw.h"\
+	"..\..\FL\fl_export.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\fl_widget.h"\
+	"..\..\FL\Xutf8.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_File_Browser.cxx
+DEP_CPP_FL_FI=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\filename.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\fl_browser.h"\
+	"..\..\FL\fl_browser_.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_draw.h"\
+	"..\..\FL\fl_export.h"\
+	"..\..\FL\Fl_File_Browser.H"\
+	"..\..\FL\fl_file_icon.h"\
+	"..\..\FL\fl_group.h"\
+	"..\..\FL\fl_scrollbar.h"\
+	"..\..\FL\fl_slider.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\fl_valuator.h"\
+	"..\..\FL\fl_widget.h"\
+	"..\..\FL\Xutf8.h"\
+	"..\..\src\flstring.h"\
+	".\config.h"\
+	
+NODEP_CPP_FL_FI=\
+	"..\..\..\..\usr\include\dirent.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_File_Chooser.cxx
+DEP_CPP_FL_FIL=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\filename.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\fl_ask.h"\
+	"..\..\FL\fl_bitmap.h"\
+	"..\..\FL\fl_box.h"\
+	"..\..\FL\fl_browser.h"\
+	"..\..\FL\fl_browser_.h"\
+	"..\..\FL\fl_button.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_check_button.h"\
+	"..\..\FL\fl_choice.h"\
+	"..\..\FL\fl_double_window.h"\
+	"..\..\FL\fl_draw.h"\
+	"..\..\FL\fl_export.h"\
+	"..\..\FL\Fl_File_Browser.H"\
+	"..\..\FL\fl_file_chooser.h"\
+	"..\..\FL\fl_file_icon.h"\
+	"..\..\FL\fl_file_input.h"\
+	"..\..\FL\fl_group.h"\
+	"..\..\FL\fl_image.h"\
+	"..\..\FL\fl_input.h"\
+	"..\..\FL\fl_input_.h"\
+	"..\..\FL\fl_light_button.h"\
+	"..\..\FL\fl_menu_.h"\
+	"..\..\FL\fl_menu_button.h"\
+	"..\..\FL\fl_menu_item.h"\
+	"..\..\FL\fl_preferences.h"\
+	"..\..\FL\fl_return_button.h"\
+	"..\..\FL\fl_scrollbar.h"\
+	"..\..\FL\fl_slider.h"\
+	"..\..\FL\fl_tile.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\fl_valuator.h"\
+	"..\..\FL\fl_widget.h"\
+	"..\..\FL\fl_window.h"\
+	"..\..\FL\Xutf8.h"\
+	
+NODEP_CPP_FL_FIL=\
+	"..\..\..\..\usr\include\dirent.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_File_Chooser2.cxx
+DEP_CPP_FL_FILE=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\filename.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\fl_ask.h"\
+	"..\..\FL\fl_box.h"\
+	"..\..\FL\fl_browser.h"\
+	"..\..\FL\fl_browser_.h"\
+	"..\..\FL\fl_button.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_check_button.h"\
+	"..\..\FL\fl_choice.h"\
+	"..\..\FL\fl_double_window.h"\
+	"..\..\FL\fl_export.h"\
+	"..\..\FL\Fl_File_Browser.H"\
+	"..\..\FL\fl_file_chooser.h"\
+	"..\..\FL\fl_file_icon.h"\
+	"..\..\FL\fl_file_input.h"\
+	"..\..\FL\fl_group.h"\
+	"..\..\FL\fl_image.h"\
+	"..\..\FL\fl_input.h"\
+	"..\..\FL\fl_input_.h"\
+	"..\..\FL\fl_light_button.h"\
+	"..\..\FL\fl_menu_.h"\
+	"..\..\FL\fl_menu_button.h"\
+	"..\..\FL\fl_menu_item.h"\
+	"..\..\FL\fl_preferences.h"\
+	"..\..\FL\fl_return_button.h"\
+	"..\..\FL\fl_scrollbar.h"\
+	"..\..\FL\fl_shared_image.h"\
+	"..\..\FL\fl_slider.h"\
+	"..\..\FL\fl_tile.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\fl_valuator.h"\
+	"..\..\FL\fl_widget.h"\
+	"..\..\FL\fl_window.h"\
+	"..\..\FL\mac.H"\
+	"..\..\FL\win32.h"\
+	"..\..\FL\x.h"\
+	"..\..\FL\Xutf8.h"\
+	"..\..\src\flstring.h"\
+	".\config.h"\
+	
+NODEP_CPP_FL_FILE=\
+	"..\..\..\..\usr\include\dirent.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\fl_file_dir.cxx
+DEP_CPP_FL_FILE_=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\filename.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\fl_ask.h"\
+	"..\..\FL\fl_box.h"\
+	"..\..\FL\fl_browser.h"\
+	"..\..\FL\fl_browser_.h"\
+	"..\..\FL\fl_button.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_check_button.h"\
+	"..\..\FL\fl_choice.h"\
+	"..\..\FL\fl_double_window.h"\
+	"..\..\FL\fl_export.h"\
+	"..\..\FL\Fl_File_Browser.H"\
+	"..\..\FL\fl_file_chooser.h"\
+	"..\..\FL\fl_file_icon.h"\
+	"..\..\FL\fl_file_input.h"\
+	"..\..\FL\fl_group.h"\
+	"..\..\FL\fl_image.h"\
+	"..\..\FL\fl_input.h"\
+	"..\..\FL\fl_input_.h"\
+	"..\..\FL\fl_light_button.h"\
+	"..\..\FL\fl_menu_.h"\
+	"..\..\FL\fl_menu_button.h"\
+	"..\..\FL\fl_menu_item.h"\
+	"..\..\FL\fl_preferences.h"\
+	"..\..\FL\fl_return_button.h"\
+	"..\..\FL\fl_scrollbar.h"\
+	"..\..\FL\fl_slider.h"\
+	"..\..\FL\fl_tile.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\fl_valuator.h"\
+	"..\..\FL\fl_widget.h"\
+	"..\..\FL\fl_window.h"\
+	"..\..\FL\Xutf8.h"\
+	"..\..\src\flstring.h"\
+	".\config.h"\
+	
+NODEP_CPP_FL_FILE_=\
+	"..\..\..\..\usr\include\dirent.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_File_Icon.cxx
+DEP_CPP_FL_FILE_I=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\filename.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_draw.h"\
+	"..\..\FL\fl_export.h"\
+	"..\..\FL\fl_file_icon.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\fl_widget.h"\
+	"..\..\FL\Xutf8.h"\
+	"..\..\src\flstring.h"\
+	".\config.h"\
+	
+NODEP_CPP_FL_FILE_I=\
+	"..\..\..\..\usr\include\dirent.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_File_Icon2.cxx
+DEP_CPP_FL_FILE_IC=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\filename.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_draw.h"\
+	"..\..\FL\fl_export.h"\
+	"..\..\FL\fl_file_icon.h"\
+	"..\..\FL\fl_image.h"\
+	"..\..\FL\fl_shared_image.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\fl_widget.h"\
+	"..\..\FL\math.h"\
+	"..\..\FL\Xutf8.h"\
+	"..\..\src\flstring.h"\
+	".\config.h"\
+	
+NODEP_CPP_FL_FILE_IC=\
+	"..\..\..\..\usr\include\dirent.h"\
+	"..\..\..\..\usr\include\math.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_File_Input.cxx
+DEP_CPP_FL_FILE_IN=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_draw.h"\
+	"..\..\FL\fl_export.h"\
+	"..\..\FL\fl_file_input.h"\
+	"..\..\FL\fl_group.h"\
+	"..\..\FL\fl_input.h"\
+	"..\..\FL\fl_input_.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\fl_widget.h"\
+	"..\..\FL\fl_window.h"\
+	"..\..\FL\Xutf8.h"\
+	"..\..\src\flstring.h"\
+	".\config.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\fl_font.cxx
+DEP_CPP_FL_FO=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_draw.h"\
+	"..\..\FL\fl_export.h"\
+	"..\..\FL\fl_group.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\fl_widget.h"\
+	"..\..\FL\fl_window.h"\
+	"..\..\FL\mac.H"\
+	"..\..\FL\win32.h"\
+	"..\..\FL\x.h"\
+	"..\..\FL\Xutf8.h"\
+	"..\..\src\fl_font.h"\
+	"..\..\src\fl_font_mac.cxx"\
+	"..\..\src\fl_font_win32.cxx"\
+	"..\..\src\fl_font_x.cxx"\
+	"..\..\src\fl_font_xft.cxx"\
+	"..\..\src\flstring.h"\
+	".\config.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_get_key.cxx
+DEP_CPP_FL_GE=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_export.h"\
+	"..\..\FL\fl_group.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\fl_widget.h"\
+	"..\..\FL\fl_window.h"\
+	"..\..\FL\mac.H"\
+	"..\..\FL\win32.h"\
+	"..\..\FL\x.h"\
+	"..\..\FL\Xutf8.h"\
+	"..\..\src\Fl_get_key_mac.cxx"\
+	"..\..\src\fl_get_key_win32.cxx"\
+	".\config.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_get_system_colors.cxx
+DEP_CPP_FL_GET=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_draw.h"\
+	"..\..\FL\fl_export.h"\
+	"..\..\FL\fl_group.h"\
+	"..\..\FL\fl_image.h"\
+	"..\..\FL\fl_pixmap.h"\
+	"..\..\FL\fl_tiled_image.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\fl_widget.h"\
+	"..\..\FL\fl_window.h"\
+	"..\..\FL\mac.H"\
+	"..\..\FL\math.h"\
+	"..\..\FL\win32.h"\
+	"..\..\FL\x.h"\
+	"..\..\FL\Xutf8.h"\
+	"..\..\src\flstring.h"\
+	"..\..\src\tile.xpm"\
+	".\config.h"\
+	
+NODEP_CPP_FL_GET=\
+	"..\..\..\..\usr\include\math.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_GIF_Image.cxx
+DEP_CPP_FL_GI=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_export.h"\
+	"..\..\FL\fl_gif_image.h"\
+	"..\..\FL\fl_image.h"\
+	"..\..\FL\fl_pixmap.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\Xutf8.h"\
+	"..\..\src\flstring.h"\
+	".\config.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Gl_Choice.cxx
+DEP_CPP_FL_GL=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_export.h"\
+	"..\..\FL\fl_group.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\fl_widget.h"\
+	"..\..\FL\fl_window.h"\
+	"..\..\FL\gl.h"\
+	"..\..\FL\gl_draw.h"\
+	"..\..\FL\mac.H"\
+	"..\..\FL\win32.h"\
+	"..\..\FL\x.h"\
+	"..\..\FL\Xutf8.h"\
+	"..\..\src\Fl_Gl_Choice.H"\
+	"..\..\src\flstring.h"\
+	".\config.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Gl_Overlay.cxx
+DEP_CPP_FL_GL_=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_export.h"\
+	"..\..\FL\Fl_Gl_Window.H"\
+	"..\..\FL\fl_group.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\fl_widget.h"\
+	"..\..\FL\fl_window.h"\
+	"..\..\FL\gl.h"\
+	"..\..\FL\mac.H"\
+	"..\..\FL\win32.h"\
+	"..\..\FL\x.h"\
+	"..\..\FL\Xutf8.h"\
+	"..\..\src\Fl_Gl_Choice.H"\
+	".\config.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Gl_Window.cxx
+DEP_CPP_FL_GL_W=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_export.h"\
+	"..\..\FL\Fl_Gl_Window.H"\
+	"..\..\FL\fl_group.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\fl_widget.h"\
+	"..\..\FL\fl_window.h"\
+	"..\..\FL\gl.h"\
+	"..\..\FL\mac.H"\
+	"..\..\FL\win32.h"\
+	"..\..\FL\x.h"\
+	"..\..\FL\Xutf8.h"\
+	"..\..\src\Fl_Gl_Choice.H"\
+	"..\..\src\flstring.h"\
+	".\config.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_grab.cxx
+DEP_CPP_FL_GR=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_export.h"\
+	"..\..\FL\fl_group.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\fl_widget.h"\
+	"..\..\FL\fl_window.h"\
+	"..\..\FL\mac.H"\
+	"..\..\FL\win32.h"\
+	"..\..\FL\x.h"\
+	"..\..\FL\Xutf8.h"\
+	".\config.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Group.cxx
+DEP_CPP_FL_GRO=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_draw.h"\
+	"..\..\FL\fl_export.h"\
+	"..\..\FL\fl_group.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\fl_widget.h"\
+	"..\..\FL\fl_window.h"\
+	"..\..\FL\Xutf8.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\fl_gtk.cxx
+DEP_CPP_FL_GT=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_draw.h"\
+	"..\..\FL\fl_export.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\Xutf8.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Help_Dialog.cxx
+DEP_CPP_FL_HE=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\fl_ask.h"\
+	"..\..\FL\fl_box.h"\
+	"..\..\FL\fl_button.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_double_window.h"\
+	"..\..\FL\fl_draw.h"\
+	"..\..\FL\fl_export.h"\
+	"..\..\FL\fl_group.h"\
+	"..\..\FL\Fl_Help_Dialog.H"\
+	"..\..\FL\Fl_Help_View.H"\
+	"..\..\FL\fl_image.h"\
+	"..\..\FL\fl_input.h"\
+	"..\..\FL\fl_input_.h"\
+	"..\..\FL\fl_scrollbar.h"\
+	"..\..\FL\fl_shared_image.h"\
+	"..\..\FL\fl_slider.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\fl_valuator.h"\
+	"..\..\FL\fl_widget.h"\
+	"..\..\FL\fl_window.h"\
+	"..\..\FL\Xutf8.h"\
+	"..\..\src\flstring.h"\
+	".\config.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Help_View.cxx
+DEP_CPP_FL_HEL=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_draw.h"\
+	"..\..\FL\fl_export.h"\
+	"..\..\FL\fl_group.h"\
+	"..\..\FL\Fl_Help_View.H"\
+	"..\..\FL\fl_image.h"\
+	"..\..\FL\fl_pixmap.h"\
+	"..\..\FL\fl_scrollbar.h"\
+	"..\..\FL\fl_shared_image.h"\
+	"..\..\FL\fl_slider.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\fl_valuator.h"\
+	"..\..\FL\fl_widget.h"\
+	"..\..\FL\fl_window.h"\
+	"..\..\FL\mac.H"\
+	"..\..\FL\win32.h"\
+	"..\..\FL\x.h"\
+	"..\..\FL\Xutf8.h"\
+	"..\..\src\flstring.h"\
+	".\config.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Image.cxx
+DEP_CPP_FL_IM=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_draw.h"\
+	"..\..\FL\fl_export.h"\
+	"..\..\FL\fl_group.h"\
+	"..\..\FL\fl_image.h"\
+	"..\..\FL\fl_menu_item.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\fl_widget.h"\
+	"..\..\FL\fl_window.h"\
+	"..\..\FL\mac.H"\
+	"..\..\FL\win32.h"\
+	"..\..\FL\x.h"\
+	"..\..\FL\Xutf8.h"\
+	"..\..\src\flstring.h"\
+	".\config.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\fl_images_core.cxx
+DEP_CPP_FL_IMA=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl_bmp_image.h"\
+	"..\..\FL\fl_export.h"\
+	"..\..\FL\fl_gif_image.h"\
+	"..\..\FL\fl_image.h"\
+	"..\..\FL\fl_jpeg_image.h"\
+	"..\..\FL\fl_pixmap.h"\
+	"..\..\FL\fl_png_image.h"\
+	"..\..\FL\fl_pnm_image.h"\
+	"..\..\FL\fl_shared_image.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\src\flstring.h"\
+	".\config.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Input.cxx
+DEP_CPP_FL_IN=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\fl_ask.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_draw.h"\
+	"..\..\FL\fl_export.h"\
+	"..\..\FL\fl_group.h"\
+	"..\..\FL\fl_input.h"\
+	"..\..\FL\fl_input_.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\fl_widget.h"\
+	"..\..\FL\fl_window.h"\
+	"..\..\FL\Xutf8.h"\
+	"..\..\src\flstring.h"\
+	".\config.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Input_.cxx
+DEP_CPP_FL_INP=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\fl_ask.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_draw.h"\
+	"..\..\FL\fl_export.h"\
+	"..\..\FL\fl_group.h"\
+	"..\..\FL\fl_input_.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\fl_widget.h"\
+	"..\..\FL\fl_window.h"\
+	"..\..\FL\Xutf8.h"\
+	"..\..\src\flstring.h"\
+	".\config.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_JPEG_Image.cxx
+DEP_CPP_FL_JP=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl_export.h"\
+	"..\..\FL\fl_image.h"\
+	"..\..\FL\fl_jpeg_image.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\jpeg\jconfig.h"\
+	"..\..\jpeg\jerror.h"\
+	"..\..\jpeg\jmorecfg.h"\
+	"..\..\jpeg\jpegint.h"\
+	"..\..\jpeg\jpeglib.h"\
+	".\config.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\fl_labeltype.cxx
+DEP_CPP_FL_LA=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_draw.h"\
+	"..\..\FL\fl_export.h"\
+	"..\..\FL\fl_group.h"\
+	"..\..\FL\fl_image.h"\
+	"..\..\FL\fl_input_.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\fl_widget.h"\
+	"..\..\FL\Xutf8.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Light_Button.cxx
+DEP_CPP_FL_LI=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\fl_button.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_draw.h"\
+	"..\..\FL\fl_export.h"\
+	"..\..\FL\fl_light_button.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\fl_widget.h"\
+	"..\..\FL\Xutf8.h"\
+	"..\..\src\flstring.h"\
+	".\config.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\fl_line_style.cxx
+DEP_CPP_FL_LIN=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_draw.h"\
+	"..\..\FL\fl_export.h"\
+	"..\..\FL\fl_group.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\fl_widget.h"\
+	"..\..\FL\fl_window.h"\
+	"..\..\FL\mac.H"\
+	"..\..\FL\win32.h"\
+	"..\..\FL\x.h"\
+	"..\..\FL\Xutf8.h"\
+	"..\..\src\flstring.h"\
+	".\config.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_lock.cxx
+DEP_CPP_FL_LO=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_export.h"\
+	"..\..\FL\fl_group.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\fl_widget.h"\
+	"..\..\FL\fl_window.h"\
+	"..\..\FL\mac.H"\
+	"..\..\FL\win32.h"\
+	"..\..\FL\x.h"\
+	"..\..\FL\Xutf8.h"\
+	".\config.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Menu.cxx
+DEP_CPP_FL_ME=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_draw.h"\
+	"..\..\FL\fl_export.h"\
+	"..\..\FL\fl_group.h"\
+	"..\..\FL\fl_image.h"\
+	"..\..\FL\fl_menu_.h"\
+	"..\..\FL\fl_menu_item.h"\
+	"..\..\FL\fl_menu_window.h"\
+	"..\..\FL\fl_single_window.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\fl_widget.h"\
+	"..\..\FL\fl_window.h"\
+	"..\..\FL\Xutf8.h"\
+	"..\..\src\flstring.h"\
+	".\config.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Menu_.cxx
+DEP_CPP_FL_MEN=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_export.h"\
+	"..\..\FL\fl_image.h"\
+	"..\..\FL\fl_menu_.h"\
+	"..\..\FL\fl_menu_item.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\fl_widget.h"\
+	"..\..\FL\Xutf8.h"\
+	"..\..\src\flstring.h"\
+	".\config.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Menu_add.cxx
+DEP_CPP_FL_MENU=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl_export.h"\
+	"..\..\FL\fl_image.h"\
+	"..\..\FL\fl_menu_.h"\
+	"..\..\FL\fl_menu_item.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\FL\fl_widget.h"\
+	"..\..\src\flstring.h"\
+	".\config.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Menu_Bar.cxx
+DEP_CPP_FL_MENU_=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_draw.h"\
+	"..\..\FL\fl_export.h"\
+	"..\..\FL\fl_image.h"\
+	"..\..\FL\fl_menu_.h"\
+	"..\..\FL\fl_menu_bar.h"\
+	"..\..\FL\fl_menu_item.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\fl_widget.h"\
+	"..\..\FL\Xutf8.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Menu_Button.cxx
+DEP_CPP_FL_MENU_B=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_draw.h"\
+	"..\..\FL\fl_export.h"\
+	"..\..\FL\fl_image.h"\
+	"..\..\FL\fl_menu_.h"\
+	"..\..\FL\fl_menu_button.h"\
+	"..\..\FL\fl_menu_item.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\fl_widget.h"\
+	"..\..\FL\Xutf8.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Menu_global.cxx
+DEP_CPP_FL_MENU_G=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_export.h"\
+	"..\..\FL\fl_image.h"\
+	"..\..\FL\fl_menu_.h"\
+	"..\..\FL\fl_menu_item.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\fl_widget.h"\
+	"..\..\FL\Xutf8.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Menu_Window.cxx
+DEP_CPP_FL_MENU_W=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_draw.h"\
+	"..\..\FL\fl_export.h"\
+	"..\..\FL\fl_group.h"\
+	"..\..\FL\fl_menu_window.h"\
+	"..\..\FL\fl_single_window.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\fl_widget.h"\
+	"..\..\FL\fl_window.h"\
+	"..\..\FL\mac.H"\
+	"..\..\FL\win32.h"\
+	"..\..\FL\x.h"\
+	"..\..\FL\Xutf8.h"\
+	".\config.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Multi_Label.cxx
+DEP_CPP_FL_MU=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_export.h"\
+	"..\..\FL\fl_image.h"\
+	"..\..\FL\fl_menu_item.h"\
+	"..\..\FL\fl_multi_label.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\fl_widget.h"\
+	"..\..\FL\Xutf8.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\fl_open_uri.cxx
+DEP_CPP_FL_OP=\
+	"..\..\FL\filename.h"\
+	"..\..\FL\fl_export.h"\
+	"..\..\src\flstring.h"\
+	".\config.h"\
+	
+NODEP_CPP_FL_OP=\
+	"..\..\..\..\usr\include\dirent.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\fl_oval_box.cxx
+DEP_CPP_FL_OV=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_draw.h"\
+	"..\..\FL\fl_export.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\Xutf8.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\fl_overlay.cxx
+DEP_CPP_FL_OVE=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl_draw.h"\
+	"..\..\FL\fl_export.h"\
+	"..\..\FL\fl_group.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\FL\fl_widget.h"\
+	"..\..\FL\fl_window.h"\
+	"..\..\FL\mac.H"\
+	"..\..\FL\win32.h"\
+	"..\..\FL\x.h"\
+	"..\..\FL\Xutf8.h"\
+	".\config.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\fl_overlay_visual.cxx
+DEP_CPP_FL_OVER=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_export.h"\
+	"..\..\FL\fl_group.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\fl_widget.h"\
+	"..\..\FL\fl_window.h"\
+	"..\..\FL\mac.H"\
+	"..\..\FL\win32.h"\
+	"..\..\FL\x.h"\
+	"..\..\FL\Xutf8.h"\
+	".\config.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Overlay_Window.cxx
+DEP_CPP_FL_OVERL=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_double_window.h"\
+	"..\..\FL\fl_draw.h"\
+	"..\..\FL\fl_export.h"\
+	"..\..\FL\fl_group.h"\
+	"..\..\FL\fl_overlay_window.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\fl_widget.h"\
+	"..\..\FL\fl_window.h"\
+	"..\..\FL\mac.H"\
+	"..\..\FL\win32.h"\
+	"..\..\FL\x.h"\
+	"..\..\FL\Xutf8.h"\
+	".\config.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_own_colormap.cxx
+DEP_CPP_FL_OW=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_export.h"\
+	"..\..\FL\fl_group.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\fl_widget.h"\
+	"..\..\FL\fl_window.h"\
+	"..\..\FL\mac.H"\
+	"..\..\FL\win32.h"\
+	"..\..\FL\x.h"\
+	"..\..\FL\Xutf8.h"\
+	".\config.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Pack.cxx
+DEP_CPP_FL_PA=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_draw.h"\
+	"..\..\FL\fl_export.h"\
+	"..\..\FL\fl_group.h"\
+	"..\..\FL\fl_pack.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\fl_widget.h"\
+	"..\..\FL\Xutf8.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Pixmap.cxx
+DEP_CPP_FL_PI=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_draw.h"\
+	"..\..\FL\fl_export.h"\
+	"..\..\FL\fl_group.h"\
+	"..\..\FL\fl_image.h"\
+	"..\..\FL\fl_menu_item.h"\
+	"..\..\FL\fl_pixmap.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\fl_widget.h"\
+	"..\..\FL\fl_window.h"\
+	"..\..\FL\mac.H"\
+	"..\..\FL\win32.h"\
+	"..\..\FL\x.h"\
+	"..\..\FL\Xutf8.h"\
+	"..\..\src\flstring.h"\
+	".\config.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\fl_plastic.cxx
+DEP_CPP_FL_PL=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_draw.h"\
+	"..\..\FL\fl_export.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\Xutf8.h"\
+	"..\..\src\flstring.h"\
+	".\config.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_PNG_Image.cxx
+DEP_CPP_FL_PN=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_export.h"\
+	"..\..\FL\fl_image.h"\
+	"..\..\FL\fl_png_image.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\Xutf8.h"\
+	"..\..\png\png.h"\
+	"..\..\png\pngconf.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	".\config.h"\
+	
+NODEP_CPP_FL_PN=\
+	"..\..\png\pngusr.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_PNM_Image.cxx
+DEP_CPP_FL_PNM=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_export.h"\
+	"..\..\FL\fl_image.h"\
+	"..\..\FL\fl_pnm_image.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\Xutf8.h"\
+	"..\..\src\flstring.h"\
+	".\config.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Positioner.cxx
+DEP_CPP_FL_PO=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_draw.h"\
+	"..\..\FL\fl_export.h"\
+	"..\..\FL\fl_positioner.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\fl_widget.h"\
+	"..\..\FL\Xutf8.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Preferences.cxx
+DEP_CPP_FL_PR=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\filename.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_export.h"\
+	"..\..\FL\fl_preferences.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\Xutf8.h"\
+	"..\..\src\flstring.h"\
+	".\config.h"\
+	
+NODEP_CPP_FL_PR=\
+	"..\..\..\..\usr\include\dirent.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Progress.cxx
+DEP_CPP_FL_PRO=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_draw.h"\
+	"..\..\FL\fl_export.h"\
+	"..\..\FL\fl_progress.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\fl_widget.h"\
+	"..\..\FL\Xutf8.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\fl_read_image.cxx
+DEP_CPP_FL_RE=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_draw.h"\
+	"..\..\FL\fl_export.h"\
+	"..\..\FL\fl_group.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\fl_widget.h"\
+	"..\..\FL\fl_window.h"\
+	"..\..\FL\mac.H"\
+	"..\..\FL\win32.h"\
+	"..\..\FL\x.h"\
+	"..\..\FL\Xutf8.h"\
+	"..\..\src\fl_read_image_mac.cxx"\
+	"..\..\src\fl_read_image_win32.cxx"\
+	"..\..\src\flstring.h"\
+	".\config.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\fl_rect.cxx
+DEP_CPP_FL_REC=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_draw.h"\
+	"..\..\FL\fl_export.h"\
+	"..\..\FL\fl_group.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\fl_widget.h"\
+	"..\..\FL\fl_window.h"\
+	"..\..\FL\mac.H"\
+	"..\..\FL\win32.h"\
+	"..\..\FL\x.h"\
+	"..\..\FL\Xutf8.h"\
+	".\config.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Repeat_Button.cxx
+DEP_CPP_FL_REP=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\fl_button.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_export.h"\
+	"..\..\FL\fl_repeat_button.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\fl_widget.h"\
+	"..\..\FL\Xutf8.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Return_Button.cxx
+DEP_CPP_FL_RET=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\fl_button.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_draw.h"\
+	"..\..\FL\fl_export.h"\
+	"..\..\FL\fl_return_button.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\fl_widget.h"\
+	"..\..\FL\Xutf8.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Roller.cxx
+DEP_CPP_FL_RO=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_draw.h"\
+	"..\..\FL\fl_export.h"\
+	"..\..\FL\fl_roller.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\fl_valuator.h"\
+	"..\..\FL\fl_widget.h"\
+	"..\..\FL\Xutf8.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\fl_round_box.cxx
+DEP_CPP_FL_ROU=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_draw.h"\
+	"..\..\FL\fl_export.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\Xutf8.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Round_Button.cxx
+DEP_CPP_FL_ROUN=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\fl_button.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_export.h"\
+	"..\..\FL\fl_light_button.h"\
+	"..\..\FL\fl_round_button.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\fl_widget.h"\
+	"..\..\FL\Xutf8.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\fl_rounded_box.cxx
+DEP_CPP_FL_ROUND=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_draw.h"\
+	"..\..\FL\fl_export.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\Xutf8.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Scroll.cxx
+DEP_CPP_FL_SC=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_draw.h"\
+	"..\..\FL\fl_export.h"\
+	"..\..\FL\fl_group.h"\
+	"..\..\FL\fl_image.h"\
+	"..\..\FL\fl_scroll.h"\
+	"..\..\FL\fl_scrollbar.h"\
+	"..\..\FL\fl_slider.h"\
+	"..\..\FL\fl_tiled_image.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\fl_valuator.h"\
+	"..\..\FL\fl_widget.h"\
+	"..\..\FL\Xutf8.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\fl_scroll_area.cxx
+DEP_CPP_FL_SCR=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_draw.h"\
+	"..\..\FL\fl_export.h"\
+	"..\..\FL\fl_group.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\fl_widget.h"\
+	"..\..\FL\fl_window.h"\
+	"..\..\FL\mac.H"\
+	"..\..\FL\win32.h"\
+	"..\..\FL\x.h"\
+	"..\..\FL\Xutf8.h"\
+	".\config.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Scrollbar.cxx
+DEP_CPP_FL_SCRO=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_draw.h"\
+	"..\..\FL\fl_export.h"\
+	"..\..\FL\fl_scrollbar.h"\
+	"..\..\FL\fl_slider.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\fl_valuator.h"\
+	"..\..\FL\fl_widget.h"\
+	"..\..\FL\Xutf8.h"\
+	"..\..\src\flstring.h"\
+	".\config.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\fl_set_font.cxx
+DEP_CPP_FL_SE=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_draw.h"\
+	"..\..\FL\fl_export.h"\
+	"..\..\FL\fl_group.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\fl_widget.h"\
+	"..\..\FL\fl_window.h"\
+	"..\..\FL\mac.H"\
+	"..\..\FL\win32.h"\
+	"..\..\FL\x.h"\
+	"..\..\FL\Xutf8.h"\
+	"..\..\src\fl_font.h"\
+	"..\..\src\flstring.h"\
+	".\config.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\fl_set_fonts.cxx
+DEP_CPP_FL_SET=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_export.h"\
+	"..\..\FL\fl_group.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\fl_widget.h"\
+	"..\..\FL\fl_window.h"\
+	"..\..\FL\mac.H"\
+	"..\..\FL\win32.h"\
+	"..\..\FL\x.h"\
+	"..\..\FL\Xutf8.h"\
+	"..\..\src\fl_font.h"\
+	"..\..\src\fl_set_fonts_mac.cxx"\
+	"..\..\src\fl_set_fonts_win32.cxx"\
+	"..\..\src\fl_set_fonts_x.cxx"\
+	"..\..\src\fl_set_fonts_xft.cxx"\
+	"..\..\src\flstring.h"\
+	".\config.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\fl_shadow_box.cxx
+DEP_CPP_FL_SH=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_draw.h"\
+	"..\..\FL\fl_export.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\Xutf8.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Shared_Image.cxx
+DEP_CPP_FL_SHA=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\fl_bitmap.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_export.h"\
+	"..\..\FL\fl_image.h"\
+	"..\..\FL\fl_pixmap.h"\
+	"..\..\FL\fl_shared_image.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\fl_xbm_image.h"\
+	"..\..\FL\fl_xpm_image.h"\
+	"..\..\FL\Xutf8.h"\
+	"..\..\src\flstring.h"\
+	".\config.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\fl_shortcut.cxx
+DEP_CPP_FL_SHO=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\fl_button.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_draw.h"\
+	"..\..\FL\fl_export.h"\
+	"..\..\FL\fl_group.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\fl_widget.h"\
+	"..\..\FL\fl_window.h"\
+	"..\..\FL\mac.H"\
+	"..\..\FL\win32.h"\
+	"..\..\FL\x.h"\
+	"..\..\FL\Xutf8.h"\
+	"..\..\src\flstring.h"\
+	".\config.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\fl_show_colormap.cxx
+DEP_CPP_FL_SHOW=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_draw.h"\
+	"..\..\FL\fl_export.h"\
+	"..\..\FL\fl_group.h"\
+	"..\..\FL\fl_show_colormap.h"\
+	"..\..\FL\fl_single_window.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\fl_widget.h"\
+	"..\..\FL\fl_window.h"\
+	"..\..\FL\Xutf8.h"\
+	".\config.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Single_Window.cxx
+DEP_CPP_FL_SI=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl_export.h"\
+	"..\..\FL\fl_group.h"\
+	"..\..\FL\fl_single_window.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\FL\fl_widget.h"\
+	"..\..\FL\fl_window.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Slider.cxx
+DEP_CPP_FL_SL=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_draw.h"\
+	"..\..\FL\fl_export.h"\
+	"..\..\FL\fl_slider.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\fl_valuator.h"\
+	"..\..\FL\fl_widget.h"\
+	"..\..\FL\Xutf8.h"\
+	"..\..\src\flstring.h"\
+	".\config.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\fl_symbols.cxx
+DEP_CPP_FL_SY=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_draw.h"\
+	"..\..\FL\fl_export.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\math.h"\
+	"..\..\FL\Xutf8.h"\
+	"..\..\src\flstring.h"\
+	".\config.h"\
+	
+NODEP_CPP_FL_SY=\
+	"..\..\..\..\usr\include\math.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Tabs.cxx
+DEP_CPP_FL_TA=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_draw.h"\
+	"..\..\FL\fl_export.h"\
+	"..\..\FL\fl_group.h"\
+	"..\..\FL\fl_tabs.h"\
+	"..\..\FL\fl_tooltip.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\fl_widget.h"\
+	"..\..\FL\Xutf8.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Text_Buffer.cxx
+DEP_CPP_FL_TE=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_export.h"\
+	"..\..\FL\fl_text_buffer.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\Xutf8.h"\
+	"..\..\src\flstring.h"\
+	".\config.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Text_Display.cxx
+DEP_CPP_FL_TEX=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_draw.h"\
+	"..\..\FL\fl_export.h"\
+	"..\..\FL\fl_group.h"\
+	"..\..\FL\fl_scrollbar.h"\
+	"..\..\FL\fl_slider.h"\
+	"..\..\FL\fl_text_buffer.h"\
+	"..\..\FL\fl_text_display.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\fl_valuator.h"\
+	"..\..\FL\fl_widget.h"\
+	"..\..\FL\fl_window.h"\
+	"..\..\FL\Xutf8.h"\
+	"..\..\src\flstring.h"\
+	".\config.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Text_Editor.cxx
+DEP_CPP_FL_TEXT=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\fl_ask.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_draw.h"\
+	"..\..\FL\fl_export.h"\
+	"..\..\FL\fl_group.h"\
+	"..\..\FL\fl_scrollbar.h"\
+	"..\..\FL\fl_slider.h"\
+	"..\..\FL\fl_text_buffer.h"\
+	"..\..\FL\fl_text_display.h"\
+	"..\..\FL\fl_text_editor.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\fl_valuator.h"\
+	"..\..\FL\fl_widget.h"\
+	"..\..\FL\fl_window.h"\
+	"..\..\FL\Xutf8.h"\
+	"..\..\src\flstring.h"\
+	".\config.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Tile.cxx
+DEP_CPP_FL_TI=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_export.h"\
+	"..\..\FL\fl_group.h"\
+	"..\..\FL\fl_tile.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\fl_widget.h"\
+	"..\..\FL\fl_window.h"\
+	"..\..\FL\Xutf8.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Tiled_Image.cxx
+DEP_CPP_FL_TIL=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_draw.h"\
+	"..\..\FL\fl_export.h"\
+	"..\..\FL\fl_image.h"\
+	"..\..\FL\fl_tiled_image.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\Xutf8.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Tooltip.cxx
+DEP_CPP_FL_TO=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_draw.h"\
+	"..\..\FL\fl_export.h"\
+	"..\..\FL\fl_group.h"\
+	"..\..\FL\fl_menu_window.h"\
+	"..\..\FL\fl_single_window.h"\
+	"..\..\FL\fl_tooltip.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\fl_widget.h"\
+	"..\..\FL\fl_window.h"\
+	"..\..\FL\Xutf8.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\fl_utf.c
+DEP_CPP_FL_UT=\
+	"..\..\FL\fl_export.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\Xutf8.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\fl_utf8.cxx
+DEP_CPP_FL_UTF=\
+	"..\..\FL\filename.h"\
+	"..\..\FL\fl_export.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\Xutf8.h"\
+	".\config.h"\
+	
+NODEP_CPP_FL_UTF=\
+	"..\..\..\..\usr\include\dirent.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Valuator.cxx
+DEP_CPP_FL_VA=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_export.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\fl_valuator.h"\
+	"..\..\FL\fl_widget.h"\
+	"..\..\FL\math.h"\
+	"..\..\FL\Xutf8.h"\
+	"..\..\src\flstring.h"\
+	".\config.h"\
+	
+NODEP_CPP_FL_VA=\
+	"..\..\..\..\usr\include\math.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Value_Input.cxx
+DEP_CPP_FL_VAL=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_export.h"\
+	"..\..\FL\fl_group.h"\
+	"..\..\FL\fl_input.h"\
+	"..\..\FL\fl_input_.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\fl_valuator.h"\
+	"..\..\FL\fl_value_input.h"\
+	"..\..\FL\fl_widget.h"\
+	"..\..\FL\math.h"\
+	"..\..\FL\Xutf8.h"\
+	
+NODEP_CPP_FL_VAL=\
+	"..\..\..\..\usr\include\math.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Value_Output.cxx
+DEP_CPP_FL_VALU=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_draw.h"\
+	"..\..\FL\fl_export.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\fl_valuator.h"\
+	"..\..\FL\fl_value_output.h"\
+	"..\..\FL\fl_widget.h"\
+	"..\..\FL\Xutf8.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Value_Slider.cxx
+DEP_CPP_FL_VALUE=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_draw.h"\
+	"..\..\FL\fl_export.h"\
+	"..\..\FL\fl_slider.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\fl_valuator.h"\
+	"..\..\FL\fl_value_slider.h"\
+	"..\..\FL\fl_widget.h"\
+	"..\..\FL\Xutf8.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\fl_vertex.cxx
+DEP_CPP_FL_VE=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_draw.h"\
+	"..\..\FL\fl_export.h"\
+	"..\..\FL\fl_group.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\fl_widget.h"\
+	"..\..\FL\fl_window.h"\
+	"..\..\FL\mac.H"\
+	"..\..\FL\math.h"\
+	"..\..\FL\win32.h"\
+	"..\..\FL\x.h"\
+	"..\..\FL\Xutf8.h"\
+	".\config.h"\
+	
+NODEP_CPP_FL_VE=\
+	"..\..\..\..\usr\include\math.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_visual.cxx
+DEP_CPP_FL_VI=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_export.h"\
+	"..\..\FL\fl_group.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\fl_widget.h"\
+	"..\..\FL\fl_window.h"\
+	"..\..\FL\mac.H"\
+	"..\..\FL\win32.h"\
+	"..\..\FL\x.h"\
+	"..\..\FL\Xutf8.h"\
+	".\config.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Widget.cxx
+DEP_CPP_FL_WI=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_draw.h"\
+	"..\..\FL\fl_export.h"\
+	"..\..\FL\fl_group.h"\
+	"..\..\FL\fl_tooltip.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\fl_widget.h"\
+	"..\..\FL\Xutf8.h"\
+	"..\..\src\flstring.h"\
+	".\config.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Window.cxx
+DEP_CPP_FL_WIN=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_draw.h"\
+	"..\..\FL\fl_export.h"\
+	"..\..\FL\fl_group.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\fl_widget.h"\
+	"..\..\FL\fl_window.h"\
+	"..\..\FL\Xutf8.h"\
+	"..\..\src\flstring.h"\
+	".\config.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Window_fullscreen.cxx
+DEP_CPP_FL_WIND=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_export.h"\
+	"..\..\FL\fl_group.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\fl_widget.h"\
+	"..\..\FL\fl_window.h"\
+	"..\..\FL\mac.H"\
+	"..\..\FL\win32.h"\
+	"..\..\FL\x.h"\
+	"..\..\FL\Xutf8.h"\
+	".\config.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Window_hotspot.cxx
+DEP_CPP_FL_WINDO=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_export.h"\
+	"..\..\FL\fl_group.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\fl_widget.h"\
+	"..\..\FL\fl_window.h"\
+	"..\..\FL\mac.H"\
+	"..\..\FL\win32.h"\
+	"..\..\FL\x.h"\
+	"..\..\FL\Xutf8.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Window_iconize.cxx
+DEP_CPP_FL_WINDOW=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl_export.h"\
+	"..\..\FL\fl_group.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\FL\fl_widget.h"\
+	"..\..\FL\fl_window.h"\
+	"..\..\FL\mac.H"\
+	"..\..\FL\win32.h"\
+	"..\..\FL\x.h"\
+	"..\..\FL\Xutf8.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Wizard.cxx
+DEP_CPP_FL_WIZ=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl_draw.h"\
+	"..\..\FL\fl_export.h"\
+	"..\..\FL\fl_group.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\FL\fl_widget.h"\
+	"..\..\FL\fl_window.h"\
+	"..\..\FL\fl_wizard.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_x.cxx
+DEP_CPP_FL_X_=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_export.h"\
+	"..\..\FL\fl_group.h"\
+	"..\..\FL\fl_tooltip.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\fl_widget.h"\
+	"..\..\FL\fl_window.h"\
+	"..\..\FL\mac.H"\
+	"..\..\FL\win32.h"\
+	"..\..\FL\x.h"\
+	"..\..\FL\Xutf8.h"\
+	"..\..\src\flstring.h"\
+	".\config.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_XBM_Image.cxx
+DEP_CPP_FL_XB=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\fl_bitmap.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_export.h"\
+	"..\..\FL\fl_image.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\fl_xbm_image.h"\
+	"..\..\FL\Xutf8.h"\
+	"..\..\src\flstring.h"\
+	".\config.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_XPM_Image.cxx
+DEP_CPP_FL_XP=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_export.h"\
+	"..\..\FL\fl_image.h"\
+	"..\..\FL\fl_pixmap.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\fl_xpm_image.h"\
+	"..\..\FL\Xutf8.h"\
+	"..\..\src\flstring.h"\
+	".\config.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\flstring.c
+DEP_CPP_FLSTR=\
+	"..\..\FL\fl_export.h"\
+	"..\..\src\flstring.h"\
+	".\config.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\forms_bitmap.cxx
+DEP_CPP_FORMS=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\filename.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\fl_ask.h"\
+	"..\..\FL\fl_bitmap.h"\
+	"..\..\FL\fl_box.h"\
+	"..\..\FL\fl_browser.h"\
+	"..\..\FL\fl_browser_.h"\
+	"..\..\FL\fl_button.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_chart.h"\
+	"..\..\FL\fl_check_button.h"\
+	"..\..\FL\fl_choice.h"\
+	"..\..\FL\fl_clock.h"\
+	"..\..\FL\fl_counter.h"\
+	"..\..\FL\fl_dial.h"\
+	"..\..\FL\fl_double_window.h"\
+	"..\..\FL\fl_draw.h"\
+	"..\..\FL\fl_export.h"\
+	"..\..\FL\Fl_File_Browser.H"\
+	"..\..\FL\fl_file_chooser.h"\
+	"..\..\FL\fl_file_icon.h"\
+	"..\..\FL\fl_file_input.h"\
+	"..\..\FL\Fl_FormsBitmap.H"\
+	"..\..\FL\Fl_FormsPixmap.H"\
+	"..\..\FL\Fl_Free.H"\
+	"..\..\FL\fl_group.h"\
+	"..\..\FL\fl_image.h"\
+	"..\..\FL\fl_input.h"\
+	"..\..\FL\fl_input_.h"\
+	"..\..\FL\fl_light_button.h"\
+	"..\..\FL\fl_menu_.h"\
+	"..\..\FL\fl_menu_button.h"\
+	"..\..\FL\fl_menu_item.h"\
+	"..\..\FL\fl_pixmap.h"\
+	"..\..\FL\fl_positioner.h"\
+	"..\..\FL\fl_preferences.h"\
+	"..\..\FL\fl_return_button.h"\
+	"..\..\FL\fl_round_button.h"\
+	"..\..\FL\fl_scrollbar.h"\
+	"..\..\FL\fl_show_colormap.h"\
+	"..\..\FL\fl_slider.h"\
+	"..\..\FL\fl_tile.h"\
+	"..\..\FL\Fl_Timer.H"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\fl_valuator.h"\
+	"..\..\FL\fl_value_slider.h"\
+	"..\..\FL\fl_widget.h"\
+	"..\..\FL\fl_window.h"\
+	"..\..\FL\forms.h"\
+	"..\..\FL\Xutf8.h"\
+	
+NODEP_CPP_FORMS=\
+	"..\..\..\..\usr\include\dirent.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\forms_compatability.cxx
+DEP_CPP_FORMS_=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\filename.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\fl_ask.h"\
+	"..\..\FL\fl_bitmap.h"\
+	"..\..\FL\fl_box.h"\
+	"..\..\FL\fl_browser.h"\
+	"..\..\FL\fl_browser_.h"\
+	"..\..\FL\fl_button.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_chart.h"\
+	"..\..\FL\fl_check_button.h"\
+	"..\..\FL\fl_choice.h"\
+	"..\..\FL\fl_clock.h"\
+	"..\..\FL\fl_counter.h"\
+	"..\..\FL\fl_dial.h"\
+	"..\..\FL\fl_double_window.h"\
+	"..\..\FL\fl_draw.h"\
+	"..\..\FL\fl_export.h"\
+	"..\..\FL\Fl_File_Browser.H"\
+	"..\..\FL\fl_file_chooser.h"\
+	"..\..\FL\fl_file_icon.h"\
+	"..\..\FL\fl_file_input.h"\
+	"..\..\FL\Fl_FormsBitmap.H"\
+	"..\..\FL\Fl_FormsPixmap.H"\
+	"..\..\FL\Fl_Free.H"\
+	"..\..\FL\fl_group.h"\
+	"..\..\FL\fl_image.h"\
+	"..\..\FL\fl_input.h"\
+	"..\..\FL\fl_input_.h"\
+	"..\..\FL\fl_light_button.h"\
+	"..\..\FL\fl_menu_.h"\
+	"..\..\FL\fl_menu_button.h"\
+	"..\..\FL\fl_menu_item.h"\
+	"..\..\FL\fl_pixmap.h"\
+	"..\..\FL\fl_positioner.h"\
+	"..\..\FL\fl_preferences.h"\
+	"..\..\FL\fl_repeat_button.h"\
+	"..\..\FL\fl_return_button.h"\
+	"..\..\FL\fl_round_button.h"\
+	"..\..\FL\fl_scrollbar.h"\
+	"..\..\FL\fl_show_colormap.h"\
+	"..\..\FL\fl_slider.h"\
+	"..\..\FL\fl_tile.h"\
+	"..\..\FL\Fl_Timer.H"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\fl_valuator.h"\
+	"..\..\FL\fl_value_slider.h"\
+	"..\..\FL\fl_widget.h"\
+	"..\..\FL\fl_window.h"\
+	"..\..\FL\forms.h"\
+	"..\..\FL\Xutf8.h"\
+	
+NODEP_CPP_FORMS_=\
+	"..\..\..\..\usr\include\dirent.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\forms_free.cxx
+DEP_CPP_FORMS_F=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_export.h"\
+	"..\..\FL\Fl_Free.H"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\fl_widget.h"\
+	"..\..\FL\Xutf8.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\forms_fselect.cxx
+DEP_CPP_FORMS_FS=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\filename.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\fl_ask.h"\
+	"..\..\FL\fl_bitmap.h"\
+	"..\..\FL\fl_box.h"\
+	"..\..\FL\fl_browser.h"\
+	"..\..\FL\fl_browser_.h"\
+	"..\..\FL\fl_button.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_chart.h"\
+	"..\..\FL\fl_check_button.h"\
+	"..\..\FL\fl_choice.h"\
+	"..\..\FL\fl_clock.h"\
+	"..\..\FL\fl_counter.h"\
+	"..\..\FL\fl_dial.h"\
+	"..\..\FL\fl_double_window.h"\
+	"..\..\FL\fl_draw.h"\
+	"..\..\FL\fl_export.h"\
+	"..\..\FL\Fl_File_Browser.H"\
+	"..\..\FL\fl_file_chooser.h"\
+	"..\..\FL\fl_file_icon.h"\
+	"..\..\FL\fl_file_input.h"\
+	"..\..\FL\Fl_FormsBitmap.H"\
+	"..\..\FL\Fl_FormsPixmap.H"\
+	"..\..\FL\Fl_Free.H"\
+	"..\..\FL\fl_group.h"\
+	"..\..\FL\fl_image.h"\
+	"..\..\FL\fl_input.h"\
+	"..\..\FL\fl_input_.h"\
+	"..\..\FL\fl_light_button.h"\
+	"..\..\FL\fl_menu_.h"\
+	"..\..\FL\fl_menu_button.h"\
+	"..\..\FL\fl_menu_item.h"\
+	"..\..\FL\fl_pixmap.h"\
+	"..\..\FL\fl_positioner.h"\
+	"..\..\FL\fl_preferences.h"\
+	"..\..\FL\fl_return_button.h"\
+	"..\..\FL\fl_round_button.h"\
+	"..\..\FL\fl_scrollbar.h"\
+	"..\..\FL\fl_show_colormap.h"\
+	"..\..\FL\fl_slider.h"\
+	"..\..\FL\fl_tile.h"\
+	"..\..\FL\Fl_Timer.H"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\fl_valuator.h"\
+	"..\..\FL\fl_value_slider.h"\
+	"..\..\FL\fl_widget.h"\
+	"..\..\FL\fl_window.h"\
+	"..\..\FL\forms.h"\
+	"..\..\FL\Xutf8.h"\
+	"..\..\src\flstring.h"\
+	".\config.h"\
+	
+NODEP_CPP_FORMS_FS=\
+	"..\..\..\..\usr\include\dirent.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\forms_pixmap.cxx
+DEP_CPP_FORMS_P=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\filename.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\fl_ask.h"\
+	"..\..\FL\fl_bitmap.h"\
+	"..\..\FL\fl_box.h"\
+	"..\..\FL\fl_browser.h"\
+	"..\..\FL\fl_browser_.h"\
+	"..\..\FL\fl_button.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_chart.h"\
+	"..\..\FL\fl_check_button.h"\
+	"..\..\FL\fl_choice.h"\
+	"..\..\FL\fl_clock.h"\
+	"..\..\FL\fl_counter.h"\
+	"..\..\FL\fl_dial.h"\
+	"..\..\FL\fl_double_window.h"\
+	"..\..\FL\fl_draw.h"\
+	"..\..\FL\fl_export.h"\
+	"..\..\FL\Fl_File_Browser.H"\
+	"..\..\FL\fl_file_chooser.h"\
+	"..\..\FL\fl_file_icon.h"\
+	"..\..\FL\fl_file_input.h"\
+	"..\..\FL\Fl_FormsBitmap.H"\
+	"..\..\FL\Fl_FormsPixmap.H"\
+	"..\..\FL\Fl_Free.H"\
+	"..\..\FL\fl_group.h"\
+	"..\..\FL\fl_image.h"\
+	"..\..\FL\fl_input.h"\
+	"..\..\FL\fl_input_.h"\
+	"..\..\FL\fl_light_button.h"\
+	"..\..\FL\fl_menu_.h"\
+	"..\..\FL\fl_menu_button.h"\
+	"..\..\FL\fl_menu_item.h"\
+	"..\..\FL\fl_pixmap.h"\
+	"..\..\FL\fl_positioner.h"\
+	"..\..\FL\fl_preferences.h"\
+	"..\..\FL\fl_return_button.h"\
+	"..\..\FL\fl_round_button.h"\
+	"..\..\FL\fl_scrollbar.h"\
+	"..\..\FL\fl_show_colormap.h"\
+	"..\..\FL\fl_slider.h"\
+	"..\..\FL\fl_tile.h"\
+	"..\..\FL\Fl_Timer.H"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\fl_valuator.h"\
+	"..\..\FL\fl_value_slider.h"\
+	"..\..\FL\fl_widget.h"\
+	"..\..\FL\fl_window.h"\
+	"..\..\FL\forms.h"\
+	"..\..\FL\Xutf8.h"\
+	
+NODEP_CPP_FORMS_P=\
+	"..\..\..\..\usr\include\dirent.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\forms_timer.cxx
+DEP_CPP_FORMS_T=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_draw.h"\
+	"..\..\FL\fl_export.h"\
+	"..\..\FL\Fl_Timer.H"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\fl_widget.h"\
+	"..\..\FL\Xutf8.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\freeglut_geometry.cxx
+DEP_CPP_FREEG=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_export.h"\
+	"..\..\FL\Fl_Gl_Window.H"\
+	"..\..\FL\fl_group.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\fl_widget.h"\
+	"..\..\FL\fl_window.h"\
+	"..\..\FL\glut.h"\
+	"..\..\FL\math.h"\
+	"..\..\FL\Xutf8.h"\
+	
+NODEP_CPP_FREEG=\
+	"..\..\..\..\usr\include\math.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\freeglut_stroke_mono_roman.cxx
+DEP_CPP_FREEGL=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_export.h"\
+	"..\..\FL\Fl_Gl_Window.H"\
+	"..\..\FL\fl_group.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\fl_widget.h"\
+	"..\..\FL\fl_window.h"\
+	"..\..\FL\glut.h"\
+	"..\..\FL\Xutf8.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\freeglut_stroke_roman.cxx
+DEP_CPP_FREEGLU=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_export.h"\
+	"..\..\FL\Fl_Gl_Window.H"\
+	"..\..\FL\fl_group.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\fl_widget.h"\
+	"..\..\FL\fl_window.h"\
+	"..\..\FL\glut.h"\
+	"..\..\FL\Xutf8.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\freeglut_teapot.cxx
+DEP_CPP_FREEGLUT=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_export.h"\
+	"..\..\FL\Fl_Gl_Window.H"\
+	"..\..\FL\fl_group.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\fl_widget.h"\
+	"..\..\FL\fl_window.h"\
+	"..\..\FL\glut.h"\
+	"..\..\FL\Xutf8.h"\
+	"..\..\src\freeglut_teapot_data.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\gl_draw.cxx
+DEP_CPP_GL_DR=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_draw.h"\
+	"..\..\FL\fl_export.h"\
+	"..\..\FL\fl_group.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\fl_widget.h"\
+	"..\..\FL\fl_window.h"\
+	"..\..\FL\gl.h"\
+	"..\..\FL\mac.H"\
+	"..\..\FL\win32.h"\
+	"..\..\FL\x.h"\
+	"..\..\FL\Xutf8.h"\
+	"..\..\src\fl_font.h"\
+	"..\..\src\Fl_Gl_Choice.H"\
+	"..\..\src\flstring.h"\
+	".\config.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\gl_start.cxx
+DEP_CPP_GL_ST=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_draw.h"\
+	"..\..\FL\fl_export.h"\
+	"..\..\FL\fl_group.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\fl_widget.h"\
+	"..\..\FL\fl_window.h"\
+	"..\..\FL\gl.h"\
+	"..\..\FL\mac.H"\
+	"..\..\FL\win32.h"\
+	"..\..\FL\x.h"\
+	"..\..\FL\Xutf8.h"\
+	"..\..\src\Fl_Gl_Choice.H"\
+	".\config.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\glut_compatability.cxx
+DEP_CPP_GLUT_=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_export.h"\
+	"..\..\FL\Fl_Gl_Window.H"\
+	"..\..\FL\fl_group.h"\
+	"..\..\FL\fl_image.h"\
+	"..\..\FL\fl_menu_item.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\fl_widget.h"\
+	"..\..\FL\fl_window.h"\
+	"..\..\FL\glut.h"\
+	"..\..\FL\Xutf8.h"\
+	"..\..\src\flstring.h"\
+	".\config.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\glut_font.cxx
+DEP_CPP_GLUT_F=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_export.h"\
+	"..\..\FL\Fl_Gl_Window.H"\
+	"..\..\FL\fl_group.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\fl_widget.h"\
+	"..\..\FL\fl_window.h"\
+	"..\..\FL\glut.h"\
+	"..\..\FL\Xutf8.h"\
+	".\config.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\xutf8\is_right2left.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\xutf8\is_spacing.c
+DEP_CPP_IS_SP=\
+	"..\..\src\xutf8\headers\spacing.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\numericsort.c
+DEP_CPP_NUMER=\
+	"..\..\FL\filename.h"\
+	"..\..\FL\fl_export.h"\
+	".\config.h"\
+	
+NODEP_CPP_NUMER=\
+	"..\..\..\..\usr\include\dirent.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\scandir.c
+DEP_CPP_SCAND=\
+	"..\..\FL\filename.h"\
+	"..\..\FL\fl_export.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\Xutf8.h"\
+	"..\..\src\flstring.h"\
+	"..\..\src\scandir_win32.c"\
+	".\config.h"\
+	
+NODEP_CPP_SCAND=\
+	"..\..\..\..\usr\include\dirent.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\screen_xywh.cxx
+DEP_CPP_SCREE=\
+	"..\..\FL\enumerations.h"\
+	"..\..\FL\fl.h"\
+	"..\..\FL\Fl_Cairo.H"\
+	"..\..\FL\fl_export.h"\
+	"..\..\FL\fl_group.h"\
+	"..\..\fl\fl_types.h"\
+	"..\..\fl\fl_utf8.h"\
+	"..\..\FL\fl_widget.h"\
+	"..\..\FL\fl_window.h"\
+	"..\..\FL\mac.H"\
+	"..\..\FL\win32.h"\
+	"..\..\FL\x.h"\
+	"..\..\FL\Xutf8.h"\
+	".\config.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\vsnprintf.c
+DEP_CPP_VSNPR=\
+	"..\..\FL\fl_export.h"\
+	"..\..\src\flstring.h"\
+	".\config.h"\
+	
+# End Source File
+# End Target
+# End Project
diff --git a/visualc/fltkforms.dsp b/ide/visualc/fltkforms.dsp
index f291b353a..ca0511c12 100644
--- a/visualc/fltkforms.dsp
+++ b/ide/visualc/fltkforms.dsp
@@ -41,7 +41,7 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"
 # 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 ".." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Ot /Op /Ob2 /I "." /I "../.." /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
@@ -50,7 +50,7 @@ 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\fltkforms.lib"
 
 !ELSEIF  "$(CFG)" == "fltkforms - Win32 Debug"
 
@@ -65,7 +65,7 @@ LIB32=link.exe -lib
 # PROP Intermediate_Dir "Debug"
 # 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 ".." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /FR /YX /FD /c
+# ADD CPP /nologo /MDd /GX /Z7 /Od /I "." /I "../.." /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
@@ -73,7 +73,7 @@ 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\fltkformsd.lib"
 
 !ENDIF 
 
@@ -83,27 +83,27 @@ LIB32=link.exe -lib
 # Name "fltkforms - Win32 Debug"
 # Begin Source File
 
-SOURCE=..\src\forms_bitmap.cxx
+SOURCE=..\..\src\forms_bitmap.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\forms_compatability.cxx
+SOURCE=..\..\src\forms_compatability.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\forms_free.cxx
+SOURCE=..\..\src\forms_free.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\forms_fselect.cxx
+SOURCE=..\..\src\forms_fselect.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\forms_pixmap.cxx
+SOURCE=..\..\src\forms_pixmap.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\forms_timer.cxx
+SOURCE=..\..\src\forms_timer.cxx
 # End Source File
 # End Target
 # End Project
diff --git a/visualc/fltkgl.dsp b/ide/visualc/fltkgl.dsp
index d50ce1612..72892f20d 100644
--- a/visualc/fltkgl.dsp
+++ b/ide/visualc/fltkgl.dsp
@@ -41,7 +41,7 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"
 # 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 ".." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Ot /Op /Ob2 /I "." /I "../.." /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
@@ -50,7 +50,7 @@ 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\fltkgl.lib"
 
 !ELSEIF  "$(CFG)" == "fltkgl - Win32 Debug"
 
@@ -65,7 +65,7 @@ LIB32=link.exe -lib
 # PROP Intermediate_Dir "Debug"
 # 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 ".." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /FR /YX /FD /c
+# ADD CPP /nologo /MDd /GX /Z7 /Od /I "." /I "../.." /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
@@ -73,7 +73,7 @@ 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\fltkgld.lib"
 
 !ENDIF 
 
@@ -83,51 +83,51 @@ LIB32=link.exe -lib
 # Name "fltkgl - Win32 Debug"
 # Begin Source File
 
-SOURCE=..\src\Fl_Gl_Choice.cxx
+SOURCE=..\..\src\Fl_Gl_Choice.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\Fl_Gl_Overlay.cxx
+SOURCE=..\..\src\Fl_Gl_Overlay.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\Fl_Gl_Window.cxx
+SOURCE=..\..\src\Fl_Gl_Window.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\freeglut_geometry.cxx
+SOURCE=..\..\src\freeglut_geometry.cxx
 	
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\freeglut_stroke_mono_roman.cxx
+SOURCE=..\..\src\freeglut_stroke_mono_roman.cxx
 	
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\freeglut_stroke_roman.cxx
+SOURCE=..\..\src\freeglut_stroke_roman.cxx
 	
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\freeglut_teapot.cxx
+SOURCE=..\..\src\freeglut_teapot.cxx
 	
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\gl_draw.cxx
+SOURCE=..\..\src\gl_draw.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\gl_start.cxx
+SOURCE=..\..\src\gl_start.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\glut_compatability.cxx
+SOURCE=..\..\src\glut_compatability.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\glut_font.cxx
+SOURCE=..\..\src\glut_font.cxx
 # End Source File
 # End Target
 # End Project
diff --git a/visualc/fltkimages.dsp b/ide/visualc/fltkimages.dsp
index a75af672c..e2245e00c 100644
--- a/visualc/fltkimages.dsp
+++ b/ide/visualc/fltkimages.dsp
@@ -41,7 +41,7 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"
 # 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
+# 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
@@ -50,7 +50,7 @@ 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\fltkimages.lib"
 
 !ELSEIF  "$(CFG)" == "fltkimages - Win32 Debug"
 
@@ -65,7 +65,7 @@ LIB32=link.exe -lib
 # PROP Intermediate_Dir "Debug"
 # 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 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
@@ -73,7 +73,7 @@ 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\fltkimagesd.lib"
 
 !ENDIF 
 
@@ -83,35 +83,35 @@ LIB32=link.exe -lib
 # Name "fltkimages - Win32 Debug"
 # Begin Source File
 
-SOURCE=..\src\Fl_BMP_Image.cxx
+SOURCE=..\..\src\Fl_BMP_Image.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\Fl_File_Icon2.cxx
+SOURCE=..\..\src\Fl_File_Icon2.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\Fl_GIF_Image.cxx
+SOURCE=..\..\src\Fl_GIF_Image.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\Fl_Help_Dialog.cxx
+SOURCE=..\..\src\Fl_Help_Dialog.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\fl_images_core.cxx
+SOURCE=..\..\src\fl_images_core.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\Fl_JPEG_Image.cxx
+SOURCE=..\..\src\Fl_JPEG_Image.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\Fl_PNG_Image.cxx
+SOURCE=..\..\src\Fl_PNG_Image.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\Fl_PNM_Image.cxx
+SOURCE=..\..\src\Fl_PNM_Image.cxx
 # End Source File
 # End Target
 # End Project
diff --git a/visualc/fluid.dsp b/ide/visualc/fluid.dsp
index 5fa579bcd..c8f6d15f1 100644
--- a/visualc/fluid.dsp
+++ b/ide/visualc/fluid.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # 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 "../png" /I "../zlib" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Ot /Op /Ob2 /I "." /I "../.." /I "../../png" /I "../../zlib" /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 MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
@@ -54,7 +54,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 /machine:I386
-# ADD LINK32 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 /machine:I386 /nodefaultlib:"libcd" /nodefaultlib:"libcmt" /out:"../fluid/fluid.exe" /libpath:"..\lib"
+# ADD LINK32 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 /machine:I386 /nodefaultlib:"libcd" /nodefaultlib:"libcmt" /out:"../fluid/fluid.exe" /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:yes
 
 !ELSEIF  "$(CFG)" == "fluid - Win32 Debug"
@@ -71,7 +71,7 @@ LINK32=link.exe
 # 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
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I ".." /I "../png" /I "../zlib" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "../.." /I "../../png" /I "../../zlib" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -81,7 +81,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 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:"libc" /nodefaultlib:"libcd" /nodefaultlib:"libcmt" /nodefaultlib:"libcmtd" /out:"../fluid/fluidd.exe" /pdbtype:sept /libpath:"..\lib"
+# ADD LINK32 fltkd.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:"libc" /nodefaultlib:"libcd" /nodefaultlib:"libcmt" /nodefaultlib:"libcmtd" /out:"../fluid/fluidd.exe" /pdbtype:sept /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:no
 
 !ENDIF 
@@ -92,79 +92,79 @@ LINK32=link.exe
 # Name "fluid - Win32 Debug"
 # Begin Source File
 
-SOURCE=..\fluid\about_panel.cxx
+SOURCE=..\..\fluid\about_panel.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\fluid\align_widget.cxx
+SOURCE=..\..\fluid\align_widget.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\fluid\alignment_panel.cxx
+SOURCE=..\..\fluid\alignment_panel.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\fluid\code.cxx
+SOURCE=..\..\fluid\code.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\fluid\CodeEditor.cxx
+SOURCE=..\..\fluid\CodeEditor.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\fluid\factory.cxx
+SOURCE=..\..\fluid\factory.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\fluid\file.cxx
+SOURCE=..\..\fluid\file.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\fluid\Fl_Function_Type.cxx
+SOURCE=..\..\fluid\Fl_Function_Type.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\fluid\Fl_Group_Type.cxx
+SOURCE=..\..\fluid\Fl_Group_Type.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\fluid\Fl_Menu_Type.cxx
+SOURCE=..\..\fluid\Fl_Menu_Type.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\fluid\Fl_Type.cxx
+SOURCE=..\..\fluid\Fl_Type.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\fluid\Fl_Widget_Type.cxx
+SOURCE=..\..\fluid\Fl_Widget_Type.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\fluid\Fl_Window_Type.cxx
+SOURCE=..\..\fluid\Fl_Window_Type.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\fluid\fluid.cxx
+SOURCE=..\..\fluid\fluid.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\fluid\Fluid_Image.cxx
+SOURCE=..\..\fluid\Fluid_Image.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\fluid\function_panel.cxx
+SOURCE=..\..\fluid\function_panel.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\fluid\template_panel.cxx
+SOURCE=..\..\fluid\template_panel.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\fluid\undo.cxx
+SOURCE=..\..\fluid\undo.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\fluid\widget_panel.cxx
+SOURCE=..\..\fluid\widget_panel.cxx
 # End Source File
 # End Target
 # End Project
diff --git a/visualc/fonts.dsp b/ide/visualc/fonts.dsp
index e39231955..683497b19 100644
--- a/visualc/fonts.dsp
+++ b/ide/visualc/fonts.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I ".." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "../.." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,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 /machine:I386
-# ADD LINK32 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 /machine:I386 /nodefaultlib:"libcd" /out:"../test/fonts.exe" /libpath:"..\lib"
+# ADD LINK32 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 /machine:I386 /nodefaultlib:"libcd" /out:"../../test/fonts.exe" /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:yes
 
 !ELSEIF  "$(CFG)" == "fonts - Win32 Debug"
@@ -70,7 +70,7 @@ LINK32=link.exe
 # 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
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I ".." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "../.." /I "." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -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 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/fontsd.exe" /pdbtype:sept /libpath:"..\lib"
+# ADD LINK32 fltkd.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/fontsd.exe" /pdbtype:sept /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:no
 
 !ENDIF 
@@ -91,7 +91,7 @@ LINK32=link.exe
 # Name "fonts - Win32 Debug"
 # Begin Source File
 
-SOURCE=..\test\fonts.cxx
+SOURCE=..\..\test\fonts.cxx
 # End Source File
 # End Target
 # End Project
diff --git a/visualc/forms.dsp b/ide/visualc/forms.dsp
index cdb64ec12..9c55acf6a 100644
--- a/visualc/forms.dsp
+++ b/ide/visualc/forms.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I ".." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "../.." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,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 /machine:I386
-# ADD LINK32 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 /machine:I386 /nodefaultlib:"libcd" /out:"../test/forms.exe" /libpath:"..\lib"
+# ADD LINK32 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 /machine:I386 /nodefaultlib:"libcd" /out:"../../test/forms.exe" /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:yes
 
 !ELSEIF  "$(CFG)" == "forms - Win32 Debug"
@@ -70,7 +70,7 @@ LINK32=link.exe
 # 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
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I ".." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "../.." /I "." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -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 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 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 
@@ -91,7 +91,7 @@ LINK32=link.exe
 # Name "forms - Win32 Debug"
 # Begin Source File
 
-SOURCE=..\test\forms.cxx
+SOURCE=..\..\test\forms.cxx
 # End Source File
 # End Target
 # End Project
diff --git a/visualc/fractals.dsp b/ide/visualc/fractals.dsp
index a38b2a49f..a2c956e6a 100644
--- a/visualc/fractals.dsp
+++ b/ide/visualc/fractals.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I ".." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "../.." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,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 /machine:I386
-# ADD LINK32 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 /machine:I386 /nodefaultlib:"libcd" /out:"../test/fractals.exe" /libpath:"..\lib"
+# ADD LINK32 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 /machine:I386 /nodefaultlib:"libcd" /out:"../../test/fractals.exe" /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:yes
 
 !ELSEIF  "$(CFG)" == "fractals - Win32 Debug"
@@ -70,7 +70,7 @@ LINK32=link.exe
 # 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
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I ".." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "../.." /I "." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -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 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 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 
@@ -91,11 +91,11 @@ LINK32=link.exe
 # Name "fractals - Win32 Debug"
 # Begin Source File
 
-SOURCE=..\test\fractals.cxx
+SOURCE=..\..\test\fractals.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\test\fracviewer.cxx
+SOURCE=..\..\test\fracviewer.cxx
 # End Source File
 # End Target
 # End Project
diff --git a/visualc/fullscreen.dsp b/ide/visualc/fullscreen.dsp
index 56b08c58c..60219cdfa 100644
--- a/visualc/fullscreen.dsp
+++ b/ide/visualc/fullscreen.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I ".." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "../.." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,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 /machine:I386
-# ADD LINK32 opengl32.lib glu32.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 /machine:I386 /nodefaultlib:"libcd" /out:"../test/fullscreen.exe" /libpath:"..\lib"
+# ADD LINK32 opengl32.lib glu32.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 /machine:I386 /nodefaultlib:"libcd" /out:"../../test/fullscreen.exe" /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:yes
 
 !ELSEIF  "$(CFG)" == "fullscreen - Win32 Debug"
@@ -70,7 +70,7 @@ LINK32=link.exe
 # 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
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I ".." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "../.." /I "." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -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 opengl32.lib glu32.lib fltkd.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 opengl32.lib glu32.lib fltkd.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 
@@ -91,7 +91,7 @@ LINK32=link.exe
 # Name "fullscreen - Win32 Debug"
 # Begin Source File
 
-SOURCE=..\test\fullscreen.cxx
+SOURCE=..\..\test\fullscreen.cxx
 # End Source File
 # End Target
 # End Project
diff --git a/visualc/gl_overlay.dsp b/ide/visualc/gl_overlay.dsp
index 9022f6d03..00971f759 100644
--- a/visualc/gl_overlay.dsp
+++ b/ide/visualc/gl_overlay.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I ".." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "../.." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,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 /machine:I386
-# ADD LINK32 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 /machine:I386 /nodefaultlib:"libcd" /out:"../test/gl_overlay.exe" /libpath:"..\lib"
+# ADD LINK32 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 /machine:I386 /nodefaultlib:"libcd" /out:"../../test/gl_overlay.exe" /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:yes
 
 !ELSEIF  "$(CFG)" == "gl_overlay - Win32 Debug"
@@ -70,7 +70,7 @@ LINK32=link.exe
 # 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
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I ".." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "../.." /I "." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -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 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 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 
@@ -91,7 +91,7 @@ LINK32=link.exe
 # Name "gl_overlay - Win32 Debug"
 # Begin Source File
 
-SOURCE=..\test\gl_overlay.cxx
+SOURCE=..\..\test\gl_overlay.cxx
 # End Source File
 # End Target
 # End Project
diff --git a/visualc/glpuzzle.dsp b/ide/visualc/glpuzzle.dsp
index 02e12236c..9f43ea789 100644
--- a/visualc/glpuzzle.dsp
+++ b/ide/visualc/glpuzzle.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I ".." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "../.." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,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 /machine:I386
-# ADD LINK32 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 /machine:I386 /nodefaultlib:"libcd" /out:"../test/glpuzzle.exe" /libpath:"..\lib"
+# ADD LINK32 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 /machine:I386 /nodefaultlib:"libcd" /out:"../../test/glpuzzle.exe" /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:yes
 
 !ELSEIF  "$(CFG)" == "glpuzzle - Win32 Debug"
@@ -70,7 +70,7 @@ LINK32=link.exe
 # 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
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I ".." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "../.." /I "." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -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 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 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 
@@ -91,7 +91,7 @@ LINK32=link.exe
 # Name "glpuzzle - Win32 Debug"
 # Begin Source File
 
-SOURCE=..\test\glpuzzle.cxx
+SOURCE=..\..\test\glpuzzle.cxx
 # End Source File
 # End Target
 # End Project
diff --git a/visualc/hello.dsp b/ide/visualc/hello.dsp
index 891053567..9b569afb9 100644
--- a/visualc/hello.dsp
+++ b/ide/visualc/hello.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I ".." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "../.." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,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 /machine:I386
-# ADD LINK32 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 /machine:I386 /nodefaultlib:"libcd" /out:"../test/hello.exe" /libpath:"..\lib"
+# ADD LINK32 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 /machine:I386 /nodefaultlib:"libcd" /out:"../../test/hello.exe" /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:yes
 
 !ELSEIF  "$(CFG)" == "hello - Win32 Debug"
@@ -70,7 +70,7 @@ LINK32=link.exe
 # 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
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I ".." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "../.." /I "." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -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 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/hellod.exe" /pdbtype:sept /libpath:"..\lib"
+# ADD LINK32 fltkd.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/hellod.exe" /pdbtype:sept /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:no
 
 !ENDIF 
@@ -91,7 +91,7 @@ LINK32=link.exe
 # Name "hello - Win32 Debug"
 # Begin Source File
 
-SOURCE=..\test\hello.cxx
+SOURCE=..\..\test\hello.cxx
 # End Source File
 # End Target
 # End Project
diff --git a/visualc/help.dsp b/ide/visualc/help.dsp
index 969480ec4..71c95feb1 100644
--- a/visualc/help.dsp
+++ b/ide/visualc/help.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I ".." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "../.." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,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 /machine:I386
-# ADD LINK32 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 /machine:I386 /out:"../test/help.exe" /libpath:"..\lib"
+# ADD LINK32 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 /machine:I386 /out:"../../test/help.exe" /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:yes
 
 !ELSEIF  "$(CFG)" == "help - Win32 Debug"
@@ -70,7 +70,7 @@ LINK32=link.exe
 # 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
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I ".." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "../.." /I "." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -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 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 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 
@@ -91,7 +91,7 @@ LINK32=link.exe
 # Name "help - Win32 Debug"
 # Begin Source File
 
-SOURCE=..\test\help.cxx
+SOURCE=..\..\test\help.cxx
 # End Source File
 # End Target
 # End Project
diff --git a/visualc/iconize.dsp b/ide/visualc/iconize.dsp
index 3b5b42e78..75e64476a 100644
--- a/visualc/iconize.dsp
+++ b/ide/visualc/iconize.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I ".." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "../.." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,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 /machine:I386
-# ADD LINK32 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 /machine:I386 /nodefaultlib:"libcd" /out:"../test/iconize.exe" /libpath:"..\lib"
+# ADD LINK32 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 /machine:I386 /nodefaultlib:"libcd" /out:"../../test/iconize.exe" /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:yes
 
 !ELSEIF  "$(CFG)" == "iconize - Win32 Debug"
@@ -70,7 +70,7 @@ LINK32=link.exe
 # 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
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I ".." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "../.." /I "." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -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 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/iconized.exe" /pdbtype:sept /libpath:"..\lib"
+# ADD LINK32 fltkd.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/iconized.exe" /pdbtype:sept /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:no
 
 !ENDIF 
@@ -91,7 +91,7 @@ LINK32=link.exe
 # Name "iconize - Win32 Debug"
 # Begin Source File
 
-SOURCE=..\test\iconize.cxx
+SOURCE=..\..\test\iconize.cxx
 # End Source File
 # End Target
 # End Project
diff --git a/visualc/image.dsp b/ide/visualc/image.dsp
index c042f6f3c..8009df9ca 100644
--- a/visualc/image.dsp
+++ b/ide/visualc/image.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I ".." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "../.." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,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 /machine:I386
-# ADD LINK32 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 /machine:I386 /nodefaultlib:"libcd" /out:"../test/image.exe" /libpath:"..\lib"
+# ADD LINK32 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 /machine:I386 /nodefaultlib:"libcd" /out:"../../test/image.exe" /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:yes
 
 !ELSEIF  "$(CFG)" == "image - Win32 Debug"
@@ -70,7 +70,7 @@ LINK32=link.exe
 # 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
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I ".." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "../.." /I "." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -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 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/imaged.exe" /pdbtype:sept /libpath:"..\lib"
+# ADD LINK32 fltkd.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/imaged.exe" /pdbtype:sept /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:no
 
 !ENDIF 
@@ -91,7 +91,7 @@ LINK32=link.exe
 # Name "image - Win32 Debug"
 # Begin Source File
 
-SOURCE=..\test\image.cxx
+SOURCE=..\..\test\image.cxx
 # End Source File
 # End Target
 # End Project
diff --git a/visualc/inactive.dsp b/ide/visualc/inactive.dsp
index 605d2c172..650d9e737 100644
--- a/visualc/inactive.dsp
+++ b/ide/visualc/inactive.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I ".." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "../.." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,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 /machine:I386
-# ADD LINK32 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 /machine:I386 /nodefaultlib:"libcd" /out:"../test/inactive.exe" /libpath:"..\lib"
+# ADD LINK32 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 /machine:I386 /nodefaultlib:"libcd" /out:"../../test/inactive.exe" /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:yes
 
 !ELSEIF  "$(CFG)" == "inactive - Win32 Debug"
@@ -70,7 +70,7 @@ LINK32=link.exe
 # 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
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I ".." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "../.." /I "." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -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 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/inactived.exe" /pdbtype:sept /libpath:"..\lib"
+# ADD LINK32 fltkd.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/inactived.exe" /pdbtype:sept /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:no
 
 !ENDIF 
@@ -91,33 +91,33 @@ LINK32=link.exe
 # Name "inactive - Win32 Debug"
 # Begin Source File
 
-SOURCE=..\test\inactive.cxx
+SOURCE=..\..\test\inactive.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\test\inactive.fl
+SOURCE=..\..\test\inactive.fl
 
 !IF  "$(CFG)" == "inactive - Win32 Release"
 
 # Begin Custom Build - Create .cxx and .h file with fluidd
-InputPath=..\test\inactive.fl
+InputPath=..\..\test\inactive.fl
 
-"..\test\inactive.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cd ..\test 
+"..\..\test\inactive.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	cd ..\..\test 
 	..\fluid\fluid -c inactive.fl 
-	cd ..\visualc 
+	cd ..\ide\visualc 
 	
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "inactive - Win32 Debug"
 
 # Begin Custom Build - Create .cxx and .h file with fluidd
-InputPath=..\test\inactive.fl
+InputPath=..\..\test\inactive.fl
 
-"..\test\inactive.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cd ..\test 
+"..\..\test\inactive.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	cd ..\..\test 
 	..\fluid\fluidd -c inactive.fl 
-	cd ..\visualc 
+	cd ..\ide\visualc 
 	
 # End Custom Build
 
diff --git a/visualc/input.dsp b/ide/visualc/input.dsp
index 6f1748be8..082698522 100644
--- a/visualc/input.dsp
+++ b/ide/visualc/input.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I ".." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "../.." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,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 /machine:I386
-# ADD LINK32 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 /machine:I386 /nodefaultlib:"libcd" /out:"../test/input.exe" /libpath:"..\lib"
+# ADD LINK32 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 /machine:I386 /nodefaultlib:"libcd" /out:"../../test/input.exe" /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:yes
 
 !ELSEIF  "$(CFG)" == "input - Win32 Debug"
@@ -70,7 +70,7 @@ LINK32=link.exe
 # 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
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I ".." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "../.." /I "." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -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 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/inputd.exe" /pdbtype:sept /libpath:"..\lib"
+# ADD LINK32 fltkd.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/inputd.exe" /pdbtype:sept /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:no
 
 !ENDIF 
@@ -91,7 +91,7 @@ LINK32=link.exe
 # Name "input - Win32 Debug"
 # Begin Source File
 
-SOURCE=..\test\input.cxx
+SOURCE=..\..\test\input.cxx
 # End Source File
 # End Target
 # End Project
diff --git a/visualc/input_choice.dsp b/ide/visualc/input_choice.dsp
index 52c55a6f2..59f336e36 100644
--- a/visualc/input_choice.dsp
+++ b/ide/visualc/input_choice.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I ".." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "../.." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,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 /machine:I386
-# ADD LINK32 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 /machine:I386 /nodefaultlib:"libcd" /out:"../test/input_choice.exe" /libpath:"..\lib"
+# ADD LINK32 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 /machine:I386 /nodefaultlib:"libcd" /out:"../../test/input_choice.exe" /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:yes
 
 !ELSEIF  "$(CFG)" == "input_choice - Win32 Debug"
@@ -70,7 +70,7 @@ LINK32=link.exe
 # 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
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I ".." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "../.." /I "." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -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 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/input_choiced.exe" /pdbtype:sept /libpath:"..\lib"
+# ADD LINK32 fltkd.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/input_choiced.exe" /pdbtype:sept /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:no
 
 !ENDIF 
@@ -91,7 +91,7 @@ LINK32=link.exe
 # Name "input_choice - Win32 Debug"
 # Begin Source File
 
-SOURCE=..\test\input_choice.cxx
+SOURCE=..\..\test\input_choice.cxx
 # End Source File
 # End Target
 # End Project
diff --git a/visualc/jpeg.dsp b/ide/visualc/jpeg.dsp
index f8cf58b60..cb5542b03 100644
--- a/visualc/jpeg.dsp
+++ b/ide/visualc/jpeg.dsp
@@ -41,7 +41,7 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /Ot /Op /Ob2 /I "../visualc" /I "../zlib" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /Ot /Op /Ob2 /I "." /I "../../zlib" /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
@@ -50,7 +50,7 @@ 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\fltkjpeg.lib"
 
 !ELSEIF  "$(CFG)" == "jpeg - Win32 Debug"
 
@@ -65,7 +65,7 @@ LIB32=link.exe -lib
 # PROP Intermediate_Dir "Debug"
 # 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 /Zi /Od /I "../visualc" /I "../zlib" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /GX /Zi /Od /I "." /I "../../zlib" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE RSC /l 0x409
 # ADD RSC /l 0x409
 BSC32=bscmake.exe
@@ -73,7 +73,7 @@ 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\fltkjpegd.lib"
 
 !ENDIF 
 
@@ -83,175 +83,175 @@ LIB32=link.exe -lib
 # Name "jpeg - Win32 Debug"
 # Begin Source File
 
-SOURCE=..\jpeg\jcapimin.c
+SOURCE=..\..\jpeg\jcapimin.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\jpeg\jcapistd.c
+SOURCE=..\..\jpeg\jcapistd.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\jpeg\jccoefct.c
+SOURCE=..\..\jpeg\jccoefct.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\jpeg\jccolor.c
+SOURCE=..\..\jpeg\jccolor.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\jpeg\jcdctmgr.c
+SOURCE=..\..\jpeg\jcdctmgr.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\jpeg\jchuff.c
+SOURCE=..\..\jpeg\jchuff.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\jpeg\jcinit.c
+SOURCE=..\..\jpeg\jcinit.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\jpeg\jcmainct.c
+SOURCE=..\..\jpeg\jcmainct.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\jpeg\jcmarker.c
+SOURCE=..\..\jpeg\jcmarker.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\jpeg\jcmaster.c
+SOURCE=..\..\jpeg\jcmaster.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\jpeg\jcomapi.c
+SOURCE=..\..\jpeg\jcomapi.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\jpeg\jcparam.c
+SOURCE=..\..\jpeg\jcparam.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\jpeg\jcphuff.c
+SOURCE=..\..\jpeg\jcphuff.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\jpeg\jcprepct.c
+SOURCE=..\..\jpeg\jcprepct.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\jpeg\jcsample.c
+SOURCE=..\..\jpeg\jcsample.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\jpeg\jctrans.c
+SOURCE=..\..\jpeg\jctrans.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\jpeg\jdapimin.c
+SOURCE=..\..\jpeg\jdapimin.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\jpeg\jdapistd.c
+SOURCE=..\..\jpeg\jdapistd.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\jpeg\jdatadst.c
+SOURCE=..\..\jpeg\jdatadst.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\jpeg\jdatasrc.c
+SOURCE=..\..\jpeg\jdatasrc.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\jpeg\jdcoefct.c
+SOURCE=..\..\jpeg\jdcoefct.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\jpeg\jdcolor.c
+SOURCE=..\..\jpeg\jdcolor.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\jpeg\jddctmgr.c
+SOURCE=..\..\jpeg\jddctmgr.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\jpeg\jdhuff.c
+SOURCE=..\..\jpeg\jdhuff.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\jpeg\jdinput.c
+SOURCE=..\..\jpeg\jdinput.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\jpeg\jdmainct.c
+SOURCE=..\..\jpeg\jdmainct.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\jpeg\jdmarker.c
+SOURCE=..\..\jpeg\jdmarker.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\jpeg\jdmaster.c
+SOURCE=..\..\jpeg\jdmaster.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\jpeg\jdmerge.c
+SOURCE=..\..\jpeg\jdmerge.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\jpeg\jdphuff.c
+SOURCE=..\..\jpeg\jdphuff.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\jpeg\jdpostct.c
+SOURCE=..\..\jpeg\jdpostct.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\jpeg\jdsample.c
+SOURCE=..\..\jpeg\jdsample.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\jpeg\jdtrans.c
+SOURCE=..\..\jpeg\jdtrans.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\jpeg\jerror.c
+SOURCE=..\..\jpeg\jerror.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\jpeg\jfdctflt.c
+SOURCE=..\..\jpeg\jfdctflt.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\jpeg\jfdctfst.c
+SOURCE=..\..\jpeg\jfdctfst.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\jpeg\jfdctint.c
+SOURCE=..\..\jpeg\jfdctint.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\jpeg\jidctflt.c
+SOURCE=..\..\jpeg\jidctflt.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\jpeg\jidctfst.c
+SOURCE=..\..\jpeg\jidctfst.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\jpeg\jidctint.c
+SOURCE=..\..\jpeg\jidctint.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\jpeg\jidctred.c
+SOURCE=..\..\jpeg\jidctred.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\jpeg\jmemmgr.c
+SOURCE=..\..\jpeg\jmemmgr.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\jpeg\jmemnobs.c
+SOURCE=..\..\jpeg\jmemnobs.c
 
 !IF  "$(CFG)" == "jpeg - Win32 Release"
 
@@ -266,15 +266,15 @@ SOURCE=..\jpeg\jmemnobs.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\jpeg\jquant1.c
+SOURCE=..\..\jpeg\jquant1.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\jpeg\jquant2.c
+SOURCE=..\..\jpeg\jquant2.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\jpeg\jutils.c
+SOURCE=..\..\jpeg\jutils.c
 # End Source File
 # End Target
 # End Project
diff --git a/visualc/keyboard.dsp b/ide/visualc/keyboard.dsp
index ca436d32f..25ad13b43 100644
--- a/visualc/keyboard.dsp
+++ b/ide/visualc/keyboard.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I ".." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "../.." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,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 /machine:I386
-# ADD LINK32 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 /machine:I386 /nodefaultlib:"libcd" /out:"../test/keyboard.exe" /libpath:"..\lib"
+# ADD LINK32 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 /machine:I386 /nodefaultlib:"libcd" /out:"../../test/keyboard.exe" /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:yes
 
 !ELSEIF  "$(CFG)" == "keyboard - Win32 Debug"
@@ -70,7 +70,7 @@ LINK32=link.exe
 # 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
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I ".." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "../.." /I "." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -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 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/keyboardd.exe" /pdbtype:sept /libpath:"..\lib"
+# ADD LINK32 fltkd.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/keyboardd.exe" /pdbtype:sept /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:no
 
 !ENDIF 
@@ -91,37 +91,37 @@ LINK32=link.exe
 # Name "keyboard - Win32 Debug"
 # Begin Source File
 
-SOURCE=..\test\keyboard.cxx
+SOURCE=..\..\test\keyboard.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\test\keyboard_ui.cxx
+SOURCE=..\..\test\keyboard_ui.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\test\keyboard_ui.fl
+SOURCE=..\..\test\keyboard_ui.fl
 
 !IF  "$(CFG)" == "keyboard - Win32 Release"
 
 # Begin Custom Build - Create .cxx and .h file with fluid
-InputPath=..\test\keyboard_ui.fl
+InputPath=..\..\test\keyboard_ui.fl
 
-"..\test\keyboard_ui.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cd ..\test 
+"..\..\test\keyboard_ui.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	cd ..\..\test 
 	..\fluid\fluid -c keyboard_ui.fl 
-	cd ..\visualc 
+	cd ..\ide\visualc 
 	
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "keyboard - Win32 Debug"
 
 # Begin Custom Build - Create .cxx and .h file with fluidd
-InputPath=..\test\keyboard_ui.fl
+InputPath=..\..\test\keyboard_ui.fl
 
-"..\test\keyboard_ui.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cd ..\test 
+"..\..\test\keyboard_ui.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	cd ..\..\test 
 	..\fluid\fluidd -c keyboard_ui.fl 
-	cd ..\visualc 
+	cd ..\ide\visualc 
 	
 # End Custom Build
 
diff --git a/visualc/label.dsp b/ide/visualc/label.dsp
index 306dfee22..b568f92ba 100644
--- a/visualc/label.dsp
+++ b/ide/visualc/label.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I ".." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "../.." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,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 /machine:I386
-# ADD LINK32 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 /machine:I386 /nodefaultlib:"libcd" /out:"../test/label.exe" /libpath:"..\lib"
+# ADD LINK32 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 /machine:I386 /nodefaultlib:"libcd" /out:"../../test/label.exe" /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:yes
 
 !ELSEIF  "$(CFG)" == "label - Win32 Debug"
@@ -70,7 +70,7 @@ LINK32=link.exe
 # 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
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I ".." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "../.." /I "." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -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 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 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 
@@ -91,7 +91,7 @@ LINK32=link.exe
 # Name "label - Win32 Debug"
 # Begin Source File
 
-SOURCE=..\test\label.cxx
+SOURCE=..\..\test\label.cxx
 # End Source File
 # End Target
 # End Project
diff --git a/visualc/libpng.dsp b/ide/visualc/libpng.dsp
index 1d4ea9787..e80f3b196 100644
--- a/visualc/libpng.dsp
+++ b/ide/visualc/libpng.dsp
@@ -41,7 +41,7 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /Ot /Op /Ob2  /I "../visualc" /I "../zlib" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /Ot /Op /Ob2 /I "." /I "../../zlib" /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
@@ -50,7 +50,7 @@ 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\fltkpng.lib"
 
 !ELSEIF  "$(CFG)" == "libpng - Win32 Debug"
 
@@ -65,7 +65,7 @@ LIB32=link.exe -lib
 # PROP Intermediate_Dir "Debug"
 # 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 /Zi /Od /I "../visualc" /I "../zlib" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /GX /Zi /Od /I "." /I "../../zlib" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE RSC /l 0x409
 # ADD RSC /l 0x409
 BSC32=bscmake.exe
@@ -73,7 +73,7 @@ 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\fltkpngd.lib"
 
 !ENDIF 
 
@@ -83,63 +83,63 @@ LIB32=link.exe -lib
 # Name "libpng - Win32 Debug"
 # Begin Source File
 
-SOURCE=..\png\png.c
+SOURCE=..\..\png\png.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\png\pngerror.c
+SOURCE=..\..\png\pngerror.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\png\pngget.c
+SOURCE=..\..\png\pngget.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\png\pngmem.c
+SOURCE=..\..\png\pngmem.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\png\pngpread.c
+SOURCE=..\..\png\pngpread.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\png\pngread.c
+SOURCE=..\..\png\pngread.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\png\pngrio.c
+SOURCE=..\..\png\pngrio.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\png\pngrtran.c
+SOURCE=..\..\png\pngrtran.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\png\pngrutil.c
+SOURCE=..\..\png\pngrutil.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\png\pngset.c
+SOURCE=..\..\png\pngset.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\png\pngtrans.c
+SOURCE=..\..\png\pngtrans.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\png\pngwio.c
+SOURCE=..\..\png\pngwio.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\png\pngwrite.c
+SOURCE=..\..\png\pngwrite.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\png\pngwtran.c
+SOURCE=..\..\png\pngwtran.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\png\pngwutil.c
+SOURCE=..\..\png\pngwutil.c
 # End Source File
 # End Target
 # End Project
diff --git a/visualc/line_style.dsp b/ide/visualc/line_style.dsp
index ad10d082e..b780140f6 100644
--- a/visualc/line_style.dsp
+++ b/ide/visualc/line_style.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I ".." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "../.." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,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 /machine:I386
-# ADD LINK32 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 /machine:I386 /nodefaultlib:"libcd" /out:"../test/line_style.exe" /libpath:"..\lib"
+# ADD LINK32 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 /machine:I386 /nodefaultlib:"libcd" /out:"../../test/line_style.exe" /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:yes
 
 !ELSEIF  "$(CFG)" == "line_style - Win32 Debug"
@@ -70,7 +70,7 @@ LINK32=link.exe
 # 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
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I ".." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "../.." /I "." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -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 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/line_styled.exe" /pdbtype:sept /libpath:"..\lib"
+# ADD LINK32 fltkd.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/line_styled.exe" /pdbtype:sept /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:no
 
 !ENDIF 
@@ -91,7 +91,7 @@ LINK32=link.exe
 # Name "line_style - Win32 Debug"
 # Begin Source File
 
-SOURCE=..\test\line_style.cxx
+SOURCE=..\..\test\line_style.cxx
 # End Source File
 # End Target
 # End Project
diff --git a/visualc/mandelbrot.dsp b/ide/visualc/mandelbrot.dsp
index f76acb85a..e976848e9 100644
--- a/visualc/mandelbrot.dsp
+++ b/ide/visualc/mandelbrot.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I ".." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "../.." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,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 /machine:I386
-# ADD LINK32 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 /machine:I386 /nodefaultlib:"libcd" /out:"../test/mandelbrot.exe" /libpath:"..\lib"
+# ADD LINK32 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 /machine:I386 /nodefaultlib:"libcd" /out:"../../test/mandelbrot.exe" /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:yes
 
 !ELSEIF  "$(CFG)" == "mandelbrot - Win32 Debug"
@@ -70,7 +70,7 @@ LINK32=link.exe
 # 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
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I ".." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "../.." /I "." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -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 glu32.lib opengl32.lib fltkd.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/mandelbrotd.exe" /pdbtype:sept /libpath:"..\lib"
+# ADD LINK32 glu32.lib opengl32.lib fltkd.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/mandelbrotd.exe" /pdbtype:sept /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:no
 
 !ENDIF 
@@ -91,37 +91,37 @@ LINK32=link.exe
 # Name "mandelbrot - Win32 Debug"
 # Begin Source File
 
-SOURCE=..\test\mandelbrot.cxx
+SOURCE=..\..\test\mandelbrot.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\test\mandelbrot_ui.cxx
+SOURCE=..\..\test\mandelbrot_ui.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\test\mandelbrot_ui.fl
+SOURCE=..\..\test\mandelbrot_ui.fl
 
 !IF  "$(CFG)" == "mandelbrot - Win32 Release"
 
 # Begin Custom Build - Create .cxx and .h file with fluid
-InputPath=..\test\mandelbrot_ui.fl
+InputPath=..\..\test\mandelbrot_ui.fl
 
-"../test/mandelbrot_ui.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cd ..\test 
+"../../test/mandelbrot_ui.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	cd ..\..\test 
 	..\fluid\fluid -c mandelbrot_ui.fl 
-	cd ..\visualc 
+	cd ..\ide\visualc 
 	
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "mandelbrot - Win32 Debug"
 
 # Begin Custom Build - Create .cxx and .h file with fluidd
-InputPath=..\test\mandelbrot_ui.fl
+InputPath=..\..\test\mandelbrot_ui.fl
 
-"../test/mandelbrot_ui.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cd ..\test 
+"../../test/mandelbrot_ui.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	cd ..\..\test 
 	..\fluid\fluidd -c mandelbrot_ui.fl 
-	cd ..\visualc 
+	cd ..\ide\visualc 
 	
 # End Custom Build
 
diff --git a/visualc/menubar.dsp b/ide/visualc/menubar.dsp
index 13f6f1f7f..93310a989 100644
--- a/visualc/menubar.dsp
+++ b/ide/visualc/menubar.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I ".." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "../.." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,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 /machine:I386
-# ADD LINK32 comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /machine:I386 /nodefaultlib:"libcd" /out:"../test/menubar.exe" /libpath:"..\lib"
+# ADD LINK32 comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /machine:I386 /nodefaultlib:"libcd" /out:"../../test/menubar.exe" /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:yes
 
 !ELSEIF  "$(CFG)" == "menubar - Win32 Debug"
@@ -70,7 +70,7 @@ LINK32=link.exe
 # 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
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I ".." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "../.." /I "." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -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 comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /debug /machine:I386 /nodefaultlib:"libcd" /out:"../test/menubard.exe" /pdbtype:sept /libpath:"..\lib"
+# ADD LINK32 fltkd.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/menubard.exe" /pdbtype:sept /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:no
 
 !ENDIF 
@@ -91,7 +91,7 @@ LINK32=link.exe
 # Name "menubar - Win32 Debug"
 # Begin Source File
 
-SOURCE=..\test\menubar.cxx
+SOURCE=..\..\test\menubar.cxx
 # End Source File
 # End Target
 # End Project
diff --git a/visualc/message.dsp b/ide/visualc/message.dsp
index 54cb1670f..8844eba81 100644
--- a/visualc/message.dsp
+++ b/ide/visualc/message.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I ".." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "../.." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,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 /machine:I386
-# ADD LINK32 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 /machine:I386 /nodefaultlib:"libcd" /out:"../test/message.exe" /libpath:"..\lib"
+# ADD LINK32 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 /machine:I386 /nodefaultlib:"libcd" /out:"../../test/message.exe" /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:yes
 
 !ELSEIF  "$(CFG)" == "message - Win32 Debug"
@@ -70,7 +70,7 @@ LINK32=link.exe
 # 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
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I ".." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "../.." /I "." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -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 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/messaged.exe" /pdbtype:sept /libpath:"..\lib"
+# ADD LINK32 fltkd.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/messaged.exe" /pdbtype:sept /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:no
 
 !ENDIF 
@@ -91,7 +91,7 @@ LINK32=link.exe
 # Name "message - Win32 Debug"
 # Begin Source File
 
-SOURCE=..\test\message.cxx
+SOURCE=..\..\test\message.cxx
 # End Source File
 # End Target
 # End Project
diff --git a/visualc/minimum.dsp b/ide/visualc/minimum.dsp
index c860d799f..ee0ed390c 100644
--- a/visualc/minimum.dsp
+++ b/ide/visualc/minimum.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I ".." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "../.." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,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 /machine:I386
-# ADD LINK32 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 /machine:I386 /nodefaultlib:"libcd" /out:"../test/minimum.exe" /libpath:"..\lib"
+# ADD LINK32 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 /machine:I386 /nodefaultlib:"libcd" /out:"../../test/minimum.exe" /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:yes
 
 !ELSEIF  "$(CFG)" == "minimum - Win32 Debug"
@@ -70,7 +70,7 @@ LINK32=link.exe
 # 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
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I ".." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "../.." /I "." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -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 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/minimumd.exe" /pdbtype:sept /libpath:"..\lib"
+# ADD LINK32 fltkd.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/minimumd.exe" /pdbtype:sept /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:no
 
 !ENDIF 
@@ -91,7 +91,7 @@ LINK32=link.exe
 # Name "minimum - Win32 Debug"
 # Begin Source File
 
-SOURCE=..\test\minimum.cxx
+SOURCE=..\..\test\minimum.cxx
 # End Source File
 # End Target
 # End Project
diff --git a/visualc/navigation.dsp b/ide/visualc/navigation.dsp
index fe79e74f8..dcde5fc04 100644
--- a/visualc/navigation.dsp
+++ b/ide/visualc/navigation.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I ".." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "../.." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,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 /machine:I386
-# ADD LINK32 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 /machine:I386 /nodefaultlib:"libcd" /out:"../test/navigation.exe" /libpath:"..\lib"
+# ADD LINK32 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 /machine:I386 /nodefaultlib:"libcd" /out:"../../test/navigation.exe" /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:yes
 
 !ELSEIF  "$(CFG)" == "navigation - Win32 Debug"
@@ -70,7 +70,7 @@ LINK32=link.exe
 # 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
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I ".." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "../.." /I "." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -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 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/navigationd.exe" /pdbtype:sept /libpath:"..\lib"
+# ADD LINK32 fltkd.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/navigationd.exe" /pdbtype:sept /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:no
 
 !ENDIF 
@@ -91,7 +91,7 @@ LINK32=link.exe
 # Name "navigation - Win32 Debug"
 # Begin Source File
 
-SOURCE=..\test\navigation.cxx
+SOURCE=..\..\test\navigation.cxx
 # End Source File
 # End Target
 # End Project
diff --git a/visualc/output.dsp b/ide/visualc/output.dsp
index bf3c009ee..83e69e772 100644
--- a/visualc/output.dsp
+++ b/ide/visualc/output.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I ".." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "../.." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,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 /machine:I386
-# ADD LINK32 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 /machine:I386 /nodefaultlib:"libcd" /out:"../test/output.exe" /libpath:"..\lib"
+# ADD LINK32 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 /machine:I386 /nodefaultlib:"libcd" /out:"../../test/output.exe" /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:yes
 
 !ELSEIF  "$(CFG)" == "output - Win32 Debug"
@@ -70,7 +70,7 @@ LINK32=link.exe
 # 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
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I ".." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "../.." /I "." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -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 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 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 
@@ -91,7 +91,7 @@ LINK32=link.exe
 # Name "output - Win32 Debug"
 # Begin Source File
 
-SOURCE=..\test\output.cxx
+SOURCE=..\..\test\output.cxx
 # End Source File
 # End Target
 # End Project
diff --git a/visualc/overlay.dsp b/ide/visualc/overlay.dsp
index 56bdb5927..7f5b1470c 100644
--- a/visualc/overlay.dsp
+++ b/ide/visualc/overlay.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I ".." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "../.." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,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 /machine:I386
-# ADD LINK32 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 /machine:I386 /nodefaultlib:"libcd" /out:"../test/overlay.exe" /libpath:"..\lib"
+# ADD LINK32 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 /machine:I386 /nodefaultlib:"libcd" /out:"../../test/overlay.exe" /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:yes
 
 !ELSEIF  "$(CFG)" == "overlay - Win32 Debug"
@@ -70,7 +70,7 @@ LINK32=link.exe
 # 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
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I ".." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "../.." /I "." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -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 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/overlayd.exe" /pdbtype:sept /libpath:"..\lib"
+# ADD LINK32 fltkd.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/overlayd.exe" /pdbtype:sept /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:no
 
 !ENDIF 
@@ -91,7 +91,7 @@ LINK32=link.exe
 # Name "overlay - Win32 Debug"
 # Begin Source File
 
-SOURCE=..\test\overlay.cxx
+SOURCE=..\..\test\overlay.cxx
 # End Source File
 # End Target
 # End Project
diff --git a/visualc/pack.dsp b/ide/visualc/pack.dsp
index f7f089a0a..4213dbc23 100644
--- a/visualc/pack.dsp
+++ b/ide/visualc/pack.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I ".." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "../.." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,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 /machine:I386
-# ADD LINK32 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 /machine:I386 /nodefaultlib:"libcd" /out:"../test/pack.exe" /libpath:"..\lib"
+# ADD LINK32 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 /machine:I386 /nodefaultlib:"libcd" /out:"../../test/pack.exe" /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:yes
 
 !ELSEIF  "$(CFG)" == "pack - Win32 Debug"
@@ -70,7 +70,7 @@ LINK32=link.exe
 # 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
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I ".." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "../.." /I "." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -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 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/packd.exe" /pdbtype:sept /libpath:"..\lib"
+# ADD LINK32 fltkd.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/packd.exe" /pdbtype:sept /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:no
 
 !ENDIF 
@@ -91,7 +91,7 @@ LINK32=link.exe
 # Name "pack - Win32 Debug"
 # Begin Source File
 
-SOURCE=..\test\pack.cxx
+SOURCE=..\..\test\pack.cxx
 # End Source File
 # End Target
 # End Project
diff --git a/visualc/pixmap.dsp b/ide/visualc/pixmap.dsp
index da65673ae..0d9fb0fd0 100644
--- a/visualc/pixmap.dsp
+++ b/ide/visualc/pixmap.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I ".." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "../.." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,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 /machine:I386
-# ADD LINK32 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 /machine:I386 /nodefaultlib:"libcd" /out:"../test/pixmap.exe" /libpath:"..\lib"
+# ADD LINK32 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 /machine:I386 /nodefaultlib:"libcd" /out:"../../test/pixmap.exe" /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:yes
 
 !ELSEIF  "$(CFG)" == "pixmap - Win32 Debug"
@@ -70,7 +70,7 @@ LINK32=link.exe
 # 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
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I ".." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "../.." /I "." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -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 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/pixmapd.exe" /pdbtype:sept /libpath:"..\lib"
+# ADD LINK32 fltkd.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/pixmapd.exe" /pdbtype:sept /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:no
 
 !ENDIF 
@@ -91,7 +91,7 @@ LINK32=link.exe
 # Name "pixmap - Win32 Debug"
 # Begin Source File
 
-SOURCE=..\test\pixmap.cxx
+SOURCE=..\..\test\pixmap.cxx
 # End Source File
 # End Target
 # End Project
diff --git a/visualc/pixmap_browser.dsp b/ide/visualc/pixmap_browser.dsp
index da071d6ef..48f078410 100644
--- a/visualc/pixmap_browser.dsp
+++ b/ide/visualc/pixmap_browser.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I ".." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "../.." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,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 /machine:I386
-# ADD LINK32 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 /machine:I386 /nodefaultlib:"libcd" /nodefaultlib:"libcmt" /out:"../test/pixmap_browser.exe" /libpath:"..\lib"
+# ADD LINK32 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 /machine:I386 /nodefaultlib:"libcd" /nodefaultlib:"libcmt" /out:"../../test/pixmap_browser.exe" /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:yes
 
 !ELSEIF  "$(CFG)" == "pixmap_browser - Win32 Debug"
@@ -70,7 +70,7 @@ LINK32=link.exe
 # 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
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I ".." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "../.." /I "." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -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 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:"libc" /nodefaultlib:"libcd" /nodefaultlib:"libcmt" /nodefaultlib:"libcmtd" /out:"../test/pixmap_browserd.exe" /pdbtype:sept /libpath:"..\lib"
+# ADD LINK32 fltkd.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:"libc" /nodefaultlib:"libcd" /nodefaultlib:"libcmt" /nodefaultlib:"libcmtd" /out:"../../test/pixmap_browserd.exe" /pdbtype:sept /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:no
 
 !ENDIF 
@@ -91,7 +91,7 @@ LINK32=link.exe
 # Name "pixmap_browser - Win32 Debug"
 # Begin Source File
 
-SOURCE=..\test\pixmap_browser.cxx
+SOURCE=..\..\test\pixmap_browser.cxx
 # End Source File
 # End Target
 # End Project
diff --git a/visualc/preferences.dsp b/ide/visualc/preferences.dsp
index 90c012c37..b75d3e499 100644
--- a/visualc/preferences.dsp
+++ b/ide/visualc/preferences.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I ".." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "../.." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,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 /machine:I386
-# ADD LINK32 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 /machine:I386 /nodefaultlib:"libcd" /out:"../test/preferences.exe" /libpath:"..\lib"
+# ADD LINK32 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 /machine:I386 /nodefaultlib:"libcd" /out:"../../test/preferences.exe" /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:yes
 
 !ELSEIF  "$(CFG)" == "preferences - Win32 Debug"
@@ -70,7 +70,7 @@ LINK32=link.exe
 # 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
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I ".." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "../.." /I "." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -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 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/preferencesd.exe" /pdbtype:sept /libpath:"..\lib"
+# ADD LINK32 fltkd.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/preferencesd.exe" /pdbtype:sept /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:no
 
 !ENDIF 
@@ -91,33 +91,33 @@ LINK32=link.exe
 # Name "preferences - Win32 Debug"
 # Begin Source File
 
-SOURCE=..\test\preferences.cxx
+SOURCE=..\..\test\preferences.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\test\preferences.fl
+SOURCE=..\..\test\preferences.fl
 
 !IF  "$(CFG)" == "preferences - Win32 Release"
 
 # Begin Custom Build - Create .cxx and .h file with fluid
-InputPath=..\test\preferences.fl
+InputPath=..\..\test\preferences.fl
 
-"..\test\preferences.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cd ..\test 
+"..\..\test\preferences.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	cd ..\..\test 
 	..\fluid\fluid -c preferences.fl 
-	cd ..\visualc 
+	cd ..\ide\visualc 
 	
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "preferences - Win32 Debug"
 
 # Begin Custom Build - Create .cxx and .h file with fluidd
-InputPath=..\test\preferences.fl
+InputPath=..\..\test\preferences.fl
 
-"..\test\preferences.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cd ..\test 
+"..\..\test\preferences.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	cd ..\..\test 
 	..\fluid\fluidd -c preferences.fl 
-	cd ..\visualc 
+	cd ..\ide\visualc 
 	
 # End Custom Build
 
diff --git a/visualc/radio.dsp b/ide/visualc/radio.dsp
index 521e1a250..28c2c2cb8 100644
--- a/visualc/radio.dsp
+++ b/ide/visualc/radio.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I ".." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "../.." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,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 /machine:I386
-# ADD LINK32 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 /machine:I386 /nodefaultlib:"libcd" /out:"../test/radio.exe" /libpath:"..\lib"
+# ADD LINK32 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 /machine:I386 /nodefaultlib:"libcd" /out:"../../test/radio.exe" /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:yes
 
 !ELSEIF  "$(CFG)" == "radio - Win32 Debug"
@@ -70,7 +70,7 @@ LINK32=link.exe
 # 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
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I ".." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "../.." /I "." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -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 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/radiod.exe" /pdbtype:sept /libpath:"..\lib"
+# ADD LINK32 fltkd.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/radiod.exe" /pdbtype:sept /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:no
 
 !ENDIF 
@@ -91,33 +91,33 @@ LINK32=link.exe
 # Name "radio - Win32 Debug"
 # Begin Source File
 
-SOURCE=..\test\radio.cxx
+SOURCE=..\..\test\radio.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\test\radio.fl
+SOURCE=..\..\test\radio.fl
 
 !IF  "$(CFG)" == "radio - Win32 Release"
 
 # Begin Custom Build - Create .cxx and .h file with fluid
-InputPath=..\test\radio.fl
+InputPath=..\..\test\radio.fl
 
-"../test/radio.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cd ..\test 
+"../../test/radio.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	cd ..\..\test 
 	..\fluid\fluid -c radio.fl 
-	cd ..\visualc 
+	cd ..\ide\visualc 
 	
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "radio - Win32 Debug"
 
 # Begin Custom Build - Create .cxx and .h file with fluidd
-InputPath=..\test\radio.fl
+InputPath=..\..\test\radio.fl
 
-"../test/radio.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cd ..\test 
+"../../test/radio.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	cd ..\..\test 
 	..\fluid\fluidd -c radio.fl 
-	cd ..\visualc 
+	cd ..\ide\visualc 
 	
 # End Custom Build
 
diff --git a/visualc/resize.dsp b/ide/visualc/resize.dsp
index d044e6a83..97142769d 100644
--- a/visualc/resize.dsp
+++ b/ide/visualc/resize.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I ".." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "../.." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,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 /machine:I386
-# ADD LINK32 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 /machine:I386 /nodefaultlib:"libcd" /out:"../test/resize.exe" /libpath:"..\lib"
+# ADD LINK32 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 /machine:I386 /nodefaultlib:"libcd" /out:"../../test/resize.exe" /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:yes
 
 !ELSEIF  "$(CFG)" == "resize - Win32 Debug"
@@ -70,7 +70,7 @@ LINK32=link.exe
 # 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
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I ".." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "../.." /I "." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -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 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/resized.exe" /pdbtype:sept /libpath:"..\lib"
+# ADD LINK32 fltkd.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/resized.exe" /pdbtype:sept /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:no
 
 !ENDIF 
@@ -91,33 +91,33 @@ LINK32=link.exe
 # Name "resize - Win32 Debug"
 # Begin Source File
 
-SOURCE=..\test\resize.cxx
+SOURCE=..\..\test\resize.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\test\resize.fl
+SOURCE=..\..\test\resize.fl
 
 !IF  "$(CFG)" == "resize - Win32 Release"
 
 # Begin Custom Build - Create .cxx and .h file with fluid
-InputPath=..\test\resize.fl
+InputPath=..\..\test\resize.fl
 
-"../test/resize.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cd ..\test 
+"../../test/resize.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	cd ..\..\test 
 	..\fluid\fluid -c resize.fl 
-	cd ..\visualc 
+	cd ..\ide\visualc 
 	
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "resize - Win32 Debug"
 
 # Begin Custom Build - Create .cxx and .h file with fluidd
-InputPath=..\test\resize.fl
+InputPath=..\..\test\resize.fl
 
-"../test/resize.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cd ..\test 
+"../../test/resize.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	cd ..\..\test 
 	..\fluid\fluidd -c resize.fl 
-	cd ..\visualc 
+	cd ..\ide\visualc 
 	
 # End Custom Build
 
diff --git a/visualc/resizebox.dsp b/ide/visualc/resizebox.dsp
index 4989d4d1e..072226c55 100644
--- a/visualc/resizebox.dsp
+++ b/ide/visualc/resizebox.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I ".." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "../.." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,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 /machine:I386
-# ADD LINK32 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 /machine:I386 /nodefaultlib:"libcd" /out:"../test/resizebox.exe" /libpath:"..\lib"
+# ADD LINK32 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 /machine:I386 /nodefaultlib:"libcd" /out:"../../test/resizebox.exe" /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:yes
 
 !ELSEIF  "$(CFG)" == "resizebox - Win32 Debug"
@@ -70,7 +70,7 @@ LINK32=link.exe
 # 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
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I ".." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "../.." /I "." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -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 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/resizeboxd.exe" /pdbtype:sept /libpath:"..\lib"
+# ADD LINK32 fltkd.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/resizeboxd.exe" /pdbtype:sept /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:no
 
 !ENDIF 
@@ -91,7 +91,7 @@ LINK32=link.exe
 # Name "resizebox - Win32 Debug"
 # Begin Source File
 
-SOURCE=..\test\resizebox.cxx
+SOURCE=..\..\test\resizebox.cxx
 # End Source File
 # End Target
 # End Project
diff --git a/visualc/scroll.dsp b/ide/visualc/scroll.dsp
index b80411748..6d1052c02 100644
--- a/visualc/scroll.dsp
+++ b/ide/visualc/scroll.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I ".." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "../.." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,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 /machine:I386
-# ADD LINK32 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 /machine:I386 /nodefaultlib:"libcd" /out:"../test/scroll.exe" /libpath:"..\lib"
+# ADD LINK32 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 /machine:I386 /nodefaultlib:"libcd" /out:"../../test/scroll.exe" /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:yes
 
 !ELSEIF  "$(CFG)" == "scroll - Win32 Debug"
@@ -70,7 +70,7 @@ LINK32=link.exe
 # 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
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I ".." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "../.." /I "." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -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 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/scrolld.exe" /pdbtype:sept /libpath:"..\lib"
+# ADD LINK32 fltkd.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/scrolld.exe" /pdbtype:sept /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:no
 
 !ENDIF 
@@ -91,7 +91,7 @@ LINK32=link.exe
 # Name "scroll - Win32 Debug"
 # Begin Source File
 
-SOURCE=..\test\scroll.cxx
+SOURCE=..\..\test\scroll.cxx
 # End Source File
 # End Target
 # End Project
diff --git a/visualc/shape.dsp b/ide/visualc/shape.dsp
index d90b18f07..e0f6629b9 100644
--- a/visualc/shape.dsp
+++ b/ide/visualc/shape.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I ".." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "../.." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,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 /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 /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../test/shape.exe" /libpath:"..\lib"
+# 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 /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/shape.exe" /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:yes
 
 !ELSEIF  "$(CFG)" == "shape - Win32 Debug"
@@ -70,7 +70,7 @@ LINK32=link.exe
 # 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
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I ".." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "../.." /I "." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -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 opengl32.lib fltkd.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 opengl32.lib fltkd.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 
@@ -91,7 +91,7 @@ LINK32=link.exe
 # Name "shape - Win32 Debug"
 # Begin Source File
 
-SOURCE=..\test\shape.cxx
+SOURCE=..\..\test\shape.cxx
 # End Source File
 # End Target
 # End Project
diff --git a/visualc/subwindow.dsp b/ide/visualc/subwindow.dsp
index bbeb9a5b1..d531e1834 100644
--- a/visualc/subwindow.dsp
+++ b/ide/visualc/subwindow.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I ".." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "../.." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,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 /machine:I386
-# ADD LINK32 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 /machine:I386 /nodefaultlib:"libcd" /out:"../test/subwindow.exe" /libpath:"..\lib"
+# ADD LINK32 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 /machine:I386 /nodefaultlib:"libcd" /out:"../../test/subwindow.exe" /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:yes
 
 !ELSEIF  "$(CFG)" == "subwindow - Win32 Debug"
@@ -70,7 +70,7 @@ LINK32=link.exe
 # 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
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I ".." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "../.." /I "." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -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 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/subwindowd.exe" /pdbtype:sept /libpath:"..\lib"
+# ADD LINK32 fltkd.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/subwindowd.exe" /pdbtype:sept /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:no
 
 !ENDIF 
@@ -91,7 +91,7 @@ LINK32=link.exe
 # Name "subwindow - Win32 Debug"
 # Begin Source File
 
-SOURCE=..\test\subwindow.cxx
+SOURCE=..\..\test\subwindow.cxx
 # End Source File
 # End Target
 # End Project
diff --git a/visualc/sudoku.dsp b/ide/visualc/sudoku.dsp
index 0f626fe18..df57ce929 100644
--- a/visualc/sudoku.dsp
+++ b/ide/visualc/sudoku.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I ".." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "../.." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,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 /machine:I386
-# ADD LINK32 winmm.lib fltk.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 /machine:I386 /nodefaultlib:"libcd" /out:"../test/sudoku.exe" /libpath:"..\lib"
+# ADD LINK32 winmm.lib fltk.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 /machine:I386 /nodefaultlib:"libcd" /out:"../../test/sudoku.exe" /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:yes
 
 !ELSEIF  "$(CFG)" == "sudoku - Win32 Debug"
@@ -70,7 +70,7 @@ LINK32=link.exe
 # 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
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I ".." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "../.." /I "." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -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 winmm.lib fltkd.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 winmm.lib fltkd.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 
@@ -91,15 +91,15 @@ LINK32=link.exe
 # Name "sudoku - Win32 Debug"
 # Begin Source File
 
-SOURCE=..\test\sudoku.cxx
+SOURCE=..\..\test\sudoku.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\test\sudoku.ico
+SOURCE=..\..\test\sudoku.ico
 # End Source File
 # Begin Source File
 
-SOURCE=..\test\sudoku.rc
+SOURCE=..\..\test\sudoku.rc
 # End Source File
 # End Target
 # End Project
diff --git a/visualc/symbols.dsp b/ide/visualc/symbols.dsp
index 6329afe19..89eb730d9 100644
--- a/visualc/symbols.dsp
+++ b/ide/visualc/symbols.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I ".." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "../.." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,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 /machine:I386
-# ADD LINK32 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 /machine:I386 /nodefaultlib:"libcd" /out:"../test/symbols.exe" /libpath:"..\lib"
+# ADD LINK32 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 /machine:I386 /nodefaultlib:"libcd" /out:"../../test/symbols.exe" /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:yes
 
 !ELSEIF  "$(CFG)" == "symbols - Win32 Debug"
@@ -70,7 +70,7 @@ LINK32=link.exe
 # 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
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I ".." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "../.." /I "." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -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 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/symbolsd.exe" /pdbtype:sept /libpath:"..\lib"
+# ADD LINK32 fltkd.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/symbolsd.exe" /pdbtype:sept /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:no
 
 !ENDIF 
@@ -91,7 +91,7 @@ LINK32=link.exe
 # Name "symbols - Win32 Debug"
 # Begin Source File
 
-SOURCE=..\test\symbols.cxx
+SOURCE=..\..\test\symbols.cxx
 # End Source File
 # End Target
 # End Project
diff --git a/visualc/tabs.dsp b/ide/visualc/tabs.dsp
index c407cdc5b..7d0326ef5 100644
--- a/visualc/tabs.dsp
+++ b/ide/visualc/tabs.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I ".." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "../.." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,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 /machine:I386
-# ADD LINK32 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 /machine:I386 /nodefaultlib:"libcd" /out:"../test/tabs.exe" /libpath:"..\lib"
+# ADD LINK32 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 /machine:I386 /nodefaultlib:"libcd" /out:"../../test/tabs.exe" /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:yes
 
 !ELSEIF  "$(CFG)" == "tabs - Win32 Debug"
@@ -70,7 +70,7 @@ LINK32=link.exe
 # 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
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I ".." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "../.." /I "." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -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 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/tabsd.exe" /pdbtype:sept /libpath:"..\lib"
+# ADD LINK32 fltkd.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/tabsd.exe" /pdbtype:sept /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:no
 
 !ENDIF 
@@ -91,33 +91,33 @@ LINK32=link.exe
 # Name "tabs - Win32 Debug"
 # Begin Source File
 
-SOURCE=..\test\tabs.cxx
+SOURCE=..\..\test\tabs.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\test\tabs.fl
+SOURCE=..\..\test\tabs.fl
 
 !IF  "$(CFG)" == "tabs - Win32 Release"
 
 # Begin Custom Build - Create .cxx and .h file with fluid
-InputPath=..\test\tabs.fl
+InputPath=..\..\test\tabs.fl
 
-"../test/tabs.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cd ..\test 
+"../../test/tabs.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	cd ..\..\test 
 	..\fluid\fluid -c tabs.fl 
-	cd ..\visualc 
+	cd ..\ide\visualc 
 	
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "tabs - Win32 Debug"
 
 # Begin Custom Build - Create .cxx and .h file with fluidd
-InputPath=..\test\tabs.fl
+InputPath=..\..\test\tabs.fl
 
-"../test/tabs.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cd ..\test 
+"../../test/tabs.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	cd ..\..\test 
 	..\fluid\fluidd -c tabs.fl 
-	cd ..\visualc 
+	cd ..\ide\visualc 
 	
 # End Custom Build
 
diff --git a/visualc/threads.dsp b/ide/visualc/threads.dsp
index e88f31d1d..b13f9eea8 100644
--- a/visualc/threads.dsp
+++ b/ide/visualc/threads.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I ".." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "../.." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,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 /machine:I386
-# ADD LINK32 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 /machine:I386 /nodefaultlib:"libcd" /out:"../test/threads.exe" /libpath:"..\lib"
+# ADD LINK32 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 /machine:I386 /nodefaultlib:"libcd" /out:"../../test/threads.exe" /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:yes
 
 !ELSEIF  "$(CFG)" == "threads - Win32 Debug"
@@ -70,7 +70,7 @@ LINK32=link.exe
 # 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
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I ".." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "../.." /I "." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -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 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/threadsd.exe" /pdbtype:sept /libpath:"..\lib"
+# ADD LINK32 fltkd.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/threadsd.exe" /pdbtype:sept /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:no
 
 !ENDIF 
@@ -91,7 +91,7 @@ LINK32=link.exe
 # Name "threads - Win32 Debug"
 # Begin Source File
 
-SOURCE=..\test\threads.cxx
+SOURCE=..\..\test\threads.cxx
 # End Source File
 # End Target
 # End Project
diff --git a/visualc/tile.dsp b/ide/visualc/tile.dsp
index e8d7a18be..7249b80b8 100644
--- a/visualc/tile.dsp
+++ b/ide/visualc/tile.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I ".." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "../.." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,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 /machine:I386
-# ADD LINK32 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 /machine:I386 /nodefaultlib:"libcd" /out:"../test/tile.exe" /libpath:"..\lib"
+# ADD LINK32 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 /machine:I386 /nodefaultlib:"libcd" /out:"../../test/tile.exe" /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:yes
 
 !ELSEIF  "$(CFG)" == "tile - Win32 Debug"
@@ -70,7 +70,7 @@ LINK32=link.exe
 # 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
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I ".." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "../.." /I "." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -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 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.exe" /pdbtype:sept /libpath:"..\lib"
+# ADD LINK32 fltkd.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.exe" /pdbtype:sept /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:no
 
 !ENDIF 
@@ -91,7 +91,7 @@ LINK32=link.exe
 # Name "tile - Win32 Debug"
 # Begin Source File
 
-SOURCE=..\test\tile.cxx
+SOURCE=..\..\test\tile.cxx
 # End Source File
 # End Target
 # End Project
diff --git a/visualc/tiled_image.dsp b/ide/visualc/tiled_image.dsp
index d9aed4453..bf5649fa3 100644
--- a/visualc/tiled_image.dsp
+++ b/ide/visualc/tiled_image.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I ".." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "../.." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,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 /machine:I386
-# ADD LINK32 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 /machine:I386 /nodefaultlib:"libcd" /out:"../test/tiled_image.exe" /libpath:"..\lib"
+# ADD LINK32 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 /machine:I386 /nodefaultlib:"libcd" /out:"../../test/tiled_image.exe" /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:yes
 
 !ELSEIF  "$(CFG)" == "tiled_image - Win32 Debug"
@@ -70,7 +70,7 @@ LINK32=link.exe
 # 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
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I ".." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "../.." /I "." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -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 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 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 
@@ -91,7 +91,7 @@ LINK32=link.exe
 # Name "tiled_image - Win32 Debug"
 # Begin Source File
 
-SOURCE=..\test\tiled_image.cxx
+SOURCE=..\..\test\tiled_image.cxx
 # End Source File
 # End Target
 # End Project
diff --git a/visualc/utf8.dsp b/ide/visualc/utf8.dsp
index 39bdb73e3..75ce1ae0d 100644
--- a/visualc/utf8.dsp
+++ b/ide/visualc/utf8.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I ".." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "../.." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,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 /machine:I386
-# ADD LINK32 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 /machine:I386 /nodefaultlib:"libcd" /out:"../test/utf8.exe" /libpath:"..\lib"
+# ADD LINK32 fltk.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 /machine:I386 /nodefaultlib:"libcd" /out:"../../test/utf8.exe" /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:yes
 
 !ELSEIF  "$(CFG)" == "utf8 - Win32 Debug"
@@ -70,7 +70,7 @@ LINK32=link.exe
 # 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
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I ".." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "../.." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -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 imm32.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/utf8d.exe" /pdbtype:sept /libpath:"..\lib"
+# ADD LINK32 fltkd.lib imm32.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/utf8d.exe" /pdbtype:sept /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:no
 
 !ENDIF 
@@ -91,7 +91,7 @@ LINK32=link.exe
 # Name "utf8 - Win32 Debug"
 # Begin Source File
 
-SOURCE=..\test\utf8.cxx
+SOURCE=..\..\test\utf8.cxx
 # End Source File
 # End Target
 # End Project
diff --git a/visualc/valuators.dsp b/ide/visualc/valuators.dsp
index 25b5a1ec2..ddfdbf846 100644
--- a/visualc/valuators.dsp
+++ b/ide/visualc/valuators.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I ".." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "../.." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,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 /machine:I386
-# ADD LINK32 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 /machine:I386 /nodefaultlib:"libcd" /out:"../test/valuators.exe" /libpath:"..\lib"
+# ADD LINK32 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 /machine:I386 /nodefaultlib:"libcd" /out:"../../test/valuators.exe" /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:yes
 
 !ELSEIF  "$(CFG)" == "valuators - Win32 Debug"
@@ -70,7 +70,7 @@ LINK32=link.exe
 # 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
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I ".." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "../.." /I "." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -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 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/valuatorsd.exe" /pdbtype:sept /libpath:"..\lib"
+# ADD LINK32 fltkd.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/valuatorsd.exe" /pdbtype:sept /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:no
 
 !ENDIF 
@@ -91,33 +91,33 @@ LINK32=link.exe
 # Name "valuators - Win32 Debug"
 # Begin Source File
 
-SOURCE=..\test\valuators.cxx
+SOURCE=..\..\test\valuators.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\test\valuators.fl
+SOURCE=..\..\test\valuators.fl
 
 !IF  "$(CFG)" == "valuators - Win32 Release"
 
 # Begin Custom Build - Create .cxx and .h file with fluid
-InputPath=..\test\valuators.fl
+InputPath=..\..\test\valuators.fl
 
-"../test/valuators.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cd ..\test 
+"../../test/valuators.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	cd ..\..\test 
 	..\fluid\fluid -c valuators.fl 
-	cd ..\visualc 
+	cd ..\ide\visualc 
 	
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "valuators - Win32 Debug"
 
 # Begin Custom Build - Create .cxx and .h file with fluidd
-InputPath=..\test\valuators.fl
+InputPath=..\..\test\valuators.fl
 
-"../test/valuators.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cd ..\test 
+"../../test/valuators.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	cd ..\..\test 
 	..\fluid\fluidd -c valuators.fl 
-	cd ..\visualc 
+	cd ..\ide\visualc 
 	
 # End Custom Build
 
diff --git a/visualc/zlib.dsp b/ide/visualc/zlib.dsp
index 33b3447de..6ede20539 100644
--- a/visualc/zlib.dsp
+++ b/ide/visualc/zlib.dsp
@@ -41,7 +41,7 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"
 # 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 "../visualc" /I "../zlib" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Ot /Op /Ob2 /I "." /I "../../zlib" /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
@@ -65,7 +65,7 @@ LIB32=link.exe -lib
 # PROP Intermediate_Dir "Debug"
 # 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 /Zi /Od /I "../visualc" /I "../zlib" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /GX /Zi /Od /I "." /I "../zlib" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
 # ADD BASE RSC /l 0x409
 # ADD RSC /l 0x409
 BSC32=bscmake.exe
@@ -83,47 +83,47 @@ LIB32=link.exe -lib
 # Name "zlib - Win32 Debug"
 # Begin Source File
 
-SOURCE=..\zlib\adler32.c
+SOURCE=..\..\zlib\adler32.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\zlib\compress.c
+SOURCE=..\..\zlib\compress.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\zlib\crc32.c
+SOURCE=..\..\zlib\crc32.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\zlib\deflate.c
+SOURCE=..\..\zlib\deflate.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\zlib\gzio.c
+SOURCE=..\..\zlib\gzio.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\zlib\inffast.c
+SOURCE=..\..\zlib\inffast.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\zlib\inflate.c
+SOURCE=..\..\zlib\inflate.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\zlib\inftrees.c
+SOURCE=..\..\zlib\inftrees.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\zlib\trees.c
+SOURCE=..\..\zlib\trees.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\zlib\uncompr.c
+SOURCE=..\..\zlib\uncompr.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\zlib\zutil.c
+SOURCE=..\..\zlib\zutil.c
 # End Source File
 # End Target
 # End Project
diff --git a/visualc/fltkdll.dsp b/visualc/fltkdll.dsp
deleted file mode 100644
index bb64f805d..000000000
--- a/visualc/fltkdll.dsp
+++ /dev/null
@@ -1,2806 +0,0 @@
-# Microsoft Developer Studio Project File - Name="fltkdll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=fltkdll - 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 "fltkdll.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 "fltkdll.mak" CFG="fltkdll - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "fltkdll - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "fltkdll - 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)" == "fltkdll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "fltkdll0"
-# PROP BASE Intermediate_Dir "fltkdll0"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../test"
-# PROP Intermediate_Dir "fltkdll"
-# 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 "." /I ".." /I "..\zlib" /I "..\png" /I "..\jpeg" /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:"fltkdll.pdb" /machine:I386 /out:"fltkdll.dll"
-# SUBTRACT LINK32 /pdb:none
-
-!ELSEIF  "$(CFG)" == "fltkdll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "fltkdll1"
-# PROP BASE Intermediate_Dir "fltkdll1"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../test"
-# PROP Intermediate_Dir "fltkdlld"
-# 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:"fltkdlld.pdb" /debug /machine:I386 /out:"fltkdlld.dll" /pdbtype:sept
-# SUBTRACT LINK32 /pdb:none /incremental:no
-
-!ENDIF 
-
-# Begin Target
-
-# Name "fltkdll - Win32 Release"
-# Name "fltkdll - Win32 Debug"
-# Begin Source File
-
-SOURCE=..\src\xutf8\case.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\filename_absolute.cxx
-DEP_CPP_FILEN=\
-	"..\fl\filename.h"\
-	"..\fl\fl_export.h"\
-	"..\src\flstring.h"\
-	".\config.h"\
-	
-NODEP_CPP_FILEN=\
-	"..\..\..\..\..\usr\include\dirent.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\filename_expand.cxx
-DEP_CPP_FILENA=\
-	"..\fl\filename.h"\
-	"..\fl\fl_export.h"\
-	"..\src\flstring.h"\
-	".\config.h"\
-	
-NODEP_CPP_FILENA=\
-	"..\..\..\..\..\usr\include\dirent.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\filename_ext.cxx
-DEP_CPP_FILENAM=\
-	"..\fl\filename.h"\
-	"..\fl\fl_export.h"\
-	
-NODEP_CPP_FILENAM=\
-	"..\..\..\..\..\usr\include\dirent.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\filename_isdir.cxx
-DEP_CPP_FILENAME=\
-	"..\fl\filename.h"\
-	"..\fl\fl_export.h"\
-	"..\src\flstring.h"\
-	".\config.h"\
-	
-NODEP_CPP_FILENAME=\
-	"..\..\..\..\..\usr\include\dirent.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\filename_list.cxx
-DEP_CPP_FILENAME_=\
-	"..\fl\filename.h"\
-	"..\fl\fl_export.h"\
-	"..\src\flstring.h"\
-	".\config.h"\
-	
-NODEP_CPP_FILENAME_=\
-	"..\..\..\..\..\usr\include\dirent.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\filename_match.cxx
-DEP_CPP_FILENAME_M=\
-	"..\fl\filename.h"\
-	"..\fl\fl_export.h"\
-	
-NODEP_CPP_FILENAME_M=\
-	"..\..\..\..\..\usr\include\dirent.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\filename_setext.cxx
-DEP_CPP_FILENAME_S=\
-	"..\fl\filename.h"\
-	"..\fl\fl_export.h"\
-	"..\src\flstring.h"\
-	".\config.h"\
-	
-NODEP_CPP_FILENAME_S=\
-	"..\..\..\..\..\usr\include\dirent.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\Fl.cxx
-DEP_CPP_FL_CX=\
-	"..\fl\enumerations.h"\
-	"..\fl\filename.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_draw.h"\
-	"..\fl\fl_export.h"\
-	"..\fl\fl_group.h"\
-	"..\fl\fl_image.h"\
-	"..\fl\fl_menu_.h"\
-	"..\fl\fl_menu_bar.h"\
-	"..\fl\fl_menu_item.h"\
-	"..\FL\Fl_Sys_Menu_Bar.H"\
-	"..\fl\fl_tooltip.h"\
-	"..\fl\fl_widget.h"\
-	"..\fl\fl_window.h"\
-	"..\fl\mac.H"\
-	"..\fl\win32.h"\
-	"..\fl\x.h"\
-	"..\src\fl_font.h"\
-	"..\src\Fl_mac.cxx"\
-	"..\src\fl_win32.cxx"\
-	"..\src\flstring.h"\
-	".\config.h"\
-	
-NODEP_CPP_FL_CX=\
-	"..\..\..\..\..\usr\include\dirent.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\Fl_abort.cxx
-DEP_CPP_FL_AB=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_export.h"\
-	"..\src\flstring.h"\
-	".\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\Fl_add_idle.cxx
-DEP_CPP_FL_AD=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_export.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\Fl_Adjuster.cxx
-DEP_CPP_FL_ADJ=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_adjuster.h"\
-	"..\fl\fl_bitmap.h"\
-	"..\fl\fl_draw.h"\
-	"..\fl\fl_export.h"\
-	"..\fl\fl_image.h"\
-	"..\fl\fl_valuator.h"\
-	"..\fl\fl_widget.h"\
-	"..\src\fastarrow.h"\
-	"..\src\mediumarrow.h"\
-	"..\src\slowarrow.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\fl_arc.cxx
-DEP_CPP_FL_AR=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl_draw.h"\
-	"..\fl\fl_export.h"\
-	"..\FL\math.h"\
-	
-NODEP_CPP_FL_AR=\
-	"..\..\..\..\..\usr\include\math.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\fl_arci.cxx
-DEP_CPP_FL_ARC=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl_draw.h"\
-	"..\fl\fl_export.h"\
-	"..\fl\fl_group.h"\
-	"..\fl\fl_widget.h"\
-	"..\fl\fl_window.h"\
-	"..\fl\mac.H"\
-	"..\FL\math.h"\
-	"..\fl\win32.h"\
-	"..\fl\x.h"\
-	".\config.h"\
-	
-NODEP_CPP_FL_ARC=\
-	"..\..\..\..\..\usr\include\math.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\Fl_arg.cxx
-DEP_CPP_FL_ARG=\
-	"..\fl\enumerations.h"\
-	"..\fl\filename.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_draw.h"\
-	"..\fl\fl_export.h"\
-	"..\fl\fl_group.h"\
-	"..\fl\fl_tooltip.h"\
-	"..\fl\fl_widget.h"\
-	"..\fl\fl_window.h"\
-	"..\fl\mac.H"\
-	"..\fl\win32.h"\
-	"..\fl\x.h"\
-	"..\src\flstring.h"\
-	".\config.h"\
-	
-NODEP_CPP_FL_ARG=\
-	"..\..\..\..\..\usr\include\dirent.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\fl_ask.cxx
-DEP_CPP_FL_AS=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_ask.h"\
-	"..\fl\fl_box.h"\
-	"..\fl\fl_button.h"\
-	"..\fl\fl_draw.h"\
-	"..\fl\fl_export.h"\
-	"..\fl\fl_group.h"\
-	"..\fl\fl_input.h"\
-	"..\fl\fl_input_.h"\
-	"..\fl\fl_return_button.h"\
-	"..\fl\fl_secret_input.h"\
-	"..\fl\fl_widget.h"\
-	"..\fl\fl_window.h"\
-	"..\fl\mac.H"\
-	"..\fl\win32.h"\
-	"..\fl\x.h"\
-	"..\src\flstring.h"\
-	".\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\Fl_Bitmap.cxx
-DEP_CPP_FL_BI=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_bitmap.h"\
-	"..\fl\fl_draw.h"\
-	"..\fl\fl_export.h"\
-	"..\fl\fl_group.h"\
-	"..\fl\fl_image.h"\
-	"..\fl\fl_menu_item.h"\
-	"..\fl\fl_widget.h"\
-	"..\fl\fl_window.h"\
-	"..\fl\mac.H"\
-	"..\fl\win32.h"\
-	"..\fl\x.h"\
-	"..\src\flstring.h"\
-	".\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\Fl_BMP_Image.cxx
-DEP_CPP_FL_BM=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl_bmp_image.h"\
-	"..\fl\fl_export.h"\
-	"..\fl\fl_image.h"\
-	".\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\Fl_Box.cxx
-DEP_CPP_FL_BO=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl_box.h"\
-	"..\fl\fl_export.h"\
-	"..\fl\fl_widget.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\fl_boxtype.cxx
-DEP_CPP_FL_BOX=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_draw.h"\
-	"..\fl\fl_export.h"\
-	"..\fl\fl_widget.h"\
-	".\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\Fl_Browser.cxx
-DEP_CPP_FL_BR=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_browser.h"\
-	"..\fl\fl_browser_.h"\
-	"..\fl\fl_draw.h"\
-	"..\fl\fl_export.h"\
-	"..\fl\fl_group.h"\
-	"..\fl\fl_scrollbar.h"\
-	"..\fl\fl_slider.h"\
-	"..\fl\fl_valuator.h"\
-	"..\fl\fl_widget.h"\
-	"..\src\flstring.h"\
-	".\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\Fl_Browser_.cxx
-DEP_CPP_FL_BRO=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_browser_.h"\
-	"..\fl\fl_draw.h"\
-	"..\fl\fl_export.h"\
-	"..\fl\fl_group.h"\
-	"..\fl\fl_scrollbar.h"\
-	"..\fl\fl_slider.h"\
-	"..\fl\fl_valuator.h"\
-	"..\fl\fl_widget.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\Fl_Browser_load.cxx
-DEP_CPP_FL_BROW=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_browser.h"\
-	"..\fl\fl_browser_.h"\
-	"..\fl\fl_export.h"\
-	"..\fl\fl_group.h"\
-	"..\fl\fl_scrollbar.h"\
-	"..\fl\fl_slider.h"\
-	"..\fl\fl_valuator.h"\
-	"..\fl\fl_widget.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\Fl_Button.cxx
-DEP_CPP_FL_BU=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_button.h"\
-	"..\fl\fl_export.h"\
-	"..\fl\fl_group.h"\
-	"..\fl\fl_widget.h"\
-	"..\fl\fl_window.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\Fl_Chart.cxx
-DEP_CPP_FL_CH=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_chart.h"\
-	"..\fl\fl_draw.h"\
-	"..\fl\fl_export.h"\
-	"..\fl\fl_widget.h"\
-	"..\FL\math.h"\
-	"..\src\flstring.h"\
-	".\config.h"\
-	
-NODEP_CPP_FL_CH=\
-	"..\..\..\..\..\usr\include\math.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\Fl_Check_Browser.cxx
-DEP_CPP_FL_CHE=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_browser_.h"\
-	"..\fl\fl_check_browser.h"\
-	"..\fl\fl_draw.h"\
-	"..\fl\fl_export.h"\
-	"..\fl\fl_group.h"\
-	"..\fl\fl_scrollbar.h"\
-	"..\fl\fl_slider.h"\
-	"..\fl\fl_valuator.h"\
-	"..\fl\fl_widget.h"\
-	"..\src\flstring.h"\
-	".\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\Fl_Check_Button.cxx
-DEP_CPP_FL_CHEC=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_button.h"\
-	"..\fl\fl_check_button.h"\
-	"..\fl\fl_export.h"\
-	"..\fl\fl_light_button.h"\
-	"..\fl\fl_widget.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\Fl_Choice.cxx
-DEP_CPP_FL_CHO=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_choice.h"\
-	"..\fl\fl_draw.h"\
-	"..\fl\fl_export.h"\
-	"..\fl\fl_image.h"\
-	"..\fl\fl_menu_.h"\
-	"..\fl\fl_menu_item.h"\
-	"..\fl\fl_widget.h"\
-	"..\src\flstring.h"\
-	".\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\Fl_Clock.cxx
-DEP_CPP_FL_CL=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_clock.h"\
-	"..\fl\fl_draw.h"\
-	"..\fl\fl_export.h"\
-	"..\fl\fl_widget.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\fl_color.cxx
-DEP_CPP_FL_CO=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_draw.h"\
-	"..\fl\fl_export.h"\
-	"..\fl\fl_group.h"\
-	"..\fl\fl_widget.h"\
-	"..\fl\fl_window.h"\
-	"..\fl\mac.H"\
-	"..\fl\win32.h"\
-	"..\fl\x.h"\
-	"..\src\fl_cmap.h"\
-	"..\src\fl_color_mac.cxx"\
-	"..\src\fl_color_win32.cxx"\
-	"..\src\Fl_XColor.H"\
-	".\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\Fl_Color_Chooser.cxx
-DEP_CPP_FL_COL=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_box.h"\
-	"..\fl\fl_button.h"\
-	"..\fl\fl_choice.h"\
-	"..\fl\fl_color_chooser.h"\
-	"..\fl\fl_draw.h"\
-	"..\fl\fl_export.h"\
-	"..\fl\fl_group.h"\
-	"..\fl\fl_image.h"\
-	"..\fl\fl_input.h"\
-	"..\fl\fl_input_.h"\
-	"..\fl\fl_menu_.h"\
-	"..\fl\fl_menu_item.h"\
-	"..\fl\fl_return_button.h"\
-	"..\fl\fl_valuator.h"\
-	"..\fl\fl_value_input.h"\
-	"..\fl\fl_widget.h"\
-	"..\fl\fl_window.h"\
-	"..\FL\math.h"\
-	
-NODEP_CPP_FL_COL=\
-	"..\..\..\..\..\usr\include\math.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\Fl_compose.cxx
-DEP_CPP_FL_COM=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_export.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\Fl_Counter.cxx
-DEP_CPP_FL_COU=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_counter.h"\
-	"..\fl\fl_draw.h"\
-	"..\fl\fl_export.h"\
-	"..\fl\fl_valuator.h"\
-	"..\fl\fl_widget.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\fl_cursor.cxx
-DEP_CPP_FL_CU=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_draw.h"\
-	"..\fl\fl_export.h"\
-	"..\fl\fl_group.h"\
-	"..\fl\fl_widget.h"\
-	"..\fl\fl_window.h"\
-	"..\fl\mac.H"\
-	"..\fl\win32.h"\
-	"..\fl\x.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\fl_curve.cxx
-DEP_CPP_FL_CUR=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl_draw.h"\
-	"..\fl\fl_export.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\Fl_Dial.cxx
-DEP_CPP_FL_DI=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_dial.h"\
-	"..\fl\fl_draw.h"\
-	"..\fl\fl_export.h"\
-	"..\fl\fl_valuator.h"\
-	"..\fl\fl_widget.h"\
-	"..\FL\math.h"\
-	
-NODEP_CPP_FL_DI=\
-	"..\..\..\..\..\usr\include\math.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\fl_diamond_box.cxx
-DEP_CPP_FL_DIA=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_draw.h"\
-	"..\fl\fl_export.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\Fl_display.cxx
-DEP_CPP_FL_DIS=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_export.h"\
-	"..\src\flstring.h"\
-	".\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\fl_dnd.cxx
-DEP_CPP_FL_DN=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_export.h"\
-	"..\fl\fl_group.h"\
-	"..\fl\fl_widget.h"\
-	"..\fl\fl_window.h"\
-	"..\fl\mac.H"\
-	"..\fl\win32.h"\
-	"..\fl\x.h"\
-	"..\src\fl_dnd_mac.cxx"\
-	"..\src\fl_dnd_win32.cxx"\
-	"..\src\fl_dnd_x.cxx"\
-	"..\src\flstring.h"\
-	".\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\Fl_Double_Window.cxx
-DEP_CPP_FL_DO=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_double_window.h"\
-	"..\fl\fl_draw.h"\
-	"..\fl\fl_export.h"\
-	"..\fl\fl_group.h"\
-	"..\fl\fl_widget.h"\
-	"..\fl\fl_window.h"\
-	"..\fl\mac.H"\
-	"..\fl\win32.h"\
-	"..\fl\x.h"\
-	".\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\fl_draw.cxx
-DEP_CPP_FL_DR=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl_draw.h"\
-	"..\fl\fl_export.h"\
-	"..\fl\fl_image.h"\
-	"..\src\flstring.h"\
-	".\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\fl_draw_image.cxx
-DEP_CPP_FL_DRA=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_draw.h"\
-	"..\fl\fl_export.h"\
-	"..\fl\fl_group.h"\
-	"..\fl\fl_widget.h"\
-	"..\fl\fl_window.h"\
-	"..\fl\mac.H"\
-	"..\fl\win32.h"\
-	"..\fl\x.h"\
-	"..\src\fl_draw_image_mac.cxx"\
-	"..\src\fl_draw_image_win32.cxx"\
-	"..\src\Fl_XColor.H"\
-	"..\src\flstring.h"\
-	".\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\fl_draw_pixmap.cxx
-DEP_CPP_FL_DRAW=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_draw.h"\
-	"..\fl\fl_export.h"\
-	"..\fl\fl_group.h"\
-	"..\fl\fl_widget.h"\
-	"..\fl\fl_window.h"\
-	"..\fl\mac.H"\
-	"..\fl\win32.h"\
-	"..\fl\x.h"\
-	"..\src\flstring.h"\
-	".\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\fl_encoding_latin1.cxx
-DEP_CPP_FL_EN=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl_draw.h"\
-	"..\fl\fl_export.h"\
-	"..\src\flstring.h"\
-	".\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\fl_encoding_mac_roman.cxx
-DEP_CPP_FL_ENC=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl_draw.h"\
-	"..\fl\fl_export.h"\
-	"..\src\flstring.h"\
-	".\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\fl_engraved_label.cxx
-DEP_CPP_FL_ENG=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_draw.h"\
-	"..\fl\fl_export.h"\
-	"..\fl\fl_widget.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\Fl_File_Browser.cxx
-DEP_CPP_FL_FI=\
-	"..\fl\enumerations.h"\
-	"..\fl\filename.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_browser.h"\
-	"..\fl\fl_browser_.h"\
-	"..\fl\fl_draw.h"\
-	"..\fl\fl_export.h"\
-	"..\FL\Fl_File_Browser.H"\
-	"..\fl\fl_file_icon.h"\
-	"..\fl\fl_group.h"\
-	"..\fl\fl_scrollbar.h"\
-	"..\fl\fl_slider.h"\
-	"..\fl\fl_valuator.h"\
-	"..\fl\fl_widget.h"\
-	"..\src\flstring.h"\
-	".\config.h"\
-	
-NODEP_CPP_FL_FI=\
-	"..\..\..\..\..\usr\include\dirent.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\Fl_File_Chooser.cxx
-DEP_CPP_FL_FIL=\
-	"..\fl\enumerations.h"\
-	"..\fl\filename.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_ask.h"\
-	"..\fl\fl_bitmap.h"\
-	"..\fl\fl_box.h"\
-	"..\fl\fl_browser.h"\
-	"..\fl\fl_browser_.h"\
-	"..\fl\fl_button.h"\
-	"..\fl\fl_check_button.h"\
-	"..\fl\fl_choice.h"\
-	"..\fl\fl_double_window.h"\
-	"..\fl\fl_draw.h"\
-	"..\fl\fl_export.h"\
-	"..\FL\Fl_File_Browser.H"\
-	"..\fl\fl_file_chooser.h"\
-	"..\fl\fl_file_icon.h"\
-	"..\fl\fl_file_input.h"\
-	"..\fl\fl_group.h"\
-	"..\fl\fl_image.h"\
-	"..\fl\fl_input.h"\
-	"..\fl\fl_input_.h"\
-	"..\fl\fl_light_button.h"\
-	"..\fl\fl_menu_.h"\
-	"..\fl\fl_menu_button.h"\
-	"..\fl\fl_menu_item.h"\
-	"..\fl\fl_preferences.h"\
-	"..\fl\fl_return_button.h"\
-	"..\fl\fl_scrollbar.h"\
-	"..\fl\fl_slider.h"\
-	"..\fl\fl_tile.h"\
-	"..\fl\fl_valuator.h"\
-	"..\fl\fl_widget.h"\
-	"..\fl\fl_window.h"\
-	
-NODEP_CPP_FL_FIL=\
-	"..\..\..\..\..\usr\include\dirent.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\Fl_File_Chooser2.cxx
-DEP_CPP_FL_FILE=\
-	"..\fl\enumerations.h"\
-	"..\fl\filename.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_ask.h"\
-	"..\fl\fl_box.h"\
-	"..\fl\fl_browser.h"\
-	"..\fl\fl_browser_.h"\
-	"..\fl\fl_button.h"\
-	"..\fl\fl_check_button.h"\
-	"..\fl\fl_choice.h"\
-	"..\fl\fl_double_window.h"\
-	"..\fl\fl_export.h"\
-	"..\FL\Fl_File_Browser.H"\
-	"..\fl\fl_file_chooser.h"\
-	"..\fl\fl_file_icon.h"\
-	"..\fl\fl_file_input.h"\
-	"..\fl\fl_group.h"\
-	"..\fl\fl_image.h"\
-	"..\fl\fl_input.h"\
-	"..\fl\fl_input_.h"\
-	"..\fl\fl_light_button.h"\
-	"..\fl\fl_menu_.h"\
-	"..\fl\fl_menu_button.h"\
-	"..\fl\fl_menu_item.h"\
-	"..\fl\fl_preferences.h"\
-	"..\fl\fl_return_button.h"\
-	"..\fl\fl_scrollbar.h"\
-	"..\fl\fl_shared_image.h"\
-	"..\fl\fl_slider.h"\
-	"..\fl\fl_tile.h"\
-	"..\fl\fl_valuator.h"\
-	"..\fl\fl_widget.h"\
-	"..\fl\fl_window.h"\
-	"..\fl\mac.H"\
-	"..\fl\win32.h"\
-	"..\fl\x.h"\
-	"..\src\flstring.h"\
-	".\config.h"\
-	
-NODEP_CPP_FL_FILE=\
-	"..\..\..\..\..\usr\include\dirent.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\fl_file_dir.cxx
-DEP_CPP_FL_FILE_=\
-	"..\fl\enumerations.h"\
-	"..\fl\filename.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_ask.h"\
-	"..\fl\fl_box.h"\
-	"..\fl\fl_browser.h"\
-	"..\fl\fl_browser_.h"\
-	"..\fl\fl_button.h"\
-	"..\fl\fl_check_button.h"\
-	"..\fl\fl_choice.h"\
-	"..\fl\fl_double_window.h"\
-	"..\fl\fl_export.h"\
-	"..\FL\Fl_File_Browser.H"\
-	"..\fl\fl_file_chooser.h"\
-	"..\fl\fl_file_icon.h"\
-	"..\fl\fl_file_input.h"\
-	"..\fl\fl_group.h"\
-	"..\fl\fl_image.h"\
-	"..\fl\fl_input.h"\
-	"..\fl\fl_input_.h"\
-	"..\fl\fl_light_button.h"\
-	"..\fl\fl_menu_.h"\
-	"..\fl\fl_menu_button.h"\
-	"..\fl\fl_menu_item.h"\
-	"..\fl\fl_preferences.h"\
-	"..\fl\fl_return_button.h"\
-	"..\fl\fl_scrollbar.h"\
-	"..\fl\fl_slider.h"\
-	"..\fl\fl_tile.h"\
-	"..\fl\fl_valuator.h"\
-	"..\fl\fl_widget.h"\
-	"..\fl\fl_window.h"\
-	"..\src\flstring.h"\
-	".\config.h"\
-	
-NODEP_CPP_FL_FILE_=\
-	"..\..\..\..\..\usr\include\dirent.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\Fl_File_Icon.cxx
-DEP_CPP_FL_FILE_I=\
-	"..\fl\enumerations.h"\
-	"..\fl\filename.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_draw.h"\
-	"..\fl\fl_export.h"\
-	"..\fl\fl_file_icon.h"\
-	"..\fl\fl_widget.h"\
-	"..\src\flstring.h"\
-	".\config.h"\
-	
-NODEP_CPP_FL_FILE_I=\
-	"..\..\..\..\..\usr\include\dirent.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\Fl_File_Icon2.cxx
-DEP_CPP_FL_FILE_IC=\
-	"..\fl\enumerations.h"\
-	"..\fl\filename.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_draw.h"\
-	"..\fl\fl_export.h"\
-	"..\fl\fl_file_icon.h"\
-	"..\fl\fl_image.h"\
-	"..\fl\fl_shared_image.h"\
-	"..\fl\fl_widget.h"\
-	"..\FL\math.h"\
-	"..\src\flstring.h"\
-	".\config.h"\
-	
-NODEP_CPP_FL_FILE_IC=\
-	"..\..\..\..\..\usr\include\dirent.h"\
-	"..\..\..\..\..\usr\include\math.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\Fl_File_Input.cxx
-DEP_CPP_FL_FILE_IN=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_draw.h"\
-	"..\fl\fl_export.h"\
-	"..\fl\fl_file_input.h"\
-	"..\fl\fl_group.h"\
-	"..\fl\fl_input.h"\
-	"..\fl\fl_input_.h"\
-	"..\fl\fl_widget.h"\
-	"..\fl\fl_window.h"\
-	"..\src\flstring.h"\
-	".\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\fl_font.cxx
-DEP_CPP_FL_FO=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_draw.h"\
-	"..\fl\fl_export.h"\
-	"..\fl\fl_group.h"\
-	"..\fl\fl_widget.h"\
-	"..\fl\fl_window.h"\
-	"..\fl\mac.H"\
-	"..\fl\win32.h"\
-	"..\fl\x.h"\
-	"..\src\fl_font.h"\
-	"..\src\fl_font_mac.cxx"\
-	"..\src\fl_font_win32.cxx"\
-	"..\src\fl_font_x.cxx"\
-	"..\src\fl_font_xft.cxx"\
-	"..\src\flstring.h"\
-	".\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\Fl_get_key.cxx
-DEP_CPP_FL_GE=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_export.h"\
-	"..\fl\fl_group.h"\
-	"..\fl\fl_widget.h"\
-	"..\fl\fl_window.h"\
-	"..\fl\mac.H"\
-	"..\fl\win32.h"\
-	"..\fl\x.h"\
-	"..\src\Fl_get_key_mac.cxx"\
-	"..\src\fl_get_key_win32.cxx"\
-	".\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\Fl_get_system_colors.cxx
-DEP_CPP_FL_GET=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_draw.h"\
-	"..\fl\fl_export.h"\
-	"..\fl\fl_group.h"\
-	"..\fl\fl_image.h"\
-	"..\fl\fl_pixmap.h"\
-	"..\fl\fl_tiled_image.h"\
-	"..\fl\fl_widget.h"\
-	"..\fl\fl_window.h"\
-	"..\fl\mac.H"\
-	"..\FL\math.h"\
-	"..\fl\win32.h"\
-	"..\fl\x.h"\
-	"..\src\flstring.h"\
-	"..\src\tile.xpm"\
-	".\config.h"\
-	
-NODEP_CPP_FL_GET=\
-	"..\..\..\..\..\usr\include\math.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\Fl_GIF_Image.cxx
-DEP_CPP_FL_GI=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_export.h"\
-	"..\fl\fl_gif_image.h"\
-	"..\fl\fl_image.h"\
-	"..\fl\fl_pixmap.h"\
-	"..\src\flstring.h"\
-	".\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\Fl_Gl_Choice.cxx
-DEP_CPP_FL_GL=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_export.h"\
-	"..\fl\fl_group.h"\
-	"..\fl\fl_widget.h"\
-	"..\fl\fl_window.h"\
-	"..\FL\gl.h"\
-	"..\fl\gl_draw.h"\
-	"..\fl\mac.H"\
-	"..\fl\win32.h"\
-	"..\fl\x.h"\
-	"..\src\Fl_Gl_Choice.H"\
-	"..\src\flstring.h"\
-	".\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\Fl_Gl_Overlay.cxx
-DEP_CPP_FL_GL_=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_export.h"\
-	"..\fl\Fl_Gl_Window.H"\
-	"..\fl\fl_group.h"\
-	"..\fl\fl_widget.h"\
-	"..\fl\fl_window.h"\
-	"..\FL\gl.h"\
-	"..\fl\mac.H"\
-	"..\fl\win32.h"\
-	"..\fl\x.h"\
-	"..\src\Fl_Gl_Choice.H"\
-	".\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\Fl_Gl_Window.cxx
-DEP_CPP_FL_GL_W=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_export.h"\
-	"..\fl\Fl_Gl_Window.H"\
-	"..\fl\fl_group.h"\
-	"..\fl\fl_widget.h"\
-	"..\fl\fl_window.h"\
-	"..\FL\gl.h"\
-	"..\fl\mac.H"\
-	"..\fl\win32.h"\
-	"..\fl\x.h"\
-	"..\src\Fl_Gl_Choice.H"\
-	"..\src\flstring.h"\
-	".\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\Fl_grab.cxx
-DEP_CPP_FL_GR=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_export.h"\
-	"..\fl\fl_group.h"\
-	"..\fl\fl_widget.h"\
-	"..\fl\fl_window.h"\
-	"..\fl\mac.H"\
-	"..\fl\win32.h"\
-	"..\fl\x.h"\
-	".\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\Fl_Group.cxx
-DEP_CPP_FL_GRO=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_draw.h"\
-	"..\fl\fl_export.h"\
-	"..\fl\fl_group.h"\
-	"..\fl\fl_widget.h"\
-	"..\fl\fl_window.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\fl_gtk.cxx
-DEP_CPP_FL_GT=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_draw.h"\
-	"..\fl\fl_export.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\Fl_Help_Dialog.cxx
-DEP_CPP_FL_HE=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_ask.h"\
-	"..\fl\fl_button.h"\
-	"..\fl\fl_double_window.h"\
-	"..\fl\fl_draw.h"\
-	"..\fl\fl_export.h"\
-	"..\fl\fl_group.h"\
-	"..\FL\Fl_Help_Dialog.H"\
-	"..\FL\Fl_Help_View.H"\
-	"..\fl\fl_image.h"\
-	"..\fl\fl_input.h"\
-	"..\fl\fl_input_.h"\
-	"..\fl\fl_scrollbar.h"\
-	"..\fl\fl_shared_image.h"\
-	"..\fl\fl_slider.h"\
-	"..\fl\fl_valuator.h"\
-	"..\fl\fl_widget.h"\
-	"..\fl\fl_window.h"\
-	"..\src\flstring.h"\
-	".\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\Fl_Help_View.cxx
-DEP_CPP_FL_HEL=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_draw.h"\
-	"..\fl\fl_export.h"\
-	"..\fl\fl_group.h"\
-	"..\FL\Fl_Help_View.H"\
-	"..\fl\fl_image.h"\
-	"..\fl\fl_pixmap.h"\
-	"..\fl\fl_scrollbar.h"\
-	"..\fl\fl_shared_image.h"\
-	"..\fl\fl_slider.h"\
-	"..\fl\fl_valuator.h"\
-	"..\fl\fl_widget.h"\
-	"..\fl\fl_window.h"\
-	"..\src\flstring.h"\
-	".\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\Fl_Image.cxx
-DEP_CPP_FL_IM=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_draw.h"\
-	"..\fl\fl_export.h"\
-	"..\fl\fl_group.h"\
-	"..\fl\fl_image.h"\
-	"..\fl\fl_menu_item.h"\
-	"..\fl\fl_widget.h"\
-	"..\fl\fl_window.h"\
-	"..\fl\mac.H"\
-	"..\fl\win32.h"\
-	"..\fl\x.h"\
-	"..\src\flstring.h"\
-	".\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\fl_images_core.cxx
-DEP_CPP_FL_IMA=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl_bmp_image.h"\
-	"..\fl\fl_export.h"\
-	"..\fl\fl_gif_image.h"\
-	"..\fl\fl_image.h"\
-	"..\fl\fl_jpeg_image.h"\
-	"..\fl\fl_pixmap.h"\
-	"..\fl\fl_png_image.h"\
-	"..\fl\fl_pnm_image.h"\
-	"..\fl\fl_shared_image.h"\
-	"..\src\flstring.h"\
-	".\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\Fl_Input.cxx
-DEP_CPP_FL_IN=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_ask.h"\
-	"..\fl\fl_draw.h"\
-	"..\fl\fl_export.h"\
-	"..\fl\fl_group.h"\
-	"..\fl\fl_input.h"\
-	"..\fl\fl_input_.h"\
-	"..\fl\fl_widget.h"\
-	"..\fl\fl_window.h"\
-	"..\src\flstring.h"\
-	".\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\Fl_Input_.cxx
-DEP_CPP_FL_INP=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_ask.h"\
-	"..\fl\fl_draw.h"\
-	"..\fl\fl_export.h"\
-	"..\fl\fl_group.h"\
-	"..\fl\fl_input_.h"\
-	"..\fl\fl_widget.h"\
-	"..\fl\fl_window.h"\
-	"..\src\flstring.h"\
-	".\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\Fl_JPEG_Image.cxx
-DEP_CPP_FL_JP=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl_export.h"\
-	"..\fl\fl_image.h"\
-	"..\fl\fl_jpeg_image.h"\
-	"..\jpeg\jconfig.h"\
-	"..\jpeg\jerror.h"\
-	"..\jpeg\jmorecfg.h"\
-	"..\jpeg\jpegint.h"\
-	"..\jpeg\jpeglib.h"\
-	".\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\fl_labeltype.cxx
-DEP_CPP_FL_LA=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_draw.h"\
-	"..\fl\fl_export.h"\
-	"..\fl\fl_group.h"\
-	"..\fl\fl_image.h"\
-	"..\fl\fl_input_.h"\
-	"..\fl\fl_widget.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\Fl_Light_Button.cxx
-DEP_CPP_FL_LI=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_button.h"\
-	"..\fl\fl_draw.h"\
-	"..\fl\fl_export.h"\
-	"..\fl\fl_light_button.h"\
-	"..\fl\fl_widget.h"\
-	"..\src\flstring.h"\
-	".\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\fl_line_style.cxx
-DEP_CPP_FL_LIN=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_draw.h"\
-	"..\fl\fl_export.h"\
-	"..\fl\fl_group.h"\
-	"..\fl\fl_widget.h"\
-	"..\fl\fl_window.h"\
-	"..\fl\mac.H"\
-	"..\fl\win32.h"\
-	"..\fl\x.h"\
-	"..\src\flstring.h"\
-	".\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\Fl_lock.cxx
-DEP_CPP_FL_LO=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_export.h"\
-	"..\fl\fl_group.h"\
-	"..\fl\fl_widget.h"\
-	"..\fl\fl_window.h"\
-	"..\fl\mac.H"\
-	"..\fl\win32.h"\
-	"..\fl\x.h"\
-	".\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\Fl_Menu.cxx
-DEP_CPP_FL_ME=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_draw.h"\
-	"..\fl\fl_export.h"\
-	"..\fl\fl_group.h"\
-	"..\fl\fl_image.h"\
-	"..\fl\fl_menu_.h"\
-	"..\fl\fl_menu_item.h"\
-	"..\fl\fl_menu_window.h"\
-	"..\fl\fl_single_window.h"\
-	"..\fl\fl_widget.h"\
-	"..\fl\fl_window.h"\
-	"..\src\flstring.h"\
-	".\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\Fl_Menu_.cxx
-DEP_CPP_FL_MEN=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_export.h"\
-	"..\fl\fl_image.h"\
-	"..\fl\fl_menu_.h"\
-	"..\fl\fl_menu_item.h"\
-	"..\fl\fl_widget.h"\
-	"..\src\flstring.h"\
-	".\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\Fl_Menu_add.cxx
-DEP_CPP_FL_MENU=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl_export.h"\
-	"..\fl\fl_image.h"\
-	"..\fl\fl_menu_.h"\
-	"..\fl\fl_menu_item.h"\
-	"..\fl\fl_widget.h"\
-	"..\src\flstring.h"\
-	".\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\Fl_Menu_Bar.cxx
-DEP_CPP_FL_MENU_=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_draw.h"\
-	"..\fl\fl_export.h"\
-	"..\fl\fl_image.h"\
-	"..\fl\fl_menu_.h"\
-	"..\fl\fl_menu_bar.h"\
-	"..\fl\fl_menu_item.h"\
-	"..\fl\fl_widget.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\Fl_Menu_Button.cxx
-DEP_CPP_FL_MENU_B=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_draw.h"\
-	"..\fl\fl_export.h"\
-	"..\fl\fl_image.h"\
-	"..\fl\fl_menu_.h"\
-	"..\fl\fl_menu_button.h"\
-	"..\fl\fl_menu_item.h"\
-	"..\fl\fl_widget.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\Fl_Menu_global.cxx
-DEP_CPP_FL_MENU_G=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_export.h"\
-	"..\fl\fl_image.h"\
-	"..\fl\fl_menu_.h"\
-	"..\fl\fl_menu_item.h"\
-	"..\fl\fl_widget.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\Fl_Menu_Window.cxx
-DEP_CPP_FL_MENU_W=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_draw.h"\
-	"..\fl\fl_export.h"\
-	"..\fl\fl_group.h"\
-	"..\fl\fl_menu_window.h"\
-	"..\fl\fl_single_window.h"\
-	"..\fl\fl_widget.h"\
-	"..\fl\fl_window.h"\
-	"..\fl\mac.H"\
-	"..\fl\win32.h"\
-	"..\fl\x.h"\
-	".\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\Fl_Multi_Label.cxx
-DEP_CPP_FL_MU=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_export.h"\
-	"..\fl\fl_image.h"\
-	"..\fl\fl_menu_item.h"\
-	"..\fl\fl_multi_label.h"\
-	"..\fl\fl_widget.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\fl_open_uri.cxx
-DEP_CPP_FL_OP=\
-	"..\fl\filename.h"\
-	"..\fl\fl_export.h"\
-	"..\src\flstring.h"\
-	".\config.h"\
-	
-NODEP_CPP_FL_OP=\
-	"..\..\..\..\..\usr\include\dirent.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\fl_oval_box.cxx
-DEP_CPP_FL_OV=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_draw.h"\
-	"..\fl\fl_export.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\fl_overlay.cxx
-DEP_CPP_FL_OVE=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl_draw.h"\
-	"..\fl\fl_export.h"\
-	"..\fl\fl_group.h"\
-	"..\fl\fl_widget.h"\
-	"..\fl\fl_window.h"\
-	"..\fl\mac.H"\
-	"..\fl\win32.h"\
-	"..\fl\x.h"\
-	".\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\fl_overlay_visual.cxx
-DEP_CPP_FL_OVER=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_export.h"\
-	"..\fl\fl_group.h"\
-	"..\fl\fl_widget.h"\
-	"..\fl\fl_window.h"\
-	"..\fl\mac.H"\
-	"..\fl\win32.h"\
-	"..\fl\x.h"\
-	".\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\Fl_Overlay_Window.cxx
-DEP_CPP_FL_OVERL=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_double_window.h"\
-	"..\fl\fl_draw.h"\
-	"..\fl\fl_export.h"\
-	"..\fl\fl_group.h"\
-	"..\fl\fl_overlay_window.h"\
-	"..\fl\fl_widget.h"\
-	"..\fl\fl_window.h"\
-	"..\fl\mac.H"\
-	"..\fl\win32.h"\
-	"..\fl\x.h"\
-	".\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\Fl_own_colormap.cxx
-DEP_CPP_FL_OW=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_export.h"\
-	"..\fl\fl_group.h"\
-	"..\fl\fl_widget.h"\
-	"..\fl\fl_window.h"\
-	"..\fl\mac.H"\
-	"..\fl\win32.h"\
-	"..\fl\x.h"\
-	".\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\Fl_Pack.cxx
-DEP_CPP_FL_PA=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_draw.h"\
-	"..\fl\fl_export.h"\
-	"..\fl\fl_group.h"\
-	"..\fl\fl_pack.h"\
-	"..\fl\fl_widget.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\Fl_Pixmap.cxx
-DEP_CPP_FL_PI=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_draw.h"\
-	"..\fl\fl_export.h"\
-	"..\fl\fl_group.h"\
-	"..\fl\fl_image.h"\
-	"..\fl\fl_menu_item.h"\
-	"..\fl\fl_pixmap.h"\
-	"..\fl\fl_widget.h"\
-	"..\fl\fl_window.h"\
-	"..\fl\mac.H"\
-	"..\fl\win32.h"\
-	"..\fl\x.h"\
-	"..\src\flstring.h"\
-	".\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\fl_plastic.cxx
-DEP_CPP_FL_PL=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_draw.h"\
-	"..\fl\fl_export.h"\
-	"..\src\flstring.h"\
-	".\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\Fl_PNG_Image.cxx
-DEP_CPP_FL_PN=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_export.h"\
-	"..\fl\fl_image.h"\
-	"..\fl\fl_png_image.h"\
-	"..\png\png.h"\
-	"..\png\pngconf.h"\
-	"..\zlib\zconf.h"\
-	"..\zlib\zlib.h"\
-	".\config.h"\
-	
-NODEP_CPP_FL_PN=\
-	"..\png\pngusr.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\Fl_PNM_Image.cxx
-DEP_CPP_FL_PNM=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_export.h"\
-	"..\fl\fl_image.h"\
-	"..\fl\fl_pnm_image.h"\
-	"..\src\flstring.h"\
-	".\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\Fl_Positioner.cxx
-DEP_CPP_FL_PO=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_draw.h"\
-	"..\fl\fl_export.h"\
-	"..\fl\fl_positioner.h"\
-	"..\fl\fl_widget.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\Fl_Preferences.cxx
-DEP_CPP_FL_PR=\
-	"..\fl\enumerations.h"\
-	"..\fl\filename.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_export.h"\
-	"..\fl\fl_preferences.h"\
-	"..\src\flstring.h"\
-	".\config.h"\
-	
-NODEP_CPP_FL_PR=\
-	"..\..\..\..\..\usr\include\dirent.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\Fl_Progress.cxx
-DEP_CPP_FL_PRO=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_draw.h"\
-	"..\fl\fl_export.h"\
-	"..\fl\fl_progress.h"\
-	"..\fl\fl_widget.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\fl_read_image.cxx
-DEP_CPP_FL_RE=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl_draw.h"\
-	"..\fl\fl_export.h"\
-	"..\fl\fl_group.h"\
-	"..\fl\fl_widget.h"\
-	"..\fl\fl_window.h"\
-	"..\fl\mac.H"\
-	"..\fl\win32.h"\
-	"..\fl\x.h"\
-	"..\src\fl_read_image_mac.cxx"\
-	"..\src\fl_read_image_win32.cxx"\
-	"..\src\flstring.h"\
-	".\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\fl_rect.cxx
-DEP_CPP_FL_REC=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_draw.h"\
-	"..\fl\fl_export.h"\
-	"..\fl\fl_group.h"\
-	"..\fl\fl_widget.h"\
-	"..\fl\fl_window.h"\
-	"..\fl\mac.H"\
-	"..\fl\win32.h"\
-	"..\fl\x.h"\
-	".\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\Fl_Repeat_Button.cxx
-DEP_CPP_FL_REP=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_button.h"\
-	"..\fl\fl_export.h"\
-	"..\fl\fl_repeat_button.h"\
-	"..\fl\fl_widget.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\Fl_Return_Button.cxx
-DEP_CPP_FL_RET=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_button.h"\
-	"..\fl\fl_draw.h"\
-	"..\fl\fl_export.h"\
-	"..\fl\fl_return_button.h"\
-	"..\fl\fl_widget.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\Fl_Roller.cxx
-DEP_CPP_FL_RO=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_draw.h"\
-	"..\fl\fl_export.h"\
-	"..\fl\fl_roller.h"\
-	"..\fl\fl_valuator.h"\
-	"..\fl\fl_widget.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\fl_round_box.cxx
-DEP_CPP_FL_ROU=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_draw.h"\
-	"..\fl\fl_export.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\Fl_Round_Button.cxx
-DEP_CPP_FL_ROUN=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_button.h"\
-	"..\fl\fl_export.h"\
-	"..\fl\fl_light_button.h"\
-	"..\fl\fl_round_button.h"\
-	"..\fl\fl_widget.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\fl_rounded_box.cxx
-DEP_CPP_FL_ROUND=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_draw.h"\
-	"..\fl\fl_export.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\Fl_Scroll.cxx
-DEP_CPP_FL_SC=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_draw.h"\
-	"..\fl\fl_export.h"\
-	"..\fl\fl_group.h"\
-	"..\fl\fl_image.h"\
-	"..\fl\fl_scroll.h"\
-	"..\fl\fl_scrollbar.h"\
-	"..\fl\fl_slider.h"\
-	"..\fl\fl_tiled_image.h"\
-	"..\fl\fl_valuator.h"\
-	"..\fl\fl_widget.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\fl_scroll_area.cxx
-DEP_CPP_FL_SCR=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_draw.h"\
-	"..\fl\fl_export.h"\
-	"..\fl\fl_group.h"\
-	"..\fl\fl_widget.h"\
-	"..\fl\fl_window.h"\
-	"..\fl\mac.H"\
-	"..\fl\win32.h"\
-	"..\fl\x.h"\
-	".\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\Fl_Scrollbar.cxx
-DEP_CPP_FL_SCRO=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_draw.h"\
-	"..\fl\fl_export.h"\
-	"..\fl\fl_scrollbar.h"\
-	"..\fl\fl_slider.h"\
-	"..\fl\fl_valuator.h"\
-	"..\fl\fl_widget.h"\
-	"..\src\flstring.h"\
-	".\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\fl_set_font.cxx
-DEP_CPP_FL_SE=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_draw.h"\
-	"..\fl\fl_export.h"\
-	"..\fl\fl_group.h"\
-	"..\fl\fl_widget.h"\
-	"..\fl\fl_window.h"\
-	"..\fl\mac.H"\
-	"..\fl\win32.h"\
-	"..\fl\x.h"\
-	"..\src\fl_font.h"\
-	"..\src\flstring.h"\
-	".\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\fl_set_fonts.cxx
-DEP_CPP_FL_SET=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_export.h"\
-	"..\fl\fl_group.h"\
-	"..\fl\fl_widget.h"\
-	"..\fl\fl_window.h"\
-	"..\fl\mac.H"\
-	"..\fl\win32.h"\
-	"..\fl\x.h"\
-	"..\src\fl_font.h"\
-	"..\src\fl_set_fonts_mac.cxx"\
-	"..\src\fl_set_fonts_win32.cxx"\
-	"..\src\fl_set_fonts_x.cxx"\
-	"..\src\fl_set_fonts_xft.cxx"\
-	"..\src\flstring.h"\
-	".\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\fl_shadow_box.cxx
-DEP_CPP_FL_SH=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_draw.h"\
-	"..\fl\fl_export.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\Fl_Shared_Image.cxx
-DEP_CPP_FL_SHA=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_bitmap.h"\
-	"..\fl\fl_export.h"\
-	"..\fl\fl_image.h"\
-	"..\fl\fl_pixmap.h"\
-	"..\fl\fl_shared_image.h"\
-	"..\fl\fl_xbm_image.h"\
-	"..\fl\fl_xpm_image.h"\
-	"..\src\flstring.h"\
-	".\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\fl_shortcut.cxx
-DEP_CPP_FL_SHO=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_button.h"\
-	"..\fl\fl_draw.h"\
-	"..\fl\fl_export.h"\
-	"..\fl\fl_group.h"\
-	"..\fl\fl_widget.h"\
-	"..\fl\fl_window.h"\
-	"..\fl\mac.H"\
-	"..\fl\win32.h"\
-	"..\fl\x.h"\
-	"..\src\flstring.h"\
-	".\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\fl_show_colormap.cxx
-DEP_CPP_FL_SHOW=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_draw.h"\
-	"..\fl\fl_export.h"\
-	"..\fl\fl_group.h"\
-	"..\fl\fl_show_colormap.h"\
-	"..\fl\fl_single_window.h"\
-	"..\fl\fl_widget.h"\
-	"..\fl\fl_window.h"\
-	".\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\Fl_Single_Window.cxx
-DEP_CPP_FL_SI=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl_export.h"\
-	"..\fl\fl_group.h"\
-	"..\fl\fl_single_window.h"\
-	"..\fl\fl_widget.h"\
-	"..\fl\fl_window.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\Fl_Slider.cxx
-DEP_CPP_FL_SL=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_draw.h"\
-	"..\fl\fl_export.h"\
-	"..\fl\fl_slider.h"\
-	"..\fl\fl_valuator.h"\
-	"..\fl\fl_widget.h"\
-	"..\src\flstring.h"\
-	".\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\fl_symbols.cxx
-DEP_CPP_FL_SY=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_draw.h"\
-	"..\fl\fl_export.h"\
-	"..\FL\math.h"\
-	"..\src\flstring.h"\
-	".\config.h"\
-	
-NODEP_CPP_FL_SY=\
-	"..\..\..\..\..\usr\include\math.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\Fl_Tabs.cxx
-DEP_CPP_FL_TA=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_draw.h"\
-	"..\fl\fl_export.h"\
-	"..\fl\fl_group.h"\
-	"..\fl\fl_tabs.h"\
-	"..\fl\fl_tooltip.h"\
-	"..\fl\fl_widget.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\Fl_Text_Buffer.cxx
-DEP_CPP_FL_TE=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_export.h"\
-	"..\fl\fl_text_buffer.h"\
-	"..\src\flstring.h"\
-	".\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\Fl_Text_Display.cxx
-DEP_CPP_FL_TEX=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_draw.h"\
-	"..\fl\fl_export.h"\
-	"..\fl\fl_group.h"\
-	"..\fl\fl_scrollbar.h"\
-	"..\fl\fl_slider.h"\
-	"..\fl\fl_text_buffer.h"\
-	"..\fl\fl_text_display.h"\
-	"..\fl\fl_valuator.h"\
-	"..\fl\fl_widget.h"\
-	"..\fl\fl_window.h"\
-	"..\src\flstring.h"\
-	".\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\Fl_Text_Editor.cxx
-DEP_CPP_FL_TEXT=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_ask.h"\
-	"..\fl\fl_draw.h"\
-	"..\fl\fl_export.h"\
-	"..\fl\fl_group.h"\
-	"..\fl\fl_scrollbar.h"\
-	"..\fl\fl_slider.h"\
-	"..\fl\fl_text_buffer.h"\
-	"..\fl\fl_text_display.h"\
-	"..\fl\fl_text_editor.h"\
-	"..\fl\fl_valuator.h"\
-	"..\fl\fl_widget.h"\
-	"..\fl\fl_window.h"\
-	"..\src\flstring.h"\
-	".\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\Fl_Tile.cxx
-DEP_CPP_FL_TI=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_export.h"\
-	"..\fl\fl_group.h"\
-	"..\fl\fl_tile.h"\
-	"..\fl\fl_widget.h"\
-	"..\fl\fl_window.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\Fl_Tiled_Image.cxx
-DEP_CPP_FL_TIL=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_draw.h"\
-	"..\fl\fl_export.h"\
-	"..\fl\fl_image.h"\
-	"..\fl\fl_tiled_image.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\Fl_Tooltip.cxx
-DEP_CPP_FL_TO=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_draw.h"\
-	"..\fl\fl_export.h"\
-	"..\fl\fl_group.h"\
-	"..\fl\fl_menu_window.h"\
-	"..\fl\fl_single_window.h"\
-	"..\fl\fl_tooltip.h"\
-	"..\fl\fl_widget.h"\
-	"..\fl\fl_window.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\fl_utf.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\fl_utf8.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\Fl_Valuator.cxx
-DEP_CPP_FL_VA=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_export.h"\
-	"..\fl\fl_valuator.h"\
-	"..\fl\fl_widget.h"\
-	"..\FL\math.h"\
-	"..\src\flstring.h"\
-	".\config.h"\
-	
-NODEP_CPP_FL_VA=\
-	"..\..\..\..\..\usr\include\math.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\Fl_Value_Input.cxx
-DEP_CPP_FL_VAL=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_export.h"\
-	"..\fl\fl_group.h"\
-	"..\fl\fl_input.h"\
-	"..\fl\fl_input_.h"\
-	"..\fl\fl_valuator.h"\
-	"..\fl\fl_value_input.h"\
-	"..\fl\fl_widget.h"\
-	"..\FL\math.h"\
-	
-NODEP_CPP_FL_VAL=\
-	"..\..\..\..\..\usr\include\math.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\Fl_Value_Output.cxx
-DEP_CPP_FL_VALU=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_draw.h"\
-	"..\fl\fl_export.h"\
-	"..\fl\fl_valuator.h"\
-	"..\fl\fl_value_output.h"\
-	"..\fl\fl_widget.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\Fl_Value_Slider.cxx
-DEP_CPP_FL_VALUE=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_draw.h"\
-	"..\fl\fl_export.h"\
-	"..\fl\fl_slider.h"\
-	"..\fl\fl_valuator.h"\
-	"..\fl\fl_value_slider.h"\
-	"..\fl\fl_widget.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\fl_vertex.cxx
-DEP_CPP_FL_VE=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_draw.h"\
-	"..\fl\fl_export.h"\
-	"..\fl\fl_group.h"\
-	"..\fl\fl_widget.h"\
-	"..\fl\fl_window.h"\
-	"..\fl\mac.H"\
-	"..\FL\math.h"\
-	"..\fl\win32.h"\
-	"..\fl\x.h"\
-	".\config.h"\
-	
-NODEP_CPP_FL_VE=\
-	"..\..\..\..\..\usr\include\math.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\Fl_visual.cxx
-DEP_CPP_FL_VI=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_export.h"\
-	"..\fl\fl_group.h"\
-	"..\fl\fl_widget.h"\
-	"..\fl\fl_window.h"\
-	"..\fl\mac.H"\
-	"..\fl\win32.h"\
-	"..\fl\x.h"\
-	".\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\Fl_Widget.cxx
-DEP_CPP_FL_WI=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_draw.h"\
-	"..\fl\fl_export.h"\
-	"..\fl\fl_group.h"\
-	"..\fl\fl_tooltip.h"\
-	"..\fl\fl_widget.h"\
-	"..\src\flstring.h"\
-	".\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\Fl_Window.cxx
-DEP_CPP_FL_WIN=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_draw.h"\
-	"..\fl\fl_export.h"\
-	"..\fl\fl_group.h"\
-	"..\fl\fl_widget.h"\
-	"..\fl\fl_window.h"\
-	"..\src\flstring.h"\
-	".\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\Fl_Window_fullscreen.cxx
-DEP_CPP_FL_WIND=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_export.h"\
-	"..\fl\fl_group.h"\
-	"..\fl\fl_widget.h"\
-	"..\fl\fl_window.h"\
-	"..\fl\mac.H"\
-	"..\fl\win32.h"\
-	"..\fl\x.h"\
-	".\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\Fl_Window_hotspot.cxx
-DEP_CPP_FL_WINDO=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_export.h"\
-	"..\fl\fl_group.h"\
-	"..\fl\fl_widget.h"\
-	"..\fl\fl_window.h"\
-	"..\fl\mac.H"\
-	"..\fl\win32.h"\
-	"..\fl\x.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\Fl_Window_iconize.cxx
-DEP_CPP_FL_WINDOW=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl_export.h"\
-	"..\fl\fl_group.h"\
-	"..\fl\fl_widget.h"\
-	"..\fl\fl_window.h"\
-	"..\fl\mac.H"\
-	"..\fl\win32.h"\
-	"..\fl\x.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\Fl_Wizard.cxx
-DEP_CPP_FL_WIZ=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl_draw.h"\
-	"..\fl\fl_export.h"\
-	"..\fl\fl_group.h"\
-	"..\fl\fl_widget.h"\
-	"..\fl\fl_window.h"\
-	"..\fl\fl_wizard.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\Fl_x.cxx
-DEP_CPP_FL_X_=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_export.h"\
-	"..\fl\fl_group.h"\
-	"..\fl\fl_tooltip.h"\
-	"..\fl\fl_widget.h"\
-	"..\fl\fl_window.h"\
-	"..\fl\mac.H"\
-	"..\fl\win32.h"\
-	"..\fl\x.h"\
-	"..\src\flstring.h"\
-	".\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\Fl_XBM_Image.cxx
-DEP_CPP_FL_XB=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_bitmap.h"\
-	"..\fl\fl_export.h"\
-	"..\fl\fl_image.h"\
-	"..\fl\fl_xbm_image.h"\
-	"..\src\flstring.h"\
-	".\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\Fl_XPM_Image.cxx
-DEP_CPP_FL_XP=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_export.h"\
-	"..\fl\fl_image.h"\
-	"..\fl\fl_pixmap.h"\
-	"..\fl\fl_xpm_image.h"\
-	"..\src\flstring.h"\
-	".\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\flstring.c
-DEP_CPP_FLSTR=\
-	"..\fl\fl_export.h"\
-	"..\src\flstring.h"\
-	".\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\forms_bitmap.cxx
-DEP_CPP_FORMS=\
-	"..\fl\enumerations.h"\
-	"..\fl\filename.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_ask.h"\
-	"..\fl\fl_bitmap.h"\
-	"..\fl\fl_box.h"\
-	"..\fl\fl_browser.h"\
-	"..\fl\fl_browser_.h"\
-	"..\fl\fl_button.h"\
-	"..\fl\fl_chart.h"\
-	"..\fl\fl_check_button.h"\
-	"..\fl\fl_choice.h"\
-	"..\fl\fl_clock.h"\
-	"..\fl\fl_counter.h"\
-	"..\fl\fl_dial.h"\
-	"..\fl\fl_double_window.h"\
-	"..\fl\fl_draw.h"\
-	"..\fl\fl_export.h"\
-	"..\FL\Fl_File_Browser.H"\
-	"..\fl\fl_file_chooser.h"\
-	"..\fl\fl_file_icon.h"\
-	"..\fl\fl_file_input.h"\
-	"..\fl\Fl_FormsBitmap.H"\
-	"..\fl\Fl_FormsPixmap.H"\
-	"..\fl\Fl_Free.H"\
-	"..\fl\fl_group.h"\
-	"..\fl\fl_image.h"\
-	"..\fl\fl_input.h"\
-	"..\fl\fl_input_.h"\
-	"..\fl\fl_light_button.h"\
-	"..\fl\fl_menu_.h"\
-	"..\fl\fl_menu_button.h"\
-	"..\fl\fl_menu_item.h"\
-	"..\fl\fl_pixmap.h"\
-	"..\fl\fl_positioner.h"\
-	"..\fl\fl_preferences.h"\
-	"..\fl\fl_return_button.h"\
-	"..\fl\fl_round_button.h"\
-	"..\fl\fl_scrollbar.h"\
-	"..\fl\fl_show_colormap.h"\
-	"..\fl\fl_slider.h"\
-	"..\fl\fl_tile.h"\
-	"..\FL\Fl_Timer.H"\
-	"..\fl\fl_valuator.h"\
-	"..\fl\fl_value_slider.h"\
-	"..\fl\fl_widget.h"\
-	"..\fl\fl_window.h"\
-	"..\fl\forms.h"\
-	
-NODEP_CPP_FORMS=\
-	"..\..\..\..\..\usr\include\dirent.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\forms_compatability.cxx
-DEP_CPP_FORMS_=\
-	"..\fl\enumerations.h"\
-	"..\fl\filename.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_ask.h"\
-	"..\fl\fl_bitmap.h"\
-	"..\fl\fl_box.h"\
-	"..\fl\fl_browser.h"\
-	"..\fl\fl_browser_.h"\
-	"..\fl\fl_button.h"\
-	"..\fl\fl_chart.h"\
-	"..\fl\fl_check_button.h"\
-	"..\fl\fl_choice.h"\
-	"..\fl\fl_clock.h"\
-	"..\fl\fl_counter.h"\
-	"..\fl\fl_dial.h"\
-	"..\fl\fl_double_window.h"\
-	"..\fl\fl_draw.h"\
-	"..\fl\fl_export.h"\
-	"..\FL\Fl_File_Browser.H"\
-	"..\fl\fl_file_chooser.h"\
-	"..\fl\fl_file_icon.h"\
-	"..\fl\fl_file_input.h"\
-	"..\fl\Fl_FormsBitmap.H"\
-	"..\fl\Fl_FormsPixmap.H"\
-	"..\fl\Fl_Free.H"\
-	"..\fl\fl_group.h"\
-	"..\fl\fl_image.h"\
-	"..\fl\fl_input.h"\
-	"..\fl\fl_input_.h"\
-	"..\fl\fl_light_button.h"\
-	"..\fl\fl_menu_.h"\
-	"..\fl\fl_menu_button.h"\
-	"..\fl\fl_menu_item.h"\
-	"..\fl\fl_pixmap.h"\
-	"..\fl\fl_positioner.h"\
-	"..\fl\fl_preferences.h"\
-	"..\fl\fl_repeat_button.h"\
-	"..\fl\fl_return_button.h"\
-	"..\fl\fl_round_button.h"\
-	"..\fl\fl_scrollbar.h"\
-	"..\fl\fl_show_colormap.h"\
-	"..\fl\fl_slider.h"\
-	"..\fl\fl_tile.h"\
-	"..\FL\Fl_Timer.H"\
-	"..\fl\fl_valuator.h"\
-	"..\fl\fl_value_slider.h"\
-	"..\fl\fl_widget.h"\
-	"..\fl\fl_window.h"\
-	"..\fl\forms.h"\
-	
-NODEP_CPP_FORMS_=\
-	"..\..\..\..\..\usr\include\dirent.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\forms_free.cxx
-DEP_CPP_FORMS_F=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_export.h"\
-	"..\fl\Fl_Free.H"\
-	"..\fl\fl_widget.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\forms_fselect.cxx
-DEP_CPP_FORMS_FS=\
-	"..\fl\enumerations.h"\
-	"..\fl\filename.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_ask.h"\
-	"..\fl\fl_bitmap.h"\
-	"..\fl\fl_box.h"\
-	"..\fl\fl_browser.h"\
-	"..\fl\fl_browser_.h"\
-	"..\fl\fl_button.h"\
-	"..\fl\fl_chart.h"\
-	"..\fl\fl_check_button.h"\
-	"..\fl\fl_choice.h"\
-	"..\fl\fl_clock.h"\
-	"..\fl\fl_counter.h"\
-	"..\fl\fl_dial.h"\
-	"..\fl\fl_double_window.h"\
-	"..\fl\fl_draw.h"\
-	"..\fl\fl_export.h"\
-	"..\FL\Fl_File_Browser.H"\
-	"..\fl\fl_file_chooser.h"\
-	"..\fl\fl_file_icon.h"\
-	"..\fl\fl_file_input.h"\
-	"..\fl\Fl_FormsBitmap.H"\
-	"..\fl\Fl_FormsPixmap.H"\
-	"..\fl\Fl_Free.H"\
-	"..\fl\fl_group.h"\
-	"..\fl\fl_image.h"\
-	"..\fl\fl_input.h"\
-	"..\fl\fl_input_.h"\
-	"..\fl\fl_light_button.h"\
-	"..\fl\fl_menu_.h"\
-	"..\fl\fl_menu_button.h"\
-	"..\fl\fl_menu_item.h"\
-	"..\fl\fl_pixmap.h"\
-	"..\fl\fl_positioner.h"\
-	"..\fl\fl_preferences.h"\
-	"..\fl\fl_return_button.h"\
-	"..\fl\fl_round_button.h"\
-	"..\fl\fl_scrollbar.h"\
-	"..\fl\fl_show_colormap.h"\
-	"..\fl\fl_slider.h"\
-	"..\fl\fl_tile.h"\
-	"..\FL\Fl_Timer.H"\
-	"..\fl\fl_valuator.h"\
-	"..\fl\fl_value_slider.h"\
-	"..\fl\fl_widget.h"\
-	"..\fl\fl_window.h"\
-	"..\fl\forms.h"\
-	"..\src\flstring.h"\
-	".\config.h"\
-	
-NODEP_CPP_FORMS_FS=\
-	"..\..\..\..\..\usr\include\dirent.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\forms_pixmap.cxx
-DEP_CPP_FORMS_P=\
-	"..\fl\enumerations.h"\
-	"..\fl\filename.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_ask.h"\
-	"..\fl\fl_bitmap.h"\
-	"..\fl\fl_box.h"\
-	"..\fl\fl_browser.h"\
-	"..\fl\fl_browser_.h"\
-	"..\fl\fl_button.h"\
-	"..\fl\fl_chart.h"\
-	"..\fl\fl_check_button.h"\
-	"..\fl\fl_choice.h"\
-	"..\fl\fl_clock.h"\
-	"..\fl\fl_counter.h"\
-	"..\fl\fl_dial.h"\
-	"..\fl\fl_double_window.h"\
-	"..\fl\fl_draw.h"\
-	"..\fl\fl_export.h"\
-	"..\FL\Fl_File_Browser.H"\
-	"..\fl\fl_file_chooser.h"\
-	"..\fl\fl_file_icon.h"\
-	"..\fl\fl_file_input.h"\
-	"..\fl\Fl_FormsBitmap.H"\
-	"..\fl\Fl_FormsPixmap.H"\
-	"..\fl\Fl_Free.H"\
-	"..\fl\fl_group.h"\
-	"..\fl\fl_image.h"\
-	"..\fl\fl_input.h"\
-	"..\fl\fl_input_.h"\
-	"..\fl\fl_light_button.h"\
-	"..\fl\fl_menu_.h"\
-	"..\fl\fl_menu_button.h"\
-	"..\fl\fl_menu_item.h"\
-	"..\fl\fl_pixmap.h"\
-	"..\fl\fl_positioner.h"\
-	"..\fl\fl_preferences.h"\
-	"..\fl\fl_return_button.h"\
-	"..\fl\fl_round_button.h"\
-	"..\fl\fl_scrollbar.h"\
-	"..\fl\fl_show_colormap.h"\
-	"..\fl\fl_slider.h"\
-	"..\fl\fl_tile.h"\
-	"..\FL\Fl_Timer.H"\
-	"..\fl\fl_valuator.h"\
-	"..\fl\fl_value_slider.h"\
-	"..\fl\fl_widget.h"\
-	"..\fl\fl_window.h"\
-	"..\fl\forms.h"\
-	
-NODEP_CPP_FORMS_P=\
-	"..\..\..\..\..\usr\include\dirent.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\forms_timer.cxx
-DEP_CPP_FORMS_T=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_draw.h"\
-	"..\fl\fl_export.h"\
-	"..\FL\Fl_Timer.H"\
-	"..\fl\fl_widget.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\freeglut_geometry.cxx
-DEP_CPP_FREEG=\
-	"..\FL\gl.h"\
-	"..\FL\glut.h"\
-	"..\src\flstring.h"\
-	".\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\freeglut_stroke_mono_roman.cxx
-DEP_CPP_FREEGL=\
-	"..\FL\gl.h"\
-	"..\FL\glut.h"\
-	"..\src\flstring.h"\
-	".\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\freeglut_stroke_roman.cxx
-DEP_CPP_FREEGLU=\
-	"..\FL\gl.h"\
-	"..\FL\glut.h"\
-	"..\src\flstring.h"\
-	".\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\freeglut_teapot.cxx
-DEP_CPP_FREEGLUT=\
-	"..\FL\gl.h"\
-	"..\FL\glut.h"\
-	"..\src\flstring.h"\
-	".\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\gl_draw.cxx
-DEP_CPP_GL_DR=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_draw.h"\
-	"..\fl\fl_export.h"\
-	"..\fl\fl_group.h"\
-	"..\fl\fl_widget.h"\
-	"..\fl\fl_window.h"\
-	"..\FL\gl.h"\
-	"..\fl\mac.H"\
-	"..\fl\win32.h"\
-	"..\fl\x.h"\
-	"..\src\fl_font.h"\
-	"..\src\Fl_Gl_Choice.H"\
-	"..\src\flstring.h"\
-	".\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\gl_start.cxx
-DEP_CPP_GL_ST=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_draw.h"\
-	"..\fl\fl_export.h"\
-	"..\fl\fl_group.h"\
-	"..\fl\fl_widget.h"\
-	"..\fl\fl_window.h"\
-	"..\FL\gl.h"\
-	"..\fl\mac.H"\
-	"..\fl\win32.h"\
-	"..\fl\x.h"\
-	"..\src\Fl_Gl_Choice.H"\
-	".\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\glut_compatability.cxx
-DEP_CPP_GLUT_=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_export.h"\
-	"..\fl\Fl_Gl_Window.H"\
-	"..\fl\fl_group.h"\
-	"..\fl\fl_image.h"\
-	"..\fl\fl_menu_item.h"\
-	"..\fl\fl_widget.h"\
-	"..\fl\fl_window.h"\
-	"..\FL\glut.h"\
-	".\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\glut_font.cxx
-DEP_CPP_GLUT_F=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_export.h"\
-	"..\fl\Fl_Gl_Window.H"\
-	"..\fl\fl_group.h"\
-	"..\fl\fl_widget.h"\
-	"..\fl\fl_window.h"\
-	"..\FL\gl.h"\
-	"..\FL\glut.h"\
-	".\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\xutf8\is_right2left.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\xutf8\is_spacing.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\numericsort.c
-DEP_CPP_NUMER=\
-	"..\fl\filename.h"\
-	"..\fl\fl_export.h"\
-	".\config.h"\
-	
-NODEP_CPP_NUMER=\
-	"..\..\..\..\..\usr\include\dirent.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\scandir.c
-DEP_CPP_SCAND=\
-	"..\fl\filename.h"\
-	"..\fl\fl_export.h"\
-	"..\src\flstring.h"\
-	"..\src\scandir_win32.c"\
-	".\config.h"\
-	
-NODEP_CPP_SCAND=\
-	"..\..\..\..\..\usr\include\dirent.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\screen_xywh.cxx
-DEP_CPP_SCREE=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_export.h"\
-	"..\fl\fl_group.h"\
-	"..\fl\fl_widget.h"\
-	"..\fl\fl_window.h"\
-	"..\fl\mac.H"\
-	"..\fl\win32.h"\
-	"..\fl\x.h"\
-	".\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\vsnprintf.c
-DEP_CPP_VSNPR=\
-	"..\fl\fl_export.h"\
-	"..\src\flstring.h"\
-	".\config.h"\
-	
-# End Source File
-# End Target
-# End Project
author	Fabien Costantini <fabien@onepost.net>	2008-10-19 16:40:38 +0000
committer	Fabien Costantini <fabien@onepost.net>	2008-10-19 16:40:38 +0000
commit	f3180baff0cf3958e4eef70a634def5d46ec2244 (patch)
tree	6d38933a6c0ba1b11cb5c801776a14246dc3b1b6
parent	a8450fee4f0a32d5bc8e99e7901e9aabc7371440 (diff)