Skip to content

Commit e68483f

Browse files
Rosalie241Rosalie241
committed
3rdParty: update mupen64plus-video-GLideN64
1 parent f6b73b8 commit e68483f

File tree

12 files changed

+50
-46
lines changed

12 files changed

+50
-46
lines changed

‎Source/3rdParty/mupen64plus-video-GLideN64/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,4 @@ src/Revision.h
2222
/projects/cmake/mupen64plus-video-GLideN64_autogen/
2323
.vs
2424
/translations/wtl
25+
.DS_Store

‎Source/3rdParty/mupen64plus-video-GLideN64/.gitrepo

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
[subrepo]
77
remote = [email protected]:/gonetz/GLideN64.git
88
branch = master
9-
commit = f4b0755e2722d59fe1c20d7e470f7b8929dcae85
10-
parent = 1b45907ab26a5e8532bfc3c41d70c4611fb61028
9+
commit = a1320da566c03503ea755447458bb2b79a610cb5
10+
parent = f6b73b86c6625fa5a268b74b1e36114a5bdd535c
1111
method = merge
1212
cmdver = 0.4.6

‎Source/3rdParty/mupen64plus-video-GLideN64/ini/GLideN64.custom.ini

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ generalEmulation\enableLegacyBlending=0
1818
Good_Name=Bio F.R.E.A.K.S. (E)(U)
1919
frameBufferEmulation\copyToRDRAM=1
2020

21-
[BioHazard%20II]
21+
[BIOHAZARD%20II]
2222
Good_Name=Biohazard 2 (J)
2323
frameBufferEmulation\copyFromRDRAM=1
2424
frameBufferEmulation\copyToRDRAM=0

‎Source/3rdParty/mupen64plus-video-GLideN64/projects/msvc/GLideN64.sln

+2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@ VisualStudioVersion = 14.0.25420.1
44
MinimumVisualStudioVersion = 10.0.40219.1
55
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GLideN64", "GLideN64.vcxproj", "{37D31D7F-C4E7-45B0-AEF6-D6824A243CF7}"
66
ProjectSection(ProjectDependencies) = postProject
7+
{37CAB375-A7A6-3CAB-BD56-0E954D3FD2FE} = {37CAB375-A7A6-3CAB-BD56-0E954D3FD2FE}
78
{7BF6F100-31DB-44AE-A2A5-5DDEED9A909C} = {7BF6F100-31DB-44AE-A2A5-5DDEED9A909C}
9+
{9E05B70F-A294-44A9-A151-B2CC95AA884E} = {9E05B70F-A294-44A9-A151-B2CC95AA884E}
810
{DA965BCF-2219-47AF-ACE7-EAF76D5D4756} = {DA965BCF-2219-47AF-ACE7-EAF76D5D4756}
911
EndProjectSection
1012
EndProject

‎Source/3rdParty/mupen64plus-video-GLideN64/src/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -522,7 +522,7 @@ else(EGL)
522522
endif(NOT OPENGL_FOUND)
523523
endif(EGL)
524524

525-
if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
525+
if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
526526
#check for compiler version
527527
execute_process(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion OUTPUT_VARIABLE G++_VERSION)
528528
if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" AND G++_VERSION VERSION_LESS 4.8)

‎Source/3rdParty/mupen64plus-video-GLideN64/src/GLideNHQ/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
6565
add_definitions( -D__MSC__)
6666
endif()
6767

68-
if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
68+
if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
6969
SET(GCC_CPP11_COMPILE_FLAGS "-std=c++0x -Wno-unused-result")
7070
if ( NOT MINGW )
7171
SET ( PIC_FLAGS "-fPIC" )

‎Source/3rdParty/mupen64plus-video-GLideN64/src/GLideNHQ/lib/libz.a

-45.6 KB
Binary file not shown.

‎Source/3rdParty/mupen64plus-video-GLideN64/src/GLideNUI-wtl/GLideNUI.cpp

+7-8
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@ Q_IMPORT_PLUGIN(QICOPlugin)
1515

1616
//#define RUN_DIALOG_IN_THREAD
1717

