annotate Gui/Makefile @ 14843:bbb693d3b130

Fix the ogg fourcc nightmare!!! The problem: once upon a time, windows idiots decided to try to store vorbis-in-ogg-in-avi. Of course this failed miserably, but they used the audio format tag 0xfffe for "extended" to do this. Later someone working on MPlayer somehow decided 0xfffe was the format for vorbis, which is nonsense, and now that's conflicting with real wav files with extended audio format. This patch changes demux_ogg (and mkv) to use sane fourcc's for vorbis and theora and gets rid of the 0xfffe nonsense so hopefully wav files with extended audio will work now. If there are problems, we'll have to find workarounds...and drive an 18-wheeler full of cola thru the house of whoever wrote this 0xfffe nonsense in MPlayer to begin with...
author rfelker
date Sun, 27 Feb 2005 18:11:17 +0000
parents e047e70a9767
children 7af5fe0860a1
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1693
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
1
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
2 LIB = libgui.a
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
3
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
4 include ../config.mak
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
5 include config.mak
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
6
13787
e047e70a9767 Handle "xxx.h" vs "../xxx.h" include paths in a consistent way.
diego
parents: 12707
diff changeset
7 INCDIR = -I. -I.. -I../loader -I./wm -I./skin $(FREETYPE_INC) $(GTKINC) $(EXTRA_INC)
1693
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
8
8976
arpi
parents: 8973
diff changeset
9 OPTIMIZE = $(OPTFLAGS) \
8273
226e6866212d reversing my patch to check for -Wall support & use it if available (requested by A'rpi)
rathann
parents: 8255
diff changeset
10 -fexpensive-optimizations -fschedule-insns2 -Wall
1693
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
11
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
12 CFLAGS = $(OPTIMIZE) $(INCDIR) $(DEBUG)
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
13
8058
9246adcf95f0 cosmetic
pontscho
parents: 8046
diff changeset
14 SRCS = wm/ws.c wm/wsxdnd.c app.c interface.c cfg.c bitmap.c \
6625
54cfbaaf161b remove unneded config files
pontscho
parents: 6036
diff changeset
15 skin/skin.c skin/font.c skin/cut.c \
8973
0a665389cf2b - add playbar
pontscho
parents: 8273
diff changeset
16 mplayer/widgets.c mplayer/play.c mplayer/mw.c mplayer/sw.c mplayer/menu.c mplayer/pb.c mplayer/common.c \
8181
pontscho
parents: 8136
diff changeset
17 mplayer/gtk/menu.c mplayer/gtk/mb.c mplayer/gtk/about.c mplayer/gtk/pl.c mplayer/gtk/sb.c mplayer/gtk/fs.c mplayer/gtk/opts.c mplayer/gtk/url.c mplayer/gtk/eq.c mplayer/gtk/common.c
6625
54cfbaaf161b remove unneded config files
pontscho
parents: 6036
diff changeset
18 OBJS = $(SRCS:.c=.o)
54cfbaaf161b remove unneded config files
pontscho
parents: 6036
diff changeset
19
1693
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
20 .SUFFIXES: .c .o
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
21
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
22 .c.o:
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
23 $(CC) -c $(CFLAGS) -o $@ $<
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
24
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
25 ### TARGETS ###
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
26
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
27 $(LIB): .depend $(OBJS)
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
28 rm -f $(LIB)
6036
5d543521dd06 patchs by Bj«Órn Sandell <biorn@dce.chalmers.se>:
pl
parents: 2112
diff changeset
29 $(AR) rc $(LIB) $(OBJS) $(MPLAYEROBJS)
12632
80973aa180a5 ranlib cleanup by Dan Christiansen
alex
parents: 9825
diff changeset
30 $(RANLIB) $(LIB)
1693
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
31
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
32 all: $(LIB)
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
33
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
34 clean:
12707
faust3
parents: 12632
diff changeset
35 rm -rf $(OBJS) *.o *~ *.bak main $(LIB) .depend
1693
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
36
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
37 #dep: depend
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
38 #
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
39 #depend:
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
40 # makedepend -- $(CFLAGS) -- $(SRCS) &>/dev/null
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
41 #
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
42
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
43 distclean: clean
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
44
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
45 dep: depend
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
46
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
47 depend: .depend
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
48
6625
54cfbaaf161b remove unneded config files
pontscho
parents: 6036
diff changeset
49 .depend: Makefile config.mak
1693
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
50 $(CC) -MM $(CFLAGS) $(SRCS) 1>.depend
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
51
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
52 #
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
53 # include dependency files if they exist
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
54 #
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
55 ifneq ($(wildcard .depend),)
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
56 include .depend
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
57 endif