diff --git a/ase/awk/aseawk.bdsproj b/ase/awk/aseawk.bdsproj
index 0f5b1a1e..2a21ae8a 100644
--- a/ase/awk/aseawk.bdsproj
+++ b/ase/awk/aseawk.bdsproj
@@ -14,7 +14,7 @@
 		</Source>
 		<BCBPROJECT>
       <project version="10.0">
-        <property category="build.config" name="active" value="0"/>
+        <property category="build.config" name="active" value="1"/>
         <property category="build.config" name="count" value="1"/>
         <property category="build.config" name="excludedefaultforzero" value="0"/>
         <property category="build.config.0" name="builddir" value="Debug"/>
@@ -256,6 +256,12 @@
         </Linker>
       </IDEOPTIONS>
     </BCBPROJECT>
-		<buildevents/>
+		<buildevents>
+      <buildevent file="aseawk.bdsproj">
+        <precompile mode="0" cancancel="0" capture="-1" showconsole="0">mkdir $(PROJECTDIR)..\release\win32\bds
+mkdir $(PROJECTDIR)..\debug\win32\bds
+</precompile>
+      </buildevent>
+    </buildevents>
 	</CPlusPlusBuilder.Personality>
 </BorlandProject>
diff --git a/ase/awk/awk.dsp b/ase/awk/awk.dsp
index 22a149b3..f2346e37 100644
--- a/ase/awk/awk.dsp
+++ b/ase/awk/awk.dsp
@@ -4,7 +4,7 @@
 
 # TARGTYPE "Win32 (x86) Static Library" 0x0104
 
-CFG=awk - Win32 Release DLL
+CFG=awk - Win32 Release
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
@@ -13,7 +13,7 @@ CFG=awk - Win32 Release DLL
 !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 "awk.mak" CFG="awk - Win32 Release DLL"
+!MESSAGE NMAKE /f "awk.mak" CFG="awk - Win32 Release"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
@@ -37,8 +37,8 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
+# PROP Output_Dir "../release/win32/vs60"
+# PROP Intermediate_Dir "release/win32/vs60"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 MTL=midl.exe
@@ -54,7 +54,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\release\aseawk.lib"
+# ADD LIB32 /nologo /out:"../release/win32/vs60/aseawk.lib"
 
 !ELSEIF  "$(CFG)" == "awk - Win32 Debug"
 
@@ -65,8 +65,8 @@ LIB32=link.exe -lib
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
+# PROP Output_Dir "../debug/win32/vs60"
+# PROP Intermediate_Dir "debug/win32/vs60"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 MTL=midl.exe
@@ -82,7 +82,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\debug\aseawk.lib"
+# ADD LIB32 /nologo /out:"../debug/win32/vs60/aseawk.lib"
 
 !ENDIF 
 
diff --git a/ase/lsp/lsp.dsp b/ase/lsp/lsp.dsp
index 5307683a..4f25fa65 100644
--- a/ase/lsp/lsp.dsp
+++ b/ase/lsp/lsp.dsp
@@ -37,12 +37,12 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
+# PROP Output_Dir "../release/win32/vs60"
+# PROP Intermediate_Dir "release/win32/vs60"
 # PROP Target_Dir ""
 MTL=midl.exe
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "../.." /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../.." /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
 BSC32=bscmake.exe
@@ -50,7 +50,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\release\aselsp.lib"
+# ADD LIB32 /nologo /out:"../release/win32/vs60/aselsp.lib"
 
 !ELSEIF  "$(CFG)" == "lsp - Win32 Debug"
 
@@ -61,12 +61,12 @@ LIB32=link.exe -lib
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
+# PROP Output_Dir "../debug/win32/vs60"
+# PROP Intermediate_Dir "debug/win32/vs60"
 # PROP Target_Dir ""
 MTL=midl.exe
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "../.." /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../.." /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe
@@ -74,7 +74,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\debug\aselsp.lib"
+# ADD LIB32 /nologo /out:"../debug/win32/vs60/aselsp.lib"
 
 !ENDIF 
 
diff --git a/ase/lsp/read.c b/ase/lsp/read.c
index 7398b2d0..f7e22188 100644
--- a/ase/lsp/read.c
+++ b/ase/lsp/read.c
@@ -1,5 +1,5 @@
 /*
- * $Id: read.c,v 1.25 2006-10-26 14:22:01 bacon Exp $
+ * $Id: read.c,v 1.26 2006-10-27 08:31:06 bacon Exp $
  */
 
 #include <ase/lsp/lsp_i.h>
