[prev in list] [next in list] [prev in thread] [next in thread] 

List:       apreq-cvs
Subject:    svn commit: r1635123 - in /httpd/apreq/trunk: CHANGES win32/apreq2_test.mak win32/libapreq2.mak win3
From:       stevehay () apache ! org
Date:       2014-10-29 13:08:28
Message-ID: 20141029130828.9C94F238888F () eris ! apache ! org
[Download RAW message or body]

Author: stevehay
Date: Wed Oct 29 13:08:27 2014
New Revision: 1635123

URL: http://svn.apache.org/r1635123
Log:
Fix debug build for Win32

Three patches from:

Subject: Modifications required to build debug version of httpd-apreq-2 for win32
From: "Kandarian, Richard M" <richard.kandarian@lanl.gov>
Date: Tue, 25 Mar 2014 17:12:25 +0000
Message-ID: <275671956B4337459E14A61834A5C03E3551729D@ECS-EXG-P-MB01.win.lanl.gov>

Submitted by: Richard M Kandarian <richard.kandarian@lanl.gov>
Reviewed by: stevehay

Modified:
    httpd/apreq/trunk/CHANGES
    httpd/apreq/trunk/win32/apreq2_test.mak
    httpd/apreq/trunk/win32/libapreq2.mak
    httpd/apreq/trunk/win32/mod_apreq2.mak

Modified: httpd/apreq/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/apreq/trunk/CHANGES?rev=1635123&r1=1635122&r2=1635123&view=diff
 ==============================================================================
--- httpd/apreq/trunk/CHANGES (original)
+++ httpd/apreq/trunk/CHANGES Wed Oct 29 13:08:27 2014
@@ -3,6 +3,9 @@
 
 @section v2_14 Changes with libapreq2-2.14 (in development)
 
+- Build [Richard M Kandarian]
+  Fix debug build for Win32.
+
 - C API [joes]
   Fix mod_apreq2's config merging.
 

Modified: httpd/apreq/trunk/win32/apreq2_test.mak
URL: http://svn.apache.org/viewvc/httpd/apreq/trunk/win32/apreq2_test.mak?rev=1635123&r1=1635122&r2=1635123&view=diff
 ==============================================================================
--- httpd/apreq/trunk/win32/apreq2_test.mak (original)
+++ httpd/apreq/trunk/win32/apreq2_test.mak Wed Oct 29 13:08:27 2014
@@ -163,7 +163,7 @@ LINK32_OBJS= \
 <<
 
 "$(LIBTDIR)\parsers.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) \
                "$(OUTDIR)\parsers.obj"
-    $(LINK32) /pdb:"$(TESTFILE)\parsers.pdb" /out:"$(LIBTDIR)\parsers.exe" @<<
+    $(LINK32) /pdb:"$(LIBTDIR)\parsers.pdb" /out:"$(LIBTDIR)\parsers.exe" @<<
   $(LINK32_FLAGS) $(LINK32_OBJS) "$(OUTDIR)\parsers.obj"
 <<
 

Modified: httpd/apreq/trunk/win32/libapreq2.mak
URL: http://svn.apache.org/viewvc/httpd/apreq/trunk/win32/libapreq2.mak?rev=1635123&r1=1635122&r2=1635123&view=diff
 ==============================================================================
--- httpd/apreq/trunk/win32/libapreq2.mak (original)
+++ httpd/apreq/trunk/win32/libapreq2.mak Wed Oct 29 13:08:27 2014
@@ -103,12 +103,12 @@ ALL : "$(OUTDIR)\libapreq2.dll"
 CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D \
"_MBCS" /D "_USRDLL" /D "APREQ_DECLARE_EXPORT" /I"$(APACHE)\include" \
/I"$(APREQ_HOME)\include" /YX /FD /GZ  /c   MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 \
/win32   RSC=rc.exe
-RSC_PROJ=/l 0x409 /i "$(APACHE)\include" /d "_DEBUG /i "$(APREQ_HOME)\include"
+RSC_PROJ=/l 0x409 /i "$(APACHE)\include" /d "_DEBUG" /i "$(APREQ_HOME)\include"
 BSC32=bscmake.exe
 BSC32_FLAGS=/nologo /o"$(OUTDIR)\libapreq2.bsc" 
 LINK32=link.exe
 MANIFEST=$(OUTDIR)\libapreq2.dll.manifest
-LINK32_FLAGS=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 /dll /incremental:yes /pdb:"$(OUTDIR)\libapreq2.pdb" /debug /machine:I386 \
/out:"$(OUTDIR)\libapreq2.dll" /implib:"$(OUTDIR)\libapreq2.lib" /pdbtype:sept  \
+LINK32_FLAGS="$(APR_LIB)" "$(APU_LIB)" 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 /dll /incremental:yes /pdb:"$(OUTDIR)\libapreq2.pdb" \
/debug /machine:I386 /out:"$(OUTDIR)\libapreq2.dll" /implib:"$(OUTDIR)\libapreq2.lib" \
/pdbtype:sept   
 "$(OUTDIR)\libapreq2.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<

Modified: httpd/apreq/trunk/win32/mod_apreq2.mak
URL: http://svn.apache.org/viewvc/httpd/apreq/trunk/win32/mod_apreq2.mak?rev=1635123&r1=1635122&r2=1635123&view=diff
 ==============================================================================
--- httpd/apreq/trunk/win32/mod_apreq2.mak (original)
+++ httpd/apreq/trunk/win32/mod_apreq2.mak Wed Oct 29 13:08:27 2014
@@ -92,7 +92,7 @@ ALL : "$(OUTDIR)\mod_apreq2.dll"
 "$(OUTDIR)" :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D \
"_MBCS" /D "_USRDLL" /D "MOD_APREQ_EXPORTS" /I"$(APACHE)\include" \
/I"$(APREQ_HOME)\include" /I"$(MODDIR)" /YX /FD /GZ  /c  +CPP_PROJ=/nologo /MDd /W3 \
/Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D \
"APREQ_DECLARE_EXPORT" /I"$(APACHE)\include" /I"$(APREQ_HOME)\include" /I"$(MODDIR)" \
/YX /FD /GZ  /c   MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 
 BSC32=bscmake.exe
 BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_apreq2.bsc" 


[prev in list] [next in list] [prev in thread] [next in thread]