[Scummvm-cvs-logs] CVS: residual Makefile,1.7,1.8 bits.h,1.6,1.7

[Jonathan Gray]

Update of /cvsroot/scummvm/residual
In directory sc8-pr-cvs1:/tmp/cvs-serv16487

Modified Files:
	Makefile bits.h 
Log Message:
fix compilation

Index: Makefile
===================================================================
RCS file: /cvsroot/scummvm/residual/Makefile,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Makefile	12 Dec 2003 08:53:30 -0000	1.7
+++ Makefile	12 Dec 2003 09:53:29 -0000	1.8
@@ -1,8 +1,7 @@
 CXX = g++
-CXXFLAGS = -g -W -Wall -Ilua/include `sdl-config --cflags` # -O2
+CXXFLAGS = -g -W -Wall -Ilua/include `sdl-config --cflags` -DUNIX # -O2
 LDFLAGS = -g -W -Wall # -O2
 LIBS = -lSDL -lGL -lGLU -Llua/lib -llua -llualib `sdl-config --libs`
-
 OBJS = main.o lab.o bitmap.o model.o resource.o material.o debug.o \
 	textsplit.o lua.o registry.o localize.o scene.o engine.o actor.o \
 	sound.o mixer.o keyframe.o costume.o walkplane.o textobject.o \

Index: bits.h
===================================================================
RCS file: /cvsroot/scummvm/residual/bits.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- bits.h	12 Dec 2003 08:39:07 -0000	1.6
+++ bits.h	12 Dec 2003 09:53:29 -0000	1.7
@@ -96,16 +96,16 @@
 	#ifdef X11_BACKEND
 
 	// You need to set this manually if necessary
-//	#define SCUMM_LITTLE_ENDIAN
+//	#define SYSTEM_LITTLE_ENDIAN
 	
 	#else
 	/* need this for the SDL_BYTEORDER define */
 	#include <SDL_byteorder.h>
 
 	#if SDL_BYTEORDER == SDL_LIL_ENDIAN
-	#define SCUMM_LITTLE_ENDIAN
+	#define SYSTEM_LITTLE_ENDIAN
 	#elif SDL_BYTEORDER == SDL_BIG_ENDIAN
-	#define SCUMM_BIG_ENDIAN
+	#define SYSTEM_BIG_ENDIAN
 	#else
 	#error Neither SDL_BIG_ENDIAN nor SDL_LITTLE_ENDIAN is set.
 	#endif