Skip to content

Commit

Permalink
(WIN32) Fix native ui savestate slots (#16290)
Browse files Browse the repository at this point in the history
  • Loading branch information
@sonninnos
sonninnos authored Feb 26, 2024
1 parent 3c4dd50 commit 7566a0f
Show file tree
Hide file tree
Showing 5 changed files with 46 additions and 32 deletions.
2 changes: 1 addition & 1 deletion Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ $(OBJDIR)/%.o: %.S config.h config.mk $(HEADERS)
$(OBJDIR)/%.o: %.rc $(HEADERS)
@mkdir -p $(dir $@)
@$(if $(Q), $(shell echo echo WINDRES $<),)
$(Q)$(WINDRES) -o $@ $<
$(Q)$(WINDRES) $(DEFINES) -o $@ $<

install: $(TARGET)
mkdir -p $(DESTDIR)$(BIN_DIR) 2>/dev/null || /bin/true
Expand Down
2 changes: 1 addition & 1 deletion Makefile.win
View file
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ $(OBJDIR)/%.o: %.cpp | $(dir $@)
$(OBJDIR)/%.o: %.rc $(HEADERS)
@-mkdir -p $(dir $@) || mkdir $(subst /,\,$(dir $@)) || echo .
@$(if $(Q), $(shell echo echo WINDRES $<),)
$(Q)$(WINDRES) -o $@ $<
$(Q)$(WINDRES) $(DEFINES) -o $@ $<

clean:
rm -rf $(OBJDIR)
Expand Down
28 changes: 15 additions & 13 deletions media/rarch.rc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,26 +32,26 @@ IDR_MENU MENU
{
POPUP "State Index"
{
MENUITEM "-1 (Auto)", ID_M_STATE_INDEX_AUTO
MENUITEM "0", ID_M_STATE_INDEX_AUTO
MENUITEM "1", ID_M_STATE_INDEX_AUTO
MENUITEM "2", ID_M_STATE_INDEX_AUTO
MENUITEM "3", ID_M_STATE_INDEX_AUTO
MENUITEM "4", ID_M_STATE_INDEX_AUTO
MENUITEM "5", ID_M_STATE_INDEX_AUTO
MENUITEM "6", ID_M_STATE_INDEX_AUTO
MENUITEM "7", ID_M_STATE_INDEX_AUTO
MENUITEM "8", ID_M_STATE_INDEX_AUTO
MENUITEM "9", ID_M_STATE_INDEX_AUTO
MENUITEM "Auto", ID_M_STATE_INDEX_AUTO
MENUITEM "0", ID_M_STATE_INDEX_0
MENUITEM "1", ID_M_STATE_INDEX_1
MENUITEM "2", ID_M_STATE_INDEX_2
MENUITEM "3", ID_M_STATE_INDEX_3
MENUITEM "4", ID_M_STATE_INDEX_4
MENUITEM "5", ID_M_STATE_INDEX_5
MENUITEM "6", ID_M_STATE_INDEX_6
MENUITEM "7", ID_M_STATE_INDEX_7
MENUITEM "8", ID_M_STATE_INDEX_8
MENUITEM "9", ID_M_STATE_INDEX_9
}
MENUITEM "Load State", ID_M_LOAD_STATE
MENUITEM "Save State", ID_M_SAVE_STATE
}
MENUITEM "Reset", ID_M_RESET
MENUITEM "Menu Toggle", ID_M_MENU_TOGGLE
MENUITEM "Pause Toggle", ID_M_PAUSE_TOGGLE
MENUITEM "Mouse Grab Toggle", ID_M_MOUSE_GRAB
MENUITEM "Menu Toggle", ID_M_MENU_TOGGLE
MENUITEM "Take Screenshot", ID_M_TAKE_SCREENSHOT
MENUITEM "Mouse Grab Toggle", ID_M_MOUSE_GRAB
}
POPUP "Window"
{
Expand All @@ -68,7 +68,9 @@ IDR_MENU MENU
MENUITEM "9x", ID_M_WINDOW_SCALE_9X
MENUITEM "10x", ID_M_WINDOW_SCALE_10X
}
#ifdef HAVE_QT
MENUITEM "Toggle Desktop Menu", ID_M_TOGGLE_DESKTOP
#endif
MENUITEM "Toggle Exclusive Full Screen", ID_M_FULL_SCREEN
// Shader dialog is disabled for now, until video_threaded issues are fixed.
//MENUITEM "Shader Parameters", ID_M_SHADER_PARAMETERS
Expand Down
28 changes: 15 additions & 13 deletions media/rarch_ja.rc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,26 +29,26 @@ IDR_MENU MENU
{
POPUP "��Ԃ̃C���f�b�N�X"
{
MENUITEM "-1 (����)", ID_M_STATE_INDEX_AUTO
MENUITEM "0", ID_M_STATE_INDEX_AUTO
MENUITEM "1", ID_M_STATE_INDEX_AUTO
MENUITEM "2", ID_M_STATE_INDEX_AUTO
MENUITEM "3", ID_M_STATE_INDEX_AUTO
MENUITEM "4", ID_M_STATE_INDEX_AUTO
MENUITEM "5", ID_M_STATE_INDEX_AUTO
MENUITEM "6", ID_M_STATE_INDEX_AUTO
MENUITEM "7", ID_M_STATE_INDEX_AUTO
MENUITEM "8", ID_M_STATE_INDEX_AUTO
MENUITEM "9", ID_M_STATE_INDEX_AUTO
MENUITEM "����", ID_M_STATE_INDEX_AUTO
MENUITEM "0", ID_M_STATE_INDEX_0
MENUITEM "1", ID_M_STATE_INDEX_1
MENUITEM "2", ID_M_STATE_INDEX_2
MENUITEM "3", ID_M_STATE_INDEX_3
MENUITEM "4", ID_M_STATE_INDEX_4
MENUITEM "5", ID_M_STATE_INDEX_5
MENUITEM "6", ID_M_STATE_INDEX_6
MENUITEM "7", ID_M_STATE_INDEX_7
MENUITEM "8", ID_M_STATE_INDEX_8
MENUITEM "9", ID_M_STATE_INDEX_9
}
MENUITEM "�ۑ���Ԃ����[�h", ID_M_LOAD_STATE
MENUITEM "��ԕۑ�", ID_M_SAVE_STATE
}
MENUITEM "���Z�b�g", ID_M_RESET
MENUITEM "���j���[�ɐ؂�ւ�", ID_M_MENU_TOGGLE
MENUITEM "�ꎞ��~", ID_M_PAUSE_TOGGLE
MENUITEM "�}�E�X�O���u�؂�ւ�", ID_M_MOUSE_GRAB
MENUITEM "���j���[�ɐ؂�ւ�", ID_M_MENU_TOGGLE
MENUITEM "�X�N���[���V���b�g���B��", ID_M_TAKE_SCREENSHOT
MENUITEM "�}�E�X�O���u�؂�ւ�", ID_M_MOUSE_GRAB
}
POPUP "�E�B���h�E"
{
Expand All @@ -65,7 +65,9 @@ IDR_MENU MENU
MENUITEM "9x", ID_M_WINDOW_SCALE_9X
MENUITEM "10x", ID_M_WINDOW_SCALE_10X
}
#ifdef HAVE_QT
MENUITEM "�f�X�N�g�b�v���j���[��\��", ID_M_TOGGLE_DESKTOP
#endif
MENUITEM "�r���I�ȃt���X�N���[���؂�ւ�", ID_M_FULL_SCREEN
// Shader dialog is disabled for now, until video_threaded issues are fixed.
//MENUITEM "�V�F�[�_�[�̃p�����[�^", ID_M_SHADER_PARAMETERS
Expand Down
18 changes: 14 additions & 4 deletions ui/drivers/ui_win32_resource.h
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@

