[Scummvm-cvs-logs] CVS: residual Makefile,1.18,1.19 bits.h,1.14,1.15

[Joost Peters]

Update of /cvsroot/scummvm/residual
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18556

Modified Files:
	Makefile bits.h 
Log Message:
detect and define MACOSX


Index: Makefile
===================================================================
RCS file: /cvsroot/scummvm/residual/Makefile,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- Makefile	5 Apr 2004 02:00:33 -0000	1.18
+++ Makefile	2 May 2004 11:34:40 -0000	1.19
@@ -9,9 +9,6 @@
 # Comment this out for Mac OS X ...
 LIBS += -lGL -lGLU
 
-# ... and instead uncomment this if you are on Mac OS X
-#CXXFLAGS += -DMACOSX
-
 include Makefile.common
 
 .PHONY: lua-build lua-clean

Index: bits.h
===================================================================
RCS file: /cvsroot/scummvm/residual/bits.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- bits.h	14 Mar 2004 15:36:21 -0000	1.14
+++ bits.h	2 May 2004 11:34:40 -0000	1.15
@@ -156,6 +156,10 @@
 	#define ROUND(x) rint(x)
 	#endif
 
+	#if defined(__APPLE__) && defined(__MACH__)
+	#define MACOSX
+	#endif
+	
 #elif defined(__MORPHOS__)
 	#define scumm_stricmp stricmp
 	#define scumm_strnicmp strnicmp