ShuriZma
/
stella
mirror of https://github.com/stella-emu/stella.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Updated makefile to include the Settings class. It is now a core class that 

is added to all versions of Stella.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@52 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
This commit is contained in:
stephena 2002-03-21 22:48:54 +00:00
parent 6ef82a49f5
commit fff4d40d77
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
stella/src/build/makefile
View File

@ -13,7 +13,7 @@
## See the file "license" for information on usage and redistribution of ## See the file "license" for information on usage and redistribution of
## this file, and for a DISCLAIMER OF ALL WARRANTIES. ## this file, and for a DISCLAIMER OF ALL WARRANTIES.
## ##
## $Id: makefile,v 1.12 2002-03-20 00:03:24 stephena Exp $ ## $Id: makefile,v 1.13 2002-03-21 22:48:54 stephena Exp $
##============================================================================ ##============================================================================
##============================================================================ ##============================================================================
@ -38,7 +38,6 @@ OPTIMIZATIONS =
# -funroll-loops -fstrength-reduce -fomit-frame-pointer -ffast-math \ # -funroll-loops -fstrength-reduce -fomit-frame-pointer -ffast-math \
# -malign-functions=2 -malign-jumps=2 -malign-loops=2 # -malign-functions=2 -malign-jumps=2 -malign-loops=2
### if your C++ compiler doesn't support the bool type ### if your C++ compiler doesn't support the bool type
# BSPF_BOOL = 1 # BSPF_BOOL = 1
@ -89,7 +88,7 @@ SRC = ..
CORE = $(SRC)/emucore CORE = $(SRC)/emucore
UI = $(SRC)/ui UI = $(SRC)/ui
INCLUDES = -I. -I$(CORE) -I$(CORE)/m6502/src -I$(CORE)/m6502/src/bspf/src INCLUDES = -I. -I$(CORE) -I$(CORE)/m6502/src -I$(CORE)/m6502/src/bspf/src -I$(UI)/common
CXXFLAGS = $(OPTIMIZATIONS) $(INCLUDES) $(SYS_INCLUDES) CXXFLAGS = $(OPTIMIZATIONS) $(INCLUDES) $(SYS_INCLUDES)
@ -117,11 +116,11 @@ endif
ifdef SNAPSHOT_SUPPORT ifdef SNAPSHOT_SUPPORT
OBJS.X11 += Snapshot.o OBJS.X11 += Snapshot.o
OPTS.X11 += -DHAVE_PNG=1 -I$(UI)/common OPTS.X11 += -DHAVE_PNG=1
LIBS.X11 += -lpng LIBS.X11 += -lpng
OBJS.SDL += Snapshot.o OBJS.SDL += Snapshot.o
OPTS.SDL += -DHAVE_PNG=1 -I$(UI)/common OPTS.SDL += -DHAVE_PNG=1
LIBS.SDL += -lpng LIBS.SDL += -lpng
endif endif
@ -229,7 +228,7 @@ CORE_OBJS = Booster.o Cart.o Cart2K.o Cart3F.o Cart4K.o CartAR.o CartDPC.o \
CartF8SC.o CartFASC.o CartFE.o CartMC.o CartCV.o CartMB.o \ CartF8SC.o CartFASC.o CartFE.o CartMC.o CartCV.o CartMB.o \
Console.o Control.o Driving.o \ Console.o Control.o Driving.o \
Event.o Joystick.o Keyboard.o M6532.o MD5.o MediaSrc.o Paddles.o \ Event.o Joystick.o Keyboard.o M6532.o MD5.o MediaSrc.o Paddles.o \
Props.o PropsSet.o Random.o Sound.o Switches.o TIA.o \ Props.o PropsSet.o Random.o Sound.o Switches.o Settings.o TIA.o \
$(M6502_OBJS) $(M6502_OBJS)
stella.exe: $(CORE_OBJS) $(OBJS) stella.exe: $(CORE_OBJS) $(OBJS)
@ -372,6 +371,8 @@ Switches.o: $(CORE)/Switches.cxx
Sound.o: $(CORE)/Sound.cxx Sound.o: $(CORE)/Sound.cxx
$(CXX) -c $(CXXFLAGS) $(OPTIONS) $(CORE)/Sound.cxx $(CXX) -c $(CXXFLAGS) $(OPTIONS) $(CORE)/Sound.cxx
Settings.o: $(UI)/common/Settings.cxx $(UI)/common/Settings.hxx
$(CXX) -c $(CXXFLAGS) $(OPTIONS) $(LDFLAGS) $(UI)/common/Settings.cxx
Terminal.o: $(UI)/x11/Terminal.cxx Terminal.o: $(UI)/x11/Terminal.cxx
$(CXX) -c $(CXXFLAGS) $(OPTIONS) $(UI)/x11/Terminal.cxx $(CXX) -c $(CXXFLAGS) $(OPTIONS) $(UI)/x11/Terminal.cxx