Added handling of gp2x png path to INCLUDES to save the user a step during compilation. Added gp2x-organize to Makefile to aid in installation/packaging after compilation. Updated gp2x documentation to reflect changes.

git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1006 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
This commit is contained in:
azaballa 2006-02-15 03:12:12 +00:00
parent 06c7d0b504
commit c8d00c9810
3 changed files with 31 additions and 11 deletions

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.18 2006-02-01 13:53:25 stephena Exp $ ## $Id: Makefile,v 1.19 2006-02-15 03:12:12 azaballa 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
@ -242,6 +242,13 @@ psp-layout:
# GP2X exec needs strip # GP2X exec needs strip
gp2x-strip: $(EXECUTABLE) gp2x-strip: $(EXECUTABLE)
$(GP2X-STRIP) stella.gpe $(GP2X-STRIP) stella
# GP2X organize: groups necessary files into a gp2x folder for easy access.
gp2x-organize:
mkdir -p "$(srcdir)/gp2x"
cp -v $(srcdir)/stella $(srcdir)/gp2x
cp -v $(srcdir)/src/gp2x/stella.gpe $(srcdir)/gp2x
cp -v $(srcdir)/src/emucore/stella.pro $(srcdir)/gp2x
.PHONY: deb bundle test win32dist install uninstall .PHONY: deb bundle test win32dist install uninstall

View File

@ -1,13 +1,15 @@
--------------------------------------- ---------------------------------------
Stella 2.1 (revision 1): Stella 2.1 (revision 1):
Ported to GP2X by Alex Zaballa Ported to GP2X by Alex Zaballa
Contact: alex.zaballa@gmail.com Contact: azaballa@users.sourceforge.net
Homepage: http://stella.sourceforge.net Homepage: http://stella.sourceforge.net
--------------------------------------- ---------------------------------------
-------- --------
Changes: Changes:
-------- --------
>From 2.1-rv1
Warlords graphics bug fixed
>From 2.1 >From 2.1
Joystick fixed Joystick fixed
Phosphor effect enabled Phosphor effect enabled
@ -22,8 +24,7 @@ Some button mapping (but still comfortably familiar)
----------- -----------
Known Bugs: Known Bugs:
----------- -----------
2nd exit bug (yes, it's still there.... but, you can play many games before that second exit, lest we Joy mouse skips menu items.
forget save state. Fix coming soon.)
------------------------------ ------------------------------
Known GP2X Performance Issues: Known GP2X Performance Issues:
@ -33,7 +34,7 @@ Pitfall 2 runs slow due to extra hardware emulation. (Steve foresees this being
--------------------- ---------------------
Installation to GP2X: Installation to GP2X:
--------------------- ---------------------
Place files stella.gpe and stella.pro into a chosen directory. Upon first run, Stella will ask for your Place files stella, stella.gpe, and stella.pro into a chosen directory. Upon first run, Stella will ask for your
ROM directory and snapshot directory. Remember that the path to the sd card is '/mnt/sd'. ROM directory and snapshot directory. Remember that the path to the sd card is '/mnt/sd'.
----------- -----------
@ -75,8 +76,8 @@ export PATH=<your arm-linux compiler path>:$PATH
This is what my configure line looks like: This is what my configure line looks like:
./configure --prefix=<your destination folder> --enable-zlib --disable-developer --host=gp2x --with-zlib-prefix=<your ./configure --prefix=<your destination folder> --enable-zlib --disable-developer --host=gp2x --with-zlib-prefix=<your
gp2x zlib path> --with-png-prefix=<your gp2x png path> --with-sdl-prefix=<your sdl config path> --x-libraries=<your X11 gp2x zlib path> --with-png-prefix=<your gp2x png path (configure appends '/include')> --with-sdl-prefix=<your sdl config
libraries path> path> --x-libraries=<your X11 libraries path>
Then: Then:
make make
@ -86,7 +87,10 @@ make gp2x-strip
You should get an exec ~2mb in size. Much better than 7mb right? You should get an exec ~2mb in size. Much better than 7mb right?
Place stella.gpe and stella.pro (available in ../src/emucore) into your destination directory on the GP2X and run. To gather all necessary files into directory './stella/gp2x' for easy access, type:
make gp2x-organize
Note: /gp2x directory created in the main stella source directory (next to configure, Makefile, etc.).
--------------- ---------------
Special Thanks: Special Thanks:

13
stella/configure vendored
View File

@ -416,7 +416,7 @@ psp)
EXEEXT=".elf" EXEEXT=".elf"
;; ;;
gp2x) gp2x)
EXEEXT=".gpe" EXEEXT=""
;; ;;
*) *)
EXEEXT="" EXEEXT=""
@ -839,9 +839,18 @@ case $_host_os in
CXXFLAGS="-O2 -finline-functions" CXXFLAGS="-O2 -finline-functions"
DEFINES="$DEFINES -DBSPF_GP2X -DGP2X -DHAVE_GETTIMEOFDAY -DHAVE_INTTYPES" DEFINES="$DEFINES -DBSPF_GP2X -DGP2X -DHAVE_GETTIMEOFDAY -DHAVE_INTTYPES"
MODULES="$MODULES $SRC/gp2x" MODULES="$MODULES $SRC/gp2x"
INCLUDES="$INCLUDES -I$SRC/gp2x"
#If PNG_CFLAGS is specified, include it.
#This saves the user the step of having to specify CXXFLAGS beforehand.
if [ -n $PNG_CFLAGS ]; then
INCLUDES="$INCLUDES $PNG_CFLAGS -I$SRC/gp2x"
else
INCLUDES="$INCLUDES -I$SRC/gp2x"
fi
_ranlib="arm-linux-ranlib" _ranlib="arm-linux-ranlib"
_ar="arm-linux-ar cru" _ar="arm-linux-ar cru"
# GP2X ARM Linux Specific strip # GP2X ARM Linux Specific strip
GP2X_STRIP="arm-linux-strip" GP2X_STRIP="arm-linux-strip"
;; ;;