CC=@CC@
SHELL=@SHELL@
+LIB_SDL=@LIB_SDL@
+LIB_GLIDE=@LIB_GLIDE@
+LIB_GGI=@LIB_GGI@
#----------------- do not change anything below this line ----------------------
# DEFINE will contain some of the constants definitions decided in Makefile,
# including SYS_xx. It will be passed to C compiler.
-DEFINE += -DSYS_$(shell echo $(SYS) | sed 's/-.*//' | tr a-z A-Z)
+DEFINE += -DSYS_$(shell echo $(SYS) | sed 's/-.*//' | tr a-z. A-Z_)
################################################################################
# Tuning and other variables - do not change anything except if you know
endif
ifneq (,$(findstring solaris,$(SYS)))
-LIB += -ldl -lsocket -lnsl -lposix4 -lpthread
+LIB += -ldl -lsocket -lnsl -lpthread
endif
ifeq ($(SYS),beos)
# Optimizations : don't compile debug versions with them
ifeq ($(OPTIMS),1)
CFLAGS += -O6
-CFLAGS += -ffast-math -funroll-loops -fargument-noalias-global
-CFLAGS += -funroll-all-loops -fstrict-aliasing
-#CFLAGS += -fomit-frame-pointer
+CFLAGS += -ffast-math -funroll-loops -funroll-all-loops
+CFLAGS += -fomit-frame-pointer
+CFLAGS += @BIZARRE_OPTIMS@
# Optimizations for x86 familiy
ifneq (,$(findstring 86,$(ARCH)))
#
# C compiler flags: plugin compilation
#
-ifneq (,$(findstring solaris,$(SYS)))
PCFLAGS += -fPIC
-endif
#
# C compiler flags: dependancies
src/interface/intf_console.o
INPUT = src/input/input_ps.o \
+ src/input/input_ts.o \
src/input/mpeg_system.o \
src/input/input_ext-dec.o \
+ src/input/input_dec.o \
src/input/input_programs.o \
src/input/input_netlist.o \
src/input/input.o
MISC = src/misc/mtime.o \
src/misc/tests.o \
src/misc/rsc_files.o \
+ src/misc/modules.o \
src/misc/netutils.o \
src/misc/playlist.o \
src/misc/plugins.o
# plugins/sdl/video_yuv.o \
# plugins/sdl/video_yuvall.o
+PLUGIN_NULL = plugins/null/null.o
+
PLUGIN_GLIDE = plugins/glide/glide.o \
plugins/glide/intf_glide.o \
plugins/glide/vout_glide.o
$(PLUGIN_YUV) \
$(PLUGIN_YUVMMX) \
$(PLUGIN_SDL) \
- $(PLUGIN_ALSA)
+ $(PLUGIN_ALSA) \
+ $(PLUGIN_NULL)
#
# Other lists of files
mkdir -p $(prefix)/bin
$(INSTALL) vlc $(prefix)/bin
# ugly
- for alias in "" @ALIASES@ ; do if test $$alias ; then ln -s vlc $(prefix)/bin/$$alias ; fi ; done
+ for alias in "" @ALIASES@ ; do if test $$alias ; then rm -f $(prefix)/bin/$$alias && ln -s vlc $(prefix)/bin/$$alias ; fi ; done
mkdir -p $(prefix)/lib/videolan/vlc
- $(INSTALL) -m 644 $(PLUGINS) $(prefix)/lib/videolan/vlc
+ $(INSTALL) -m 644 $(PLUGINS:%=lib/%.so) $(prefix)/lib/videolan/vlc
mkdir -p $(prefix)/share/videolan
$(INSTALL) -m 644 share/*.psf $(prefix)/share/videolan
$(INSTALL) -m 644 share/*.png $(prefix)/share/videolan
$(PLUGIN_GNOME): %.o: Makefile.dep
$(PLUGIN_GNOME): %.o: %.c
- $(CC) $(CFLAGS) `gnome-config --cflags gnomeui` -c -o $@ $<
+ $(CC) $(CFLAGS) $(PCFLAGS) `gnome-config --cflags gnomeui` -c -o $@ $<
$(PLUGIN_GLIDE): %.o: Makefile.dep
$(PLUGIN_GLIDE): %.o: %.c
- $(CC) $(CFLAGS) -I/usr/include/glide -c -o $@ $<
+ $(CC) $(CFLAGS) $(PCFLAGS) -I/usr/include/glide -c -o $@ $<
#
# Real targets
rm -f ./plugins/_APP_
ln -s ../vlc ./plugins/_APP_
else
- $(CC) $(CFLAGS) $(LCFLAGS) --export-dynamic -rdynamic -o $@ $(C_OBJ) $(CPP_OBJ) $(ASM_OBJ)
+ $(CC) $(CFLAGS) $(LCFLAGS) --export-dynamic @DYNAMIC_FLAG@ -o $@ $(C_OBJ) $(CPP_OBJ) $(ASM_OBJ)
endif
lib/beos.so: $(PLUGIN_BEOS)
lib/esd.so: $(PLUGIN_ESD)
ifneq (,$(findstring bsd,$(SYS)))
- $(CC) -shared -lesd -o $@ $^
+ $(CC) -shared -lesd -o $@ $^ $(LCFLAGS) -lesd
else
- $(CC) -shared -laudiofile -lesd -o $@ $^
+ $(CC) -shared -o $@ $^ $(LCFLAGS) -laudiofile -lesd
endif
lib/dsp.so: $(PLUGIN_DSP)
- $(CC) -shared -o $@ $^
+ $(CC) -shared -o $@ $^ $(LCFLAGS)
lib/alsa.so: $(PLUGIN_ALSA)
- $(CC) -shared -o $@ $^
+ $(CC) -shared -o $@ $^ $(LCFLAGS)
+
+lib/null.so: $(PLUGIN_NULL)
+ $(CC) -shared -o $@ $^ $(LCFLAGS)
lib/dummy.so: $(PLUGIN_DUMMY)
- $(CC) -shared -o $@ $^
+ $(CC) -shared -o $@ $^ $(LCFLAGS)
lib/fb.so: $(PLUGIN_FB)
- $(CC) -shared -o $@ $^
+ $(CC) -shared -o $@ $^ $(LCFLAGS)
lib/x11.so: $(PLUGIN_X11)
- $(CC) -shared -L/usr/X11R6/lib -lX11 -lXext -o $@ $^
+ $(CC) -shared -L/usr/X11R6/lib -o $@ $^ $(LCFLAGS) -lX11 -lXext
lib/mga.so: $(PLUGIN_MGA)
- $(CC) -shared -L/usr/X11R6/lib -lX11 -lXext -o $@ $^
+ $(CC) -shared -L/usr/X11R6/lib -o $@ $^ $(LCFLAGS) -lX11 -lXext
lib/gnome.so: $(PLUGIN_GNOME)
- $(CC) -shared `gnome-config --libs gnomeui | sed 's,-rdynamic,,'` -o $@ $^
+ $(CC) -shared -o $@ $^ $(LCFLAGS) `gnome-config --libs gnomeui | sed 's,-rdynamic,,'`
lib/glide.so: $(PLUGIN_GLIDE)
- $(CC) -shared -lglide2x -o $@ $^
+ $(CC) -shared $(LIB_GLIDE) -o $@ $^ $(LCFLAGS)
lib/ggi.so: $(PLUGIN_GGI)
- $(CC) -shared -lggi -o $@ $^
+ $(CC) -shared $(LIB_GGI) -o $@ $^ $(LCFLAGS)
lib/sdl.so: $(PLUGIN_SDL)
- $(CC) -shared -lSDL -o $@ $^
+ $(CC) -shared $(LIB_SDL) -o $@ $^ $(LCFLAGS)
lib/yuv.so: $(PLUGIN_YUV)
ifeq ($(SYS),beos)
$(CC) $(CFLAGS) -nostart -Xlinker -soname=$@ -o $@ $^ plugins/_APP_
else
- $(CC) -shared -o $@ $^
+ $(CC) -shared -o $@ $^ $(LCFLAGS)
endif
lib/yuvmmx.so: $(PLUGIN_YUVMMX)
ifeq ($(SYS),beos)
$(CC) $(CFLAGS) -nostart -Xlinker -soname=$@ -o $@ $^ plugins/_APP_
else
- $(CC) $(LCFLAGS) -shared -o $@ $^
+ $(CC) -shared -o $@ $^ $(LCFLAGS)
endif
################################################################################