bump ffmpeg from git-185a155 to git-0b32da9

[handbrake-jp/handbrake-jp-git.git] / gtk / src / Makefile.am

diff --git a/gtk/src/Makefile.am b/gtk/src/Makefile.am
index 38412ea..9c1dbd2 100644 (file)
--- a/gtk/src/Makefile.am
+++ b/gtk/src/Makefile.am
@@ -4,14 +4,14 @@ if MINGW
 HB_LIBS= \
        -lhb -la52 -lmkv -lavformat -lavcodec -lavutil -ldca -ldvdnav -ldvdread \
        -lfaac -lmp3lame -lmpeg2 -lvorbis -lvorbisenc -logg -lsamplerate \
-       -lx264 -lmp4v2 -lswscale -ltheora -lfaad -lz \
-       -lbz2 -liberty -lpthreadGC2
+       -lx264 -lmp4v2 -lswscale -ltheora -lz \
+       -lbz2 -liberty -lpthreadGC2 -lbluray -lass -lfontconfig -lfreetype
 else
 HB_LIBS= \
        -lhb -la52 -lmkv -lavformat -lavcodec -lavutil -ldca -ldvdnav -ldvdread \
        -lfaac -lmp3lame -lmpeg2 -lvorbis -lvorbisenc -logg -lsamplerate \
-       -lx264 -lmp4v2 -lswscale -ltheora -lfaad -lz \
-       -lbz2 -lpthread
+       -lx264 -lmp4v2 -lswscale -ltheora -lz \
+       -lbz2 -lpthread -lbluray -lass -lfontconfig -lfreetype
 endif
 
 icons =        \
@@ -124,8 +124,21 @@ widget_reverse.deps: makedeps.py
 widget.deps: makedeps.py
        python $(srcdir)/makedeps.py
 
-resources.plist: create_resources.py resources.list $(icons_dep) internal_defaults.xml standard_presets.xml ghb.ui widget.deps widget_reverse.deps
-       python $(srcdir)/create_resources.py -I$(srcdir) $(srcdir)/resources.list resources.plist
+resources.plist: create_resources resources.list $(icons_dep) internal_defaults.xml standard_presets.xml ghb.ui widget.deps widget_reverse.deps
+       ./create_resources -I$(srcdir) $(srcdir)/resources.list resources.plist
+
+CREATE_RES.c = \
+       create_resources.c \
+       plist.c \
+       values.c 
+
+CREATE_RES.c.o = $(patsubst %.c,%-native.o,$(CREATE_RES.c))
+
+create_resources: $(CREATE_RES.c.o)
+       $(CC_FOR_BUILD) -o $@ $^ $(GHB_TOOLS_LIBS)
+ 
+$(CREATE_RES.c.o): %-native.o: %.c
+       $(CC_FOR_BUILD) $(GHB_TOOLS_CFLAGS) -c -o $@ $<
 
 ghbcellrenderertext.$(OBJEXT): marshalers.h