Kaydet (Commit) 6cb28fb7 authored tarafından Kurt Zenker's avatar Kurt Zenker

INTEGRATION: CWS libxslt02 (1.106.52); FILE MERGED

2007/04/21 11:36:54 cmc 1.106.52.2: RESYNC: (1.106-1.110); FILE MERGED
2006/12/24 09:04:55 cmc 1.106.52.1: #i30380 enable xslt usage by default
üst 22d788ce
...@@ -4,9 +4,9 @@ ...@@ -4,9 +4,9 @@
# #
# $RCSfile: libs.mk,v $ # $RCSfile: libs.mk,v $
# #
# $Revision: 1.110 $ # $Revision: 1.111 $
# #
# last change: $Author: vg $ $Date: 2007-03-26 14:31:37 $ # last change: $Author: kz $ $Date: 2007-05-10 13:14:18 $
# #
# The Contents of this file are made available subject to # The Contents of this file are made available subject to
# the terms of GNU Lesser General Public License Version 2.1. # the terms of GNU Lesser General Public License Version 2.1.
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
# MA 02111-1307 USA # MA 02111-1307 USA
# #
#************************************************************************* #*************************************************************************
LIBSMKREV!:="$$Revision: 1.110 $$" LIBSMKREV!:="$$Revision: 1.111 $$"
.IF "$(GUI)"=="UNX" || "$(GUI)"=="MAC" || "$(COM)"=="GCC" .IF "$(GUI)"=="UNX" || "$(GUI)"=="MAC" || "$(COM)"=="GCC"
...@@ -263,6 +263,11 @@ XML2LIB=$(LIBXML_LIBS) ...@@ -263,6 +263,11 @@ XML2LIB=$(LIBXML_LIBS)
XML2LIB=-lxml2 XML2LIB=-lxml2
.ENDIF .ENDIF
.ENDIF .ENDIF
.IF "$(SYSTEM_LIBXSLT)"=="YES"
XSLTLIB=$(LIBXSLT_LIBS)
.ELSE
XSLTLIB=-lxslt $(ZLIB3RD) $(XML2LIB)
.ENDIF
.IF "$(GUI)$(COM)"=="WNTGCC" .IF "$(GUI)$(COM)"=="WNTGCC"
JVMFWKLIB = -ljvmfwk$(UDK_MAJOR) JVMFWKLIB = -ljvmfwk$(UDK_MAJOR)
.ELSE .ELSE
...@@ -438,6 +443,8 @@ SYSSHELLLIB=sysshell.lib ...@@ -438,6 +443,8 @@ SYSSHELLLIB=sysshell.lib
JVMACCESSLIB = ijvmaccess.lib JVMACCESSLIB = ijvmaccess.lib
CPPUNITLIB = cppunit.lib CPPUNITLIB = cppunit.lib
XML2LIB = libxml2.lib XML2LIB = libxml2.lib
XSLTLIB = libxslt.lib $(ZLIB3RD) $(XML2LIB)
JVMFWKLIB = ijvmfwk.lib JVMFWKLIB = ijvmfwk.lib
# #110743# # #110743#
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment