[xml] Minor patch for Makefile.bcb
- From: Eric Zurcher csiro au
- To: xml gnome org
- Cc: igor zlatkovic com
- Subject: [xml] Minor patch for Makefile.bcb
- Date: Wed, 26 Nov 2003 16:09:56 +1100
Igor,
I've made a minor change to Makefile.bcb to better handle definition of the
_RTLDLL macro, which relates to the use of dynamic vs. static Borland
run-times.
Here's the patch:
Index: win32/Makefile.bcb
===================================================================
RCS file: /cvs/gnome/gnome-xml/win32/Makefile.bcb,v
retrieving revision 1.4
diff -u -r1.4 Makefile.bcb
--- win32/Makefile.bcb 21 Oct 2003 09:27:56 -0000 1.4
+++ win32/Makefile.bcb 26 Nov 2003 05:00:12 -0000
@@ -94,6 +94,9 @@
!if "$(WITH_THREADS)" != "no"
CFLAGS = $(CFLAGS) -D_REENTRANT -tWM
!endif
+!if "$(STATIC_RTL)" != "1"
+CFLAGS = $(CFLAGS) -D_RTLDLL
+!endif
!if "$(WITH_THREADS)" == "yes" || "$(WITH_THREADS)" == "ctls"
CFLAGS = $(CFLAGS) -DHAVE_WIN32_THREADS -DHAVE_COMPILER_TLS
!else if "$(WITH_THREADS)" == "native"
@@ -341,11 +344,11 @@
# An implicit rule for xmllint and friends.
!if "$(STATIC)" == "1"
{$(UTILS_SRCDIR)}.c{$(BINDIR)}.exe:
- $(CC) -DLIBXML_STATIC -w -D_RTLDLL -tWC $(CFLAGS)
-o$(UTILS_INTDIR)\$&.obj -c $<
+ $(CC) -DLIBXML_STATIC -w -tWC $(CFLAGS) -o$(UTILS_INTDIR)\$&.obj -c
$<
$(LD) $(LDFLAGS) c0x32.obj $(UTILS_INTDIR)\$&.obj,$@,,$(LIBS)
$(XML_A)
!else
{$(UTILS_SRCDIR)}.c{$(BINDIR)}.exe:
- $(CC) $(CFLAGS) -D_RTLDLL -tWC -o$(UTILS_INTDIR)\$&.obj -c $<
+ $(CC) $(CFLAGS) -tWC -o$(UTILS_INTDIR)\$&.obj -c $<
$(LD) $(LDFLAGS) c0x32.obj $(UTILS_INTDIR)\$&.obj
$(XML_IMP),$@,,$(LIBS)
!endif
Eric Zurcher
CSIRO Livestock Industries
Canberra, Australia
Eric Zurcher csiro au
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]