diff --git a/platforms/macos/Minecraft/Minecraft.xcodeproj/project.pbxproj b/platforms/macos/Minecraft/Minecraft.xcodeproj/project.pbxproj index a56ce2e..64f2178 100644 --- a/platforms/macos/Minecraft/Minecraft.xcodeproj/project.pbxproj +++ b/platforms/macos/Minecraft/Minecraft.xcodeproj/project.pbxproj @@ -7,6 +7,7 @@ objects = { /* Begin PBXBuildFile section */ + 843371332AA3375C009ABC2E /* Logger.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 843371312AA3375C009ABC2E /* Logger.cpp */; }; 84359EF22A8D1B5F008CBFC0 /* Router2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84359DE82A8D1B5E008CBFC0 /* Router2.cpp */; }; 84359EF32A8D1B5F008CBFC0 /* DS_Table.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84359DEA2A8D1B5E008CBFC0 /* DS_Table.cpp */; }; 84359EF42A8D1B5F008CBFC0 /* RakNetSocket2_Berkley_NativeClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84359DEF2A8D1B5E008CBFC0 /* RakNetSocket2_Berkley_NativeClient.cpp */; }; @@ -352,7 +353,6 @@ 849B93022A99C3D900CF0DE0 /* SoundEngine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 849B92B72A99C3D900CF0DE0 /* SoundEngine.cpp */; }; 849B93032A99C3D900CF0DE0 /* SoundRepository.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 849B92B92A99C3D900CF0DE0 /* SoundRepository.cpp */; }; 849B93042A99C3D900CF0DE0 /* SoundSystem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 849B92BB2A99C3D900CF0DE0 /* SoundSystem.cpp */; }; - 84A1072A2A9B183A00850A9C /* StandardOut.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84A107282A9B183A00850A9C /* StandardOut.cpp */; }; 84C4D86F2A872C0100323E33 /* OpenAL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84C4D86E2A872C0100323E33 /* OpenAL.framework */; }; /* End PBXBuildFile section */ @@ -369,6 +369,8 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ + 843371312AA3375C009ABC2E /* Logger.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Logger.cpp; sourceTree = ""; }; + 843371322AA3375C009ABC2E /* Logger.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = Logger.hpp; sourceTree = ""; }; 84359DE02A8D1B42008CBFC0 /* GL.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = GL.hpp; sourceTree = ""; }; 84359DE12A8D1B42008CBFC0 /* readme.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = readme.txt; sourceTree = ""; }; 84359DE52A8D1B5E008CBFC0 /* NatTypeDetectionClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NatTypeDetectionClient.h; sourceTree = ""; }; @@ -1080,8 +1082,6 @@ 849B92BB2A99C3D900CF0DE0 /* SoundSystem.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SoundSystem.cpp; sourceTree = ""; }; 849B92BC2A99C3D900CF0DE0 /* SoundSystem.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = SoundSystem.hpp; sourceTree = ""; }; 849B930F2A99C44A00CF0DE0 /* GameMods.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = GameMods.hpp; path = ../../../GameMods.hpp; sourceTree = SOURCE_ROOT; }; - 84A107282A9B183A00850A9C /* StandardOut.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StandardOut.cpp; sourceTree = ""; }; - 84A107292A9B183A00850A9C /* StandardOut.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = StandardOut.hpp; sourceTree = ""; }; 84C4D86E2A872C0100323E33 /* OpenAL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenAL.framework; path = /System/Library/Frameworks/OpenAL.framework; sourceTree = ""; }; /* End PBXFileReference section */ @@ -1436,6 +1436,8 @@ children = ( 8443B68C2A9865110086730C /* CThread.cpp */, 8443B68D2A9865110086730C /* CThread.hpp */, + 843371312AA3375C009ABC2E /* Logger.cpp */, + 843371322AA3375C009ABC2E /* Logger.hpp */, 8443B68E2A9865110086730C /* LongHack.hpp */, 8443B68F2A9865110086730C /* Matrix.cpp */, 8443B6902A9865110086730C /* Matrix.hpp */, @@ -1445,8 +1447,6 @@ 8443B6942A9865110086730C /* Options.hpp */, 8443B6952A9865110086730C /* Random.cpp */, 8443B6962A9865110086730C /* Random.hpp */, - 84A107282A9B183A00850A9C /* StandardOut.cpp */, - 84A107292A9B183A00850A9C /* StandardOut.hpp */, 8443B6972A9865110086730C /* Timer.cpp */, 8443B6982A9865110086730C /* Timer.hpp */, 8443B6992A9865110086730C /* Util.cpp */, @@ -2157,11 +2157,11 @@ 8489B08F2A86D4B2004CA8EC /* Project object */ = { isa = PBXProject; attributes = { - BuildIndependentTargetsInParallel = 1; LastUpgradeCheck = 1420; TargetAttributes = { 8489B0962A86D4B2004CA8EC = { CreatedOnToolsVersion = 14.2; + ProvisioningStyle = Automatic; }; }; }; @@ -2528,24 +2528,20 @@ 849B93022A99C3D900CF0DE0 /* SoundEngine.cpp in Sources */, 849B93032A99C3D900CF0DE0 /* SoundRepository.cpp in Sources */, 849B93042A99C3D900CF0DE0 /* SoundSystem.cpp in Sources */, - 84A1072A2A9B183A00850A9C /* StandardOut.cpp in Sources */, + 843371332AA3375C009ABC2E /* Logger.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXSourcesBuildPhase section */ /* Begin XCBuildConfiguration section */ - 8489B09C2A86D4B2004CA8EC /* Debug */ = { + 840FD8C92AA565FB009EB349 /* Release (x86) */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; CLANG_ANALYZER_NONNULL = YES; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_ENABLE_OBJC_WEAK = YES; CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_COMMA = YES; @@ -2568,13 +2564,245 @@ CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = dwarf; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_PREPROCESSOR_DEFINITIONS = ( + USE_SDL, + SDL_DISABLE_IMMINTRIN_H, + USE_OPENAL, + HANDLE_CHARS_SEPARATELY, + USE_OLD_CPP, + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + HEADER_SEARCH_PATHS = ( + /opt/local/include, + /usr/local/include, + ../../../, + ../../../source, + ../../../thirdparty/raknet/, + ); + LIBRARY_SEARCH_PATHS = ( + /opt/local/lib, + /usr/local/lib, + ); + MTL_ENABLE_DEBUG_INFO = NO; + MTL_FAST_MATH = YES; + VALID_ARCHS = "i386 x86_64"; + }; + name = "Release (x86)"; + }; + 840FD8CA2AA565FB009EB349 /* Release (x86) */ = { + isa = XCBuildConfiguration; + buildSettings = { + CODE_SIGN_STYLE = Automatic; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(LOCAL_LIBRARY_DIR)/Frameworks", + ); + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + /usr/local/Cellar/libpng/1.6.40/lib, + /usr/local/Cellar/libpng/1.6.40_arm64/lib, + /opt/local/lib, + ); + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = "Release (x86)"; + }; + 840FD8CB2AA56676009EB349 /* Release (PPC) */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_PREPROCESSOR_DEFINITIONS = ( + USE_SDL, + SDL_DISABLE_IMMINTRIN_H, + USE_OPENAL, + HANDLE_CHARS_SEPARATELY, + USE_OLD_CPP, + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + HEADER_SEARCH_PATHS = ( + /opt/local/include, + /usr/local/include, + ../../../, + ../../../source, + ../../../thirdparty/raknet/, + ); + LIBRARY_SEARCH_PATHS = ( + /opt/local/lib, + /usr/local/lib, + ); + MTL_ENABLE_DEBUG_INFO = NO; + MTL_FAST_MATH = YES; + VALID_ARCHS = "ppc ppc64 ppc7400 ppc970"; + }; + name = "Release (PPC)"; + }; + 840FD8CC2AA56676009EB349 /* Release (PPC) */ = { + isa = XCBuildConfiguration; + buildSettings = { + CODE_SIGN_STYLE = Automatic; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(LOCAL_LIBRARY_DIR)/Frameworks", + ); + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + /usr/local/Cellar/libpng/1.6.40/lib, + /usr/local/Cellar/libpng/1.6.40_arm64/lib, + /opt/local/lib, + ); + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = "Release (PPC)"; + }; + 840FD8CD2AA566AB009EB349 /* Release (x86-PPC) */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_PREPROCESSOR_DEFINITIONS = ( + USE_SDL, + SDL_DISABLE_IMMINTRIN_H, + USE_OPENAL, + HANDLE_CHARS_SEPARATELY, + USE_OLD_CPP, + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + HEADER_SEARCH_PATHS = ( + /opt/local/include, + /usr/local/include, + ../../../, + ../../../source, + ../../../thirdparty/raknet/, + ); + LIBRARY_SEARCH_PATHS = ( + /opt/local/lib, + /usr/local/lib, + ); + MTL_ENABLE_DEBUG_INFO = NO; + MTL_FAST_MATH = YES; + VALID_ARCHS = "i386 ppc ppc64 ppc7400 ppc970 x86_64"; + }; + name = "Release (x86-PPC)"; + }; + 840FD8CE2AA566AB009EB349 /* Release (x86-PPC) */ = { + isa = XCBuildConfiguration; + buildSettings = { + CODE_SIGN_STYLE = Automatic; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(LOCAL_LIBRARY_DIR)/Frameworks", + ); + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + /usr/local/Cellar/libpng/1.6.40/lib, + /usr/local/Cellar/libpng/1.6.40_arm64/lib, + /opt/local/lib, + ); + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = "Release (x86-PPC)"; + }; + 8489B09C2A86D4B2004CA8EC /* Debug (Default) */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; - GCC_C_LANGUAGE_STANDARD = "compiler-default"; - GCC_DYNAMIC_NO_PIC = NO; - GCC_NO_COMMON_BLOCKS = YES; GCC_OPTIMIZATION_LEVEL = 0; GCC_PREPROCESSOR_DEFINITIONS = ( USE_SDL, @@ -2601,25 +2829,18 @@ /opt/local/lib, /usr/local/lib, ); - MACOSX_DEPLOYMENT_TARGET = 10.6; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; ONLY_ACTIVE_ARCH = YES; - SDKROOT = macosx10.6; }; - name = Debug; + name = "Debug (Default)"; }; - 8489B09D2A86D4B2004CA8EC /* Release */ = { + 8489B09D2A86D4B2004CA8EC /* Release (Default) */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; CLANG_ANALYZER_NONNULL = YES; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_ENABLE_OBJC_WEAK = YES; CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_COMMA = YES; @@ -2642,12 +2863,8 @@ CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_C_LANGUAGE_STANDARD = "compiler-default"; - GCC_NO_COMMON_BLOCKS = YES; GCC_PREPROCESSOR_DEFINITIONS = ( USE_SDL, SDL_DISABLE_IMMINTRIN_H, @@ -2672,15 +2889,12 @@ /opt/local/lib, /usr/local/lib, ); - MACOSX_DEPLOYMENT_TARGET = 10.6; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; - ONLY_ACTIVE_ARCH = NO; - SDKROOT = macosx10.6; }; - name = Release; + name = "Release (Default)"; }; - 8489B09F2A86D4B2004CA8EC /* Debug */ = { + 8489B09F2A86D4B2004CA8EC /* Debug (Default) */ = { isa = XCBuildConfiguration; buildSettings = { CODE_SIGN_STYLE = Automatic; @@ -2696,9 +2910,9 @@ ); PRODUCT_NAME = "$(TARGET_NAME)"; }; - name = Debug; + name = "Debug (Default)"; }; - 8489B0A02A86D4B2004CA8EC /* Release */ = { + 8489B0A02A86D4B2004CA8EC /* Release (Default) */ = { isa = XCBuildConfiguration; buildSettings = { CODE_SIGN_STYLE = Automatic; @@ -2714,7 +2928,7 @@ ); PRODUCT_NAME = "$(TARGET_NAME)"; }; - name = Release; + name = "Release (Default)"; }; /* End XCBuildConfiguration section */ @@ -2722,20 +2936,26 @@ 8489B0922A86D4B2004CA8EC /* Build configuration list for PBXProject "Minecraft" */ = { isa = XCConfigurationList; buildConfigurations = ( - 8489B09C2A86D4B2004CA8EC /* Debug */, - 8489B09D2A86D4B2004CA8EC /* Release */, + 8489B09C2A86D4B2004CA8EC /* Debug (Default) */, + 8489B09D2A86D4B2004CA8EC /* Release (Default) */, + 840FD8C92AA565FB009EB349 /* Release (x86) */, + 840FD8CB2AA56676009EB349 /* Release (PPC) */, + 840FD8CD2AA566AB009EB349 /* Release (x86-PPC) */, ); defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; + defaultConfigurationName = "Release (Default)"; }; 8489B09E2A86D4B2004CA8EC /* Build configuration list for PBXNativeTarget "Minecraft" */ = { isa = XCConfigurationList; buildConfigurations = ( - 8489B09F2A86D4B2004CA8EC /* Debug */, - 8489B0A02A86D4B2004CA8EC /* Release */, + 8489B09F2A86D4B2004CA8EC /* Debug (Default) */, + 8489B0A02A86D4B2004CA8EC /* Release (Default) */, + 840FD8CA2AA565FB009EB349 /* Release (x86) */, + 840FD8CC2AA56676009EB349 /* Release (PPC) */, + 840FD8CE2AA566AB009EB349 /* Release (x86-PPC) */, ); defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; + defaultConfigurationName = "Release (Default)"; }; /* End XCConfigurationList section */ }; diff --git a/platforms/macos/Minecraft/Minecraft.xcodeproj/xcshareddata/xcschemes/Minecraft.xcscheme b/platforms/macos/Minecraft/Minecraft.xcodeproj/xcshareddata/xcschemes/Minecraft.xcscheme index 808061f..d7e72e1 100644 --- a/platforms/macos/Minecraft/Minecraft.xcodeproj/xcshareddata/xcschemes/Minecraft.xcscheme +++ b/platforms/macos/Minecraft/Minecraft.xcodeproj/xcshareddata/xcschemes/Minecraft.xcscheme @@ -23,7 +23,7 @@ @@ -31,7 +31,7 @@ + buildConfiguration = "Debug (Default)"> diff --git a/source/common/Logger.cpp b/source/common/Logger.cpp index 25dffd0..f629ac4 100644 --- a/source/common/Logger.cpp +++ b/source/common/Logger.cpp @@ -3,6 +3,7 @@ #include "Logger.hpp" #include "Util.hpp" +#include "Utils.hpp" Logger* Logger::m_singleton = nullptr; diff --git a/source/common/Utils.hpp b/source/common/Utils.hpp index a8b364f..e22700a 100644 --- a/source/common/Utils.hpp +++ b/source/common/Utils.hpp @@ -24,10 +24,16 @@ #include #ifdef USE_OLD_CPP +#ifndef constexpr #define constexpr const +#endif +#ifndef nullptr #define nullptr NULL +#endif +#ifndef override #define override #endif +#endif #if defined(_WIN32) @@ -583,7 +589,7 @@ struct TilePos : Pos #define SAFE_DELETE(ptr) do { if (ptr) delete ptr; } while (0) #define SAFE_DELETE_ARRAY(ptr) do { if (ptr) delete[] ptr; } while (0) -#define SSTR( x ) static_cast< std::ostringstream & >( \ +#define SSTR( x ) static_cast< const std::ostringstream & >( \ ( std::ostringstream() << std::dec << x ) ).str() typedef uint8_t TileID;