Commit 4f3d4ed7 authored by Bill Stoddard's avatar Bill Stoddard
Browse files

Get htpasswd compiling under Windows 

Submitted by:	William Rowe
Reviewed by:	Bill Stoddard


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

support/htpasswd.c

+0 −1
Changes for support/htpasswd.c: 0 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -89,7 +89,6 @@ 


#ifdef WIN32

#include <conio.h>

#include "../os/win32/getopt.h"

#define unlink _unlink

#endif

support/htpasswd.dsp

+4 −32
Changes for support/htpasswd.dsp: 4 added lines, 32 removed lines.
Original line number Diff line number Diff line
@@ -42,7 +42,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" /YX /FD /c

# ADD CPP /nologo /W3 /GX /O2 /I "..\include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "WIN32_LEAN_AND_MEAN" /FD /c

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

# SUBTRACT CPP /YX

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

# ADD RSC /l 0x409 /d "NDEBUG"
@@ -51,7 +51,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 user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ws2_32.lib /nologo /subsystem:console /machine:I386

# ADD LINK32 aprlib.lib ap.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ws2_32.lib /nologo /subsystem:console /machine:I386 /libpath:"../lib/apr/release" /libpath:"../ap/release"



!ELSEIF  "$(CFG)" == "htpasswd - Win32 Debug"
@@ -67,7 +67,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" /YX /FD /c

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

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

# SUBTRACT CPP /YX

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

# ADD RSC /l 0x409 /d "_DEBUG"
@@ -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 user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ws2_32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

# ADD LINK32 aprlib.lib ap.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ws2_32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"../lib/apr/debug" /libpath:"../ap/debug"

# SUBTRACT LINK32 /pdb:none



!ENDIF
@@ -87,34 +87,6 @@ LINK32=link.exe 
# Name "htpasswd - Win32 Debug"

# Begin Source File



SOURCE=..\ap\ap_base64.c

# End Source File

# Begin Source File



SOURCE=..\ap\ap_checkpass.c

# End Source File

# Begin Source File



SOURCE=..\ap\ap_cpystrn.c

# End Source File

# Begin Source File



SOURCE=..\ap\ap_getpass.c

# End Source File

# Begin Source File



SOURCE=..\ap\ap_md5c.c

# End Source File

# Begin Source File



SOURCE=..\ap\ap_sha1.c

# End Source File

# Begin Source File



SOURCE=..\ap\ap_snprintf.c

# End Source File

# Begin Source File



SOURCE=.\htpasswd.c

# End Source File

# End Target