diff options
| author | davilla <davilla@4pi.com> | 2012-05-15 00:29:47 -0400 |
|---|---|---|
| committer | davilla <davilla@4pi.com> | 2012-05-15 00:29:47 -0400 |
| commit | 6014bd67e74d3944a970c605ac4ed6151a528e3a (patch) | |
| tree | 0dd098350c24aaca519d67541bcf5dc944322e03 /tools/TexturePacker/Makefile.in | |
| parent | 6f40b50893765d74ba3381b19ba612a84e5e6b78 (diff) | |
[ios] fixed ios build, HRESULT and ULONG only collide on osx
Diffstat (limited to 'tools/TexturePacker/Makefile.in')
| -rw-r--r-- | tools/TexturePacker/Makefile.in | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/TexturePacker/Makefile.in b/tools/TexturePacker/Makefile.in index fcaeca3cf3..482a6af087 100644 --- a/tools/TexturePacker/Makefile.in +++ b/tools/TexturePacker/Makefile.in @@ -13,6 +13,7 @@ ifeq (@USE_TEXTUREPACKER_NATIVE@,1) NATIVE_ROOT_PATH=@USE_TEXTUREPACKER_NATIVE_ROOT@ ifdef NATIVE_ROOT_PATH ifeq ($(findstring osx,@ARCH@),osx) +DEFINES += -DTARGET_DARWIN NATIVE_ARCH=$(shell echo $(CXXFLAGS) | grep x86_64 >/dev/null && echo -m64 || echo -m32) endif CXXFLAGS+= -I$(NATIVE_ROOT_PATH)/include |