23 lines
826 B
Plaintext
23 lines
826 B
Plaintext
$OpenBSD: patch-src_base_tinyxml_Makefile_in,v 1.4 2018/02/06 15:28:51 sthen Exp $
|
|
|
|
Fix build when tinyxml is installed.
|
|
(tinyxml is bundled within codeblocks, so prefer the bundled includes)
|
|
|
|
Index: src/base/tinyxml/Makefile.in
|
|
--- src/base/tinyxml/Makefile.in.orig
|
|
+++ src/base/tinyxml/Makefile.in
|
|
@@ -416,10 +416,10 @@ top_builddir = @top_builddir@
|
|
top_srcdir = @top_srcdir@
|
|
zlib_CFLAGS = @zlib_CFLAGS@
|
|
zlib_LIBS = @zlib_LIBS@
|
|
-AM_CPPFLAGS = $(WX_CXXFLAGS) \
|
|
- -I$(top_srcdir)/src/sdk/wxscintilla/include \
|
|
+AM_CPPFLAGS = -I$(top_srcdir)/src/sdk/wxscintilla/include \
|
|
-I$(top_srcdir)/src/include \
|
|
- -I$(top_srcdir)/src/include/tinyxml
|
|
+ -I$(top_srcdir)/src/include/tinyxml \
|
|
+ $(WX_CXXFLAGS)
|
|
|
|
noinst_LTLIBRARIES = libtinyxml.la
|
|
libtinyxml_la_SOURCES = tinyxml.cpp tinyxmlerror.cpp tinyxmlparser.cpp
|