summaryrefslogtreecommitdiff
path: root/chromium/third_party/libxml/src/win32/Makefile.bcb
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/third_party/libxml/src/win32/Makefile.bcb')
-rw-r--r--chromium/third_party/libxml/src/win32/Makefile.bcb21
1 files changed, 3 insertions, 18 deletions
diff --git a/chromium/third_party/libxml/src/win32/Makefile.bcb b/chromium/third_party/libxml/src/win32/Makefile.bcb
index d326fb99568..4b0a2ef51ca 100644
--- a/chromium/third_party/libxml/src/win32/Makefile.bcb
+++ b/chromium/third_party/libxml/src/win32/Makefile.bcb
@@ -42,7 +42,7 @@ XML_INTDIR_A = int.a.bcb
UTILS_INTDIR = int.utils.bcb
# The preprocessor and its options.
-CPP = cpp32.exe -P- -DWIN32
+CPP = cpp32.exe -P-
CPPFLAGS = -I"$(XML_SRCDIR)\include" -DNOLIBTOOL
!if "$(WITH_THREADS)" != "no"
CPPFLAGS = $(CPPFLAGS) -D_REENTRANT -D__MT__
@@ -50,7 +50,7 @@ CPPFLAGS = $(CPPFLAGS) -D_REENTRANT -D__MT__
# The compiler and its options.
CC = bcc32.exe
-CFLAGS = -q -DWIN32 -D_NO_VCL -D_WINDOWS -D_MBCS -DEILSEQ=2 -DNOLIBTOOL -w-
+CFLAGS = -q -D_NO_VCL -D_WINDOWS -D_MBCS -DEILSEQ=2 -DNOLIBTOOL -w-
CFLAGS = $(CFLAGS) -I"$(XML_SRCDIR)" -I"$(XML_SRCDIR)\include" -I"$(INCPREFIX)" -I"$(INCLUDE)"
!if "$(WITH_THREADS)" != "no"
CFLAGS = $(CFLAGS) -D_REENTRANT -tWM
@@ -59,9 +59,7 @@ CFLAGS = $(CFLAGS) -D_REENTRANT -tWM
CFLAGS = $(CFLAGS) -tWR
!endif
!if "$(WITH_THREADS)" == "yes" || "$(WITH_THREADS)" == "ctls"
-CFLAGS = $(CFLAGS) -DHAVE_WIN32_THREADS -DHAVE_COMPILER_TLS
-!else if "$(WITH_THREADS)" == "native"
-CFLAGS = $(CFLAGS) -DHAVE_WIN32_THREADS
+CFLAGS = $(CFLAGS) -DHAVE_COMPILER_TLS
!else if "$(WITH_THREADS)" == "posix"
CFLAGS = $(CFLAGS) -DHAVE_PTHREAD_H
!endif
@@ -119,7 +117,6 @@ XML_OBJS = $(XML_INTDIR)\buf.obj\
$(XML_INTDIR)\chvalid.obj\
$(XML_INTDIR)\debugXML.obj\
$(XML_INTDIR)\dict.obj\
- $(XML_INTDIR)\DOCBparser.obj\
$(XML_INTDIR)\encoding.obj\
$(XML_INTDIR)\entities.obj\
$(XML_INTDIR)\error.obj\
@@ -165,7 +162,6 @@ XML_OBJS_A = $(XML_INTDIR_A)\buf.obj\
$(XML_INTDIR_A)\chvalid.obj\
$(XML_INTDIR_A)\debugXML.obj\
$(XML_INTDIR_A)\dict.obj\
- $(XML_INTDIR_A)\DOCBparser.obj\
$(XML_INTDIR_A)\encoding.obj\
$(XML_INTDIR_A)\entities.obj\
$(XML_INTDIR_A)\error.obj\
@@ -207,18 +203,7 @@ XML_OBJS_A = $(XML_INTDIR_A)\buf.obj\
# Xmllint and friends executables.
UTILS = $(BINDIR)\xmllint.exe\
$(BINDIR)\xmlcatalog.exe\
- $(BINDIR)\testAutomata.exe\
- $(BINDIR)\testC14N.exe\
- $(BINDIR)\testDocbook.exe\
- $(BINDIR)\testHTML.exe\
- $(BINDIR)\testReader.exe\
- $(BINDIR)\testRelax.exe\
- $(BINDIR)\testRegexp.exe\
$(BINDIR)\testModule.exe\
- $(BINDIR)\testSAX.exe\
- $(BINDIR)\testSchemas.exe\
- $(BINDIR)\testURI.exe\
- $(BINDIR)\testXPath.exe\
$(BINDIR)\runtest.exe\
$(BINDIR)\runsuite.exe\
$(BINDIR)\testapi.exe\