|
|
@@ -147,7 +147,7 @@
|
|
|
4F7EF53920062290004089D6 /* UberShaderProgram.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F7EF43720062289004089D6 /* UberShaderProgram.cpp */; };
|
|
|
4F7EF54020062290004089D6 /* oxgl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F7EF44020062289004089D6 /* oxgl.cpp */; };
|
|
|
4F7EF54120062290004089D6 /* VideoDriverGL.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F7EF44120062289004089D6 /* VideoDriverGL.cpp */; };
|
|
|
- 4F7EF54220062290004089D6 /* NativeTextureGLES.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F7EF44220062289004089D6 /* NativeTextureGLES.cpp */; };
|
|
|
+ 4F7EF54220062290004089D6 /* NativeTextureGLES.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F7EF44220062289004089D6 /* NativeTextureGLES.cpp */; settings = {COMPILER_FLAGS = "-Wno-unreachable-code"; }; };
|
|
|
4F7EF54320062290004089D6 /* VideoDriverGLES20.h in Headers */ = {isa = PBXBuildFile; fileRef = 4F7EF44320062289004089D6 /* VideoDriverGLES20.h */; };
|
|
|
4F7EF54420062290004089D6 /* ShaderProgramGL.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F7EF44420062289004089D6 /* ShaderProgramGL.cpp */; };
|
|
|
4F7EF54520062290004089D6 /* NativeTextureGLES.h in Headers */ = {isa = PBXBuildFile; fileRef = 4F7EF44520062289004089D6 /* NativeTextureGLES.h */; };
|
|
|
@@ -219,7 +219,7 @@
|
|
|
4F7EF58720062290004089D6 /* closure_impl.h in Headers */ = {isa = PBXBuildFile; fileRef = 4F7EF48D2006228D004089D6 /* closure_impl.h */; };
|
|
|
4F7EF58820062290004089D6 /* closure.h in Headers */ = {isa = PBXBuildFile; fileRef = 4F7EF48E2006228D004089D6 /* closure.h */; };
|
|
|
4F7EF58920062290004089D6 /* oxygine-include.h in Headers */ = {isa = PBXBuildFile; fileRef = 4F7EF48F2006228D004089D6 /* oxygine-include.h */; };
|
|
|
- 4F7EF58A20062290004089D6 /* PostProcess.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F7EF4902006228E004089D6 /* PostProcess.cpp */; };
|
|
|
+ 4F7EF58A20062290004089D6 /* PostProcess.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F7EF4902006228E004089D6 /* PostProcess.cpp */; settings = {COMPILER_FLAGS = "-Wno-unreachable-code"; }; };
|
|
|
4F7EF58B20062290004089D6 /* TreeInspectorLine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F7EF4922006228E004089D6 /* TreeInspectorLine.cpp */; };
|
|
|
4F7EF58C20062290004089D6 /* TreeInspectorPage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F7EF4932006228E004089D6 /* TreeInspectorPage.cpp */; };
|
|
|
4F7EF58D20062290004089D6 /* DeveloperMenu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F7EF4942006228E004089D6 /* DeveloperMenu.cpp */; };
|
|
|
@@ -1069,7 +1069,7 @@
|
|
|
049B52B31871EDE900EF3C66 /* Project object */ = {
|
|
|
isa = PBXProject;
|
|
|
attributes = {
|
|
|
- LastUpgradeCheck = 0720;
|
|
|
+ LastUpgradeCheck = 0920;
|
|
|
ORGANIZATIONNAME = oxygine;
|
|
|
};
|
|
|
buildConfigurationList = 049B52B61871EDE900EF3C66 /* Build configuration list for PBXProject "oxygine_macosx" */;
|
|
|
@@ -1210,19 +1210,30 @@
|
|
|
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
|
|
|
CLANG_CXX_LIBRARY = "libc++";
|
|
|
CLANG_ENABLE_OBJC_ARC = YES;
|
|
|
+ CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
|
|
|
CLANG_WARN_BOOL_CONVERSION = YES;
|
|
|
+ CLANG_WARN_COMMA = YES;
|
|
|
CLANG_WARN_CONSTANT_CONVERSION = YES;
|
|
|
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
|
|
|
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_LITERAL_CONVERSION = YES;
|
|
|
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
|
|
|
+ CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
|
|
|
+ CLANG_WARN_STRICT_PROTOTYPES = YES;
|
|
|
+ CLANG_WARN_SUSPICIOUS_MOVE = YES;
|
|
|
+ CLANG_WARN_UNREACHABLE_CODE = YES;
|
|
|
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
|
|
|
COPY_PHASE_STRIP = NO;
|
|
|
+ ENABLE_STRICT_OBJC_MSGSEND = YES;
|
|
|
ENABLE_TESTABILITY = YES;
|
|
|
GCC_C_LANGUAGE_STANDARD = gnu99;
|
|
|
GCC_DYNAMIC_NO_PIC = NO;
|
|
|
GCC_ENABLE_OBJC_EXCEPTIONS = YES;
|
|
|
+ GCC_NO_COMMON_BLOCKS = YES;
|
|
|
GCC_OPTIMIZATION_LEVEL = 0;
|
|
|
GCC_PREPROCESSOR_DEFINITIONS = (
|
|
|
"DEBUG=1",
|
|
|
@@ -1256,19 +1267,30 @@
|
|
|
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
|
|
|
CLANG_CXX_LIBRARY = "libc++";
|
|
|
CLANG_ENABLE_OBJC_ARC = YES;
|
|
|
+ CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
|
|
|
CLANG_WARN_BOOL_CONVERSION = YES;
|
|
|
+ CLANG_WARN_COMMA = YES;
|
|
|
CLANG_WARN_CONSTANT_CONVERSION = YES;
|
|
|
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
|
|
|
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_LITERAL_CONVERSION = YES;
|
|
|
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
|
|
|
+ CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
|
|
|
+ CLANG_WARN_STRICT_PROTOTYPES = YES;
|
|
|
+ CLANG_WARN_SUSPICIOUS_MOVE = YES;
|
|
|
+ CLANG_WARN_UNREACHABLE_CODE = YES;
|
|
|
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
|
|
|
COPY_PHASE_STRIP = YES;
|
|
|
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
|
|
|
ENABLE_NS_ASSERTIONS = NO;
|
|
|
+ ENABLE_STRICT_OBJC_MSGSEND = YES;
|
|
|
GCC_C_LANGUAGE_STANDARD = gnu99;
|
|
|
GCC_ENABLE_OBJC_EXCEPTIONS = YES;
|
|
|
+ GCC_NO_COMMON_BLOCKS = YES;
|
|
|
GCC_PREPROCESSOR_DEFINITIONS = (
|
|
|
OX_HAVE_LIBPNG,
|
|
|
OX_HAVE_LIBJPEG,
|
|
|
@@ -1296,6 +1318,7 @@
|
|
|
buildSettings = {
|
|
|
COMBINE_HIDPI_IMAGES = YES;
|
|
|
EXECUTABLE_PREFIX = lib;
|
|
|
+ GCC_INLINES_ARE_PRIVATE_EXTERN = YES;
|
|
|
PRODUCT_NAME = "$(TARGET_NAME)";
|
|
|
VALID_ARCHS = x86_64;
|
|
|
};
|
|
|
@@ -1306,6 +1329,7 @@
|
|
|
buildSettings = {
|
|
|
COMBINE_HIDPI_IMAGES = YES;
|
|
|
EXECUTABLE_PREFIX = lib;
|
|
|
+ GCC_INLINES_ARE_PRIVATE_EXTERN = YES;
|
|
|
PRODUCT_NAME = "$(TARGET_NAME)";
|
|
|
VALID_ARCHS = x86_64;
|
|
|
};
|