You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by wr...@apache.org on 2007/10/18 07:32:08 UTC
svn commit: r585870 - in /apr/apr/trunk: apr.dsw build/apr_app.dsp
build/aprapp.dsp build/libapr_app.dsp build/libaprapp.dsp
build/preaprapp.dsp build/prelibaprapp.dsp test/Makefile.win
Author: wrowe
Date: Wed Oct 17 22:32:07 2007
New Revision: 585870
URL: http://svn.apache.org/viewvc?rev=585870&view=rev
Log:
Rename apr_app to clearly fall in our target tree as
[lib]aprapp-1.lib for users who want to make NT-specific
binaries (and receive full unicode envvars and command
line into their main() in utf8 as if nothing happened).
Hook up pre-aprapp steps just like we did for apriconv.
Although it's 'named' libaprapp, it's also a static lib
and needs to avoid being filled with the libapriconv dll
bindings just like other static libraries which depend
upon another static lib (the reason for inventing these
pre-dsp's).
Added:
apr/apr/trunk/build/aprapp.dsp
- copied, changed from r585758, apr/apr/trunk/build/apr_app.dsp
apr/apr/trunk/build/libaprapp.dsp
- copied, changed from r585758, apr/apr/trunk/build/libapr_app.dsp
apr/apr/trunk/build/preaprapp.dsp
apr/apr/trunk/build/prelibaprapp.dsp (with props)
Removed:
apr/apr/trunk/build/apr_app.dsp
apr/apr/trunk/build/libapr_app.dsp
Modified:
apr/apr/trunk/apr.dsw
apr/apr/trunk/test/Makefile.win
Modified: apr/apr/trunk/apr.dsw
URL: http://svn.apache.org/viewvc/apr/apr/trunk/apr.dsw?rev=585870&r1=585869&r2=585870&view=diff
==============================================================================
--- apr/apr/trunk/apr.dsw (original)
+++ apr/apr/trunk/apr.dsw Wed Oct 17 22:32:07 2007
@@ -15,7 +15,7 @@
###############################################################################
-Project: "apr_app"=".\build\apr_app.dsp" - Package Owner=<4>
+Project: "aprapp"=".\build\aprapp.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -24,7 +24,7 @@
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name apr
+ Project_Dep_Name preaprapp
End Project Dependency
}}}
@@ -42,7 +42,37 @@
###############################################################################
-Project: "libapr_app"=".\build\libapr_app.dsp" - Package Owner=<4>
+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>
Package=<5>
{{{
Copied: apr/apr/trunk/build/aprapp.dsp (from r585758, apr/apr/trunk/build/apr_app.dsp)
URL: http://svn.apache.org/viewvc/apr/apr/trunk/build/aprapp.dsp?p2=apr/apr/trunk/build/aprapp.dsp&p1=apr/apr/trunk/build/apr_app.dsp&r1=585758&r2=585870&rev=585870&view=diff
==============================================================================
--- apr/apr/trunk/build/apr_app.dsp (original)
+++ apr/apr/trunk/build/aprapp.dsp Wed Oct 17 22:32:07 2007
@@ -1,28 +1,28 @@
-# Microsoft Developer Studio Project File - Name="apr_app" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="aprapp" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Static Library" 0x0104
-CFG=apr_app - Win32 Release
+CFG=aprapp - Win32 Release
!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 "apr_app.mak".
+!MESSAGE NMAKE /f "aprapp.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 "apr_app.mak" CFG="apr_app - Win32 Release"
+!MESSAGE NMAKE /f "aprapp.mak" CFG="aprapp - Win32 Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "apr_app - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "apr_app - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "apr_app - Win32 Release9x" (based on "Win32 (x86) Static Library")
-!MESSAGE "apr_app - Win32 Debug9x" (based on "Win32 (x86) Static Library")
-!MESSAGE "apr_app - x64 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "apr_app - x64 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "aprapp - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "aprapp - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "aprapp - Win32 Release9x" (based on "Win32 (x86) Static Library")
+!MESSAGE "aprapp - Win32 Debug9x" (based on "Win32 (x86) Static Library")
+!MESSAGE "aprapp - x64 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "aprapp - x64 Debug" (based on "Win32 (x86) Static Library")
!MESSAGE
# Begin Project
@@ -32,20 +32,20 @@
CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "apr_app - Win32 Release"
+!IF "$(CFG)" == "aprapp - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "LibR"
+# PROP BASE Output_Dir "..\LibR"
# PROP BASE Intermediate_Dir "LibR"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "LibR"
+# PROP Output_Dir "..\LibR"
# 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 /O2 /Oy- /Zi /I "../include" /I "../include/arch" /I "../include/arch/win32" /I "../include/arch/unix" /D "NDEBUG" /D "WINNT" /D "WIN32" /D "_WINDOWS" /D "APR_APP" /D "APR_DECLARE_STATIC" /Fo"$(INTDIR)\" /Fd"$(OUTDIR)\apr_app-1" /FD /c
+# ADD CPP /nologo /MD /W3 /O2 /Oy- /Zi /I "../include" /I "../include/arch" /I "../include/arch/win32" /I "../include/arch/unix" /D "NDEBUG" /D "WINNT" /D "WIN32" /D "_WINDOWS" /D APR_APP /D "APR_DECLARE_STATIC" /Fo"$(INTDIR)\" /Fd"$(OUTDIR)\aprapp-1" /FD /c
# ADD BASE RSC /l 0x409
# ADD RSC /l 0x409
BSC32=bscmake.exe
@@ -53,23 +53,23 @@
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"LibR\apr_app-1.lib"
+# ADD LIB32 /nologo /out:"..\LibR\aprapp-1.lib"
-!ELSEIF "$(CFG)" == "apr_app - Win32 Debug"
+!ELSEIF "$(CFG)" == "aprapp - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "LibD"
+# PROP BASE Output_Dir "..\LibD"
# PROP BASE Intermediate_Dir "LibD"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "LibD"
+# PROP Output_Dir "..\LibD"
# PROP Intermediate_Dir "LibD"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MDd /W3 /EHsc /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
-# ADD CPP /nologo /MDd /W3 /EHsc /Zi /Od /I "../include" /I "../include/arch" /I "../include/arch/win32" /I "../include/arch/unix" /D "_DEBUG" /D "WINNT" /D "WIN32" /D "_WINDOWS" /D "APR_APP" /D "APR_DECLARE_STATIC" /Fo"$(INTDIR)\" /Fd"$(OUTDIR)\apr_app-1" /FD /c
+# ADD CPP /nologo /MDd /W3 /EHsc /Zi /Od /I "../include" /I "../include/arch" /I "../include/arch/win32" /I "../include/arch/unix" /D "_DEBUG" /D "WINNT" /D "WIN32" /D "_WINDOWS" /D APR_APP /D "APR_DECLARE_STATIC" /Fo"$(INTDIR)\" /Fd"$(OUTDIR)\aprapp-1" /FD /c
# ADD BASE RSC /l 0x409
# ADD RSC /l 0x409
BSC32=bscmake.exe
@@ -77,22 +77,22 @@
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"LibD\apr_app-1.lib"
+# ADD LIB32 /nologo /out:"..\LibD\aprapp-1.lib"
-!ELSEIF "$(CFG)" == "apr_app - Win32 Release9x"
+!ELSEIF "$(CFG)" == "aprapp - Win32 Release9x"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "9x\LibR"
+# PROP BASE Output_Dir "..\9x\LibR"
# PROP BASE Intermediate_Dir "9x\LibR"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "9x\LibR"
+# PROP Output_Dir "..\9x\LibR"
# PROP Intermediate_Dir "9x\LibR"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
-# ADD CPP /nologo /MD /W3 /O2 /Oy- /Zi /I "../include" /I "../include/arch" /I "../include/arch/win32" /I "../include/arch/unix" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "APR_APP" /D "APR_DECLARE_STATIC" /Fo"$(INTDIR)\" /Fd"$(OUTDIR)\apr_app-1" /FD /c
+# ADD CPP /nologo /MD /W3 /O2 /Oy- /Zi /I "../include" /I "../include/arch" /I "../include/arch/win32" /I "../include/arch/unix" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D APR_APP /D "APR_DECLARE_STATIC" /Fo"$(INTDIR)\" /Fd"$(OUTDIR)\aprapp-1" /FD /c
# ADD BASE RSC /l 0x409
# ADD RSC /l 0x409
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_app-1.lib"
+# ADD LIB32 /nologo /out:"..\9x\LibR\aprapp-1.lib"
-!ELSEIF "$(CFG)" == "apr_app - Win32 Debug9x"
+!ELSEIF "$(CFG)" == "aprapp - Win32 Debug9x"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "9x\LibD"
+# PROP BASE Output_Dir "..\9x\LibD"
# PROP BASE Intermediate_Dir "9x\LibD"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "9x\LibD"
+# PROP Output_Dir "..\9x\LibD"
# PROP Intermediate_Dir "9x\LibD"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MDd /W3 /EHsc /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
-# ADD CPP /nologo /MDd /W3 /EHsc /Zi /Od /I "../include" /I "../include/arch" /I "../include/arch/win32" /I "../include/arch/unix" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "APR_APP" /D "APR_DECLARE_STATIC" /Fo"$(INTDIR)\" /Fd"$(OUTDIR)\apr_app-1" /FD /c
+# ADD CPP /nologo /MDd /W3 /EHsc /Zi /Od /I "../include" /I "../include/arch" /I "../include/arch/win32" /I "../include/arch/unix" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D APR_APP /D "APR_DECLARE_STATIC" /Fo"$(INTDIR)\" /Fd"$(OUTDIR)\aprapp-1" /FD /c
# ADD BASE RSC /l 0x409
# ADD RSC /l 0x409
BSC32=bscmake.exe
@@ -124,22 +124,22 @@
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"9x\LibD\apr_app-1.lib"
+# ADD LIB32 /nologo /out:"..\9x\LibD\aprapp-1.lib"
-!ELSEIF "$(CFG)" == "apr_app - x64 Release"
+!ELSEIF "$(CFG)" == "aprapp - x64 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "x64\LibR"
+# PROP BASE Output_Dir "..\x64\LibR"
# PROP BASE Intermediate_Dir "x64\LibR"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "x64\LibR"
+# PROP Output_Dir "..\x64\LibR"
# 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 /O2 /Oy- /Zi /I "../include" /I "../include/arch" /I "../include/arch/win32" /I "../include/arch/unix" /D "NDEBUG" /D "WINNT" /D "WIN32" /D "_WINDOWS" /D "APR_APP" /D "APR_DECLARE_STATIC" /Fo"$(INTDIR)\" /Fd"$(OUTDIR)\apr_app-1" /FD /c
+# ADD CPP /nologo /MD /W3 /O2 /Oy- /Zi /I "../include" /I "../include/arch" /I "../include/arch/win32" /I "../include/arch/unix" /D "NDEBUG" /D "WINNT" /D "WIN32" /D "_WINDOWS" /D APR_APP /D "APR_DECLARE_STATIC" /Fo"$(INTDIR)\" /Fd"$(OUTDIR)\aprapp-1" /FD /c
# ADD BASE RSC /l 0x409
# ADD RSC /l 0x409
BSC32=bscmake.exe
@@ -147,23 +147,23 @@
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"x64\LibR\apr_app-1.lib"
+# ADD LIB32 /nologo /out:"..\x64\LibR\aprapp-1.lib"
-!ELSEIF "$(CFG)" == "apr_app - x64 Debug"
+!ELSEIF "$(CFG)" == "aprapp - x64 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "x64\LibD"
+# PROP BASE Output_Dir "..\x64\LibD"
# PROP BASE Intermediate_Dir "x64\LibD"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "x64\LibD"
+# PROP Output_Dir "..\x64\LibD"
# PROP Intermediate_Dir "x64\LibD"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MDd /W3 /EHsc /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
-# ADD CPP /nologo /MDd /W3 /EHsc /Zi /Od /I "../include" /I "../include/arch" /I "../include/arch/win32" /I "../include/arch/unix" /D "_DEBUG" /D "WINNT" /D "WIN32" /D "_WINDOWS" /D "APR_APP" /D "APR_DECLARE_STATIC" /Fo"$(INTDIR)\" /Fd"$(OUTDIR)\apr_app-1" /FD /c
+# ADD CPP /nologo /MDd /W3 /EHsc /Zi /Od /I "../include" /I "../include/arch" /I "../include/arch/win32" /I "../include/arch/unix" /D "_DEBUG" /D "WINNT" /D "WIN32" /D "_WINDOWS" /D APR_APP /D "APR_DECLARE_STATIC" /Fo"$(INTDIR)\" /Fd"$(OUTDIR)\aprapp-1" /FD /c
# ADD BASE RSC /l 0x409
# ADD RSC /l 0x409
BSC32=bscmake.exe
@@ -171,18 +171,18 @@
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"x64\LibD\apr_app-1.lib"
+# ADD LIB32 /nologo /out:"..\x64\LibD\aprapp-1.lib"
!ENDIF
# Begin Target
-# Name "apr_app - Win32 Release"
-# Name "apr_app - Win32 Debug"
-# Name "apr_app - Win32 Release9x"
-# Name "apr_app - Win32 Debug9x"
-# Name "apr_app - x64 Release"
-# Name "apr_app - x64 Debug"
+# Name "aprapp - Win32 Release"
+# Name "aprapp - Win32 Debug"
+# Name "aprapp - Win32 Release9x"
+# Name "aprapp - Win32 Debug9x"
+# Name "aprapp - x64 Release"
+# Name "aprapp - x64 Debug"
# Begin Source File
SOURCE=..\misc\win32\apr_app.c
Copied: apr/apr/trunk/build/libaprapp.dsp (from r585758, apr/apr/trunk/build/libapr_app.dsp)
URL: http://svn.apache.org/viewvc/apr/apr/trunk/build/libaprapp.dsp?p2=apr/apr/trunk/build/libaprapp.dsp&p1=apr/apr/trunk/build/libapr_app.dsp&r1=585758&r2=585870&rev=585870&view=diff
==============================================================================
--- apr/apr/trunk/build/libapr_app.dsp (original)
+++ apr/apr/trunk/build/libaprapp.dsp Wed Oct 17 22:32:07 2007
@@ -1,28 +1,28 @@
-# Microsoft Developer Studio Project File - Name="libapr_app" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="libaprapp" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Static Library" 0x0104
-CFG=libapr_app - Win32 Release
+CFG=libaprapp - Win32 Release
!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 "libapr_app.mak".
+!MESSAGE NMAKE /f "libaprapp.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 "libapr_app.mak" CFG="libapr_app - Win32 Release"
+!MESSAGE NMAKE /f "libaprapp.mak" CFG="libaprapp - Win32 Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "libapr_app - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "libapr_app - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "libapr_app - Win32 Release9x" (based on "Win32 (x86) Static Library")
-!MESSAGE "libapr_app - Win32 Debug9x" (based on "Win32 (x86) Static Library")
-!MESSAGE "libapr_app - x64 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "libapr_app - x64 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "libaprapp - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "libaprapp - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "libaprapp - Win32 Release9x" (based on "Win32 (x86) Static Library")
+!MESSAGE "libaprapp - Win32 Debug9x" (based on "Win32 (x86) Static Library")
+!MESSAGE "libaprapp - x64 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "libaprapp - x64 Debug" (based on "Win32 (x86) Static Library")
!MESSAGE
# Begin Project
@@ -32,20 +32,20 @@
CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "libapr_app - Win32 Release"
+!IF "$(CFG)" == "libaprapp - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
+# PROP BASE Output_Dir "..\Release"
# PROP BASE Intermediate_Dir "Release"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
+# PROP Output_Dir "..\Release"
# PROP Intermediate_Dir "Release"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
-# ADD CPP /nologo /MD /W3 /O2 /Oy- /Zi /I "../include" /I "../include/arch" /I "../include/arch/win32" /I "../include/arch/unix" /D "NDEBUG" /D "WINNT" /D "WIN32" /D "_WINDOWS" /D "APR_APP" /Fo"$(INTDIR)\" /Fd"$(OUTDIR)\libapr_app-1" /FD /c
+# ADD CPP /nologo /MD /W3 /O2 /Oy- /Zi /I "../include" /I "../include/arch" /I "../include/arch/win32" /I "../include/arch/unix" /D "NDEBUG" /D "WINNT" /D "WIN32" /D "_WINDOWS" /D "APR_APP" /Fo"$(INTDIR)\" /Fd"$(OUTDIR)\libaprapp-1" /FD /c
# ADD BASE RSC /l 0x409
# ADD RSC /l 0x409
BSC32=bscmake.exe
@@ -53,23 +53,23 @@
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"Release\libapr_app-1.lib"
+# ADD LIB32 /nologo /out:"..\Release\libaprapp-1.lib"
-!ELSEIF "$(CFG)" == "libapr_app - Win32 Debug"
+!ELSEIF "$(CFG)" == "libaprapp - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
+# PROP BASE Output_Dir "..\Debug"
# PROP BASE Intermediate_Dir "Debug"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
+# PROP Output_Dir "..\Debug"
# PROP Intermediate_Dir "Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MDd /W3 /EHsc /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
-# ADD CPP /nologo /MDd /W3 /EHsc /Zi /Od /I "../include" /I "../include/arch" /I "../include/arch/win32" /I "../include/arch/unix" /D "_DEBUG" /D "WINNT" /D "WIN32" /D "_WINDOWS" /D "APR_APP" /Fo"$(INTDIR)\" /Fd"$(OUTDIR)\libapr_app-1" /FD /c
+# ADD CPP /nologo /MDd /W3 /EHsc /Zi /Od /I "../include" /I "../include/arch" /I "../include/arch/win32" /I "../include/arch/unix" /D "_DEBUG" /D "WINNT" /D "WIN32" /D "_WINDOWS" /D "APR_APP" /Fo"$(INTDIR)\" /Fd"$(OUTDIR)\libaprapp-1" /FD /c
# ADD BASE RSC /l 0x409
# ADD RSC /l 0x409
BSC32=bscmake.exe
@@ -77,22 +77,22 @@
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"Debug\libapr_app-1.lib"
+# ADD LIB32 /nologo /out:"..\Debug\libaprapp-1.lib"
-!ELSEIF "$(CFG)" == "libapr_app - Win32 Release9x"
+!ELSEIF "$(CFG)" == "libaprapp - Win32 Release9x"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "9x\Release"
+# PROP BASE Output_Dir "..\9x\Release"
# PROP BASE Intermediate_Dir "9x\Release"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "9x\Release"
+# PROP Output_Dir "..\9x\Release"
# PROP Intermediate_Dir "9x\Release"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
-# ADD CPP /nologo /MD /W3 /O2 /Oy- /Zi /I "../include" /I "../include/arch" /I "../include/arch/win32" /I "../include/arch/unix" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "APR_APP" /Fo"$(INTDIR)\" /Fd"$(OUTDIR)\libapr_app-1" /FD /c
+# ADD CPP /nologo /MD /W3 /O2 /Oy- /Zi /I "../include" /I "../include/arch" /I "../include/arch/win32" /I "../include/arch/unix" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "APR_APP" /Fo"$(INTDIR)\" /Fd"$(OUTDIR)\libaprapp-1" /FD /c
# ADD BASE RSC /l 0x409
# ADD RSC /l 0x409
BSC32=bscmake.exe
@@ -100,23 +100,23 @@
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"9x\Release\libapr_app-1.lib"
+# ADD LIB32 /nologo /out:"..\9x\Release\libaprapp-1.lib"
-!ELSEIF "$(CFG)" == "libapr_app - Win32 Debug9x"
+!ELSEIF "$(CFG)" == "libaprapp - Win32 Debug9x"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "9x\Debug"
+# PROP BASE Output_Dir "..\9x\Debug"
# PROP BASE Intermediate_Dir "9x\Debug"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "9x\Debug"
+# PROP Output_Dir "..\9x\Debug"
# PROP Intermediate_Dir "9x\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MDd /W3 /EHsc /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
-# ADD CPP /nologo /MDd /W3 /EHsc /Zi /Od /I "../include" /I "../include/arch" /I "../include/arch/win32" /I "../include/arch/unix" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "APR_APP" /Fo"$(INTDIR)\" /Fd"$(OUTDIR)\libapr_app-1" /FD /c
+# ADD CPP /nologo /MDd /W3 /EHsc /Zi /Od /I "../include" /I "../include/arch" /I "../include/arch/win32" /I "../include/arch/unix" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "APR_APP" /Fo"$(INTDIR)\" /Fd"$(OUTDIR)\libaprapp-1" /FD /c
# ADD BASE RSC /l 0x409
# ADD RSC /l 0x409
BSC32=bscmake.exe
@@ -124,22 +124,22 @@
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"9x\Debug\libapr_app-1.lib"
+# ADD LIB32 /nologo /out:"..\9x\Debug\libaprapp-1.lib"
-!ELSEIF "$(CFG)" == "libapr_app - x64 Release"
+!ELSEIF "$(CFG)" == "libaprapp - x64 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "x64\Release"
+# PROP BASE Output_Dir "..\x64\Release"
# PROP BASE Intermediate_Dir "x64\Release"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "x64\Release"
+# PROP Output_Dir "..\x64\Release"
# PROP Intermediate_Dir "x64\Release"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
-# ADD CPP /nologo /MD /W3 /O2 /Oy- /Zi /I "../include" /I "../include/arch" /I "../include/arch/win32" /I "../include/arch/unix" /D "NDEBUG" /D "WINNT" /D "WIN32" /D "_WINDOWS" /D "APR_APP" /Fo"$(INTDIR)\" /Fd"$(OUTDIR)\libapr_app-1" /FD /c
+# ADD CPP /nologo /MD /W3 /O2 /Oy- /Zi /I "../include" /I "../include/arch" /I "../include/arch/win32" /I "../include/arch/unix" /D "NDEBUG" /D "WINNT" /D "WIN32" /D "_WINDOWS" /D "APR_APP" /Fo"$(INTDIR)\" /Fd"$(OUTDIR)\libaprapp-1" /FD /c
# ADD BASE RSC /l 0x409
# ADD RSC /l 0x409
BSC32=bscmake.exe
@@ -147,23 +147,23 @@
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"x64\Release\libapr_app-1.lib"
+# ADD LIB32 /nologo /out:"..\x64\Release\libaprapp-1.lib"
-!ELSEIF "$(CFG)" == "libapr_app - x64 Debug"
+!ELSEIF "$(CFG)" == "libaprapp - x64 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "x64\Debug"
+# PROP BASE Output_Dir "..\x64\Debug"
# PROP BASE Intermediate_Dir "x64\Debug"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "x64\Debug"
+# PROP Output_Dir "..\x64\Debug"
# PROP Intermediate_Dir "x64\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MDd /W3 /EHsc /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
-# ADD CPP /nologo /MDd /W3 /EHsc /Zi /Od /I "../include" /I "../include/arch" /I "../include/arch/win32" /I "../include/arch/unix" /D "_DEBUG" /D "WINNT" /D "WIN32" /D "_WINDOWS" /D "APR_APP" /Fo"$(INTDIR)\" /Fd"$(OUTDIR)\libapr_app-1" /FD /c
+# ADD CPP /nologo /MDd /W3 /EHsc /Zi /Od /I "../include" /I "../include/arch" /I "../include/arch/win32" /I "../include/arch/unix" /D "_DEBUG" /D "WINNT" /D "WIN32" /D "_WINDOWS" /D "APR_APP" /Fo"$(INTDIR)\" /Fd"$(OUTDIR)\libaprapp-1" /FD /c
# ADD BASE RSC /l 0x409
# ADD RSC /l 0x409
BSC32=bscmake.exe
@@ -171,18 +171,18 @@
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"x64\Debug\libapr_app-1.lib"
+# ADD LIB32 /nologo /out:"..\x64\Debug\libaprapp-1.lib"
!ENDIF
# Begin Target
-# Name "libapr_app - Win32 Release"
-# Name "libapr_app - Win32 Debug"
-# Name "libapr_app - Win32 Release9x"
-# Name "libapr_app - Win32 Debug9x"
-# Name "libapr_app - x64 Release"
-# Name "libapr_app - x64 Debug"
+# Name "libaprapp - Win32 Release"
+# Name "libaprapp - Win32 Debug"
+# Name "libaprapp - Win32 Release9x"
+# Name "libaprapp - Win32 Debug9x"
+# Name "libaprapp - x64 Release"
+# Name "libaprapp - x64 Debug"
# Begin Source File
SOURCE=..\misc\win32\apr_app.c
Added: apr/apr/trunk/build/preaprapp.dsp
URL: http://svn.apache.org/viewvc/apr/apr/trunk/build/preaprapp.dsp?rev=585870&view=auto
==============================================================================
--- apr/apr/trunk/build/preaprapp.dsp (added)
+++ apr/apr/trunk/build/preaprapp.dsp Wed Oct 17 22:32:07 2007
@@ -0,0 +1,179 @@
+# Microsoft Developer Studio Project File - Name="preaprapp" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) External Target" 0x0106
+
+CFG=preaprapp - Win32 Release
+!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 "preaprapp.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 "preaprapp.mak" CFG="preaprapp - Win32 Release"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "preaprapp - Win32 Release" (based on "Win32 (x86) External Target")
+!MESSAGE "preaprapp - Win32 Debug" (based on "Win32 (x86) External Target")
+!MESSAGE "preaprapp - Win32 Release9x" (based on "Win32 (x86) External Target")
+!MESSAGE "preaprapp - Win32 Debug9x" (based on "Win32 (x86) External Target")
+!MESSAGE "preaprapp - x64 Release" (based on "Win32 (x86) External Target")
+!MESSAGE "preaprapp - x64 Debug" (based on "Win32 (x86) External Target")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+
+!IF "$(CFG)" == "preaprapp - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir ""
+# PROP BASE Intermediate_Dir ""
+# PROP BASE Cmd_Line "NMAKE /nologo /f NUL"
+# PROP BASE Rebuild_Opt "/a"
+# PROP BASE Target_File "preaprapp.exe"
+# PROP BASE Bsc_Name "preaprapp.bsc"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir ""
+# PROP Intermediate_Dir ""
+# PROP Cmd_Line "NMAKE /nologo /f NUL"
+# PROP Rebuild_Opt "/a"
+# PROP Bsc_Name ""
+# PROP Target_Dir ""
+
+!ELSEIF "$(CFG)" == "preaprapp - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir ""
+# PROP BASE Intermediate_Dir ""
+# PROP BASE Cmd_Line "NMAKE /nologo /f NUL"
+# PROP BASE Rebuild_Opt "/a"
+# PROP BASE Target_File "preaprapp.exe"
+# PROP BASE Bsc_Name "preaprapp.bsc"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ""
+# PROP Intermediate_Dir ""
+# PROP Cmd_Line "NMAKE /nologo /f NUL"
+# PROP Rebuild_Opt "/a"
+# PROP Bsc_Name ""
+# PROP Target_Dir ""
+
+!ELSEIF "$(CFG)" == "preaprapp - Win32 Release9x"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir ""
+# PROP BASE Intermediate_Dir ""
+# PROP BASE Cmd_Line "NMAKE /nologo /f NUL"
+# PROP BASE Rebuild_Opt "/a"
+# PROP BASE Target_File "preaprapp.exe"
+# PROP BASE Bsc_Name "preaprapp.bsc"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir ""
+# PROP Intermediate_Dir ""
+# PROP Cmd_Line "NMAKE /nologo /f NUL"
+# PROP Rebuild_Opt "/a"
+# PROP Bsc_Name ""
+# PROP Target_Dir ""
+
+!ELSEIF "$(CFG)" == "preaprapp - Win32 Debug9x"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir ""
+# PROP BASE Intermediate_Dir ""
+# PROP BASE Cmd_Line "NMAKE /nologo /f NUL"
+# PROP BASE Rebuild_Opt "/a"
+# PROP BASE Target_File "preaprapp.exe"
+# PROP BASE Bsc_Name "preaprapp.bsc"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ""
+# PROP Intermediate_Dir ""
+# PROP Cmd_Line "NMAKE /nologo /f NUL"
+# PROP Rebuild_Opt "/a"
+# PROP Bsc_Name ""
+# PROP Target_Dir ""
+
+!ELSEIF "$(CFG)" == "preaprapp - x64 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir ""
+# PROP BASE Intermediate_Dir ""
+# PROP BASE Cmd_Line "NMAKE /nologo /f NUL"
+# PROP BASE Rebuild_Opt "/a"
+# PROP BASE Target_File "preaprapp.exe"
+# PROP BASE Bsc_Name "preaprapp.bsc"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir ""
+# PROP Intermediate_Dir ""
+# PROP Cmd_Line "NMAKE /nologo /f NUL"
+# PROP Rebuild_Opt "/a"
+# PROP Bsc_Name ""
+# PROP Target_Dir ""
+
+!ELSEIF "$(CFG)" == "preaprapp - x64 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir ""
+# PROP BASE Intermediate_Dir ""
+# PROP BASE Cmd_Line "NMAKE /nologo /f NUL"
+# PROP BASE Rebuild_Opt "/a"
+# PROP BASE Target_File "preaprapp.exe"
+# PROP BASE Bsc_Name "preaprapp.bsc"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ""
+# PROP Intermediate_Dir ""
+# PROP Cmd_Line "NMAKE /nologo /f NUL"
+# PROP Rebuild_Opt "/a"
+# PROP Bsc_Name ""
+# PROP Target_Dir ""
+
+!ENDIF
+
+# Begin Target
+
+# Name "preaprapp - Win32 Release"
+# Name "preaprapp - Win32 Debug"
+# Name "preaprapp - Win32 Release9x"
+# Name "preaprapp - Win32 Debug9x"
+# Name "preaprapp - x64 Release"
+# Name "preaprapp - x64 Debug"
+
+!IF "$(CFG)" == "preaprapp - Win32 Release"
+
+!ELSEIF "$(CFG)" == "preaprapp - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "preaprapp - Win32 Release9x"
+
+!ELSEIF "$(CFG)" == "preaprapp - Win32 Debug9x"
+
+!ELSEIF "$(CFG)" == "preaprapp - x64 Release"
+
+!ELSEIF "$(CFG)" == "preaprapp - x64 Debug"
+
+!ENDIF
+
+# End Target
+# End Project
Added: apr/apr/trunk/build/prelibaprapp.dsp
URL: http://svn.apache.org/viewvc/apr/apr/trunk/build/prelibaprapp.dsp?rev=585870&view=auto
==============================================================================
--- apr/apr/trunk/build/prelibaprapp.dsp (added)
+++ apr/apr/trunk/build/prelibaprapp.dsp Wed Oct 17 22:32:07 2007
@@ -0,0 +1,179 @@
+# Microsoft Developer Studio Project File - Name="prelibaprapp" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) External Target" 0x0106
+
+CFG=prelibaprapp - Win32 Release
+!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 "prelibaprapp.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 "prelibaprapp.mak" CFG="prelibaprapp - Win32 Release"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "prelibaprapp - Win32 Release" (based on "Win32 (x86) External Target")
+!MESSAGE "prelibaprapp - Win32 Debug" (based on "Win32 (x86) External Target")
+!MESSAGE "prelibaprapp - Win32 Release9x" (based on "Win32 (x86) External Target")
+!MESSAGE "prelibaprapp - Win32 Debug9x" (based on "Win32 (x86) External Target")
+!MESSAGE "prelibaprapp - x64 Release" (based on "Win32 (x86) External Target")
+!MESSAGE "prelibaprapp - x64 Debug" (based on "Win32 (x86) External Target")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+
+!IF "$(CFG)" == "prelibaprapp - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir ""
+# PROP BASE Intermediate_Dir ""
+# PROP BASE Cmd_Line "NMAKE /nologo /f NUL"
+# PROP BASE Rebuild_Opt "/a"
+# PROP BASE Target_File "prelibaprapp.exe"
+# PROP BASE Bsc_Name "prelibaprapp.bsc"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir ""
+# PROP Intermediate_Dir ""
+# PROP Cmd_Line "NMAKE /nologo /f NUL"
+# PROP Rebuild_Opt "/a"
+# PROP Bsc_Name ""
+# PROP Target_Dir ""
+
+!ELSEIF "$(CFG)" == "prelibaprapp - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir ""
+# PROP BASE Intermediate_Dir ""
+# PROP BASE Cmd_Line "NMAKE /nologo /f NUL"
+# PROP BASE Rebuild_Opt "/a"
+# PROP BASE Target_File "prelibaprapp.exe"
+# PROP BASE Bsc_Name "prelibaprapp.bsc"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ""
+# PROP Intermediate_Dir ""
+# PROP Cmd_Line "NMAKE /nologo /f NUL"
+# PROP Rebuild_Opt "/a"
+# PROP Bsc_Name ""
+# PROP Target_Dir ""
+
+!ELSEIF "$(CFG)" == "prelibaprapp - Win32 Release9x"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir ""
+# PROP BASE Intermediate_Dir ""
+# PROP BASE Cmd_Line "NMAKE /nologo /f NUL"
+# PROP BASE Rebuild_Opt "/a"
+# PROP BASE Target_File "prelibaprapp.exe"
+# PROP BASE Bsc_Name "prelibaprapp.bsc"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir ""
+# PROP Intermediate_Dir ""
+# PROP Cmd_Line "NMAKE /nologo /f NUL"
+# PROP Rebuild_Opt "/a"
+# PROP Bsc_Name ""
+# PROP Target_Dir ""
+
+!ELSEIF "$(CFG)" == "prelibaprapp - Win32 Debug9x"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir ""
+# PROP BASE Intermediate_Dir ""
+# PROP BASE Cmd_Line "NMAKE /nologo /f NUL"
+# PROP BASE Rebuild_Opt "/a"
+# PROP BASE Target_File "prelibaprapp.exe"
+# PROP BASE Bsc_Name "prelibaprapp.bsc"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ""
+# PROP Intermediate_Dir ""
+# PROP Cmd_Line "NMAKE /nologo /f NUL"
+# PROP Rebuild_Opt "/a"
+# PROP Bsc_Name ""
+# PROP Target_Dir ""
+
+!ELSEIF "$(CFG)" == "prelibaprapp - x64 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir ""
+# PROP BASE Intermediate_Dir ""
+# PROP BASE Cmd_Line "NMAKE /nologo /f NUL"
+# PROP BASE Rebuild_Opt "/a"
+# PROP BASE Target_File "prelibaprapp.exe"
+# PROP BASE Bsc_Name "prelibaprapp.bsc"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir ""
+# PROP Intermediate_Dir ""
+# PROP Cmd_Line "NMAKE /nologo /f NUL"
+# PROP Rebuild_Opt "/a"
+# PROP Bsc_Name ""
+# PROP Target_Dir ""
+
+!ELSEIF "$(CFG)" == "prelibaprapp - x64 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir ""
+# PROP BASE Intermediate_Dir ""
+# PROP BASE Cmd_Line "NMAKE /nologo /f NUL"
+# PROP BASE Rebuild_Opt "/a"
+# PROP BASE Target_File "prelibaprapp.exe"
+# PROP BASE Bsc_Name "prelibaprapp.bsc"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ""
+# PROP Intermediate_Dir ""
+# PROP Cmd_Line "NMAKE /nologo /f NUL"
+# PROP Rebuild_Opt "/a"
+# PROP Bsc_Name ""
+# PROP Target_Dir ""
+
+!ENDIF
+
+# Begin Target
+
+# Name "prelibaprapp - Win32 Release"
+# Name "prelibaprapp - Win32 Debug"
+# Name "prelibaprapp - Win32 Release9x"
+# Name "prelibaprapp - Win32 Debug9x"
+# Name "prelibaprapp - x64 Release"
+# Name "prelibaprapp - x64 Debug"
+
+!IF "$(CFG)" == "prelibaprapp - Win32 Release"
+
+!ELSEIF "$(CFG)" == "prelibaprapp - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "prelibaprapp - Win32 Release9x"
+
+!ELSEIF "$(CFG)" == "prelibaprapp - Win32 Debug9x"
+
+!ELSEIF "$(CFG)" == "prelibaprapp - x64 Release"
+
+!ELSEIF "$(CFG)" == "prelibaprapp - x64 Debug"
+
+!ENDIF
+
+# End Target
+# End Project
Propchange: apr/apr/trunk/build/prelibaprapp.dsp
------------------------------------------------------------------------------
svn:eol-style = native
Modified: apr/apr/trunk/test/Makefile.win
URL: http://svn.apache.org/viewvc/apr/apr/trunk/test/Makefile.win?rev=585870&r1=585869&r2=585870&view=diff
==============================================================================
--- apr/apr/trunk/test/Makefile.win (original)
+++ apr/apr/trunk/test/Makefile.win Wed Oct 17 22:32:07 2007
@@ -109,11 +109,11 @@
!IF "$(MODEL)" == "static"
LOCAL_LIB= ..\$(OUTDIR)\apr-1.lib
-APP_LIB= ..\build\$(OUTDIR)\apr_app-1.lib
+APP_LIB= ..\$(OUTDIR)\aprapp-1.lib
STATIC_CFLAGS = /D APR_DECLARE_STATIC
!ELSE
LOCAL_LIB= ..\$(OUTDIR)\libapr-1.lib
-APP_LIB= ..\build\$(OUTDIR)\libapr_app-1.lib
+APP_LIB= ..\$(OUTDIR)\libaprapp-1.lib
STATIC_CFLAGS =
!ENDIF