apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r661054 - in /apr/apr/branches/1.3.x: ./ build/ test/ test/internal/
Date Wed, 28 May 2008 19:19:21 GMT
Author: wrowe
Date: Wed May 28 12:19:20 2008
New Revision: 661054

URL: http://svn.apache.org/viewvc?rev=661054&view=rev
Log:
Revert to 1.2.x style build for binary compatibility; it was never
assumed when these changes went into trunk that httpd would ship
the 1.3.x release with httpd 2.2.x


Added:
    apr/apr/branches/1.3.x/build/apr_app.dsp
      - copied unchanged from r660535, apr/apr/branches/1.2.x/build/apr_app.dsp
    apr/apr/branches/1.3.x/build/libapr_app.dsp
      - copied unchanged from r660535, apr/apr/branches/1.2.x/build/libapr_app.dsp
    apr/apr/branches/1.3.x/test/internal/Makefile.win
      - copied unchanged from r660535, apr/apr/branches/1.2.x/test/internal/Makefile.win
Removed:
    apr/apr/branches/1.3.x/build/aprapp.dsp
    apr/apr/branches/1.3.x/build/libaprapp.dsp
    apr/apr/branches/1.3.x/build/preaprapp.dsp
    apr/apr/branches/1.3.x/build/prelibaprapp.dsp
Modified:
    apr/apr/branches/1.3.x/Makefile.win
    apr/apr/branches/1.3.x/apr.dsp
    apr/apr/branches/1.3.x/apr.dsw
    apr/apr/branches/1.3.x/libapr.dsp
    apr/apr/branches/1.3.x/test/Makefile.win
    apr/apr/branches/1.3.x/test/testall.dsw
    apr/apr/branches/1.3.x/test/testdll.dsp
    apr/apr/branches/1.3.x/test/testlib.dsp

Modified: apr/apr/branches/1.3.x/Makefile.win
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.3.x/Makefile.win?rev=661054&r1=661053&r2=661054&view=diff
==============================================================================
--- apr/apr/branches/1.3.x/Makefile.win (original)
+++ apr/apr/branches/1.3.x/Makefile.win Wed May 28 12:19:20 2008
@@ -18,8 +18,8 @@
 #
 #     ARCH="Win32 Release"
 #     ARCH="Win32 Debug"
-#     ARCH="Win32 Release9x"
-#     ARCH="Win32 Debug9x"
+#     ARCH="Win32 ReleaseNT"
+#     ARCH="Win32 DebugNT"
 #     ARCH="x64 Release"
 #     ARCH="x64 Debug"
 #
@@ -66,14 +66,14 @@
 SLNARCH=Debug|Win32
 ARCHOSPATH=Debug
 LIBSOSPATH=LibD
-!ELSEIF "$(ARCH)" == "Win32 Release9x"
-SLNARCH=Release9x|Win32
-ARCHOSPATH=9x\Release
-LIBSOSPATH=9x\LibR
-!ELSEIF "$(ARCH)" == "Win32 Debug9x"
-SLNARCH=Debug9x|Win32
-ARCHOSPATH=9x\Debug
-LIBSOSPATH=9x\LibD
+!ELSEIF "$(ARCH)" == "Win32 ReleaseNT"
+SLNARCH=ReleaseNT|Win32
+ARCHOSPATH=NT\Release
+LIBSOSPATH=NT\LibR
+!ELSEIF "$(ARCH)" == "Win32 DebugNT"
+SLNARCH=DebugNT|Win32
+ARCHOSPATH=NT\Debug
+LIBSOSPATH=NT\LibD
 !ELSEIF "$(ARCH)" == "x64 Release"
 SLNARCH=Release|x64
 ARCHOSPATH=x64\Release
@@ -108,38 +108,38 @@
 	$(MAKE) $(MAKEOPT) -f apr.mak         CFG="apr - $(ARCH)" RECURSE=0 $(CTARGET)
 	$(MAKE) $(MAKEOPT) -f libapr.mak      CFG="libapr - $(ARCH)" RECURSE=0 $(CTARGET)
 	cd build
-	 $(MAKE) $(MAKEOPT) -f aprapp.mak     CFG="aprapp - $(ARCH)" RECURSE=0 $(CTARGET)
-	 $(MAKE) $(MAKEOPT) -f libaprapp.mak  CFG="libaprapp - $(ARCH)" RECURSE=0 $(CTARGET)
+	 $(MAKE) $(MAKEOPT) -f apr_app.mak    CFG="apr_app - $(ARCH)" RECURSE=0 $(CTARGET)
+	 $(MAKE) $(MAKEOPT) -f libapr_app.mak CFG="libapr_app - $(ARCH)" RECURSE=0 $(CTARGET)
 	cd ..
 
 !ELSEIF $(USESLN) == 1
 
 clean:
-	-devenv apr.sln /useenv /clean "$(SLNARCH)" /project libaprapp
+	-devenv apr.sln /useenv /clean "$(SLNARCH)" /project libapr_app
 	-devenv apr.sln /useenv /clean "$(SLNARCH)" /project libapr
