Commit 8a45f5f0 authored by William A. Rowe Jr's avatar William A. Rowe Jr
Browse files 

  Make Win32 build again


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87129 13f79535-47bb-0310-9956-ffa450edef68
parent f9ec6af5

Apache.dsw

+3 −0
Original line number Diff line number Diff line
@@ -35,6 +35,9 @@ Package=<4> 
    Begin Project Dependency

    Project_Dep_Name gen_uri_delims

    End Project Dependency

    Begin Project Dependency

    Project_Dep_Name sdbmlib

    End Project Dependency

}}}



###############################################################################

ApacheCore.def

+14 −0
Original line number Diff line number Diff line
@@ -438,3 +438,17 @@ EXPORTS 
       ap_bucket_create_pool



       ap_os_create_privileged_process



;

; apu_dbm symbols

;

        apu_dbm_open

        apu_dbm_geterror

        apu_dbm_close

        apu_dbm_fetch

        apu_dbm_store

        apu_dbm_delete

        apu_dbm_exists

        apu_dbm_firstkey

        apu_dbm_nextkey

        apu_dbm_freedatum

ApacheCore.dsp

+35 −2
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ RSC=rc.exe 
# ADD BASE RSC /l 0x409

# ADD RSC /l 0x409

# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I ".\include" /I ".\lib\apr\include" /I ".\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /FD /c

# ADD CPP /nologo /MD /W3 /GX /O2 /I ".\include" /I ".\lib\apr\include" /I ".\os\win32" /I ".\modules\mpm\winnt" /I ".\lib\expat-lite" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /FD /c

# ADD CPP /nologo /MD /W3 /GX /O2 /I ".\include" /I ".\lib\apr\include" /I ".\lib\aputil" /I ".\lib\sdbm" /I ".\os\win32" /I ".\modules\mpm\winnt" /I ".\lib\expat-lite" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /FD /c

BSC32=bscmake.exe

# ADD BASE BSC32 /nologo

# ADD BSC32 /nologo
@@ -68,7 +68,7 @@ RSC=rc.exe 
# ADD BASE RSC /l 0x409

# ADD RSC /l 0x409

# ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /I ".\include" /I ".\lib\apr\include" /I ".\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /FD /c

# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I ".\include" /I ".\lib\apr\include" /I ".\os\win32" /I ".\modules\mpm\winnt" /I ".\lib\expat-lite" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /FD /c

# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I ".\include" /I ".\lib\apr\include" /I ".\lib\aputil" /I ".\lib\sdbm" /I ".\os\win32" /I ".\modules\mpm\winnt" /I ".\lib\expat-lite" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /FD /c

BSC32=bscmake.exe

# ADD BASE BSC32 /nologo

# ADD BSC32 /nologo
@@ -120,6 +120,35 @@ SOURCE=.\os\win32\os.h 
# PROP Default_Filter ""

# Begin Source File



SOURCE=.\lib\aputil\apu_private.hw



!IF  "$(CFG)" == "ApacheCore - Win32 Release"



# Begin Custom Build

InputPath=.\lib\aputil\apu_private.hw



".\lib\aputil\apu_private.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

	copy .\lib\aputil\apu_private.hw .\lib\aputil\apu_private.h >nul 

	echo Created aputil apu_private.h from apu_private.hw 

	

# End Custom Build



!ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"



# Begin Custom Build

InputPath=.\lib\aputil\apu_private.hw



".\lib\aputil\apu_private.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

	copy .\lib\aputil\apu_private.hw .\lib\aputil\apu_private.h >nul 

	echo Created aputil apu_private.h from apu_private.hw 

	

# End Custom Build



!ENDIF 



# End Source File

# Begin Source File



SOURCE=.\main\gen_test_char.exe



!IF  "$(CFG)" == "ApacheCore - Win32 Release"
@@ -264,6 +293,10 @@ SOURCE=.\ap\ap_sha1.c 


SOURCE=.\include\ap_sha1.h

# End Source File

# Begin Source File



SOURCE=.\lib\aputil\apu_dbm.c

# End Source File

# End Group

# Begin Group "httpd"

httpd.dsp

+35 −2
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ RSC=rc.exe 
# ADD BASE RSC /l 0x409

# ADD RSC /l 0x409

# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I ".\include" /I ".\lib\apr\include" /I ".\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /FD /c

# ADD CPP /nologo /MD /W3 /GX /O2 /I ".\include" /I ".\lib\apr\include" /I ".\os\win32" /I ".\modules\mpm\winnt" /I ".\lib\expat-lite" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /FD /c

# ADD CPP /nologo /MD /W3 /GX /O2 /I ".\include" /I ".\lib\apr\include" /I ".\lib\aputil" /I ".\lib\sdbm" /I ".\os\win32" /I ".\modules\mpm\winnt" /I ".\lib\expat-lite" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /FD /c

BSC32=bscmake.exe

# ADD BASE BSC32 /nologo

# ADD BSC32 /nologo
@@ -68,7 +68,7 @@ RSC=rc.exe 
# ADD BASE RSC /l 0x409

# ADD RSC /l 0x409

# ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /I ".\include" /I ".\lib\apr\include" /I ".\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /FD /c

# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I ".\include" /I ".\lib\apr\include" /I ".\os\win32" /I ".\modules\mpm\winnt" /I ".\lib\expat-lite" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /FD /c

# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I ".\include" /I ".\lib\apr\include" /I ".\lib\aputil" /I ".\lib\sdbm" /I ".\os\win32" /I ".\modules\mpm\winnt" /I ".\lib\expat-lite" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /FD /c

BSC32=bscmake.exe

# ADD BASE BSC32 /nologo

# ADD BSC32 /nologo
@@ -120,6 +120,35 @@ SOURCE=.\os\win32\os.h 
# PROP Default_Filter ""

# Begin Source File



SOURCE=.\lib\aputil\apu_private.hw



!IF  "$(CFG)" == "ApacheCore - Win32 Release"



# Begin Custom Build

InputPath=.\lib\aputil\apu_private.hw



".\lib\aputil\apu_private.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

	copy .\lib\aputil\apu_private.hw .\lib\aputil\apu_private.h >nul 

	echo Created aputil apu_private.h from apu_private.hw 

	

# End Custom Build



!ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"



# Begin Custom Build

InputPath=.\lib\aputil\apu_private.hw



".\lib\aputil\apu_private.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

	copy .\lib\aputil\apu_private.hw .\lib\aputil\apu_private.h >nul 

	echo Created aputil apu_private.h from apu_private.hw 

	

# End Custom Build



!ENDIF 



# End Source File

# Begin Source File



SOURCE=.\main\gen_test_char.exe



!IF  "$(CFG)" == "ApacheCore - Win32 Release"
@@ -264,6 +293,10 @@ SOURCE=.\ap\ap_sha1.c 


SOURCE=.\include\ap_sha1.h

# End Source File

# Begin Source File



SOURCE=.\lib\aputil\apu_dbm.c

# End Source File

# End Group

# Begin Group "httpd"

libhttpd.def

+14 −0
Original line number Diff line number Diff line
@@ -438,3 +438,17 @@ EXPORTS 
       ap_bucket_create_pool



       ap_os_create_privileged_process



;

; apu_dbm symbols

;

        apu_dbm_open

        apu_dbm_geterror

        apu_dbm_close

        apu_dbm_fetch

        apu_dbm_store

        apu_dbm_delete

        apu_dbm_exists

        apu_dbm_firstkey

        apu_dbm_nextkey

        apu_dbm_freedatum