Skip to content

Commit

Permalink
added L button for fast-forwarding toggle, with opk generation embedd…
Browse files Browse the repository at this point in the history
…ed into makefile
  • Loading branch information
soarqin committed Nov 23, 2019
1 parent bf89b7f commit a0dc666
Show file tree
Hide file tree
Showing 8 changed files with 153 additions and 225 deletions.
12 changes: 9 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -255,14 +255,20 @@ LIBS = $(SDL_LIBS) -lz -lm
TARGET = fceux

all: $(TARGET)
mipsel-linux-strip bin/$(TARGET)

opk: $(TARGET).opk

$(TARGET).opk: $(TARGET)
@echo Creating $@...
@mipsel-linux-strip bin/$(TARGET)
@mksquashfs $(TARGET) src/drivers/dingux-sdl/gui/*.bmp opk/fceux.png opk/default.gcw0.desktop $@ -all-root -no-xattrs -noappend -no-exports

$(TARGET): $(OBJS)
@mkdir -p bin/
@cp src/drivers/dingux-sdl/gui/*.bmp bin/
@echo Linking $@...
@echo $(LD) $(LDFLAGS) $(OBJS) -o bin/$@
$(LD) $(LDFLAGS) $(OBJS) $(LIBS) -o bin/$@
@echo $(LD) $(LDFLAGS) $(OBJS) -o $@
$(LD) $(LDFLAGS) $(OBJS) $(LIBS) -o $@

%.o: %.c
@echo Compiling $<...
Expand Down
31 changes: 0 additions & 31 deletions make_opk.sh

This file was deleted.

10 changes: 10 additions & 0 deletions opk/default.gcw0.desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
[Desktop Entry]
Name=Fceux
Comment=NES/Famicom emulator
Exec=fceux %f
Terminal=false
Type=Application
MimeType=application/zip;application/x-nes-rom;
StartupNotify=true
Icon=fceux
Categories=emulators;
File renamed without changes
23 changes: 12 additions & 11 deletions src/drivers/dingux-sdl/config.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -315,30 +315,31 @@ Config * InitConfig() {
// Will use R + Button combo for hotkeys on dingoo
// So only 11 hotkeys available
// L trigger will be saved for GUI
const int Hotkeys[HK_MAX] = { -1, // cheat menu
const int Hotkeys[HK_MAX] = {
-1, // cheat menu
-1, // bind state
-1, // load lua
-1, // toggleBG
0, // save state
2, // fds flip disk
-1, // save state
-1, // fds flip disk
-1, // fds select
1, // load state
-1, // load state
-1, // fds eject
5, // VS insert coin
-1, // VS insert coin
-1, // VS toggle dipswitch
6, // toggle frame display
27, // toggle subtitle
-1, // toggle frame display
-1, // toggle subtitle
-1, // reset
17, // screenshot
16, // pause
-1, // screenshot
-1, // pause
-1, // speed++
-1, // speed--
18, //frame advance
-1, // frame advance
-1, // turbo
-1, // toggle input display
-1, // toggle movie RW
-1, // toggle mute capture
29, // quit
-1, // quit
-1, // frame advance lag skip
-1, // lag counter display
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1 };
Expand Down
3 changes: 3 additions & 0 deletions src/drivers/dingux-sdl/dingoo-sound.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,9 @@ void WriteSound(int32 *buf, int Count)
{
//extern int EmulationPaused;

if (NoWaiting) {
Count /= (1 + NoWaiting);
}
SDL_LockAudio();

/*if (EmulationPaused == 0)*/ { // for some reason EmulationPaused is always 1, ignore it
Expand Down
2 changes: 1 addition & 1 deletion src/drivers/dingux-sdl/gui/control_settings.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ int RunControlSettings()
g_config->getOption(cm_menu[i].option, &iBtnVal);

if (i == CONTROL_MENUSIZE-1)
sprintf(cBtn, "%s", "");
cBtn[0] = 0;
else if (i == CONTROL_MENUSIZE-2)
{
int value;
Expand Down
Loading

0 comments on commit a0dc666

Please sign in to comment.