diff options
| -rw-r--r-- | Apache.dsw | 6 | ||||
| -rw-r--r-- | ApacheCore.dsp | 4 | ||||
| -rw-r--r-- | httpd.dsp | 4 | ||||
| -rw-r--r-- | srclib/pcre/dftables.dsp | 7 | ||||
| -rw-r--r-- | srclib/pcre/pcre.dsp | 8 | ||||
| -rw-r--r-- | srclib/pcre/pcreposix.dsp | 8 | ||||
| -rw-r--r-- | support/ab.dsp | 12 | ||||
| -rw-r--r-- | support/htdigest.dsp | 12 |
8 files changed, 36 insertions, 25 deletions
diff --git a/Apache.dsw b/Apache.dsw index 96d9bf9056..6d9291a82e 100644 --- a/Apache.dsw +++ b/Apache.dsw @@ -44,6 +44,9 @@ Package=<4> Begin Project Dependency Project_Dep_Name pcreposix End Project Dependency + Begin Project Dependency + Project_Dep_Name pcre + End Project Dependency }}} ############################################################################### @@ -512,6 +515,9 @@ Package=<5> Package=<4> {{{ + Begin Project Dependency + Project_Dep_Name pcre + End Project Dependency }}} ############################################################################### diff --git a/ApacheCore.dsp b/ApacheCore.dsp index 087da21fbf..64bdba3e9b 100644 --- a/ApacheCore.dsp +++ b/ApacheCore.dsp @@ -55,7 +55,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 aprlib.lib ap.lib pcreposix.lib pcre.lib kernel32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"lib\apr\Release" /libpath:"regex\release" /libpath:"ap\Release" /base:@"os\win32\BaseAddr.ref",ApacheCore -# ADD LINK32 aprlib.lib ap.lib pcreposix.lib pcre.lib kernel32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"lib\apr\Release" /libpath:"lib\pcre\release" /libpath:"ap\Release" /base:@"os\win32\BaseAddr.ref",ApacheCore +# ADD LINK32 aprlib.lib ap.lib pcre.lib pcreposix.lib kernel32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"lib\apr\Release" /libpath:"lib\pcre\LibR" /libpath:"ap\Release" /base:@"os\win32\BaseAddr.ref",ApacheCore !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" @@ -82,7 +82,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 aprlib.lib regex.lib ap.lib pcreposix.lib pcre.lib kernel32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /map /debug /machine:I386 /libpath:"lib\apr\debug" /libpath:"regex\debug" /libpath:"ap\Debug" /base:@"os\win32\BaseAddr.ref",ApacheCore -# ADD LINK32 aprlib.lib ap.lib kernel32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /map /debug /machine:I386 /libpath:"lib\apr\debug" /libpath:"lib\pcre\debug" /libpath:"ap\Debug" /base:@"os\win32\BaseAddr.ref",ApacheCore +# ADD LINK32 aprlib.lib ap.lib pcre.lib pcreposix.lib kernel32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /map /debug /machine:I386 /libpath:"lib\apr\debug" /libpath:"lib\pcre\LibD" /libpath:"ap\Debug" /base:@"os\win32\BaseAddr.ref",ApacheCore !ENDIF @@ -55,7 +55,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 aprlib.lib ap.lib pcreposix.lib pcre.lib kernel32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"lib\apr\Release" /libpath:"regex\release" /libpath:"ap\Release" /base:@"os\win32\BaseAddr.ref",ApacheCore -# ADD LINK32 aprlib.lib ap.lib pcreposix.lib pcre.lib kernel32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"lib\apr\Release" /libpath:"lib\pcre\release" /libpath:"ap\Release" /base:@"os\win32\BaseAddr.ref",ApacheCore +# ADD LINK32 aprlib.lib ap.lib pcre.lib pcreposix.lib kernel32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"lib\apr\Release" /libpath:"lib\pcre\LibR" /libpath:"ap\Release" /base:@"os\win32\BaseAddr.ref",ApacheCore !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" @@ -82,7 +82,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 aprlib.lib regex.lib ap.lib pcreposix.lib pcre.lib kernel32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /map /debug /machine:I386 /libpath:"lib\apr\debug" /libpath:"regex\debug" /libpath:"ap\Debug" /base:@"os\win32\BaseAddr.ref",ApacheCore -# ADD LINK32 aprlib.lib ap.lib kernel32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /map /debug /machine:I386 /libpath:"lib\apr\debug" /libpath:"lib\pcre\debug" /libpath:"ap\Debug" /base:@"os\win32\BaseAddr.ref",ApacheCore +# ADD LINK32 aprlib.lib ap.lib pcre.lib pcreposix.lib kernel32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /map /debug /machine:I386 /libpath:"lib\apr\debug" /libpath:"lib\pcre\LibD" /libpath:"ap\Debug" /base:@"os\win32\BaseAddr.ref",ApacheCore !ENDIF diff --git a/srclib/pcre/dftables.dsp b/srclib/pcre/dftables.dsp index c2955cbf08..cc2accc321 100644 --- a/srclib/pcre/dftables.dsp +++ b/srclib/pcre/dftables.dsp @@ -66,7 +66,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 "_CONSOLE" /D "_MBCS" /FD /c -# ADD CPP /nologo /MDd /W3 /Gm /GX- /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c +# ADD CPP /nologo /MDd /W3 /Gm /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c # ADD BASE RSC /l 0x809 /d "_DEBUG" # ADD RSC /l 0x809 /d "_DEBUG" BSC32=bscmake.exe @@ -128,6 +128,11 @@ SOURCE=.\internal.h # End Source File # Begin Source File +SOURCE=.\maketables.c +# PROP Exclude_From_Build 1 +# End Source File +# Begin Source File + SOURCE=.\pcre.hw !IF "$(CFG)" == "dftables - Win32 Release" diff --git a/srclib/pcre/pcre.dsp b/srclib/pcre/pcre.dsp index bb6781503a..eca84426b1 100644 --- a/srclib/pcre/pcre.dsp +++ b/srclib/pcre/pcre.dsp @@ -157,6 +157,10 @@ InputPath=.\config.hw # End Source File # Begin Source File +SOURCE=.\internal.h +# End Source File +# Begin Source File + SOURCE=.\pcre.hw !IF "$(CFG)" == "pcre - Win32 Release" @@ -184,10 +188,6 @@ InputPath=.\pcre.hw !ENDIF # End Source File -# Begin Source File - -SOURCE=..\..\include\pcreposix.h -# End Source File # End Group # End Target # End Project diff --git a/srclib/pcre/pcreposix.dsp b/srclib/pcre/pcreposix.dsp index 651e4a19d7..dd85f50cc1 100644 --- a/srclib/pcre/pcreposix.dsp +++ b/srclib/pcre/pcreposix.dsp @@ -116,10 +116,6 @@ InputPath=.\config.hw # End Source File # Begin Source File -SOURCE=..\..\include\pcre.h -# End Source File -# Begin Source File - SOURCE=.\pcre.hw !IF "$(CFG)" == "pcreposix - Win32 Release" @@ -147,6 +143,10 @@ InputPath=.\pcre.hw !ENDIF # End Source File +# Begin Source File + +SOURCE=.\pcreposix.h +# End Source File # End Group # End Target # End Project diff --git a/support/ab.dsp b/support/ab.dsp index 50f9da746d..e750e67e02 100644 --- a/support/ab.dsp +++ b/support/ab.dsp @@ -36,8 +36,8 @@ RSC=rc.exe # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "" -# PROP Intermediate_Dir "" +# PROP Output_Dir "Release" +# PROP Intermediate_Dir "Release" # 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 @@ -49,7 +49,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:console /machine:I386 -# ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console /machine:I386 /out:"release/ab.exe" +# ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console /machine:I386 # SUBTRACT LINK32 /pdb:none !ELSEIF "$(CFG)" == "ab - 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 "" -# PROP Intermediate_Dir "" +# PROP Output_Dir "Debug" +# PROP Intermediate_Dir "Debug" # 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 /c @@ -75,7 +75,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:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /out:"debug/ab.exe" /pdbtype:sept +# ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /pdbtype:sept !ENDIF diff --git a/support/htdigest.dsp b/support/htdigest.dsp index b8f92c008e..c82a4b186e 100644 --- a/support/htdigest.dsp +++ b/support/htdigest.dsp @@ -37,8 +37,8 @@ RSC=rc.exe # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "" -# PROP Intermediate_Dir "" +# PROP Output_Dir "Release" +# PROP Intermediate_Dir "Release" # 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 /nologo /subsystem:console /machine:I386 -# ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console /machine:I386 /out:"release/htdigest.exe" +# ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console /machine:I386 # SUBTRACT LINK32 /pdb:none !ELSEIF "$(CFG)" == "htdigest - Win32 Debug" @@ -62,8 +62,8 @@ LINK32=link.exe # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "" -# PROP Intermediate_Dir "" +# PROP Output_Dir "Debug" +# PROP Intermediate_Dir "Debug" # 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 /c @@ -76,7 +76,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:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /out:"debug/htdigest.exe" /pdbtype:sept +# ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /pdbtype:sept !ENDIF |