#define IDR_MENU 101
#define IDD_PICKCORE 103
#define IDR_ACCELERATOR1 104
#define ID_M_LOAD_CONTENT 40001
#define ID_CORELISTBOX 40002
#define ID_M_RESET 40002
Expand All @@ -26,7 +27,16 @@
#define ID_M_FULL_SCREEN 40022
#define ID_M_MOUSE_GRAB 40023
#define ID_M_STATE_INDEX_AUTO 40024
#define ID_M_TAKE_SCREENSHOT 40025
#define ID_M_MUTE_TOGGLE 40026
#define ID_M_TOGGLE_DESKTOP 40027
#define IDR_ACCELERATOR1 104
#define ID_M_STATE_INDEX_0 40025
#define ID_M_STATE_INDEX_1 40026
#define ID_M_STATE_INDEX_2 40027
#define ID_M_STATE_INDEX_3 40028
#define ID_M_STATE_INDEX_4 40029
#define ID_M_STATE_INDEX_5 40030
#define ID_M_STATE_INDEX_6 40031
#define ID_M_STATE_INDEX_7 40032
#define ID_M_STATE_INDEX_8 40033
#define ID_M_STATE_INDEX_9 40034
#define ID_M_TAKE_SCREENSHOT 40035
#define ID_M_MUTE_TOGGLE 40036
#define ID_M_TOGGLE_DESKTOP 40037

0 comments on commit 7566a0f

Please sign in to comment.