Skip to content
This repository has been archived by the owner on Apr 11, 2019. It is now read-only.

Commit

Permalink
rm gtk, avc2avi.
Browse files Browse the repository at this point in the history
I don't remember why I allowed a gui into the repository in the first place. There's nothing that makes this one special relative to all the other x264 guis.
avc2avi doesn't compile since we removed the bitstream reader. And avc doesn't belong in avi.
  • Loading branch information
pengvado committed Oct 3, 2008
1 parent 6768543 commit cc51047
Show file tree
Hide file tree
Showing 39 changed files with 4 additions and 7,319 deletions.
3 changes: 0 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,6 @@ config.h
config.mak
x264
checkasm
gtk/test
gtk/x264_gtk_encode
gtk/x264_icon.h

*.264
*.2pass
Expand Down
4 changes: 0 additions & 4 deletions AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,3 @@ N: Tuukka Toivonen
E: tuukkat AT ee DOT oulu DOT fi
D: Visualization

N: Vincent Torri
E: Vincent DOT Torri AT iecn DOT u-nancy DOT fr
D: GTK frontend

12 changes: 1 addition & 11 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ OBJS = $(SRCS:%.c=%.o)
OBJCLI = $(SRCCLI:%.c=%.o)
DEP = depend

.PHONY: all default fprofiled clean distclean install install-gtk uninstall dox test testclean
.PHONY: all default fprofiled clean distclean install uninstall dox test testclean

default: $(DEP) x264$(EXE)

Expand All @@ -83,9 +83,6 @@ $(SONAME): .depend $(OBJS) $(OBJASM)
x264$(EXE): $(OBJCLI) libx264.a
$(CC) -o $@ $+ $(LDFLAGS)

libx264gtk.a: muxers.o libx264.a
$(MAKE) -C gtk

checkasm: tools/checkasm.o libx264.a
$(CC) -o $@ $+ $(LDFLAGS)

Expand Down Expand Up @@ -140,15 +137,12 @@ endif
clean:
rm -f $(OBJS) $(OBJASM) $(OBJCLI) $(SONAME) *.a x264 x264.exe .depend TAGS
rm -f checkasm checkasm.exe tools/checkasm.o
rm -f tools/avc2avi tools/avc2avi.exe tools/avc2avi.o
rm -f $(SRC2:%.c=%.gcda) $(SRC2:%.c=%.gcno)
- sed -e 's/ *-fprofile-\(generate\|use\)//g' config.mak > config.mak2 && mv config.mak2 config.mak
$(MAKE) -C gtk clean

distclean: clean
rm -f config.mak config.h x264.pc
rm -rf test/
$(MAKE) -C gtk distclean

install: x264$(EXE) $(SONAME)
install -d $(DESTDIR)$(bindir) $(DESTDIR)$(includedir)
Expand All @@ -166,14 +160,10 @@ else
endif
$(if $(IMPLIBNAME), install -m 644 $(IMPLIBNAME) $(DESTDIR)$(libdir))

install-gtk: libx264gtk.a
$(MAKE) -C gtk install

uninstall:
rm -f $(DESTDIR)$(includedir)/x264.h $(DESTDIR)$(libdir)/libx264.a
rm -f $(DESTDIR)$(bindir)/x264 $(DESTDIR)$(libdir)/pkgconfig/x264.pc
$(if $(SONAME), rm -f $(DESTDIR)$(libdir)/$(SONAME) $(DESTDIR)$(libdir)/libx264.$(SOSUFFIX))
$(MAKE) -C gtk uninstall

etags: TAGS

Expand Down
28 changes: 0 additions & 28 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ echo " --disable-avis-input disables avisynth input (win32 only)"
echo " --disable-mp4-output disables mp4 output (using gpac)"
echo " --disable-pthread disables multithreaded encoding"
echo " --disable-asm disables assembly optimizations on x86"
echo " --enable-gtk build GTK+ interface"
echo " --enable-debug adds -g, doesn't strip"
echo " --enable-gprof adds -pg, doesn't strip"
echo " --enable-visualize enables visualization (X11 only)"
Expand Down Expand Up @@ -58,7 +57,6 @@ asm="yes"
debug="no"
gprof="no"
pic="no"
gtk="no"
vis="no"
shared="no"

Expand Down Expand Up @@ -148,12 +146,6 @@ for opt do
--enable-pic)
pic="yes"
;;
--enable-gtk)
gtk="yes"
;;
--disable-gtk)
gtk="no"
;;
--enable-shared)
shared="yes"
;;
Expand Down Expand Up @@ -427,7 +419,6 @@ ALTIVECFLAGS=$ALTIVECFLAGS
LDFLAGS=$LDFLAGS
AS=$AS
ASFLAGS=$ASFLAGS
GTK=$gtk
EXE=$EXE
VIS=$vis
HAVE_GETOPT_LONG=$HAVE_GETOPT_LONG
Expand All @@ -441,8 +432,6 @@ for A in "$@" ; do
done
echo '' >> config.mak

cp config.mak gtk/config.mak

if [ "$shared" = "yes" ]; then
API=$(grep '#define X264_BUILD' < x264.h | cut -f 3 -d ' ')
if [ "$SYS" = "MINGW" ]; then
Expand All @@ -459,22 +448,6 @@ if [ "$shared" = "yes" ]; then
echo 'SOFLAGS=-Wl,-soname,$(SONAME)' >> config.mak
fi
echo 'default: $(SONAME)' >> config.mak
if [ "$gtk" = "yes" ]; then
if [ "$SYS" = "MACOSX" ]; then
echo "SOSUFFIX=dylib" >> gtk/config.mak
echo "SONAMEGTK=libx264gtk.$API.dylib" >> gtk/config.mak
echo 'SOFLAGS=-dynamiclib -Wl,-single_module -Wl,-read_only_relocs,suppress -install_name $(DESTDIR)$(libdir)/$(SONAMEGTK)' >> gtk/config.mak
else
echo "SOSUFFIX=so" >> gtk/config.mak
echo "SONAMEGTK=libx264gtk.so.$API" >> gtk/config.mak
echo 'SOFLAGS=-Wl,-soname,$(SONAMEGTK)' >> gtk/config.mak
fi
fi
fi

if [ "$gtk" = "yes" ]; then
echo 'default: libx264gtk.a' >> config.mak
echo 'install: install-gtk' >> config.mak
fi

./version.sh
Expand All @@ -501,7 +474,6 @@ echo "asm: $asm"
echo "avis input: $avis_input"
echo "mp4 output: $mp4_output"
echo "pthread: $pthread"
echo "gtk: $gtk"
echo "debug: $debug"
echo "gprof: $gprof"
echo "PIC: $pic"
Expand Down
200 changes: 0 additions & 200 deletions gtk/Makefile

This file was deleted.

Loading

0 comments on commit cc51047

Please sign in to comment.