Skip to content

Commit 2f4fab6

Browse files
committed
Fix compiling for GTK3 port. (Regression from commit d5e4ed5.)
1 parent d5e4ed5 commit 2f4fab6

File tree

1 file changed

+14
-11
lines changed

1 file changed

+14
-11
lines changed

desmume/src/frontend/posix/gtk/main.cpp

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,19 @@ enum {
135135
SUB_OBJ
136136
};
137137

138+
#ifdef HAVE_LIBAGG
139+
enum hud_display_enum {
140+
HUD_DISPLAY_FPS,
141+
HUD_DISPLAY_INPUT,
142+
HUD_DISPLAY_GINPUT,
143+
HUD_DISPLAY_FCOUNTER,
144+
HUD_DISPLAY_LCOUNTER,
145+
HUD_DISPLAY_RTC,
146+
HUD_DISPLAY_MIC,
147+
HUD_DISPLAY_EDITOR,
148+
};
149+
#endif
150+
138151
#ifdef AGG2D_USE_VECTORFONTS
139152
#define VECTOR_FONT_BASE_SIZE 16
140153

@@ -198,8 +211,8 @@ static void Modify_PriInterpolation(GSimpleAction *action, GVariant *parameter,
198211
static void Modify_Interpolation(GSimpleAction *action, GVariant *parameter, gpointer user_data);
199212
static void SetOrientation(GSimpleAction *action, GVariant *parameter, gpointer user_data);
200213
static void ToggleLayerVisibility(GSimpleAction *action, GVariant *parameter, gpointer user_data);
201-
static void ToggleHudDisplay(GtkToggleAction* action, gpointer data);
202214
#ifdef HAVE_LIBAGG
215+
static void ToggleHudDisplay(hud_display_enum hudId, gboolean active);
203216
static void HudFps(GSimpleAction *action, GVariant *parameter, gpointer user_data);
204217
static void HudInput(GSimpleAction *action, GVariant *parameter, gpointer user_data);
205218
static void HudGraphicalInput(GSimpleAction *action, GVariant *parameter, gpointer user_data);
@@ -3097,16 +3110,6 @@ static void desmume_gtk_menu_tool_layers(GtkApplication *app)
30973110
}
30983111

30993112
#ifdef HAVE_LIBAGG
3100-
enum hud_display_enum {
3101-
HUD_DISPLAY_FPS,
3102-
HUD_DISPLAY_INPUT,
3103-
HUD_DISPLAY_GINPUT,
3104-
HUD_DISPLAY_FCOUNTER,
3105-
HUD_DISPLAY_LCOUNTER,
3106-
HUD_DISPLAY_RTC,
3107-
HUD_DISPLAY_MIC,
3108-
HUD_DISPLAY_EDITOR,
3109-
};
31103113

31113114
static void ToggleHudDisplay(hud_display_enum hudId, gboolean active)
31123115
{

0 commit comments

Comments
 (0)