Max/mgba-ps3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Windows: Fix some MSVC warnings

Browse Source
This commit is contained in:
Vicki Pfau 2025-05-04 00:24:39 -07:00
parent a3a8b3a8f8
commit 35f287e24c
4 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/mgba-util/common.h
View File

@ -17,6 +17,9 @@
CXX_GUARD_START CXX_GUARD_START
#ifdef _WIN32 #ifdef _WIN32
#ifdef _CRT_NONSTDC_NO_WARNINGS
#define _CRT_NONSTDC_NO_WARNINGS
#endif
#ifndef WIN32_LEAN_AND_MEAN #ifndef WIN32_LEAN_AND_MEAN
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
#endif #endif

2
src/core/input.c
View File

@ -650,7 +650,7 @@ void mInputSetPreferredDevice(struct Configuration* config, const char* platform
char deviceId[KEY_NAME_MAX]; char deviceId[KEY_NAME_MAX];
snprintf(deviceId, sizeof(deviceId), "device%i", playerId); snprintf(deviceId, sizeof(deviceId), "device%i", playerId);
return ConfigurationSetValue(config, sectionName, deviceId, deviceName); ConfigurationSetValue(config, sectionName, deviceId, deviceName);
} }
const char* mInputGetCustomValue(const struct Configuration* config, const char* platformName, uint32_t type, const char* key, const char* profile) { const char* mInputGetCustomValue(const struct Configuration* config, const char* platformName, uint32_t type, const char* key, const char* profile) {

18
src/core/scripting.c
View File

@ -1346,9 +1346,9 @@ static uint8_t _readLuminance(struct GBALuminanceSource* luminance) {
} }
#endif #endif
#define CALLBACK(NAME) _mScriptCoreCallback ## NAME #define mCoreCallback(NAME) _mScriptCoreCallback ## NAME
#define DEFINE_CALLBACK(NAME) \ #define DEFINE_CALLBACK(NAME) \
void CALLBACK(NAME) (void* context) { \ void mCoreCallback(NAME) (void* context) { \
struct mScriptContext* scriptContext = context; \ struct mScriptContext* scriptContext = context; \
if (!scriptContext) { \ if (!scriptContext) { \
return; \ return; \
@ -1397,13 +1397,13 @@ void mScriptContextAttachCore(struct mScriptContext* context, struct mCore* core
#endif #endif
struct mCoreCallbacks callbacks = { struct mCoreCallbacks callbacks = {
.videoFrameEnded = CALLBACK(frame), .videoFrameEnded = mCoreCallback(frame),
.coreCrashed = CALLBACK(crashed), .coreCrashed = mCoreCallback(crashed),
.sleep = CALLBACK(sleep), .sleep = mCoreCallback(sleep),
.shutdown = CALLBACK(stop), .shutdown = mCoreCallback(stop),
.keysRead = CALLBACK(keysRead), .keysRead = mCoreCallback(keysRead),
.savedataUpdated = CALLBACK(savedataUpdated), .savedataUpdated = mCoreCallback(savedataUpdated),
.alarm = CALLBACK(alarm), .alarm = mCoreCallback(alarm),
.context = context .context = context
}; };
core->addCoreCallbacks(core, &callbacks); core->addCoreCallbacks(core, &callbacks);

4
src/core/test/scripting.c
View File

@ -58,6 +58,7 @@ static const uint8_t _fakeGBROM[0x4000] = {
assert_true(core->loadROM(core, VFileFromConstMemory(_fakeGBROM, sizeof(_fakeGBROM)))); \ assert_true(core->loadROM(core, VFileFromConstMemory(_fakeGBROM, sizeof(_fakeGBROM)))); \
break; \ break; \
case mPLATFORM_NONE: \ case mPLATFORM_NONE: \
abort(); \
break; \ break; \
} \ } \
mCoreInitConfig(core, NULL); \ mCoreInitConfig(core, NULL); \
@ -345,6 +346,9 @@ void _setupBp(struct mCore* core) {
core->rawWrite8(core, 0xF2, 0, 0xFD); // jr $-3 core->rawWrite8(core, 0xF2, 0, 0xFD); // jr $-3
break; break;
#endif #endif
case mPLATFORM_NONE:
abort();
break;
} }
} }