Commit ddeca32f authored by Bill Stoddard's avatar Bill Stoddard
Browse files

Update logresolve.dsp and add to Makefile.win 


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

Makefile.win

+2 −2
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ _build: 
	cd support

         nmake /nologo CFG="htpasswd - Win32 $(LONG)" -f htpasswd.mak RECURSE=0 $(CTARGET)

#        nmake /nologo CFG="htdigest - Win32 $(LONG)" -f htdigest.mak RECURSE=0 $(CTARGET)

#	 nmake /nologo CFG="logresolve - Win32 $(LONG)" -f logresolve.mak RECURSE=0 $(CTARGET)

	 nmake /nologo CFG="logresolve - Win32 $(LONG)" -f logresolve.mak RECURSE=0 $(CTARGET)

	 nmake /nologo CFG="rotatelogs - Win32 $(LONG)" -f rotatelogs.mak RECURSE=0 $(CTARGET)

	cd ..

	cd main
@@ -115,7 +115,7 @@ _install: 
#       copy modules\proxy\$(LONG)\ApacheModuleProxy.dll $(INSTDIR)\modules

        copy support\$(LONG)\htpasswd.exe $(INSTDIR)\bin

#       copy support\$(LONG)\htdigest.exe $(INSTDIR)\bin

#	copy support\$(LONG)\logresolve.exe $(INSTDIR)\bin

	copy support\$(LONG)\logresolve.exe $(INSTDIR)\bin

	copy support\$(LONG)\rotatelogs.exe $(INSTDIR)\bin



_installdll:

support/logresolve.dsp

+4 −4
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ RSC=rc.exe 
# PROP Ignore_Export_Lib 0

# PROP Target_Dir ""

# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

# ADD CPP /nologo /MT /W3 /GX /O2 /I "../include" /I "../lib/apr/include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "WIN32_LEAN_AND_MEAN" /FD /c

# ADD CPP /nologo /MD /W3 /GX /O2 /I "../include" /I "../lib/apr/include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "WIN32_LEAN_AND_MEAN" /FD /c

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

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

BSC32=bscmake.exe
@@ -68,7 +68,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 /MTd /W3 /Gm /GX /Zi /Od /I "../include" /I "../lib/apr/include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "WIN32_LEAN_AND_MEAN" /FD /c

# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../include" /I "../lib/apr/include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "WIN32_LEAN_AND_MEAN" /FD /c

# SUBTRACT CPP /Fr

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

# ADD RSC /l 0x409 /d "_DEBUG"
@@ -77,8 +77,8 @@ 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 wsock32.lib ws2_32.lib /nologo /subsystem:console /map /debug /machine:I386 /nodefaultlib

# SUBTRACT LINK32 /pdb:none

# ADD LINK32 kernel32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console /map /debug /machine:I386

# SUBTRACT LINK32 /pdb:none /nodefaultlib



!ENDIF