Commit ddec0b93 authored by Sam Hocevar's avatar Sam Hocevar

  * ./plugins/win32: skeleton for the win32 interface Ipkiss is developing.
  * ./config.guess ./config.sub: latest GNU versions.
  * ./configure.in: when possible, xvideo is compiled as a plugin.
  * ./vlc.spec: fixed a few minor inaccuracies.
  * ./debian/control: vlc-gui is no longer depended on, but rather recommended.
  * ./src/interface/main.c: --spumargin flag; use this to force displaying
    subtitles at the bottom of the screen instead of putting them in the
    middle, for instance: `--spumargin 5'.
parent 85523bcf
List of known vlc bugs List of known vlc bugs
$Id: BUGS,v 1.4 2002/01/09 02:01:14 sam Exp $ $Id: BUGS,v 1.5 2002/01/21 00:52:06 sam Exp $
Please try to keep this file up to date. Also, grep for FIXME in the Please try to keep this file up to date. Also, grep for FIXME in the
source files for more and more bugs to fix. source files for more and more bugs to fix.
...@@ -41,6 +41,9 @@ Video output: ...@@ -41,6 +41,9 @@ Video output:
* The MGA video output plugin makes the picture stutter when MGA_NUM_FRAMES * The MGA video output plugin makes the picture stutter when MGA_NUM_FRAMES
is set to a value higher than 1. is set to a value higher than 1.
* The SPU decoder doesn't detect when the video output failed to launch
itself, and we segfault.
Chroma transformations: Chroma transformations:
* The only working YUV2RGB transformation function is the MMX version * The only working YUV2RGB transformation function is the MMX version
......
List of vlc plugins List of vlc plugins
$Id: MODULES,v 1.1 2002/01/04 14:01:34 sam Exp $ $Id: MODULES,v 1.2 2002/01/21 00:52:06 sam Exp $
* ac3_adec: software AC3 decoder. * ac3_adec: software AC3 decoder.
...@@ -25,12 +25,16 @@ $Id: MODULES,v 1.1 2002/01/04 14:01:34 sam Exp $ ...@@ -25,12 +25,16 @@ $Id: MODULES,v 1.1 2002/01/04 14:01:34 sam Exp $
* directx: audio output and video output module using the DirectX API. * directx: audio output and video output module using the DirectX API.
* downmix: downmix module, used by the AC3 decoder.
* downmixsse: SSE accelerated version of downmix.
* downmix3dn: 3D Now! accelerated version of downmix.
* dsp: audio output module using the OSS /dev/dsp interface. * dsp: audio output module using the OSS /dev/dsp interface.
* dummy: dummy audio output, video output, interface and input modules. * dummy: dummy audio output, video output, interface and input modules.
* null: a module with no capabilities.
* dvd: input module for accessing DVDs. * dvd: input module for accessing DVDs.
* dvdread: input module for accessing DVDs, uses libdvdread. * dvdread: input module for accessing DVDs, uses libdvdread.
...@@ -58,12 +62,6 @@ $Id: MODULES,v 1.1 2002/01/04 14:01:34 sam Exp $ ...@@ -58,12 +62,6 @@ $Id: MODULES,v 1.1 2002/01/04 14:01:34 sam Exp $
* gtk: interface using the Gtk+ widget set. * gtk: interface using the Gtk+ widget set.
* downmix: downmix module, used by the AC3 decoder.
* downmixsse: SSE accelerated version of downmix.
* downmix3dn: 3D Now! accelerated version of downmix.
* idct: inverse DCT module, used by the video decoder. * idct: inverse DCT module, used by the video decoder.
* idctclassic: another version of idct. * idctclassic: another version of idct.
...@@ -119,16 +117,18 @@ $Id: MODULES,v 1.1 2002/01/04 14:01:34 sam Exp $ ...@@ -119,16 +117,18 @@ $Id: MODULES,v 1.1 2002/01/04 14:01:34 sam Exp $
* mpeg_vdec: MPEG and MPEG2 video decoder. * mpeg_vdec: MPEG and MPEG2 video decoder.
* ncurses: interface module using the ncurses library.
* null: a module with no capabilities.
* qt: interface module using the Qt widget set. * qt: interface module using the Qt widget set.
* rc: interface module using stdio.
* sdl: audio output and video output module using the SDL library. * sdl: audio output and video output module using the SDL library.
* spudec: DVD subtitles decoder. * spudec: DVD subtitles decoder.
* ncurses: interface module using the ncurses library.
* rc: interface module using stdio.
* vcd: input module for accessing Video CDs. * vcd: input module for accessing Video CDs.
* x11: video output module using the X11 API. * x11: video output module using the X11 API.
......
...@@ -48,6 +48,7 @@ PLUGINS_DIR := ac3_adec \ ...@@ -48,6 +48,7 @@ PLUGINS_DIR := ac3_adec \
spudec \ spudec \
text \ text \
vcd \ vcd \
win32 \
x11 x11
PLUGINS_TARGETS := ac3_adec/ac3_adec \ PLUGINS_TARGETS := ac3_adec/ac3_adec \
...@@ -117,6 +118,7 @@ PLUGINS_TARGETS := ac3_adec/ac3_adec \ ...@@ -117,6 +118,7 @@ PLUGINS_TARGETS := ac3_adec/ac3_adec \
text/ncurses \ text/ncurses \
text/rc \ text/rc \
vcd/vcd \ vcd/vcd \
win32/win32 \
x11/x11 \ x11/x11 \
x11/xvideo x11/xvideo
...@@ -142,6 +144,10 @@ ifeq ($(NEED_GETOPT),1) ...@@ -142,6 +144,10 @@ ifeq ($(NEED_GETOPT),1)
C_OBJ += extras/GNUgetopt/getopt.o extras/GNUgetopt/getopt1.o C_OBJ += extras/GNUgetopt/getopt.o extras/GNUgetopt/getopt1.o
endif endif
ifeq ($(NEED_SYMBOLS),1)
C_OBJ += src/misc/symbols.o
endif
ifeq ($(SYS),beos) ifeq ($(SYS),beos)
CPP_OBJ := src/misc/beos_specific.o CPP_OBJ := src/misc/beos_specific.o
endif endif
......
...@@ -74,7 +74,7 @@ $(SRC_CPP:%.cpp=%.$(suff).$(module_name)): %.$(suff).$(module_name): %.cpp ...@@ -74,7 +74,7 @@ $(SRC_CPP:%.cpp=%.$(suff).$(module_name)): %.$(suff).$(module_name): %.cpp
$(CC) $(CFLAGS) $(CFLAGS_EXTRA) -c $< -o $@ $(CC) $(CFLAGS) $(CFLAGS_EXTRA) -c $< -o $@
../$(module_name).so: $(EXTRA_DEP) $(OBJ_ALL) ../$(module_name).so: $(EXTRA_DEP) $(OBJ_ALL)
$(CC) $(OBJ_ALL) $(PLDFLAGS) $(LIB_$(MODULE_NAME)) -o $@ $(CC) $(OBJ_ALL) $(PLDFLAGS) $(LIB_$(MODULE_NAME)) -o $@ && chmod -x $@
../$(module_name).a: $(EXTRA_DEP) $(OBJ_ALL) ../$(module_name).a: $(EXTRA_DEP) $(OBJ_ALL)
rm -f $@ && ar rc $@ $(OBJ_ALL) && $(RANLIB) $@ rm -f $@ && ar rc $@ $(OBJ_ALL) && $(RANLIB) $@
......
...@@ -97,6 +97,7 @@ LIB_QNX = @LIB_QNX@ ...@@ -97,6 +97,7 @@ LIB_QNX = @LIB_QNX@
LIB_QT = @LIB_QT@ LIB_QT = @LIB_QT@
LIB_RC = @LIB_RC@ LIB_RC = @LIB_RC@
LIB_SDL = @LIB_SDL@ LIB_SDL = @LIB_SDL@
LIB_WIN32 = @LIB_WIN32@
LIB_X11 = @LIB_X11@ LIB_X11 = @LIB_X11@
LIB_XVIDEO = @LIB_XVIDEO@ LIB_XVIDEO = @LIB_XVIDEO@
...@@ -119,6 +120,7 @@ CFLAGS_MAD = @CFLAGS_MAD@ ...@@ -119,6 +120,7 @@ CFLAGS_MAD = @CFLAGS_MAD@
CFLAGS_MOTIONALTIVEC = @CFLAGS_MOTIONALTIVEC@ CFLAGS_MOTIONALTIVEC = @CFLAGS_MOTIONALTIVEC@
CFLAGS_QT = @CFLAGS_QT@ CFLAGS_QT = @CFLAGS_QT@
CFLAGS_SDL = @CFLAGS_SDL@ CFLAGS_SDL = @CFLAGS_SDL@
CFLAGS_WIN32 = @CFLAGS_WIN32@
CFLAGS_X11 = @CFLAGS_X11@ CFLAGS_X11 = @CFLAGS_X11@
CFLAGS_XVIDEO = @CFLAGS_XVIDEO@ CFLAGS_XVIDEO = @CFLAGS_XVIDEO@
......
#! /bin/sh #! /bin/sh
# Attempt to guess a canonical system name. # Attempt to guess a canonical system name.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
# Free Software Foundation, Inc. # 2000, 2001, 2002 Free Software Foundation, Inc.
timestamp='2001-11-26' timestamp='2002-01-02'
# This file is free software; you can redistribute it and/or modify it # This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by # under the terms of the GNU General Public License as published by
...@@ -135,23 +135,21 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in ...@@ -135,23 +135,21 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
# object file format. This provides both forward # object file format. This provides both forward
# compatibility and a consistent mechanism for selecting the # compatibility and a consistent mechanism for selecting the
# object file format. # object file format.
# Determine the machine/vendor (is the vendor relevant). #
case "${UNAME_MACHINE}" in # Note: NetBSD doesn't particularly care about the vendor
amiga) machine=m68k-unknown ;; # portion of the name. We always set it to "unknown".
arm32) machine=arm-unknown ;; UNAME_MACHINE_ARCH=`(uname -p) 2>/dev/null` || \
atari*) machine=m68k-atari ;; UNAME_MACHINE_ARCH=unknown
sun3*) machine=m68k-sun ;; case "${UNAME_MACHINE_ARCH}" in
mac68k) machine=m68k-apple ;; arm*) machine=arm-unknown ;;
macppc) machine=powerpc-apple ;; sh3el) machine=shl-unknown ;;
hp3[0-9][05]) machine=m68k-hp ;; sh3eb) machine=sh-unknown ;;
ibmrt|romp-ibm) machine=romp-ibm ;; *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
sparc*) machine=`uname -p`-unknown ;;
*) machine=${UNAME_MACHINE}-unknown ;;
esac esac
# The Operating System including object format, if it has switched # The Operating System including object format, if it has switched
# to ELF recently, or will in the future. # to ELF recently, or will in the future.
case "${UNAME_MACHINE}" in case "${UNAME_MACHINE_ARCH}" in
i386|sparc|amiga|arm*|hp300|mvme68k|vax|atari|luna68k|mac68k|news68k|next68k|pc532|sun3*|x68k) arm*|i386|m68k|ns32k|sh3*|sparc|vax)
eval $set_cc_for_build eval $set_cc_for_build
if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
| grep __ELF__ >/dev/null | grep __ELF__ >/dev/null
...@@ -291,6 +289,9 @@ EOF ...@@ -291,6 +289,9 @@ EOF
*:[Aa]miga[Oo][Ss]:*:*) *:[Aa]miga[Oo][Ss]:*:*)
echo ${UNAME_MACHINE}-unknown-amigaos echo ${UNAME_MACHINE}-unknown-amigaos
exit 0 ;; exit 0 ;;
*:[Mm]orph[Oo][Ss]:*:*)
echo ${UNAME_MACHINE}-unknown-morphos
exit 0 ;;
*:OS/390:*:*) *:OS/390:*:*)
echo i370-ibm-openedition echo i370-ibm-openedition
exit 0 ;; exit 0 ;;
...@@ -736,6 +737,9 @@ EOF ...@@ -736,6 +737,9 @@ EOF
i*:PW*:*) i*:PW*:*)
echo ${UNAME_MACHINE}-pc-pw32 echo ${UNAME_MACHINE}-pc-pw32
exit 0 ;; exit 0 ;;
x86:Interix*:3*)
echo i386-pc-interix3
exit 0 ;;
i*:Windows_NT*:* | Pentium*:Windows_NT*:*) i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
# How do we know it's Interix rather than the generic POSIX subsystem? # How do we know it's Interix rather than the generic POSIX subsystem?
# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
...@@ -767,10 +771,24 @@ EOF ...@@ -767,10 +771,24 @@ EOF
echo ${UNAME_MACHINE}-unknown-linux-gnu echo ${UNAME_MACHINE}-unknown-linux-gnu
exit 0 ;; exit 0 ;;
mips:Linux:*:*) mips:Linux:*:*)
case `sed -n '/^byte/s/^.*: \(.*\) endian/\1/p' < /proc/cpuinfo` in eval $set_cc_for_build
big) echo mips-unknown-linux-gnu && exit 0 ;; sed 's/^ //' << EOF >$dummy.c
little) echo mipsel-unknown-linux-gnu && exit 0 ;; #undef CPU
esac #undef mips
#undef mipsel
#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
CPU=mipsel
#else
#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
CPU=mips
#else
CPU=
#endif
#endif
EOF
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
rm -f $dummy.c
test x"${CPU}" != x && echo "${CPU}-pc-linux-gnu" && exit 0
;; ;;
ppc:Linux:*:*) ppc:Linux:*:*)
echo powerpc-unknown-linux-gnu echo powerpc-unknown-linux-gnu
...@@ -843,32 +861,25 @@ EOF ...@@ -843,32 +861,25 @@ EOF
esac esac
# Determine whether the default compiler is a.out or elf # Determine whether the default compiler is a.out or elf
eval $set_cc_for_build eval $set_cc_for_build
cat >$dummy.c <<EOF sed 's/^ //' << EOF >$dummy.c
#include <features.h> #include <features.h>
#ifdef __cplusplus #ifdef __ELF__
#include <stdio.h> /* for printf() prototype */ # ifdef __GLIBC__
int main (int argc, char *argv[]) { # if __GLIBC__ >= 2
#else LIBC=gnu
int main (argc, argv) int argc; char *argv[]; { # else
#endif LIBC=gnulibc1
#ifdef __ELF__ # endif
# ifdef __GLIBC__ # else
# if __GLIBC__ >= 2 LIBC=gnulibc1
printf ("%s-pc-linux-gnu\n", argv[1]); # endif
# else #else
printf ("%s-pc-linux-gnulibc1\n", argv[1]); LIBC=gnuaout
# endif #endif
# else
printf ("%s-pc-linux-gnulibc1\n", argv[1]);
# endif
#else
printf ("%s-pc-linux-gnuaout\n", argv[1]);
#endif
return 0;
}
EOF EOF
$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0 eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
rm -f $dummy.c $dummy rm -f $dummy.c
test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
;; ;;
i*86:DYNIX/ptx:4*:*) i*86:DYNIX/ptx:4*:*)
......
#! /bin/sh #! /bin/sh
# Configuration validation subroutine script. # Configuration validation subroutine script.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
# Free Software Foundation, Inc. # 2000, 2001, 2002 Free Software Foundation, Inc.
timestamp='2001-12-03' timestamp='2002-01-02'
# This file is (in principle) common to ALL GNU software. # This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software # The presence of a machine in this file suggests that SOME GNU software
...@@ -227,6 +227,7 @@ case $basic_machine in ...@@ -227,6 +227,7 @@ case $basic_machine in
1750a | 580 \ 1750a | 580 \
| a29k \ | a29k \
| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
| c4x | clipper \ | c4x | clipper \
| d10v | d30v | dsp16xx \ | d10v | d30v | dsp16xx \
...@@ -278,7 +279,8 @@ case $basic_machine in ...@@ -278,7 +279,8 @@ case $basic_machine in
580-* \ 580-* \
| a29k-* \ | a29k-* \
| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
| alphapca5[67]-* | arc-* \ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
| arm-* | armbe-* | armle-* | armv*-* \ | arm-* | armbe-* | armle-* | armv*-* \
| avr-* \ | avr-* \
| bs2000-* \ | bs2000-* \
...@@ -419,6 +421,14 @@ case $basic_machine in ...@@ -419,6 +421,14 @@ case $basic_machine in
decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn) decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
basic_machine=mips-dec basic_machine=mips-dec
;; ;;
decsystem10* | dec10*)
basic_machine=pdp10-dec
os=-tops10
;;
decsystem20* | dec20*)
basic_machine=pdp10-dec
os=-tops20
;;
delta | 3300 | motorola-3300 | motorola-delta \ delta | 3300 | motorola-3300 | motorola-delta \
| 3300-motorola | delta-motorola) | 3300-motorola | delta-motorola)
basic_machine=m68k-motorola basic_machine=m68k-motorola
...@@ -621,6 +631,10 @@ case $basic_machine in ...@@ -621,6 +631,10 @@ case $basic_machine in
basic_machine=m68k-rom68k basic_machine=m68k-rom68k
os=-coff os=-coff
;; ;;
morphos)
basic_machine=powerpc-unknown
os=-morphos
;;
msdos) msdos)
basic_machine=i386-pc basic_machine=i386-pc
os=-msdos os=-msdos
...@@ -882,6 +896,10 @@ case $basic_machine in ...@@ -882,6 +896,10 @@ case $basic_machine in
tx39el) tx39el)
basic_machine=mipstx39el-unknown basic_machine=mipstx39el-unknown
;; ;;
toad1)
basic_machine=pdp10-xkl
os=-tops20
;;
tower | tower-32) tower | tower-32)
basic_machine=m68k-ncr basic_machine=m68k-ncr
;; ;;
...@@ -1075,7 +1093,7 @@ case $os in ...@@ -1075,7 +1093,7 @@ case $os in
| -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \ | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
| -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
| -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus*) | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* | -morphos*)
# Remember, each alternative MUST END IN *, to match a version number. # Remember, each alternative MUST END IN *, to match a version number.
;; ;;
-qnx*) -qnx*)
...@@ -1210,6 +1228,7 @@ case $basic_machine in ...@@ -1210,6 +1228,7 @@ case $basic_machine in
arm*-semi) arm*-semi)
os=-aout os=-aout
;; ;;
# This must come before the *-dec entry.
pdp10-*) pdp10-*)
os=-tops20 os=-tops20
;; ;;
......
This diff is collapsed.
...@@ -310,8 +310,8 @@ esac ...@@ -310,8 +310,8 @@ esac
dnl dnl
dnl default modules dnl default modules
dnl dnl
BUILTINS="${BUILTINS} mpeg_es mpeg_ps mpeg_ts memcpy idct idctclassic motion imdct downmix chroma_i420_rgb chroma_i420_yuy2 chroma_i422_yuy2 chroma_i420_ymga mpeg_adec lpcm_adec ac3_adec mpeg_vdec" BUILTINS="${BUILTINS} mpeg_es mpeg_ps mpeg_ts memcpy idct idctclassic motion imdct downmix chroma_i420_rgb chroma_i420_yuy2 chroma_i422_yuy2 chroma_i420_ymga mpeg_adec ac3_adec mpeg_vdec"
PLUGINS="${PLUGINS} ac3_spdif spudec filter_deinterlace filter_invert filter_wall filter_transform filter_distort" PLUGINS="${PLUGINS} lpcm_adec ac3_spdif spudec filter_deinterlace filter_invert filter_wall filter_transform filter_distort"
dnl dnl
dnl Accelerated modules dnl Accelerated modules
...@@ -431,8 +431,8 @@ case x"${target_os}" in ...@@ -431,8 +431,8 @@ case x"${target_os}" in
x*mingw32*) x*mingw32*)
SYS=mingw32 SYS=mingw32
AC_CHECK_TOOL(WINDRES, windres, :) AC_CHECK_TOOL(WINDRES, windres, :)
LIB_MPEG_TS="-lws2_32" LIB_MPEG_TS="${LIB_MPEG_TS} -lws2_32"
LIB_RC="-lws2_32" LIB_RC="${LIB_RC} -lws2_32"
;; ;;
x*nto*) x*nto*)
SYS=nto SYS=nto
...@@ -824,10 +824,10 @@ AC_ARG_WITH(mad, ...@@ -824,10 +824,10 @@ AC_ARG_WITH(mad,
[ --with-mad[=PATH] libmad module (default disabled)], [ --with-mad[=PATH] libmad module (default disabled)],
[ if test "x$with_val" != "xno"; then [ if test "x$with_val" != "xno"; then
if test -n $with_val; then if test -n $with_val; then
CFLAGS_MAD="-I$with_val/include" CFLAGS_MAD="${CFLAGS_MAD} -I$with_val/include"
LIB_MAD="-L$with_val/lib -lmad" LIB_MAD="${LIB_MAD} -L$with_val/lib -lmad"
else else
LIB_MAD="-lmad" LIB_MAD="${LIB_MAD} -lmad"
fi fi
save_CFLAGS=$CFLAGS save_CFLAGS=$CFLAGS
save_LDFLAGS=$LDFLAGS save_LDFLAGS=$LDFLAGS
...@@ -881,8 +881,8 @@ AC_ARG_ENABLE(esd, ...@@ -881,8 +881,8 @@ AC_ARG_ENABLE(esd,
if test x${ESD_CONFIG} != xno if test x${ESD_CONFIG} != xno
then then
PLUGINS="${PLUGINS} esd" PLUGINS="${PLUGINS} esd"
CFLAGS_ESD="`${ESD_CONFIG} --cflags`" CFLAGS_ESD="${CFLAGS_ESD} `${ESD_CONFIG} --cflags`"
LIB_ESD="`${ESD_CONFIG} --libs`" LIB_ESD="${LIB_ESD} `${ESD_CONFIG} --libs`"
fi fi
fi]) fi])
...@@ -897,8 +897,8 @@ AC_ARG_ENABLE(arts, ...@@ -897,8 +897,8 @@ AC_ARG_ENABLE(arts,
if test x${ARTS_CONFIG} != xno if test x${ARTS_CONFIG} != xno
then then
PLUGINS="${PLUGINS} arts" PLUGINS="${PLUGINS} arts"
CFLAGS_ARTS="`${ARTS_CONFIG} --cflags`" CFLAGS_ARTS="${CFLAGS_ARTS} `${ARTS_CONFIG} --cflags`"
LIB_ARTS="`${ARTS_CONFIG} --libs `" LIB_ARTS="${LIB_ARTS} `${ARTS_CONFIG} --libs `"
fi fi
fi]) fi])
...@@ -910,14 +910,14 @@ AC_ARG_ENABLE(macosx, ...@@ -910,14 +910,14 @@ AC_ARG_ENABLE(macosx,
[if test x$enable_macosx = xyes [if test x$enable_macosx = xyes
then then
BUILTINS="${BUILTINS} macosx" BUILTINS="${BUILTINS} macosx"
LIB_MACOSX="-framework CoreAudio -framework Cocoa -framework AGL -framework QuickTime -lobjc" LIB_MACOSX="${LIB_MACOSX} -framework CoreAudio -framework Cocoa -framework AGL -framework QuickTime -lobjc"
CFLAGS_MACOSX="-ObjC" CFLAGS_MACOSX="${CFLAGS_MACOSX} -ObjC"
LIB="${LIB} -ObjC" LIB="${LIB} -ObjC"
fi], fi],
[AC_CHECK_HEADERS(Cocoa/Cocoa.h, [AC_CHECK_HEADERS(Cocoa/Cocoa.h,
BUILTINS="${BUILTINS} macosx" BUILTINS="${BUILTINS} macosx"
LIB_MACOSX="-framework CoreAudio -framework Cocoa -framework AGL -framework QuickTime -lobjc" LIB_MACOSX="${LIB_MACOSX} -framework CoreAudio -framework Cocoa -framework AGL -framework QuickTime -lobjc"
CFLAGS_MACOSX="-ObjC" CFLAGS_MACOSX="${CFLAGS_MACOSX} -ObjC"
LIB="${LIB} -ObjC" LIB="${LIB} -ObjC"
)]) )])
...@@ -930,7 +930,7 @@ AC_ARG_ENABLE(qnx, ...@@ -930,7 +930,7 @@ AC_ARG_ENABLE(qnx,
then then
AC_CHECK_HEADERS(Ph.h, [ AC_CHECK_HEADERS(Ph.h, [
PLUGINS="${PLUGINS} qnx" PLUGINS="${PLUGINS} qnx"
LIB_QNX="-lasound -lph" LIB_QNX="${LIB_QNX} -lasound -lph"
]) ])
fi fi
...@@ -964,9 +964,9 @@ AC_ARG_WITH(ggi, ...@@ -964,9 +964,9 @@ AC_ARG_WITH(ggi,
PLUGINS="${PLUGINS} ggi" PLUGINS="${PLUGINS} ggi"
if test "x$withval" != "xyes" if test "x$withval" != "xyes"
then then
LIB_GGI="-l"$withval LIB_GGI="${LIB_GGI} -l$withval"
else else
LIB_GGI="-lggi" LIB_GGI="${LIB_GGI} -lggi"
fi fi
fi ]) fi ])
...@@ -1001,8 +1001,8 @@ then ...@@ -1001,8 +1001,8 @@ then
if test x${SDL_CONFIG} != xno if test x${SDL_CONFIG} != xno
then then
PLUGINS="${PLUGINS} sdl" PLUGINS="${PLUGINS} sdl"
CFLAGS_SDL="`${SDL_CONFIG} --cflags`" CFLAGS_SDL="${CFLAGS_SDL} `${SDL_CONFIG} --cflags`"
LIB_SDL="`${SDL_CONFIG} --libs | sed 's,-rdynamic,,'`" LIB_SDL="${LIB_SDL} `${SDL_CONFIG} --libs | sed 's,-rdynamic,,'`"
save_CPPFLAGS=$CPPFLAGS save_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $CFLAGS_SDL" CPPFLAGS="$CPPFLAGS $CFLAGS_SDL"
AC_CHECK_HEADERS(${SDL_HEADER}, AC_DEFINE_UNQUOTED(SDL_INCLUDE_FILE, AC_CHECK_HEADERS(${SDL_HEADER}, AC_DEFINE_UNQUOTED(SDL_INCLUDE_FILE,
...@@ -1041,13 +1041,13 @@ then ...@@ -1041,13 +1041,13 @@ then
then then
AC_CHECK_HEADERS(directx.h, AC_CHECK_HEADERS(directx.h,
[ PLUGINS="${PLUGINS} directx" [ PLUGINS="${PLUGINS} directx"
LIB_DIRECTX="-lgdi32" ]) LIB_DIRECTX="${LIB_DIRECTX} -lgdi32" ])
else else
AC_MSG_CHECKING(for directX headers in ${withval}) AC_MSG_CHECKING(for directX headers in ${withval})
if test -f ${withval}/include/directx.h if test -f ${withval}/include/directx.h
then then
PLUGINS="${PLUGINS} directx" PLUGINS="${PLUGINS} directx"
LIB_DIRECTX="-L${withval}/lib -lgdi32" LIB_DIRECTX="${LIB_DIRECTX} -L${withval}/lib -lgdi32"
INCLUDE="${INCLUDE} -I${withval}/include" INCLUDE="${INCLUDE} -I${withval}/include"
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
else else
...@@ -1058,6 +1058,16 @@ then ...@@ -1058,6 +1058,16 @@ then
fi fi
fi fi
dnl
dnl Windows MFC interface module
dnl
AC_ARG_ENABLE(win32,
[ --enable-win32 Windows DirectX support (default disabled)])
if test "x$enableval" = "xyes"
then
PLUGINS="${PLUGINS} win32"
fi
dnl dnl
dnl Glide module dnl Glide module
dnl