diff --git a/FAudio b/FAudio index e00e45ef..b28c9f25 160000 --- a/FAudio +++ b/FAudio @@ -1 +1 @@ -Subproject commit e00e45ef1b93864f4e3b7bf75dc03e27993f3ee0 +Subproject commit b28c9f2550a5c2910e028e77d1a6d39fd39daa4f diff --git a/build/makefile_base.mak b/build/makefile_base.mak index 5ef643ca..63c63b83 100644 --- a/build/makefile_base.mak +++ b/build/makefile_base.mak @@ -960,7 +960,7 @@ endif # ifeq ($(WITH_FFMPEG),1) ## FAudio ## -FAUDIO_CMAKE_FLAGS = -DCMAKE_BUILD_TYPE=Release -DFORCE_ENABLE_DEBUGCONFIGURATION=ON -DLOG_ASSERTIONS=ON -DCMAKE_INSTALL_LIBDIR="lib" -DXNASONG=OFF +FAUDIO_CMAKE_FLAGS = -DGSTREAMER=ON -DCMAKE_BUILD_TYPE=Release -DFORCE_ENABLE_DEBUGCONFIGURATION=ON -DLOG_ASSERTIONS=ON -DCMAKE_INSTALL_LIBDIR="lib" -DXNASONG=OFF ifeq ($(WITH_FFMPEG),1) FAUDIO_CMAKE_FLAGS += -DFFMPEG=ON endif # ifeq ($(WITH_FFMPEG),1) @@ -978,7 +978,7 @@ FAUDIO_CONFIGURE_FILES32 := $(FAUDIO_OBJ32)/Makefile FAUDIO_CONFIGURE_FILES64 := $(FAUDIO_OBJ64)/Makefile $(FAUDIO_CONFIGURE_FILES32): SHELL = $(CONTAINER_SHELL32) -$(FAUDIO_CONFIGURE_FILES32): $(FAUDIO)/CMakeLists.txt $(MAKEFILE_DEP) | $(FAUDIO_OBJ32) +$(FAUDIO_CONFIGURE_FILES32): $(FAUDIO)/CMakeLists.txt $(MAKEFILE_DEP) gst_base32 | $(FAUDIO_OBJ32) cd $(dir $@) && \ PKG_CONFIG_PATH=$(abspath $(TOOLS_DIR32))/lib/pkgconfig \ CC="$(CC32)" \ @@ -989,8 +989,9 @@ $(FAUDIO_CONFIGURE_FILES32): $(FAUDIO)/CMakeLists.txt $(MAKEFILE_DEP) | $(FAUDIO $(FAUDIO_CMAKE_FLAGS) $(FAUDIO_CONFIGURE_FILES64): SHELL = $(CONTAINER_SHELL64) -$(FAUDIO_CONFIGURE_FILES64): $(FAUDIO)/CMakeLists.txt $(MAKEFILE_DEP) | $(FAUDIO_OBJ64) +$(FAUDIO_CONFIGURE_FILES64): $(FAUDIO)/CMakeLists.txt $(MAKEFILE_DEP) gst_base64 | $(FAUDIO_OBJ64) cd $(dir $@) && \ + PKG_CONFIG_PATH=$(abspath $(TOOLS_DIR64))/lib/pkgconfig \ cmake $(abspath $(FAUDIO)) \ -DCMAKE_INSTALL_PREFIX="$(abspath $(TOOLS_DIR64))" \ $(FAUDIO_CMAKE_FLAGS)