Index: modules/text/src/main/native/text/unix/makefile =================================================================== --- modules/text/src/main/native/text/unix/makefile (revision 503679) +++ modules/text/src/main/native/text/unix/makefile (working copy) @@ -20,7 +20,7 @@ include $(HY_HDK)/build/make/defines.mk CFLAGS += -fpic -INCLUDES += -I../../icu4c +INCLUDES += -I$(HY_HDK)/include/icu4c BUILDFILES = $(SHAREDSUB)text_copyright.o $(SHAREDSUB)BidiWrapper.o Index: modules/text/src/main/native/text/windows/makefile =================================================================== --- modules/text/src/main/native/text/windows/makefile (revision 503679) +++ modules/text/src/main/native/text/windows/makefile (working copy) @@ -23,14 +23,14 @@ DLLNAME=..\$(LIBBASE).dll LIBNAME=$(LIBPATH)$(LIBBASE).lib HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE).def -HYCFLAGS = $(HYCFLAGS) /I$(SHAREDSUB) /I../../icu4c +HYCFLAGS = $(HYCFLAGS) /I$(SHAREDSUB) /I$(HY_HDK)\include\icu4c BUILDFILES = $(SHAREDSUB)text_copyright.obj $(SHAREDSUB)BidiWrapper.obj VIRTFILES = hytext.res SYSLIBFILES = ws2_32.lib Iphlpapi.lib MDLLIBFILES = \ $(LIBPATH)hysig.lib $(LIBPATH)hycommon.lib $(LIBPATH)hypool.lib $(LIBPATH)hyfdlibm.lib \ - $(LIBPATH)hythr.lib $(LIBPATH)vmi.lib ..\..\icu4c\unicode\icuuc.lib + $(LIBPATH)hythr.lib $(LIBPATH)vmi.lib $(LIBPATH)icuuc.lib DLLBASE=0x13300000 COMMENT=/comment:"Text component native code. (c) Copyright 1991, 2005 The Apache Software Foundation or its licensors, as applicable." Index: modules/text/build.xml =================================================================== --- modules/text/build.xml (revision 503679) +++ modules/text/build.xml (working copy) @@ -37,8 +37,6 @@ - - @@ -57,16 +55,6 @@ - - - - - - - - - - Index: make/build-native.xml =================================================================== --- make/build-native.xml (revision 503679) +++ make/build-native.xml (working copy) @@ -154,6 +154,7 @@ + @@ -161,8 +162,10 @@ - + + + +