From 95cb712a52125b89daf4f3d7eef69d01b124975c Mon Sep 17 00:00:00 2001 From: hiroshica Date: Wed, 26 Feb 2020 22:13:15 +0900 Subject: [PATCH] adding RG350 platform MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit squashed commits: RG350用のキーマップを作った opkのコマンドライン起動のエラー修正 mingw挑戦途中 --- README.md | 1 + configure | 15 ++++++++-- platform/opendingux/data/default.gcw0.desktop | 8 ++--- platform/opendingux/inputmap.c | 30 +++++++++++++++++++ 4 files changed, 47 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index a5d0ad3a..86da98e1 100644 --- a/README.md +++ b/README.md @@ -34,6 +34,7 @@ gp2x,wiz,caanoo|open2x with ubuntu arm gcc 4.7|CROSS_COMPILE=arm-linux-gnueabi- opendingux|opendingux|CROSS_COMPILE=mipsel-linux- CFLAGS="-I$TC/usr/include -I$TC/usr/include/SDL" LDFLAGS="--sysroot $TC -L$TC/lib" ./configure --platform=opendingux opendingux|opendingux with ubuntu mips gcc 5.4|CROSS_COMPILE=mipsel-linux-gnu- CFLAGS="-I$TC/usr/include -I$TC/usr/include/SDL" LDFLAGS="-B$TC/usr/lib -B$TC/lib -Wl,-rpath-link=$TC/usr/lib -Wl,-rpath-link=$TC/lib" ./configure --platform=opendingux gcw0|gcw0|CROSS_COMPILE=mipsel-gcw0-linux-uclibc- CFLAGS="-I$TC/usr/mipsel-gcw0-linux-uclibc/sysroot/usr/include -I$TC/usr/mipsel-gcw0-linux-uclibc/sysroot/usr/include/SDL" LDFLAGS="--sysroot $TC/usr/mipsel-gcw0-linux-uclibc/sysroot" ./configure --platform=gcw0 +rg350|rg350|CROSS_COMPILE=mipsel-linux- CFLAGS="-I$TC/usr/include -I$TC/usr/include/SDL" LDFLAGS="--sysroot $TC -L$TC/lib" ./configure --platform=rg350 For gp2x, wiz, and caanoo you may need to compile libpng first. diff --git a/configure b/configure index c82fe205..6860eb70 100755 --- a/configure +++ b/configure @@ -38,7 +38,7 @@ check_define() # setting options to "yes" or "no" will make that choice default, # "" means "autodetect". -platform_list="generic pandora gp2x wiz caanoo opendingux gcw0 rpi1 rpi2" +platform_list="generic pandora gp2x wiz caanoo opendingux gcw0 rg350 rpi1 rpi2" platform="generic" sound_driver_list="oss alsa sdl" sound_drivers="" @@ -62,7 +62,12 @@ CC="${CC-${CROSS_COMPILE}gcc}" CXX="${CXX-${CROSS_COMPILE}g++}" AS="${AS-${CROSS_COMPILE}as}" STRIP="${STRIP-${CROSS_COMPILE}strip}" -test -n "$SDL_CONFIG" || SDL_CONFIG="`$CC $CFLAGS $LDFLAGS --print-sysroot 2> /dev/null || true`/usr/bin/sdl-config" +SYSROOT=`$CC $CFLAGS $LDFLAGS --print-sysroot 2> /dev/null || true` +test -n "$SDL_CONFIG" || SDL_CONFIG="$(ls $SYSROOT/*bin*/sdl-config 2>/dev/null | grep /bin/sdl-config | head -n 1)" +test -n "$SDL_CONFIG" || SDL_CONFIG="$(ls $SYSROOT/*/*bin*/sdl-config 2>/dev/null | grep /bin/sdl-config | head -n 1)" +#test -n "$SDL_CONFIG" || SDL_CONFIG="$(ls $SYSROOT/*bin*/sdl2-config 2>/dev/null | grep /bin/sdl2-config | head -n 1)" +#test -n "$SDL_CONFIG" || SDL_CONFIG="$(ls $SYSROOT/*/*bin*/sdl2-config 2>/dev/null | grep /bin/sdl2-config | head -n 1)" +SDLVERSION=sdl && echo $SDL_CONFIG | grep -q sdl2 && SDLVERSION=sdl2 MAIN_LDLIBS="$LDLIBS -lm" config_mak="config.mak" @@ -86,9 +91,10 @@ set_platform() ;; generic) ;; - opendingux | gcw0) + opendingux | gcw0 | rg350) sound_drivers="sdl" # both are really an opendingux + CFLAGS="$CFLAGS -D__`echo $platform | tr '[a-z]' '[A-Z]'`__" platform="opendingux" ;; pandora) @@ -376,6 +382,9 @@ if [ "$need_sdl" = "yes" ]; then CFLAGS="$CFLAGS `$SDL_CONFIG --cflags`" MAIN_LDLIBS="`$SDL_CONFIG --libs` $MAIN_LDLIBS" check_sdl `$SDL_CONFIG --libs` || fail "please install libsdl (libsdl1.2-dev)" + if [ "$SDLVERSION" = "sdl2" ]; then + CFLAGS="$CFLAGS -D__USE_SDL2__" + fi fi if check_option -Wno-unused_result; then diff --git a/platform/opendingux/data/default.gcw0.desktop b/platform/opendingux/data/default.gcw0.desktop index 80458bd8..3e17a75e 100644 --- a/platform/opendingux/data/default.gcw0.desktop +++ b/platform/opendingux/data/default.gcw0.desktop @@ -1,9 +1,9 @@ [Desktop Entry] +Type=Application Name=Picodrive Comment=A megadrive/genesis emulator -Exec=PicoDrive -Terminal=false -Type=Application -StartupNotify=true +Exec=PicoDrive %f Icon=megadrive +Terminal=false Categories=emulators; +MimeType=.md;.smd;.bin;.sms;.cue;.32x;.zip;.7z diff --git a/platform/opendingux/inputmap.c b/platform/opendingux/inputmap.c index 0398fc68..8c4ba6a0 100644 --- a/platform/opendingux/inputmap.c +++ b/platform/opendingux/inputmap.c @@ -37,6 +37,7 @@ const struct menu_keymap in_sdl_key_map[] = { SDLK_BACKSPACE, PBTN_R }, }; +#if !defined(__RG350__) const char * const in_sdl_key_names[SDLK_LAST] = { [SDLK_UP] = "UP", [SDLK_DOWN] = "DOWN", @@ -52,4 +53,33 @@ const char * const in_sdl_key_names[SDLK_LAST] = { [SDLK_ESCAPE] = "SELECT", [SDLK_POWER] = "POWER", [SDLK_PAUSE] = "LOCK", + + [SDLK_PAGEUP] = "L2", + [SDLK_PAGEDOWN] = "R2", + [SDLK_KP_DIVIDE] = "L3", + [SDLK_KP_PERIOD] = "R3", +}; +#else +/* RG 350 */ +const char * const in_sdl_key_names[SDLK_LAST] = { + [SDLK_UP] = "UP", + [SDLK_DOWN] = "DOWN", + [SDLK_LEFT] = "LEFT", + [SDLK_RIGHT] = "RIGHT", + [SDLK_LCTRL] = "A", + [SDLK_LALT] = "B", + [SDLK_SPACE] = "X", + [SDLK_LSHIFT] = "Y", + [SDLK_TAB] = "L", + [SDLK_BACKSPACE] = "R", + [SDLK_RETURN] = "START", + [SDLK_ESCAPE] = "SELECT", + [SDLK_HOME] = "POWER", + [SDLK_PAUSE] = "LOCK", + + [SDLK_PAGEUP] = "L2", + [SDLK_PAGEDOWN] = "R2", + [SDLK_KP_DIVIDE] = "L3", + [SDLK_KP_PERIOD] = "R3", }; +#endif -- 2.39.5