diff --git a/macos/Dependencies/dependencies.make b/macos/Dependencies/dependencies.make index d2cb4634..ae6cde6f 100644 --- a/macos/Dependencies/dependencies.make +++ b/macos/Dependencies/dependencies.make @@ -37,7 +37,6 @@ RUBY_CONFIGURE_ARGS := \ --disable-install-doc \ --with-out-ext=openssl,fiddle,gdbm,win32ole,win32 \ --disable-rubygems \ - --with-static-linked-ext \ ${EXTRA_RUBY_CONFIG_ARGS} CONFIGURE := $(CONFIGURE_ENV) ./configure $(CONFIGURE_ARGS) @@ -310,4 +309,4 @@ clean-compiled: deps-core: libvorbis sigcxx pixman libpng libjpeg physfs sdl2 sdl2image sdl2ttf openal everything: deps-core ruby -legacy: deps-core legacy-ruby \ No newline at end of file +legacy: deps-core legacy-ruby diff --git a/macos/Info.plist b/macos/Info.plist index db3026de..a9c7838f 100644 --- a/macos/Info.plist +++ b/macos/Info.plist @@ -26,7 +26,5 @@ public.app-category.role-playing-games NSRequiresAquaSystemAppearance False - SDL_FILESYSTEM_BASE_DIR_TYPE - parent diff --git a/macos/mkxp-z.xcodeproj/project.pbxproj b/macos/mkxp-z.xcodeproj/project.pbxproj index 174bc4fe..2cdb069a 100644 --- a/macos/mkxp-z.xcodeproj/project.pbxproj +++ b/macos/mkxp-z.xcodeproj/project.pbxproj @@ -3192,6 +3192,13 @@ GCC_DYNAMIC_NO_PIC = NO; GCC_NO_COMMON_BLOCKS = YES; GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + MKXPZ_BUILD_XCODE, + "ALCDEVICE_STRUCT=ALCdevice", + USE_MINIFFI, + AL_LIBTYPE_STATIC, + EASY_POKE, + ); GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; GCC_WARN_UNDECLARED_SELECTOR = YES; @@ -3268,6 +3275,13 @@ ENABLE_STRICT_OBJC_MSGSEND = YES; FRAMEWORK_SEARCH_PATHS = "$(inherited)"; GCC_NO_COMMON_BLOCKS = YES; + GCC_PREPROCESSOR_DEFINITIONS = ( + MKXPZ_BUILD_XCODE, + "ALCDEVICE_STRUCT=ALCdevice", + USE_MINIFFI, + AL_LIBTYPE_STATIC, + EASY_POKE, + ); GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; GCC_WARN_UNDECLARED_SELECTOR = YES;