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

Removed all references to DefProps from the makefile and related classes. 

There is no longer a builtin stella.pro file.  You must supply one with
the program.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@30 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
This commit is contained in:
stephena 2002-01-16 15:09:21 +00:00
parent 2f55b22d2b
commit f257327aa1
8 changed files with 6 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
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.4 2002-01-08 19:17:58 stephena Exp $ ## $Id: makefile,v 1.5 2002-01-16 15:09:21 stephena Exp $
##============================================================================ ##============================================================================
##============================================================================ ##============================================================================
@ -210,7 +210,7 @@ M6502_OBJS = D6502.o Device.o M6502.o M6502Low.o M6502Hi.o NullDev.o System.o
CORE_OBJS = Booster.o Cart.o Cart2K.o Cart3F.o Cart4K.o CartAR.o CartDPC.o \ CORE_OBJS = Booster.o Cart.o Cart2K.o Cart3F.o Cart4K.o CartAR.o CartDPC.o \
CartE0.o CartE7.o CartF4SC.o CartF6.o CartF6SC.o CartF8.o \ CartE0.o CartE7.o CartF4SC.o CartF6.o CartF6SC.o CartF8.o \
CartF8SC.o CartFASC.o CartFE.o CartMC.o Console.o \ CartF8SC.o CartFASC.o CartFE.o CartMC.o Console.o \
Control.o DefProps.o Driving.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 TIA.o \
$(M6502_OBJS) $(M6502_OBJS)
@ -235,17 +235,12 @@ M6502Low.ins: $(CORE)/m6502/src/M6502Low.m4 $(CORE)/m6502/src/M6502.m4
M6502Hi.ins: $(CORE)/m6502/src/M6502Hi.m4 $(CORE)/m6502/src/M6502.m4 M6502Hi.ins: $(CORE)/m6502/src/M6502Hi.m4 $(CORE)/m6502/src/M6502.m4
m4 $(CORE)/m6502/src/M6502Hi.m4 $(CORE)/m6502/src/M6502.m4 > M6502Hi.ins m4 $(CORE)/m6502/src/M6502Hi.m4 $(CORE)/m6502/src/M6502.m4 > M6502Hi.ins
DefProps.def: $(CORE)/stella.pro
sed 's/"/\\\"/g;s/^/"/g;s/$$/",/g' $(CORE)/stella.pro > DefProps.def
DefProps.o: DefProps.def
M6502Low.o: M6502Low.ins M6502Low.o: M6502Low.ins
M6502Hi.o: M6502Hi.ins M6502Hi.o: M6502Hi.ins
cleandos: cleandos:
del *.o del *.o
del stella.exe del stella.exe
del DefProps.def
del M6502Low.ins del M6502Low.ins
del M6502Hi.ins del M6502Hi.ins
@ -253,7 +248,7 @@ clean:
rm -f *.o stella stella.x11 stella.sdl stella.exe core rm -f *.o stella stella.x11 stella.sdl stella.exe core
cleanall: clean cleanall: clean
rm -f DefProps.def M6502Low.ins M6502Hi.ins rm -f M6502Low.ins M6502Hi.ins
Driving.o: $(CORE)/Driving.cxx Driving.o: $(CORE)/Driving.cxx
$(CXX) -c $(CXXFLAGS) $(OPTIONS) $(CORE)/Driving.cxx $(CXX) -c $(CXXFLAGS) $(OPTIONS) $(CORE)/Driving.cxx
@ -324,9 +319,6 @@ CartFE.o: $(CORE)/CartFE.cxx
CartMC.o: $(CORE)/CartMC.cxx CartMC.o: $(CORE)/CartMC.cxx
$(CXX) -c $(CXXFLAGS) $(OPTIONS) $(CORE)/CartMC.cxx $(CXX) -c $(CXXFLAGS) $(OPTIONS) $(CORE)/CartMC.cxx
DefProps.o: $(CORE)/DefProps.cxx
$(CXX) -c $(CXXFLAGS) $(OPTIONS) $(CORE)/DefProps.cxx
M6532.o: $(CORE)/M6532.cxx M6532.o: $(CORE)/M6532.cxx
$(CXX) -c $(CXXFLAGS) $(OPTIONS) $(CORE)/M6532.cxx $(CXX) -c $(CXXFLAGS) $(OPTIONS) $(CORE)/M6532.cxx

34
stella/src/emucore/DefProps.cxx
View File

