From 064ca20ac7ce1a47b611d097cd7aded491c2119a Mon Sep 17 00:00:00 2001
From: Rahul Jain <rahulj@apache.org>
Date: Fri, 9 Jun 2000 23:45:03 +0000
Subject: [PATCH] More PTX port related changes submitted by Sumit Chawla
<sumitc@us.ibm.com>.
git-svn-id: https://svn.apache.org/repos/asf/xerces/c/trunk@172161 13f79535-47bb-0310-9956-ffa450edef68
---
samples/Makefile.incl | 2 +-
src/Makefile.incl | 7 ++++---
src/util/Transcoders/Iconv/IconvTransService.cpp | 6 +++++-
tests/Makefile.incl | 6 +++++-
4 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/samples/Makefile.incl b/samples/Makefile.incl
index 962cb99b7..1813abdf8 100644
--- a/samples/Makefile.incl
+++ b/samples/Makefile.incl
@@ -126,7 +126,7 @@ PLATFORM_COMPILE_OPTIONS = -KPIC -Kthread -DPTX
MAKE_SHARED = ${PLATFORM_CPP_COMPILER} -DPTX -G
MAKE_SHARED_C = ${PLATFORM_C_COMPILER} -DPTX -G
PLATFORM_LIB_LINK_OPTIONS=-L/usr/local/lib -L${XMLINSTALL}/lib
-EXTRA_LINK_OPTIONS=-lm -lgen -lustdio -licu-uc -licu-i18n -licu-toolutil
+EXTRA_LINK_OPTIONS=-lm -lgen
SHLIBSUFFIX=.so
endif
diff --git a/src/Makefile.incl b/src/Makefile.incl
index c208c7af5..3099f2aaa 100644
--- a/src/Makefile.incl
+++ b/src/Makefile.incl
@@ -168,13 +168,14 @@ ifeq (${PLATFORM}, PTX)
PLATFORM_CPP_COMPILER = c++
PLATFORM_C_COMPILER = cc
-ifdef ICUROOT
- ALLLIBS = ${LIBS} -L${ICUROOT}/lib -lm -lgen
+ifeq (${TRANSCODER}, ICU)
+ PLATFORM_COMPILE_OPTIONS = -KPIC -Kthread -D${PLATFORM}
+ ALLLIBS = ${LIBS} -L${ICUROOT}/lib -lm -lgen -licu-uc
else
+ PLATFORM_COMPILE_OPTIONS = -KPIC -Kthread -D${PLATFORM}
ALLLIBS = ${LIBS} -lm -lgen
endif
OBJ_OUT=${ALL_OBJECTS_DIR}/
-PLATFORM_COMPILE_OPTIONS = -KPIC -Kthread -D${PLATFORM}
MAKE_SHARED = ${PLATFORM_CPP_COMPILER} -D${PLATFORM} -G
MAKE_SHARED_C = ${PLATFORM_C_COMPILER} -D${PLATFORM} -G
EXTRA_LINK_OPTIONS = -lm -lgen
diff --git a/src/util/Transcoders/Iconv/IconvTransService.cpp b/src/util/Transcoders/Iconv/IconvTransService.cpp
index 35f82ab2f..9810a817f 100644
--- a/src/util/Transcoders/Iconv/IconvTransService.cpp
+++ b/src/util/Transcoders/Iconv/IconvTransService.cpp
@@ -56,6 +56,10 @@
/*
* $Log$
+ * Revision 1.18 2000/06/09 23:45:02 rahulj
+ * More PTX port related changes submitted by
+ * Sumit Chawla <sumitc@us.ibm.com>.
+ *
* Revision 1.17 2000/03/28 19:43:24 roddey
* Fixes for signed/unsigned warnings. New work for two way transcoding
* stuff.
@@ -138,7 +142,7 @@
#include <util/XMLUni.hpp>
#include "IconvTransService.hpp"
#include <wchar.h>
-#if defined (XML_GCC)
+#if defined (XML_GCC) || defined (XML_PTX)
#include <wctype.h>
#endif
#include <string.h>
diff --git a/tests/Makefile.incl b/tests/Makefile.incl
index b148fcf1a..4cac7b2e3 100644
--- a/tests/Makefile.incl
+++ b/tests/Makefile.incl
@@ -55,6 +55,10 @@
#
#
# $Log$
+# Revision 1.8 2000/06/09 23:45:03 rahulj
+# More PTX port related changes submitted by
+# Sumit Chawla <sumitc@us.ibm.com>.
+#
# Revision 1.7 2000/06/03 01:13:51 aruna1
# Version number consolidated into single file for unix
#
@@ -136,7 +140,7 @@ PLATFORM_COMPILE_OPTIONS = -KPIC -Kthread -DPTX
MAKE_SHARED = ${PLATFORM_CPP_COMPILER} -DPTX -G
MAKE_SHARED_C = ${PLATFORM_C_COMPILER} -DPTX -G
PLATFORM_LIB_LINK_OPTIONS=-L/usr/local/lib -L${XMLINSTALL}/lib
-EXTRA_LINK_OPTIONS=-lm -lgen -licu-uc -licu-i18n -lustdio -licu-toolutil
+EXTRA_LINK_OPTIONS=-lm -lgen
SHLIBSUFFIX=.so
endif
--
GitLab