Moved the OpenGL 3.3 renderer and Discord integration out of the Dev branch.

2021-11-29 15:42:50 +01:00
parent c6c2988b64
commit 295f750884
23 changed files with 68 additions and 306 deletions
--- a/src/86box.c
+++ b/src/86box.c
@@ -167,9 +167,7 @@ int	time_sync = 0;				/* (C) enable time sync */
 int	confirm_reset = 1;			/* (C) enable reset confirmation */
 int confirm_exit = 1;				/* (C) enable exit confirmation */
 int confirm_save = 1;				/* (C) enable save confirmation */
-#ifdef USE_DISCORD
 int	enable_discord = 0;			/* (C) enable Discord integration */
-#endif
 int	enable_crashdump = 0;			/* (C) enable crash dump */

 /* Statistics. */
--- a/src/config.c
+++ b/src/config.c
@@ -579,15 +579,11 @@ load_general(void)
 	else
 		strcpy(icon_set, "");
 	
-#if USE_DISCORD
    enable_discord = !!config_get_int(cat, "enable_discord", 0);
-#endif

-#if defined(DEV_BRANCH) && defined(USE_OPENGL)
    video_framerate = config_get_int(cat, "video_gl_framerate", -1);
    video_vsync = config_get_int(cat, "video_gl_vsync", 0);
    strcpy_s(video_shader, sizeof(video_shader), config_get_string(cat, "video_gl_shader", ""));
-#endif
 }


@@ -2243,14 +2239,11 @@ save_general(void)
 	else
 		config_set_string(cat, "iconset", icon_set);

-#if USE_DISCORD
    if (enable_discord)
 	config_set_int(cat, "enable_discord", enable_discord);
    else
 	config_delete_var(cat, "enable_discord");
-#endif

-#if defined(DEV_BRANCH) && defined(USE_OPENGL)
    if (video_framerate != -1)
 	    config_set_int(cat, "video_gl_framerate", video_framerate);
    else
@@ -2263,7 +2256,6 @@ save_general(void)
 	    config_set_string(cat, "video_gl_shader", video_shader);
    else
 	    config_delete_var(cat, "video_gl_shader");
-#endif

    delete_section_if_empty(cat);
 }
--- a/src/include/86box/win.h
+++ b/src/include/86box/win.h
@@ -66,9 +66,7 @@ DECLARE_HANDLE(DPI_AWARENESS_CONTEXT);
 #define ZIP_SUBMENU_NAME	L"ZIPSubmenu"
 #define MO_SUBMENU_NAME		L"MOSubmenu"

-#if defined(DEV_BRANCH) && defined(USE_OPENGL)
 #define VID_GL_SUBMENU		L"VidGLSubMenu"
