diff --git a/cheevos/cheevos.h b/cheevos/cheevos.h index 479446563d..ce0d278140 100644 --- a/cheevos/cheevos.h +++ b/cheevos/cheevos.h @@ -51,7 +51,7 @@ void rcheevos_get_achievement_state(unsigned index, char* buffer, size_t buffer_ bool rcheevos_get_description(rcheevos_ctx_desc_t *desc); -void rcheevos_pause_hardcore(); +void rcheevos_pause_hardcore(void); bool rcheevos_unload(void); diff --git a/deps/rcheevos/include/rc_hash.h b/deps/rcheevos/include/rc_hash.h index 32e9655dfc..9ed86f86d3 100644 --- a/deps/rcheevos/include/rc_hash.h +++ b/deps/rcheevos/include/rc_hash.h @@ -112,7 +112,7 @@ extern "C" { rc_hash_cdreader_close_track_handler close_track; }; - void rc_hash_init_default_cdreader(); + void rc_hash_init_default_cdreader(void); void rc_hash_init_custom_cdreader(struct rc_hash_cdreader* reader); /* ===================================================== */ diff --git a/frontend/frontend_driver.h b/frontend/frontend_driver.h index 22f5d9a270..ccf6d689d3 100644 --- a/frontend/frontend_driver.h +++ b/frontend/frontend_driver.h @@ -214,7 +214,7 @@ void frontend_driver_detach_console(void); void frontend_driver_set_screen_brightness(int value); -bool frontend_driver_can_set_screen_brightness(); +bool frontend_driver_can_set_screen_brightness(void); bool frontend_driver_can_watch_for_changes(void); diff --git a/gfx/drivers/metal.m b/gfx/drivers/metal.m index e3e0da066b..bfe7c93224 100644 --- a/gfx/drivers/metal.m +++ b/gfx/drivers/metal.m @@ -60,11 +60,10 @@ static uint32_t metal_get_flags(void *data); // The graphics context for the Metal driver is just a stubbed out version // It supports getting metrics such as dpi which is needed for iOS/tvOS - +#if defined(HAVE_COCOATOUCH) static bool metal_gfx_ctx_get_metrics(void *data, enum display_metric_types type, float *value) { -#ifdef HAVE_COCOATOUCH CGRect screenRect = [[UIScreen mainScreen] bounds]; CGFloat scale = [[UIScreen mainScreen] scale]; float displayHeight = screenRect.size.height; @@ -112,10 +111,8 @@ static bool metal_gfx_ctx_get_metrics(void *data, enum display_metric_types type return false; } return true; -#else - return false; -#endif } +#endif /* Temporary workaround for metal not being able to poll flags during init */ static gfx_ctx_driver_t metal_fake_context = { diff --git a/libretro-common/include/formats/rjson.h b/libretro-common/include/formats/rjson.h index 05c61d8d5d..1a58397539 100644 --- a/libretro-common/include/formats/rjson.h +++ b/libretro-common/include/formats/rjson.h @@ -186,7 +186,7 @@ typedef struct rjsonwriter rjsonwriter_t; /* Create a new writer instance to various targets */ rjsonwriter_t *rjsonwriter_open_stream(struct intfstream_internal *stream); rjsonwriter_t *rjsonwriter_open_rfile(struct RFILE *rfile); -rjsonwriter_t *rjsonwriter_open_memory(); +rjsonwriter_t *rjsonwriter_open_memory(void); rjsonwriter_t *rjsonwriter_open_user(rjsonwriter_io_t io, void *user_data); /* When opened with rjsonwriter_open_memory, will return the generated JSON. diff --git a/pkg/apple/RetroArch_Metal.xcodeproj/project.pbxproj b/pkg/apple/RetroArch_Metal.xcodeproj/project.pbxproj index 0d18848770..6e6726f4ca 100644 --- a/pkg/apple/RetroArch_Metal.xcodeproj/project.pbxproj +++ b/pkg/apple/RetroArch_Metal.xcodeproj/project.pbxproj @@ -1734,11 +1734,11 @@ buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CODE_SIGN_ENTITLEMENTS = RetroArch.entitlements; - CODE_SIGN_IDENTITY = "Developer ID Application"; - CODE_SIGN_STYLE = Manual; + CODE_SIGN_IDENTITY = "Mac Developer"; + CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; - DEVELOPMENT_TEAM = ZE9XE938Z2; + DEVELOPMENT_TEAM = NAY8P7HNSD; ENABLE_HARDENED_RUNTIME = YES; GCC_DYNAMIC_NO_PIC = NO; GCC_MODEL_TUNING = G5; @@ -1772,11 +1772,11 @@ buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CODE_SIGN_ENTITLEMENTS = RetroArch.entitlements; - CODE_SIGN_IDENTITY = "Developer ID Application"; - CODE_SIGN_STYLE = Manual; + CODE_SIGN_IDENTITY = "Mac Developer"; + CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - DEVELOPMENT_TEAM = ZE9XE938Z2; + DEVELOPMENT_TEAM = NAY8P7HNSD; ENABLE_HARDENED_RUNTIME = YES; GCC_MODEL_TUNING = G5; GCC_PRECOMPILE_PREFIX_HEADER = YES; diff --git a/retroarch.h b/retroarch.h index 073b2571e6..7e00fa0bbc 100644 --- a/retroarch.h +++ b/retroarch.h @@ -1994,6 +1994,15 @@ void *input_driver_init_wrap(input_driver_t *input, const char *name); /* creates folder and core options stub file for subsequent runs */ bool create_folder_and_core_options(void); +typedef enum apple_view_type +{ + APPLE_VIEW_TYPE_NONE = 0, + APPLE_VIEW_TYPE_OPENGL_ES, + APPLE_VIEW_TYPE_OPENGL, + APPLE_VIEW_TYPE_VULKAN, + APPLE_VIEW_TYPE_METAL +} apple_view_type_t; + RETRO_END_DECLS #endif diff --git a/ui/drivers/cocoa/cocoa_common.h b/ui/drivers/cocoa/cocoa_common.h index aba9e4222a..7d3ba53318 100644 --- a/ui/drivers/cocoa/cocoa_common.h +++ b/ui/drivers/cocoa/cocoa_common.h @@ -46,15 +46,6 @@ #include "../../../retroarch.h" -typedef enum apple_view_type -{ - APPLE_VIEW_TYPE_NONE = 0, - APPLE_VIEW_TYPE_OPENGL_ES, - APPLE_VIEW_TYPE_OPENGL, - APPLE_VIEW_TYPE_VULKAN, - APPLE_VIEW_TYPE_METAL -} apple_view_type_t; - #if defined(HAVE_COCOATOUCH) #if TARGET_OS_IOS diff --git a/ui/drivers/cocoa/cocoa_common.m b/ui/drivers/cocoa/cocoa_common.m index d202db6f38..775b543e52 100644 --- a/ui/drivers/cocoa/cocoa_common.m +++ b/ui/drivers/cocoa/cocoa_common.m @@ -17,6 +17,7 @@ #import #include #include "cocoa_common.h" +#include "apple_platform.h" #include "../ui_cocoa.h" #include diff --git a/ui/drivers/ui_cocoa.m b/ui/drivers/ui_cocoa.m index 16bdff8cbe..e96bb1cdea 100644 --- a/ui/drivers/ui_cocoa.m +++ b/ui/drivers/ui_cocoa.m @@ -29,6 +29,11 @@ #include "cocoa/cocoa_defines.h" #include "cocoa/cocoa_common.h" #include "cocoa/apple_platform.h" + +#if defined(HAVE_COCOA_METAL) +#include "../../gfx/common/metal_common.h" +#endif + #include "../ui_companion_driver.h" #include "../../input/drivers/cocoa_input.h" #include "../../input/drivers_keyboard/keyboard_event_apple.h" @@ -191,10 +196,7 @@ static char **waiting_argv; @synthesize window = _window; -#ifdef HAVE_COCOA_METAL -#else -#define NS_WINDOW_COLLECTION_BEHAVIOR_FULLSCREEN_PRIMARY (1 << 17) - +#ifndef HAVE_COCOA_METAL - (void)dealloc { [_window release]; @@ -202,6 +204,8 @@ static char **waiting_argv; } #endif +#define NS_WINDOW_COLLECTION_BEHAVIOR_FULLSCREEN_PRIMARY (1 << 17) + - (void)applicationDidFinishLaunching:(NSNotification *)aNotification { unsigned i; diff --git a/wifi/wifi_driver.h b/wifi/wifi_driver.h index 1dc762d360..0e06b59b89 100644 --- a/wifi/wifi_driver.h +++ b/wifi/wifi_driver.h @@ -100,7 +100,7 @@ bool driver_wifi_connection_info(wifi_network_info_t *network); void driver_wifi_scan(void); -wifi_network_scan_t* driver_wifi_get_ssids(); +wifi_network_scan_t* driver_wifi_get_ssids(void); bool driver_wifi_ssid_is_online(unsigned i);