From fec7bee984a54818bd6be41d6b2c86f336669c3d Mon Sep 17 00:00:00 2001
From: Ludvig Strigeus
Date: Sat, 1 Dec 2001 17:44:59 +0000
Subject: fixed to compile on unix

svn-id: r3513
---
 Makefile | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 66bd47ffe5..d6e9a20dee 100644
--- a/Makefile
+++ b/Makefile
@@ -1,27 +1,27 @@
 # $Header$
 
-CC	= gcc
-CFLAGS	= -g -Wno-multichar
-DEFINES	= -DUNIX -DHAVE_READLINE -DUSE_TIMIDITY
-LDFLAGS := 
-INCLUDES:= `sdl-config --cflags`
+CC      = gcc
+CFLAGS  = -g -Wno-multichar
+DEFINES = -DUNIX -DUSE_IMUSE
+LDFLAGS :=
+INCLUDES:= `sdl-config --cflags` -I./ -I./sound
 CPPFLAGS= $(DEFINES) $(INCLUDES)
-LIBS	= `sdl-config --libs` -lreadline -lncurses -lhistory
+LIBS    = `sdl-config --libs` -lreadline -lncurses -lhistory -lm
 ZIPFILE := scummvm-`date '+%Y-%m-%d'`.zip
 
-INCS	= scumm.h scummsys.h stdafx.h
+INCS    = scumm.h scummsys.h stdafx.h
 
-OBJS	= actor.o boxes.o costume.o gfx.o object.o resource.o \
-	  saveload.o script.o scummvm.o sound.o string.o \
-	  sys.o verbs.o sdl.o script_v1.o script_v2.o debug.o gui.o \
-	  imuse.o debugrl.o
+OBJS    = actor.o boxes.o costume.o gfx.o object.o resource.o \
+          saveload.o script.o scummvm.o sound.o string.o \
+          sys.o verbs.o sdl.o script_v1.o script_v2.o debug.o gui.o \
+          sound/imuse.o sound/fmopl.o sound/adlib.o sound/gmidi.o debugrl.o
 
 DISTFILES=$(OBJS:.o=.cpp) Makefile scumm.h scummsys.h stdafx.h stdafx.cpp \
-	  windows.cpp debugrl.h whatsnew.txt readme.txt copying.txt \
-	  scummvm.dsp scummvm.dsw 
+          windows.cpp debugrl.h whatsnew.txt readme.txt copying.txt \
+          scummvm.dsp scummvm.dsw
 
 .cpp.o:
-	$(CC) $(CFLAGS) $(CPPFLAGS) -c $(<)
+        $(CC) $(CFLAGS) $(CPPFLAGS) -c $(<) -o $*.o
 
 all: scummvm
 
-- 
cgit v1.2.3