18-
static
19-
int openConfigDialog(const wchar_t * _strFileName, const char * _romName, unsigned int _maxMSAALevel, unsigned int _maxAnisotropy, bool & _accepted)
18+
static int openConfigDialog(const wchar_t * _strFileName, const wchar_t * _strSharedFileName, const char * _romName, unsigned int _maxMSAALevel, unsigned int _maxAnisotropy, bool & _accepted)
2019
{
2120
std::string IniFolder;
2221
uint32_t slength = WideCharToMultiByte(CP_ACP, 0, _strFileName, -1, NULL, 0, NULL, NULL);
@@ -40,22 +39,22 @@ int openConfigDialog(const wchar_t * _strFileName, const char * _romName, unsign
4039
return 0;
4140
}
4241

43-
bool runConfigThread(const wchar_t * _strFileName, const char * _romName, unsigned int _maxMSAALevel, unsigned int _maxAnisotropy)
42+
bool runConfigThread(const wchar_t * _strFileName, const wchar_t * _strSharedFileName, const char * _romName, unsigned int _maxMSAALevel, unsigned int _maxAnisotropy)
4443
{
4544
bool accepted = false;
4645
#ifdef RUN_DIALOG_IN_THREAD
4746
std::thread configThread(openConfigDialog, _strFileName, _maxMSAALevel, std::ref(accepted));
4847
configThread.join();
4948
#else
50-
openConfigDialog(_strFileName, _romName, _maxMSAALevel, _maxAnisotropy, accepted);
49+
openConfigDialog(_strFileName, _strSharedFileName, _romName, _maxMSAALevel, _maxAnisotropy, accepted);
5150
#endif
5251
return accepted;
5352

5453
}
5554

56-
EXPORT bool CALL RunConfig(const wchar_t * _strFileName, const char * _romName, unsigned int _maxMSAALevel, unsigned int _maxAnisotropy)
55+
EXPORT bool CALL RunConfig(const wchar_t * _strFileName, const wchar_t * _strSharedFileName, const char * _romName, unsigned int _maxMSAALevel, unsigned int _maxAnisotropy)
5756
{
58-
return runConfigThread(_strFileName, _romName, _maxMSAALevel, _maxAnisotropy);
57+
return runConfigThread(_strFileName, _strSharedFileName, _romName, _maxMSAALevel, _maxAnisotropy);
5958
}
6059

6160
EXPORT int CALL RunAbout(const wchar_t * _strFileName)
@@ -73,7 +72,7 @@ EXPORT int CALL RunAbout(const wchar_t * _strFileName)
7372
return 0;
7473
}
7574

76-
EXPORT void CALL LoadConfig(const wchar_t * _strFileName)
75+
EXPORT void CALL LoadConfig(const wchar_t * _strFileName, const wchar_t * _strSharedFileName)
7776
{
7877
std::string IniFolder;
7978
uint32_t slength = WideCharToMultiByte(CP_ACP, 0, _strFileName, -1, NULL, 0, NULL, NULL);
@@ -84,7 +83,7 @@ EXPORT void CALL LoadConfig(const wchar_t * _strFileName)
8483
loadSettings(IniFolder.c_str());
8584
}
8685

