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

Some cleanup of configure/Makefile scripts. 

git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@3089 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
This commit is contained in:
stephena 2014-11-19 12:32:08 +00:00
parent 37d9c6c99f
commit b646ba5c26
2 changed files with 1 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -215,6 +215,6 @@ src/emucore/M6502.ins: src/emucore/M6502.m4
# Special rule for windows icon stuff (there's probably a better way to do this ...) # Special rule for windows icon stuff (there's probably a better way to do this ...)
src/windows/stella_icon.o: src/windows/stella.ico src/windows/stella.rc src/windows/stella_icon.o: src/windows/stella.ico src/windows/stella.rc
$(WINDRES) --include-dir src/windows src/windows/stella.rc src/windows/stella_icon.o windres --include-dir src/windows src/windows/stella.rc src/windows/stella_icon.o
.PHONY: deb bundle test install uninstall .PHONY: deb bundle test install uninstall

28
configure vendored
View File

@ -41,7 +41,6 @@ _rm_rec="$_rm -r"
_zip="zip -q" _zip="zip -q"
_cp=cp _cp=cp
_windowspath="" _windowspath=""
_windres=windres
_sdlconfig=sdl2-config _sdlconfig=sdl2-config
_sdlpath="$PATH" _sdlpath="$PATH"
_prefix=/usr/local _prefix=/usr/local
@ -176,11 +175,6 @@ echo "Configure run on" `date` > $TMPLOG
# #
# Check any parameters we received # Check any parameters we received
# #
# TODO:
# * Change --disable-mad / --enable-mad to the way it's done in autoconf:
# That is, --without-mad / --with-mad=/prefix/to/mad. Useful for people
# who have Mad/Vorbis/ALSA installed in a non-standard locations.
#
for parm in "$@" ; do for parm in "$@" ; do
if test "$parm" = "--help" || test "$parm" = "-help" || test "$parm" = "-h" ; then if test "$parm" = "--help" || test "$parm" = "-help" || test "$parm" = "-h" ; then
@ -485,26 +479,6 @@ fi
if test -n "$_host"; then if test -n "$_host"; then
# Cross-compiling mode - add your target here if needed # Cross-compiling mode - add your target here if needed
case "$_host" in case "$_host" in
# linupy|arm-riscos-aof)
# echo "Cross-compiling to $_host, forcing endianness, alignment and type sizes"
# DEFINES="$DEFINES -DUNIX"
# _def_endianness='#define SCUMM_LITTLE_ENDIAN'
# _def_align='#define SCUMM_NEED_ALIGNMENT'
# _def_linupy="#define DLINUPY"
# type_1_byte='char'
# type_2_byte='short'
# type_4_byte='int'
# ;;
# ppc-amigaos)
# echo "Cross-compiling to $_host, forcing endianness, alignment and type sizes"
# _def_endianness='#define SCUMM_BIG_ENDIAN'
# _def_align='#define SCUMM_NEED_ALIGNMENT'
# type_1_byte='char'
# type_2_byte='short'
# type_4_byte='long'
# CXXFLAGS="$CFLAGS -newlib -mstrict-align -mcpu=750 -mtune=7400"
# LDFLAGS="$LDFLAGS -newlib"
# ;;
mingw32-cross) mingw32-cross)
echo "Cross-compiling for Windows using MinGW." echo "Cross-compiling for Windows using MinGW."
DEFINES="$DEFINES -DWIN32" DEFINES="$DEFINES -DWIN32"
@ -557,7 +531,6 @@ fi
# Cross-compilers use their own commands for the following functions # Cross-compilers use their own commands for the following functions
if test -n "$_host_prefix"; then if test -n "$_host_prefix"; then
_strip="$_host_prefix-$_strip" _strip="$_host_prefix-$_strip"
_windres="$_host_prefix-$_windres"
fi fi
# #
@ -801,7 +774,6 @@ ZIP := $_zip
CP := $_cp CP := $_cp
WINDOWSPATH=$_windowspath WINDOWSPATH=$_windowspath
STRIP := $_strip STRIP := $_strip
WINDRES := $_windres
MODULES += $MODULES MODULES += $MODULES
MODULE_DIRS += $MODULE_DIRS MODULE_DIRS += $MODULE_DIRS