Commit 03d61555 authored by William A. Rowe Jr's avatar William A. Rowe Jr
Browse files 

  Catch up with Apache.exe->httpd.exe rename; it seems svn rn can't
  be combined with svn commit and source changes.

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

httpd.dsp

+19 −19
Original line number Diff line number Diff line 
# Microsoft Developer Studio Project File - Name="Apache" - Package Owner=<4>

# Microsoft Developer Studio Project File - Name="httpd" - Package Owner=<4>

# Microsoft Developer Studio Generated Build File, Format Version 6.00

# ** DO NOT EDIT **



# TARGTYPE "Win32 (x86) Console Application" 0x0103



CFG=Apache - Win32 Release

CFG=httpd - 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 "Apache.mak".

!MESSAGE NMAKE /f "httpd.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 "Apache.mak" CFG="Apache - Win32 Release"

!MESSAGE NMAKE /f "httpd.mak" CFG="httpd - Win32 Release"

!MESSAGE 

!MESSAGE Possible choices for configuration are:

!MESSAGE 

!MESSAGE "Apache - Win32 Release" (based on "Win32 (x86) Console Application")

!MESSAGE "Apache - Win32 Debug" (based on "Win32 (x86) Console Application")

!MESSAGE "httpd - Win32 Release" (based on "Win32 (x86) Console Application")

!MESSAGE "httpd - Win32 Debug" (based on "Win32 (x86) Console Application")

!MESSAGE 



# Begin Project
@@ -28,7 +28,7 @@ CFG=Apache - Win32 Release 
CPP=cl.exe

RSC=rc.exe



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

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



# PROP BASE Use_MFC 0

# PROP BASE Use_Debug_Libraries 0
@@ -42,7 +42,7 @@ RSC=rc.exe 
# PROP Ignore_Export_Lib 0

# PROP Target_Dir ""

# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "SHARED_MODULE" /FD /c

# ADD CPP /nologo /MD /W3 /Zi /O2 /I "./include" /I "./srclib/apr/include" /I "./srclib/apr-util/include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /Fd"Release\Apache" /FD /c

# ADD CPP /nologo /MD /W3 /Zi /O2 /I "./include" /I "./srclib/apr/include" /I "./srclib/apr-util/include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /Fd"Release\httpd" /FD /c

# ADD BASE RSC /l 0x409 /d "NDEBUG"

# ADD RSC /l 0x409 /d "NDEBUG"

BSC32=bscmake.exe
@@ -52,7 +52,7 @@ LINK32=link.exe 
# ADD BASE LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /subsystem:console /machine:I386

# ADD LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /stack:0x40000 /subsystem:console /debug /machine:I386 /opt:ref



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

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



# PROP BASE Use_MFC 0

# PROP BASE Use_Debug_Libraries 1
@@ -66,7 +66,7 @@ LINK32=link.exe 
# PROP Ignore_Export_Lib 0

# PROP Target_Dir ""

# ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "./include" /I "./srclib/apr/include" /I "./srclib/apr-util/include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /Fd"Debug\Apache" /FD /c

# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "./include" /I "./srclib/apr/include" /I "./srclib/apr-util/include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /Fd"Debug\httpd" /FD /c

# SUBTRACT CPP /YX

# ADD BASE RSC /l 0x409 /d "_DEBUG"

# ADD RSC /l 0x409 /d "_DEBUG"
@@ -81,15 +81,15 @@ LINK32=link.exe 


# Begin Target



# Name "Apache - Win32 Release"

# Name "Apache - Win32 Debug"

# Name "httpd - Win32 Release"

# Name "httpd - Win32 Debug"

# Begin Source File



SOURCE=.\build\win32\Apache.ico

# End Source File

# Begin Source File



SOURCE=.\build\win32\Apache.rc

SOURCE=.\build\win32\httpd.rc

# End Source File

# Begin Source File
@@ -99,25 +99,25 @@ SOURCE=.\server\main.c 


SOURCE=.\build\win32\win32ver.awk



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

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



# PROP Ignore_Default_Tool 1

# Begin Custom Build - Creating Version Resource

InputPath=.\build\win32\win32ver.awk



".\build\win32\Apache.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

	awk -f ./build/win32/win32ver.awk Apache.exe "Apache HTTP Server"  ./include/ap_release.h icon=apache.ico > .\build\win32\Apache.rc

".\build\win32\httpd.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

	awk -f ./build/win32/win32ver.awk httpd.exe "Apache HTTP Server"  ./include/ap_release.h icon=apache.ico > .\build\win32\httpd.rc



# End Custom Build



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

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



# PROP Ignore_Default_Tool 1

# Begin Custom Build - Creating Version Resource

InputPath=.\build\win32\win32ver.awk



".\build\win32\Apache.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

	awk -f ./build/win32/win32ver.awk Apache.exe "Apache HTTP Server"  ./include/ap_release.h icon=apache.ico > .\build\win32\Apache.rc

".\build\win32\httpd.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

	awk -f ./build/win32/win32ver.awk httpd.exe "Apache HTTP Server"  ./include/ap_release.h icon=apache.ico > .\build\win32\httpd.rc



# End Custom Build