changeset 5:d9914dd6ba6b

Cleanup.
author Matti Hamalainen <ccr@tnsp.org>
date Fri, 15 Mar 2013 05:01:37 +0200
parents 54361aa65b1f
children 20534e52d7db
files Makefile
diffstat 1 files changed, 7 insertions(+), 35 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Fri Mar 15 05:01:30 2013 +0200
+++ b/Makefile	Fri Mar 15 05:01:37 2013 +0200
@@ -1,41 +1,13 @@
 # mAKEFiLE fOR 3x666 bY oCSA
 
-# Choose either vga or X11
-VIDEO = X11
-
-# 1 = /dev/dsp a.k.a OpenSoundSystem; 0 = nosound
-AUDIO = 0
-
-# Ok, next check out config.h!
-
-## ## ## ##
-
 CC = gcc
 
-COPT = -O9 -funroll-loops -fomit-frame-pointer
-
-# If you prefer size to speed, use of the below COPTs:
-# i386 size
-#COPT = -O2 -m386 -fomit-frame-pointer -malign-functions=0 -malign-loops=0 -malign-jumps=0
-# generic size
-#COPT = -O2
-
-CFLAGS = -g -Wall -DVIDEO=$(VIDEO) -DAUDIO=$(AUDIO) 
-LIBS   = -l$(VIDEO) -lm
+CFLAGS = -O3 -march=
+CFLAGS = -O3 -march=core2 -g -Wall `sdl-config --cflags`
+LIBS   = `sdl-config --libs` -lm
 
-# You may want to check out if these dirs are right.
-INCDIR = 
-LIBDIR = -L/usr/X11R6/lib
-
-# These are for sun.
-#INCDIR = -I/usr/openwin/include
-#LIBDIR = -L/usr/openwin/lib
+3x666: 3x666.o
+	$(CC) -o $@ $+ $(LDFLAGS)
 
-3x666: 3x666.o oxl.o
-	$(CC) 3x666.o oxl.o -s -o 3x666 $(LIBDIR) $(LIBS)
-
-oxl.o: oxl.c config.h
-	$(CC) oxl.c -c -o oxl.o $(COPT) $(CFLAGS) $(INCDIR)
-
-3x666.o: 3x666.c oxl.h config.h 3xfont.h
-	$(CC) 3x666.c -c -o 3x666.o $(COPT) $(CFLAGS) $(INCDIR)
+3x666.o: 3x666.c config.h 3xfont.h
+	$(CC) $(CFLAGS) -c -o $@ $<