-	-devenv apr.sln /useenv /clean "$(SLNARCH)" /project aprapp
+	-devenv apr.sln /useenv /clean "$(SLNARCH)" /project apr_app
 	-devenv apr.sln /useenv /clean "$(SLNARCH)" /project apr
 
 buildall:
 	devenv apr.sln /useenv /build "$(SLNARCH)" /project apr
-	devenv apr.sln /useenv /build "$(SLNARCH)" /project aprapp
+	devenv apr.sln /useenv /build "$(SLNARCH)" /project apr_app
 	devenv apr.sln /useenv /build "$(SLNARCH)" /project libapr
-	devenv apr.sln /useenv /build "$(SLNARCH)" /project libaprapp
+	devenv apr.sln /useenv /build "$(SLNARCH)" /project libapr_app
 
 !ELSE
 #	$(USEDSP) == 1
 
 clean:
-	-msdev apr.dsw /USEENV /MAKE "libaprapp - $(ARCH)" /CLEAN
+	-msdev apr.dsw /USEENV /MAKE "libapr_app - $(ARCH)" /CLEAN
 	-msdev apr.dsw /USEENV /MAKE "libapr - $(ARCH)" /CLEAN
-	-msdev apr.dsw /USEENV /MAKE "aprapp - $(ARCH)" /CLEAN
+	-msdev apr.dsw /USEENV /MAKE "apr_app - $(ARCH)" /CLEAN
 	-msdev apr.dsw /USEENV /MAKE "apr - $(ARCH)" /CLEAN
 
 buildall:
 	@msdev apr.dsw /USEENV /MAKE "apr - $(ARCH)"
-	@msdev apr.dsw /USEENV /MAKE "aprapp - $(ARCH)"
+	@msdev apr.dsw /USEENV /MAKE "apr_app - $(ARCH)"
 	@msdev apr.dsw /USEENV /MAKE "libapr - $(ARCH)"
-	@msdev apr.dsw /USEENV /MAKE "libaprapp - $(ARCH)"
+	@msdev apr.dsw /USEENV /MAKE "libapr_app - $(ARCH)"
 
 !ENDIF
 
@@ -168,10 +168,6 @@
 	xcopy include\*.h		"$(PREFIX)\include\" /d < .a
 	copy $(LIBSOSPATH)\apr-1.lib		"$(PREFIX)\lib\" <.y
 	copy $(LIBSOSPATH)\apr-1.pdb		"$(PREFIX)\lib\" <.y
-	copy $(LIBSOSPATH)\aprapp-1.lib		"$(PREFIX)\lib\" <.y
-	copy $(LIBSOSPATH)\aprapp-1.pdb		"$(PREFIX)\lib\" <.y
-	copy $(LIBSOSPATH)\libaprapp-1.lib	"$(PREFIX)\lib\" <.y
-	copy $(LIBSOSPATH)\libaprapp-1.pdb	"$(PREFIX)\lib\" <.y
 	copy $(ARCHOSPATH)\libapr-1.lib		"$(PREFIX)\lib\" <.y
 	copy $(ARCHOSPATH)\libapr-1.exp		"$(PREFIX)\lib\" <.y
 	copy $(ARCHOSPATH)\libapr-1.dll		"$(PREFIX)\bin\" <.y

Modified: apr/apr/branches/1.3.x/apr.dsp
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.3.x/apr.dsp?rev=661054&r1=661053&r2=661054&view=diff
==============================================================================
--- apr/apr/branches/1.3.x/apr.dsp (original)
+++ apr/apr/branches/1.3.x/apr.dsp Wed May 28 12:19:20 2008
@@ -19,8 +19,8 @@
 !MESSAGE 
 !MESSAGE "apr - Win32 Release" (based on "Win32 (x86) Static Library")
 !MESSAGE "apr - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "apr - Win32 Release9x" (based on "Win32 (x86) Static Library")
-!MESSAGE "apr - Win32 Debug9x" (based on "Win32 (x86) Static Library")
+!MESSAGE "apr - Win32 ReleaseNT" (based on "Win32 (x86) Static Library")
+!MESSAGE "apr - Win32 DebugNT" (based on "Win32 (x86) Static Library")
 !MESSAGE "apr - x64 Release" (based on "Win32 (x86) Static Library")
 !MESSAGE "apr - x64 Debug" (based on "Win32 (x86) Static Library")
 !MESSAGE 
@@ -45,7 +45,7 @@
 # PROP Intermediate_Dir "LibR"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
-# ADD CPP /nologo /MD /W3 /Zi /O2 /Oy- /I "./include" /I "./include/arch" /I "./include/arch/win32"
/I "./include/arch/unix" /D "NDEBUG" /D "APR_DECLARE_STATIC" /D "WIN32" /D "WINNT" /D "_WINDOWS"
/Fo"$(INTDIR)\" /Fd"$(OUTDIR)\apr-1" /FD /c
+# ADD CPP /nologo /MD /W3 /Zi /O2 /Oy- /I "./include" /I "./include/arch" /I "./include/arch/win32"
/I "./include/arch/unix" /D "NDEBUG" /D "APR_DECLARE_STATIC" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\"
/Fd"$(OUTDIR)\apr-1" /FD /c
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
 BSC32=bscmake.exe
