diff options
| author | davilla <davilla@4pi.com> | 2012-09-23 12:43:03 -0400 |
|---|---|---|
| committer | davilla <davilla@4pi.com> | 2012-09-23 12:43:03 -0400 |
| commit | ad47b98fc32ac12c6eb6ebb68199cdb9c0d64ad1 (patch) | |
| tree | 6358c64d0fa317c9ec6f41635a626c04e0a39565 /tools/TexturePacker | |
| parent | 152d3160607fab751ca92149891d904399d8534f (diff) | |
fixed, broke -jN builds with TexturePacker fix
Diffstat (limited to 'tools/TexturePacker')
| -rw-r--r-- | tools/TexturePacker/Makefile.in | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/tools/TexturePacker/Makefile.in b/tools/TexturePacker/Makefile.in index 77a663b5ca..2661972131 100644 --- a/tools/TexturePacker/Makefile.in +++ b/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 |