summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--contrib/fontconfig/module.defs23
-rw-r--r--contrib/freetype/module.defs3
-rw-r--r--contrib/libxml2/module.defs3
-rw-r--r--gtk/src/Makefile.am6
-rw-r--r--make/include/contrib.defs16
-rw-r--r--test/module.defs45
6 files changed, 37 insertions, 59 deletions
diff --git a/contrib/fontconfig/module.defs b/contrib/fontconfig/module.defs
index 23091597b..ba9752fd7 100644
--- a/contrib/fontconfig/module.defs
+++ b/contrib/fontconfig/module.defs
@@ -1,4 +1,4 @@
-__deps__ := FREETYPE LIBXML2
+__deps__ := FREETYPE LIBXML2 LIBICONV
$(eval $(call import.MODULE.defs,FONTCONFIG,fontconfig,$(__deps__)))
$(eval $(call import.CONTRIB.defs,FONTCONFIG))
@@ -51,19 +51,19 @@ FONTCONFIG.CONFIGURE.env.CC = CC="$(FONTCONFIG.GCC.gcc) $(FONTCONFIG.cc_ar
#
ifeq (max,$(FONTCONFIG.GCC.g))
ifeq (none,$(FONTCONFIG.GCC.O))
- FONTCONFIG.CONFIGURE.env.CFLAGS = CFLAGS="$(call fn.ARGS,FONTCONFIG.GCC,*sysroot *minver ?extra .g .O)"
- FONTCONFIG.CONFIGURE.env.CXXFLAGS = CXXFLAGS="$(call fn.ARGS,FONTCONFIG.GCC,*sysroot *minver ?extra .g .O)"
+ FONTCONFIG.CONFIGURE.env.CFLAGS = CFLAGS="-I$(call fn.ABSOLUTE,$(CONTRIB.build/))include $(call fn.ARGS,FONTCONFIG.GCC,*sysroot *minver ?extra .g .O)"
+ FONTCONFIG.CONFIGURE.env.CXXFLAGS = CXXFLAGS="-I$(call fn.ABSOLUTE,$(CONTRIB.build/))include $(call fn.ARGS,FONTCONFIG.GCC,*sysroot *minver ?extra .g .O)"
else
- FONTCONFIG.CONFIGURE.env.CFLAGS = CFLAGS="$(call fn.ARGS,FONTCONFIG.GCC,*sysroot *minver ?extra .g)"
- FONTCONFIG.CONFIGURE.env.CXXFLAGS = CXXFLAGS="$(call fn.ARGS,FONTCONFIG.GCC,*sysroot *minver ?extra .g)"
+ FONTCONFIG.CONFIGURE.env.CFLAGS = CFLAGS="-I$(call fn.ABSOLUTE,$(CONTRIB.build/))include $(call fn.ARGS,FONTCONFIG.GCC,*sysroot *minver ?extra .g)"
+ FONTCONFIG.CONFIGURE.env.CXXFLAGS = CXXFLAGS="-I$(call fn.ABSOLUTE,$(CONTRIB.build/))include $(call fn.ARGS,FONTCONFIG.GCC,*sysroot *minver ?extra .g)"
endif
else
- FONTCONFIG.CONFIGURE.env.CFLAGS = CFLAGS="$(call fn.ARGS,FONTCONFIG.GCC,*sysroot *minver ?extra)"
- FONTCONFIG.CONFIGURE.env.CXXFLAGS = CXXFLAGS="$(call fn.ARGS,FONTCONFIG.GCC,*sysroot *minver ?extra)"
+ FONTCONFIG.CONFIGURE.env.CFLAGS = CFLAGS="-I$(call fn.ABSOLUTE,$(CONTRIB.build/))include $(call fn.ARGS,FONTCONFIG.GCC,*sysroot *minver ?extra)"
+ FONTCONFIG.CONFIGURE.env.CXXFLAGS = CXXFLAGS="-I$(call fn.ABSOLUTE,$(CONTRIB.build/))include $(call fn.ARGS,FONTCONFIG.GCC,*sysroot *minver ?extra)"
endif
-FONTCONFIG.CONFIGURE.env.CPPFLAGS = CPPFLAGS="$(call fn.ARGS,FONTCONFIG.GCC,*sysroot *minver ?extra)"
-FONTCONFIG.CONFIGURE.env.LDFLAGS = LDFLAGS="$(call fn.ARGS,FONTCONFIG.GCC,*sysroot *minver)"
+FONTCONFIG.CONFIGURE.env.CPPFLAGS = CPPFLAGS="-I$(call fn.ABSOLUTE,$(CONTRIB.build/))include $(call fn.ARGS,FONTCONFIG.GCC,*sysroot *minver ?extra)"
+FONTCONFIG.CONFIGURE.env.LDFLAGS = LDFLAGS="-L$(call fn.ABSOLUTE,$(CONTRIB.build/))lib $(call fn.ARGS,FONTCONFIG.GCC,*sysroot *minver)"
#
# Force use of libxml2 instead of expat with --enable-libxml2.
@@ -77,9 +77,8 @@ FONTCONFIG.CONFIGURE.env.LDFLAGS = LDFLAGS="$(call fn.ARGS,FONTCONFIG.GCC,*sysr
FONTCONFIG.CONFIGURE.extra = \
--enable-libxml2 \
--with-freetype-config=$(call fn.ABSOLUTE,$(CONTRIB.build/)bin/freetype-config) \
- LIBXML2_LIBS="-L$(call fn.ABSOLUTE,$(CONTRIB.build/))lib -lxml2" \
- LIBXML2_CFLAGS="-I$(call fn.ABSOLUTE,$(CONTRIB.build/))include/libxml2" \
- $(FONTCONFIG.config_archoption)
+ $(FONTCONFIG.config_archoption) --disable-silent-rules
+
ifeq (darwin,$(BUILD.system))
FONTCONFIG.CONFIGURE.extra += \
--with-fcpath=/usr/X11/lib/X11/fontconfig \
diff --git a/contrib/freetype/module.defs b/contrib/freetype/module.defs
index 4f00d68d3..f4ad34568 100644
--- a/contrib/freetype/module.defs
+++ b/contrib/freetype/module.defs
@@ -1,4 +1,5 @@
-$(eval $(call import.MODULE.defs,FREETYPE,freetype))
+__deps__ := BZIP
+$(eval $(call import.MODULE.defs,FREETYPE,freetype,$(__deps__)))
$(eval $(call import.CONTRIB.defs,FREETYPE))
FREETYPE.FETCH.url = http://download.handbrake.fr/handbrake/contrib/freetype-2.4.7.tar.bz2
diff --git a/contrib/libxml2/module.defs b/contrib/libxml2/module.defs
index 8d25756c3..4c1d14bba 100644
--- a/contrib/libxml2/module.defs
+++ b/contrib/libxml2/module.defs
@@ -1,4 +1,5 @@
-$(eval $(call import.MODULE.defs,LIBXML2,libxml2))
+__deps__ := LIBICONV
+$(eval $(call import.MODULE.defs,LIBXML2,libxml2,$(__deps__)))
$(eval $(call import.CONTRIB.defs,LIBXML2))
LIBXML2.FETCH.url = http://download.handbrake.fr/handbrake/contrib/libxml2-2.7.7.tar.gz
diff --git a/gtk/src/Makefile.am b/gtk/src/Makefile.am
index 2a18ed70f..3fc616027 100644
--- a/gtk/src/Makefile.am
+++ b/gtk/src/Makefile.am
@@ -4,13 +4,13 @@ if MINGW
HB_LIBS= \
-lhb -la52 -lmkv -lavresample -lavformat -lavcodec -lavutil \
-ldvdnav -ldvdread -lfaac -lmp3lame -lmpeg2 -lvorbis -lvorbisenc \
- -logg -lsamplerate -lx264 -lmp4v2 -lswscale -ltheora -lz \
- -lbz2 -liberty -lpthreadGC2 -lbluray -lass -lfontconfig -lfreetype
+ -logg -lsamplerate -lx264 -lmp4v2 -lswscale -ltheoraenc -ltheoradec -lz \
+ -lbz2 -lpthreadGC2 -lbluray -lass -lfontconfig -lfreetype -lgmodule-2.0
else
HB_LIBS= \
-lhb -la52 -lmkv -lavresample -lavformat -lavcodec -lavutil \
-ldvdnav -ldvdread -lfaac -lmp3lame -lmpeg2 -lvorbis -lvorbisenc \
- -logg -lsamplerate -lx264 -lmp4v2 -lswscale -ltheora -lz \
+ -logg -lsamplerate -lx264 -lmp4v2 -lswscale -ltheoraenc -ltheoradec -lz \
-lbz2 -lpthread -lbluray -lass -lfontconfig -lfreetype
endif
diff --git a/make/include/contrib.defs b/make/include/contrib.defs
index e49c2fb26..8794e6e31 100644
--- a/make/include/contrib.defs
+++ b/make/include/contrib.defs
@@ -91,18 +91,18 @@ define import.CONTRIB.defs
## debug=max or optimizations=none. Otherwise, use the contribs defaults
ifeq (max,$$($(1).GCC.g))
ifeq (none,$$($(1).GCC.O))
- $(1).CONFIGURE.env.CFLAGS = CFLAGS="$$(call fn.ARGS,$(1).GCC,*archs *sysroot *minver ?extra .g .O *D)"
- $(1).CONFIGURE.env.CXXFLAGS = CXXFLAGS="$$(call fn.ARGS,$(1).GCC,*archs *sysroot *minver ?extra .g .O *D)"
+ $(1).CONFIGURE.env.CFLAGS = CFLAGS="-I$$(call fn.ABSOLUTE,$(CONTRIB.build/))include $$(call fn.ARGS,$(1).GCC,*archs *sysroot *minver ?extra .g .O *D)"
+ $(1).CONFIGURE.env.CXXFLAGS = CXXFLAGS="-I$$(call fn.ABSOLUTE,$(CONTRIB.build/))include $$(call fn.ARGS,$(1).GCC,*archs *sysroot *minver ?extra .g .O *D)"
else
- $(1).CONFIGURE.env.CFLAGS = CFLAGS="$$(call fn.ARGS,$(1).GCC,*archs *sysroot *minver ?extra .g *D)"
- $(1).CONFIGURE.env.CXXFLAGS = CXXFLAGS="$$(call fn.ARGS,$(1).GCC,*archs *sysroot *minver ?extra .g *D)"
+ $(1).CONFIGURE.env.CFLAGS = CFLAGS="-I$$(call fn.ABSOLUTE,$(CONTRIB.build/))include $$(call fn.ARGS,$(1).GCC,*archs *sysroot *minver ?extra .g *D)"
+ $(1).CONFIGURE.env.CXXFLAGS = CXXFLAGS="-I$$(call fn.ABSOLUTE,$(CONTRIB.build/))include $$(call fn.ARGS,$(1).GCC,*archs *sysroot *minver ?extra .g *D)"
endif
else
- $(1).CONFIGURE.env.CFLAGS = CFLAGS="$$(call fn.ARGS,$(1).GCC,*archs *sysroot *minver ?extra *D)"
- $(1).CONFIGURE.env.CXXFLAGS = CXXFLAGS="$$(call fn.ARGS,$(1).GCC,*archs *sysroot *minver ?extra *D)"
+ $(1).CONFIGURE.env.CFLAGS = CFLAGS="-I$$(call fn.ABSOLUTE,$(CONTRIB.build/))include $$(call fn.ARGS,$(1).GCC,*archs *sysroot *minver ?extra *D)"
+ $(1).CONFIGURE.env.CXXFLAGS = CXXFLAGS="-I$$(call fn.ABSOLUTE,$(CONTRIB.build/))include $$(call fn.ARGS,$(1).GCC,*archs *sysroot *minver ?extra *D)"
endif
- $(1).CONFIGURE.env.CPPFLAGS = CPPFLAGS="$$(call fn.ARGS,$(1).GCC,*archs *sysroot *minver ?extra *D)"
- $(1).CONFIGURE.env.LDFLAGS = LDFLAGS="$$(call fn.ARGS,$(1).GCC,*archs *sysroot *minver ?extra.exe *D)"
+ $(1).CONFIGURE.env.CPPFLAGS = CPPFLAGS="-I$$(call fn.ABSOLUTE,$(CONTRIB.build/))include $$(call fn.ARGS,$(1).GCC,*archs *sysroot *minver ?extra *D)"
+ $(1).CONFIGURE.env.LDFLAGS = LDFLAGS="-L$$(call fn.ABSOLUTE,$(CONTRIB.build/))lib $$(call fn.ARGS,$(1).GCC,*archs *sysroot *minver ?extra.exe *D)"
$(1).CONFIGURE.env.PKG_CONFIG_PATH = PKG_CONFIG_PATH="$$(call fn.ABSOLUTE,$$(CONTRIB.build/))lib/pkgconfig"
$(1).CONFIGURE.env.args = !CC !CFLAGS !CXX !CXXFLAGS !CPPFLAGS !LDFLAGS !PKG_CONFIG_PATH !LOCAL_PATH
diff --git a/test/module.defs b/test/module.defs
index 699007ebe..5f825e3a7 100644
--- a/test/module.defs
+++ b/test/module.defs
@@ -9,34 +9,17 @@ TEST.c.o = $(patsubst $(SRC/)%.c,$(BUILD/)%.o,$(TEST.c))
TEST.exe = $(BUILD/)$(call TARGET.exe,$(HB.name)CLI)
-TEST.libs = $(LIBHB.a) $(foreach n, \
- a52 ass avcodec avformat avutil avresample dvdnav dvdread faac fontconfig freetype mkv mpeg2 mp3lame mp4v2 \
- ogg samplerate swscale theora vorbis vorbisenc x264 xml2 bluray, \
- $(CONTRIB.build/)lib/lib$(n).a )
+TEST.GCC.L = $(CONTRIB.build/)lib
-TEST.install.exe = $(DESTDIR)$(PREFIX/)bin/$(notdir $(TEST.exe))
+TEST.libs = $(LIBHB.a)
-ifeq (1,$(PTHREADW32.enabled))
- TEST.libs += $(CONTRIB.build/)lib/libpthreadGC2.a
-endif
-ifeq (1,$(LIBICONV.enabled))
- TEST.libs += $(CONTRIB.build/)lib/libiconv.a
-endif
-ifeq (1,$(BZIP2.enabled))
- TEST.libs += $(CONTRIB.build/)lib/libbz2.a
-else
- TEST.GCC.l += bz2
-endif
-ifeq (1,$(ZLIB.enabled))
- TEST.libs += $(CONTRIB.build/)lib/libz.a
-else
- TEST.GCC.l += z
-endif
-ifeq (1,$(FRIBIDI.enabled))
- TEST.libs += $(CONTRIB.build/)lib/libfribidi.a
-else
- TEST.GCC.l += fribidi
-endif
+TEST.GCC.l = \
+ a52 ass avcodec avformat avutil avresample dvdnav dvdread faac \
+ fontconfig freetype fribidi mkv mpeg2 mp3lame mp4v2 ogg \
+ samplerate swscale theoraenc theoradec vorbis vorbisenc x264 \
+ xml2 bluray bz2 z
+
+TEST.install.exe = $(DESTDIR)$(PREFIX/)bin/$(notdir $(TEST.exe))
###############################################################################
@@ -56,18 +39,12 @@ ifeq ($(BUILD.system),darwin)
else ifeq ($(BUILD.system),linux)
TEST.GCC.l += pthread dl m
else ifeq ($(BUILD.system),solaris)
- TEST.GCC.l += pthread nsl socket
+ TEST.GCC.l += pthread nsl socket iconv
else ifeq (1-mingw,$(BUILD.cross)-$(BUILD.system))
-ifeq ($(HAS.iconv),1)
- TEST.GCC.l += iconv
-endif
-ifeq ($(HAS.pthread),1)
- TEST.GCC.l += pthreadGC2
-endif
ifeq ($(HAS.dlfcn),1)
TEST.GCC.l += dl
endif
+ TEST.GCC.l += pthreadGC2 iconv ws2_32
TEST.GCC.D += PTW32_STATIC_LIB
- TEST.GCC.l += ws2_32
TEST.GCC.args.extra.exe++ += -static
endif
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-05 03:47:33 +0000