@@ -69,7 +69,7 @@
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MDd /W3 /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /EHsc /c
-# ADD CPP /nologo /MDd /W3 /Zi /Od /I "./include" /I "./include/arch" /I "./include/arch/win32"
/I "./include/arch/unix" /D "_DEBUG" /D "APR_DECLARE_STATIC" /D "WIN32" /D "WINNT" /D "_WINDOWS"
/Fo"$(INTDIR)\" /Fd"$(OUTDIR)\apr-1" /FD /EHsc /c
+# ADD CPP /nologo /MDd /W3 /Zi /Od /I "./include" /I "./include/arch" /I "./include/arch/win32"
/I "./include/arch/unix" /D "_DEBUG" /D "APR_DECLARE_STATIC" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\"
/Fd"$(OUTDIR)\apr-1" /FD /EHsc /c
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe
@@ -79,20 +79,20 @@
 # ADD BASE LIB32 /nologo
 # ADD LIB32 /nologo /out:"LibD\apr-1.lib"
 
-!ELSEIF  "$(CFG)" == "apr - Win32 Release9x"
+!ELSEIF  "$(CFG)" == "apr - Win32 ReleaseNT"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "9x\LibR"
-# PROP BASE Intermediate_Dir "9x\LibR"
+# PROP BASE Output_Dir "NT\LibR"
+# PROP BASE Intermediate_Dir "NT\LibR"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "9x\LibR"
-# PROP Intermediate_Dir "9x\LibR"
+# PROP Output_Dir "NT\LibR"
+# PROP Intermediate_Dir "NT\LibR"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
-# ADD CPP /nologo /MD /W3 /Zi /O2 /Oy- /I "./include" /I "./include/arch" /I "./include/arch/win32"
/I "./include/arch/unix" /D "NDEBUG" /D "APR_DECLARE_STATIC" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\"
/Fd"$(OUTDIR)\apr-1" /FD /c
+# ADD CPP /nologo /MD /W3 /Zi /O2 /Oy- /I "./include" /I "./include/arch" /I "./include/arch/win32"
/I "./include/arch/unix" /D "NDEBUG" /D "APR_DECLARE_STATIC" /D "WINNT" /D "WIN32" /D "_WINDOWS"
/Fo"$(INTDIR)\" /Fd"$(OUTDIR)\apr-1" /FD /c
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
 BSC32=bscmake.exe
@@ -100,23 +100,23 @@
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"9x\LibR\apr-1.lib"
+# ADD LIB32 /nologo /out:"NT\LibR\apr-1.lib"
 
-!ELSEIF  "$(CFG)" == "apr - Win32 Debug9x"
+!ELSEIF  "$(CFG)" == "apr - Win32 DebugNT"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "9x\LibD"
-# PROP BASE Intermediate_Dir "9x\LibD"
+# PROP BASE Output_Dir "NT\LibD"
+# PROP BASE Intermediate_Dir "NT\LibD"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "9x\LibD"
-# PROP Intermediate_Dir "9x\LibD"
+# PROP Output_Dir "NT\LibD"
+# PROP Intermediate_Dir "NT\LibD"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MDd /W3 /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /EHsc /c
-# ADD CPP /nologo /MDd /W3 /Zi /Od /I "./include" /I "./include/arch" /I "./include/arch/win32"
/I "./include/arch/unix" /D "_DEBUG" /D "APR_DECLARE_STATIC" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\"
/Fd"$(OUTDIR)\apr-1" /FD /EHsc /c
+# ADD CPP /nologo /MDd /W3 /Zi /Od /I "./include" /I "./include/arch" /I "./include/arch/win32"
/I "./include/arch/unix" /D "_DEBUG" /D "APR_DECLARE_STATIC" /D "WINNT" /D "WIN32" /D "_WINDOWS"
/Fo"$(INTDIR)\" /Fd"$(OUTDIR)\apr-1" /FD /EHsc /c
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe
@@ -124,7 +124,7 @@
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"9x\LibD\apr-1.lib"
+# ADD LIB32 /nologo /out:"NT\LibD\apr-1.lib"
 
 !ELSEIF  "$(CFG)" == "apr - x64 Release"
 
@@ -139,7 +139,7 @@
 # PROP Intermediate_Dir "x64\LibR"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
-# ADD CPP /nologo /MD /W3 /Zi /O2 /Oy- /I "./include" /I "./include/arch" /I "./include/arch/win32"
/I "./include/arch/unix" /D "NDEBUG" /D "APR_DECLARE_STATIC" /D "WIN32" /D "WINNT" /D "_WINDOWS"
/Fo"$(INTDIR)\" /Fd"$(OUTDIR)\apr-1" /FD /c
+# ADD CPP /nologo /MD /W3 /Zi /O2 /Oy- /I "./include" /I "./include/arch" /I "./include/arch/win32"
/I "./include/arch/unix" /D "NDEBUG" /D "APR_DECLARE_STATIC" /D "WINNT" /D "WIN32" /D "_WINDOWS"
/Fo"$(INTDIR)\" /Fd"$(OUTDIR)\apr-1" /FD /c
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
 BSC32=bscmake.exe