-#endif

 /* Application-specific window messages.

--- a/src/win/CMakeLists.txt
+++ b/src/win/CMakeLists.txt
@@ -20,7 +20,8 @@ add_library(plat OBJECT win.c win_dynld.c win_cdrom.c win_thread.c

 add_library(ui OBJECT win_ui.c win_icon.c win_stbar.c win_sdl.c win_dialog.c win_about.c
 	win_settings.c win_devconf.c win_snd_gain.c win_specify_dim.c win_new_floppy.c
-	win_jsconf.c win_media_menu.c win_preferences.c 86Box.rc)
+	win_jsconf.c win_media_menu.c win_preferences.c win_discord.c glad.c win_opengl.c
+	win_opengl_glslp.c 86Box.rc)

 if(MSVC)
 	# MSVC complains when we include the manifest from 86Box.rc...
@@ -44,19 +45,5 @@ else()
 	target_sources(plat PRIVATE win_joystick_rawinput.c)
 endif()

-if(DISCORD)
-	# PUBLIC due to config.c and 86box.c
-	target_compile_definitions(ui PUBLIC USE_DISCORD)
-
-	target_sources(ui PRIVATE win_discord.c)
-endif()
-
-if(OPENGL)
-	target_compile_definitions(ui PUBLIC USE_OPENGL)
-	target_compile_definitions(plat PRIVATE USE_OPENGL)
-
-	target_sources(ui PRIVATE glad.c win_opengl.c win_opengl_glslp.c)
-endif()
-
 target_link_libraries(86Box advapi32 comctl32 comdlg32 gdi32 shell32 iphlpapi
 	dxguid imm32 hid setupapi uxtheme version winmm psapi)
--- a/src/win/Makefile.mingw
+++ b/src/win/Makefile.mingw
@@ -54,9 +54,6 @@ ifeq ($(DEV_BUILD), y)
 ifndef OPEN_AT
  OPEN_AT	:= y
 endif
- ifndef OPENGL
-  OPENGL	:= y
- endif
 ifndef PAS16
  PAS16		:= n
 endif
@@ -106,9 +103,6 @@ else
 ifndef OPEN_AT
  OPEN_AT	:= n
 endif
- ifndef OPENGL
-  OPENGL	:= n
- endif
 ifndef PAS16
  PAS16		:= n
 endif
@@ -151,9 +145,6 @@ endif
 ifndef ARM64
 ARM64 := n
 endif
-ifndef WX
-WX		:= n
-endif
 ifndef DINPUT
 DINPUT		:= n
 endif
@@ -184,9 +175,6 @@ ifeq ($(DYNAREC), y)
  endif
 endif
 endif
-ifndef DISCORD
- DISCORD	:= y
-endif


 # Path to the dynamic recompiler code.
@@ -198,45 +186,7 @@ endif


 # Name of the executable.
-ifndef PROG
- ifneq ($(WX), n)
-  PROG		:= Wx86Box
- else
-  PROG		:= 86Box
- endif
-endif
-
-# WxWidgets basic info. Extract using the config program.
-ifneq ($(WX), n)
- EXPATH		+= wx
- WX_CONFIG	:= wx-config.exe
- ifeq ($(WX), y)
-  WX_PATH	:= C:/MinGW32/WxWidgets
-  WX_FLAGS	:= -I$(WX_PATH)/lib/wx/include/msw-unicode-3.0 \
-		   -I$(WX_PATH)/include/wx-3.0 \
-		   -D__WXMSW__ -DWX_PRECOMP -D_FILE_OFFSET_BITS=64 -pthread
-#		   -lwx_mswu_gl-3.0 -lwxtiff-3.0 -llzma
-  WX_LIBS	:= -mwindows -mthreads -L$(WX_PATH)/lib \
-		   -lwx_mswu-3.0.dll \
-		   -lrpcrt4 -loleaut32 -lole32 -luuid \
-		   -lwinspool -lwinmm -lshell32 -lcomctl32 \
-		   -lcomdlg32 -ladvapi32 -lwsock32 -lgdi32
- endif
- ifeq ($(WX), static)
-  WX_PATH	:= C:/MinGW32/WxWidgets
-  WX_FLAGS	:= -I$(WX_PATH)/lib/wx/include/msw-unicode-3.0 \
-		   -I$(WX_PATH)/include/wx-3.0 \
-		   -D__WXMSW__ -DWX_PRECOMP -D_FILE_OFFSET_BITS=64 -pthread
-#		   -lwx_mswu_gl-3.0 -lwxtiff-3.0 -llzma
-  WX_LIBS	:= -mwindows -mthreads -L$(WX_PATH)/lib \
-		   -lwx_mswu-3.0 -lwxscintilla-3.0 \
-		   -lwxjpeg-3.0 -lwxpng-3.0 -lwxzlib-3.0 \
-		   -lwxregexu-3.0 -lwxexpat-3.0 \
-		   -lrpcrt4 -loleaut32 -lole32 -luuid \
-		   -lwinspool -lwinmm -lshell32 -lcomctl32 \
-		   -lcomdlg32 -ladvapi32 -lwsock32 -lgdi32
- endif
-endif
+PROG		:= 86Box


 #########################################################################
@@ -400,18 +350,6 @@ else
 endif
 endif

-ifeq ($(WX), y)
- OPTS		+= -DUSE_WX $(WX_FLAGS)
- LIBS		+= $(WX_LIBS)
- UIOBJ		:= wx_main.o wx_ui.o wx_stbar.o wx_render.o
-else
- UIOBJ		:= win_ui.o win_icon.o win_stbar.o \
-		   win_sdl.o \
-		   win_dialog.o win_about.o \
-		   win_settings.o win_devconf.o win_snd_gain.o win_specify_dim.o win_preferences.o \
-		   win_new_floppy.o win_jsconf.o win_media_menu.o
-endif
-
 ifeq ($(OPENAL), y)
 OPTS		+= -DUSE_OPENAL
 endif
@@ -443,12 +381,6 @@ VNCLIB		+=  -lvncserver
 VNCOBJ		:= vnc.o vnc_keymap.o
 endif

-ifeq ($(DISCORD), y)
-OPTS		+= -DUSE_DISCORD
-RFLAGS		+= -DUSE_DISCORD
-DISCORDOBJ	:= win_discord.o
-endif
-
 ifeq ($(MINITRACE), y)
 OPTS		+= -DMTR_ENABLED
 RFLAGS		+= -DMTR_ENABLED
@@ -491,12 +423,6 @@ ifeq ($(OPEN_AT), y)
 OPTS		+= -DUSE_OPEN_AT
 endif

-ifeq ($(OPENGL), y)
-OPTS		+= -DUSE_OPENGL
-RFLAGS		+= -DUSE_OPENGL
-DEVBROBJ	+= win_opengl.o win_opengl_glslp.o glad.o
-endif
-
 ifeq ($(PAS16), y)
 OPTS		+= -DUSE_PAS16
 DEVBROBJ	+= snd_pas16.o
@@ -525,7 +451,7 @@ endif


 # Final versions of the toolchain flags.
-CFLAGS		:= $(WX_FLAGS) $(OPTS) $(DFLAGS) $(COPTIM) $(AOPTIM) \
+CFLAGS		:= $(OPTS) $(DFLAGS) $(COPTIM) $(AOPTIM) \
 		   $(AFLAGS) -fomit-frame-pointer -mstackrealign -Wall \
 		   -fno-strict-aliasing

@@ -751,6 +677,13 @@ PLATOBJ		:= win.o \
 		    win_crashdump.o win_midi.o \
 		    win_mouse.o

+UIOBJ		:= win_ui.o win_icon.o win_stbar.o win_discord.o \
+		   win_sdl.o win_opengl.o win_opengl_glslp.o glad.o \
+		   win_dialog.o win_about.o \
+		   win_settings.o win_devconf.o win_snd_gain.o win_specify_dim.o win_preferences.o \
+		   win_new_floppy.o win_jsconf.o \
+		   win_media_menu.o
+
 ifeq ($(DINPUT), y)
 PLATOBJ	+= win_joystick.o
 else
@@ -760,8 +693,7 @@ endif
 OBJ		:= $(MAINOBJ) $(CPUOBJ) $(CHIPSETOBJ) $(MCHOBJ) $(DEVOBJ) $(MEMOBJ) \
 		   $(FDDOBJ) $(GAMEOBJ) $(CDROMOBJ) $(ZIPOBJ) $(MOOBJ) $(HDDOBJ) $(MINIVHDOBJ) \
 		   $(NETOBJ) $(PRINTOBJ) $(SCSIOBJ) $(SIOOBJ) $(SNDOBJ) $(VIDOBJ) $(VOODOOOBJ) \
-		   $(PLATOBJ) $(UIOBJ) $(FSYNTHOBJ) $(MUNTOBJ) $(DEVBROBJ) \
-		   $(DISCORDOBJ) $(MINITRACEOBJ)
+		   $(PLATOBJ) $(UIOBJ) $(FSYNTHOBJ) $(MUNTOBJ) $(DEVBROBJ) $(MINITRACEOBJ)
 ifdef EXOBJ
 OBJ		+= $(EXOBJ)
 endif
@@ -772,9 +704,6 @@ LIBS		:= -mwindows -lcomctl32 \
 ifeq ($(VNC), y)
 LIBS		+= $(VNCLIB) -lws2_32
 endif
-ifneq ($(WX), n)
-LIBS		+= $(WX_LIBS) -lm
-endif
 LIBS		+= -lpng -lz -lwsock32 -lshell32 -liphlpapi -lpsapi -lSDL2 -limm32 -lhid -lsetupapi -loleaut32 -luxtheme -lversion -lwinmm -static -lstdc++
 ifneq ($(X64), y)
 ifneq ($(ARM64), y)
@@ -861,7 +790,7 @@ ifneq ($(DEBUG), y)
 endif

 hello.exe:	hello.o
-		$(CXX) $(LDFLAGS) -o hello.exe hello.o $(WXLIBS) $(LIBS)
+		$(CXX) $(LDFLAGS) -o hello.exe hello.o $(LIBS)
 ifneq ($(DEBUG), y)
 		@$(STRIP) hello.exe
 endif
--- a/src/win/languages/cs-CZ.rc
+++ b/src/win/languages/cs-CZ.rc
@@ -41,9 +41,7 @@ BEGIN
            MENUITEM "&SDL (Software)",				IDM_VID_SDL_SW
            MENUITEM "SDL (&Hardware)",				IDM_VID_SDL_HW
            MENUITEM "SDL (&OpenGL)",				IDM_VID_SDL_OPENGL
-#if defined(DEV_BRANCH) && defined(USE_OPENGL)
            MENUITEM "Open&GL (3.3 Core)",			IDM_VID_OPENGL_CORE
-#endif
 #ifdef USE_VNC
            MENUITEM "&VNC",					IDM_VID_VNC
 #endif
@@ -100,15 +98,12 @@ BEGIN
    BEGIN
        MENUITEM "&Nastavení...",				IDM_CONFIG
        MENUITEM "&Aktualizovat ikony stavového řádku",		IDM_UPDATE_ICONS
-        MENUITEM SEPARATOR
-        MENUITEM "&Předvolby...",				IDM_PREFERENCES
-# ifdef USE_DISCORD
-        MENUITEM SEPARATOR
-        MENUITEM "Povolit integraci s &Discordem",		IDM_DISCORD
-# endif
        MENUITEM SEPARATOR
        MENUITEM "Pořídit &screenshot\tCtrl+F11",		IDM_ACTION_SCREENSHOT
        MENUITEM SEPARATOR
+        MENUITEM "&Předvolby...",				IDM_PREFERENCES
+        MENUITEM "Povolit integraci s &Discordem",		IDM_DISCORD
+        MENUITEM SEPARATOR
        MENUITEM "&Zesílení zvuku",				IDM_SND_GAIN
 #ifdef MTR_ENABLED
        MENUITEM SEPARATOR
@@ -249,7 +244,6 @@ BEGIN
    END
 END

-#if defined(DEV_BRANCH) && defined(USE_OPENGL)
 VidGLSubMenu MENU DISCARDABLE
 BEGIN
    POPUP "&Cílová snímková frekvence"
@@ -265,7 +259,6 @@ BEGIN
    MENUITEM "&Zvolit shader...", IDM_VID_GL_SHADER
    MENUITEM "&Odebrat shader", IDM_VID_GL_NOSHADER
 END
-#endif


 /////////////////////////////////////////////////////////////////////////////
--- a/src/win/languages/de-DE.rc
+++ b/src/win/languages/de-DE.rc
@@ -41,9 +41,7 @@ BEGIN
            MENUITEM "&SDL (Software)",         IDM_VID_SDL_SW
            MENUITEM "SDL (&Hardware)",         IDM_VID_SDL_HW
            MENUITEM "SDL (&OpenGL)",           IDM_VID_SDL_OPENGL
-#if defined(DEV_BRANCH) && defined(USE_OPENGL)
            MENUITEM "Open&GL (3.3-Kern)",      IDM_VID_OPENGL_CORE
-#endif
 #ifdef USE_VNC
            MENUITEM "&VNC",                    IDM_VID_VNC
 #endif
@@ -100,15 +98,12 @@ BEGIN
    BEGIN
        MENUITEM "&Optionen...",                IDM_CONFIG
        MENUITEM "&Statusleistenicons aktualisieren",	IDM_UPDATE_ICONS
-        MENUITEM SEPARATOR
-        MENUITEM "&Einstellungen...",    IDM_PREFERENCES
-# ifdef USE_DISCORD
-        MENUITEM SEPARATOR
-        MENUITEM "&Discord-Integration aktivieren", IDM_DISCORD
-# endif
        MENUITEM SEPARATOR
        MENUITEM "S&creenshot aufnehmen\tStrg+F11",  IDM_ACTION_SCREENSHOT
        MENUITEM SEPARATOR
+        MENUITEM "&Einstellungen...",    IDM_PREFERENCES
+        MENUITEM "&Discord-Integration aktivieren", IDM_DISCORD
+        MENUITEM SEPARATOR
        MENUITEM "&Schallverstärkung...",              IDM_SND_GAIN
 #ifdef MTR_ENABLED
        MENUITEM SEPARATOR
@@ -249,7 +244,6 @@ BEGIN
    END
 END

-#if defined(DEV_BRANCH) && defined(USE_OPENGL)
 VidGLSubMenu MENU DISCARDABLE
 BEGIN
    POPUP "Ziel&framerate"
@@ -265,7 +259,6 @@ BEGIN
    MENUITEM "&Shader auswählen...", IDM_VID_GL_SHADER
    MENUITEM "&Shader entfernen", IDM_VID_GL_NOSHADER
 END
-#endif


 /////////////////////////////////////////////////////////////////////////////
--- a/src/win/languages/en-GB.rc
+++ b/src/win/languages/en-GB.rc
@@ -41,9 +41,7 @@ BEGIN
            MENUITEM "&SDL (Software)",         IDM_VID_SDL_SW
            MENUITEM "SDL (&Hardware)",         IDM_VID_SDL_HW
            MENUITEM "SDL (&OpenGL)",           IDM_VID_SDL_OPENGL
-#if defined(DEV_BRANCH) && defined(USE_OPENGL)
            MENUITEM "Open&GL (3.3 Core)",      IDM_VID_OPENGL_CORE
-#endif
 #ifdef USE_VNC
            MENUITEM "&VNC",                    IDM_VID_VNC
 #endif
@@ -100,15 +98,12 @@ BEGIN
    BEGIN
        MENUITEM "&Settings...",                IDM_CONFIG
        MENUITEM "&Update status bar icons",	IDM_UPDATE_ICONS
-        MENUITEM SEPARATOR
-        MENUITEM "&Preferences...",		IDM_PREFERENCES
-# ifdef USE_DISCORD
-        MENUITEM SEPARATOR
-        MENUITEM "Enable &Discord integration", IDM_DISCORD
-# endif
        MENUITEM SEPARATOR
        MENUITEM "Take s&creenshot\tCtrl+F11",  IDM_ACTION_SCREENSHOT
        MENUITEM SEPARATOR
+        MENUITEM "&Preferences...",		IDM_PREFERENCES
+        MENUITEM "Enable &Discord integration", IDM_DISCORD
+        MENUITEM SEPARATOR
        MENUITEM "Sound &gain...",              IDM_SND_GAIN
 #ifdef MTR_ENABLED
        MENUITEM SEPARATOR
@@ -249,7 +244,6 @@ BEGIN
    END
 END

-#if defined(DEV_BRANCH) && defined(USE_OPENGL)
 VidGLSubMenu MENU DISCARDABLE
 BEGIN
    POPUP "Target &framerate"
@@ -265,7 +259,6 @@ BEGIN
    MENUITEM "&Select shader...", IDM_VID_GL_SHADER
    MENUITEM "&Remove shader", IDM_VID_GL_NOSHADER
 END
-#endif


 /////////////////////////////////////////////////////////////////////////////
--- a/src/win/languages/en-US.rc
+++ b/src/win/languages/en-US.rc
@@ -41,9 +41,7 @@ BEGIN
            MENUITEM "&SDL (Software)",         IDM_VID_SDL_SW
            MENUITEM "SDL (&Hardware)",         IDM_VID_SDL_HW
            MENUITEM "SDL (&OpenGL)",           IDM_VID_SDL_OPENGL
-#if defined(DEV_BRANCH) && defined(USE_OPENGL)
            MENUITEM "Open&GL (3.3 Core)",      IDM_VID_OPENGL_CORE
-#endif
 #ifdef USE_VNC
            MENUITEM "&VNC",                    IDM_VID_VNC
 #endif
@@ -100,15 +98,12 @@ BEGIN
    BEGIN
        MENUITEM "&Settings...",                IDM_CONFIG
        MENUITEM "&Update status bar icons",	IDM_UPDATE_ICONS
-        MENUITEM SEPARATOR
-        MENUITEM "&Preferences...",		IDM_PREFERENCES
-# ifdef USE_DISCORD
-        MENUITEM SEPARATOR
-        MENUITEM "Enable &Discord integration", IDM_DISCORD
-# endif
        MENUITEM SEPARATOR
        MENUITEM "Take s&creenshot\tCtrl+F11",  IDM_ACTION_SCREENSHOT
        MENUITEM SEPARATOR
+        MENUITEM "&Preferences...",		IDM_PREFERENCES
+        MENUITEM "Enable &Discord integration", IDM_DISCORD
+        MENUITEM SEPARATOR
        MENUITEM "Sound &gain...",              IDM_SND_GAIN
 #ifdef MTR_ENABLED
        MENUITEM SEPARATOR
@@ -249,7 +244,6 @@ BEGIN
    END
 END

-#if defined(DEV_BRANCH) && defined(USE_OPENGL)
 VidGLSubMenu MENU DISCARDABLE
 BEGIN
    POPUP "Target &framerate"
@@ -265,7 +259,6 @@ BEGIN
    MENUITEM "&Select shader...", IDM_VID_GL_SHADER
    MENUITEM "&Remove shader", IDM_VID_GL_NOSHADER
 END
-#endif


 /////////////////////////////////////////////////////////////////////////////
--- a/src/win/languages/es-ES.rc
+++ b/src/win/languages/es-ES.rc
@@ -41,9 +41,7 @@ BEGIN
            MENUITEM "&SDL (Software)",         IDM_VID_SDL_SW
            MENUITEM "SDL (&Hardware)",         IDM_VID_SDL_HW
            MENUITEM "SDL (&OpenGL)",           IDM_VID_SDL_OPENGL
-#if defined(DEV_BRANCH) && defined(USE_OPENGL)
            MENUITEM "Open&GL (3.3 Core)",      IDM_VID_OPENGL_CORE
-#endif
 #ifdef USE_VNC
            MENUITEM "&VNC",                    IDM_VID_VNC
 #endif
@@ -100,15 +98,12 @@ BEGIN
    BEGIN
        MENUITEM "&Ajustes...",                IDM_CONFIG
        MENUITEM "&Actualizar iconos en barra de estado",	IDM_UPDATE_ICONS
-        MENUITEM SEPARATOR
-        MENUITEM "&Preferencias...",		IDM_PREFERENCES
-# ifdef USE_DISCORD
-        MENUITEM SEPARATOR
-        MENUITEM "Habilitar integración con &Discord", IDM_DISCORD
-# endif
        MENUITEM SEPARATOR
        MENUITEM "Tomar c&aptura\tCtrl+F11",  IDM_ACTION_SCREENSHOT
        MENUITEM SEPARATOR
+        MENUITEM "&Preferencias...",		IDM_PREFERENCES
+        MENUITEM "Habilitar integración con &Discord", IDM_DISCORD
+        MENUITEM SEPARATOR
        MENUITEM "&Ganancia de sonido...",              IDM_SND_GAIN
 #ifdef MTR_ENABLED
        MENUITEM SEPARATOR
@@ -249,7 +244,6 @@ BEGIN
    END
 END

-#if defined(DEV_BRANCH) && defined(USE_OPENGL)
 VidGLSubMenu MENU DISCARDABLE
 BEGIN
    POPUP "&Tasa de refresco objetivo"
@@ -265,7 +259,6 @@ BEGIN
    MENUITEM "&Seleccionar shader...", IDM_VID_GL_SHADER
    MENUITEM "&Eliminar shader", IDM_VID_GL_NOSHADER
 END
-#endif


 /////////////////////////////////////////////////////////////////////////////
--- a/src/win/languages/fi-FI.rc
+++ b/src/win/languages/fi-FI.rc
@@ -41,9 +41,7 @@ BEGIN
            MENUITEM "&SDL (ohjelmistopohjainen)",                      IDM_VID_SDL_SW
            MENUITEM "SDL (&laitteistokiihdytetty)",                    IDM_VID_SDL_HW
            MENUITEM "SDL (&OpenGL)",                                   IDM_VID_SDL_OPENGL
-#if defined(DEV_BRANCH) && defined(USE_OPENGL)
            MENUITEM "Open&GL (3.3 Core)",                              IDM_VID_OPENGL_CORE
-#endif
 #ifdef USE_VNC
            MENUITEM "&VNC",                                            IDM_VID_VNC
 #endif
@@ -100,15 +98,12 @@ BEGIN
    BEGIN
        MENUITEM "&Kokoonpano...",                                      IDM_CONFIG
        MENUITEM "&Päivitä tilapalkin kuvakkeita",                      IDM_UPDATE_ICONS
-        MENUITEM SEPARATOR
-        MENUITEM "&Sovellusasetukset...",                               IDM_PREFERENCES
-# ifdef USE_DISCORD
-        MENUITEM SEPARATOR
-        MENUITEM "Käytä &Discord integraatiota",                        IDM_DISCORD
-# endif
        MENUITEM SEPARATOR
        MENUITEM "Ota &kuvakaappaus\tCtrl+F11",                         IDM_ACTION_SCREENSHOT
        MENUITEM SEPARATOR
+        MENUITEM "&Sovellusasetukset...",                               IDM_PREFERENCES
+        MENUITEM "Käytä &Discord integraatiota",                        IDM_DISCORD
+        MENUITEM SEPARATOR
        MENUITEM "&Äänen tulotaso...",                                  IDM_SND_GAIN
 #ifdef MTR_ENABLED
        MENUITEM SEPARATOR
@@ -249,7 +244,6 @@ BEGIN
    END
 END

-#if defined(DEV_BRANCH) && defined(USE_OPENGL)
 VidGLSubMenu MENU DISCARDABLE
 BEGIN
    POPUP "&Kuvataajuustavoite"
@@ -265,7 +259,6 @@ BEGIN
    MENUITEM "Valitse varjostin&ohjelma...",    IDM_VID_GL_SHADER
    MENUITEM "&Poista varjostinohjelma",        IDM_VID_GL_NOSHADER
 END
-#endif


 /////////////////////////////////////////////////////////////////////////////
--- a/src/win/languages/fr-FR.rc
+++ b/src/win/languages/fr-FR.rc
@@ -41,9 +41,7 @@ BEGIN
            MENUITEM "&SDL (Logiciel)",         IDM_VID_SDL_SW
            MENUITEM "SDL (&Materiel)",         IDM_VID_SDL_HW
            MENUITEM "SDL (&OpenGL)",           IDM_VID_SDL_OPENGL
-#if defined(DEV_BRANCH) && defined(USE_OPENGL)
            MENUITEM "Open&GL (3.3 Core)",      IDM_VID_OPENGL_CORE
-#endif
 #ifdef USE_VNC
            MENUITEM "&VNC",                    IDM_VID_VNC
 #endif
@@ -100,15 +98,12 @@ BEGIN
    BEGIN
        MENUITEM "&Réglages...",                IDM_CONFIG
        MENUITEM "Mettre à jour la barre de stat&us",	IDM_UPDATE_ICONS
-        MENUITEM SEPARATOR
-        MENUITEM "&Préférences...",    IDM_PREFERENCES
-# ifdef USE_DISCORD
-        MENUITEM SEPARATOR
-        MENUITEM "Activer intégration &Discord", IDM_DISCORD
-# endif
        MENUITEM SEPARATOR
        MENUITEM "Copie &Ecran\tCtrl+F11",  IDM_ACTION_SCREENSHOT
        MENUITEM SEPARATOR
+        MENUITEM "&Préférences...",    IDM_PREFERENCES
+        MENUITEM "Activer intégration &Discord", IDM_DISCORD
+        MENUITEM SEPARATOR
        MENUITEM "&Gain Son...",              IDM_SND_GAIN
 #ifdef MTR_ENABLED
        MENUITEM SEPARATOR
@@ -249,7 +244,6 @@ BEGIN
    END
 END

-#if defined(DEV_BRANCH) && defined(USE_OPENGL)
 VidGLSubMenu MENU DISCARDABLE
 BEGIN
    POPUP "&Taux de rafraîchissement cible"
@@ -265,7 +259,6 @@ BEGIN
    MENUITEM "Sé&lectionnez le shader...", IDM_VID_GL_SHADER
    MENUITEM "S&upprimer le shader", IDM_VID_GL_NOSHADER
 END
-#endif


 /////////////////////////////////////////////////////////////////////////////
--- a/src/win/languages/hr-HR.rc
+++ b/src/win/languages/hr-HR.rc
@@ -41,9 +41,7 @@ BEGIN
            MENUITEM "&SDL (Softver)",         IDM_VID_SDL_SW
            MENUITEM "SDL (&Hardver)",         IDM_VID_SDL_HW
            MENUITEM "SDL (&OpenGL)",           IDM_VID_SDL_OPENGL
-#if defined(DEV_BRANCH) && defined(USE_OPENGL)
            MENUITEM "Open&GL (3.3 jezgra)",      IDM_VID_OPENGL_CORE
-#endif
 #ifdef USE_VNC
            MENUITEM "&VNC",                    IDM_VID_VNC
 #endif
@@ -100,15 +98,12 @@ BEGIN
    BEGIN
        MENUITEM "&Opcije...",                IDM_CONFIG
        MENUITEM "&Ažuriranje ikone statusne trake",	IDM_UPDATE_ICONS
-        MENUITEM SEPARATOR
-        MENUITEM "&Postavke...",    IDM_PREFERENCES
-# ifdef USE_DISCORD
-        MENUITEM SEPARATOR
-        MENUITEM "Omogući integraciju &Discord-a", IDM_DISCORD
-# endif
        MENUITEM SEPARATOR
        MENUITEM "Napravite &snimku zaslona\tCtrl+F11",  IDM_ACTION_SCREENSHOT
        MENUITEM SEPARATOR
+        MENUITEM "&Postavke...",    IDM_PREFERENCES
+        MENUITEM "Omogući integraciju &Discord-a", IDM_DISCORD
+        MENUITEM SEPARATOR
        MENUITEM "&Pojačanje zvuka...",              IDM_SND_GAIN
 #ifdef MTR_ENABLED
        MENUITEM SEPARATOR
@@ -249,7 +244,6 @@ BEGIN
    END
 END

-#if defined(DEV_BRANCH) && defined(USE_OPENGL)
 VidGLSubMenu MENU DISCARDABLE
 BEGIN
    POPUP "&Ciljni framerate"
@@ -265,7 +259,6 @@ BEGIN
    MENUITEM "&Odaberi shader...", IDM_VID_GL_SHADER
    MENUITEM "&Ukloni shader", IDM_VID_GL_NOSHADER
 END
-#endif


 /////////////////////////////////////////////////////////////////////////////
--- a/src/win/languages/hu-HU.rc
+++ b/src/win/languages/hu-HU.rc
@@ -44,9 +44,7 @@ BEGIN
            MENUITEM "&SDL (Szoftveres)",         IDM_VID_SDL_SW
            MENUITEM "SDL (&Hardveres)",         IDM_VID_SDL_HW
            MENUITEM "SDL (&OpenGL)",           IDM_VID_SDL_OPENGL
-#if defined(DEV_BRANCH) && defined(USE_OPENGL)
            MENUITEM "Open&GL (3.3 Core)",      IDM_VID_OPENGL_CORE
-#endif
 #ifdef USE_VNC
            MENUITEM "&VNC",                    IDM_VID_VNC
 #endif
@@ -103,15 +101,12 @@ BEGIN
    BEGIN
        MENUITEM "&Konfigurálás...",                IDM_CONFIG
        MENUITEM "Állapotsori ikonok &frissítése",	IDM_UPDATE_ICONS
-        MENUITEM SEPARATOR
-        MENUITEM "&Beállítások...",    IDM_PREFERENCES
-# ifdef USE_DISCORD
-        MENUITEM SEPARATOR
-        MENUITEM "&Discord integráció engedélyezése", IDM_DISCORD
-# endif
        MENUITEM SEPARATOR
        MENUITEM "&Képernyőkép készítése\tCtrl+F11",  IDM_ACTION_SCREENSHOT
        MENUITEM SEPARATOR
+        MENUITEM "&Beállítások...",    IDM_PREFERENCES
+        MENUITEM "&Discord integráció engedélyezése", IDM_DISCORD
+        MENUITEM SEPARATOR
        MENUITEM "&Hangerőszabályzó...",              IDM_SND_GAIN
 #ifdef MTR_ENABLED
        MENUITEM SEPARATOR
@@ -252,7 +247,6 @@ BEGIN
    END
 END

-#if defined(DEV_BRANCH) && defined(USE_OPENGL)
 VidGLSubMenu MENU DISCARDABLE
 BEGIN
    POPUP "Cél &képkockasebesség"
@@ -268,7 +262,6 @@ BEGIN
    MENUITEM "Shader &kiválasztása...", IDM_VID_GL_SHADER
    MENUITEM "Shader &eltávolítása", IDM_VID_GL_NOSHADER
 END
-#endif


 /////////////////////////////////////////////////////////////////////////////
--- a/src/win/languages/it-IT.rc
+++ b/src/win/languages/it-IT.rc
@@ -41,9 +41,7 @@ BEGIN
            MENUITEM "&SDL (Software)",         IDM_VID_SDL_SW
            MENUITEM "SDL (&Hardware)",         IDM_VID_SDL_HW
            MENUITEM "SDL (&OpenGL)",           IDM_VID_SDL_OPENGL
-#if defined(DEV_BRANCH) && defined(USE_OPENGL)
            MENUITEM "Open&GL (3.3 Core)",      IDM_VID_OPENGL_CORE
-#endif
 #ifdef USE_VNC
            MENUITEM "&VNC",                    IDM_VID_VNC
 #endif
@@ -100,15 +98,12 @@ BEGIN
    BEGIN
        MENUITEM "&Impostazioni...",                IDM_CONFIG
        MENUITEM "&Aggiorna icone della barra di stato",	IDM_UPDATE_ICONS
-        MENUITEM SEPARATOR
-        MENUITEM "&Preferenze...",    IDM_PREFERENCES
-# ifdef USE_DISCORD
-        MENUITEM SEPARATOR
-        MENUITEM "Abilita &integrazione Discord", IDM_DISCORD
-# endif
        MENUITEM SEPARATOR
        MENUITEM "Cattura schermata\tCtrl+F11",  IDM_ACTION_SCREENSHOT
        MENUITEM SEPARATOR
+        MENUITEM "&Preferenze...",    IDM_PREFERENCES
+        MENUITEM "Abilita &integrazione Discord", IDM_DISCORD
+        MENUITEM SEPARATOR
        MENUITEM "Guadagno &suono...",              IDM_SND_GAIN
 #ifdef MTR_ENABLED
        MENUITEM SEPARATOR
@@ -249,7 +244,6 @@ BEGIN
    END
 END

-#if defined(DEV_BRANCH) && defined(USE_OPENGL)
 VidGLSubMenu MENU DISCARDABLE
 BEGIN
    POPUP "Imposta obiettivo &fotogrammi"
@@ -265,7 +259,6 @@ BEGIN
    MENUITEM "&Seleziona shader...", IDM_VID_GL_SHADER
    MENUITEM "&Rimuovi shader", IDM_VID_GL_NOSHADER
 END
-#endif


 /////////////////////////////////////////////////////////////////////////////
--- a/src/win/languages/ja-JP.rc
+++ b/src/win/languages/ja-JP.rc
@@ -41,9 +41,7 @@ BEGIN
            MENUITEM "SDL (ソフトウェア)(&S)",         IDM_VID_SDL_SW
            MENUITEM "SDL (ハードウェア)(&H)",         IDM_VID_SDL_HW
            MENUITEM "SDL (OpenGL)(&O)",           IDM_VID_SDL_OPENGL
-#if defined(DEV_BRANCH) && defined(USE_OPENGL)
            MENUITEM "OpenGL (3.3コア)(&G)",      IDM_VID_OPENGL_CORE
-#endif
 #ifdef USE_VNC
            MENUITEM "VNC(&V)",                    IDM_VID_VNC
 #endif
@@ -100,15 +98,12 @@ BEGIN
    BEGIN
        MENUITEM "設定(&S)...",                IDM_CONFIG
        MENUITEM "ステータスバーアイコンの更新(&U)",	IDM_UPDATE_ICONS
-        MENUITEM SEPARATOR
-        MENUITEM "環境設定(&P)...",    IDM_PREFERENCES
-# ifdef USE_DISCORD
-        MENUITEM SEPARATOR
-        MENUITEM "Discordとの連携を可能にする(&D)", IDM_DISCORD
-# endif
        MENUITEM SEPARATOR
        MENUITEM "クリーンショットを撮る(&C)\tCtrl+F11",  IDM_ACTION_SCREENSHOT
        MENUITEM SEPARATOR
+        MENUITEM "環境設定(&P)...",    IDM_PREFERENCES
+        MENUITEM "Discordとの連携を可能にする(&D)", IDM_DISCORD
+        MENUITEM SEPARATOR
        MENUITEM "サウンドゲイン(&G)...",              IDM_SND_GAIN
 #ifdef MTR_ENABLED
        MENUITEM SEPARATOR
@@ -249,7 +244,6 @@ BEGIN
    END
 END

-#if defined(DEV_BRANCH) && defined(USE_OPENGL)
 VidGLSubMenu MENU DISCARDABLE
 BEGIN
    POPUP "目標フレームレート(&F)"
@@ -265,7 +259,6 @@ BEGIN
    MENUITEM "シェーダの選択(&S)...", IDM_VID_GL_SHADER
    MENUITEM "シェーダの削除(&R)", IDM_VID_GL_NOSHADER
 END
-#endif


 /////////////////////////////////////////////////////////////////////////////
--- a/src/win/languages/pt-BR.rc
+++ b/src/win/languages/pt-BR.rc
@@ -42,9 +42,7 @@ BEGIN
            MENUITEM "&SDL (Software)",         IDM_VID_SDL_SW
            MENUITEM "SDL (&Hardware)",         IDM_VID_SDL_HW
            MENUITEM "SDL (&OpenGL)",           IDM_VID_SDL_OPENGL
-#if defined(DEV_BRANCH) && defined(USE_OPENGL)
            MENUITEM "Open&GL (Núcleo 3.3)",      IDM_VID_OPENGL_CORE
-#endif
 #ifdef USE_VNC
            MENUITEM "&VNC",                    IDM_VID_VNC
 #endif
@@ -101,15 +99,12 @@ BEGIN
    BEGIN
        MENUITEM "&Configurações...",                IDM_CONFIG
        MENUITEM "&Atualizar ícones da barra de status",	IDM_UPDATE_ICONS
-        MENUITEM SEPARATOR
-        MENUITEM "&Preferências...",    IDM_PREFERENCES
-# ifdef USE_DISCORD
-        MENUITEM SEPARATOR
-        MENUITEM "Ativar integração com o &Discord", IDM_DISCORD
-# endif
        MENUITEM SEPARATOR
        MENUITEM "Capturar &tela\tCtrl+F11",  IDM_ACTION_SCREENSHOT
        MENUITEM SEPARATOR
+        MENUITEM "&Preferências...",    IDM_PREFERENCES
+        MENUITEM "Ativar integração com o &Discord", IDM_DISCORD
+        MENUITEM SEPARATOR
        MENUITEM "&Ganho de som...",              IDM_SND_GAIN
 #ifdef MTR_ENABLED
        MENUITEM SEPARATOR
@@ -250,7 +245,6 @@ BEGIN
    END
 END

-#if defined(DEV_BRANCH) && defined(USE_OPENGL)
 VidGLSubMenu MENU DISCARDABLE
 BEGIN
    POPUP "&Taxa de quadro pretendida"
@@ -266,7 +260,6 @@ BEGIN
    MENUITEM "&Selecionar shader...", IDM_VID_GL_SHADER
    MENUITEM "&Remover shader", IDM_VID_GL_NOSHADER
 END
-#endif


 /////////////////////////////////////////////////////////////////////////////
--- a/src/win/languages/pt-PT.rc
+++ b/src/win/languages/pt-PT.rc
@@ -41,9 +41,7 @@ BEGIN
            MENUITEM "&SDL (Software)",         IDM_VID_SDL_SW
            MENUITEM "SDL (&Hardware)",         IDM_VID_SDL_HW
            MENUITEM "SDL (&OpenGL)",           IDM_VID_SDL_OPENGL
-#if defined(DEV_BRANCH) && defined(USE_OPENGL)
            MENUITEM "Open&GL (Núcleo 3.3)",    IDM_VID_OPENGL_CORE
-#endif
 #ifdef USE_VNC
            MENUITEM "&VNC",                    IDM_VID_VNC
 #endif
@@ -100,15 +98,12 @@ BEGIN
    BEGIN
        MENUITEM "&Definições...",              IDM_CONFIG
        MENUITEM "&Atualizar ícones da barra de estado",	IDM_UPDATE_ICONS
-        MENUITEM SEPARATOR
-        MENUITEM "&Preferências...",    IDM_PREFERENCES
-# ifdef USE_DISCORD
-        MENUITEM SEPARATOR
-        MENUITEM "Ativar integração com &Discord", IDM_DISCORD
-# endif
        MENUITEM SEPARATOR
        MENUITEM "Gravar imagem de ecrã\tCtrl+F11",  IDM_ACTION_SCREENSHOT
        MENUITEM SEPARATOR
+        MENUITEM "&Preferências...",    IDM_PREFERENCES
+        MENUITEM "Ativar integração com &Discord", IDM_DISCORD
+        MENUITEM SEPARATOR
        MENUITEM "&Ganho de som...",              IDM_SND_GAIN
 #ifdef MTR_ENABLED
        MENUITEM SEPARATOR
@@ -249,7 +244,6 @@ BEGIN
    END
 END

-#if defined(DEV_BRANCH) && defined(USE_OPENGL)
 VidGLSubMenu MENU DISCARDABLE
 BEGIN
    POPUP "&Taxa de quadros de destino"
@@ -265,7 +259,6 @@ BEGIN
    MENUITEM "&Selecionar shader...", IDM_VID_GL_SHADER
    MENUITEM "&Remover shader", IDM_VID_GL_NOSHADER
 END
-#endif


 /////////////////////////////////////////////////////////////////////////////
--- a/src/win/languages/sl-SI.rc
+++ b/src/win/languages/sl-SI.rc
@@ -41,9 +41,7 @@ BEGIN
            MENUITEM "&SDL (programsko)",         IDM_VID_SDL_SW
            MENUITEM "SDL (s&trojno)",         IDM_VID_SDL_HW
            MENUITEM "SDL (&OpenGL)",           IDM_VID_SDL_OPENGL
-#if defined(DEV_BRANCH) && defined(USE_OPENGL)
-            MENUITEM "Open&GL (3.3 Core)",      IDM_VID_OPENGL_CORE
-#endif
+            MENUITEM "Open&GL (Jedro 3.3)",      IDM_VID_OPENGL_CORE
 #ifdef USE_VNC
            MENUITEM "&VNC",                    IDM_VID_VNC
 #endif
@@ -100,15 +98,12 @@ BEGIN
    BEGIN
        MENUITEM "&Nastavitve...",                IDM_CONFIG
        MENUITEM "&Posodabljaj ikone statusne vrstice",	IDM_UPDATE_ICONS
-        MENUITEM SEPARATOR
-        MENUITEM "&Možnosti...",    IDM_PREFERENCES
-# ifdef USE_DISCORD
-        MENUITEM SEPARATOR
-        MENUITEM "Omogoči integracijo s programom &Discord", IDM_DISCORD
-# endif
        MENUITEM SEPARATOR
        MENUITEM "&Zajemi posnetek zaslona\tCtrl+F11",  IDM_ACTION_SCREENSHOT
        MENUITEM SEPARATOR
+        MENUITEM "&Možnosti...",    IDM_PREFERENCES
+        MENUITEM "Omogoči integracijo s programom &Discord", IDM_DISCORD
+        MENUITEM SEPARATOR
        MENUITEM "&Ojačanje zvoka...",              IDM_SND_GAIN
 #ifdef MTR_ENABLED
        MENUITEM SEPARATOR
@@ -249,7 +244,6 @@ BEGIN
    END
 END

-#if defined(DEV_BRANCH) && defined(USE_OPENGL)
 VidGLSubMenu MENU DISCARDABLE
 BEGIN
    POPUP "&Ciljno št. sličic na sekundo"
@@ -265,7 +259,6 @@ BEGIN
    MENUITEM "&Izberi senčilnik...", IDM_VID_GL_SHADER
    MENUITEM "&Odstrani senčilnik", IDM_VID_GL_NOSHADER
 END
-#endif


 /////////////////////////////////////////////////////////////////////////////
--- a/src/win/languages/tr-TR.rc
+++ b/src/win/languages/tr-TR.rc
@@ -41,9 +41,7 @@ BEGIN
            MENUITEM "&SDL (Yazılım)",         IDM_VID_SDL_SW
            MENUITEM "SDL (&Donanım)",         IDM_VID_SDL_HW
            MENUITEM "SDL (&OpenGL)",           IDM_VID_SDL_OPENGL
-#if defined(DEV_BRANCH) && defined(USE_OPENGL)
            MENUITEM "Open&GL (3.3 Core)",      IDM_VID_OPENGL_CORE
-#endif
 #ifdef USE_VNC
            MENUITEM "&VNC",                    IDM_VID_VNC
 #endif
@@ -100,15 +98,12 @@ BEGIN
    BEGIN
        MENUITEM "&Ayarlar...",                IDM_CONFIG
        MENUITEM "Durum &çubuğu ikonlarını güncelle",	IDM_UPDATE_ICONS
-        MENUITEM SEPARATOR
-        MENUITEM "&Tercihler...",    IDM_PREFERENCES
-# ifdef USE_DISCORD
-        MENUITEM SEPARATOR
-        MENUITEM "&Discord entegrasyonunu etkinleştir", IDM_DISCORD
-# endif
        MENUITEM SEPARATOR
        MENUITEM "&Ekran görüntüsü al\tCtrl+F11",  IDM_ACTION_SCREENSHOT
        MENUITEM SEPARATOR
+        MENUITEM "&Tercihler...",    IDM_PREFERENCES
+        MENUITEM "&Discord entegrasyonunu etkinleştir", IDM_DISCORD
+        MENUITEM SEPARATOR
        MENUITEM "&Ses yükseltici...",              IDM_SND_GAIN
 #ifdef MTR_ENABLED
        MENUITEM SEPARATOR
@@ -249,7 +244,6 @@ BEGIN
    END
 END

-#if defined(DEV_BRANCH) && defined(USE_OPENGL)
 VidGLSubMenu MENU DISCARDABLE
 BEGIN
    POPUP "Hedef &kare oranı"
@@ -265,7 +259,6 @@ BEGIN
    MENUITEM "Gölgelendirici &seç...", IDM_VID_GL_SHADER
    MENUITEM "&Gölgelendiriciyi kaldır", IDM_VID_GL_NOSHADER
 END
-#endif


 /////////////////////////////////////////////////////////////////////////////
@@ -485,7 +478,7 @@ BEGIN
    IDS_2118	"Dahili kontrolcü"
    IDS_2119	"Çıkış"
    IDS_2120	"Hiçbir ROM imajı bulunamadı"
-    IDS_2121	"Ayarlary kaydetmek istediğinizden emin misiniz?"
+    IDS_2121	"Ayarları kaydetmek istediğinizden emin misiniz?"
    IDS_2122	"Bu makineyi yeniden başlatacak."
    IDS_2123	"Kaydet"
    IDS_2124	"86Box Hakkında"
--- a/src/win/languages/zh-CN.rc
+++ b/src/win/languages/zh-CN.rc
@@ -100,15 +100,12 @@ BEGIN
    BEGIN
        MENUITEM "设置(&S)...",                IDM_CONFIG
        MENUITEM "更新状态栏图标(&U)",	IDM_UPDATE_ICONS
-        MENUITEM SEPARATOR
-        MENUITEM "首选项(&P)...",    IDM_PREFERENCES
-# ifdef USE_DISCORD
-        MENUITEM SEPARATOR
-        MENUITEM "启用 Discord 集成(&D)", IDM_DISCORD
-# endif
        MENUITEM SEPARATOR
        MENUITEM "截图(&c)\tCtrl+F11",  IDM_ACTION_SCREENSHOT
        MENUITEM SEPARATOR
+        MENUITEM "首选项(&P)...",    IDM_PREFERENCES
+        MENUITEM "启用 Discord 集成(&D)", IDM_DISCORD
+        MENUITEM SEPARATOR
        MENUITEM "音量增益(&g)...",              IDM_SND_GAIN
 #ifdef MTR_ENABLED
        MENUITEM SEPARATOR
--- a/src/win/win.c
+++ b/src/win/win.c
@@ -106,11 +106,7 @@ static const struct {
  {	"SDL_Software", 1, (int(*)(void*))sdl_inits, sdl_close, NULL, sdl_pause, sdl_enable, sdl_set_fs, sdl_reload	},
  {	"SDL_Hardware", 1, (int(*)(void*))sdl_inith, sdl_close, NULL, sdl_pause, sdl_enable, sdl_set_fs, sdl_reload	},
  {	"SDL_OpenGL", 1, (int(*)(void*))sdl_initho, sdl_close, NULL, sdl_pause, sdl_enable, sdl_set_fs, sdl_reload	}
-#if defined(DEV_BRANCH) && defined(USE_OPENGL)
 ,{	"OpenGL_Core", 1, (int(*)(void*))opengl_init, opengl_close, opengl_resize, opengl_pause, NULL, opengl_set_fs, opengl_reload}
-#else
- ,{	"OpenGL_Core", 1, (int(*)(void*))sdl_initho, sdl_close, NULL, sdl_pause, sdl_enable, sdl_set_fs, NULL		} /* fall back to SDL_OpenGL */
-#endif
 #ifdef USE_VNC
 ,{	"VNC", 0, vnc_init, vnc_close, vnc_resize, vnc_pause, NULL, NULL						}
 #endif
