Browse Source

Fix build with static libmagic

tags/1.9.8
falkTX 7 years ago
parent
commit
af6435313f
2 changed files with 4 additions and 1 deletions
  1. +3
    -0
      source/Makefile.mk
  2. +1
    -1
      source/bridges-plugin/Makefile

+ 3
- 0
source/Makefile.mk View File

@@ -421,6 +421,9 @@ endif


ifeq ($(HAVE_LIBMAGIC),true) ifeq ($(HAVE_LIBMAGIC),true)
MAGIC_LIBS += -lmagic MAGIC_LIBS += -lmagic
ifeq ($(LINUX),true)
MAGIC_LIBS += -lz
endif
endif endif


# --------------------------------------------------------------------------------------------------------------------- # ---------------------------------------------------------------------------------------------------------------------


+ 1
- 1
source/bridges-plugin/Makefile View File

@@ -65,7 +65,6 @@ LIBS_win64 += $(MODULEDIR)/water.win64.a
LINK_FLAGS += $(WATER_LIBS) LINK_FLAGS += $(WATER_LIBS)


LINK_FLAGS += $(LIBLO_LIBS) LINK_FLAGS += $(LIBLO_LIBS)
LINK_FLAGS += $(MAGIC_LIBS)
LINK_FLAGS += $(X11_LIBS) LINK_FLAGS += $(X11_LIBS)


# ---------------------------------------------------------------------------------------------------------------------- # ----------------------------------------------------------------------------------------------------------------------
@@ -80,6 +79,7 @@ NATIVE_BUILD_FLAGS += $(LINUXSAMPLER_FLAGS)
NATIVE_LINK_FLAGS += $(LINUXSAMPLER_LIBS) NATIVE_LINK_FLAGS += $(LINUXSAMPLER_LIBS)


NATIVE_LINK_FLAGS += $(FFMPEG_LIBS) NATIVE_LINK_FLAGS += $(FFMPEG_LIBS)
NATIVE_LINK_FLAGS += $(MAGIC_LIBS)
NATIVE_LINK_FLAGS += $(SNDFILE_LIBS) NATIVE_LINK_FLAGS += $(SNDFILE_LIBS)


LIBS_native += $(MODULEDIR)/audio_decoder.a LIBS_native += $(MODULEDIR)/audio_decoder.a


Loading…
Cancel
Save