@@ -163,7 +163,7 @@
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MDd /W3 /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /EHsc /c
-# ADD CPP /nologo /MDd /W3 /Zi /Od /I "./include" /I "./include/arch" /I "./include/arch/win32"
/I "./include/arch/unix" /D "_DEBUG" /D "APR_DECLARE_STATIC" /D "WIN32" /D "WINNT" /D "_WINDOWS"
/Fo"$(INTDIR)\" /Fd"$(OUTDIR)\apr-1" /FD /EHsc /c
+# ADD CPP /nologo /MDd /W3 /Zi /Od /I "./include" /I "./include/arch" /I "./include/arch/win32"
/I "./include/arch/unix" /D "_DEBUG" /D "APR_DECLARE_STATIC" /D "WINNT" /D "WIN32" /D "_WINDOWS"
/Fo"$(INTDIR)\" /Fd"$(OUTDIR)\apr-1" /FD /EHsc /c
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe
@@ -179,8 +179,8 @@
 
 # Name "apr - Win32 Release"
 # Name "apr - Win32 Debug"
-# Name "apr - Win32 Release9x"
-# Name "apr - Win32 Debug9x"
+# Name "apr - Win32 ReleaseNT"
+# Name "apr - Win32 DebugNT"
 # Name "apr - x64 Release"
 # Name "apr - x64 Debug"
 # Begin Group "Source Files"
@@ -617,7 +617,7 @@
 
 # End Custom Build
 
-!ELSEIF  "$(CFG)" == "apr - Win32 Release9x"
+!ELSEIF  "$(CFG)" == "apr - Win32 ReleaseNT"
 
 # Begin Custom Build - Creating apr.h from apr.hw
 InputPath=.\include\apr.hw
@@ -627,7 +627,7 @@
 
 # End Custom Build
 
-!ELSEIF  "$(CFG)" == "apr - Win32 Debug9x"
+!ELSEIF  "$(CFG)" == "apr - Win32 DebugNT"
 
 # Begin Custom Build - Creating apr.h from apr.hw
 InputPath=.\include\apr.hw

Modified: apr/apr/branches/1.3.x/apr.dsw
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.3.x/apr.dsw?rev=661054&r1=661053&r2=661054&view=diff
==============================================================================
--- apr/apr/branches/1.3.x/apr.dsw (original)
+++ apr/apr/branches/1.3.x/apr.dsw Wed May 28 12:19:20 2008
@@ -15,7 +15,7 @@
 
 ###############################################################################
 
-Project: "aprapp"=".\build\aprapp.dsp" - Package Owner=<4>
+Project: "apr_app"=".\build\apr_app.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -24,7 +24,7 @@
 Package=<4>
 {{{
     Begin Project Dependency
-    Project_Dep_Name preaprapp
+    Project_Dep_Name apr
     End Project Dependency
 }}}
 
@@ -42,37 +42,7 @@
 
 ###############################################################################
 
-Project: "libaprapp"=".\build\libaprapp.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name prelibaprapp
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "preaprapp"=".\build\preaprapp.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name apr
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "prelibaprapp"=".\build\prelibaprapp.dsp" - Package Owner=<4>
+Project: "libapr_app"=".\build\libapr_app.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{

Modified: apr/apr/branches/1.3.x/libapr.dsp
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.3.x/libapr.dsp?rev=661054&r1=661053&r2=661054&view=diff
==============================================================================
--- apr/apr/branches/1.3.x/libapr.dsp (original)
+++ apr/apr/branches/1.3.x/libapr.dsp Wed May 28 12:19:20 2008
@@ -19,8 +19,8 @@
 !MESSAGE 
 !MESSAGE "libapr - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
 !MESSAGE "libapr - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "libapr - Win32 Release9x" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "libapr - Win32 Debug9x" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "libapr - Win32 ReleaseNT" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "libapr - Win32 DebugNT" (based on "Win32 (x86) Dynamic-Link Library")
 !MESSAGE "libapr - x64 Release" (based on "Win32 (x86) Dynamic-Link Library")
 !MESSAGE "libapr - x64 Debug" (based on "Win32 (x86) Dynamic-Link Library")
 !MESSAGE 
@@ -47,7 +47,7 @@
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
-# ADD CPP /nologo /MD /W3 /Zi /O2 /Oy- /I "./include" /I "./include/arch" /I "./include/arch/win32"
/I "./include/arch/unix" /D "NDEBUG" /D "APR_DECLARE_EXPORT" /D "WIN32" /D "WINNT" /D "_WINDOWS"
/Fo"$(INTDIR)\" /Fd"$(INTDIR)\libapr_src" /FD /c
+# ADD CPP /nologo /MD /W3 /Zi /O2 /Oy- /I "./include" /I "./include/arch" /I "./include/arch/win32"
/I "./include/arch/unix" /D "NDEBUG" /D "APR_DECLARE_EXPORT" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\"
/Fd"$(INTDIR)\libapr_src" /FD /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"
@@ -79,7 +79,7 @@
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MDd /W3 /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /EHsc /c
-# ADD CPP /nologo /MDd /W3 /Zi /Od /I "./include" /I "./include/arch" /I "./include/arch/win32"
/I "./include/arch/unix" /D "_DEBUG" /D "APR_DECLARE_EXPORT" /D "WIN32" /D "WINNT" /D "_WINDOWS"
/Fo"$(INTDIR)\" /Fd"$(INTDIR)\libapr_src" /FD /EHsc /c
+# ADD CPP /nologo /MDd /W3 /Zi /Od /I "./include" /I "./include/arch" /I "./include/arch/win32"
/I "./include/arch/unix" /D "_DEBUG" /D "APR_DECLARE_EXPORT" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\"
/Fd"$(INTDIR)\libapr_src" /FD /EHsc /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"
@@ -97,21 +97,21 @@
 PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2
 # End Special Build Tool
 
