From 9a5881fc4760d8c95948bec83ee28f29b2ebe99f Mon Sep 17 00:00:00 2001 From: WerWolv Date: Wed, 4 Jan 2023 14:24:07 +0100 Subject: [PATCH] build: Fixed -Wpedantic issues on macOS --- cmake/build_helpers.cmake | 1 + lib/libimhex/source/helpers/fs_macos.m | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/cmake/build_helpers.cmake b/cmake/build_helpers.cmake index 2b07a07a2..358e8f49d 100644 --- a/cmake/build_helpers.cmake +++ b/cmake/build_helpers.cmake @@ -409,6 +409,7 @@ macro(addBundledLibraries) set(EXTERN_LIBS_FOLDER "${CMAKE_CURRENT_SOURCE_DIR}/lib/external") + set(BUILD_SHARED_LIBS OFF) add_subdirectory(${EXTERN_LIBS_FOLDER}/imgui) set_target_properties(imgui PROPERTIES POSITION_INDEPENDENT_CODE ON) diff --git a/lib/libimhex/source/helpers/fs_macos.m b/lib/libimhex/source/helpers/fs_macos.m index 665b7493f..1549f196e 100644 --- a/lib/libimhex/source/helpers/fs_macos.m +++ b/lib/libimhex/source/helpers/fs_macos.m @@ -4,7 +4,7 @@ #include #include - char* getMacExecutableDirectoryPath() { + char* getMacExecutableDirectoryPath(void) { @autoreleasepool { const char *pathString = [[[[[NSBundle mainBundle] executableURL] URLByDeletingLastPathComponent] path] UTF8String]; @@ -15,7 +15,7 @@ } } - char* getMacApplicationSupportDirectoryPath() { + char* getMacApplicationSupportDirectoryPath(void) { @autoreleasepool { NSError* error = nil; NSURL* dirUrl = [[NSFileManager defaultManager] URLForDirectory:NSApplicationSupportDirectory