amassari 2004/05/19 07:49:15
Modified: c/src/xercesc Makefile.incl runConfigure
c/tests runConfigure
Log:
MinGW: move the -mthreads option from Makefile.incl to runConfigure; change the name
of the DLL to be aligned with the naming in CygWin/Win32
Revision Changes Path
1.54 +17 -2 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.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- Makefile.incl 22 Mar 2004 22:07:05 -0000 1.53
+++ Makefile.incl 19 May 2004 14:49:15 -0000 1.54
@@ -347,7 +347,7 @@
#=============== MINGW SPECIFIC OPTIONS =========================
ifeq (${PLATFORM}, MINGW)
- PLATFORM_COMPILE_OPTIONS = -D${PLATFORM} -fexceptions -DWIN32 -D_WINDOWS
-DNDEBUG -DPLATFORM_WIN32 -D_CRTDBG_MAP_ALLOC
+ PLATFORM_COMPILE_OPTIONS = -D${PLATFORM} -fexceptions -D__GNUWIN32__ -DWIN32
-D_WINDOWS -DNDEBUG -DPLATFORM_WIN32
MAKE_SHARED = dllwrap --export-all-symbols --driver-name c++ ${LDFLAGS}
MAKE_SHARED_C = ${CC} -D${PLATFORM} ${LDFLAGS}
ALLLIBS = ${LIBS}
@@ -718,6 +718,21 @@
LINK_DEPDOM=${LIBDEPDOM}${SHLIBSUFFIX}
SO_DEPDOM =${CYGDEPDOM}${SO_TARGET_VERSION}${SHLIBSUFFIX}
+ REAL_DEPDOM=${LIBDEPDOM}${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}
+
+ LINK_DEPDOM=${LIBDEPDOM}${SHLIBSUFFIX}
+ SO_DEPDOM =${LIBDEPDOM}${SO_TARGET_VERSION}${SHLIBSUFFIX}
REAL_DEPDOM=${LIBDEPDOM}${VER}${SHLIBSUFFIX}
endif
1.34 +3 -3 xml-xerces/c/src/xercesc/runConfigure
Index: runConfigure
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/runConfigure,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- runConfigure 15 Mar 2004 17:06:58 -0000 1.33
+++ runConfigure 19 May 2004 14:49:15 -0000 1.34
@@ -439,8 +439,8 @@
esac
fi
elif test $platform = "mingw-msys"; then
- threadingLibs=""
- threadingDefines=""
+ threadingLibs="-mthreads"
+ threadingDefines="-mthreads"
fi
fi
1.34 +3 -3 xml-xerces/c/tests/runConfigure
Index: runConfigure
===================================================================
RCS file: /home/cvs/xml-xerces/c/tests/runConfigure,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- runConfigure 15 Mar 2004 17:06:58 -0000 1.33
+++ runConfigure 19 May 2004 14:49:15 -0000 1.34
@@ -374,8 +374,8 @@
esac
fi
elif test $platform = "mingw-msys"; then
- threadingLibs=""
- threadingDefines=""
+ threadingLibs="-mthreads"
+ threadingDefines="-mthreads"
fi
fi
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
