aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorLionel Ulmer2002-05-25 18:35:56 +0000
committerLionel Ulmer2002-05-25 18:35:56 +0000
commit7b2cb2b0e957b5bb3bf4ed2486d4b029f6ef79f2 (patch)
treee684c09c75ff4317a7446318783f7ccefee907a5 /Makefile
parentf7c69ad830b74986a8579404e36cf1fd3df19fe5 (diff)
downloadscummvm-rg350-7b2cb2b0e957b5bb3bf4ed2486d4b029f6ef79f2.tar.gz
scummvm-rg350-7b2cb2b0e957b5bb3bf4ed2486d4b029f6ef79f2.tar.bz2
scummvm-rg350-7b2cb2b0e957b5bb3bf4ed2486d4b029f6ef79f2.zip
Fix a little bit the Makefile to not have both UNIX and UNIX_X11
defined when building the X11 driver. svn-id: r4382
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 04998a0298..97b2ef7fc9 100644
--- a/Makefile
+++ b/Makefile
@@ -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 @@ LIBS = -lncurses
OBJS = sdl.o
INCLUDE += `sdl-config --cflags`
LIBS += `sdl-config --libs`
+DEFINES += -DUNIX
# Uncomment this if you rather want X11 output
# OBJS = x11.o