diff options
| author | Hans-Christoph Steiner <eighthave@users.sourceforge.net> | 2010-11-06 04:18:31 +0000 |
|---|---|---|
| committer | Hans-Christoph Steiner <eighthave@users.sourceforge.net> | 2010-11-06 04:18:31 +0000 |
| commit | 787be4153b867bed204dbf5857d53574e0a765c2 (patch) | |
| tree | 757fe1f736ec7ff82e0dceb140909e3faa47d451 | |
| parent | 911daa77e0455f80416857e2f2a962f70fe1a4bb (diff) | |
got building and linking working on all platforms
svn path=/trunk/externals/pdogg/; revision=14281
| -rw-r--r-- | Makefile | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -32,7 +32,7 @@ EXTRA_DIST = pdogg.c makefile.msvc HISTORY # #------------------------------------------------------------------------------# -CFLAGS = -DPD -I"$(PD_INCLUDE)" -Wall -W -g +CFLAGS = -DPD -I"$(PD_INCLUDE)"/pd -Wall -W -g LDFLAGS = LIBS = @@ -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 + LIBS += -lc `pkg-config --libs vorbis vorbisenc` STRIP = strip -x DISTBINDIR=$(DISTDIR)-$(OS) # install into ~/Library/Pd on Mac OS X since /usr/local isn't used much @@ -117,8 +117,8 @@ ifeq ($(UNAME),Linux) PD_PATH = /usr OPT_CFLAGS = -O6 -funroll-loops -fomit-frame-pointer CFLAGS += -fPIC - LDFLAGS += -Wl,--export-dynamic -shared -fPIC `pkg-config --libs vorbis vorbisenc` - LIBS += -lc + LDFLAGS += -Wl,--export-dynamic -shared -fPIC + LIBS += -lc `pkg-config --libs vorbis vorbisenc` 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 + LIBS += -lc -lpd -lvorbis -lvorbisenc -logg 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 + LIBS += -L"$(PD_PATH)/src" -L"$(PD_PATH)/bin" -L"$(PD_PATH)/obj" -lpd -lwsock32 -lkernel32 -luser32 -lgdi32 -lpthreadGC2 -lvorbis -lvorbisenc -logg STRIP = strip --strip-unneeded -R .note -R .comment DISTBINDIR=$(DISTDIR)-$(OS) endif |