diff options
| author | davilla <davilla@4pi.com> | 2012-01-15 16:28:38 -0500 |
|---|---|---|
| committer | davilla <davilla@4pi.com> | 2012-01-15 16:28:38 -0500 |
| commit | 542ed4d1e44f8f889732bce513b4c99eafec1758 (patch) | |
| tree | 4a57a1333217d20faab3dc9fdcc52031f4f3caaf /tools | |
| parent | 1ca4afcac0f0af00984611e2c738a727e9dd7fb6 (diff) | |
[osx/ios] fixed, qualify windows DEBUG ifdef as it collides with the darwin one
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/darwin/depends/tinyxml/Makefile | 1 | ||||
| -rw-r--r-- | tools/darwin/depends/tinyxml/qualify-windows-debug.patch | 10 |
2 files changed, 11 insertions, 0 deletions
diff --git a/tools/darwin/depends/tinyxml/Makefile b/tools/darwin/depends/tinyxml/Makefile index f4f3616bdf..b1059ebd95 100644 --- a/tools/darwin/depends/tinyxml/Makefile +++ b/tools/darwin/depends/tinyxml/Makefile @@ -23,6 +23,7 @@ $(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE) $(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/qualify-windows-debug.patch b/tools/darwin/depends/tinyxml/qualify-windows-debug.patch new file mode 100644 index 0000000000..d734718522 --- /dev/null +++ b/tools/darwin/depends/tinyxml/qualify-windows-debug.patch @@ -0,0 +1,10 @@ +--- 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 |