amassari 2005/02/02 08:41:50
Modified: c/samples Makefile.incl
c/src/xercesc Makefile.incl
c/tests Makefile.incl
c/tests/ThreadTest ThreadTest.cpp
Log:
Enable building of tests and samples under Interix (jira# 1330)
Revision Changes Path
1.69 +11 -1 xml-xerces/c/samples/Makefile.incl
Index: Makefile.incl
===================================================================
RCS file: /home/cvs/xml-xerces/c/samples/Makefile.incl,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- Makefile.incl 25 Nov 2004 17:30:36 -0000 1.68
+++ Makefile.incl 2 Feb 2005 16:41:50 -0000 1.69
@@ -205,6 +205,16 @@
SHLIBSUFFIX=.dll
endif
+#=============== INTERIX SPECIFIC OPTIONS =========================
+ifeq (${PLATFORM}, INTERIX)
+CMP= -c ${CXXFLAGS}
+CC= ${COMPILER} -c -D${PLATFORM} -D_REENTRANT -D_ALL_SOURCE
+LINK = ${COMPILER} -D${PLATFORM} ${LDFLAGS}
+PLATFORM_LIB_LINK_OPTIONS=-L/usr/local/lib
+EXTRA_LINK_OPTIONS=-lc ${EXTRA_LIBS}
+SHLIBSUFFIX=.so
+endif
+
#=============== MINGW SPECIFIC OPTIONS =========================
ifeq (${PLATFORM}, MINGW)
CMP= -c ${CXXFLAGS} -fexceptions
1.67 +4 -4 xml-xerces/c/src/xercesc/Makefile.incl
Index: Makefile.incl
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/Makefile.incl,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- Makefile.incl 18 Nov 2004 16:20:06 -0000 1.66
+++ Makefile.incl 2 Feb 2005 16:41:50 -0000 1.67
@@ -303,9 +303,9 @@
#=============== INTERIX SPECIFIC OPTIONS =========================
ifeq (${PLATFORM}, INTERIX)
- PLATFORM_COMPILE_OPTIONS = -fPIC -D${PLATFORM} -D_REENTRANT -D_ALL_SOURCE
- MAKE_SHARED = ${CXX} -D${PLATFORM} -shared -fPIC ${LDFLAGS}
- MAKE_SHARED_C = ${CC} -D${PLATFORM} -shared -fPIC ${LDFLAGS}
+ PLATFORM_COMPILE_OPTIONS = -D${PLATFORM} -D_REENTRANT -D_ALL_SOURCE
+ MAKE_SHARED = ${CXX} -D${PLATFORM} -shared ${LDFLAGS}
+ MAKE_SHARED_C = ${CC} -D${PLATFORM} -shared ${LDFLAGS}
ALLLIBS = ${LIBS}
SHLIBSUFFIX=.so
endif
1.52 +11 -1 xml-xerces/c/tests/Makefile.incl
Index: Makefile.incl
===================================================================
RCS file: /home/cvs/xml-xerces/c/tests/Makefile.incl,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- Makefile.incl 25 Nov 2004 17:30:36 -0000 1.51
+++ Makefile.incl 2 Feb 2005 16:41:50 -0000 1.52
@@ -205,6 +205,16 @@
SHLIBSUFFIX=.dll
endif
+#=============== INTERIX SPECIFIC OPTIONS =========================
+ifeq (${PLATFORM}, INTERIX)
+CMP= -c ${CXXFLAGS}
+CC= ${COMPILER} -c -D${PLATFORM} -D_REENTRANT -D_ALL_SOURCE
+LINK = ${COMPILER} -D${PLATFORM} ${LDFLAGS}
+PLATFORM_LIB_LINK_OPTIONS=-L/usr/local/lib
+EXTRA_LINK_OPTIONS=${EXTRA_LIBS}
+SHLIBSUFFIX=.so
+endif
+
#=============== MINGW SPECIFIC OPTIONS =========================
ifeq (${PLATFORM}, MINGW)
CMP= -c ${CXXFLAGS} -fexceptions
1.38 +2 -2 xml-xerces/c/tests/ThreadTest/ThreadTest.cpp
Index: ThreadTest.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/tests/ThreadTest/ThreadTest.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- ThreadTest.cpp 6 Dec 2004 12:14:00 -0000 1.37
+++ ThreadTest.cpp 2 Feb 2005 16:41:50 -0000 1.38
@@ -88,7 +88,7 @@
}
-#elif defined (AIX) || defined(SOLARIS) || defined(LINUX) || defined(HPUX)
|| defined (OS390) || defined(MACOSX) || defined(FREEBSD) ||
defined(__CYGWIN__) || defined(__QNXNTO__)
+#elif defined (AIX) || defined(SOLARIS) || defined(LINUX) || defined(HPUX)
|| defined (OS390) || defined(MACOSX) || defined(FREEBSD) ||
defined(__CYGWIN__) || defined(__QNXNTO__) || defined(INTERIX)
#include <pthread.h>
#include <unistd.h>
#include <errno.h>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
