[Scummvm-cvs-logs] CVS: scummvm Makefile,1.43,1.44

Lionel Ulmer bbrox at users.sourceforge.net
Sat May 25 11:36:04 CEST 2002


Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv5737

Modified Files:
	Makefile 
Log Message:
Fix a little bit the Makefile to not have both UNIX and UNIX_X11
defined when building the X11 driver.



Index: Makefile
===================================================================
RCS file: /cvsroot/scummvm/scummvm/Makefile,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- Makefile	16 May 2002 18:45:58 -0000	1.43
+++ Makefile	25 May 2002 18:35:56 -0000	1.44
@@ -2,7 +2,7 @@
 
 CC       = g++
 CFLAGS   = -g -O -Wall -Wstrict-prototypes -Wuninitialized -Wno-long-long -Wno-multichar
-DEFINES  = -DUNIX
+DEFINES  =
 LDFLAGS :=
 INCLUDES:= `sdl-config --cflags` -I./ -I./sound
 LIBS	 = -lncurses
@@ -23,6 +23,7 @@
 OBJS	 = sdl.o
 INCLUDE += `sdl-config --cflags`
 LIBS    += `sdl-config --libs`
+DEFINES += -DUNIX
 
 # Uncomment this if you rather want X11 output
 # OBJS     = x11.o





More information about the Scummvm-git-logs mailing list