amassari 2004/03/15 09:06:07
Modified: c/samples configure configure.in Makefile.incl
c/src/xercesc configure configure.in Makefile.in
Makefile.incl
c/tests configure configure.in Makefile.incl
c/src/xercesc/util/Compilers GCCDefs.cpp GCCDefs.hpp
c/src/xercesc/util/Platforms Makefile.in
c/src/xercesc/util/Platforms/Win32 Makefile.in
Log:
- Added support for MinGW (bug#23176)
Revision Changes Path
1.30 +4 -0 xml-xerces/c/samples/configure
Index: configure
===================================================================
RCS file: /home/cvs/xml-xerces/c/samples/configure,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- configure 11 Feb 2004 21:22:05 -0000 1.29
+++ configure 15 Mar 2004 17:06:06 -0000 1.30
@@ -1379,6 +1379,10 @@
*-*-osf*) platform=TRU64 ;;
*-apple-*) platform=MACOSX ;;
*-*-cygwin*) platform=CYGWIN ;;
+ *-*-mingw*) platform=MINGW ;;
+ *-*-interix*) platform=INTERIX ;;
+ *-*-mingw*) platform=MINGW ;;
+ *-*-interix*) platform=INTERIX ;;
*) platform=UNKNOWN ;;
esac
1.27 +2 -0 xml-xerces/c/samples/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/xml-xerces/c/samples/configure.in,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- configure.in 11 Feb 2004 21:22:05 -0000 1.26
+++ configure.in 15 Mar 2004 17:06:06 -0000 1.27
@@ -55,6 +55,8 @@
*-*-osf*) platform=TRU64 ;;
*-apple-*) platform=MACOSX ;;
*-*-cygwin*) platform=CYGWIN ;;
+ *-*-mingw*) platform=MINGW ;;
+ *-*-interix*) platform=INTERIX ;;
*) platform=UNKNOWN ;;
esac
AC_SUBST(platform)
1.60 +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.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- Makefile.incl 10 Dec 2003 23:50:25 -0000 1.59
+++ Makefile.incl 15 Mar 2004 17:06:06 -0000 1.60
@@ -224,6 +224,16 @@
SHLIBSUFFIX=.dll
endif
+#=============== MINGW SPECIFIC OPTIONS =========================
+ifeq (${PLATFORM}, MINGW)
+CMP= -c ${CXXFLAGS} -fexceptions
+CC= ${COMPILER} -c -D__${PLATFORM}__
+LINK = ${COMPILER} -D__${PLATFORM}__ ${LDFLAGS}
+PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib -L/usr/local/lib
+EXTRA_LINK_OPTIONS=${EXTRA_LIBS}
+SHLIBSUFFIX=.dll
+endif
+
#=============== FREEBSD SPECIFIC OPTIONS =========================
ifeq (${PLATFORM}, FREEBSD)
CMP= -c ${CXXFLAGS}
1.18 +1 -0 xml-xerces/c/src/xercesc/configure
Index: configure
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/configure,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- configure 17 Feb 2004 15:56:50 -0000 1.17
+++ configure 15 Mar 2004 17:06:06 -0000 1.18
@@ -1332,6 +1332,7 @@
*-*-osf*) platform=TRU64 ;;
*-apple-*) platform=MACOSX ;;
*-*-cygwin*) platform=CYGWIN ;;
+ *-*-mingw*) platform=MINGW ;;
*-*-interix*) platform=INTERIX ;;
*) platform=UNKNOWN ;;
esac
1.22 +2 -0 xml-xerces/c/src/xercesc/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/configure.in,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- configure.in 17 Feb 2004 15:56:50 -0000 1.21
+++ configure.in 15 Mar 2004 17:06:06 -0000 1.22
@@ -58,6 +58,8 @@
*-*-osf*) platform=TRU64 ;;
*-apple-*) platform=MACOSX ;;
*-*-cygwin*) platform=CYGWIN ;;
+ *-*-mingw*) platform=MINGW ;;
+ *-*-interix*) platform=INTERIX ;;
*) platform=UNKNOWN ;;
esac
AC_SUBST(platform)
1.18 +3 -3 xml-xerces/c/src/xercesc/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/Makefile.in,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- Makefile.in 20 Nov 2003 16:59:23 -0000 1.17
+++ Makefile.in 15 Mar 2004 17:06:06 -0000 1.18
@@ -166,11 +166,11 @@
ifeq (${PLATFORM},CYGWIN)
${FQ_SO_NAME}:: compile
@echo Building ${FQ_SO_NAME}
- ${MAKE} -C $(XML_OBJ_DIR)/.. -k $(MAKE_FLAGS)
+ ${MAKE} -C $(XML_OBJ) -k $(MAKE_FLAGS)
else
${FQ_REAL_NAME}:: compile
@echo Building ${FQ_REAL_NAME}
- ${MAKE} -C $(XML_OBJ_DIR)/.. -k $(MAKE_FLAGS)
+ ${MAKE} -C $(XML_OBJ) -k $(MAKE_FLAGS)
endif
install::
1.51 +20 -1 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.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- Makefile.incl 12 Feb 2004 20:44:10 -0000 1.50
+++ Makefile.incl 15 Mar 2004 17:06:06 -0000 1.51
@@ -332,6 +332,15 @@
SHLIBSUFFIX=.so
endif
+#=============== MINGW SPECIFIC OPTIONS =========================
+ifeq (${PLATFORM}, MINGW)
+ PLATFORM_COMPILE_OPTIONS = -D${PLATFORM} -fexceptions -DWIN32 -D_WINDOWS
-DNDEBUG -DPLATFORM_WIN32 -D_CRTDBG_MAP_ALLOC
+ MAKE_SHARED = dllwrap --export-all-symbols --driver-name c++ ${LDFLAGS}
+ MAKE_SHARED_C = ${CC} -D${PLATFORM} ${LDFLAGS}
+ ALLLIBS = ${LIBS}
+ SHLIBSUFFIX=.dll
+endif
+
#=============== LINUX SPECIFIC OPTIONS =========================
ifeq (${PLATFORM}, LINUX)
PLATFORM_COMPILE_OPTIONS = -fPIC -D${PLATFORM} -D_REENTRANT
@@ -662,6 +671,16 @@
#
LINK_NAME=${LIBNAME}${SHLIBSUFFIX}
SO_NAME =${CYGNAME}${SO_TARGET_VERSION}${SHLIBSUFFIX}
+ REAL_NAME=${LIBNAME}${VER}${SHLIBSUFFIX}
+endif
+ifeq (${PLATFORM}, MINGW)
+ #
+ # LINK_NAME=libxerces-c.dll
+ # SO_NAME =libxerces-c20.dll
+ # REAL_NAME=libxerces-c2_0_0.dll
+ #
+ LINK_NAME=${LIBNAME}${SHLIBSUFFIX}
+ SO_NAME =${LIBNAME}${SO_TARGET_VERSION}${SHLIBSUFFIX}
REAL_NAME=${LIBNAME}${VER}${SHLIBSUFFIX}
endif
ifeq (${PLATFORM}, MACOSX)
1.32 +2 -0 xml-xerces/c/tests/configure
Index: configure
===================================================================
RCS file: /home/cvs/xml-xerces/c/tests/configure,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- configure 13 Dec 2003 20:16:35 -0000 1.31
+++ configure 15 Mar 2004 17:06:06 -0000 1.32
@@ -1379,6 +1379,8 @@
*-*-osf*) platform=TRU64 ;;
*-apple-*) platform=MACOSX ;;
*-*-cygwin*) platform=CYGWIN ;;
+ *-*-mingw*) platform=MINGW ;;
+ *-*-interix*) platform=INTERIX ;;
*) platform=UNKNOWN ;;
esac
1.33 +2 -0 xml-xerces/c/tests/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/xml-xerces/c/tests/configure.in,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- configure.in 13 Dec 2003 20:16:35 -0000 1.32
+++ configure.in 15 Mar 2004 17:06:06 -0000 1.33
@@ -55,6 +55,8 @@
*-*-osf*) platform=TRU64 ;;
*-apple-*) platform=MACOSX ;;
*-*-cygwin*) platform=CYGWIN ;;
+ *-*-mingw*) platform=MINGW ;;
+ *-*-interix*) platform=INTERIX ;;
*) platform=UNKNOWN ;;
esac
AC_SUBST(platform)
1.41 +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.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- Makefile.incl 10 Dec 2003 23:50:26 -0000 1.40
+++ Makefile.incl 15 Mar 2004 17:06:06 -0000 1.41
@@ -219,6 +219,16 @@
SHLIBSUFFIX=.dll
endif
+#=============== MINGW SPECIFIC OPTIONS =========================
+ifeq (${PLATFORM}, MINGW)
+CMP= -c ${CXXFLAGS} -fexceptions
+CC= ${COMPILER} -c -D__${PLATFORM}__ -DPLATFORM_WIN32
+LINK = ${COMPILER} -D__${PLATFORM}__ ${LDFLAGS}
+PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib -L/usr/local/lib
+EXTRA_LINK_OPTIONS=${EXTRA_LIBS}
+SHLIBSUFFIX=.dll
+endif
+
#=============== FREEBSD SPECIFIC OPTIONS =========================
ifeq (${PLATFORM}, FREEBSD)
CMP= -c ${CXXFLAGS}
1.3 +4 -1 xml-xerces/c/src/xercesc/util/Compilers/GCCDefs.cpp
Index: GCCDefs.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/Compilers/GCCDefs.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- GCCDefs.cpp 18 Nov 2002 20:38:11 -0000 1.2
+++ GCCDefs.cpp 15 Mar 2004 17:06:06 -0000 1.3
@@ -57,6 +57,9 @@
/*
* $Log$
+ * Revision 1.3 2004/03/15 17:06:06 amassari
+ * - Added support for MinGW (bug#23176)
+ *
* Revision 1.2 2002/11/18 20:38:11 tng
* [Bug 14612] GCCDefs clashes with cygwin's string.h for stricmp and strnicmp.
*
@@ -90,7 +93,7 @@
#include <string.h>
-#ifndef __CYGWIN__
+#if !defined(__CYGWIN__) && !defined(__MINGW32__)
int stricmp(const char* const str1, const char* const str2)
{
1.8 +11 -3 xml-xerces/c/src/xercesc/util/Compilers/GCCDefs.hpp
Index: GCCDefs.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/Compilers/GCCDefs.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- GCCDefs.hpp 29 May 2003 11:18:37 -0000 1.7
+++ GCCDefs.hpp 15 Mar 2004 17:06:06 -0000 1.8
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.8 2004/03/15 17:06:06 amassari
+ * - Added support for MinGW (bug#23176)
+ *
* Revision 1.7 2003/05/29 11:18:37 gareth
* Added macros in so we can determine whether to do things like iostream as
opposed to iostream.h and whether to use std:: or not.
*
@@ -139,8 +142,13 @@
// These defines provide the platform specific keywords that they need
// to do this.
// ---------------------------------------------------------------------------
-#define PLATFORM_EXPORT
-#define PLATFORM_IMPORT
+#if defined(__MINGW32__)
+#define PLATFORM_EXPORT __declspec(dllexport)
+#define PLATFORM_IMPORT __declspec(dllimport)
+#else
+#define PLATFORM_EXPORT
+#define PLATFORM_IMPORT
+#endif
// ---------------------------------------------------------------------------
// Indicate that we do not support native bools
@@ -224,7 +232,7 @@
}
#endif
-#ifndef __CYGWIN__
+#if !defined(__CYGWIN__) && !defined(__MINGW32__)
int stricmp(const char* const str1, const char* const str2);
int strnicmp(const char* const str1, const char* const str2, const unsigned int
count);
1.11 +7 -1 xml-xerces/c/src/xercesc/util/Platforms/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/Platforms/Makefile.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Makefile.in 17 Feb 2004 15:56:50 -0000 1.10
+++ Makefile.in 15 Mar 2004 17:06:06 -0000 1.11
@@ -55,6 +55,9 @@
#
#
# $Log$
+# Revision 1.11 2004/03/15 17:06:06 amassari
+# - Added support for MinGW (bug#23176)
+#
# Revision 1.10 2004/02/17 15:56:50 neilg
# fix for bug 25035; much thanks to Abe Backus
#
@@ -213,6 +216,9 @@
endif
ifeq (${PLATFORM}, INTERIX)
SUBMODULE = Interix
+endif
+ifeq (${PLATFORM}, MINGW)
+ SUBMODULE = Win32
endif
includes::
1.3 +6 -0 xml-xerces/c/src/xercesc/util/Platforms/Win32/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/Platforms/Win32/Makefile.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile.in 21 Aug 2002 19:44:17 -0000 1.2
+++ Makefile.in 15 Mar 2004 17:06:06 -0000 1.3
@@ -54,6 +54,9 @@
# <http://www.apache.org/>.
#
# $Log$
+# Revision 1.3 2004/03/15 17:06:06 amassari
+# - Added support for MinGW (bug#23176)
+#
# Revision 1.2 2002/08/21 19:44:17 tng
# [Bug 6467] Installing Xerces C++ on cygwin environment.
#
@@ -87,6 +90,9 @@
CXXFLAGS += -D_GNU_SOURCE -D__USE_GNU
ifeq (${PLATFORM}, CYGWIN)
CXXFLAGS += -D__CYGWIN__
+endif
+ifeq (${PLATFORM}, MINGW)
+ CXXFLAGS += -D__MINGW__
endif
CPP_PUBHEADERS = Win32Defs.hpp
CPP_OBJECTS = Win32PlatformUtils.$(TO)
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
