Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id C0FAF200C53 for ; Tue, 11 Apr 2017 18:36:28 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id BE036160B9B; Tue, 11 Apr 2017 16:36:28 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id B482C160B7D for ; Tue, 11 Apr 2017 18:36:27 +0200 (CEST) Received: (qmail 69325 invoked by uid 500); 11 Apr 2017 16:36:26 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 69316 invoked by uid 99); 11 Apr 2017 16:36:26 -0000 Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 11 Apr 2017 16:36:26 +0000 Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 3D74D3A1385 for ; Tue, 11 Apr 2017 16:36:26 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1790999 - in /httpd/httpd/branches/2.4.x: Makefile.win docs/manual/platform/win_compiling.xml modules/ssl/mod_ssl.mak support/ab.c support/abs.mak Date: Tue, 11 Apr 2017 16:36:25 -0000 To: cvs@httpd.apache.org From: gsmith@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20170411163626.3D74D3A1385@svn01-us-west.apache.org> archived-at: Tue, 11 Apr 2017 16:36:28 -0000 Author: gsmith Date: Tue Apr 11 16:36:25 2017 New Revision: 1790999 URL: http://svn.apache.org/viewvc?rev=1790999&view=rev Log: Retro win32 command-line build allow building with OpenSSL 1.1.0 ab.c (abs) ---------- applink.c has been moved in this version of OpenSSL dsw/dsp ------- use srclib\apr\build\cvtdsp.pl -ossl11 from apr-1.6.x Modified: httpd/httpd/branches/2.4.x/Makefile.win httpd/httpd/branches/2.4.x/docs/manual/platform/win_compiling.xml httpd/httpd/branches/2.4.x/modules/ssl/mod_ssl.mak httpd/httpd/branches/2.4.x/support/ab.c httpd/httpd/branches/2.4.x/support/abs.mak Modified: httpd/httpd/branches/2.4.x/Makefile.win URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/Makefile.win?rev=1790999&r1=1790998&r2=1790999&view=diff ============================================================================== --- httpd/httpd/branches/2.4.x/Makefile.win (original) +++ httpd/httpd/branches/2.4.x/Makefile.win Tue Apr 11 16:36:25 2017 @@ -57,6 +57,29 @@ USEMAK=0 USEDSW=1 !ENDIF +!IF EXIST("srclib\openssl") +!IF "$(LONG)" == "Debug" && EXIST("srclib\openssl\out32dll.dbg\openssl.exe") +SSLBIN=out32dll.dbg +SSLAPP=out32dll.dbg +SSLCRP=libeay32 +SSLLIB=ssleay32 +!ELSE +!IF EXIST("srclib\openssl\libcrypto.lib") +!MESSAGE Building with OpenSSL 1.1.0 +!MESSAGE +SSLBIN=. +SSLAPP=apps +SSLCRP=libcrypto +SSLLIB=libssl +SSLOPT=_HAVE_OSSL110=1 +!ELSE +SSLBIN=out32dll +SSLAPP=out32dll +SSLCRP=libeay32 +SSLLIB=ssleay32 +!ENDIF +!ENDIF + default: _buildr !IF ("$(CTARGET)" == "") && ($(USESLN) == 1) @@ -99,20 +122,14 @@ UTILDIR=apr-util # to 'fix up' the build, since conditional dependencies aren't supported. # -!IF EXIST("srclib\openssl") -!IF "$(LONG)" == "Debug" && EXIST("srclib\openssl\out32dll.dbg\openssl.exe") -SSLBIN=out32dll.dbg -!ELSE -SSLBIN=out32dll -!ENDIF _tryssl: !IF $(USEMAK) == 1 cd modules\ssl - $(MAKE) $(MAKEOPT) -f mod_ssl.mak CFG="mod_ssl - Win32 $(LONG)" RECURSE=0 $(CTARGET) + $(MAKE) $(MAKEOPT) $(SSLOPT) -f mod_ssl.mak CFG="mod_ssl - Win32 $(LONG)" RECURSE=0 $(CTARGET) cd ..\.. cd support - $(MAKE) $(MAKEOPT) -f abs.mak CFG="abs - Win32 $(LONG)" RECURSE=0 $(CTARGET) + $(MAKE) $(MAKEOPT) $(SSLOPT) -f abs.mak CFG="abs - Win32 $(LONG)" RECURSE=0 $(CTARGET) cd .. !ELSEIF $(USESLN) == 1 devenv $(TLP).sln /useenv $(CTARGET) $(LONG) /project mod_ssl @@ -585,10 +602,10 @@ _build: # $(MAKE) $(MAKEOPT) -f mod_session_crypto.mak CFG="mod_session_crypto - Win32 $(LONG)" RECURSE=0 $(CTARGET) # cd ..\.. cd modules\ssl - $(MAKE) $(MAKEOPT) -f mod_ssl.mak CFG="mod_ssl - Win32 $(LONG)" RECURSE=0 $(CTARGET) + $(MAKE) $(MAKEOPT) $(SSLOPT) -f mod_ssl.mak CFG="mod_ssl - Win32 $(LONG)" RECURSE=0 $(CTARGET) cd ..\.. cd support - $(MAKE) $(MAKEOPT) -f abs.mak CFG="abs - Win32 $(LONG)" RECURSE=0 $(CTARGET) + $(MAKE) $(MAKEOPT) $(SSLOPT) -f abs.mak CFG="abs - Win32 $(LONG)" RECURSE=0 $(CTARGET) cd .. !ENDIF cd support @@ -848,9 +865,9 @@ _copybin: !IF EXIST("srclib\openssl") # copy modules\session\$(LONG)\mod_session_crypto.$(src_so) "$(inst_so)" <.y copy modules\ssl\$(LONG)\mod_ssl.$(src_so) "$(inst_so)" <.y - -copy srclib\openssl\$(SSLBIN)\libeay32.$(src_dll) "$(inst_dll)" <.y - -copy srclib\openssl\$(SSLBIN)\ssleay32.$(src_dll) "$(inst_dll)" <.y - -copy srclib\openssl\$(SSLBIN)\openssl.$(src_exe) "$(inst_exe)" <.y + -copy srclib\openssl\$(SSLBIN)\$(SSLCRP)*.$(src_dll) "$(inst_dll)" <.y + -copy srclib\openssl\$(SSLBIN)\$(SSLLIB)*.$(src_dll) "$(inst_dll)" <.y + -copy srclib\openssl\$(SSLAPP)\openssl.$(src_exe) "$(inst_exe)" <.y copy support\$(LONG)\abs.$(src_exe) "$(inst_exe)" <.y !ENDIF copy support\$(LONG)\ab.$(src_exe) "$(inst_exe)" <.y Modified: httpd/httpd/branches/2.4.x/docs/manual/platform/win_compiling.xml URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/platform/win_compiling.xml?rev=1790999&r1=1790998&r2=1790999&view=diff ============================================================================== --- httpd/httpd/branches/2.4.x/docs/manual/platform/win_compiling.xml (original) +++ httpd/httpd/branches/2.4.x/docs/manual/platform/win_compiling.xml Tue Apr 11 16:36:25 2017 @@ -355,6 +355,15 @@ description of the mod_apachemodule.so files to the shared .rc resource version-identifier build. +

