[Scummvm-cvs-logs] CVS: scummvm Makefile.common,NONE,1.1 Makefile.macosx,NONE,1.1 Makefile,1.38,1.39 Makefile.irix,1.1,1.2 Makefile.x11,1.1,1.2

Max Horn fingolfin at users.sourceforge.net
Fri Apr 26 06:40:09 CEST 2002


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

Modified Files:
	Makefile Makefile.irix Makefile.x11 
Added Files:
	Makefile.common Makefile.macosx 
Log Message:
Slightly revised Makefiles, now share common stuff in Makefile.common; added simple Makefile for MacOS X

--- NEW FILE: Makefile.common ---
# $Header: /cvsroot/scummvm/scummvm/Makefile.common,v 1.1 2002/04/26 13:39:31 fingolfin Exp $
# This file is used by Makefile, Makefile.irix, Makefile.macosx and declares
# common rules, a list of common object files etc.

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 script_v1.o script_v2.o debug.o gui.o \
	sound/imuse.o sound/fmopl.o sound/mixer.o debugrl.o \
	akos.o vars.o insane.o gameDetector.o init.o \
	v3/resource_v3.o v4/resource_v4.o 2xsai.o main.o \
	simon/midi.o simon/simon.o simon/simonsys.o sound/mididrv.o

DISTFILES=$(OBJS:.o=.cpp) Makefile scumm.h scummsys.h stdafx.h stdafx.cpp \
	debugrl.h whatsnew.txt readme.txt copying.txt \
	scummvm.dsp scummvm.dsw sound/fmopl.h gui.h sound.h

.cpp.o:
	$(CC) $(CFLAGS) $(CPPFLAGS) -c $(<) -o $*.o

all: scummvm

scummvm: $(OBJS)
	$(CC) $(LDFLAGS) -o $(@) $(OBJS) $(LIBS)

$(OBJS): Makefile

clean:
	rm -f $(OBJS) scummvm

dist:
	rm -f $(ZIPFILE)
	zip -q $(ZIPFILE) $(DISTFILES)

check:
$(OBJS): $(INCS)

--- NEW FILE: Makefile.macosx ---
# $Header: /cvsroot/scummvm/scummvm/Makefile.macosx,v 1.1 2002/04/26 13:39:31 fingolfin Exp $

CC      = cc
CFLAGS  = -g -O -Wall -Wstrict-prototypes -Wuninitialized -Wno-long-long -Wno-multichar
DEFINES = -DUNIX -DMACOSX
LDFLAGS :=
INCLUDES:= `sdl-config --cflags` -I./ -I./sound
CPPFLAGS= $(DEFINES) $(INCLUDES)

# Add -lmad for -DCOMPRESSED_SOUND_FILE
LIBS	= `sdl-config --libs` -lncurses -framework QuickTime -framework AudioUnit

OBJS	= sdl.o

include Makefile.common

Index: Makefile
===================================================================
RCS file: /cvsroot/scummvm/scummvm/Makefile,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** Makefile	17 Apr 2002 20:49:56 -0000	1.38
--- Makefile	26 Apr 2002 13:39:31 -0000	1.39
***************
*** 9,46 ****
  
  # Add -lmad for -DCOMPRESSED_SOUND_FILE
! LIBS	= `sdl-config --libs` -lncurses -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/mixer.o debugrl.o \
!         akos.o vars.o insane.o gameDetector.o init.o \
! 	v3/resource_v3.o v4/resource_v4.o 2xsai.o main.o \
! 	simon/midi.o simon/simon.o simon/simonsys.o sound/mididrv.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 sound/fmopl.h gui.h sound.h
! 
! .cpp.o:
! 	$(CC) $(CFLAGS) $(CPPFLAGS) -c $(<) -o $*.o
! 
! all: scummvm
! 
! scummvm: $(OBJS)
! 	$(CC) $(LDFLAGS) -o $(@) $(OBJS) $(LIBS)
! 
! $(OBJS): Makefile
! 
! clean:
! 	rm -f $(OBJS) scummvm
  
! dist:
! 	rm -f $(ZIPFILE)
! 	zip -q $(ZIPFILE) $(DISTFILES)
  
