[droid] - fix TexturePacker build - darwin doesn't know anything abou…

…t rpath
xbmc · Jul 2, 2012 · de58cf9 · de58cf9
1 parent a424514
commit de58cf9
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/tools/TexturePacker/Makefile.in b/tools/TexturePacker/Makefile.in
@@ -9,12 +9,15 @@ 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 Darwin,$(shell uname -s)),Darwin)
 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
@@ -42,7 +45,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) -Wl,-rpath=$(NATIVE_ROOT_PATH)/lib -o $(TARGET)
+	g++ $(DEFINES) $(NATIVE_ARCH) $(CXXFLAGS) $(SRCS) $(LIBS) $(RPATH) -o $(TARGET)
 clean:
 	rm -f $(TARGET)
 else