Permalink
Browse files

fixed, broke -jN builds with TexturePacker fix

  • Loading branch information...
1 parent 152d316 commit ad47b98fc32ac12c6eb6ebb68199cdb9c0d64ad1 @davilla davilla committed Sep 23, 2012
Showing with 2 additions and 4 deletions.
  1. +2 −4 tools/TexturePacker/Makefile.in
@@ -34,8 +34,6 @@ endif
LIBS += -lSDL_image -lSDL -llzo2
-@abs_top_srcdir@/xbmc/guilib/XBTF.o : @abs_top_srcdir@/xbmc/guilib/XBTF.h
-
SRCS = \
md5.cpp \
SDL_anigif.cpp \
@@ -51,13 +49,13 @@ all: $(TARGET)
ifeq (@USE_TEXTUREPACKER_NATIVE@,1)
# TexturePacker run native on build system, build it with native tools
-$(TARGET): $(SRCS)
+$(TARGET): $(SRCS) @abs_top_srcdir@/xbmc/guilib/XBTF.h
g++ $(DEFINES) $(NATIVE_ARCH) $(NATIVE_CXXFLAGS) $(SRCS) $(NATIVE_LIBS) $(RPATH) -o $(TARGET)
clean:
rm -f $(TARGET)
else
include @abs_top_srcdir@/Makefile.include
-$(TARGET): $(SRCS)
+$(TARGET): $(SRCS) @abs_top_srcdir@/xbmc/guilib/XBTF.h
$(CXX) $(CXXFLAGS) $(DEFINES) $(INCLUDES) $(SRCS) $(LDFLAGS) $(LIBS) -o $(TARGET)
endif

0 comments on commit ad47b98

Please sign in to comment.