diff options
| author | davilla <davilla@4pi.com> | 2012-01-15 21:24:36 -0500 |
|---|---|---|
| committer | davilla <davilla@4pi.com> | 2012-01-15 21:24:36 -0500 |
| commit | f54f11e8468bb1842691bf40c439e38c6fe16d3e (patch) | |
| tree | f03a17ac59e673e6c22dcbe1e28a23345cf22a7e | |
| parent | f4bd817d90880ba67101f0632eec86864413aa8c (diff) | |
[osx/ios] changed, bring changes into lib so others can use it without having to patch the crap out of it
| -rw-r--r-- | tools/darwin/depends/tinyxml/Makefile | 5 | ||||
| -rw-r--r-- | tools/darwin/depends/tinyxml/enforce-use-stl.patch | 14 | ||||
| -rw-r--r-- | tools/darwin/depends/tinyxml/qualify-windows-debug.patch | 10 |
3 files changed, 1 insertions, 28 deletions
diff --git a/tools/darwin/depends/tinyxml/Makefile b/tools/darwin/depends/tinyxml/Makefile index b1059ebd95..14454da7f4 100644 --- a/tools/darwin/depends/tinyxml/Makefile +++ b/tools/darwin/depends/tinyxml/Makefile @@ -2,12 +2,11 @@ include ../Makefile.include # lib name, version LIBNAME=tinyxml -VERSION=2.6.2 +VERSION=2.6.2_0 SOURCE=$(LIBNAME)-$(VERSION) ARCHIVE=$(SOURCE).tar.gz # configuration settings -export CXXFLAGS += -DTIXML_USE_STL CONFIGURE=./configure --prefix=$(PREFIX) @@ -22,8 +21,6 @@ $(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); patch -p1 < ../qualify-windows-debug.patch cd $(SOURCE); autoreconf -vif cd $(SOURCE); $(CONFIGURE) diff --git a/tools/darwin/depends/tinyxml/enforce-use-stl.patch b/tools/darwin/depends/tinyxml/enforce-use-stl.patch deleted file mode 100644 index 0dfc5a7441..0000000000 --- a/tools/darwin/depends/tinyxml/enforce-use-stl.patch +++ /dev/null @@ -1,14 +0,0 @@ -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 ) diff --git a/tools/darwin/depends/tinyxml/qualify-windows-debug.patch b/tools/darwin/depends/tinyxml/qualify-windows-debug.patch deleted file mode 100644 index d734718522..0000000000 --- a/tools/darwin/depends/tinyxml/qualify-windows-debug.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/include/tinyxml.h 2012-01-15 16:19:30.000000000 -0500 -+++ b/include/tinyxml.h 2012-01-15 16:23:05.000000000 -0500 -@@ -43,7 +43,7 @@ distribution. - #include <assert.h> - - // Help out windows: --#if defined( _DEBUG ) && !defined( DEBUG ) -+#if !defined(__APPLE__) && defined( _DEBUG ) && !defined( DEBUG ) - #define DEBUG - #endif |