-!ELSEIF  "$(CFG)" == "libapr - Win32 Release9x"
+!ELSEIF  "$(CFG)" == "libapr - Win32 ReleaseNT"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "9x\Release"
-# PROP BASE Intermediate_Dir "9x\Release"
+# PROP BASE Output_Dir "NT\Release"
+# PROP BASE Intermediate_Dir "NT\Release"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "9x\Release"
-# PROP Intermediate_Dir "9x\Release"
+# PROP Output_Dir "NT\Release"
+# PROP Intermediate_Dir "NT\Release"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
-# ADD CPP /nologo /MD /W3 /Zi /O2 /Oy- /I "./include" /I "./include/arch" /I "./include/arch/win32"
/I "./include/arch/unix" /D "NDEBUG" /D "APR_DECLARE_EXPORT" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\"
/Fd"$(INTDIR)\libapr_src" /FD /c
+# ADD CPP /nologo /MD /W3 /Zi /O2 /Oy- /I "./include" /I "./include/arch" /I "./include/arch/win32"
/I "./include/arch/unix" /D "NDEBUG" /D "APR_DECLARE_EXPORT" /D "WINNT" /D "WIN32" /D "_WINDOWS"
/Fo"$(INTDIR)\" /Fd"$(INTDIR)\libapr_src" /FD /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"
@@ -121,29 +121,29 @@
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib shell32.lib
rpcrt4.lib /nologo /base:"0x6EEC0000" /subsystem:windows /dll /incremental:no /debug /opt:ref
-# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib shell32.lib rpcrt4.lib
/nologo /base:"0x6EEC0000" /subsystem:windows /dll /incremental:no /debug /out:"9x\Release\libapr-1.dll"
/pdb:"9x\Release\libapr-1.pdb" /implib:"9x\Release\libapr-1.lib" /MACHINE:X86 /opt:ref
+# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib shell32.lib rpcrt4.lib
/nologo /base:"0x6EEC0000" /subsystem:windows /dll /incremental:no /debug /out:"NT\Release\libapr-1.dll"
/pdb:"NT\Release\libapr-1.pdb" /implib:"NT\Release\libapr-1.lib" /MACHINE:X86 /opt:ref
 # Begin Special Build Tool
-TargetPath=9x\Release\libapr.dll
+TargetPath=NT\Release\libapr.dll
 SOURCE="$(InputPath)"
 PostBuild_Desc=Embed .manifest
 PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2
 # End Special Build Tool
 
-!ELSEIF  "$(CFG)" == "libapr - Win32 Debug9x"
+!ELSEIF  "$(CFG)" == "libapr - Win32 DebugNT"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "9x\Debug"
-# PROP BASE Intermediate_Dir "9x\Debug"
+# PROP BASE Output_Dir "NT\Debug"
+# PROP BASE Intermediate_Dir "NT\Debug"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "9x\Debug"
-# PROP Intermediate_Dir "9x\Debug"
+# PROP Output_Dir "NT\Debug"
+# PROP Intermediate_Dir "NT\Debug"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MDd /W3 /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /EHsc /c
-# ADD CPP /nologo /MDd /W3 /Zi /Od /I "./include" /I "./include/arch" /I "./include/arch/win32"
/I "./include/arch/unix" /D "_DEBUG" /D "APR_DECLARE_EXPORT" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\"
/Fd"$(INTDIR)\libapr_src" /FD /EHsc /c
+# ADD CPP /nologo /MDd /W3 /Zi /Od /I "./include" /I "./include/arch" /I "./include/arch/win32"
/I "./include/arch/unix" /D "_DEBUG" /D "APR_DECLARE_EXPORT" /D "WINNT" /D "WIN32" /D "_WINDOWS"
/Fo"$(INTDIR)\" /Fd"$(INTDIR)\libapr_src" /FD /EHsc /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"
@@ -153,9 +153,9 @@
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib shell32.lib
rpcrt4.lib /nologo /base:"0x6EEC0000" /subsystem:windows /dll /incremental:no /debug
-# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib shell32.lib rpcrt4.lib
/nologo /base:"0x6EEC0000" /subsystem:windows /dll /incremental:no /debug /out:"9x\Debug\libapr-1.dll"
/pdb:"9x\Debug\libapr-1.pdb" /implib:"9x\Debug\libapr-1.lib" /MACHINE:X86
+# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib shell32.lib rpcrt4.lib
/nologo /base:"0x6EEC0000" /subsystem:windows /dll /incremental:no /debug /out:"NT\Debug\libapr-1.dll"
/pdb:"NT\Debug\libapr-1.pdb" /implib:"NT\Debug\libapr-1.lib" /MACHINE:X86
 # Begin Special Build Tool