@@ -1005,15 +1001,9 @@ plat_vidapi_name(int api)
 	case 2:
 		name = "sdl_opengl";
 		break;
-#if defined(DEV_BRANCH) && defined(USE_OPENGL)
 	case 3:
 		name = "opengl_core";
 		break;
-#else
-	case 3:
-		name = "sdl_opengl"; /* fall back to SDL_OpenGL */
-		break;
-#endif
 #ifdef USE_VNC
 	case 4:
 		name = "vnc";
--- a/src/win/win_ui.c
+++ b/src/win/win_ui.c
@@ -44,9 +44,7 @@
 #include <86box/ui.h>
 #include <86box/win.h>
 #include <86box/version.h>
-#ifdef USE_DISCORD
 # include <86box/win_discord.h>
-#endif

 #ifdef MTR_ENABLED
 #include <minitrace/minitrace.h>
@@ -163,7 +161,6 @@ video_toggle_option(HMENU h, int *val, int id)
    device_force_redraw();
 }

-#if defined(DEV_BRANCH) && defined(USE_OPENGL)
 /* Recursively finds and deletes target submenu */
 static int
 delete_submenu(HMENU parent, HMENU target)
@@ -191,7 +188,6 @@ delete_submenu(HMENU parent, HMENU target)

 	return 0;
 }
