diff options
| author | davilla <davilla@4pi.com> | 2012-01-15 14:55:01 -0500 |
|---|---|---|
| committer | davilla <davilla@4pi.com> | 2012-01-15 14:55:13 -0500 |
| commit | 0dd831a8c9a86ee17ee07a2ccc481f486ee0fdef (patch) | |
| tree | f1eb4fe87d3a99f3c3e36ace6fe55d02ed3999b5 /tools | |
| parent | a29ac00d38bc2b98b014bc1f5245641fce369f7d (diff) | |
[osx/ios] fixed, force TIXML_USE_STL and just build the lib
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/darwin/depends/tinyxml/Makefile | 6 | ||||
| -rw-r--r-- | tools/darwin/depends/tinyxml/enforce-use-stl.patch | 14 |
2 files changed, 18 insertions, 2 deletions
diff --git a/tools/darwin/depends/tinyxml/Makefile b/tools/darwin/depends/tinyxml/Makefile index 75fe5aed80..f4f3616bdf 100644 --- a/tools/darwin/depends/tinyxml/Makefile +++ b/tools/darwin/depends/tinyxml/Makefile @@ -7,6 +7,7 @@ SOURCE=$(LIBNAME)-$(VERSION) ARCHIVE=$(SOURCE).tar.gz # configuration settings +export CXXFLAGS += -DTIXML_USE_STL CONFIGURE=./configure --prefix=$(PREFIX) @@ -21,14 +22,15 @@ $(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE) rm -rf $(SOURCE) $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) echo $(SOURCE) > .gitignore + cd $(SOURCE); patch -p2 < ../enforce-use-stl.patch cd $(SOURCE); autoreconf -vif cd $(SOURCE); $(CONFIGURE) $(LIBDYLIB): $(SOURCE) - make -j 1 -C $(SOURCE) + make -j 1 -C $(SOURCE)/src .installed: - make -C $(SOURCE) install + make -C $(SOURCE)/src install touch $@ clean: diff --git a/tools/darwin/depends/tinyxml/enforce-use-stl.patch b/tools/darwin/depends/tinyxml/enforce-use-stl.patch new file mode 100644 index 0000000000..0dfc5a7441 --- /dev/null +++ b/tools/darwin/depends/tinyxml/enforce-use-stl.patch @@ -0,0 +1,14 @@ +diff -Nur a/tinyxml-2.6.2/tinyxml.h b/tinyxml-2.6.2/tinyxml.h +--- a/tinyxml-2.6.2/include/tinyxml.h ++++ b/tinyxml-2.6.2/include/tinyxml.h +@@ -26,6 +26,10 @@ + #ifndef TINYXML_INCLUDED + #define TINYXML_INCLUDED + ++#ifndef TIXML_USE_STL ++ #define TIXML_USE_STL ++#endif ++ + #ifdef _MSC_VER + #pragma warning( push ) + #pragma warning( disable : 4530 ) |