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

Updated Makefile with default compile flags if none are provided. 

git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@865 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
This commit is contained in:
stephena 2005-10-25 20:30:59 +00:00
parent 823f6fe696
commit d1ce577cda
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
stella/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.11 2005-10-22 20:33:57 stephena Exp $ ## $Id: Makefile,v 1.12 2005-10-25 20:30:59 stephena Exp $
## ##
## Based on code from ScummVM - Scumm Interpreter ## Based on code from ScummVM - Scumm Interpreter
## Copyright (C) 2002-2004 The ScummVM project ## Copyright (C) 2002-2004 The ScummVM project
@ -45,9 +45,9 @@ include config.mak
ifdef CXXFLAGS ifdef CXXFLAGS
CXXFLAGS:= $(CXXFLAGS) CXXFLAGS:= $(CXXFLAGS)
else else
CXXFLAGS:= -O2 CXXFLAGS:= -O2 -march=i586 -mtune=pentiumpro
endif endif
CXXFLAGS+= -Wall -Wno-multichar -Wunused CXXFLAGS+= -Wall -Wno-multichar -Wunused -fomit-frame-pointer
# Even more warnings... # Even more warnings...
#CXXFLAGS+= -pedantic -Wpointer-arith -Wcast-qual -Wconversion #CXXFLAGS+= -pedantic -Wpointer-arith -Wcast-qual -Wconversion
#CXXFLAGS+= -Wshadow -Wimplicit -Wundef -Wnon-virtual-dtor #CXXFLAGS+= -Wshadow -Wimplicit -Wundef -Wnon-virtual-dtor
@ -192,7 +192,6 @@ win32dist: stella$(EXEEXT)
cp Announce.txt Changes.txt Copyright.txt License.txt README-PSP.txt README-SDL.txt Readme.txt Todo.txt $(DISTNAME)/docs cp Announce.txt Changes.txt Copyright.txt License.txt README-PSP.txt README-SDL.txt Readme.txt Todo.txt $(DISTNAME)/docs
cp -r docs/*.html $(DISTNAME)/docs cp -r docs/*.html $(DISTNAME)/docs
cp -r docs/graphics/*.png $(DISTNAME)/docs/graphics cp -r docs/graphics/*.png $(DISTNAME)/docs/graphics
cp src/win32/stella.ico $(DISTNAME)
cp /usr/bin/SDL.dll /mingw/bin/libpng12.dll /mingw/bin/zlib1.dll $(DISTNAME) cp /usr/bin/SDL.dll /mingw/bin/libpng12.dll /mingw/bin/zlib1.dll $(DISTNAME)
# u2d $(DISTNAME)/*.txt # u2d $(DISTNAME)/*.txt
# zip $(DISTNAME)-win32.zip $(DISTNAME) # zip $(DISTNAME)-win32.zip $(DISTNAME)

1
stella/src/win32/stella.iss
View File

@ -25,7 +25,6 @@ Source: "H:\windows\src\stella\stella.exe"; DestDir: "{app}"; Flags: ignoreversi
Source: "H:\windows\src\stella\stella-2.0.1\zlib1.dll"; DestDir: "{app}"; Flags: ignoreversion Source: "H:\windows\src\stella\stella-2.0.1\zlib1.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "H:\windows\src\stella\stella-2.0.1\libpng12.dll"; DestDir: "{app}"; Flags: ignoreversion Source: "H:\windows\src\stella\stella-2.0.1\libpng12.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "H:\windows\src\stella\stella-2.0.1\SDL.dll"; DestDir: "{app}"; Flags: ignoreversion Source: "H:\windows\src\stella\stella-2.0.1\SDL.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "H:\windows\src\stella\stella-2.0.1\stella.ico"; DestDir: "{app}"; Flags: ignoreversion
Source: "H:\windows\src\stella\stella-2.0.1\stella.pro"; DestDir: "{app}"; Flags: ignoreversion Source: "H:\windows\src\stella\stella-2.0.1\stella.pro"; DestDir: "{app}"; Flags: ignoreversion
Source: "H:\windows\src\stella\stella-2.0.1\docs\*"; DestDir: "{app}\docs"; Flags: ignoreversion recursesubdirs createallsubdirs Source: "H:\windows\src\stella\stella-2.0.1\docs\*"; DestDir: "{app}\docs"; Flags: ignoreversion recursesubdirs createallsubdirs
; NOTE: Don't use "Flags: ignoreversion" on any shared system files ; NOTE: Don't use "Flags: ignoreversion" on any shared system files