[Scummvm-cvs-logs] CVS: residual Makefile,1.9,1.10 bits.h,1.9,1.10 lua.cpp,1.35,1.36

[Eugene Sandulenko]

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

Modified Files:
	Makefile bits.h lua.cpp 
Log Message:
o Portability fixes


Index: Makefile
===================================================================
RCS file: /cvsroot/scummvm/residual/Makefile,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- Makefile	12 Dec 2003 23:06:19 -0000	1.9
+++ Makefile	18 Dec 2003 22:54:01 -0000	1.10
@@ -1,7 +1,7 @@
 CXX = g++
 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` \
+LIBS = -lGL -lGLU -Llua/lib -llua -llualib `sdl-config --libs` \
 	-Lmixer -lmixer
 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 \

Index: bits.h
===================================================================
RCS file: /cvsroot/scummvm/residual/bits.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- bits.h	18 Dec 2003 08:58:57 -0000	1.9
+++ bits.h	18 Dec 2003 22:54:01 -0000	1.10
@@ -40,6 +40,9 @@
 template<typename T> inline T MIN (T a, T b)	{ return (a<b) ? a : b; }
 template<typename T> inline T MAX (T a, T b)	{ return (a>b) ? a : b; }
 
+// Default definition. See _MSVC_VER & FreeBSD for OS specific stuff
+#define ROUND(x) round(x)
+
 #if defined(_MSC_VER)
 
 	#define snprintf _snprintf
@@ -69,6 +72,9 @@
 	#define END_PACK_STRUCTS	 pack(pop)
 	#define GCC_PACK
 
+	#undef ROUND
+	#define ROUND(x) (x)
+
 #elif defined(__MINGW32__)
 
 	#define CHECK_HEAP
@@ -145,6 +151,11 @@
 	#define END_PACK_STRUCTS	 pack ()
 	#define GCC_PACK
 	#define NORETURN
+	#endif
+
+	#ifdef __FreeBSD__
+	#undef ROUND
+	#define ROUND(x) rint(x)
 	#endif
 
 #elif defined(__MORPHOS__)

Index: lua.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/lua.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- lua.cpp	12 Dec 2003 21:17:31 -0000	1.35
+++ lua.cpp	18 Dec 2003 22:54:01 -0000	1.36
@@ -77,11 +77,8 @@
 
 static inline int check_int(int num) {
   double val = luaL_check_number(num);
-#ifndef _MSC_VER
-  return int(round(val));
-#else
-  return int(/*round*/(val));
-#endif
+
+  return int(ROUND(val));
 }
 
 static inline int check_control(int num) {