-TargetPath=9x\Debug\libapr-1.dll
+TargetPath=NT\Debug\libapr-1.dll
 SOURCE="$(InputPath)"
 PostBuild_Desc=Embed .manifest
 PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2
@@ -175,7 +175,7 @@
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
-# ADD CPP /nologo /MD /W3 /Zi /O2 /Oy- /I "./include" /I "./include/arch" /I "./include/arch/win32"
/I "./include/arch/unix" /D "NDEBUG" /D "APR_DECLARE_EXPORT" /D "WIN32" /D "WINNT" /D "_WINDOWS"
/Fo"$(INTDIR)\" /Fd"$(INTDIR)\libapr_src" /FD /c
+# ADD CPP /nologo /MD /W3 /Zi /O2 /Oy- /I "./include" /I "./include/arch" /I "./include/arch/win32"
/I "./include/arch/unix" /D "NDEBUG" /D "APR_DECLARE_EXPORT" /D "WINNT" /D "WIN32" /D "_WINDOWS"
/Fo"$(INTDIR)\" /Fd"$(INTDIR)\libapr_src" /FD /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"
@@ -207,7 +207,7 @@
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MDd /W3 /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /EHsc /c
-# ADD CPP /nologo /MDd /W3 /Zi /Od /I "./include" /I "./include/arch" /I "./include/arch/win32"
/I "./include/arch/unix" /D "_DEBUG" /D "APR_DECLARE_EXPORT" /D "WIN32" /D "WINNT" /D "_WINDOWS"
/Fo"$(INTDIR)\" /Fd"$(INTDIR)\libapr_src" /FD /EHsc /c
+# ADD CPP /nologo /MDd /W3 /Zi /Od /I "./include" /I "./include/arch" /I "./include/arch/win32"
/I "./include/arch/unix" /D "_DEBUG" /D "APR_DECLARE_EXPORT" /D "WINNT" /D "WIN32" /D "_WINDOWS"
/Fo"$(INTDIR)\" /Fd"$(INTDIR)\libapr_src" /FD /EHsc /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"
@@ -231,8 +231,8 @@
 
 # Name "libapr - Win32 Release"
 # Name "libapr - Win32 Debug"
-# Name "libapr - Win32 Release9x"
-# Name "libapr - Win32 Debug9x"
+# Name "libapr - Win32 ReleaseNT"
+# Name "libapr - Win32 DebugNT"
 # Name "libapr - x64 Release"
 # Name "libapr - x64 Debug"
 # Begin Group "Source Files"
@@ -669,7 +669,7 @@
 
 # End Custom Build
 
-!ELSEIF  "$(CFG)" == "libapr - Win32 Release9x"
+!ELSEIF  "$(CFG)" == "libapr - Win32 ReleaseNT"
 
 # Begin Custom Build - Creating apr.h from apr.hw
 InputPath=.\include\apr.hw
@@ -679,7 +679,7 @@
 
 # End Custom Build
 
-!ELSEIF  "$(CFG)" == "libapr - Win32 Debug9x"
+!ELSEIF  "$(CFG)" == "libapr - Win32 DebugNT"
 
 # Begin Custom Build - Creating apr.h from apr.hw
 InputPath=.\include\apr.hw

Modified: apr/apr/branches/1.3.x/test/Makefile.win
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.3.x/test/Makefile.win?rev=661054&r1=661053&r2=661054&view=diff
==============================================================================
--- apr/apr/branches/1.3.x/test/Makefile.win (original)
+++ apr/apr/branches/1.3.x/test/Makefile.win Wed May 28 12:19:20 2008
@@ -123,11 +123,11 @@
 
 !IF "$(MODEL)" == "static"
 LOCAL_LIB= ..\$(OUTDIR)\apr-1.lib 
-APP_LIB= ..\$(OUTDIR)\aprapp-1.lib 
+APP_LIB= ..\build\$(OUTDIR)\apr_app-1.lib 
 STATIC_CFLAGS = /D APR_DECLARE_STATIC
 !ELSE
 LOCAL_LIB= ..\$(OUTDIR)\libapr-1.lib 
-APP_LIB= ..\$(OUTDIR)\libaprapp-1.lib 
+APP_LIB= ..\build\$(OUTDIR)\libapr_app-1.lib 
 STATIC_CFLAGS = 
 !ENDIF
 

Modified: apr/apr/branches/1.3.x/test/testall.dsw
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.3.x/test/testall.dsw?rev=661054&r1=661053&r2=661054&view=diff
==============================================================================
--- apr/apr/branches/1.3.x/test/testall.dsw (original)
+++ apr/apr/branches/1.3.x/test/testall.dsw Wed May 28 12:19:20 2008
@@ -15,7 +15,7 @@
 
 ###############################################################################
 
-Project: "aprapp"="..\build\aprapp.dsp" - Package Owner=<4>
+Project: "apr_app"="..\build\apr_app.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -24,7 +24,7 @@
 Package=<4>
 {{{
     Begin Project Dependency
-    Project_Dep_Name preaprapp
+    Project_Dep_Name apr
     End Project Dependency
 }}}
 
