[Scummvm-cvs-logs] CVS: scummvm configure,1.25,1.26 Makefile.new,1.4,1.5
Jonathan Gray
khalek at users.sourceforge.net
Sat Jul 5 19:41:01 CEST 2003
Update of /cvsroot/scummvm/scummvm
In directory sc8-pr-cvs1:/tmp/cvs-serv7295
Modified Files:
configure Makefile.new
Log Message:
make Makefile.new not require build.rules
Index: configure
===================================================================
RCS file: /cvsroot/scummvm/scummvm/configure,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- configure 14 Jun 2003 08:16:10 -0000 1.25
+++ configure 6 Jul 2003 02:40:02 -0000 1.26
@@ -129,7 +129,7 @@
Configuration:
-h, --help display this help and exit
- --backend=BACKEND backend to build (sdl, x11, morphos, dc, gp32) [sdl]
+ --backend=BACKEND backend to build (sdl, sdlgl, x11, morphos, dc, gp32) [sdl]
Optional Features:
--disable-scumm don't build the SCUMM engine
@@ -265,14 +265,14 @@
echo $hosttype
case $hosttype in
Linux | OpenBSD | FreeBSD | NetBSD | BSD/OS | SunOS | HP-UX)
- _def_unix='/* #define UNIX */'
+ DEFINES="$DEFINES -DUNIX"
;;
IRIX)
- _def_unix='/* #define UNIX */'
+ DEFINES="$DEFINES -DUNIX"
ranlib=ar -r
;;
Darwin)
- _def_unix='/* #define UNIX */'
+ DEFINES="$DEFINES -DUNIX"
_def_macosx='#define MACOSX'
LIBS="$LIBS -framework QuickTime -framework AudioUnit"
;;
@@ -430,6 +430,36 @@
echo "$_backend"
echo
+#
+# Backend related stuff
+#
+case $_backend in
+ sdl)
+ INCLUDES="$INCLUDES `$_sdlconfig --cflags`"
+ LIBS="$LIBS `$_sdlconfig --libs`"
+ OBJS="$OBJS backends/sdl/sdl-common.o backends/sdl/sdl.o"
+ MODULES="$MODULES backends/sdl"
+ ;;
+ sdlgl)
+ INCLUDES="$INCLUDES `$_sdlconfig --cflags`"
+ LIBS="$LIBS `$_sdlconfig --libs` -lGL"
+ OBJS="$OBJS backends/sdl/sdl-common.o backends/sdl/sdl_gl.o"
+ MODULES="$MODULES backends/sdl"
+ ;;
+ x11)
+ INCLUDES="$INCLUDES -I/usr/X11R6/include"
+ LIBS="$LIBS -lpthread -lXext -lX11"
+ LDFLAGS="$LDFLAGS -L/usr/X11R6/lib -L/usr/local/lib"
+ OBJS="$OBJS backends/x11/x11.o"
+ DEFINES="$DEFINES -DX11_BACKEND"
+ MODULES="$MODULES backends/x11"
+ ;;
+ *)
+ echo "support for $_backend backend not implemented in configure script yet"
+ exit 1
+ ;;
+esac
+
echo "Creating config.h"
cat > config.h << EOF
/* This file is automatically generated by configure */
@@ -442,7 +472,6 @@
$_def_simon
$_def_sky
-$_def_unix
$_def_macosx
$_def_endianess
$_def_align
@@ -475,4 +504,8 @@
RANLIB := $_ranlib
BACKEND := $_backend
+MODULES += $MODULES
+INCLUDES += $INCLUDES
+OBJS += $OBJS
+DEFINES += $DEFINES
EOF
Index: Makefile.new
===================================================================
RCS file: /cvsroot/scummvm/scummvm/Makefile.new,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Makefile.new 2 Jun 2003 03:01:22 -0000 1.4
+++ Makefile.new 6 Jul 2003 02:40:02 -0000 1.5
@@ -27,9 +27,6 @@
# Load the make rules generated by configure
include config.mak
-# Load the build rules & settings for the chosen backend
--include build.rules
-
# Uncomment this for stricter compile time code verification
# CXXFLAGS+= -Wshadow -Werror
@@ -45,13 +42,13 @@
$(RM) $(ZIPFILE)
$(ZIP) $(ZIPFILE) $(DISTFILES)
-build.rules:
- $(CP) backends/$(BACKEND)/build.rules build.rules
-
deb:
ln -sf dists/debian;
debian/prepare
fakeroot debian/rules binary
+
+config.mak:
+ ./configure
# Special target to create a application wrapper for Mac OS X
bundle_name = ScummVM.app
More information about the Scummvm-git-logs
mailing list