Removed svgalib
This commit is contained in:
jsalmon3
parent
4f3b7a8fca
commit
7321981f85
9 changed files with 6 additions and 1434 deletions
|
|
@ -61,12 +61,6 @@ SDL = -DUSE_SDL -DUSE_SDLA $(SDL_CFLAGS)
|
|||
VIDEO = -DUSE_X11
|
||||
VIDEOLIB = -lXext -lX11 -ldl
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
# Uncomment th next to get svgalib support.
|
||||
|
||||
#VIDEO = -DUSE_SVGALIB
|
||||
#VIDEOLIB = -lvga -lm -ldl
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
# Uncomment one of the next for the SDL support.
|
||||
|
||||
|
|
@ -75,11 +69,6 @@ VIDEOLIB = -lXext -lX11 -ldl
|
|||
#VIDEO = $(SDL)
|
||||
#VIDEOLIB = $(SDLLIB)
|
||||
|
||||
# Uncomment the next for the SDL X11/SVGALIB support.
|
||||
|
||||
#VIDEO = $(SDL)
|
||||
#VIDEOLIB = $(SDLLIB) -lXext -lX11 -lXxf86dga -lXxf86vm -lvga -lvgagl -ldl -lesd -lm -lslang -lgpm
|
||||
|
||||
# Uncomment the next for the win32/cygwin support. (not working?)
|
||||
|
||||
#VIDEO = -DUSE_WIN32 $(SDL)
|
||||
|
|
@ -196,9 +185,6 @@ OBJDIR=.
|
|||
#EXE=.exe
|
||||
#OBJDIR=.
|
||||
|
||||
## architecture-dependant objects
|
||||
#ARCHOBJS=stdmman.$(OE) svgalib.$(OE) unix_lib.$(OE) bitm_lnx.$(OE)
|
||||
|
||||
## include flags
|
||||
IFLAGS= -I$(TOPDIR)/src/include $(XIFLAGS) -I$(TOPDIR)/src/movie/vp31/include
|
||||
## define flags
|
||||
|
|
|
|||
|
|
@ -105,7 +105,7 @@ dnl [ --enable-optimization [Enable detection of optimization flags (defau
|
|||
dnl FIXME: todo
|
||||
|
||||
AC_ARG_WITH(client,
|
||||
[ --with-client=sdl,x11,svgalib
|
||||
[ --with-client=sdl,x11
|
||||
[Select which client (default: sdl)]])
|
||||
THREAD_LIBS=
|
||||
if test "$with_client" = "x11"; then
|
||||
|
|
@ -117,9 +117,6 @@ if test "$with_client" = "x11"; then
|
|||
else
|
||||
THREAD_LIBS="-lpthread"
|
||||
fi
|
||||
elif test "$with_client" = "svgalib"; then
|
||||
VIDEO_CFLAGS="-DUSE_SVGALIB"
|
||||
VIDEO_LIBS="-lvga"
|
||||
else
|
||||
AC_CHECK_HEADERS(SDL/SDL.h,, AC_MSG_ERROR(could not find SDL/SDL.h))
|
||||
VIDEO_CFLAGS="-DUSE_SDL -DUSE_SDLA `sdl-config --cflags`"
|
||||
|
|
|
|||
39
setup
39
setup
|
|
@ -433,17 +433,6 @@ fi
|
|||
|
||||
if [ "$BEOS" != "1" ] ; then
|
||||
|
||||
if [ "$DARWIN" != "1" ] && [ "$WIN32" != "1" ] ; then
|
||||
# Check for SVGALIB
|
||||
LIBCHECK="-lvga -lvgagl"
|
||||
check_for_libs
|
||||
if test "$?" = 0 ; then
|
||||
HAVESVGA=1
|
||||
else
|
||||
echo "...You do not appear to have SVGALIB installed"
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "$WIN32" = 0 ; then
|
||||
echo
|
||||
echo "VIDEO DRIVER OPTIONS"
|
||||
|
|
@ -452,12 +441,6 @@ if test "$WIN32" = 0 ; then
|
|||
if test "$HAVESDL" = 1 ; then
|
||||
echo " S - SDL Support"
|
||||
fi
|
||||
if test "$HAVESVGA" = 1 ; then
|
||||
echo " V - SVGALIB Support"
|
||||
fi
|
||||
if (test "$HAVESVGA" = 1 && test "$HAVESDL" = 1) ; then
|
||||
echo " B - SDL/SVGALIB Support"
|
||||
fi
|
||||
echo
|
||||
echo -n "Please enter selection: (s) "
|
||||
read $N VIDSEL
|
||||
|
|
@ -480,25 +463,6 @@ fi
|
|||
|
||||
echo "# Video support" >> $RULESFILE
|
||||
case $VIDSEL in
|
||||
[vV])
|
||||
echo "-> Using SVGALIB"
|
||||
echo "VIDEO = -DUSE_SVGALIB" >> $RULESFILE
|
||||
echo "VIDEOLIB = -lvga $DL" >> $RULESFILE
|
||||
;;
|
||||
|
||||
[bB])
|
||||
echo "-> Using SDL/SVGALIB"
|
||||
USESDL=1
|
||||
SDLLIB="\$(shell $SDL_CONFIG --libs)"
|
||||
echo "SDL = -DUSE_SDL -DUSE_SDLA \$(SDL_CFLAGS)" >> $RULESFILE
|
||||
echo "SDL_CFLAGS = \$(shell $SDL_CONFIG --cflags)" >> $RULESFILE
|
||||
echo "SDLLIB = $SDLLIB" >> $RULESFILE
|
||||
echo >> $RULESFILE
|
||||
echo "VIDEO = \$(SDL)" >> $RULESFILE
|
||||
echo "VIDEOLIB = \$(SDLLIB) -lvga -lvgagl $DL" >> $RULESFILE
|
||||
echo
|
||||
;;
|
||||
|
||||
[xX])
|
||||
echo "-> Using X11"
|
||||
echo "VIDEO = -DUSE_X11" >> $RULESFILE
|
||||
|
|
@ -1085,9 +1049,6 @@ fi
|
|||
#------------------------------------------------------------------------------
|
||||
# architecture-dependent objects
|
||||
|
||||
echo >> $RULESFILE
|
||||
echo "#ARCHOBJS=stdmman.\$(OE) svgalib.\$(OE) unix_lib.\$(OE) bitm_lnx.\$(OE)" >> $RULESFILE
|
||||
|
||||
# include flags
|
||||
echo "IFLAGS= -I\$(TOPDIR)/src/include \$(XIFLAGS) -I\$(TOPDIR)/src/movie/vp31/include" >> $RULESFILE
|
||||
|
||||
|
|
|
|||
|
|
@ -45,7 +45,6 @@
|
|||
#define noUSE_SDL /// Remove no for sdl support
|
||||
#define noUSE_SDLA /// Remove no for sdl audio support
|
||||
#define noUSE_X11 /// Remove no for x11 support
|
||||
#define noUSE_SVGALIB /// Remove no for svgalib support
|
||||
#define noUSE_WINCE /// Remove no for win-ce video support
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -919,9 +919,6 @@ global void InitCcl(void)
|
|||
#ifdef USE_X11
|
||||
gh_define("stratagus-feature-x11", SCM_BOOL_T);
|
||||
#endif
|
||||
#ifdef USE_SVGALIB
|
||||
gh_define("stratagus-feature-svgalib", SCM_BOOL_T);
|
||||
#endif
|
||||
#ifdef WITH_SOUND
|
||||
gh_define("stratagus-feature-with-sound", SCM_BOOL_T);
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -1184,9 +1184,6 @@ local void PrintHeader(void)
|
|||
#ifdef USE_ZZIPLIB
|
||||
"ZZIPLIB "
|
||||
#endif
|
||||
#ifdef USE_SVGALIB
|
||||
"SVGALIB "
|
||||
#endif
|
||||
#ifdef USE_SDL
|
||||
"SDL "
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
SRC += src/video/X11.c src/video/cursor.c src/video/deco.c src/video/font.c src/video/graphic.c src/video/linedraw.c src/video/new_X11.c src/video/png.c src/video/sdl.c src/video/sprite.c src/video/svgalib.c src/video/sweepline.c src/video/video.c src/video/wince.c
|
||||
SRC += src/video/X11.c src/video/cursor.c src/video/deco.c src/video/font.c src/video/graphic.c src/video/linedraw.c src/video/new_X11.c src/video/png.c src/video/sdl.c src/video/sprite.c src/video/sweepline.c src/video/video.c src/video/wince.c
|
||||
HDRS += src/video/intern_video.h src/video/sweepline.h
|
||||
OBJ += src/video/$(OBJDIR)/X11.o src/video/$(OBJDIR)/cursor.o src/video/$(OBJDIR)/deco.o src/video/$(OBJDIR)/font.o src/video/$(OBJDIR)/graphic.o src/video/$(OBJDIR)/linedraw.o src/video/$(OBJDIR)/new_X11.o src/video/$(OBJDIR)/png.o src/video/$(OBJDIR)/sdl.o src/video/$(OBJDIR)/sprite.o src/video/$(OBJDIR)/svgalib.o src/video/$(OBJDIR)/sweepline.o src/video/$(OBJDIR)/video.o src/video/$(OBJDIR)/wince.o
|
||||
OBJ += src/video/$(OBJDIR)/X11.o src/video/$(OBJDIR)/cursor.o src/video/$(OBJDIR)/deco.o src/video/$(OBJDIR)/font.o src/video/$(OBJDIR)/graphic.o src/video/$(OBJDIR)/linedraw.o src/video/$(OBJDIR)/new_X11.o src/video/$(OBJDIR)/png.o src/video/$(OBJDIR)/sdl.o src/video/$(OBJDIR)/sprite.o src/video/$(OBJDIR)/sweepline.o src/video/$(OBJDIR)/video.o src/video/$(OBJDIR)/wince.o
|
||||
MISC += src/video/_clip_rectangle
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -129,28 +129,18 @@
|
|||
#ifdef USE_X11
|
||||
#define UseX11 1
|
||||
#define UseSdl 0
|
||||
#define UseSVGALib 0
|
||||
#define UseWin32 0
|
||||
#endif
|
||||
|
||||
#ifdef USE_SDL
|
||||
#define UseX11 0
|
||||
#define UseSdl 1
|
||||
#define UseSVGALib 0
|
||||
#define UseWin32 0
|
||||
#endif
|
||||
|
||||
#ifdef USE_SVGALIB
|
||||
#define UseX11 0
|
||||
#define UseSdl 0
|
||||
#define UseSVGALib 1
|
||||
#define UseWin32 0
|
||||
#endif
|
||||
|
||||
#ifdef noUSE_WIN32
|
||||
#define UseX11 0
|
||||
#define UseSdl 0
|
||||
#define UseSVGALib 0
|
||||
#define UseWin32 1
|
||||
#endif
|
||||
|
||||
|
|
@ -1343,11 +1333,6 @@ global unsigned long GetTicks(void)
|
|||
|
||||
return X11GetTicks();
|
||||
#endif
|
||||
#if UseSVGALib
|
||||
extern unsigned long SVGAGetTicks(void);
|
||||
|
||||
return SVGAGetTicks();
|
||||
#endif
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -1360,8 +1345,6 @@ global void InitVideo(void)
|
|||
InitVideoSdl();
|
||||
} else if (UseX11) {
|
||||
InitVideoX11();
|
||||
} else if (UseSVGALib) {
|
||||
InitVideoSVGA();
|
||||
} else if (UseWin32) {
|
||||
InitVideoWin32();
|
||||
} else {
|
||||
|
|
@ -1376,14 +1359,10 @@ global void InitVideo(void)
|
|||
#if UseX11
|
||||
InitVideoX11();
|
||||
#else
|
||||
#if UseSVGALib
|
||||
InitVideoSVGA();
|
||||
#if UseWin32
|
||||
InitVideoWin32();
|
||||
#else
|
||||
#if UseWin32
|
||||
InitVideoWin32();
|
||||
#else
|
||||
abort();
|
||||
#endif
|
||||
abort();
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Reference in a new issue