31daa1bd60
Conflicts: cairo/cairo-1.8.0.patch cairo/prj/build.lst gdk-pixbuf/makefile.mk libcroco/makefile.mk
105 lines
3.7 KiB
Diff
105 lines
3.7 KiB
Diff
--- misc/expat-2.0.1/conftools/config.sub
|
|
+++ misc/build/expat-2.0.1/conftools/config.sub
|
|
@@ -1272,7 +1272,7 @@
|
|
| -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
|
|
| -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
|
|
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
|
|
- | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
|
|
+ | -udi* | -androideabi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
|
|
| -chorusos* | -chorusrdb* \
|
|
| -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
|
|
| -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
|
|
--- misc/expat-2.0.1/lib/makefile.mk Wed Aug 20 14:33:55 2008
|
|
+++ misc/build/expat-2.0.1/lib/makefile.mk Wed Aug 20 14:26:42 2008
|
|
@@ -1 +1,90 @@
|
|
-dummy
|
|
+#*************************************************************************
|
|
+#
|
|
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
|
+#
|
|
+# Copyright 2000, 2010 Oracle and/or its affiliates.
|
|
+#
|
|
+# OpenOffice.org - a multi-platform office productivity suite
|
|
+#
|
|
+# This file is part of OpenOffice.org.
|
|
+#
|
|
+# OpenOffice.org is free software: you can redistribute it and/or modify
|
|
+# it under the terms of the GNU Lesser General Public License version 3
|
|
+# only, as published by the Free Software Foundation.
|
|
+#
|
|
+# OpenOffice.org is distributed in the hope that it will be useful,
|
|
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
+# GNU Lesser General Public License version 3 for more details
|
|
+# (a copy is included in the LICENSE file that accompanied this code).
|
|
+#
|
|
+# You should have received a copy of the GNU Lesser General Public License
|
|
+# version 3 along with OpenOffice.org. If not, see
|
|
+# <http://www.openoffice.org/license.html>
|
|
+# for a copy of the LGPLv3 License.
|
|
+#
|
|
+#*************************************************************************
|
|
+PRJ=..$/..$/..$/..$/..
|
|
+
|
|
+PRJNAME=expat
|
|
+TARGET=expat
|
|
+LIBTARGET=NO
|
|
+EXTERNAL_WARNINGS_NOT_ERRORS=TRUE
|
|
+VISIBILITY_HIDDEN=TRUE
|
|
+
|
|
+# --- Settings -----------------------------------------------------
|
|
+.INCLUDE : settings.mk
|
|
+# --- Files --------------------------------------------------------
|
|
+
|
|
+CFLAGS+=-I..
|
|
+
|
|
+.IF "$(OS)"=="WNT"
|
|
+CDEFS+=-DCOMPILED_FROM_DSP
|
|
+.ELSE
|
|
+CDEFS+=-DHAVE_EXPAT_CONFIG_H
|
|
+.ENDIF
|
|
+
|
|
+.IF "$(OS)"=="MACOSX" && "$(SYSBASE)"!=""
|
|
+CDEFS+=-DHAVE_MEMMOVE -DHAVE_BCOPY
|
|
+.ENDIF # "$(OS)"=="MACOSX"
|
|
+
|
|
+SLOFILES=$(SLO)$/xmlparse.obj \
|
|
+ $(SLO)$/xmlrole.obj \
|
|
+ $(SLO)$/xmltok.obj
|
|
+
|
|
+SECOND_BUILD=UNICODE
|
|
+UNICODE_SLOFILES=$(SLO)$/xmlparse.obj
|
|
+UNICODECDEFS+=-DXML_UNICODE
|
|
+
|
|
+LIB1ARCHIV=$(LB)$/libascii_$(TARGET)_xmlparse.a
|
|
+LIB1TARGET=$(SLB)$/ascii_$(TARGET)_xmlparse.lib
|
|
+LIB1OBJFILES=$(SLO)$/xmlparse.obj
|
|
+
|
|
+LIB2ARCHIV=$(LB)$/lib$(TARGET)_xmlparse.a
|
|
+LIB2TARGET=$(SLB)$/$(TARGET)_xmlparse.lib
|
|
+LIB2OBJFILES =$(REAL_UNICODE_SLOFILES)
|
|
+
|
|
+LIB3ARCHIV=$(LB)$/lib$(TARGET)_xmltok.a
|
|
+LIB3TARGET=$(SLB)$/$(TARGET)_xmltok.lib
|
|
+LIB3OBJFILES=$(SLO)$/xmlrole.obj $(SLO)$/xmltok.obj
|
|
+
|
|
+.IF "$(BUILD_X64)"!=""
|
|
+# ---------------- X64 stuff special ---------------------
|
|
+# use UNICODE only because shell/shlxthandler
|
|
+# doesn't link against ascii_expat_xmlparse
|
|
+#---------------------------------------------------------
|
|
+SLOFILES_X64=$(SLO_X64)$/xmlparse.obj \
|
|
+ $(SLO_X64)$/xmlrole.obj \
|
|
+ $(SLO_X64)$/xmltok.obj
|
|
+CDEFS_X64+=-DXML_UNICODE -DCOMPILED_FROM_DSP
|
|
+CFLAGS_X64+=-I..
|
|
+LIB1TARGET_X64=$(SLB_X64)$/$(TARGET)_xmlparse.lib
|
|
+LIB1OBJFILES_X64=$(SLO_X64)$/xmlparse.obj
|
|
+LIB2TARGET_X64=$(SLB_X64)$/$(TARGET)_xmltok.lib
|
|
+LIB2OBJFILES_X64=$(SLO_X64)$/xmlrole.obj $(SLO_X64)$/xmltok.obj
|
|
+.ENDIF # "$(BUILD_X64)"!=""
|
|
+
|
|
+# --- Targets ------------------------------------------------------
|
|
+.INCLUDE : set_wntx64.mk
|
|
+.INCLUDE : target.mk
|
|
+.INCLUDE : tg_wntx64.mk
|