-#endif

 static int menu_vidapi = -1;
 static HMENU cur_menu = NULL;
@@ -199,7 +195,6 @@ static HMENU cur_menu = NULL;
 static void
 show_render_options_menu()
 {
-#if defined(DEV_BRANCH) && defined(USE_OPENGL)
 	if (vid_api == menu_vidapi)
 		return;
 	
@@ -229,7 +224,6 @@ show_render_options_menu()
 	}

 	menu_vidapi = vid_api;
-#endif
 }

 static void
@@ -282,13 +276,11 @@ ResetAllMenus(void)
    CheckMenuItem(menuMain, IDM_VID_SDL_SW, MF_UNCHECKED);
    CheckMenuItem(menuMain, IDM_VID_SDL_HW, MF_UNCHECKED);
    CheckMenuItem(menuMain, IDM_VID_SDL_OPENGL, MF_UNCHECKED);
-#if defined(DEV_BRANCH) && defined(USE_OPENGL)
    CheckMenuItem(menuMain, IDM_VID_OPENGL_CORE, MF_UNCHECKED);
 	
-	menu_vidapi = -1;
-	cur_menu = NULL;
+    menu_vidapi = -1;
+    cur_menu = NULL;
    show_render_options_menu();
-#endif
 #ifdef USE_VNC
    CheckMenuItem(menuMain, IDM_VID_VNC, MF_UNCHECKED);
 #endif
