Author: mturk
Date: Thu Mar 8 15:07:41 2012
New Revision: 1298424
URL: http://svn.apache.org/viewvc?rev=1298424&view=rev
Log:
Use APACHE24_HOME instead APACHE23 and allow passing ARCH
Modified:
tomcat/jk/trunk/native/apache-2.0/Makefile.vc
Modified: tomcat/jk/trunk/native/apache-2.0/Makefile.vc
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/apache-2.0/Makefile.vc?rev=1298424&r1=1298423&r2=1298424&view=diff
==============================================================================
--- tomcat/jk/trunk/native/apache-2.0/Makefile.vc (original)
+++ tomcat/jk/trunk/native/apache-2.0/Makefile.vc Thu Mar 8 15:07:41 2012
@@ -20,10 +20,10 @@ OUTDIR=.\Release20
INTDIR=.\Release20
APACHE2_HOME=$(APACHE20_HOME)
!ELSE
-!IFDEF APACHE23_HOME
-APACHE2_HOME=$(APACHE23_HOME)
-OUTDIR=.\Release23
-INTDIR=.\Release23
+!IFDEF APACHE24_HOME
+APACHE2_HOME=$(APACHE24_HOME)
+OUTDIR=.\Release24
+INTDIR=.\Release24
!ELSE
!IFDEF APACHE22_HOME
APACHE2_HOME=$(APACHE22_HOME)
@@ -34,7 +34,6 @@ INTDIR=.\Release22
APR_LIB=libapr-1.lib
APU_LIB=libaprutil-1.lib
!ENDIF
-
!IFNDEF APACHE2_HOME
!ERROR Missing APACHE2_HOME environment variable.
!ENDIF
@@ -43,6 +42,7 @@ TARGET=mod_jk$(SO_VERSION)$(SO_HTTPD_VER
CPP=cl.exe
MTL=midl.exe
RSC=rc.exe
+ARCH=X86
ALL : "$(OUTDIR)\$(TARGET).so"
@@ -85,7 +85,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\$(TARGE
BSC32_SBRS= \
LINK32=link.exe
-LINK32_FLAGS=libhttpd.lib $(APR_LIB) $(APU_LIB) kernel32.lib user32.lib
advapi32.lib mswsock.lib ws2_32.lib $(EXTRA_LIBS) /nologo /base:"0x6A6B0000"
/subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\$(TARGET).pdb" /debug
/machine:I386 /out:"$(OUTDIR)\$(TARGET).so" /implib:"$(OUTDIR)\mod_jk.lib"
/libpath:"$(APACHE2_HOME)\lib" /opt:ref
+LINK32_FLAGS=libhttpd.lib $(APR_LIB) $(APU_LIB) kernel32.lib user32.lib
advapi32.lib mswsock.lib ws2_32.lib $(EXTRA_LIBS) /nologo /base:"0x6A6B0000"
/subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\$(TARGET).pdb" /debug
/machine:$(ARCH) /out:"$(OUTDIR)\$(TARGET).so" /implib:"$(OUTDIR)\mod_jk.lib"
/libpath:"$(APACHE2_HOME)\lib" /opt:ref
LINK32_OBJS= \
"$(INTDIR)\jk_ajp12_worker.obj" \
"$(INTDIR)\jk_ajp13.obj" \
@@ -118,7 +118,7 @@ LINK32_OBJS= \
mt -nologo -manifest $(OUTDIR)\$(TARGET).manifest
-outputresource:$(OUTDIR)\$(TARGET).so;2
-CPP_PROJ=-nologo -MD -W3 -O2 -Ob2 -Oy- -Zi -EHsc /I "..\common" /I
"$(APACHE2_HOME)\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\"
/Fd"$(INTDIR)\mod_jk_src" /FD /c
+CPP_PROJ=-nologo -MD -W3 -O2 -Ob2 -Oy- -Zi -EHsc /I "..\common" /I
"$(APACHE2_HOME)\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" $(CFLAGS)
/Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_jk_src" /FD /c
.c{$(INTDIR)}.obj::
$(CPP) @<<
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