87-
EXPORT void CALL LoadCustomRomSettings(const wchar_t * _strFileName, const char * _romName)
86+
EXPORT void CALL LoadCustomRomSettings(const wchar_t * _strFileName, const wchar_t * _strSharedFileName, const char * _romName)
8887
{
8988
std::string IniFolder;
9089
uint32_t slength = WideCharToMultiByte(CP_ACP, 0, _strFileName, -1, NULL, 0, NULL, NULL);

‎Source/3rdParty/mupen64plus-video-GLideN64/src/GLideNUI-wtl/GLideNUI.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ extern "C" {
1313
#define CALL
1414
#endif
1515

16-
EXPORT bool CALL RunConfig(const wchar_t * _strFileName, const char * _romName, unsigned int _maxMSAALevel, unsigned int _maxAnisotropy);
17-
EXPORT int CALL RunAbout(const wchar_t * _strFileName);
18-
EXPORT void CALL LoadConfig(const wchar_t * _strFileName);
19-
EXPORT void CALL LoadCustomRomSettings(const wchar_t * _strFileName, const char * _romName);
16+
EXPORT bool CALL RunConfig(const wchar_t * _strFileName, const wchar_t * _strSharedFileName, const char * _romName, unsigned int _maxMSAALevel, unsigned int _maxAnisotropy);
17+
EXPORT int CALL RunAbout(const wchar_t * _strFileName);
18+
EXPORT void CALL LoadConfig(const wchar_t * _strFileName, const wchar_t * _strSharedFileName);
19+
EXPORT void CALL LoadCustomRomSettings(const wchar_t * _strFileName, const wchar_t * _strSharedFileName, const char * _romName);
2020

2121
#if defined(__cplusplus)
2222
}

‎Source/3rdParty/mupen64plus-video-GLideN64/src/Textures.cpp

+28-28
Original file line numberDiff line numberDiff line change
@@ -52,39 +52,39 @@ u32 GetCI4IA_RGBA4444(u16 offset, u16 x, u16 i, u8 palette)
5252
const u8 color4B = Get4BitPaletteColor(offset, x, i);
5353

5454
if (x & 1)
55-
return IA88_RGBA4444(*(u16*)&TMEM[(0x100 + (palette << 4) + (color4B & 0x0F)) & 0x1FF]);
55+
return IA88_RGBA4444(static_cast<u16>(TMEM[(0x100 + (palette << 4) + (color4B & 0x0F)) & 0x1FF] & 0xFFFF));
5656
else
57-
return IA88_RGBA4444(*(u16*)&TMEM[(0x100 + (palette << 4) + (color4B >> 4)) & 0x1FF]);
57+
return IA88_RGBA4444(static_cast<u16>(TMEM[(0x100 + (palette << 4) + (color4B >> 4)) & 0x1FF] & 0xFFFF));
5858
}
5959

6060
u32 GetCI4IA_RGBA8888(u16 offset, u16 x, u16 i, u8 palette)
6161
{
6262
const u8 color4B = Get4BitPaletteColor(offset, x, i);
6363

6464
if (x & 1)
65-
return IA88_RGBA8888(*(u16*)&TMEM[(0x100 + (palette << 4) + (color4B & 0x0F)) & 0x1FF]);
65+
return IA88_RGBA8888(static_cast<u16>(TMEM[(0x100 + (palette << 4) + (color4B & 0x0F)) & 0x1FF] & 0xFFFF));
6666
else
67-
return IA88_RGBA8888(*(u16*)&TMEM[(0x100 + (palette << 4) + (color4B >> 4)) & 0x1FF]);
67+
return IA88_RGBA8888(static_cast<u16>(TMEM[(0x100 + (palette << 4) + (color4B >> 4)) & 0x1FF] & 0xFFFF));
6868
}
6969

7070
u32 GetCI4RGBA_RGBA5551(u16 offset, u16 x, u16 i, u8 palette)
7171
{
7272
const u8 color4B = Get4BitPaletteColor(offset, x, i);
7373

7474
if (x & 1)
75-
return RGBA5551_RGBA5551(*(u16*)&TMEM[(0x100 + (palette << 4) + (color4B & 0x0F)) & 0x1FF]);
75+
return RGBA5551_RGBA5551(static_cast<u16>(TMEM[(0x100 + (palette << 4) + (color4B & 0x0F)) & 0x1FF] & 0xFFFF));
7676
else
77-
return RGBA5551_RGBA5551(*(u16*)&TMEM[(0x100 + (palette << 4) + (color4B >> 4)) & 0x1FF]);
77+
return RGBA5551_RGBA5551(static_cast<u16>(TMEM[(0x100 + (palette << 4) + (color4B >> 4)) & 0x1FF] & 0xFFFF));
7878
}
7979

