From 2bdffff435d3f62fe5b61c16d4ff46751c3a9074 Mon Sep 17 00:00:00 2001 From: Twinaphex Date: Thu, 21 Jun 2018 07:34:27 +0200 Subject: [PATCH] Silence more warnings --- frontend/drivers/platform_darwin.m | 4 ++-- gfx/drivers_shader/slang_process.cpp | 4 ++-- midi/midi_driver.c | 15 +++++++-------- .../RetroArch_Metal.xcodeproj/project.pbxproj | 4 ++-- 4 files changed, 13 insertions(+), 14 deletions(-) diff --git a/frontend/drivers/platform_darwin.m b/frontend/drivers/platform_darwin.m index 956d3605bb..4df8be17df 100644 --- a/frontend/drivers/platform_darwin.m +++ b/frontend/drivers/platform_darwin.m @@ -306,8 +306,8 @@ static void frontend_darwin_get_os(char *s, size_t len, int *major, int *minor) NSInteger patchVersion; } NSMyOSVersion; NSMyOSVersion version = ((NSMyOSVersion(*)(id, SEL))objc_msgSend_stret)([NSProcessInfo processInfo], @selector(operatingSystemVersion)); - *major = version.majorVersion; - *minor = version.minorVersion; + *major = (int)version.majorVersion; + *minor = (int)version.minorVersion; } else { diff --git a/gfx/drivers_shader/slang_process.cpp b/gfx/drivers_shader/slang_process.cpp index 2a9c39d0e4..77ec32065a 100644 --- a/gfx/drivers_shader/slang_process.cpp +++ b/gfx/drivers_shader/slang_process.cpp @@ -482,8 +482,8 @@ bool slang_process( CompilerGLSL* vs = (CompilerGLSL*)vs_compiler; CompilerGLSL* ps = (CompilerGLSL*)ps_compiler; options.version = version; - ps->set_options(options); - vs->set_options(options); + ps->set_common_options(options); + vs->set_common_options(options); vs_code = vs->compile(); ps_code = ps->compile(); diff --git a/midi/midi_driver.c b/midi/midi_driver.c index 9f8f934fa5..4b6411b302 100644 --- a/midi/midi_driver.c +++ b/midi/midi_driver.c @@ -133,7 +133,6 @@ bool midi_driver_set_volume(unsigned volume) { midi_event_t event; uint8_t data[8] = { 0xF0, 0x7F, 0x7F, 0x04, 0x01, 0, 0, 0xF7 }; - const char *err_str = NULL; if (!midi_drv_data || !midi_drv_output_enabled) return false; @@ -464,7 +463,7 @@ bool midi_driver_write(uint8_t byte, uint32_t delta_time) midi_drv_output_event.data[0] == 0xF0) { if (byte == 0xF7) - event_size = midi_drv_output_event.data_size + 1; + event_size = (int)midi_drv_output_event.data_size + 1; else { if (!midi_drv->write(midi_drv_data, &midi_drv_output_event)) @@ -489,17 +488,17 @@ bool midi_driver_write(uint8_t byte, uint32_t delta_time) midi_drv_output_event.data_size); #endif - midi_drv_output_pending = true; - event_size = midi_driver_get_event_size(byte); - midi_drv_output_event.data_size = 0; + midi_drv_output_pending = true; + event_size = (int)midi_driver_get_event_size(byte); + midi_drv_output_event.data_size = 0; midi_drv_output_event.delta_time = 0; } } else { - event_size = midi_driver_get_event_size(byte); - midi_drv_output_event.data_size = 0; - midi_drv_output_event.delta_time = 0; + event_size = (int)midi_driver_get_event_size(byte); + midi_drv_output_event.data_size = 0; + midi_drv_output_event.delta_time = 0; } } diff --git a/pkg/apple/RetroArch_Metal.xcodeproj/project.pbxproj b/pkg/apple/RetroArch_Metal.xcodeproj/project.pbxproj index 323da51714..d38411703c 100644 --- a/pkg/apple/RetroArch_Metal.xcodeproj/project.pbxproj +++ b/pkg/apple/RetroArch_Metal.xcodeproj/project.pbxproj @@ -357,7 +357,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.7; + MACOSX_DEPLOYMENT_TARGET = 10.13; ONLY_ACTIVE_ARCH = YES; PREBINDING = NO; SDKROOT = macosx; @@ -395,7 +395,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.7; + MACOSX_DEPLOYMENT_TARGET = 10.13; PREBINDING = NO; SDKROOT = macosx; };