From 3c0058f154380383a2254f947db57c4dec328fd0 Mon Sep 17 00:00:00 2001 From: "S. Davilla" Date: Mon, 7 Mar 2011 17:37:09 -0500 Subject: [osx] fixed, TexturePacker make was assuming the wrong lib path and an SDL_image dylib --- tools/TexturePacker/Makefile.in | 2 +- tools/osx/osx-depends/libsdl_image/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/TexturePacker/Makefile.in b/tools/TexturePacker/Makefile.in index 99974873f4..e69f78275f 100644 --- a/tools/TexturePacker/Makefile.in +++ b/tools/TexturePacker/Makefile.in @@ -1,7 +1,7 @@ ARCH=@ARCH@ DEFINES = ifeq ($(findstring osx,$(ARCH)),osx) -LIBS = @abs_top_srcdir@/lib/libsquish/libsquish-@ARCH@.a -L/opt/local/lib -lSDL_image -lSDL -llzo2 +LIBS = @abs_top_srcdir@/lib/libsquish/libsquish-@ARCH@.a -L/Users/Shared/xbmc-depends/osx-10.4_i386/lib -lSDL_image -lSDL -llzo2 else LIBS = @abs_top_srcdir@/lib/libsquish/libsquish-@ARCH@.a -lSDL_image -lSDL -llzo2 endif diff --git a/tools/osx/osx-depends/libsdl_image/Makefile b/tools/osx/osx-depends/libsdl_image/Makefile index 638488d426..8ddf25cfa2 100644 --- a/tools/osx/osx-depends/libsdl_image/Makefile +++ b/tools/osx/osx-depends/libsdl_image/Makefile @@ -25,7 +25,7 @@ export CFLAGS+=-undefined dynamic_lookup export CXXFLAGS+=-undefined dynamic_lookup export LDFLAGS+=-Wl,-read_only_relocs,suppress -Wl,-undefined,dynamic_lookup CONFIGURE=./configure --prefix=$(PREFIX) --host=$(HOST) \ - --enable-static --disable-shared --disable-sdltest + --disable-sdltest LIBDYLIB=$(SOURCE)/.libs/$(LIBNAME).a -- cgit v1.2.3