Commit 1702eb92 authored by William A. Rowe Jr's avatar William A. Rowe Jr
Browse files

Revert Revision 397647 

While it solves the studio 2005 (we desire this), it breaks
the studio 6 packaging (we require this).  Discussion on list
of practical solutions.

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

httpd.dsp

+2 −2
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ RSC=rc.exe 
# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "SHARED_MODULE" /FD /c

# ADD CPP /nologo /MD /W3 /O2 /Oy- /Zi /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 /i "./include" /i "./srclib/apr/include" /d "NDEBUG" /d "APP_FILE" /d "BIN_NAME=httpd.exe" /d "LONG_NAME=Apache HTTP Server" /d "ICON_FILE=apache.ico"

# ADD RSC /l 0x409 /i "./include" /i "./srclib/apr/include" /d "NDEBUG" /d "APP_FILE" /d BIN_NAME="httpd.exe" /d LONG_NAME="Apache HTTP Server" /d ICON_FILE="apache.ico"

BSC32=bscmake.exe

# ADD BASE BSC32 /nologo

# ADD BSC32 /nologo
@@ -69,7 +69,7 @@ LINK32=link.exe 
# ADD CPP /nologo /MDd /W3 /EHsc /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 /i "./include" /i "./srclib/apr/include" /d "_DEBUG" /d "APP_FILE" /d "BIN_NAME=httpd.exe" /d "LONG_NAME=Apache HTTP Server" /d "ICON_FILE=apache.ico"

# ADD RSC /l 0x409 /i "./include" /i "./srclib/apr/include" /d "_DEBUG" /d "APP_FILE" /d BIN_NAME="httpd.exe" /d LONG_NAME="Apache HTTP Server" /d ICON_FILE="apache.ico"

BSC32=bscmake.exe

# ADD BASE BSC32 /nologo

# ADD BSC32 /nologo

libhttpd.dsp

+2 −2
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ RSC=rc.exe 
# ADD BASE MTL /nologo /D "NDEBUG" /win32

# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32

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

# ADD RSC /l 0x409 /fo"Release/libhttpd.res" /i "./include" /i "./srclib/apr/include" /d "NDEBUG" /d "BIN_NAME=libhttpd.dll" /d "LONG_NAME=Apache HTTP Server Core"

# ADD RSC /l 0x409 /fo"Release/libhttpd.res" /i "./include" /i "./srclib/apr/include" /d "NDEBUG" /d BIN_NAME="libhttpd.dll" /d LONG_NAME="Apache HTTP Server Core"

BSC32=bscmake.exe

# ADD BASE BSC32 /nologo

# ADD BSC32 /nologo
@@ -78,7 +78,7 @@ PreLink_Cmds=cl.exe /nologo /MD /W3 /O2 /I "./include" /I "./srclib/apr/include" 
# ADD BASE MTL /nologo /D "_DEBUG" /win32

# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

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

# ADD RSC /l 0x409 /fo"Debug/libhttpd.res" /i "./include" /i "./srclib/apr/include" /d "_DEBUG" /d "BIN_NAME=libhttpd.dll" /d "LONG_NAME=Apache HTTP Server Core"

# ADD RSC /l 0x409 /fo"Debug/libhttpd.res" /i "./include" /i "./srclib/apr/include" /d "_DEBUG" /d BIN_NAME="libhttpd.dll" /d LONG_NAME="Apache HTTP Server Core"

BSC32=bscmake.exe

# ADD BASE BSC32 /nologo

# ADD BSC32 /nologo

modules/aaa/mod_auth_basic.dsp

+2 −2
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ RSC=rc.exe 
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"

# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"

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

# ADD RSC /l 0x409 /fo"Release/mod_auth_basic.res" /i "../../include" /i "../../srclib/apr/include" /d "NDEBUG" /d "BIN_NAME=mod_auth_basic.so" /d "LONG_NAME=auth_basic_module for Apache"

# ADD RSC /l 0x409 /fo"Release/mod_auth_basic.res" /i "../../include" /i "../../srclib/apr/include" /d "NDEBUG" /d BIN_NAME="mod_auth_basic.so" /d LONG_NAME="auth_basic_module for Apache"