@@ -362,12 +354,10 @@ ResetAllMenus(void)

    video_set_filter_menu(menuMain);

-#ifdef USE_DISCORD
    if (discord_loaded)
 	CheckMenuItem(menuMain, IDM_DISCORD, enable_discord ? MF_CHECKED : MF_UNCHECKED);
    else
 	EnableMenuItem(menuMain, IDM_DISCORD, MF_DISABLED);
-#endif
 #ifdef MTR_ENABLED
    EnableMenuItem(menuMain, IDM_ACTION_END_TRACE, MF_DISABLED);
 #endif
@@ -704,9 +694,7 @@ MainWindowProcedure(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
 			case IDM_VID_SDL_SW:
 			case IDM_VID_SDL_HW:
 			case IDM_VID_SDL_OPENGL:
-#if defined(DEV_BRANCH) && defined(USE_OPENGL)
 			case IDM_VID_OPENGL_CORE:
-#endif
 #ifdef USE_VNC
 			case IDM_VID_VNC:
 #endif
@@ -718,7 +706,6 @@ MainWindowProcedure(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
 				show_render_options_menu();
 				break;

-#if defined(DEV_BRANCH) && defined(USE_OPENGL)
 			case IDM_VID_GL_FPS_BLITTER:
 			case IDM_VID_GL_FPS_25:
 			case IDM_VID_GL_FPS_30:
@@ -757,7 +744,6 @@ MainWindowProcedure(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
 				EnableMenuItem(menuMain, IDM_VID_GL_NOSHADER, MF_DISABLED);
 				plat_vid_reload_options();
 				break;
-#endif

 			case IDM_VID_FULLSCREEN:
 				plat_setfullscreen(1);
@@ -858,7 +844,6 @@ MainWindowProcedure(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
 				config_save();
 				break;

-#ifdef USE_DISCORD
 			case IDM_DISCORD:
 				if (! discord_loaded) break;
 				enable_discord ^= 1;
@@ -869,7 +854,6 @@ MainWindowProcedure(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
 				} else
 					discord_close();
 				break;
-#endif

 #ifdef ENABLE_LOG_TOGGLES
 # ifdef ENABLE_BUSLOGIC_LOG
@@ -1287,7 +1271,6 @@ ui_init(int nCmdShow)
 	return(0);
    }

-#ifdef USE_DISCORD
    if(! discord_load()) {
 	enable_discord = 0;
    } else if (enable_discord) {
@@ -1297,7 +1280,6 @@ ui_init(int nCmdShow)
 	/* Update Discord status */
 	discord_update_activity(dopause);
    }
-#endif

    /* Create our main window's class and register it. */
    wincl.hInstance = hinstance;
@@ -1534,11 +1516,9 @@ ui_init(int nCmdShow)
 		plat_setfullscreen(0);
 	}

-#ifdef USE_DISCORD
 	/* Run Discord API callbacks */
 	if (enable_discord)
 		discord_run_callbacks();
-#endif
    }

    timeEndPeriod(1);
@@ -1556,13 +1536,11 @@ ui_init(int nCmdShow)

    win_mouse_close();

-#ifdef USE_DISCORD
    /* Shut down the Discord integration */
    discord_close();
-#endif

-	if (user32_handle != NULL)
-    	dynld_close(user32_handle);
+    if (user32_handle != NULL)
+	dynld_close(user32_handle);

    return(messages.wParam);
 }
@@ -1622,11 +1600,9 @@ plat_pause(int p)
    CheckMenuItem(menuMain, IDM_ACTION_PAUSE,
 		  (dopause) ? MF_CHECKED : MF_UNCHECKED);

-#if USE_DISCORD
    /* Update Discord status */
-    if(enable_discord)
+    if (enable_discord)
 	discord_update_activity(dopause);
-#endif

    /* Send the WM to a manager if needed. */
    if (source_hwnd)