[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Stratagus-CVS] stratagus ./Rules.make.orig ./configure.in ./se...
|
From: |
Jimmy Salmon |
|
Subject: |
[Stratagus-CVS] stratagus ./Rules.make.orig ./configure.in ./se... |
|
Date: |
Wed, 15 Oct 2003 20:06:38 -0400 |
CVSROOT: /cvsroot/stratagus
Module name: stratagus
Branch:
Changes by: Jimmy Salmon <address@hidden> 03/10/15 20:06:37
Modified files:
. : Rules.make.orig configure.in setup
contrib : msvc.zip
src/clone : ccl.c clone.c
src/include : stratagus.h
src/video : Module.make video.c
Removed files:
src/video : svgalib.c
Log message:
Removed svgalib
Patches:
Index: stratagus/Rules.make.orig
diff -u stratagus/Rules.make.orig:1.148 stratagus/Rules.make.orig:1.149
--- stratagus/Rules.make.orig:1.148 Thu Jul 3 13:48:47 2003
+++ stratagus/Rules.make.orig Wed Oct 15 20:06:36 2003
@@ -21,7 +21,7 @@
## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
## GNU General Public License for more details.
##
-## $Id: Rules.make.orig,v 1.148 2003/07/03 17:48:47 ingo Exp $
+## $Id: Rules.make.orig,v 1.149 2003/10/16 00:06:36 jsalmon3 Exp $
##
############################################################################
@@ -62,12 +62,6 @@
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.
# Uncomment the next for the generic SDL support.
@@ -75,11 +69,6 @@
#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)
@@ -195,9 +184,6 @@
#OE=o
#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
Index: stratagus/configure.in
diff -u stratagus/configure.in:1.27 stratagus/configure.in:1.28
--- stratagus/configure.in:1.27 Tue Oct 7 08:03:34 2003
+++ stratagus/configure.in Wed Oct 15 20:06:36 2003
@@ -105,7 +105,7 @@
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 @@
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`"
Index: stratagus/contrib/msvc.zip
Index: stratagus/setup
diff -u stratagus/setup:1.154 stratagus/setup:1.155
--- stratagus/setup:1.154 Thu Jul 3 13:48:47 2003
+++ stratagus/setup Wed Oct 15 20:06:36 2003
@@ -23,7 +23,7 @@
## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
## GNU General Public License for more details.
##
-## $Id: setup,v 1.154 2003/07/03 17:48:47 ingo Exp $
+## $Id: setup,v 1.155 2003/10/16 00:06:36 jsalmon3 Exp $
##
##-----------------------------------------------------------------------------
## HERE ARE SOME USER-CONFIGURABLE VARIABLES
@@ -433,17 +433,6 @@
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 "$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 @@
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
@@ -1084,9 +1048,6 @@
#------------------------------------------------------------------------------
# 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
Index: stratagus/src/clone/ccl.c
diff -u stratagus/src/clone/ccl.c:1.114 stratagus/src/clone/ccl.c:1.115
--- stratagus/src/clone/ccl.c:1.114 Thu Oct 9 16:54:35 2003
+++ stratagus/src/clone/ccl.c Wed Oct 15 20:06:37 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: ccl.c,v 1.114 2003/10/09 20:54:35 jsalmon3 Exp $
+// $Id: ccl.c,v 1.115 2003/10/16 00:06:37 jsalmon3 Exp $
//@{
@@ -919,9 +919,6 @@
#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
@@ -1028,7 +1025,7 @@
}
fprintf(fd, ";;; -----------------------------------------\n");
- fprintf(fd, ";;; $Id: ccl.c,v 1.114 2003/10/09 20:54:35 jsalmon3 Exp $\n");
+ fprintf(fd, ";;; $Id: ccl.c,v 1.115 2003/10/16 00:06:37 jsalmon3 Exp $\n");
fprintf(fd, "(set-video-resolution! %d %d)\n", VideoWidth, VideoHeight);
@@ -1053,7 +1050,7 @@
}
fprintf(fd, ";;; -----------------------------------------\n");
- fprintf(fd, ";;; $Id: ccl.c,v 1.114 2003/10/09 20:54:35 jsalmon3 Exp $\n");
+ fprintf(fd, ";;; $Id: ccl.c,v 1.115 2003/10/16 00:06:37 jsalmon3 Exp $\n");
// Global options
if (OriginalFogOfWar) {
@@ -1163,7 +1160,7 @@
extern SCM oblistvar;
CLprintf(file, "\n;;; -----------------------------------------\n");
- CLprintf(file, ";;; MODULE: CCL $Id: ccl.c,v 1.114 2003/10/09 20:54:35
jsalmon3 Exp $\n\n");
+ CLprintf(file, ";;; MODULE: CCL $Id: ccl.c,v 1.115 2003/10/16 00:06:37
jsalmon3 Exp $\n\n");
for (list = oblistvar; gh_list_p(list); list = gh_cdr(list)) {
SCM sym;
Index: stratagus/src/clone/clone.c
diff -u stratagus/src/clone/clone.c:1.211 stratagus/src/clone/clone.c:1.212
--- stratagus/src/clone/clone.c:1.211 Thu Oct 9 19:28:38 2003
+++ stratagus/src/clone/clone.c Wed Oct 15 20:06:37 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: clone.c,v 1.211 2003/10/09 23:28:38 mr-russ Exp $
+// $Id: clone.c,v 1.212 2003/10/16 00:06:37 jsalmon3 Exp $
//@{
@@ -1183,9 +1183,6 @@
#endif
#ifdef USE_ZZIPLIB
"ZZIPLIB "
-#endif
-#ifdef USE_SVGALIB
- "SVGALIB "
#endif
#ifdef USE_SDL
"SDL "
Index: stratagus/src/include/stratagus.h
diff -u stratagus/src/include/stratagus.h:1.18
stratagus/src/include/stratagus.h:1.19
--- stratagus/src/include/stratagus.h:1.18 Tue Oct 7 08:03:40 2003
+++ stratagus/src/include/stratagus.h Wed Oct 15 20:06:37 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: stratagus.h,v 1.18 2003/10/07 12:03:40 martinxyz Exp $
+// $Id: stratagus.h,v 1.19 2003/10/16 00:06:37 jsalmon3 Exp $
#ifndef __STRATAGUS_H__
#define __STRATAGUS_H__
@@ -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
/**
Index: stratagus/src/video/Module.make
diff -u stratagus/src/video/Module.make:1.1 stratagus/src/video/Module.make:1.2
--- stratagus/src/video/Module.make:1.1 Fri Nov 29 15:58:18 2002
+++ stratagus/src/video/Module.make Wed Oct 15 20:06:37 2003
@@ -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
Index: stratagus/src/video/video.c
diff -u stratagus/src/video/video.c:1.66 stratagus/src/video/video.c:1.67
--- stratagus/src/video/video.c:1.66 Tue Oct 7 20:06:44 2003
+++ stratagus/src/video/video.c Wed Oct 15 20:06:37 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: video.c,v 1.66 2003/10/08 00:06:44 jsalmon3 Exp $
+// $Id: video.c,v 1.67 2003/10/16 00:06:37 jsalmon3 Exp $
//@{
@@ -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 @@
return X11GetTicks();
#endif
-#if UseSVGALib
- extern unsigned long SVGAGetTicks(void);
-
- return SVGAGetTicks();
-#endif
}
/**
@@ -1360,8 +1345,6 @@
InitVideoSdl();
} else if (UseX11) {
InitVideoX11();
- } else if (UseSVGALib) {
- InitVideoSVGA();
} else if (UseWin32) {
InitVideoWin32();
} else {
@@ -1376,14 +1359,10 @@
#if UseX11
InitVideoX11();
#else
- #if UseSVGALib
- InitVideoSVGA();
+ #if UseWin32
+ InitVideoWin32();
#else
- #if UseWin32
- InitVideoWin32();
- #else
- abort();
- #endif
+ abort();
#endif
#endif
#endif
- [Stratagus-CVS] stratagus ./Rules.make.orig ./configure.in ./se...,
Jimmy Salmon <=