diff options
| author | Cory Fields <theuni-nospam-@xbmc.org> | 2012-07-09 18:44:45 -0400 |
|---|---|---|
| committer | Cory Fields <theuni-nospam-@xbmc.org> | 2012-08-08 18:59:21 -0400 |
| commit | 3eb3f5ab2072bf82f9d5f80a3d3f489492977c78 (patch) | |
| tree | ac6787d052ceb1b7b3342735f7b0802c916dc0bf /tools | |
| parent | 72fea1846909df7faec34d439c9711867ca024ca (diff) | |
[droid] fix first-run TexturePacker build.
We can't use CXXFLAGS/LIBS/etc vars as they'll contain host info
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/TexturePacker/Makefile.in | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/tools/TexturePacker/Makefile.in b/tools/TexturePacker/Makefile.in index 840511c5dc..83d3bb571e 100644 --- a/tools/TexturePacker/Makefile.in +++ b/tools/TexturePacker/Makefile.in @@ -19,10 +19,15 @@ DEFINES += -DTARGET_DARWIN NATIVE_ARCH=$(shell echo $(CXXFLAGS) | grep x86_64 >/dev/null && echo -m64 || echo -m32) RPATH= endif -CXXFLAGS+= -I$(NATIVE_ROOT_PATH)/include -LIBS += -L$(NATIVE_ROOT_PATH)/lib +NATIVE_CXXFLAGS+= -I. \ + -I$(NATIVE_ROOT_PATH)/include \ + -I@abs_top_srcdir@/lib \ + -I@abs_top_srcdir@/xbmc \ + -I@abs_top_srcdir@/xbmc/linux +NATIVE_LIBS += -L$(NATIVE_ROOT_PATH)/lib endif -LIBS += -L@abs_top_srcdir@/lib/libsquish -lsquish-native +NATIVE_LIBS += -lSDL_image -lSDL -llzo2 +NATIVE_LIBS += -L@abs_top_srcdir@/lib/libsquish -lsquish-native else LIBS += -L@abs_top_srcdir@/lib/libsquish -lsquish endif @@ -45,7 +50,7 @@ all: $(TARGET) ifeq (@USE_TEXTUREPACKER_NATIVE@,1) # TexturePacker run native on build system, build it with native tools $(TARGET): $(SRCS) - g++ $(DEFINES) $(NATIVE_ARCH) $(CXXFLAGS) $(SRCS) $(LIBS) $(RPATH) -o $(TARGET) + g++ $(DEFINES) $(NATIVE_ARCH) $(NATIVE_CXXFLAGS) $(SRCS) $(NATIVE_LIBS) $(RPATH) -o $(TARGET) clean: rm -f $(TARGET) else |