Set data dir back to Contents/Resources by default

This commit is contained in:
Struma 2020-12-27 12:26:55 -05:00 committed by Roza
parent 682b8c4716
commit 7953feac37
3 changed files with 15 additions and 4 deletions

View file

@ -37,7 +37,6 @@ RUBY_CONFIGURE_ARGS := \
--disable-install-doc \ --disable-install-doc \
--with-out-ext=openssl,fiddle,gdbm,win32ole,win32 \ --with-out-ext=openssl,fiddle,gdbm,win32ole,win32 \
--disable-rubygems \ --disable-rubygems \
--with-static-linked-ext \
${EXTRA_RUBY_CONFIG_ARGS} ${EXTRA_RUBY_CONFIG_ARGS}
CONFIGURE := $(CONFIGURE_ENV) ./configure $(CONFIGURE_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 deps-core: libvorbis sigcxx pixman libpng libjpeg physfs sdl2 sdl2image sdl2ttf openal
everything: deps-core ruby everything: deps-core ruby
legacy: deps-core legacy-ruby legacy: deps-core legacy-ruby

View file

@ -26,7 +26,5 @@
<string>public.app-category.role-playing-games</string> <string>public.app-category.role-playing-games</string>
<key>NSRequiresAquaSystemAppearance</key> <key>NSRequiresAquaSystemAppearance</key>
<string>False</string> <string>False</string>
<key>SDL_FILESYSTEM_BASE_DIR_TYPE</key>
<string>parent</string>
</dict> </dict>
</plist> </plist>

View file

@ -3192,6 +3192,13 @@
GCC_DYNAMIC_NO_PIC = NO; GCC_DYNAMIC_NO_PIC = NO;
GCC_NO_COMMON_BLOCKS = YES; GCC_NO_COMMON_BLOCKS = YES;
GCC_OPTIMIZATION_LEVEL = 0; 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_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_UNDECLARED_SELECTOR = YES; GCC_WARN_UNDECLARED_SELECTOR = YES;
@ -3268,6 +3275,13 @@
ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_STRICT_OBJC_MSGSEND = YES;
FRAMEWORK_SEARCH_PATHS = "$(inherited)"; FRAMEWORK_SEARCH_PATHS = "$(inherited)";
GCC_NO_COMMON_BLOCKS = YES; 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_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_UNDECLARED_SELECTOR = YES; GCC_WARN_UNDECLARED_SELECTOR = YES;