Browse Source

Link audiofile to libavutil, fixes build on Ubuntu 13.04

tags/1.9.4
falkTX 11 years ago
parent
commit
3a5d17cd3b
4 changed files with 5 additions and 7 deletions
  1. +1
    -1
      source/Makefile.mk
  2. +2
    -2
      source/backend/native/Makefile
  3. +1
    -3
      source/backend/standalone/Makefile
  4. +1
    -1
      source/bridges/Makefile

+ 1
- 1
source/Makefile.mk View File

@@ -56,7 +56,7 @@ HAVE_JACK = $(shell pkg-config --exists jack && echo true)
HAVE_OPENGL = $(shell pkg-config --exists gl && echo true) HAVE_OPENGL = $(shell pkg-config --exists gl && echo true)
HAVE_QT5 = $(shell pkg-config --atleast-version=5.0 QtCore && echo true) HAVE_QT5 = $(shell pkg-config --atleast-version=5.0 QtCore && echo true)


HAVE_AF_DEPS = $(shell pkg-config --exists libavcodec libavformat sndfile && echo true)
HAVE_AF_DEPS = $(shell pkg-config --exists libavcodec libavformat libavutil sndfile && echo true)
HAVE_ZYN_DEPS = $(shell pkg-config --exists fftw3 mxml zlib && echo true) HAVE_ZYN_DEPS = $(shell pkg-config --exists fftw3 mxml zlib && echo true)
HAVE_ZYN_UI_DEPS = $(shell pkg-config --exists ntk ntk_images && echo true) HAVE_ZYN_UI_DEPS = $(shell pkg-config --exists ntk ntk_images && echo true)




+ 2
- 2
source/backend/native/Makefile View File

@@ -16,8 +16,8 @@ LINK_FLAGS += $(shell pkg-config --libs QtCore QtGui)


ifeq ($(HAVE_AF_DEPS),true) ifeq ($(HAVE_AF_DEPS),true)
AF_C_FLAGS = $(BUILD_C_FLAGS) AF_C_FLAGS = $(BUILD_C_FLAGS)
AF_C_FLAGS += $(shell pkg-config --cflags libavcodec libavformat sndfile)
LINK_FLAGS += $(shell pkg-config --libs libavcodec libavformat sndfile)
AF_C_FLAGS += $(shell pkg-config --cflags libavcodec libavformat libavutil sndfile)
LINK_FLAGS += $(shell pkg-config --libs libavcodec libavformat libavutil sndfile)
endif endif


ifeq ($(HAVE_OPENGL),true) ifeq ($(HAVE_OPENGL),true)


+ 1
- 3
source/backend/standalone/Makefile View File

@@ -40,10 +40,8 @@ endif
# -------------------------------------------------------------- # --------------------------------------------------------------
# Native # Native


LINK_FLAGS += $(shell pkg-config --libs QtGui)

ifeq ($(HAVE_AF_DEPS),true) ifeq ($(HAVE_AF_DEPS),true)
LINK_FLAGS += $(shell pkg-config --libs libavcodec libavformat sndfile)
LINK_FLAGS += $(shell pkg-config --libs libavcodec libavformat libavutil sndfile)
endif endif


ifeq ($(HAVE_OPENGL),true) ifeq ($(HAVE_OPENGL),true)


+ 1
- 1
source/bridges/Makefile View File

@@ -81,7 +81,7 @@ endif


ifeq ($(HAVE_AF_DEPS),true) ifeq ($(HAVE_AF_DEPS),true)
NATIVE_BUILD_FLAGS += -DWANT_AUDIOFILE NATIVE_BUILD_FLAGS += -DWANT_AUDIOFILE
NATIVE_LINK_FLAGS += $(shell pkg-config --libs libavcodec libavformat sndfile)
NATIVE_LINK_FLAGS += $(shell pkg-config --libs libavcodec libavformat libavutil sndfile)
endif endif


ifeq ($(HAVE_ZYN_DEPS),true) ifeq ($(HAVE_ZYN_DEPS),true)


Loading…
Cancel
Save