aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorMax Horn2002-07-25 21:34:06 +0000
committerMax Horn2002-07-25 21:34:06 +0000
commit9ad01eba91dcf6e232055610f1828f16d4393de9 (patch)
tree5eb6de539965959ec6ebb236a8923936adc8813a /Makefile
parent0ee70aae3a7f6b7b8a6f8b2b725e8605a4f4f623 (diff)
downloadscummvm-rg350-9ad01eba91dcf6e232055610f1828f16d4393de9.tar.gz
scummvm-rg350-9ad01eba91dcf6e232055610f1828f16d4393de9.tar.bz2
scummvm-rg350-9ad01eba91dcf6e232055610f1828f16d4393de9.zip
got rid of UNIX_X11 - instead, use UNIX + X11_BACKEND
svn-id: r4632
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile14
1 files changed, 7 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index 8434ab7cf9..9320484c29 100644
--- a/Makefile
+++ b/Makefile
@@ -8,8 +8,8 @@ INCLUDES:= -I./ -I./sound
LIBS = -lncurses
# Uncomment this to activate the MAD lib for compressed sound files
-#DEFINES += -DCOMPRESSED_SOUND_FILE
-#LIBS += -lmad
+# DEFINES += -DCOMPRESSED_SOUND_FILE
+# LIBS += -lmad
# Uncomment this to activate the ALSA lib for midi
# DEFINES += -DUSE_ALSA
@@ -25,10 +25,10 @@ LIBS += `sdl-config --libs`
DEFINES += -DUNIX
# Uncomment this (instead of the above) to activate the SDL with OpenGL output
-#OBJS = sdl_gl.o
-#INCLUDES += `sdl-config --cflags`
-#LIBS += `sdl-config --libs` -lGL
-#DEFINES += -DUNIX
+# OBJS = sdl_gl.o
+# INCLUDES += `sdl-config --cflags`
+# LIBS += `sdl-config --libs` -lGL
+# DEFINES += -DUNIX
# Uncomment this in addition to the above if you compile on Mac OS X
# LIBS += -framework QuickTime -framework AudioUnit
@@ -36,7 +36,7 @@ DEFINES += -DUNIX
# Uncomment this if you rather want X11 output
# OBJS = x11.o
-# DEFINES += -DUNIX_X11
+# DEFINES += -DUNIX -DX11_BACKEND
# LDFLAGS := -L/usr/X11R6/lib -L/usr/local/lib
# INCLUDES+= -I/usr/X11R6/include
# LIBS += -lpthread -lXext -lX11