aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorNicolas Noble2002-05-16 06:46:50 +0000
committerNicolas Noble2002-05-16 06:46:50 +0000
commit5edf1e6d7f9ca5ce8fa4e6ded69adff61c60ab50 (patch)
treecb82f69a3dfa64011f81e85333b5a303261d3c00 /Makefile
parent4f24f91f8c47d2f91233cc41057c808aa3f0df9f (diff)
downloadscummvm-rg350-5edf1e6d7f9ca5ce8fa4e6ded69adff61c60ab50.tar.gz
scummvm-rg350-5edf1e6d7f9ca5ce8fa4e6ded69adff61c60ab50.tar.bz2
scummvm-rg350-5edf1e6d7f9ca5ce8fa4e6ded69adff61c60ab50.zip
Added an ALSA sequencer support. Updated readme.txt to explain it, and
Makefile to allow the user to enable it. I also reorganised the Makefile a bit, since there is now one more optionnal library. BBrox, I also merged your Makefile.x11 in it, just take a look at it! svn-id: r4341
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile36
1 files changed, 29 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index de431fe47d..bb75ac6a2f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,16 +1,38 @@
# $Header$
-CC = g++
-CFLAGS = -g -O -Wall -Wstrict-prototypes -Wuninitialized -Wno-long-long -Wno-multichar
-DEFINES = -DUNIX
+CC = g++
+CFLAGS = -g -O -Wall -Wstrict-prototypes -Wuninitialized -Wno-long-long -Wno-multichar
+DEFINES = -DUNIX
LDFLAGS :=
INCLUDES:= `sdl-config --cflags` -I./ -I./sound
-CPPFLAGS= $(DEFINES) $(INCLUDES)
+LIBS = -lncurses
+
+# Uncomment this to activate the MAD lib for compressed sound files
+# DEFINES += -DCOMPRESSED_SOUND_FILE
+# LIBS += -lmad
+
+# Uncomment this to activate the ALSA lib for midi
+# DEFINES += -DUSE_ALSA
+# LIBS += -lasound
+
-# Add -lmad for -DCOMPRESSED_SOUND_FILE
-LIBS = `sdl-config --libs` -lncurses
+# Now, please choose a graphical output system between SDL and X11.
+# Beware, only define one of them, otherwise the compilation will blow up.
-OBJS = sdl.o
+# Comment this if you want to disable SDL output
+OBJS = sdl.o
+INCLUDE += `sdl-config --cflags`
+LIBS += `sdl-config --libs`
+
+# Uncomment this if you rather want X11 output
+# OBJS = x11.o
+# DEFINES += -DUNIX_X11
+# LDFLAGS := -L/usr/X11R6/lib -L/usr/local/lib
+# INCLUDES+= -I/usr/X11R6/include
+# LIBS += -lpthread
+
+
+CPPFLAGS= $(DEFINES) $(INCLUDES)
include Makefile.common