httpd-apreq-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From steve...@apache.org
Subject svn commit: r1661586 - in /httpd/apreq/trunk/win32: apreq2_test.mak apreq2_win32.pl libapreq2.mak mod_apreq2.mak test_cgi.mak
Date Sun, 22 Feb 2015 23:58:24 GMT
Author: stevehay
Date: Sun Feb 22 23:58:24 2015
New Revision: 1661586

URL: http://svn.apache.org/r1661586
Log:
Fix 64-bit build on Windows

Cf. revision 1543395 in https://svn.apache.org/repos/asf/perl/apxs/trunk

Modified:
    httpd/apreq/trunk/win32/apreq2_test.mak
    httpd/apreq/trunk/win32/apreq2_win32.pl
    httpd/apreq/trunk/win32/libapreq2.mak
    httpd/apreq/trunk/win32/mod_apreq2.mak
    httpd/apreq/trunk/win32/test_cgi.mak

Modified: httpd/apreq/trunk/win32/apreq2_test.mak
URL: http://svn.apache.org/viewvc/httpd/apreq/trunk/win32/apreq2_test.mak?rev=1661586&r1=1661585&r2=1661586&view=diff
==============================================================================
--- httpd/apreq/trunk/win32/apreq2_test.mak (original)
+++ httpd/apreq/trunk/win32/apreq2_test.mak Sun Feb 22 23:58:24 2015
@@ -85,7 +85,7 @@ LIB32_OBJS= \
 <<
 
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib wsock32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib
shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.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 /subsystem:console /incremental:yes  /debug /machine:I386
/pdbtype:sept 
+LINK32_FLAGS=kernel32.lib wsock32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib
shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.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 /subsystem:console /incremental:yes  /debug /pdbtype:sept

 
 LINK32_OBJS= \
 	"$(LIBDIR)\libapreq2.lib" \
@@ -138,7 +138,7 @@ LIB32_OBJS= \
 	"$(APU_LIB)"
 
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib wsock32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib
shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.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 /subsystem:console /incremental:yes  /debug /machine:I386
/pdbtype:sept 
+LINK32_FLAGS=kernel32.lib wsock32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib
shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.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 /subsystem:console /incremental:yes  /debug /pdbtype:sept

 
 LINK32_OBJS= \
 	"$(LIBDIR)\libapreq2.lib" \

Modified: httpd/apreq/trunk/win32/apreq2_win32.pl
URL: http://svn.apache.org/viewvc/httpd/apreq/trunk/win32/apreq2_win32.pl?rev=1661586&r1=1661585&r2=1661586&view=diff
==============================================================================
--- httpd/apreq/trunk/win32/apreq2_win32.pl (original)
+++ httpd/apreq/trunk/win32/apreq2_win32.pl Sun Feb 22 23:58:24 2015
@@ -90,7 +90,7 @@ my %apreq_args = (APREQ_MAJOR_VERSION =>
                   SHELL => $ENV{comspec},
                   CPPFLAGS => '',
                   CFLAGS => q{ /nologo /MD /W3 /O2 /D "WIN32" /D "_WINDOWS" /D "NDEBUG"
},
-                  LDFLAGS => q{ kernel32.lib /nologo /subsystem:windows /dll /machine:I386
},
+                  LDFLAGS => q{ kernel32.lib /nologo /subsystem:windows /dll },
                   LIBS => '',
                   EXTRA_INCLUDES => '',
                   APREQ_SOURCE_DIR => $src_dir,

Modified: httpd/apreq/trunk/win32/libapreq2.mak
URL: http://svn.apache.org/viewvc/httpd/apreq/trunk/win32/libapreq2.mak?rev=1661586&r1=1661585&r2=1661586&view=diff
==============================================================================
--- httpd/apreq/trunk/win32/libapreq2.mak (original)
+++ httpd/apreq/trunk/win32/libapreq2.mak Sun Feb 22 23:58:24 2015
@@ -85,7 +85,7 @@ BSC32=bscmake.exe
 BSC32_FLAGS=/nologo /o"$(OUTDIR)\libapreq2.bsc" 
 LINK32=link.exe
 MANIFEST=$(OUTDIR)\libapreq2.dll.manifest
-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:no /machine:I386 /out:"$(OUTDIR)\libapreq2.dll" /implib:"$(OUTDIR)\libapreq2.lib"
+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:no /out:"$(OUTDIR)\libapreq2.dll" /implib:"$(OUTDIR)\libapreq2.lib"
 
 "$(OUTDIR)\libapreq2.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
@@ -108,7 +108,7 @@ BSC32=bscmake.exe
 BSC32_FLAGS=/nologo /o"$(OUTDIR)\libapreq2.bsc" 
 LINK32=link.exe
 MANIFEST=$(OUTDIR)\libapreq2.dll.manifest
-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 
+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 /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=1661586&r1=1661585&r2=1661586&view=diff
==============================================================================
--- httpd/apreq/trunk/win32/mod_apreq2.mak (original)
+++ httpd/apreq/trunk/win32/mod_apreq2.mak Sun Feb 22 23:58:24 2015
@@ -78,7 +78,7 @@ BSC32=bscmake.exe
 BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_apreq2.bsc" 
 LINK32=link.exe
 MANIFEST=$(OUTDIR)\mod_apreq2.so.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:no /machine:I386
/out:"$(OUTDIR)\mod_apreq2.so" /implib:"$(OUTDIR)\mod_apreq2.lib" 
+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:no /out:"$(OUTDIR)\mod_apreq2.so"
/implib:"$(OUTDIR)\mod_apreq2.lib" 
 "$(OUTDIR)\mod_apreq2.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
   $(LINK32_FLAGS) $(LINK32_OBJS)
@@ -98,7 +98,7 @@ BSC32=bscmake.exe
 BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_apreq2.bsc" 
 LINK32=link.exe
 MANIFEST=$(OUTDIR)\mod_apreq2.so.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)\mod_apreq2.pdb"