8080
u32 GetCI4RGBA_RGBA8888(u16 offset, u16 x, u16 i, u8 palette)
8181
{
8282
const u8 color4B = Get4BitPaletteColor(offset, x, i);
8383

8484
if (x & 1)
85-
return RGBA5551_RGBA8888(*(u16*)&TMEM[(0x100 + (palette << 4) + (color4B & 0x0F)) & 0x1FF]);
85+
return RGBA5551_RGBA8888(static_cast<u16>(TMEM[(0x100 + (palette << 4) + (color4B & 0x0F)) & 0x1FF] & 0xFFFF));
8686
else
87-
return RGBA5551_RGBA8888(*(u16*)&TMEM[(0x100 + (palette << 4) + (color4B >> 4)) & 0x1FF]);
87+
return RGBA5551_RGBA8888(static_cast<u16>(TMEM[(0x100 + (palette << 4) + (color4B >> 4)) & 0x1FF] & 0xFFFF));
8888
}
8989

9090
u32 GetIA31_RGBA8888(u16 offset, u16 x, u16 i, u8 palette)
@@ -120,25 +120,25 @@ inline u8 Get8BitPaletteColor(u16 offset, u16 x, u16 i)
120120
u32 GetCI8IA_RGBA4444(u16 offset, u16 x, u16 i, u8 palette)
121121
{
122122
const u8 color = Get8BitPaletteColor(offset, x, i);
123-
return IA88_RGBA4444(*(u16*)&TMEM[(0x100 + color) & 0x1FF]);
123+
return IA88_RGBA4444(static_cast<u16>(TMEM[(0x100 + color) & 0x1FF] & 0xFFFF));
124124
}
125125

126126
u32 GetCI8IA_RGBA8888(u16 offset, u16 x, u16 i, u8 palette)
127127
{
128128
const u8 color = Get8BitPaletteColor(offset, x, i);
129-
return IA88_RGBA8888(*(u16*)&TMEM[(0x100 + color) & 0x1FF]);
129+
return IA88_RGBA8888(static_cast<u16>(TMEM[(0x100 + color) & 0x1FF] & 0xFFFF));
130130
}
131131

132132
u32 GetCI8RGBA_RGBA5551(u16 offset, u16 x, u16 i, u8 palette)
133133
{
134134
const u8 color = Get8BitPaletteColor(offset, x, i);
135-
return RGBA5551_RGBA5551(*(u16*)&TMEM[(0x100 + color) & 0x1FF]);
135+
return RGBA5551_RGBA5551(static_cast<u16>(TMEM[(0x100 + color) & 0x1FF] & 0xFFFF));
136136
}
137137

138138
u32 GetCI8RGBA_RGBA8888(u16 offset, u16 x, u16 i, u8 palette)
139139
{
140140
const u8 color = Get8BitPaletteColor(offset, x, i);
141-
return RGBA5551_RGBA8888(*(u16*)&TMEM[(0x100 + color) & 0x1FF]);
141+
return RGBA5551_RGBA8888(static_cast<u16>(TMEM[(0x100 + color) & 0x1FF] & 0xFFFF));
142142
}
143143