BSC32=bscmake.exe

# ADD BASE BSC32 /nologo

# ADD BSC32 /nologo
@@ -73,7 +73,7 @@ LINK32=link.exe 
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"

# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"

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

# ADD RSC /l 0x409 /fo"Debug/mod_auth_basic.res" /i "../../include" /i "../../srclib/apr/include" /d "_DEBUG" /d "BIN_NAME=mod_auth_basic.so" /d "LONG_NAME=auth_basic_module for Apache"

# ADD RSC /l 0x409 /fo"Debug/mod_auth_basic.res" /i "../../include" /i "../../srclib/apr/include" /d "_DEBUG" /d BIN_NAME="mod_auth_basic.so" /d LONG_NAME="auth_basic_module for Apache"

BSC32=bscmake.exe

# ADD BASE BSC32 /nologo

# ADD BSC32 /nologo

modules/aaa/mod_auth_digest.dsp

+2 −2
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ RSC=rc.exe 
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"

# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"

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

# ADD RSC /l 0x409 /fo"Release/mod_auth_digest.res" /i "../../include" /i "../../srclib/apr/include" /d "NDEBUG" /d "BIN_NAME=mod_auth_digest.so" /d "LONG_NAME=auth_digest_module for Apache"

# ADD RSC /l 0x409 /fo"Release/mod_auth_digest.res" /i "../../include" /i "../../srclib/apr/include" /d "NDEBUG" /d BIN_NAME="mod_auth_digest.so" /d LONG_NAME="auth_digest_module for Apache"

BSC32=bscmake.exe

# ADD BASE BSC32 /nologo

# ADD BSC32 /nologo
@@ -73,7 +73,7 @@ LINK32=link.exe 
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"

# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"

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

# ADD RSC /l 0x409 /fo"Debug/mod_auth_digest.res" /i "../../include" /i "../../srclib/apr/include" /d "_DEBUG" /d "BIN_NAME=mod_auth_digest.so" /d "LONG_NAME=auth_digest_module for Apache"

# ADD RSC /l 0x409 /fo"Debug/mod_auth_digest.res" /i "../../include" /i "../../srclib/apr/include" /d "_DEBUG" /d BIN_NAME="mod_auth_digest.so" /d LONG_NAME="auth_digest_module for Apache"

BSC32=bscmake.exe

# ADD BASE BSC32 /nologo

# ADD BSC32 /nologo

modules/aaa/mod_authn_anon.dsp

+2 −2
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ RSC=rc.exe 
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"

# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"

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

# ADD RSC /l 0x409 /fo"Release/mod_authn_anon.res" /i "../../include" /i "../../srclib/apr/include" /d "NDEBUG" /d "BIN_NAME=mod_authn_anon.so" /d "LONG_NAME=authn_anon_module for Apache"

# ADD RSC /l 0x409 /fo"Release/mod_authn_anon.res" /i "../../include" /i "../../srclib/apr/include" /d "NDEBUG" /d BIN_NAME="mod_authn_anon.so" /d LONG_NAME="authn_anon_module for Apache"

BSC32=bscmake.exe

# ADD BASE BSC32 /nologo

# ADD BSC32 /nologo
@@ -73,7 +73,7 @@ LINK32=link.exe 
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"

# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"

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

# ADD RSC /l 0x409 /fo"Debug/mod_authn_anon.res" /i "../../include" /i "../../srclib/apr/include" /d "_DEBUG" /d "BIN_NAME=mod_authn_anon.so" /d "LONG_NAME=authn_anon_module for Apache"

# ADD RSC /l 0x409 /fo"Debug/mod_authn_anon.res" /i "../../include" /i "../../srclib/apr/include" /d "_DEBUG" /d BIN_NAME="mod_authn_anon.so" /d LONG_NAME="authn_anon_module for Apache"

BSC32=bscmake.exe

# ADD BASE BSC32 /nologo

# ADD BSC32 /nologo