@ -1,34 +0,0 @@
//============================================================================
//
// SSSS tt lll lll
// SS SS tt ll ll
// SS tttttt eeee ll ll aaaa
// SSSS tt ee ee ll ll aa
// SS tt eeeeee ll ll aaaaa -- "An Atari 2600 VCS Emulator"
// SS SS tt ee ll ll aa aa
// SSSS ttt eeeee llll llll aaaaa
//
// Copyright (c) 1995-1998 by Bradford W. Mott
//
// See the file "license" for information on usage and redistribution of
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
//
// $Id: DefProps.cxx,v 1.2 2002-01-16 02:14:25 stephena Exp $
//============================================================================
#include "DefProps.hxx"
/**
The default properties file is generated from the 'stella.pro' file
using a sed script
*/
static const char* theScript[] = {
0
};
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
const char** defaultPropertiesFile()
{
return theScript;
}

31
stella/src/emucore/DefProps.hxx
View File

@ -1,31 +0,0 @@
//============================================================================
//
// SSSS tt lll lll
// SS SS tt ll ll
// SS tttttt eeee ll ll aaaa
// SSSS tt ee ee ll ll aa
// SS tt eeeeee ll ll aaaaa -- "An Atari 2600 VCS Emulator"
// SS SS tt ee ll ll aa aa
// SSSS ttt eeeee llll llll aaaaa
//
// Copyright (c) 1995-1998 by Bradford W. Mott
//
// See the file "license" for information on usage and redistribution of
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
//
// $Id: DefProps.hxx,v 1.1.1.1 2001-12-27 19:54:21 bwmott Exp $
//============================================================================
#ifndef DEFAULTPROPERTIES_HXX
#define DEFAULTPROPERTIES_HXX
/**
Get the default properties file as an array of pointers to null-terminated
character arrays. The last entry in the array is the null pointer.
@return The default properties file
*/
const char** defaultPropertiesFile();
#endif

3
stella/src/ui/dos/mainDOS.cxx
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: mainDOS.cxx,v 1.3 2002-01-16 02:14:25 stephena Exp $ // $Id: mainDOS.cxx,v 1.4 2002-01-16 15:09:21 stephena Exp $
//============================================================================ //============================================================================
#include <go32.h> #include <go32.h>
@ -34,7 +34,6 @@
#include "bspf.hxx" #include "bspf.hxx"
#include "Console.hxx" #include "Console.hxx"
#include "DefProps.hxx"
#include "Event.hxx" #include "Event.hxx"
#include "MediaSrc.hxx" #include "MediaSrc.hxx"
#include "PropsSet.hxx" #include "PropsSet.hxx"

3
stella/src/ui/sdl/mainSDL.cxx
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: mainSDL.cxx,v 1.3 2002-01-16 02:14:25 stephena Exp $ // $Id: mainSDL.cxx,v 1.4 2002-01-16 15:09:21 stephena Exp $
//============================================================================ //============================================================================
#include <assert.h> #include <assert.h>
@ -34,7 +34,6 @@
#include "bspf.hxx" #include "bspf.hxx"
#include "Console.hxx" #include "Console.hxx"
#include "DefProps.hxx"
#include "Event.hxx" #include "Event.hxx"
#include "MediaSrc.hxx" #include "MediaSrc.hxx"
#include "PropsSet.hxx" #include "PropsSet.hxx"

8
stella/src/ui/win32/Stella.dsp
View File

@ -304,14 +304,6 @@ SOURCE=..\..\emucore\Control.hxx
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\emucore\DefProps.cxx
# End Source File
# Begin Source File
SOURCE=..\..\emucore\DefProps.hxx
# End Source File
# Begin Source File
SOURCE=..\..\emucore\Driving.cxx SOURCE=..\..\emucore\Driving.cxx
# End Source File # End Source File
# Begin Source File # Begin Source File

1
stella/src/ui/win32/StellaXMain.cxx
View File

@ -12,7 +12,6 @@
#include "bspf.hxx" #include "bspf.hxx"
#include "Console.hxx" #include "Console.hxx"
#include "DefProps.hxx"
#include "Event.hxx" #include "Event.hxx"
#include "MediaSrc.hxx" #include "MediaSrc.hxx"
#include "PropsSet.hxx" #include "PropsSet.hxx"

3
stella/src/ui/x11/mainX11.cxx
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: mainX11.cxx,v 1.4 2002-01-16 02:14:25 stephena Exp $ // $Id: mainX11.cxx,v 1.5 2002-01-16 15:09:21 stephena Exp $
//============================================================================ //============================================================================
#include <assert.h> #include <assert.h>
@ -37,7 +37,6 @@
#include "bspf.hxx" #include "bspf.hxx"
#include "Console.hxx" #include "Console.hxx"
#include "DefProps.hxx"
#include "Event.hxx" #include "Event.hxx"
#include "MediaSrc.hxx" #include "MediaSrc.hxx"
#include "PropsSet.hxx" #include "PropsSet.hxx"