diff options
Diffstat (limited to 'source/Makefile')
| -rw-r--r-- | source/Makefile | 40 |
1 files changed, 6 insertions, 34 deletions
diff --git a/source/Makefile b/source/Makefile index dab037d1749..cd2e7cf75ba 100644 --- a/source/Makefile +++ b/source/Makefile @@ -109,26 +109,7 @@ COMLIB += $(OCGDIR)/blender/blenfont/$(DEBUG_DIR)libblenfont.a COMLIB += $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)libaudaspace.a COMLIB += $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)libaud_src.a COMLIB += $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)libaud_fx.a -COMLIB += $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)libaud_sdl.a COMLIB += $(NAN_SAMPLERATE)/lib/$(DEBUG_DIR)libsamplerate.a -COMLIB += $(NAN_LZO)/lib/$(DEBUG_DIR)libminilzo.a -COMLIB += $(NAN_LZMA)/lib/$(DEBUG_DIR)liblzma.a - -ifeq ($(WITH_FFMPEG),true) - COMLIB += $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)libaud_ffmpeg.a -endif - -ifeq ($(WITH_OPENAL),true) - COMLIB += $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)libaud_openal.a -endif - -ifeq ($(WITH_JACK),true) - COMLIB += $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)libaud_jack.a -endif - -ifeq ($(WITH_SNDFILE),true) - COMLIB += $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)libaud_sndfile.a -endif ifneq ($(NAN_NO_KETSJI),true) COMLIB += $(OCGDIR)/gameengine/bloutines/$(DEBUG_DIR)libbloutines.a @@ -264,8 +245,6 @@ PULIB += $(OCGDIR)/blender/ed_uvedit/$(DEBUG_DIR)libed_uvedit.a PULIB += $(OCGDIR)/blender/ed_screen/$(DEBUG_DIR)libed_screen.a PULIB += $(OCGDIR)/blender/ed_console/$(DEBUG_DIR)libed_console.a PULIB += $(OCGDIR)/blender/ed_userpref/$(DEBUG_DIR)libed_userpref.a -PULIB += $(OCGDIR)/blender/ed_gpencil/$(DEBUG_DIR)libed_gpencil.a -PULIB += $(OCGDIR)/blender/ed_opsound/$(DEBUG_DIR)libed_opsound.a PULIB += $(OCGDIR)/blender/windowmanager/$(DEBUG_DIR)libwindowmanager.a PULIB += $(OCGDIR)/blender/python/$(DEBUG_DIR)libpython.a PULIB += $(OCGDIR)/blender/makesrna/$(DEBUG_DIR)librna.a @@ -374,7 +353,12 @@ ifeq ($(OS),solaris) SPLIB += $(NAN_ZLIB)/lib/libz.a endif -ifeq ($(WITH_OPENAL),true) +# OpenAL libs are already compiled as shared code! + +# Some kooky logic going on here ... +ifeq ($(NAN_NO_OPENAL), true) +# NAN_SND_LIBS = +else ifeq ($(OS),$(findstring $(OS), "freebsd linux windows")) ifeq ($(CPU),$(findstring $(CPU), "i386 powerpc x86_64 parisc64")) NAN_SND_LIBS += $(NAN_OPENAL)/lib/libopenal.a @@ -394,18 +378,6 @@ ifeq ($(WITH_OPENAL),true) endif endif -ifeq ($(WITH_JACK),true) - ifeq ($(OS),$(findstring $(OS), "linux")) - NAN_SND_LIBS += $(NAN_JACKLIBS) - endif -endif - -ifeq ($(WITH_SNDFILE),true) - ifeq ($(OS),$(findstring $(OS), "linux")) - NAN_SND_LIBS += $(NAN_SNDFILELIBS) - endif -endif - ifeq ($(OS),windows) # Might need to change this to $(NAN_MOZILLA_LIB)/nspr4.lib |