Commit 1b0868ed authored by Sam Hocevar's avatar Sam Hocevar

  * ./plugins/win32/win32.cpp: fixed `--intf intfwin' which wasn't working.
  * ./Makefile: we don't include the Gtk+ and SDL DLLs in the win32 package
    anymore, the package is now 700k instead of 4MB.
  * ./configure.in, ./Makefile, ./Makefile.opts.in: replaced LIB_FOO with
    foo_LDFLAGS and CFLAGS_BAR with bar_CFLAGS for faster builds, and moved a
    lot of stuff from Makefile.opts.in back to configure.in.
  * ./install-win32: updated script for NSIS 1.96.

   I hope this doesn't break too many other architectures...
parent 0d691469
.*
core
core.*
conftest
conftest.*
.dep
gmon.out
vlc-debug.log
......
......@@ -4,6 +4,13 @@
HEAD
* ./plugins/win32/win32.cpp: fixed `--intf intfwin' which wasn't working.
* ./Makefile: we don't include the Gtk+ and SDL DLLs in the win32 package
anymore, the package is now 700k instead of 4MB.
* ./configure.in, ./Makefile, ./Makefile.opts.in: replaced LIB_FOO with
foo_LDFLAGS and CFLAGS_BAR with bar_CFLAGS for faster builds, and moved a
lot of stuff from Makefile.opts.in back to configure.in.
* ./install-win32: updated script for NSIS 1.96.
* ./configure.in: added --enable-intfwin to enable the win32 interface and
--with-bcbuilder to tell make where to find Borland C++ Builder.
* ./plugins/win32/intfwin.bpr: we now build intfwin.so at the right place.
......
......@@ -123,10 +123,7 @@ Building Win32 interface with bcc32 (Borland's compiler)
(This stage is only necessary if you want to use the Win32 native interface.
If you are happy with the GTK interface, then you can skip this section)
[Steps 2 and 3 are temporary]
1) Compile vlc as usual.
include\defs.h should be generated.
2) From the plugin\win32 directory, use Borland C++ command-line tools
as follows:
......
......@@ -211,7 +211,7 @@ endif
#
# Misc variables
#
VLC_QUICKVERSION := $(shell grep '^ *VERSION=' configure.in | head -1 | sed 's/"//g' | cut -f2 -d=)
VERSION := $(shell grep '^ *VERSION=' configure.in | head -1 | sed 's/"//g' | cut -f2 -d=)
# All symbols must be exported
export
......@@ -235,10 +235,11 @@ Makefile.opts:
show:
@echo CC: $(CC)
@echo CFLAGS: $(CFLAGS)
@echo DCFLAGS: $(DCFLAGS)
@echo LDFLAGS: $(LDFLAGS)
@echo PCFLAGS: $(PCFLAGS)
@echo PLDFLAGS: $(PLDFLAGS)
@echo plugins_CFLAGS: $(plugins_CFLAGS)
@echo plugins_LDFLAGS: $(plugins_LDFLAGS)
@echo builtins_CFLAGS: $(builtins_CFLAGS)
@echo builtins_LDFLAGS: $(builtins_LDFLAGS)
@echo C_OBJ: $(C_OBJ)
@echo CPP_OBJ: $(CPP_OBJ)
@echo PLUGIN_OBJ: $(PLUGIN_OBJ)
......@@ -250,7 +251,7 @@ show:
clean: plugins-clean po-clean vlc-clean
rm -f src/*/*.o extras/*/*.o
rm -f lib/*.so* lib/*.a
rm -f plugins/*.so plugins/*.a
rm -f plugins/*.so plugins/*.a plugins/*.lib plugins/*.tds
rm -rf extras/MacOSX/build
po-clean:
......@@ -372,7 +373,7 @@ dist:
for file in vlc_beos.rsrc vlc.icns gvlc_win32.ico vlc_win32_rc.rc ; do \
cp share/$$file tmp/vlc/share/ ; done
# Build archives
F=vlc-${VLC_QUICKVERSION}; \
F=vlc-${VERSION}; \
mv tmp/vlc tmp/$$F; (cd tmp ; tar cf $$F.tar $$F); \
bzip2 -f -9 < tmp/$$F.tar > $$F.tar.bz2; \
gzip -f -9 tmp/$$F.tar ; mv tmp/$$F.tar.gz .
......@@ -390,24 +391,22 @@ package-win32:
echo "OK."; mkdir tmp; \
fi
# Create installation script
sed -e 's#@VERSION@#'${VLC_QUICKVERSION}'#' < install-win32 > tmp/nsi
cp install-win32 tmp/nsi
# Copy relevant files
cp vlc.exe $(PLUGINS:%=plugins/%.so) tmp/
cp vlc.exe tmp/
$(STRIP) tmp/vlc.exe
cp INSTALL.win32 tmp/INSTALL.txt ; unix2dos tmp/INSTALL.txt
for file in AUTHORS COPYING ChangeLog README FAQ TODO ; \
do cp $$file tmp/$${file}.txt ; \
unix2dos tmp/$${file}.txt ; done
for file in iconv.dll libgmodule-1.3-12.dll libgtk-0.dll libgdk-0.dll \
libgobject-1.3-12.dll libintl-1.dll libglib-1.3-12.dll \
libgthread-1.3-12.dll SDL.dll README-SDL.txt ; \
do cp ${DLL_PATH}/$$file tmp/ ; done
mkdir tmp/plugins
cp $(PLUGINS:%=plugins/%.so) tmp/plugins/
$(STRIP) tmp/$(PLUGINS:%=plugins/%.so)
mkdir tmp/share
for file in default8x16.psf default8x9.psf ; \
do cp share/$$file tmp/share/ ; done
# Create package
wine ~/.wine/fake_windows/Program\ Files/NSIS/makensis.exe /CD tmp/nsi
mv tmp/vlc-${VLC_QUICKVERSION}.exe \
vlc-${VLC_QUICKVERSION}-win32-installer.exe
wine ~/.wine/fake_windows/Program\ Files/NSIS/makensis.exe -- /DVERSION=${VERSION} /CD tmp/nsi
# Clean up
rm -Rf tmp
......@@ -427,10 +426,10 @@ package-beos:
for file in default8x16.psf default8x9.psf ; \
do cp share/$$file tmp/vlc/share/ ; done
# Create package
mv tmp/vlc tmp/vlc-${VLC_QUICKVERSION}
(cd tmp ; find vlc-${VLC_QUICKVERSION} | \
zip -9 -@ vlc-${VLC_QUICKVERSION}-beos.zip )
mv tmp/vlc-${VLC_QUICKVERSION}-BeOS-x86.zip .
mv tmp/vlc tmp/vlc-${VERSION}
(cd tmp ; find vlc-${VERSION} | \
zip -9 -@ vlc-${VERSION}-beos.zip )
mv tmp/vlc-${VERSION}-BeOS-x86.zip .
# Clean up
rm -Rf tmp
......@@ -447,7 +446,7 @@ package-macosx:
cp AUTHORS COPYING ChangeLog README FAQ TODO tmp/
# Create disk image
./macosx-dmg 0 "vlc-${VLC_QUICKVERSION}" tmp/*
./macosx-dmg 0 "vlc-${VERSION}" tmp/*
# Clean up
rm -Rf tmp
......@@ -528,7 +527,7 @@ endif
# Main application target
#
vlc: Makefile.opts Makefile.dep Makefile $(VLC_OBJ) $(BUILTIN_OBJ)
$(CC) $(CFLAGS) -o $@ $(VLC_OBJ) $(BUILTIN_OBJ) $(LDFLAGS) $(LIB_VLC) $(LIB_BUILTINS) $(LIB_COMMON)
$(CC) $(CFLAGS) -o $@ $(VLC_OBJ) $(BUILTIN_OBJ) $(LDFLAGS) $(vlc_LDFLAGS) $(builtins_LDFLAGS)
ifeq ($(SYS),beos)
xres -o $@ ./share/vlc_beos.rsrc
mimeset -f $@
......
......@@ -50,7 +50,7 @@ CFLAGS += -DMAKE_DEP
$(C_DEP): .dep/%.d: %.c
@test -d .dep/$(dir $*) || mkdir -p $(shell dirname .dep/$*)
#@echo "regenerating dependencies for $*.c"
@$(SHELL) -ec '$(CC) $(DCFLAGS) $(CFLAGS) $(DEFINE) 2>/dev/null $< \
@$(SHELL) -ec '$(CC) -M $(CFLAGS) 2>/dev/null $< \
| sed '\''s/$(subst .,\.,$(notdir $*))\.o[ :]*/$(subst /,\/,$*).o \
.dep\/$(subst /,\/,$*).d : /g'\'' > $@; \
[ -s $@ ] || rm -f $@'
......@@ -58,7 +58,7 @@ $(C_DEP): .dep/%.d: %.c
$(CPP_DEP): .dep/%.dpp: %.cpp
@test -d .dep/$(dir $*) || mkdir -p $(shell dirname .dep/$*)
#@echo "regenerating dependencies for $*.c"
@$(SHELL) -ec '$(CC) $(DCFLAGS) $(CFLAGS) $(DEFINE) 2>/dev/null $< \
@$(SHELL) -ec '$(CC) -M $(CFLAGS) 2>/dev/null $< \
| sed '\''s/$(subst .,\.,$(notdir $*))\.o[ :]*/$(subst /,\/,$*).o \
.dep\/$(subst /,\/,$*).dpp : /g'\'' > $@; \
[ -s $@ ] || rm -f $@'
......
......@@ -14,8 +14,6 @@ include Makefile
# Analyze the target we are asked to build
#
module_name := $(shell echo $(MAKECMDGOALS) | sed 's@.*/\(.*\)\..*@\1@')
MODULE_NAME := $(shell echo $(module_name) | tr '[a-z]' '[A-Z]')
suff := $(shell echo $(MAKECMDGOALS) | sed 's@.*\.@@' | tr so/a lo/o)
#
......@@ -25,14 +23,14 @@ SRC_C := $(filter %.c,$($(module_name)_SOURCES))
SRC_CPP := $(filter %.cpp,$($(module_name)_SOURCES))
ifeq (lo,$(suff))
CFLAGS_EXTRA := -I../../include -I../../extras $(CFLAGS_$(MODULE_NAME)) \
extra_CFLAGS := $(plugins_CFLAGS) $($(module_name)_CFLAGS) \
-DMODULE_NAME=$(module_name) -DMODULE_NAME_IS_$(module_name) \
-DPLUGIN $(CFLAGS_$(MODULE_NAME)_PLUGIN) $(PCFLAGS)
$($(module_name)_so_CFLAGS)
OBJ_ALL := $(SRC_C:%.c=%.lo.$(module_name)) $(SRC_CPP:%.cpp=%.lo.$(module_name))
else
CFLAGS_EXTRA := -I../../include -I../../extras $(CFLAGS_$(MODULE_NAME)) \
extra_CFLAGS := $(builtins_CFLAGS) $($(module_name)_CFLAGS) \
-DMODULE_NAME=$(module_name) -DMODULE_NAME_IS_$(module_name) \
-DBUILTIN $(CFLAGS_$(MODULE_NAME)_BUILTIN)
$($(module_name)_a_CFLAGS)
OBJ_ALL := $(SRC_C:%.c=%.o.$(module_name)) $(SRC_CPP:%.cpp=%.o.$(module_name))
endif
......@@ -51,7 +49,7 @@ all:
clean:
# rm -f $(PLUGIN_ALL) $(BUILTIN_ALL)
rm -f *.o *.o.* *.lo *.lo.* *.moc *.moc.* *.bak
rm -f *.o *.o.* *.lo *.lo.* *.obj *.moc *.moc.* *.bak
rm -rf .dep
FORCE:
......@@ -60,23 +58,23 @@ $(OBJ_ALL): ../../Makefile.modules ../../Makefile.dep ../../Makefile ../../Makef
$(OBJ_ALL): $(H_DEP:%=../../include/%)
$(C_DEP): %.d: FORCE
@$(MAKE) -s --no-print-directory -f ../../Makefile.dep $@ CFLAGS="$(CFLAGS) $(CFLAGS_EXTRA)"
@$(MAKE) -s --no-print-directory -f ../../Makefile.dep $@ CFLAGS="$(CFLAGS) $(extra_CFLAGS)"
$(CPP_DEP): %.dpp: FORCE
@$(MAKE) -s --no-print-directory -f ../../Makefile.dep $@ CFLAGS="$(CFLAGS) $(CFLAGS_EXTRA)"
@$(MAKE) -s --no-print-directory -f ../../Makefile.dep $@ CFLAGS="$(CFLAGS) $(extra_CFLAGS)"
$(SRC_C:%.c=%.$(suff).$(module_name)): %.$(suff).$(module_name): .dep/%.d
$(SRC_C:%.c=%.$(suff).$(module_name)): %.$(suff).$(module_name): %.c
$(CC) $(CFLAGS) $(CFLAGS_EXTRA) -c $< -o $@
$(CC) $(CFLAGS) $(extra_CFLAGS) -c $< -o $@
$(SRC_CPP:%.cpp=%.$(suff).$(module_name)): %.$(suff).$(module_name): .dep/%.dpp
$(SRC_CPP:%.cpp=%.$(suff).$(module_name)): %.$(suff).$(module_name): %.cpp
$(CC) $(CFLAGS) $(CFLAGS_EXTRA) -c $< -o $@
$(CC) $(CFLAGS) $(extra_CFLAGS) -c $< -o $@
# foo_CUSTOM lets us override all target rules for foo.so and foo.a
ifeq (,$($(module_name)_CUSTOM))
../$(module_name).so: $(EXTRA_DEP) $(OBJ_ALL)
$(CC) $(OBJ_ALL) $(PLDFLAGS) $(LIB_$(MODULE_NAME)) $(LIB_COMMON) -o $@
$(CC) $(OBJ_ALL) $(LDFLAGS) $(plugins_LDFLAGS) $($(module_name)_LDFLAGS) -o $@
chmod a-x $@
../$(module_name).a: $(EXTRA_DEP) $(OBJ_ALL)
......
......@@ -48,10 +48,10 @@ CC = @CC@
CFLAGS = @CFLAGS@
SHELL = @SHELL@
RANLIB = @RANLIB@
STRIP = @STRIP@
MOC = @MOC@
WINDRES = @WINDRES@
BCBUILDER = @BCBUILDER@
DLL_PATH = @DLL_PATH@
#
# Installation environment
......@@ -64,77 +64,75 @@ libdir = @libdir@
includedir = @includedir@
#
# Libraries for special cases
# CFLAGS for special cases
#
LIB_COMMON = @LIB_COMMON@
LIB_VLC = @LIB_VLC@
LIB_A52 = @LIB_A52@
LIB_AA = @LIB_AA@
LIB_ALSA = @LIB_ALSA@
LIB_ARTS = @LIB_ARTS@
LIB_BEOS = @LIB_BEOS@
LIB_CHROMA_I420_RGB = @LIB_CHROMA_I420_RGB@
LIB_DARWIN = @LIB_DARWIN@
LIB_DIRECTX = @LIB_DIRECTX@
LIB_DSP = @LIB_DSP@
LIB_DVD = @LIB_DVD@
LIB_DVDREAD = @LIB_DVDREAD@
LIB_ESD = @LIB_ESD@
LIB_FILTER_DISTORT = @LIB_FILTER_DISTORT@
LIB_GGI = @LIB_GGI@
LIB_GLIDE = @LIB_GLIDE@
LIB_GNOME = @LIB_GNOME@
LIB_GTK = @LIB_GTK@
LIB_IDCTALTIVEC = @LIB_IDCTALTIVEC@
LIB_IMDCT = @LIB_IMDCT@
LIB_IMDCT3DN = @LIB_IMDCT3DN@
LIB_IMDCTSSE = @LIB_IMDCTSSE@
LIB_IPV4 = @LIB_IPV4@
LIB_IPV6 = @LIB_IPV6@
LIB_KDE = @LIB_KDE@
LIB_LIRC = @LIB_LIRC@
LIB_MACOSX = @LIB_MACOSX@
LIB_MAD = @LIB_MAD@
LIB_MEMCPYALTIVEC = @LIB_MEMCPYALTIVEC@
LIB_MOTIONALTIVEC = @LIB_MOTIONALTIVEC@
LIB_MPEG_TS = @LIB_MPEG_TS@
LIB_NCURSES = @LIB_NCURSES@
LIB_QNX = @LIB_QNX@
LIB_QT = @LIB_QT@
LIB_RC = @LIB_RC@
LIB_SDL = @LIB_SDL@
LIB_VCD = @LIB_VCD@
LIB_VORBIS = @LIB_VORBIS@
LIB_WAVEOUT = @LIB_WAVEOUT@
LIB_WIN32 = @LIB_WIN32@
LIB_X11 = @LIB_X11@
LIB_XVIDEO = @LIB_XVIDEO@
vlc_CFLAGS = @vlc_CFLAGS@
plugins_CFLAGS := @plugins_CFLAGS@
builtins_CFLAGS := @builtins_CFLAGS@
arts_CFLAGS = @arts_CFLAGS@
dvd_CFLAGS = @dvd_CFLAGS@
dvdread_CFLAGS = @dvdread_CFLAGS@
directx_CFLAGS = @directx_CFLAGS@
esd_CFLAGS = @esd_CFLAGS@
glide_CFLAGS = @glide_CFLAGS@
gnome_CFLAGS = @gnome_CFLAGS@
gtk_CFLAGS = @gtk_CFLAGS@
kde_CFLAGS = @kde_CFLAGS@
idctaltivec_CFLAGS = @idctaltivec_CFLAGS@
macosx_CFLAGS = @macosx_CFLAGS@
mad_CFLAGS = @mad_CFLAGS@
memcpyaltivec_CFLAGS = @memcpyaltivec_CFLAGS@
motionaltivec_CFLAGS = @motionaltivec_CFLAGS@
qt_CFLAGS = @qt_CFLAGS@
sdl_CFLAGS = @sdl_CFLAGS@
x11_CFLAGS = @x11_CFLAGS@
xvideo_CFLAGS = @xvideo_CFLAGS@
#
# CFLAGS for special cases
# Libraries for special cases
#
CFLAGS_COMMON = @CFLAGS_COMMON@
CFLAGS_VLC = @CFLAGS_VLC@
CFLAGS_ARTS = @CFLAGS_ARTS@
CFLAGS_DVD = @CFLAGS_DVD@
CFLAGS_DVDREAD = @CFLAGS_DVDREAD@
CFLAGS_ESD = @CFLAGS_ESD@
CFLAGS_GLIDE = @CFLAGS_GLIDE@
CFLAGS_GNOME = @CFLAGS_GNOME@
CFLAGS_GTK = @CFLAGS_GTK@
CFLAGS_KDE = @CFLAGS_KDE@
CFLAGS_IDCTALTIVEC = @CFLAGS_IDCTALTIVEC@
CFLAGS_MACOSX = @CFLAGS_MACOSX@
CFLAGS_MAD = @CFLAGS_MAD@
CFLAGS_MEMCPYALTIVEC = @CFLAGS_MEMCPYALTIVEC@
CFLAGS_MOTIONALTIVEC = @CFLAGS_MOTIONALTIVEC@
CFLAGS_QT = @CFLAGS_QT@
CFLAGS_SDL = @CFLAGS_SDL@
CFLAGS_WIN32 = @CFLAGS_WIN32@
CFLAGS_X11 = @CFLAGS_X11@
CFLAGS_XVIDEO = @CFLAGS_XVIDEO@
vlc_LDFLAGS = @vlc_LDFLAGS@
plugins_LDFLAGS += @plugins_LDFLAGS@
builtins_LDFLAGS += @builtins_LDFLAGS@
a52_LDFLAGS = @a52_LDFLAGS@
aa_LDFLAGS = @aa_LDFLAGS@
alsa_LDFLAGS = @alsa_LDFLAGS@
arts_LDFLAGS = @arts_LDFLAGS@
beos_LDFLAGS = @beos_LDFLAGS@
chroma_i420_rgb_LDFLAGS = @chroma_i420_rgb_LDFLAGS@
directx_LDFLAGS = @directx_LDFLAGS@
dsp_LDFLAGS = @dsp_LDFLAGS@
dvd_LDFLAGS = @dvd_LDFLAGS@
dvdread_LDFLAGS = @dvdread_LDFLAGS@
esd_LDFLAGS = @esd_LDFLAGS@
filter_distort_LDFLAGS = @filter_distort_LDFLAGS@
ggi_LDFLAGS = @ggi_LDFLAGS@
glide_LDFLAGS = @glide_LDFLAGS@
gnome_LDFLAGS = @gnome_LDFLAGS@
gtk_LDFLAGS = @gtk_LDFLAGS@
idctaltivec_LDFLAGS = @idctaltivec_LDFLAGS@
imdct_LDFLAGS = @imdct_LDFLAGS@
imdct3dn_LDFLAGS = @imdct3dn_LDFLAGS@
imdctsse_LDFLAGS = @imdctsse_LDFLAGS@
ipv4_LDFLAGS = @ipv4_LDFLAGS@
kde_LDFLAGS = @kde_LDFLAGS@
lirc_LDFLAGS = @lirc_LDFLAGS@
macosx_LDFLAGS = @macosx_LDFLAGS@
mad_LDFLAGS = @mad_LDFLAGS@
memcpyaltivec_LDFLAGS = @memcpyaltivec_LDFLAGS@
motionaltivec_LDFLAGS = @motionaltivec_LDFLAGS@
ncurses_LDFLAGS = @ncurses_LDFLAGS@
qnx_LDFLAGS = @qnx_LDFLAGS@
qt_LDFLAGS = @qt_LDFLAGS@
rc_LDFLAGS = @rc_LDFLAGS@
sdl_LDFLAGS = @sdl_LDFLAGS@
vcd_LDFLAGS = @vcd_LDFLAGS@
vorbis_LDFLAGS = @vorbis_LDFLAGS@
waveout_LDFLAGS = @waveout_LDFLAGS@
x11_LDFLAGS = @x11_LDFLAGS@
xvideo_LDFLAGS = @xvideo_LDFLAGS@
#
# Other special cases
......@@ -149,15 +147,15 @@ NEED_GETOPT = @NEED_GETOPT@
PROGRAM_OPTIONS = $(SYS) $(ARCH)
ifeq ($(DEBUG),1)
PROGRAM_OPTIONS += DEBUG
DEFINE += -DDEBUG
CFLAGS += -DDEBUG
endif
ifeq ($(CPROF),1)
PROGRAM_OPTIONS += CPROF
DEFINE += -DCPROF
CFLAGS += -DCPROF
endif
ifeq ($(GPROF),1)
PROGRAM_OPTIONS += GPROF
DEFINE += -DGPROF
CFLAGS += -DGPROF
endif
# PROGRAM_BUILD is a complete identification of the build
......@@ -170,20 +168,15 @@ else
PROGRAM_BUILD = `date` $(USER)@`hostname`
endif
# DEFINE will contain some of the constants definitions decided in Makefile,
# including SYS_xx. It will be passed to C compiler.
DEFINE_SYS := -DSYS_$(shell echo $(SYS) | sed -e 's/-.*//' | tr '[a-z].' '[A-Z]_')
DEFINE += $(DEFINE_SYS)
# On Linux and Solaris, activate 64-bit off_t (by default under BSD)
DEFINE += -D_FILE_OFFSET_BITS=64 -D__USE_UNIX98 -D_LARGEFILE64_SOURCE
CFLAGS += -D_FILE_OFFSET_BITS=64 -D__USE_UNIX98 -D_LARGEFILE64_SOURCE
# Gettext support
DEFINE += -DLOCALEDIR=\"$(datadir)/locale\"
CFLAGS += -DLOCALEDIR=\"$(datadir)/locale\"
# Data and plugin location
DEFINE += -DDATA_PATH=\"@prefix@/share/videolan\"
DEFINE += -DPLUGIN_PATH=\"@prefix@/lib/videolan/vlc\"
CFLAGS += -DDATA_PATH=\"@prefix@/share/videolan\"
CFLAGS += -DPLUGIN_PATH=\"@prefix@/lib/videolan/vlc\"
###############################################################################
# Tuning and other variables - do not change anything except if you know
......@@ -193,25 +186,11 @@ DEFINE += -DPLUGIN_PATH=\"@prefix@/lib/videolan/vlc\"
#
# C headers directories
#
INCLUDE += @INCLUDE@
INCLUDE += -Iinclude -Iextras
#
# Libraries needed by built-in modules
#
LIB_BUILTINS := $(patsubst %,$$LIB_%,$(shell echo $(BUILTINS) | tr '[a-z]' '[A-Z]'))
#
# Libraries needed by the vlc executable
#
ifneq (,$(findstring mingw32,$(SYS)))
LIB_VLC += -lws2_32 -lnetapi32
endif
CFLAGS += -Iinclude -Iextras
#
# C compiler flags: mainstream compilation
#
CFLAGS += $(DEFINE) $(INCLUDE)
CFLAGS += -D_REENTRANT
CFLAGS += -D_GNU_SOURCE
......@@ -219,23 +198,6 @@ ifeq ($(RELEASE),1)
CFLAGS += -DHAVE_RELEASE
endif
# flags needed for clean beos compilation
ifeq ($(SYS),beos)
CFLAGS += -Wno-multichar -Wno-ctor-dtor-privacy -Woverloaded-virtual
endif
ifneq (,$(findstring darwin,$(SYS)))
CFLAGS += -no-cpp-precomp
endif
ifneq (,$(findstring mingw32,$(SYS)))
CFLAGS += -fnative-struct -D_OFF_T_ -D_off_t=long
endif
ifneq (,$(findstring bsd,$(SYS)))
CFLAGS += -pthread
endif
# Optimizations : don't compile debug versions with them
ifeq ($(OPTIMS),1)
CFLAGS += @CFLAGS_OPTIM@
......@@ -271,17 +233,10 @@ endif
#end of optimisations
endif
#
# C compiler flags: dependancies
#
DCFLAGS += $(INCLUDE)
DCFLAGS += -M
#
# C compiler flags: linking
#
LDFLAGS += @LDFLAGS@
LDFLAGS += $(LIB)
LDFLAGS += -Wall
ifneq ($(DEBUG),1)
ifneq ($(GPROF),1)
......@@ -290,23 +245,17 @@ ifneq ($(CPROF),1)
endif
endif
endif
ifneq (,$(findstring mingw32,$(SYS)))
LDFLAGS += -mwindows -Xlinker --force-exe-suffix
endif
#
# C compiler flags: plugin compilation
# C compiler flags: plugins and builtins compilation
#
ifneq (,$(findstring mingw32,$(SYS)))
PCFLAGS += -fnative-struct
else
PCFLAGS += -fPIC
endif
plugins_CFLAGS += -DPLUGIN -I../../include -I../../extras
builtins_CFLAGS += -DBUILTIN -I../../include -I../../extras
#
# C compiler flags: plugin linking
# Linker flags: plugins and builtins linking
#
PLDFLAGS += @PLDFLAGS@
builtins_LDFLAGS += $(patsubst %,$$%_LDFLAGS,$(BUILTINS))
#
# Debugging and profiling support
......
This diff is collapsed.
This diff is collapsed.
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
; NSIS installer script for vlc ;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
; written by Pierre Baillet <oct@zoy.org> 29/7/01 v0.2
; modifications by Samuel Hocevar <sam@zoy.org> 12/11/01
;;;;;;;;;;;;;
; CHANGELOG ;
;;;;;;;;;;;;;
; modifications by Samuel Hocevar <sam@zoy.org> 05 Apr 2002
; . no need for @VERSION@ anymore
; . updated script for NSIS 1.96.
; modifications by Samuel Hocevar <sam@zoy.org> 12 Nov 2001
; . removed version information.
; written by Pierre Baillet <oct@zoy.org> 29 Jul 2001 v0.2
; . lists all installed files so as to prevent installer.nsi to be included
; in the release.
; . really remove the shortcuts.
......@@ -17,14 +20,15 @@
; General configuration ;
;;;;;;;;;;;;;;;;;;;;;;;;;
OutFile vlc-@VERSION@.exe
OutFile ..\vlc-${VERSION}-win32.exe
Name "the VideoLAN Client"
Caption "vlc @VERSION@ for Win32 Setup"
;Icon ../share/gvlc_win32.ico
Caption "VideoLAN Client '${VERSION}' for Win32 Setup"
;Icon ../share/gvlc32x32.ico
CRCCheck on
InstallDir $PROGRAMFILES\vlc
InstallDir "$PROGRAMFILES\VideoLAN\VideoLAN Client"
; check if the program has already been installed, if so, take this dir
; as install dir
InstallDirRegKey HKLM SOFTWARE\VideoLAN\VLC "Install_Dir"
......@@ -33,15 +37,13 @@ DirText "Choose a directory to install in to:"
AutoCloseWindow false
ShowInstDetails show
; uninstall stuff
UninstallText "This will uninstall the VideoLAN Client. Hit next to continue."
UninstallExeName "vlc-uninst.exe"
SetOverwrite ifnewer
SetDatablockOptimize on
SetDateSave off
SetCompress auto
UninstallText "This will uninstall the VideoLAN Client. Hit next to continue."
;;;;;;;;;;;;;;;;;;;;
; Install settings ;
;;;;;;;;;;;;;;;;;;;;
......@@ -50,17 +52,19 @@ Section "Install"
SetOutPath $INSTDIR
File vlc.exe
File *.so
File *.dll
File *.txt
File /r share
File /r plugins
CreateDirectory "$SMPROGRAMS\VideoLAN"
CreateShortCut "$SMPROGRAMS\VideoLAN\vlc_@VERSION@.lnk" "$INSTDIR\vlc.exe"
CreateShortCut "$SMPROGRAMS\VideoLAN\Uninstall VLC.lnk" "$INSTDIR\vlc-uninst.exe"
CreateShortCut "$SMPROGRAMS\VideoLAN\vlc.lnk" "$INSTDIR\vlc.exe"
CreateShortCut "$SMPROGRAMS\VideoLAN\Uninstall VLC.lnk" "$INSTDIR\uninstall.exe"
WriteUninstaller "uninstall.exe"
WriteRegStr HKLM SOFTWARE\VideoLAN\VLC "Install_Dir" $INSTDIR
WriteRegStr HKLM SOFTWARE\VideoLAN\VLC "version" "@VERSION@"
WriteRegStr HKLM SOFTWARE\VideoLAN\VLC "version" "${VERSION}"
Exec "explorer $SMPROGRAMS\VideoLAN\"
SectionEnd
......@@ -73,6 +77,8 @@ Section "Uninstall"
RMDir $SMPROGRAMS\VideoLAN
Delete $INSTDIR\share\*
RMDir $INSTDIR\share
Delete $INSTDIR\plugins\*
RMDir $INSTDIR\plugins
Delete $INSTDIR\*
RMDir $INSTDIR
DeleteRegKey HKLM SOFTWARE\VideoLAN
......
*.a
*.so
*.so.*
*.tds
*.lib
......@@ -2,3 +2,5 @@
*.lo
*.o.*
*.lo.*
intfwin.mak
*MAKE*
......@@ -44,7 +44,9 @@ MODULE_CONFIG_STOP
MODULE_INIT_START
SET_DESCRIPTION( "Win32 interface module" )
ADD_CAPABILITY( INTF, 100 )
ADD_SHORTCUT( "win" )
ADD_SHORTCUT( "win32" )
ADD_SHORTCUT( "intfwin" )
MODULE_INIT_STOP
MODULE_ACTIVATE_START
......
VLC_ICON ICON "share/gvlc_win32.ico"
VLC_ICON ICON "share/vlc48x48.ico"
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