/debug /machine:I386 /out:"$(OUTDIR)\mod_apreq2.so" /implib:"$(OUTDIR)\mod_apreq2.lib" /pdbtype:sept

+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)\mod_apreq2.pdb"
/debug /out:"$(OUTDIR)\mod_apreq2.so" /implib:"$(OUTDIR)\mod_apreq2.lib" /pdbtype:sept 
 "$(OUTDIR)\mod_apreq2.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
   $(LINK32_FLAGS) $(LINK32_OBJS)

Modified: httpd/apreq/trunk/win32/test_cgi.mak
URL: http://svn.apache.org/viewvc/httpd/apreq/trunk/win32/test_cgi.mak?rev=1661586&r1=1661585&r2=1661586&view=diff
==============================================================================
--- httpd/apreq/trunk/win32/test_cgi.mak (original)
+++ httpd/apreq/trunk/win32/test_cgi.mak Sun Feb 22 23:58:24 2015
@@ -71,7 +71,7 @@ RSC=rc.exe
 BSC32=bscmake.exe
 BSC32_FLAGS=/nologo /o"$(OUTDIR)\test_cgi.bsc" 
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib wsock32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib
shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.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 /subsystem:console /incremental:no /pdb:"$(OUTDIR)\test_cgi.pdb"
/machine:I386 /out:"$(CGIBIN)\test_cgi.exe" 
+LINK32_FLAGS=kernel32.lib wsock32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib
shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.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 /subsystem:console /incremental:no /pdb:"$(OUTDIR)\test_cgi.pdb"
/out:"$(CGIBIN)\test_cgi.exe" 
 
 !ELSEIF  "$(CFG)" == "test_cgi - Win32 Debug"
 
@@ -87,7 +87,7 @@ RSC=rc.exe
 BSC32=bscmake.exe
 BSC32_FLAGS=/nologo /o"$(OUTDIR)\test_cgi.bsc" 
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib wsock32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib
shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.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 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\test_cgi.pdb"
/debug /machine:I386 /out:"$(CGIBIN)\test_cgi.exe" /pdbtype:sept 
+LINK32_FLAGS=kernel32.lib wsock32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib
shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.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 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\test_cgi.pdb"
/debug /out:"$(CGIBIN)\test_cgi.exe" /pdbtype:sept 
 
 !ENDIF 
 



Mime
View raw message