aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.cvsignore1
-rw-r--r--Makefile2
-rw-r--r--backends/sdl/build.rules14
3 files changed, 9 insertions, 8 deletions
diff --git a/.cvsignore b/.cvsignore
index 4e0ae0f23c..3fa5527bec 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,3 @@
.deps
+build.rules
scummvm
diff --git a/Makefile b/Makefile
index c0699550ce..d8c0cad0de 100644
--- a/Makefile
+++ b/Makefile
@@ -34,4 +34,4 @@ dist:
# Until we add a nice configure tool, default to the SDL build rules
build.rules:
- ln -s backends/sdl/build.rules
+ cp backends/sdl/build.rules build.rules
diff --git a/backends/sdl/build.rules b/backends/sdl/build.rules
index 3bdb7b58ce..bc91d660ef 100644
--- a/backends/sdl/build.rules
+++ b/backends/sdl/build.rules
@@ -1,16 +1,16 @@
# Build settings for the SDL backend
MODULES += backends/sdl
-OBJS += backends/sdl/sdl.o
DEFINES += -DUNIX
INCLUDES += `sdl-config --cflags`
LIBS += `sdl-config --libs`
-# Uncomment this (instead of the above) to activate the SDL with OpenGL output
+# The normal (non OpenGL-accelerated) SDL backend
+OBJS += backends/sdl/sdl.o
+
+# Uncomment these lines (instead of the above) to use SDL with OpenGL
# OBJS += backends/sdl/sdl_gl.o
-# DEFINES += -DUNIX
-# INCLUDES += `sdl-config --cflags`
-# LIBS += `sdl-config --libs` -lGL
+# LIBS += -lGL
# Uncomment this in addition to the above if you compile on Mac OS X
-DEFINES += -DMACOSX
-LIBS += -framework QuickTime -framework AudioUnit
+# DEFINES += -DMACOSX
+# LIBS += -framework QuickTime -framework AudioUnit