Skip to content

Commit

Permalink
* Fixed the BeOS compile typo.
Browse files Browse the repository at this point in the history
  * The ALSA plugin is back.
  * A gift for Gildas: plugins don't rely on backlinking any more. The
    drawback is the dirty magic in include/modules_export.h which has to
    be included whenever a module needs one of the functions in it. But
     a) we should less and less rely on those functions
     b) no plugin code modification was needed

   The BeOS and MacOS X modules may be broken when compiled as plugins,
   I'll check this later when I can reboot under BeOS.
  • Loading branch information
Sam Hocevar committed May 30, 2001
1 parent 1ffe943 commit 440f999
Show file tree
Hide file tree
Showing 112 changed files with 3,698 additions and 7,667 deletions.
4 changes: 2 additions & 2 deletions INSTALL
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ Here is a shortcut to copy-paste for a complete build:

make distclean && ./configure --prefix=/usr --enable-gnome \
--enable-fb --with-glide --with-ggi --with-sdl --enable-esd \
--enable-mga --enable-gtk --enable-qt --enable-xvideo
--enable-mga --enable-gtk --enable-qt --enable-xvideo --enable-alsa

If you intend to debug stuff, you may want to disable optimizations:

make distclean && ./configure --prefix=/usr --enable-gnome \
--enable-fb --with-glide --with-ggi --with-sdl --enable-esd \
--enable-mga --enable-gtk --enable-qt --enable-xvideo \
--enable-mga --enable-gtk --enable-qt --enable-xvideo --enable-alsa \
--enable-debug


Expand Down
5 changes: 2 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,7 @@ INTERFACE = src/interface/main.o \
src/interface/interface.o \
src/interface/intf_msg.o \
src/interface/intf_playlist.o \
src/interface/intf_channels.o \
src/interface/intf_urldecode.o \
src/interface/intf_channels.o

INPUT = src/input/input.o \
src/input/input_ext-dec.o \
Expand Down Expand Up @@ -328,7 +327,7 @@ $(CPP_OBJ): %.o: %.cpp
# Main application target
#
vlc: Makefile.opts Makefile.dep Makefile $(H_OBJ) $(C_OBJ) $(CPP_OBJ) $(BUILTIN_OBJ)
$(CC) $(CFLAGS) -o $@ $(C_OBJ) $(CPP_OBJ) $(BUILTIN_OBJ) $(LCFLAGS)
$(CC) $(CFLAGS) -o $@ $(C_OBJ) $(CPP_OBJ) $(BUILTIN_OBJ) $(LCFLAGS) $(LIB)
ifeq ($(SYS),beos)
rm -f ./lib/_APP_
ln -s ../vlc ./lib/_APP_
Expand Down
4 changes: 2 additions & 2 deletions Makefile.modules
Original file line number Diff line number Diff line change
Expand Up @@ -59,15 +59,15 @@ $(CPP_DEP): %.dpp: FORCE

$(PLUGIN_C): %.o: .dep/%.d
$(PLUGIN_C): %.o: %.c
$(CC) $(CFLAGS) $(PCFLAGS) -c -o $@ $<
$(CC) $(CFLAGS) -DPLUGIN $(PCFLAGS) -c -o $@ $<

$(BUILTIN_C): BUILTIN_%.o: .dep/%.d
$(BUILTIN_C): BUILTIN_%.o: %.c
$(CC) $(CFLAGS) -DBUILTIN -c -o $@ $<

$(PLUGIN_CPP): %.o: .dep/%.dpp
$(PLUGIN_CPP): %.o: %.cpp
$(CC) $(CFLAGS) $(PCFLAGS) -c -o $@ $<
$(CC) $(CFLAGS) -DPLUGIN $(PCFLAGS) -c -o $@ $<

$(BUILTIN_CPP): BUILTIN_%.o: .dep/%.dpp
$(BUILTIN_CPP): BUILTIN_%.o: %.cpp
Expand Down
14 changes: 0 additions & 14 deletions Makefile.opts.in
Original file line number Diff line number Diff line change
Expand Up @@ -213,20 +213,6 @@ LCFLAGS += @LCFLAGS@ $(LIB)
LCFLAGS += -Wall
#LCFLAGS += -s

ifeq ($(SYS),beos)
LCFLAGS += -Xlinker -soname=_APP_
else
ifneq (,$(findstring qnx,$(SYS)))
LCFLAGS += -Xlinker -export-dynamic
else
ifneq (,$(findstring darwin,$(SYS)))
LCFLAGS += -dyn
else
LCFLAGS += --export-dynamic
endif
endif
endif

#
# Debugging and profiling support
#
Expand Down
Loading

0 comments on commit 440f999

Please sign in to comment.