@@ -42,37 +42,7 @@
 
 ###############################################################################
 
-Project: "libaprapp"="..\build\libaprapp.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name prelibaprapp
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "preaprapp"="..\build\preaprapp.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name apr
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "prelibaprapp"="..\build\prelibaprapp.dsp" - Package Owner=<4>
+Project: "libapr_app"="..\build\libapr_app.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -99,7 +69,7 @@
     Project_Dep_Name libapr
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name libaprapp
+    Project_Dep_Name libapr_app
     End Project Dependency
 }}}
 
@@ -117,7 +87,7 @@
     Project_Dep_Name apr
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name aprapp
+    Project_Dep_Name apr_app
     End Project Dependency
 }}}
 

Modified: apr/apr/branches/1.3.x/test/testdll.dsp
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.3.x/test/testdll.dsp?rev=661054&r1=661053&r2=661054&view=diff
==============================================================================
--- apr/apr/branches/1.3.x/test/testdll.dsp (original)
+++ apr/apr/branches/1.3.x/test/testdll.dsp Wed May 28 12:19:20 2008
@@ -19,8 +19,8 @@
 !MESSAGE 
 !MESSAGE "testdll - Win32 Release" (based on "Win32 (x86) External Target")
 !MESSAGE "testdll - Win32 Debug" (based on "Win32 (x86) External Target")
-!MESSAGE "testdll - Win32 Release9x" (based on "Win32 (x86) External Target")
-!MESSAGE "testdll - Win32 Debug9x" (based on "Win32 (x86) External Target")
+!MESSAGE "testdll - Win32 ReleaseNT" (based on "Win32 (x86) External Target")
+!MESSAGE "testdll - Win32 DebugNT" (based on "Win32 (x86) External Target")
 !MESSAGE "testdll - x64 Release" (based on "Win32 (x86) External Target")
 !MESSAGE "testdll - x64 Debug" (based on "Win32 (x86) External Target")
 !MESSAGE 
@@ -72,45 +72,45 @@
 # PROP Bsc_Name ""
 # PROP Target_Dir ""
 
-!ELSEIF  "$(CFG)" == "testdll - Win32 Release9x"
+!ELSEIF  "$(CFG)" == "testdll - Win32 ReleaseNT"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 # PROP BASE Output_Dir ""
 # PROP BASE Intermediate_Dir ""
-# PROP BASE Cmd_Line "NMAKE /f Makefile.win INTDIR=9x\Release OUTDIR=9x\Release MODEL=dynamic
all check"
+# PROP BASE Cmd_Line "NMAKE /f Makefile.win INTDIR=NT\Release OUTDIR=NT\Release MODEL=dynamic
all check"
 # PROP BASE Rebuild_Opt "/a"
-# PROP BASE Target_File "9x\Release\testall.exe"
+# PROP BASE Target_File "NT\Release\testall.exe"
 # PROP BASE Bsc_Name ""
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
 # PROP Output_Dir ""
 # PROP Intermediate_Dir ""
-# PROP Cmd_Line "NMAKE /f Makefile.win INTDIR=9x\Release OUTDIR=9x\Release MODEL=dynamic
all check"
+# PROP Cmd_Line "NMAKE /f Makefile.win INTDIR=NT\Release OUTDIR=NT\Release MODEL=dynamic
all check"
 # PROP Rebuild_Opt "/a"
-# PROP Target_File "9x\Release\testall.exe"
+# PROP Target_File "NT\Release\testall.exe"
 # PROP Bsc_Name ""
 # PROP Target_Dir ""
 
-!ELSEIF  "$(CFG)" == "testdll - Win32 Debug9x"
+!ELSEIF  "$(CFG)" == "testdll - Win32 DebugNT"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 # PROP BASE Output_Dir ""
 # PROP BASE Intermediate_Dir ""
-# PROP BASE Cmd_Line "NMAKE /f Makefile.win INTDIR=9x\Debug OUTDIR=9x\Debug MODEL=dynamic
_DEBUG=1 all check"
+# PROP BASE Cmd_Line "NMAKE /f Makefile.win INTDIR=NT\Debug OUTDIR=NT\Debug MODEL=dynamic
_DEBUG=1 all check"
 # PROP BASE Rebuild_Opt "/a"
-# PROP BASE Target_File "9x\Debug\testall.exe"
+# PROP BASE Target_File "NT\Debug\testall.exe"
 # PROP BASE Bsc_Name ""
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
 # PROP Output_Dir ""
 # PROP Intermediate_Dir ""
-# PROP Cmd_Line "NMAKE /f Makefile.win INTDIR=9x\Debug OUTDIR=9x\Debug MODEL=dynamic _DEBUG=1
all check"
+# PROP Cmd_Line "NMAKE /f Makefile.win INTDIR=NT\Debug OUTDIR=NT\Debug MODEL=dynamic _DEBUG=1
all check"
 # PROP Rebuild_Opt "/a"
-# PROP Target_File "9x\Debug\testall.exe"
+# PROP Target_File "NT\Debug\testall.exe"
 # PROP Bsc_Name ""
 # PROP Target_Dir ""
 
@@ -162,8 +162,8 @@
 
 # Name "testdll - Win32 Release"
 # Name "testdll - Win32 Debug"
