diff --git a/Apple/MultiCraft/MultiCraft.xcodeproj/project.pbxproj b/Apple/MultiCraft/MultiCraft.xcodeproj/project.pbxproj index 07d58179f..944aa19ae 100644 --- a/Apple/MultiCraft/MultiCraft.xcodeproj/project.pbxproj +++ b/Apple/MultiCraft/MultiCraft.xcodeproj/project.pbxproj @@ -250,7 +250,6 @@ 84F20F0225D52958009562A9 /* guiEditBoxWithScrollbar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84F20ECB25D52954009562A9 /* guiEditBoxWithScrollbar.cpp */; }; 84F20F0325D52958009562A9 /* guiFormSpecMenu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84F20ECF25D52955009562A9 /* guiFormSpecMenu.cpp */; }; 84F20F0525D52958009562A9 /* profilergraph.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84F20ED225D52955009562A9 /* profilergraph.cpp */; }; - 84F20F0625D52958009562A9 /* intlGUIEditBox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84F20ED425D52955009562A9 /* intlGUIEditBox.cpp */; }; 84F20F0725D52958009562A9 /* guiSkin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84F20ED525D52955009562A9 /* guiSkin.cpp */; }; 84F20F0825D52958009562A9 /* guiButton.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84F20ED825D52955009562A9 /* guiButton.cpp */; }; 84F20F0925D52958009562A9 /* guiItemImage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84F20EE025D52956009562A9 /* guiItemImage.cpp */; }; @@ -292,6 +291,7 @@ /* End PBXBuildFile section */ /* Begin PBXFileReference section */ + 840A686F2989C8B400ADE329 /* nb */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nb; path = nb.lproj/Localizable.strings; sourceTree = ""; }; 84135AC625D5261C00CA4DCF /* craftdef.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = craftdef.cpp; path = ../../../src/craftdef.cpp; sourceTree = ""; }; 84135AC725D5261C00CA4DCF /* modchannels.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = modchannels.cpp; path = ../../../src/modchannels.cpp; sourceTree = ""; }; 84135AC825D5261C00CA4DCF /* nodemetadata.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = nodemetadata.cpp; path = ../../../src/nodemetadata.cpp; sourceTree = ""; }; @@ -812,12 +812,10 @@ 84F20ECA25D52954009562A9 /* guiHyperText.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = guiHyperText.h; path = ../../../src/gui/guiHyperText.h; sourceTree = ""; }; 84F20ECB25D52954009562A9 /* guiEditBoxWithScrollbar.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = guiEditBoxWithScrollbar.cpp; path = ../../../src/gui/guiEditBoxWithScrollbar.cpp; sourceTree = ""; }; 84F20ECC25D52955009562A9 /* guiButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = guiButton.h; path = ../../../src/gui/guiButton.h; sourceTree = ""; }; - 84F20ECE25D52955009562A9 /* intlGUIEditBox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = intlGUIEditBox.h; path = ../../../src/gui/intlGUIEditBox.h; sourceTree = ""; }; 84F20ECF25D52955009562A9 /* guiFormSpecMenu.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = guiFormSpecMenu.cpp; path = ../../../src/gui/guiFormSpecMenu.cpp; sourceTree = ""; }; 84F20ED125D52955009562A9 /* guiButtonImage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = guiButtonImage.h; path = ../../../src/gui/guiButtonImage.h; sourceTree = ""; }; 84F20ED225D52955009562A9 /* profilergraph.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = profilergraph.cpp; path = ../../../src/gui/profilergraph.cpp; sourceTree = ""; }; 84F20ED325D52955009562A9 /* guiConfirmRegistration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = guiConfirmRegistration.h; path = ../../../src/gui/guiConfirmRegistration.h; sourceTree = ""; }; - 84F20ED425D52955009562A9 /* intlGUIEditBox.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = intlGUIEditBox.cpp; path = ../../../src/gui/intlGUIEditBox.cpp; sourceTree = ""; }; 84F20ED525D52955009562A9 /* guiSkin.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = guiSkin.cpp; path = ../../../src/gui/guiSkin.cpp; sourceTree = ""; }; 84F20ED625D52955009562A9 /* guiBackgroundImage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = guiBackgroundImage.h; path = ../../../src/gui/guiBackgroundImage.h; sourceTree = ""; }; 84F20ED725D52955009562A9 /* guiChatConsole.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = guiChatConsole.h; path = ../../../src/gui/guiChatConsole.h; sourceTree = ""; }; @@ -1069,8 +1067,6 @@ 84F20EE125D52956009562A9 /* guiTable.h */, 84F20EEA25D52957009562A9 /* guiVolumeChange.cpp */, 84F20EDE25D52956009562A9 /* guiVolumeChange.h */, - 84F20ED425D52955009562A9 /* intlGUIEditBox.cpp */, - 84F20ECE25D52955009562A9 /* intlGUIEditBox.h */, 84F20EFA25D52958009562A9 /* mainmenumanager.h */, 84F20EE825D52956009562A9 /* modalMenu.cpp */, 84F20EF825D52957009562A9 /* modalMenu.h */, @@ -1782,6 +1778,7 @@ tr, id, ja, + nb, ); mainGroup = 845856A024B1322C0040BA4F; productRefGroup = 845856AA24B1322C0040BA4F /* Products */; @@ -1801,9 +1798,9 @@ 8458617F24B1C3BC0040BA4F /* builtin in Resources */, 8453A49E24DB22F00087ECF9 /* client in Resources */, 8458618024B1C3BC0040BA4F /* textures in Resources */, - 845856B324B1322D0040BA4F /* Assets.xcassets in Resources */, 84287CA7291ED0F000E30F96 /* fonts in Resources */, 84287CA6291ED0F000E30F96 /* locale in Resources */, + 845856B324B1322D0040BA4F /* Assets.xcassets in Resources */, 848ADEF427BD68AE001C60F3 /* Localizable.strings in Resources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -1938,7 +1935,6 @@ 84F20E8025D52868009562A9 /* srp.cpp in Sources */, 84F20E3525D5282A009562A9 /* l_http.cpp in Sources */, 84F20D5A25D52790009562A9 /* CGUITTFont.cpp in Sources */, - 84F20F0625D52958009562A9 /* intlGUIEditBox.cpp in Sources */, 84F20E8D25D52868009562A9 /* base64.cpp in Sources */, 84A1F9BC252E617D00000717 /* scripting_client.cpp in Sources */, 84135B9F25D5264C00CA4DCF /* staticobject.cpp in Sources */, @@ -2100,6 +2096,7 @@ 8425D3702837D89300753F0E /* tr */, 8425D3712837D89600753F0E /* id */, 8457C2C52848DB7300D69304 /* ja */, + 840A686F2989C8B400ADE329 /* nb */, ); name = Localizable.strings; sourceTree = ""; @@ -2113,7 +2110,6 @@ ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++17"; - CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; CLANG_ENABLE_OBJC_WEAK = YES; @@ -2133,7 +2129,6 @@ GCC_WARN_64_TO_32_BIT_CONVERSION = NO; GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO; MACOSX_DEPLOYMENT_TARGET = 10.11; - MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; ONLY_ACTIVE_ARCH = YES; OTHER_CPLUSPLUSFLAGS = ( "$(OTHER_CFLAGS)", @@ -2142,7 +2137,6 @@ "-Wno-builtin-macro-redefined", ); SDKROOT = macosx; - VALIDATE_WORKSPACE_SKIPPED_SDK_FRAMEWORKS = OpenGL; }; name = Debug; }; @@ -2152,7 +2146,6 @@ ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++17"; - CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; CLANG_ENABLE_OBJC_WEAK = YES; @@ -2169,7 +2162,6 @@ GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO; LLVM_LTO = YES; MACOSX_DEPLOYMENT_TARGET = 10.11; - MTL_ENABLE_DEBUG_INFO = NO; OTHER_CPLUSPLUSFLAGS = ( "$(OTHER_CFLAGS)", "-Wno-inconsistent-missing-override", @@ -2178,7 +2170,6 @@ ); SDKROOT = macosx; VALIDATE_PRODUCT = YES; - VALIDATE_WORKSPACE_SKIPPED_SDK_FRAMEWORKS = OpenGL; }; name = Release; }; @@ -2188,7 +2179,6 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_ENTITLEMENTS = MultiCraft/MultiCraft.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; - CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = R3RLJ9TW52; @@ -2230,12 +2220,6 @@ "${SRCROOT}/../deps/libvorbis/include", ); INFOPLIST_FILE = MultiCraft/Info.plist; - INFOPLIST_KEY_CFBundleDisplayName = MultiCraft; - INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.adventure-games"; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/../Frameworks", - ); MACOSX_DEPLOYMENT_TARGET = 10.11; MARKETING_VERSION = 2.0.3; OTHER_CFLAGS = "$(inherited)"; @@ -2265,7 +2249,6 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_ENTITLEMENTS = MultiCraft/MultiCraft.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; - CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = R3RLJ9TW52; @@ -2309,12 +2292,6 @@ "${SRCROOT}/../deps/libvorbis/include", ); INFOPLIST_FILE = MultiCraft/Info.plist; - INFOPLIST_KEY_CFBundleDisplayName = MultiCraft; - INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.adventure-games"; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/../Frameworks", - ); MACOSX_DEPLOYMENT_TARGET = 10.11; MARKETING_VERSION = 2.0.3; OTHER_CFLAGS = "$(inherited)"; diff --git a/Apple/MultiCraft/MultiCraft/Info.plist b/Apple/MultiCraft/MultiCraft/Info.plist index 92daf8c06..af071bcff 100644 --- a/Apple/MultiCraft/MultiCraft/Info.plist +++ b/Apple/MultiCraft/MultiCraft/Info.plist @@ -29,7 +29,7 @@ NSHighResolutionCapable NSHumanReadableCopyright - Copyright © 2022 MultiCraft Studio OÜ. All rights reserved. + Copyright © 2023 MultiCraft Studio OÜ. All rights reserved. NSPrincipalClass NSApplication NSSupportsAutomaticTermination diff --git a/Apple/MultiCraft/MultiCraft/nb.lproj/Localizable.strings b/Apple/MultiCraft/MultiCraft/nb.lproj/Localizable.strings new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/Apple/MultiCraft/MultiCraft/nb.lproj/Localizable.strings @@ -0,0 +1 @@ + diff --git a/Apple/scripts/SDL2.sh b/Apple/scripts/SDL2.sh index 9b1b7668c..7561302ef 100755 --- a/Apple/scripts/SDL2.sh +++ b/Apple/scripts/SDL2.sh @@ -1,6 +1,6 @@ #!/bin/bash -e -SDL2_VERSION=2.26.1 +SDL2_VERSION=2.26.3 . scripts/sdk.sh mkdir -p deps; cd deps diff --git a/Apple/scripts/freetype.sh b/Apple/scripts/freetype.sh index 9ef999d64..55887daab 100755 --- a/Apple/scripts/freetype.sh +++ b/Apple/scripts/freetype.sh @@ -1,6 +1,6 @@ #!/bin/bash -e -FREETYPE_VERSION=2.12.1 +FREETYPE_VERSION=2.13.0 . scripts/sdk.sh mkdir -p deps; cd deps diff --git a/Apple/scripts/libjpeg.sh b/Apple/scripts/libjpeg.sh index 464cb1f6b..acc20a498 100755 --- a/Apple/scripts/libjpeg.sh +++ b/Apple/scripts/libjpeg.sh @@ -1,6 +1,6 @@ #!/bin/bash -e -JPEG_VERSION=2.1.4 +JPEG_VERSION=2.1.5.1 . scripts/sdk.sh mkdir -p deps; cd deps diff --git a/Apple/scripts/openal.sh b/Apple/scripts/openal.sh index afafd03d7..8bba10c1e 100755 --- a/Apple/scripts/openal.sh +++ b/Apple/scripts/openal.sh @@ -1,6 +1,6 @@ #!/bin/bash -e -OPENAL_VERSION=1.22.2 +OPENAL_VERSION=1.23.0 . scripts/sdk.sh mkdir -p deps; cd deps