diff options
author | Hans-Christoph Steiner <eighthave@users.sourceforge.net> | 2011-01-19 05:33:23 +0000 |
---|---|---|
committer | Hans-Christoph Steiner <eighthave@users.sourceforge.net> | 2011-01-19 05:33:23 +0000 |
commit | 5b917179ad613e0979fda5899ce38d664e3d8a81 (patch) | |
tree | 444ca23b1918a0eba962cbd53257a2bc776c2c70 | |
parent | c7a7f48a3dd65baf8d2b06b5063be07eaf2ef1c9 (diff) |
updated to 1.0.7 and use pkg-config on all platforms
svn path=/trunk/externals/pdogg/; revision=14753
-rw-r--r-- | Makefile | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -34,7 +34,7 @@ EXTRA_DIST = pdogg.c makefile.msvc HISTORY CFLAGS = -DPD -I"$(PD_INCLUDE)"/pd -Wall -W -g LDFLAGS = -LIBS = +LIBS = $(shell pkg-config --libs vorbis vorbisenc) #------------------------------------------------------------------------------# # @@ -102,7 +102,7 @@ ifeq ($(UNAME),Darwin) LDFLAGS += $(FAT_FLAGS) -bundle -undefined dynamic_lookup -L/sw/lib # if the 'pd' binary exists, check the linking against it to aid with stripping LDFLAGS += $(shell test -e $(PD_PATH)/bin/pd && echo -bundle_loader $(PD_PATH)/bin/pd) - LIBS += -lc `pkg-config --libs vorbis vorbisenc` + LIBS += -lc STRIP = strip -x DISTBINDIR=$(DISTDIR)-$(OS) # install into ~/Library/Pd on Mac OS X since /usr/local isn't used much @@ -118,7 +118,7 @@ ifeq ($(UNAME),Linux) OPT_CFLAGS = -O6 -funroll-loops -fomit-frame-pointer CFLAGS += -fPIC LDFLAGS += -Wl,--export-dynamic -shared -fPIC - LIBS += -lc `pkg-config --libs vorbis vorbisenc` + LIBS += -lc STRIP = strip --strip-unneeded -R .note -R .comment DISTBINDIR=$(DISTDIR)-$(OS)-$(shell uname -m) endif @@ -131,7 +131,7 @@ ifeq (CYGWIN,$(findstring CYGWIN,$(UNAME))) OPT_CFLAGS = -O6 -funroll-loops -fomit-frame-pointer CFLAGS += LDFLAGS += -Wl,--export-dynamic -shared -L"$(PD_PATH)/src" -L"$(PD_PATH)/bin" - LIBS += -lc -lpd -lvorbis -lvorbisenc -logg + LIBS += -lc -lpd STRIP = strip --strip-unneeded -R .note -R .comment DISTBINDIR=$(DISTDIR)-$(OS) endif @@ -144,7 +144,7 @@ ifeq (MINGW,$(findstring MINGW,$(UNAME))) OPT_CFLAGS = -O3 -funroll-loops -fomit-frame-pointer CFLAGS += -mms-bitfields LDFLAGS += -s -shared -Wl,--enable-auto-import - LIBS += -L"$(PD_PATH)/src" -L"$(PD_PATH)/bin" -L"$(PD_PATH)/obj" -lpd -lwsock32 -lkernel32 -luser32 -lgdi32 -lpthreadGC2 -lvorbis -lvorbisenc -logg + LIBS += -L"$(PD_PATH)/src" -L"$(PD_PATH)/bin" -L"$(PD_PATH)/obj" -lpd -lwsock32 -lkernel32 -luser32 -lgdi32 -lpthreadGC2 STRIP = strip --strip-unneeded -R .note -R .comment DISTBINDIR=$(DISTDIR)-$(OS) endif |