Commit e510c098 authored by Loren Merritt's avatar Loren Merritt
Browse files

GTK: compilation fixes



git-svn-id: svn://svn.videolan.org/x264/trunk@483 df754926-b1dd-0310-bc7b-ec298dee348c
parent 845feff6
...@@ -129,9 +129,10 @@ clean: ...@@ -129,9 +129,10 @@ clean:
rm -rf vfw/build/cygwin/bin rm -rf vfw/build/cygwin/bin
rm -f $(SRC2:%.c=%.gcda) $(SRC2:%.c=%.gcno) rm -f $(SRC2:%.c=%.gcda) $(SRC2:%.c=%.gcno)
- sed -e 's/ *-fprofile-\(generate\|use\)//g' config.mak > config.mak2 && mv config.mak2 config.mak - sed -e 's/ *-fprofile-\(generate\|use\)//g' config.mak > config.mak2 && mv config.mak2 config.mak
make -C gtk clean
distclean: clean distclean: clean
rm -f config.mak config.h vfw/build/cygwin/config.mak x264.pc rm -f config.mak config.h vfw/build/cygwin/config.mak gtk/config.mak x264.pc
install: x264 $(SONAME) install: x264 $(SONAME)
install -d $(DESTDIR)$(bindir) $(DESTDIR)$(includedir) install -d $(DESTDIR)$(bindir) $(DESTDIR)$(includedir)
......
...@@ -357,6 +357,8 @@ DEVNULL=$DEVNULL ...@@ -357,6 +357,8 @@ DEVNULL=$DEVNULL
CONFIGURE_ARGS=$@ CONFIGURE_ARGS=$@
EOF EOF
cp config.mak gtk/config.mak
if [ "$vfw" = "yes" ]; then if [ "$vfw" = "yes" ]; then
rm -f vfw/build/cygwin/config.mak rm -f vfw/build/cygwin/config.mak
cat > vfw/build/cygwin/config.mak << EOF cat > vfw/build/cygwin/config.mak << EOF
......
include ../config.mak include config.mak
OBJECTS = x264_gtk_bitrate.o x264_gtk_rc.o x264_gtk_mb.o x264_gtk_more.o x264_gtk.o OBJECTS = x264_gtk_bitrate.o x264_gtk_rc.o x264_gtk_mb.o x264_gtk_more.o x264_gtk.o
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment