[Scummvm-cvs-logs] CVS: scummvm Makefile,1.15,1.16

Ludvig Strigeus strigeus at users.sourceforge.net
Sat Dec 1 09:51:06 CET 2001


Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv18259

Modified Files:
	Makefile 
Log Message:
fixed to compile on unix (again)

Index: Makefile
===================================================================
RCS file: /cvsroot/scummvm/scummvm/Makefile,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** Makefile	2001/12/01 17:44:59	1.15
--- Makefile	2001/12/01 17:50:19	1.16
***************
*** 7,26 ****
  INCLUDES:= `sdl-config --cflags` -I./ -I./sound
  CPPFLAGS= $(DEFINES) $(INCLUDES)
! LIBS    = `sdl-config --libs` -lreadline -lncurses -lhistory -lm
  ZIPFILE := scummvm-`date '+%Y-%m-%d'`.zip
  
! 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 \
!           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
  
  .cpp.o:
!         $(CC) $(CFLAGS) $(CPPFLAGS) -c $(<) -o $*.o
  
  all: scummvm
--- 7,26 ----
  INCLUDES:= `sdl-config --cflags` -I./ -I./sound
  CPPFLAGS= $(DEFINES) $(INCLUDES)
! LIBS	= `sdl-config --libs` -lreadline -lncurses -lhistory -lm
  ZIPFILE := scummvm-`date '+%Y-%m-%d'`.zip
  
! 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 \
! 	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
  
  .cpp.o:
! 	$(CC) $(CFLAGS) $(CPPFLAGS) -c $(<) -o $*.o
  
  all: scummvm





More information about the Scummvm-git-logs mailing list