@@ -347,7 +347,6 @@ static int read_token (ase_lsp_t* lsp)
 	return 0;
 }
 
-#if 0
 static int read_number (ase_lsp_t* lsp, int negative)
 {
 	ase_long_t ivalue = 0;
@@ -388,8 +387,8 @@ static int read_number (ase_lsp_t* lsp, int negative)
 
 	return 0;
 }
-#endif
 
+#if 0
 static int __read_number (ase_lsp_t* lsp, int negative)
 {
 	ase_cint_t c;
@@ -484,6 +483,7 @@ static int __read_number (ase_lsp_t* lsp, int negative)
 
 	return 0;
 }
+#endif
 
 static int read_ident (ase_lsp_t* lsp)
 {
diff --git a/ase/test/awk/test_awk.dsp b/ase/test/awk/test_awk.dsp
index 0518da25..4681db76 100644
--- a/ase/test/awk/test_awk.dsp
+++ b/ase/test/awk/test_awk.dsp
@@ -37,8 +37,8 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
+# PROP Output_Dir "../../release/win32/vs60"
+# PROP Intermediate_Dir "release/win32/vs60"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
@@ -50,7 +50,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 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 aseawk.lib  xpbas.lib user32.lib kernel32.lib /nologo /subsystem:console /machine:I386 /out:"..\..\..\release\awk.exe" /libpath:"..\..\release" /libpath:"\projects\xpkit\release"
+# ADD LINK32 aseawk.lib xpbas.lib user32.lib kernel32.lib /nologo /subsystem:console /machine:I386 /out:"../../release/win32/vs60/awk.exe" /libpath:"$(OutDir)" /libpath:"\projects\xpkit\release"
 
 !ELSEIF  "$(CFG)" == "test_awk - Win32 Debug"
 
@@ -61,8 +61,8 @@ LINK32=link.exe
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
+# PROP Output_Dir "../../debug/win32/vs60"
+# PROP Intermediate_Dir "debug/win32/vs60"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
@@ -74,7 +74,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 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 aseawk.lib xpbas.lib user32.lib kernel32.lib /nologo /subsystem:console /debug /machine:I386 /out:"..\..\..\debug\awk.exe" /pdbtype:sept /libpath:"..\..\debug" /libpath:"\projects\xpkit\debug"
+# ADD LINK32 aseawk.lib xpbas.lib user32.lib kernel32.lib /nologo /subsystem:console /debug /machine:I386 /out:"../../debug/win32/vs60/awk.exe" /pdbtype:sept /libpath:"$(OutDir)" /libpath:"\projects\xpkit\debug"
 
 !ENDIF 
 
diff --git a/ase/test/lsp/test_lsp.dsp b/ase/test/lsp/test_lsp.dsp
index 39ff2f5a..822b30e4 100644
--- a/ase/test/lsp/test_lsp.dsp
+++ b/ase/test/lsp/test_lsp.dsp
@@ -37,8 +37,8 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
+# PROP Output_Dir "../../release/win32/vs60"
+# PROP Intermediate_Dir "release/win32/vs60"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
@@ -50,7 +50,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 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 aselsp.lib  xpbas.lib user32.lib kernel32.lib /nologo /subsystem:console /machine:I386 /out:"..\..\..\release\lsp.exe" /libpath:"..\..\release" /libpath:"\projects\xpkit\release"
+# ADD LINK32 aselsp.lib xpbas.lib user32.lib kernel32.lib /nologo /subsystem:console /machine:I386 /out:"../../release/win32/vs60/lsp.exe" /libpath:"$(OutDir)" /libpath:"\projects\xpkit\release"
 
 !ELSEIF  "$(CFG)" == "test_lsp - Win32 Debug"
 
@@ -61,8 +61,8 @@ LINK32=link.exe
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
+# PROP Output_Dir "../../debug/win32/vs60"
+# PROP Intermediate_Dir "debug/win32/vs60"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
@@ -74,7 +74,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 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 aselsp.lib xpbas.lib user32.lib kernel32.lib /nologo /subsystem:console /debug /machine:I386 /out:"..\..\..\debug\lsp.exe" /pdbtype:sept /libpath:"..\..\debug" /libpath:"\projects\xpkit\debug"
+# ADD LINK32 aselsp.lib xpbas.lib user32.lib kernel32.lib /nologo /subsystem:console /debug /machine:I386 /out:"../../debug/win32/vs60/lsp.exe" /pdbtype:sept /libpath:"$(OutDir)" /libpath:"\projects\xpkit\debug"
 
 !ENDIF