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

Updated button mapping to incorporate the new UI events. Updated configure to fix a linking issue. 

git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1161 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
This commit is contained in:
azaballa 2006-11-29 00:24:57 +00:00
parent cc5afaba11
commit 36f4122d7d
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
stella/configure vendored
View File

@ -853,10 +853,10 @@ case $_host_os in
;; ;;
gp2x) gp2x)
# -O3 hangs the GP2X, do not use. # -O3 hangs the GP2X, do not use.
CXXFLAGS="-O2 -finline-functions -mtune=arm940t" CXXFLAGS="-O2 -finline-functions -mtune=arm920t"
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" INCLUDES="$INCLUDES -I$SRC/gp2x $ZLIB_CFLAGS"
_ranlib="arm-linux-ranlib" _ranlib="arm-linux-ranlib"
_ar="arm-linux-ar cru" _ar="arm-linux-ar cru"

17
stella/src/gp2x/OSystemGP2X.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: OSystemGP2X.cxx,v 1.12 2006-11-28 21:48:56 stephena Exp $ // $Id: OSystemGP2X.cxx,v 1.13 2006-11-29 00:24:57 azaballa Exp $
// Modified on 2006/01/06 by Alex Zaballa for use on GP2X // Modified on 2006/01/06 by Alex Zaballa for use on GP2X
//============================================================================ //============================================================================
@ -136,10 +136,10 @@ void OSystemGP2X::getScreenDimensions(int& width, int& height)
void OSystemGP2X::setDefaultJoymap() void OSystemGP2X::setDefaultJoymap()
{ {
myEventHandler->setDefaultJoyMapping(Event::LauncherMode, kEmulationMode, 0, 8); // Start myEventHandler->setDefaultJoyMapping(Event::LauncherMode, kEmulationMode, 0, 8); // Start
myEventHandler->setDefaultJoyMapping(Event::CmdMenuMode, kEmulationMode, 0, 9); // Select myEventHandler->setDefaultJoyMapping(Event::TakeSnapshot, kEmulationMode, 0, 9); // Select
myEventHandler->setDefaultJoyMapping(Event::ConsoleReset, kEmulationMode, 0, 10); // L myEventHandler->setDefaultJoyMapping(Event::ConsoleReset, kEmulationMode, 0, 10); // L
myEventHandler->setDefaultJoyMapping(Event::ConsoleSelect, kEmulationMode, 0, 11); // R myEventHandler->setDefaultJoyMapping(Event::ConsoleSelect, kEmulationMode, 0, 11); // R
myEventHandler->setDefaultJoyMapping(Event::TakeSnapshot, kEmulationMode, 0, 12); // A myEventHandler->setDefaultJoyMapping(Event::CmdMenuMode, kEmulationMode, 0, 12); // A
myEventHandler->setDefaultJoyMapping(Event::JoystickZeroFire, kEmulationMode, 0, 13); // B myEventHandler->setDefaultJoyMapping(Event::JoystickZeroFire, kEmulationMode, 0, 13); // B
myEventHandler->setDefaultJoyMapping(Event::Pause, kEmulationMode, 0, 14); // X myEventHandler->setDefaultJoyMapping(Event::Pause, kEmulationMode, 0, 14); // X
myEventHandler->setDefaultJoyMapping(Event::MenuMode, kEmulationMode, 0, 15); // Y myEventHandler->setDefaultJoyMapping(Event::MenuMode, kEmulationMode, 0, 15); // Y
@ -147,15 +147,16 @@ void OSystemGP2X::setDefaultJoymap()
myEventHandler->setDefaultJoyMapping(Event::VolumeDecrease, kEmulationMode, 0, 17); // Vol- myEventHandler->setDefaultJoyMapping(Event::VolumeDecrease, kEmulationMode, 0, 17); // Vol-
myEventHandler->setDefaultJoyMapping(Event::NoType, kEmulationMode, 0, 18); // Click myEventHandler->setDefaultJoyMapping(Event::NoType, kEmulationMode, 0, 18); // Click
//Begin Menu Navigation Mapping //Begin Menu Navigation Mapping
myEventHandler->setDefaultJoyMapping(Event::NoType, kMenuMode, 0, 8); // Start myEventHandler->setDefaultJoyMapping(Event::UICancel, kMenuMode, 0, 8); // Start
myEventHandler->setDefaultJoyMapping(Event::NoType, kMenuMode, 0, 9); // Select myEventHandler->setDefaultJoyMapping(Event::UIOK, kMenuMode, 0, 9); // Select
myEventHandler->setDefaultJoyMapping(Event::UIPgUp, kMenuMode, 0, 10); // L myEventHandler->setDefaultJoyMapping(Event::UIPgUp, kMenuMode, 0, 10); // L
myEventHandler->setDefaultJoyMapping(Event::UIPgDown, kMenuMode, 0, 11); // R myEventHandler->setDefaultJoyMapping(Event::UIPgDown, kMenuMode, 0, 11); // R
myEventHandler->setDefaultJoyMapping(Event::UITabNext, kMenuMode, 0, 12); // A myEventHandler->setDefaultJoyMapping(Event::UITabNext, kMenuMode, 0, 12); // A
myEventHandler->setDefaultJoyMapping(Event::UISelect, kMenuMode, 0, 13); // B myEventHandler->setDefaultJoyMapping(Event::UISelect, kMenuMode, 0, 13); // B
myEventHandler->setDefaultJoyMapping(Event::UINavNext, kMenuMode, 0, 15); // Y myEventHandler->setDefaultJoyMapping(Event::UITabPrev, kMenuMode, 0, 14); // X
myEventHandler->setDefaultJoyMapping(Event::NoType, kMenuMode, 0, 16); // Vol+ myEventHandler->setDefaultJoyMapping(Event::UICancel, kMenuMode, 0, 15); // Y
myEventHandler->setDefaultJoyMapping(Event::NoType, kMenuMode, 0, 17); // Vol- myEventHandler->setDefaultJoyMapping(Event::UINavNext, kMenuMode, 0, 16); // Vol+
myEventHandler->setDefaultJoyMapping(Event::UINavPrev, kMenuMode, 0, 17); // Vol-
myEventHandler->setDefaultJoyMapping(Event::NoType, kMenuMode, 0, 18); // Click myEventHandler->setDefaultJoyMapping(Event::NoType, kMenuMode, 0, 18); // Click
} }