144144
u32 GetIA44_RGBA8888(u16 offset, u16 x, u16 i, u8 palette)
@@ -193,7 +193,7 @@ u32 GetI16_RGBA4444(u16 offset, u16 x, u16 i, u8 palette)
193193
u32 GetCI16IA_RGBA8888(u16 offset, u16 x, u16 i, u8 palette)
194194
{
195195
const u16 tex = Get16BitColor(offset, x, i);
196-
const u16 col = (*(u16*)&TMEM[0x100 + (tex & 0xFF)]);
196+
const u16 col = (static_cast<u16>(TMEM[0x100 + (tex & 0xFF)] & 0xFFFF));
197197
const u16 c = col >> 8;
198198
const u16 a = col & 0xFF;
199199
return (a << 24) | (c << 16) | (c << 8) | c;
@@ -202,7 +202,7 @@ u32 GetCI16IA_RGBA8888(u16 offset, u16 x, u16 i, u8 palette)
202202
u32 GetCI16IA_RGBA4444(u16 offset, u16 x, u16 i, u8 palette)
203203
{
204204
const u16 tex = Get16BitColor(offset, x, i);
205-
const u16 col = (*(u16*)&TMEM[0x100 + (tex & 0xFF)]);
205+
const u16 col = (static_cast<u16>(TMEM[0x100 + (tex & 0xFF)] & 0xFFFF));
206206
const u16 c = col >> 12;
207207
const u16 a = col & 0x0F;
208208
return (a << 12) | (c << 8) | (c << 4) | c;
@@ -303,39 +303,39 @@ u32 GetCI4IA_RGBA4444_BG(u64 *src, u16 x, u16 i, u8 palette)
303303
u8 color4B = ((u8*)src)[(x >> 1) ^ (i << 1)];
304304

305305
if (x & 1)
306-
return IA88_RGBA4444(*(u16*)&TMEM[256 + (palette << 4) + (color4B & 0x0F)]);
306+
return IA88_RGBA4444(static_cast<u16>(TMEM[256 + (palette << 4) + (color4B & 0x0F)] & 0xFFFF));
307307
else
308-
return IA88_RGBA4444(*(u16*)&TMEM[256 + (palette << 4) + (color4B >> 4)]);
308+
return IA88_RGBA4444(static_cast<u16>(TMEM[256 + (palette << 4) + (color4B >> 4)] & 0xFFFF));
309309
}
310310

311311
u32 GetCI4IA_RGBA8888_BG(u64 *src, u16 x, u16 i, u8 palette)
312312
{
313313
u8 color4B = ((u8*)src)[(x >> 1) ^ (i << 1)];
314314

315315
if (x & 1)
316-
return IA88_RGBA8888(*(u16*)&TMEM[256 + (palette << 4) + (color4B & 0x0F)]);
316+
return IA88_RGBA8888(static_cast<u16>(TMEM[256 + (palette << 4) + (color4B & 0x0F)] & 0xFFFF));
317317
else
318-
return IA88_RGBA8888(*(u16*)&TMEM[256 + (palette << 4) + (color4B >> 4)]);
318+
return IA88_RGBA8888(static_cast<u16>(TMEM[256 + (palette << 4) + (color4B >> 4)] & 0xFFFF));
319319
}
320320

321321
u32 GetCI4RGBA_RGBA5551_BG(u64 *src, u16 x, u16 i, u8 palette)
322322
{
323323
u8 color4B = ((u8*)src)[(x >> 1) ^ (i << 1)];
324324

325325
if (x & 1)
326-
return RGBA5551_RGBA5551(*(u16*)&TMEM[256 + (palette << 4) + (color4B & 0x0F)]);
326+
return RGBA5551_RGBA5551(static_cast<u16>(TMEM[256 + (palette << 4) + (color4B & 0x0F)] & 0xFFFF));
327327
else
328-
return RGBA5551_RGBA5551(*(u16*)&TMEM[256 + (palette << 4) + (color4B >> 4)]);
328+
return RGBA5551_RGBA5551(static_cast<u16>(TMEM[256 + (palette << 4) + (color4B >> 4)] & 0xFFFF));
329329
}
330330

331331
u32 GetCI4RGBA_RGBA8888_BG(u64 *src, u16 x, u16 i, u8 palette)
332332
{
333333
u8 color4B = ((u8*)src)[(x >> 1) ^ (i << 1)];
334334

335335
if (x & 1)
336-
return RGBA5551_RGBA8888(*(u16*)&TMEM[256 + (palette << 4) + (color4B & 0x0F)]);
336+
return RGBA5551_RGBA8888(static_cast<u16>(TMEM[256 + (palette << 4) + (color4B & 0x0F)] & 0xFFFF));
337337
else
338-
return RGBA5551_RGBA8888(*(u16*)&TMEM[256 + (palette << 4) + (color4B >> 4)]);
338+
return RGBA5551_RGBA8888(static_cast<u16>(TMEM[256 + (palette << 4) + (color4B >> 4)] & 0xFFFF));
339339
}
340340

341341
u32 GetIA31_RGBA8888_BG(u64 *src, u16 x, u16 i, u8 palette)
@@ -368,22 +368,22 @@ u32 GetI4_RGBA4444_BG(u64 *src, u16 x, u16 i, u8 palette)
368368

369369
u32 GetCI8IA_RGBA4444_BG(u64 *src, u16 x, u16 i, u8 palette)
370370
{
371-
return IA88_RGBA4444(*(u16*)&TMEM[256 + ((u8*)src)[x ^ (i << 1)]]);
371+
return IA88_RGBA4444(static_cast<u16>(TMEM[256 + ((u8*)src)[x ^ (i << 1)]] & 0xFFFF));
372372
}
373373

374374
u32 GetCI8IA_RGBA8888_BG(u64 *src, u16 x, u16 i, u8 palette)
375375
{
376-
return IA88_RGBA8888(*(u16*)&TMEM[256 + ((u8*)src)[x ^ (i << 1)]]);
376+
return IA88_RGBA8888(static_cast<u16>(TMEM[256 + ((u8*)src)[x ^ (i << 1)]] & 0xFFFF));
377377
}
378378

379379
u32 GetCI8RGBA_RGBA5551_BG(u64 *src, u16 x, u16 i, u8 palette)
380380
{
381-
return RGBA5551_RGBA5551(*(u16*)&TMEM[256 + ((u8*)src)[x ^ (i << 1)]]);
381+
return RGBA5551_RGBA5551(static_cast<u16>(TMEM[256 + ((u8*)src)[x ^ (i << 1)]] & 0xFFFF));
382382
}
383383

384384
u32 GetCI8RGBA_RGBA8888_BG(u64 *src, u16 x, u16 i, u8 palette)
385385
{
386-
return RGBA5551_RGBA8888(*(u16*)&TMEM[256 + ((u8*)src)[x ^ (i << 1)]]);
386+
return RGBA5551_RGBA8888(static_cast<u16>(TMEM[256 + ((u8*)src)[x ^ (i << 1)]] & 0xFFFF));
387387
}
388388

389389
u32 GetIA44_RGBA8888_BG(u64 *src, u16 x, u16 i, u8 palette)
@@ -429,7 +429,7 @@ u32 GetI16_RGBA4444_BG(u64 *src, u16 x, u16 i, u8 palette)
429429
u32 GetCI16IA_RGBA8888_BG(u64 *src, u16 x, u16 i, u8 palette)
430430
{
431431
const u16 tex = ((u16*)src)[x^i];
432-
const u16 col = (*(u16*)&TMEM[256 + (tex & 0xFF)]);
432+
const u16 col = (static_cast<u16>(TMEM[256 + (tex & 0xFF)] & 0xFFFF));
433433
const u16 c = col >> 8;
434434
const u16 a = col & 0xFF;
435435
return (a << 24) | (c << 16) | (c << 8) | c;
@@ -438,7 +438,7 @@ u32 GetCI16IA_RGBA8888_BG(u64 *src, u16 x, u16 i, u8 palette)
438438
u32 GetCI16IA_RGBA4444_BG(u64 *src, u16 x, u16 i, u8 palette)
439439
{
440440
const u16 tex = ((u16*)src)[x^i];
441-
const u16 col = (*(u16*)&TMEM[256 + (tex & 0xFF)]);
441+
const u16 col = (static_cast<u16>(TMEM[256 + (tex & 0xFF)] & 0xFFFF));
442442
const u16 c = col >> 12;
443443
const u16 a = col & 0x0F;
444444
return (a << 12) | (c << 8) | (c << 4) | c;

‎Source/3rdParty/mupen64plus-video-GLideN64/src/mupenplus/Config_mupenplus.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -340,6 +340,8 @@ void Config_LoadCustomConfig()
340340
ROMname.replace(pos, 1, "%20");
341341
for (size_t pos = ROMname.find('\''); pos != std::string::npos; pos = ROMname.find('\'', pos))
342342
ROMname.replace(pos, 1, "%27");
343+
for (size_t pos = ROMname.find('&'); pos != std::string::npos; pos = ROMname.find('&', pos))
344+
ROMname.replace(pos, 1, "%26");
343345
std::transform(ROMname.begin(), ROMname.end(), ROMname.begin(), ::toupper);
344346
const char* sectionName = ROMname.c_str();
345347
m64p_handle fileHandle;

‎Source/3rdParty/mupen64plus-video-GLideN64/src/osal/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
3939
add_definitions( -D__MSC__)
4040
endif()
4141

42-
if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
42+
if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
4343
SET(GCC_CPP11_COMPILE_FLAGS "-std=c++0x")
4444
if (NOT MINGW)
4545
SET( PIC_FLAGS "-fPIC")

0 commit comments

Comments
 (0)