Building with OpenSSL 1.1.0 and up

+ Due to difference in the build structure of OpenSSL begining with version + 1.1.0 you will need to convert the dsp files affected with cvtdsp.pl from + APR 1.6 or greater. The command: + + perl srclib\apr\build\cvtdsp.pl -ossl11 + + +

Visual Studio 2002 (.NET) and later users should also use the Build menu, Configuration Manager dialog to uncheck both the Debug and Release Solution modules abs, Modified: httpd/httpd/branches/2.4.x/modules/ssl/mod_ssl.mak URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/ssl/mod_ssl.mak?rev=1790999&r1=1790998&r2=1790999&view=diff ============================================================================== --- httpd/httpd/branches/2.4.x/modules/ssl/mod_ssl.mak (original) +++ httpd/httpd/branches/2.4.x/modules/ssl/mod_ssl.mak Tue Apr 11 16:36:25 2017 @@ -25,6 +25,19 @@ NULL= NULL=nul !ENDIF +!IF "$(_HAVE_OSSL110)" == "1" +SSLCRP=libcrypto +SSLLIB=libssl +SSLINC=/I ../../srclib/openssl/include +SSLBIN=../../srclib/openssl +!ELSE +SSLCRP=libeay32 +SSLLIB=ssleay32 +SSLINC=/I ../../srclib/openssl/inc32 +SSLBIN=../../srclib/openssl/out32dll +!ENDIF + + !IF "$(CFG)" == "mod_ssl - Win32 Release" OUTDIR=.\Release @@ -77,7 +90,7 @@ CLEAN : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" CPP=cl.exe -CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "../../include" /I "../generators" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" /I "../../srclib/openssl/inc32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "NO_IDEA" /D "NO_RC5" /D "NO_MDC2" /D "OPENSSL_NO_IDEA" /D "OPENSSL_NO_RC5" /D "OPENSSL_NO_MDC2" /D "HAVE_OPENSSL" /D "HAVE_SSL_SET_STATE" /D "HAVE_OPENSSL_ENGINE_H" /D "HAVE_ENGINE_INIT" /D "HAVE_ENGINE_LOAD_BUILTIN_ENGINES" /D "SSL_DECLARE_EXPORT" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_ssl_src" /FD /c +CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "../../include" /I "../generators" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" $(SSLINC) /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "NO_IDEA" /D "NO_RC5" /D "NO_MDC2" /D "OPENSSL_NO_IDEA" /D "OPENSSL_NO_RC5" /D "OPENSSL_NO_MDC2" /D "HAVE_OPENSSL" /D "HAVE_SSL_SET_STATE" /D "HAVE_OPENSSL_ENGINE_H" /D "HAVE_ENGINE_INIT" /D "HAVE_ENGINE_LOAD_BUILTIN_ENGINES" /D "SSL_DECLARE_EXPORT" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_ssl_src" /FD /c .c{$(INTDIR)}.obj:: $(CPP) @<< @@ -118,7 +131,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_ssl BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=kernel32.lib user32.lib wsock32.lib ws2_32.lib advapi32.lib gdi32.lib libeay32.lib ssleay32.lib /nologo /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\mod_ssl.pdb" /debug /out:"$(OUTDIR)\mod_ssl.so" /implib:"$(OUTDIR)\mod_ssl.lib" /libpath:"../../srclib/openssl/out32dll" /libpath:"../../srclib/openssl/out32" /base:@..\..\os\win32\BaseAddr.ref,mod_ssl.so /opt:ref +LINK32_FLAGS=kernel32.lib user32.lib wsock32.lib ws2_32.lib advapi32.lib gdi32.lib $(SSLCRP).lib $(SSLLIB).lib /nologo /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\mod_ssl.pdb" /debug /out:"$(OUTDIR)\mod_ssl.so" /implib:"$(OUTDIR)\mod_ssl.lib" /libpath:"$(SSLBIN)" /libpath:"../../srclib/openssl/out32" /base:@..\..\os\win32\BaseAddr.ref,mod_ssl.so /opt:ref LINK32_OBJS= \ "$(INTDIR)\mod_ssl.obj" \ "$(INTDIR)\ssl_engine_config.obj" \ @@ -211,7 +224,7 @@ CLEAN : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" CPP=cl.exe -CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "../../include" /I "../generators" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" /I "../../srclib/openssl/inc32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "NO_IDEA" /D "NO_RC5" /D "NO_MDC2" /D "OPENSSL_NO_IDEA" /D "OPENSSL_NO_RC5" /D "OPENSSL_NO_MDC2" /D "HAVE_OPENSSL" /D "HAVE_SSL_SET_STATE" /D "HAVE_OPENSSL_ENGINE_H" /D "HAVE_ENGINE_INIT" /D "HAVE_ENGINE_LOAD_BUILTIN_ENGINES" /D "SSL_DECLARE_EXPORT" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_ssl_src" /FD /EHsc /c +CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "../../include" /I "../generators" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" $(SSLINC) /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "NO_IDEA" /D "NO_RC5" /D "NO_MDC2" /D "OPENSSL_NO_IDEA" /D "OPENSSL_NO_RC5" /D "OPENSSL_NO_MDC2" /D "HAVE_OPENSSL" /D "HAVE_SSL_SET_STATE" /D "HAVE_OPENSSL_ENGINE_H" /D "HAVE_ENGINE_INIT" /D "HAVE_ENGINE_LOAD_BUILTIN_ENGINES" /D "SSL_DECLARE_EXPORT" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_ssl_src" /FD /EHsc /c .c{$(INTDIR)}.obj:: $(CPP) @<< @@ -252,7 +265,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_ssl BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=kernel32.lib user32.lib wsock32.lib ws2_32.lib advapi32.lib gdi32.lib libeay32.lib ssleay32.lib /nologo /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\mod_ssl.pdb" /debug /out:"$(OUTDIR)\mod_ssl.so" /implib:"$(OUTDIR)\mod_ssl.lib" /libpath:"../../srclib/openssl/out32dll.dbg" /libpath:"../../srclib/openssl/out32.dbg" /libpath:"../../srclib/openssl/out32dll" /libpath:"../../srclib/openssl/out32" /base:@..\..\os\win32\BaseAddr.ref,mod_ssl.so +LINK32_FLAGS=kernel32.lib user32.lib wsock32.lib ws2_32.lib advapi32.lib gdi32.lib $(SSLCRP).lib $(SSLLIB).lib /nologo /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\mod_ssl.pdb" /debug /out:"$(OUTDIR)\mod_ssl.so" /implib:"$(OUTDIR)\mod_ssl.lib" /libpath:"../../srclib/openssl/out32dll.dbg" /libpath:"../../srclib/openssl/out32.dbg" /libpath:"$(SSLBIN)" /libpath:"../../srclib/openssl/out32" /base:@..\..\os\win32\BaseAddr.ref,mod_ssl.so LINK32_OBJS= \ "$(INTDIR)\mod_ssl.obj" \ "$(INTDIR)\ssl_engine_config.obj" \ Modified: httpd/httpd/branches/2.4.x/support/ab.c URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/support/ab.c?rev=1790999&r1=1790998&r2=1790999&view=diff ============================================================================== --- httpd/httpd/branches/2.4.x/support/ab.c (original) +++ httpd/httpd/branches/2.4.x/support/ab.c Tue Apr 11 16:36:25 2017 @@ -175,8 +175,12 @@ typedef STACK_OF(X509) X509_STACK_TYPE; * by the OpenSSL library build to another CRT used by the ab.exe build. * This became especially problematic with Visual Studio 2015. */ +#if (OPENSSL_VERSION_NUMBER >= 0x1010000fL) +#include <../ms/applink.c> +#else #include #endif +#endif #endif Modified: httpd/httpd/branches/2.4.x/support/abs.mak URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/support/abs.mak?rev=1790999&r1=1790998&r2=1790999&view=diff ============================================================================== --- httpd/httpd/branches/2.4.x/support/abs.mak (original) +++ httpd/httpd/branches/2.4.x/support/abs.mak Tue Apr 11 16:36:25 2017 @@ -25,6 +25,18 @@ NULL= NULL=nul !ENDIF +!IF "$(_HAVE_OSSL110)" == "1" +SSLCRP=libcrypto +SSLLIB=libssl +SSLINC=/I ../srclib/openssl/include +SSLBIN=/libpath:../srclib/openssl +!ELSE +SSLCRP=libeay32 +SSLLIB=ssleay32 +SSLINC=/I ../srclib/openssl/inc32 +SSLBIN=/libpath:../srclib/openssl/out32dll +!ENDIF + !IF "$(CFG)" == "abs - Win32 Release" OUTDIR=.\Release @@ -60,7 +72,7 @@ CLEAN : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" CPP=cl.exe -CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "../srclib/apr/include" /I "../srclib/apr-util/include" /I "../include" /I "../srclib/openssl/inc32" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /D "HAVE_OPENSSL" /D "WIN32_LEAN_AND_MEAN" /D "NO_IDEA" /D "NO_RC5" /D "NO_MDC2" /D "OPENSSL_NO_IDEA" /D "OPENSSL_NO_RC5" /D "OPENSSL_NO_MDC2" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\abs_src" /FD /c +CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "../srclib/apr/include" /I "../srclib/apr-util/include" /I "../include" $(SSLINC) /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /D "HAVE_OPENSSL" /D "WIN32_LEAN_AND_MEAN" /D "NO_IDEA" /D "NO_RC5" /D "NO_MDC2" /D "OPENSSL_NO_IDEA" /D "OPENSSL_NO_RC5" /D "OPENSSL_NO_MDC2" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\abs_src" /FD /c .c{$(INTDIR)}.obj:: $(CPP) @<< @@ -99,7 +111,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\abs.bsc BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=kernel32.lib advapi32.lib wsock32.lib ws2_32.lib rpcrt4.lib shell32.lib ssleay32.lib libeay32.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\abs.pdb" /debug /out:"$(OUTDIR)\abs.exe" /libpath:"../srclib/openssl/out32dll" /opt:ref +LINK32_FLAGS=kernel32.lib advapi32.lib wsock32.lib ws2_32.lib rpcrt4.lib shell32.lib $(SSLCRP).lib $(SSLLIB).lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\abs.pdb" /debug /out:"$(OUTDIR)\abs.exe" $(SSLBIN) /opt:ref LINK32_OBJS= \ "$(INTDIR)\abs.obj" \ "$(INTDIR)\ab.res" \ @@ -159,7 +171,7 @@ CLEAN : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" CPP=cl.exe -CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "../srclib/apr/include" /I "../srclib/apr-util/include" /I "../include" /I "../srclib/openssl/inc32" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /D "HAVE_OPENSSL" /D "WIN32_LEAN_AND_MEAN" /D "NO_IDEA" /D "NO_RC5" /D "NO_MDC2" /D "OPENSSL_NO_IDEA" /D "OPENSSL_NO_RC5" /D "OPENSSL_NO_MDC2" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\abs_src" /FD /EHsc /c +CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "../srclib/apr/include" /I "../srclib/apr-util/include" /I "../include" $(SSLINC) /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /D "HAVE_OPENSSL" /D "WIN32_LEAN_AND_MEAN" /D "NO_IDEA" /D "NO_RC5" /D "NO_MDC2" /D "OPENSSL_NO_IDEA" /D "OPENSSL_NO_RC5" /D "OPENSSL_NO_MDC2" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\abs_src" /FD /EHsc /c .c{$(INTDIR)}.obj:: $(CPP) @<< @@ -198,7 +210,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\abs.bsc BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=kernel32.lib advapi32.lib wsock32.lib ws2_32.lib rpcrt4.lib shell32.lib ssleay32.lib libeay32.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\abs.pdb" /debug /out:"$(OUTDIR)\abs.exe" /libpath:"../srclib/openssl/out32dll" +LINK32_FLAGS=kernel32.lib advapi32.lib wsock32.lib ws2_32.lib rpcrt4.lib shell32.lib $(SSLCRP).lib $(SSLLIB).lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\abs.pdb" /debug /out:"$(OUTDIR)\abs.exe" $(SSLBIN) LINK32_OBJS= \ "$(INTDIR)\abs.obj" \ "$(INTDIR)\ab.res" \ @@ -293,7 +305,7 @@ SOURCE=.\ab.c !IF "$(CFG)" == "abs - Win32 Release" -CPP_SWITCHES=/nologo /MD /W3 /Zi /O2 /Oy- /I "../srclib/apr/include" /I "../srclib/apr-util/include" /I "../include" /I "../srclib/openssl/inc32" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /D "HAVE_OPENSSL" /D "WIN32_LEAN_AND_MEAN" /D "NO_IDEA" /D "NO_RC5" /D "NO_MDC2" /D "OPENSSL_NO_IDEA" /D "OPENSSL_NO_RC5" /D "OPENSSL_NO_MDC2" /Fo"$(INTDIR)\abs.obj" /Fd"$(INTDIR)\abs_src" /FD /c +CPP_SWITCHES=/nologo /MD /W3 /Zi /O2 /Oy- /I "../srclib/apr/include" /I "../srclib/apr-util/include" /I "../include" $(SSLINC) /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /D "HAVE_OPENSSL" /D "WIN32_LEAN_AND_MEAN" /D "NO_IDEA" /D "NO_RC5" /D "NO_MDC2" /D "OPENSSL_NO_IDEA" /D "OPENSSL_NO_RC5" /D "OPENSSL_NO_MDC2" /Fo"$(INTDIR)\abs.obj" /Fd"$(INTDIR)\abs_src" /FD /c "$(INTDIR)\abs.obj" : $(SOURCE) "$(INTDIR)" $(CPP) @<< @@ -303,7 +315,7 @@ CPP_SWITCHES=/nologo /MD /W3 /Zi /O2 /Oy !ELSEIF "$(CFG)" == "abs - Win32 Debug" -CPP_SWITCHES=/nologo /MDd /W3 /Zi /Od /I "../srclib/apr/include" /I "../srclib/apr-util/include" /I "../include" /I "../srclib/openssl/inc32" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /D "HAVE_OPENSSL" /D "WIN32_LEAN_AND_MEAN" /D "NO_IDEA" /D "NO_RC5" /D "NO_MDC2" /D "OPENSSL_NO_IDEA" /D "OPENSSL_NO_RC5" /D "OPENSSL_NO_MDC2" /Fo"$(INTDIR)\abs.obj" /Fd"$(INTDIR)\abs_src" /FD /EHsc /c +CPP_SWITCHES=/nologo /MDd /W3 /Zi /Od /I "../srclib/apr/include" /I "../srclib/apr-util/include" /I "../include" $(SSLINC) /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /D "HAVE_OPENSSL" /D "WIN32_LEAN_AND_MEAN" /D "NO_IDEA" /D "NO_RC5" /D "NO_MDC2" /D "OPENSSL_NO_IDEA" /D "OPENSSL_NO_RC5" /D "OPENSSL_NO_MDC2" /Fo"$(INTDIR)\abs.obj" /Fd"$(INTDIR)\abs_src" /FD /EHsc /c "$(INTDIR)\abs.obj" : $(SOURCE) "$(INTDIR)" $(CPP) @<<