piwalker/melonDS
1
0
Fork 0
mirror of https://github.com/melonDS-emu/melonDS.git synced 2024-11-14 21:37:42 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

* fix the OpenGL shito under Linux

Browse Source 
* make the 'BIOS not found' errors a bit more user-friendly
This commit is contained in:
Arisotura 2020-05-29 22:18:21 +02:00
parent 054b94b2b7
commit 88823f66cb
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/OpenGLSupport.h
View File

@ -49,9 +49,21 @@
// if you need more OpenGL functions, add them to the macronator here // if you need more OpenGL functions, add them to the macronator here
#define DO_PROCLIST(func) \ #ifdef __WIN32__
#define DO_PROCLIST_1_3(func) \
func(GLACTIVETEXTURE, glActiveTexture); \ func(GLACTIVETEXTURE, glActiveTexture); \
func(GLBLENDCOLOR, glBlendColor); \ func(GLBLENDCOLOR, glBlendColor); \
#else
#define DO_PROCLIST_1_3(func)
#endif
#define DO_PROCLIST(func) \
DO_PROCLIST_1_3(func) \
\ \
func(GLGENFRAMEBUFFERS, glGenFramebuffers); \ func(GLGENFRAMEBUFFERS, glGenFramebuffers); \
func(GLDELETEFRAMEBUFFERS, glDeleteFramebuffers); \ func(GLDELETEFRAMEBUFFERS, glDeleteFramebuffers); \

6
src/frontend/qt_sdl/main.cpp
View File

@ -1360,13 +1360,13 @@ QString MainWindow::loadErrorStr(int error)
{ {
switch (error) switch (error)
{ {
case Frontend::Load_BIOS9Missing: return "DS ARM9 BIOS was not found or could not be accessed."; case Frontend::Load_BIOS9Missing: return "DS ARM9 BIOS was not found or could not be accessed. Check your emu settings.";
case Frontend::Load_BIOS9Bad: return "DS ARM9 BIOS is not a valid BIOS dump."; case Frontend::Load_BIOS9Bad: return "DS ARM9 BIOS is not a valid BIOS dump.";
case Frontend::Load_BIOS7Missing: return "DS ARM7 BIOS was not found or could not be accessed."; case Frontend::Load_BIOS7Missing: return "DS ARM7 BIOS was not found or could not be accessed. Check your emu settings.";
case Frontend::Load_BIOS7Bad: return "DS ARM7 BIOS is not a valid BIOS dump."; case Frontend::Load_BIOS7Bad: return "DS ARM7 BIOS is not a valid BIOS dump.";
case Frontend::Load_FirmwareMissing: return "DS firmware was not found or could not be accessed."; case Frontend::Load_FirmwareMissing: return "DS firmware was not found or could not be accessed. Check your emu settings.";
case Frontend::Load_FirmwareBad: return "DS firmware is not a valid firmware dump."; case Frontend::Load_FirmwareBad: return "DS firmware is not a valid firmware dump.";
case Frontend::Load_FirmwareNotBootable: return "DS firmware is not bootable."; case Frontend::Load_FirmwareNotBootable: return "DS firmware is not bootable.";