You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by na...@apache.org on 2006/12/12 12:08:59 UTC
svn commit: r486094 - /webservices/axis2/trunk/c/build/win32/makefile
Author: nandika
Date: Tue Dec 12 03:08:56 2006
New Revision: 486094
URL: http://svn.apache.org/viewvc?view=rev&rev=486094
Log:
patch spplied from jirs 458
thsnks to dumindu
Modified:
webservices/axis2/trunk/c/build/win32/makefile
Modified: webservices/axis2/trunk/c/build/win32/makefile
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/build/win32/makefile?view=diff&rev=486094&r1=486093&r2=486094
==============================================================================
--- webservices/axis2/trunk/c/build/win32/makefile (original)
+++ webservices/axis2/trunk/c/build/win32/makefile Tue Dec 12 03:08:56 2006
@@ -166,9 +166,9 @@
#debug symbols
!if "$(DEBUG)" == "1"
CFLAGS = $(CFLAGS) /D "_DEBUG" /Od /Z7
-LDFLAGS = $(LDFLAGS) /DEBUG /NODEFAULTLIB:LIBCMTD.lib
+LDFLAGS = $(LDFLAGS) /DEBUG /NODEFAULTLIB:LIBCMTD.lib /MTd
!else
-CFLAGS = $(CFLAGS) /D "NDEBUG" /O2
+CFLAGS = $(CFLAGS) /D "NDEBUG" /O2 /MT
LDFLAGS = $(LDFLAGS)
!endif
@@ -979,9 +979,18 @@
!if "$(ENABLE_SSL)" == "0"
MOD_RAMPART_INCLUDE_PATH = $(MOD_RAMPART_INCLUDE_PATH) /I$(OPENSSL_BIN_DIR)\include
LDFLAGS = $(LDFLAGS) /LIBPATH:$(OPENSSL_BIN_DIR)\lib\vc
+!endif
+
+
+#debug symbols
+!if "$(DEBUG)" == "1"
+LIBS = $(LIBS) libeay32MTd.lib ssleay32MTd.lib
+!else
LIBS = $(LIBS) libeay32MT.lib ssleay32MT.lib
!endif
+APPLINK_FILE = $(OPENSSL_BIN_DIR)\include\openssl\applink.c
+
omxmlsec:
$(CC) $(CFLAGS) $(MOD_RAMPART_INCLUDE_PATH) $(OMXMLSEC_SRC) /c
$(LD) $(LDFLAGS) *.obj $(AXIS2_UTIL).lib $(AXIOM).lib $(AXIS2_PARSER).lib \
@@ -1002,6 +1011,7 @@
copy $(AXIS2_SOURCE_DIR)\rampart\src\data\module.xml $(AXIS2_INSTALL_DIR)\rampart\rampart
mod_rampart:
+ $(CC) $(APPLINK_FILE) /c
$(CC) $(CFLAGS) $(MOD_RAMPART_INCLUDE_PATH) $(MOD_RAMPART_SRC) $(OMXMLSEC_SRC) /c
$(LD) $(LDFLAGS) /LIBPATH:$(AXIS2_INSTALL_DIR)\rampart\rampart *.obj $(AXIS2_UTIL).lib $(AXIOM).lib \
$(AXIS2_PARSER).lib $(LIBS) \
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org