diff options
Diffstat (limited to 'tools/TexturePacker/Makefile.in')
| -rw-r--r-- | tools/TexturePacker/Makefile.in | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/tools/TexturePacker/Makefile.in b/tools/TexturePacker/Makefile.in index 482a6af087..951720d817 100644 --- a/tools/TexturePacker/Makefile.in +++ b/tools/TexturePacker/Makefile.in @@ -9,17 +9,25 @@ CXXFLAGS+= \ -I@abs_top_srcdir@/xbmc \ -I@abs_top_srcdir@/xbmc/linux +RPATH=-Wl,-rpath=$(NATIVE_ROOT_PATH)/lib + ifeq (@USE_TEXTUREPACKER_NATIVE@,1) NATIVE_ROOT_PATH=@USE_TEXTUREPACKER_NATIVE_ROOT@ ifdef NATIVE_ROOT_PATH -ifeq ($(findstring osx,@ARCH@),osx) +ifeq ($(findstring Darwin,$(shell uname -s)),Darwin) DEFINES += -DTARGET_DARWIN -NATIVE_ARCH=$(shell echo $(CXXFLAGS) | grep x86_64 >/dev/null && echo -m64 || echo -m32) +NATIVE_ARCH=@DARWIN_NATIVE_ARCH@ +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 @@ -42,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) -o $(TARGET) + g++ $(DEFINES) $(NATIVE_ARCH) $(NATIVE_CXXFLAGS) $(SRCS) $(NATIVE_LIBS) $(RPATH) -o $(TARGET) clean: rm -f $(TARGET) else |