-# Name "testdll - Win32 Release9x"
-# Name "testdll - Win32 Debug9x"
+# Name "testdll - Win32 ReleaseNT"
+# Name "testdll - Win32 DebugNT"
 # Name "testdll - x64 Release"
 # Name "testdll - x64 Debug"
 # Begin Group "testall Source Files"

Modified: apr/apr/branches/1.3.x/test/testlib.dsp
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.3.x/test/testlib.dsp?rev=661054&r1=661053&r2=661054&view=diff
==============================================================================
--- apr/apr/branches/1.3.x/test/testlib.dsp (original)
+++ apr/apr/branches/1.3.x/test/testlib.dsp Wed May 28 12:19:20 2008
@@ -19,8 +19,8 @@
 !MESSAGE 
 !MESSAGE "testlib - Win32 Release" (based on "Win32 (x86) External Target")
 !MESSAGE "testlib - Win32 Debug" (based on "Win32 (x86) External Target")
-!MESSAGE "testlib - Win32 Release9x" (based on "Win32 (x86) External Target")
-!MESSAGE "testlib - Win32 Debug9x" (based on "Win32 (x86) External Target")
+!MESSAGE "testlib - Win32 ReleaseNT" (based on "Win32 (x86) External Target")
+!MESSAGE "testlib - Win32 DebugNT" (based on "Win32 (x86) External Target")
 !MESSAGE "testlib - x64 Release" (based on "Win32 (x86) External Target")
 !MESSAGE "testlib - x64 Debug" (based on "Win32 (x86) External Target")
 !MESSAGE 
@@ -72,45 +72,45 @@
 # PROP Bsc_Name ""
 # PROP Target_Dir ""
 
-!ELSEIF  "$(CFG)" == "testlib - Win32 Release9x"
+!ELSEIF  "$(CFG)" == "testlib - Win32 ReleaseNT"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 # PROP BASE Output_Dir ""
 # PROP BASE Intermediate_Dir ""
-# PROP BASE Cmd_Line "NMAKE /f Makefile.win INTDIR=9x\LibR OUTDIR=9x\LibR MODEL=static all
check"
+# PROP BASE Cmd_Line "NMAKE /f Makefile.win INTDIR=NT\LibR OUTDIR=NT\LibR MODEL=static all
check"
 # PROP BASE Rebuild_Opt "/a"
-# PROP BASE Target_File "9x\LibR\testall.exe"
+# PROP BASE Target_File "NT\LibR\testall.exe"
 # PROP BASE Bsc_Name ""
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
 # PROP Output_Dir ""
 # PROP Intermediate_Dir ""
-# PROP Cmd_Line "NMAKE /f Makefile.win INTDIR=9x\LibR OUTDIR=9x\LibR MODEL=static all check"
+# PROP Cmd_Line "NMAKE /f Makefile.win INTDIR=NT\LibR OUTDIR=NT\LibR MODEL=static all check"
 # PROP Rebuild_Opt "/a"
-# PROP Target_File "9x\LibR\testall.exe"
+# PROP Target_File "NT\LibR\testall.exe"
 # PROP Bsc_Name ""
 # PROP Target_Dir ""
 
-!ELSEIF  "$(CFG)" == "testlib - Win32 Debug9x"
+!ELSEIF  "$(CFG)" == "testlib - Win32 DebugNT"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 # PROP BASE Output_Dir ""
 # PROP BASE Intermediate_Dir ""
-# PROP BASE Cmd_Line "NMAKE /f Makefile.win INTDIR=9x\LibD OUTDIR=9x\LibD MODEL=static _DEBUG=1
all check"
+# PROP BASE Cmd_Line "NMAKE /f Makefile.win INTDIR=NT\LibD OUTDIR=NT\LibD MODEL=static _DEBUG=1
all check"
 # PROP BASE Rebuild_Opt "/a"
-# PROP BASE Target_File "9x\LibD\testall.exe"
+# PROP BASE Target_File "NT\LibD\testall.exe"
 # PROP BASE Bsc_Name ""
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
 # PROP Output_Dir ""
 # PROP Intermediate_Dir ""
-# PROP Cmd_Line "NMAKE /f Makefile.win INTDIR=9x\LibD OUTDIR=9x\LibD MODEL=static _DEBUG=1
all check"
+# PROP Cmd_Line "NMAKE /f Makefile.win INTDIR=NT\LibD OUTDIR=NT\LibD MODEL=static _DEBUG=1
all check"
 # PROP Rebuild_Opt "/a"
-# PROP Target_File "9x\LibD\testall.exe"
+# PROP Target_File "NT\LibD\testall.exe"
 # PROP Bsc_Name ""
 # PROP Target_Dir ""
 
@@ -162,8 +162,8 @@
 
 # Name "testlib - Win32 Release"
 # Name "testlib - Win32 Debug"
-# Name "testlib - Win32 Release9x"
-# Name "testlib - Win32 Debug9x"
+# Name "testlib - Win32 ReleaseNT"
+# Name "testlib - Win32 DebugNT"
 # Name "testlib - x64 Release"
 # Name "testlib - x64 Debug"
 # Begin Group "testall Source Files"



Mime
View raw message