diff options
| author | Hans-Christoph Steiner <eighthave@users.sourceforge.net> | 2006-09-13 00:50:50 +0000 |
|---|---|---|
| committer | Hans-Christoph Steiner <eighthave@users.sourceforge.net> | 2006-09-13 00:50:50 +0000 |
| commit | 74e34ce7e8a56e56b6458dd59fdea01c5f8f8bdc (patch) | |
| tree | 7451c2767c3e4e165eaf9dcb82c61c6a90ac3c91 | |
| parent | 408ecb8a54e30651faedb32ab11dbd57d4a57c0e (diff) | |
made platform-specific object targets for unauthorized since they break a lot on Mac OS X and MinGW
svn path=/trunk/; revision=5922
| -rw-r--r-- | externals/Makefile | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/externals/Makefile b/externals/Makefile index 73e20257..d1d44a0a 100644 --- a/externals/Makefile +++ b/externals/Makefile @@ -106,8 +106,8 @@ CXXFLAGS = $(CFLAGS) `test -f $(dir $*)../$(BUILDSRC_OS_NAME)/$(notdir $*).libs && \ cat $(dir $*)../$(BUILDSRC_OS_NAME)/$(notdir $*).libs` chmod a-x "$*.$(EXTENSION)" -# $(STRIP) $*.$(EXTENSION) -# rm -f -- $*.o + $(STRIP) $*.$(EXTENSION) + rm -f -- $*.o @@ -1849,10 +1849,22 @@ UNAUTHORIZED_TKFILES = $(wildcard $(externals_src)/unauthorized/*/*.tk) %.tk2c: %.tk bash $(externals_src)/unauthorized/tk2c.bash < $*.tk > $*.tk2c -# [cooled~] doesn't compile under MinGW (yet) and it crashes Pd on Mac OS X, -# so its excluded from the build here -UNAUTHORIZED_OBJECTS := $(wildcard $(externals_src)/unauthorized/[a-bd-uw-z]*/*.c) \ +# a number of objects don't compile under MinGW (yet? they used to, but the +# needed changes were overwritten, so they are in CVS +ifeq ($(OS_NAME),windows) +UNAUTHORIZED_OBJECTS := $(wildcard $(externals_src)/unauthorized/[abdg-oqrw]*/*.c)\ $(wildcard $(externals_src)/unauthorized/c?[a-np-z]*/*.c) +else + ifeq ($(OS_NAME),darwin) + # [cooled~] crashes Pd on Mac OS X, [vocoder~] doesn't compile + UNAUTHORIZED_OBJECTS := $(wildcard $(externals_src)/unauthorized/[abd-uw-z]*/*.c)\ + $(wildcard $(externals_src)/unauthorized/c?[a-np-z]*/*.c) + else + # GNU/Linux, BSD, IRIX, etc. + UNAUTHORIZED_OBJECTS := $(wildcard $(externals_src)/unauthorized/*/*.c) + endif +endif + # [vocoder~] is built separately since its made from a number of files UNAUTHORIZED_VOCODER = $(wildcard $(externals_src)/unauthorized/vocoder*/*.c) |