! check:
! $(OBJS): $(INCS)
--- 9,15 ----
  
  # Add -lmad for -DCOMPRESSED_SOUND_FILE
! LIBS	= `sdl-config --libs` -lncurses
  
! OBJS	= sdl.o
  
! include Makefile.common

Index: Makefile.irix
===================================================================
RCS file: /cvsroot/scummvm/scummvm/Makefile.irix,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Makefile.irix	20 Apr 2002 04:09:01 -0000	1.1
--- Makefile.irix	26 Apr 2002 13:39:31 -0000	1.2
***************
*** 1,2 ****
--- 1,4 ----
+ # $Header$
+ 
  CC      = CC
  CFLAGS  = -O2 -Olimit 9000 -mips2
***************
*** 10,46 ****
  # Add -lmad for -DCOMPRESSED_SOUND_FILE
  LIBS   = `sdl-config --libs` -lmad -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/mixer.o debugrl.o \
! 	akos.o vars.o insane.o gameDetector.o init.o \
! 	v3/resource_v3.o v4/resource_v4.o 2xsai.o main.o \
! 	simon/midi.o simon/simon.o simon/simonsys.o sound/mididrv.o
! 
! DISTFILES=$(OBJS:.o=.cpp) Makefile scumm.h scummsys.h stdafx.h stdafx.cpp \
! 	debugrl.h whatsnew.txt readme.txt copying.txt \
! 	scummvm.dsp scummvm.dsw sound/fmopl.h gui.h sound.h \
! 
! .cpp.o:
! 	$(CC) $(CFLAGS) $(CPPFLAGS) -c $(<) -o $*.o
! 
! all: scummvm
! 
! scummvm: $(OBJS)
! 	$(CC) $(LDFLAGS) -o $(@) $(OBJS) $(LIBS)
! 
! $(OBJS): Makefile
! 
! clean:
! 	rm -f $(OBJS) scummvm
! 
! dist:
! 	rm -f $(ZIPFILE)
! 	zip -q $(ZIPFILE) $(DISTFILES)
  
! check:
! $(OBJS): $(INCS)
--- 12,17 ----
  # Add -lmad for -DCOMPRESSED_SOUND_FILE
  LIBS   = `sdl-config --libs` -lmad -lm
  
! OBJS	= sdl.o
  
! include Makefile.common

Index: Makefile.x11
===================================================================
RCS file: /cvsroot/scummvm/scummvm/Makefile.x11,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Makefile.x11	20 Apr 2002 17:41:41 -0000	1.1
--- Makefile.x11	26 Apr 2002 13:39:31 -0000	1.2
***************
*** 10,46 ****
  # Add -lmad for -DCOMPRESSED_SOUND_FILE
  LIBS	= -lXext -lX11 -lncurses -lm -lmad -lpthread
- 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 script_v1.o script_v2.o debug.o gui.o \
- 	sound/imuse.o sound/fmopl.o sound/mixer.o debugrl.o \
-         akos.o vars.o insane.o gameDetector.o init.o mp3_cd.o\
- 	v3/resource_v3.o v4/resource_v4.o 2xsai.o main.o \
- 	simon/midi.o simon/simon.o simon/simonsys.o sound/mididrv.o x11.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 sound/fmopl.h gui.h sound.h
- 
- .cpp.o:
- 	$(CC) $(CFLAGS) $(CPPFLAGS) -c $(<) -o $*.o
  
! all: scummvm
! 
! scummvm: $(OBJS)
! 	$(CC) $(LDFLAGS) -o $(@) $(OBJS) $(LIBS)
! 
! $(OBJS): Makefile
! 
! clean:
! 	rm -f $(OBJS) scummvm
! 
! dist:
! 	rm -f $(ZIPFILE)
! 	zip -q $(ZIPFILE) $(DISTFILES)
  
! check:
! $(OBJS): $(INCS)
--- 10,15 ----
  # Add -lmad for -DCOMPRESSED_SOUND_FILE
  LIBS	= -lXext -lX11 -lncurses -lm -lmad -lpthread
  
! OBJS	= mp3_cd.o x11.o
  
! include Makefile.common





More information about the Scummvm-git-logs mailing list