diff --git a/examples/01.HelloWorld/HelloWorld.xcodeproj/xcshareddata/xcschemes/01.HelloWorld.xcscheme b/examples/01.HelloWorld/HelloWorld.xcodeproj/xcshareddata/xcschemes/01.HelloWorld.xcscheme index ba196db3..16aad335 100644 --- a/examples/01.HelloWorld/HelloWorld.xcodeproj/xcshareddata/xcschemes/01.HelloWorld.xcscheme +++ b/examples/01.HelloWorld/HelloWorld.xcodeproj/xcshareddata/xcschemes/01.HelloWorld.xcscheme @@ -1,6 +1,6 @@ - - - - + + - - - - - - + + - - - - - - + + - - - - - - + + - - - - - - + + - - - - - - + + - - - - - - + + - - - - - - + + - - - - - - + + - - - - - - + + - - - - - - + + - - - - - - + + - - - - - - + + - - - - - - + + - - - - - - + + - - - - - - + + - - - - - - + + - - - - - - + + - - - - - - + + - - - - - - + + - - - - - - + + - - setTarget(vector3df(200.f, -80.f, 150.f)); camera->setFarValue(20000.0f); } + switchToMayaCamera(device); /* Just a usual render loop with event handling. The custom mesh is diff --git a/examples/24.CursorControl/CursorControl.xcodeproj/project.pbxproj b/examples/24.CursorControl/CursorControl.xcodeproj/project.pbxproj index 984620df..12d52ceb 100644 --- a/examples/24.CursorControl/CursorControl.xcodeproj/project.pbxproj +++ b/examples/24.CursorControl/CursorControl.xcodeproj/project.pbxproj @@ -103,7 +103,7 @@ 5E34C6D91B7F4A0C00F212E8 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0710; + LastUpgradeCheck = 1240; TargetAttributes = { 5E34CC501B7F8E6E00F212E8 = { CreatedOnToolsVersion = 6.1; @@ -112,7 +112,7 @@ }; buildConfigurationList = 5E34C6DC1B7F4A0C00F212E8 /* Build configuration list for PBXProject "CursorControl" */; compatibilityVersion = "Xcode 3.2"; - developmentRegion = English; + developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( en, @@ -154,8 +154,35 @@ 5E34C6DD1B7F4A0C00F212E8 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; + 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_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_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; + 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; + ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; - MACOSX_DEPLOYMENT_TARGET = 10.7; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + MACOSX_DEPLOYMENT_TARGET = 10.11; ONLY_ACTIVE_ARCH = YES; }; name = Debug; @@ -163,7 +190,34 @@ 5E34C6DE1B7F4A0C00F212E8 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - MACOSX_DEPLOYMENT_TARGET = 10.7; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; + 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_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_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; + 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; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + MACOSX_DEPLOYMENT_TARGET = 10.11; }; name = Release; }; @@ -171,6 +225,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ENABLE_OBJC_WEAK = YES; CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; @@ -207,9 +262,7 @@ INFOPLIST_FILE = "$(SRCROOT)/../../media/info_osx.plist"; INSTALL_PATH = /; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; - LIBRARY_SEARCH_PATHS = ( - "$(SRCROOT)/../../lib/OSX", - ); + LIBRARY_SEARCH_PATHS = "$(SRCROOT)/../../lib/OSX"; MACOSX_DEPLOYMENT_TARGET = 10.7; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; @@ -222,6 +275,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ENABLE_OBJC_WEAK = YES; CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; @@ -253,9 +307,7 @@ INFOPLIST_FILE = "$(SRCROOT)/../../media/info_osx.plist"; INSTALL_PATH = /; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; - LIBRARY_SEARCH_PATHS = ( - "$(SRCROOT)/../../lib/OSX", - ); + LIBRARY_SEARCH_PATHS = "$(SRCROOT)/../../lib/OSX"; MACOSX_DEPLOYMENT_TARGET = 10.7; MTL_ENABLE_DEBUG_INFO = NO; PRODUCT_NAME = "$(TARGET_NAME)"; diff --git a/examples/24.CursorControl/CursorControl.xcodeproj/xcshareddata/xcschemes/24.CursorControl.xcscheme b/examples/24.CursorControl/CursorControl.xcodeproj/xcshareddata/xcschemes/24.CursorControl.xcscheme index 699becb7..3d3f3e0f 100644 --- a/examples/24.CursorControl/CursorControl.xcodeproj/xcshareddata/xcschemes/24.CursorControl.xcscheme +++ b/examples/24.CursorControl/CursorControl.xcodeproj/xcshareddata/xcschemes/24.CursorControl.xcscheme @@ -1,6 +1,6 @@ - - - - + + - - - - - - + + - - - - - - + + - - - - - - + + - - - - - - + + - - getVertices(); @@ -629,6 +630,7 @@ bool C3DSMeshFileLoader::readTrackChunk(io::IReadFile* file, ChunkData& data, //TODO } } +#endif // skip further frames file->seek(data.header.length - data.read, true); data.read += data.header.length - data.read; diff --git a/source/Irrlicht/CIrrDeviceOSX.mm b/source/Irrlicht/CIrrDeviceOSX.mm index dfa2cf5e..3d6d97e1 100644 --- a/source/Irrlicht/CIrrDeviceOSX.mm +++ b/source/Irrlicht/CIrrDeviceOSX.mm @@ -559,9 +559,10 @@ namespace irr //! constructor CIrrDeviceMacOSX::CIrrDeviceMacOSX(const SIrrlichtCreationParameters& param) : CIrrDeviceStub(param), Window(NULL), Display(NULL), - SoftwareDriverTarget(0), DeviceWidth(0), DeviceHeight(0), - ScreenWidth(0), ScreenHeight(0), MouseButtonStates(0), SoftwareRendererType(0), - IsActive(true), IsFullscreen(false), IsShiftDown(false), IsControlDown(false), IsResizable(false) + DeviceWidth(0), DeviceHeight(0), + ScreenWidth(0), ScreenHeight(0), MouseButtonStates(0), + IsActive(true), IsFullscreen(false), IsShiftDown(false), IsControlDown(false), IsResizable(false), + SoftwareDriverTarget(nil),SoftwareRendererType(0) { struct utsname name; NSString *path; @@ -628,7 +629,6 @@ CIrrDeviceMacOSX::CIrrDeviceMacOSX(const SIrrlichtCreationParameters& param) CIrrDeviceMacOSX::~CIrrDeviceMacOSX() { - [SoftwareDriverTarget release]; #ifdef __MAC_10_6 [NSApp setPresentationOptions:(NSApplicationPresentationDefault)]; #else @@ -646,6 +646,12 @@ CIrrDeviceMacOSX::~CIrrDeviceMacOSX() void CIrrDeviceMacOSX::closeDevice() { + if ( SoftwareDriverTarget != nil ) + { + [SoftwareDriverTarget release]; + SoftwareDriverTarget = nil; + } + if (Window != nil) { [Window setIsVisible:FALSE]; @@ -677,8 +683,13 @@ bool CIrrDeviceMacOSX::createWindow() ScreenWidth = (int)CGDisplayPixelsWide(Display); ScreenHeight = (int)CGDisplayPixelsHigh(Display); - const NSBackingStoreType type = (CreationParams.DriverType == video::EDT_OPENGL) ? NSBackingStoreBuffered : NSBackingStoreNonretained; - + //NSBackingStoreNonretained not working since El Capitan (TA has) +#ifdef __MAC_10_6 + const NSBackingStoreType backing_type = NSBackingStoreBuffered; +#else + const NSBackingStoreType backing_type = (CreationParams.DriverType == video::EDT_OPENGL) ? NSBackingStoreBuffered : NSBackingStoreNonretained; +#endif + if (!CreationParams.Fullscreen) { if (!CreationParams.WindowId) //create another window when WindowId is null @@ -692,7 +703,10 @@ bool CIrrDeviceMacOSX::createWindow() y = screenHeight - y - CreationParams.WindowSize.Height; } - Window = [[NSWindow alloc] initWithContentRect:NSMakeRect(x, y, CreationParams.WindowSize.Width,CreationParams.WindowSize.Height) styleMask:NSTitledWindowMask+NSClosableWindowMask+NSResizableWindowMask backing:type defer:FALSE]; + Window = [[NSWindow alloc] initWithContentRect:NSMakeRect(x, y, CreationParams.WindowSize.Width,CreationParams.WindowSize.Height) + styleMask:NSTitledWindowMask+NSClosableWindowMask+NSResizableWindowMask + backing:backing_type + defer:NO]; if (CreationParams.WindowPosition.X == -1 && CreationParams.WindowPosition.Y == -1) [Window center]; @@ -757,7 +771,7 @@ bool CIrrDeviceMacOSX::createWindow() if (error == CGDisplayNoErr) { - Window = [[NSWindow alloc] initWithContentRect:[[NSScreen mainScreen] frame] styleMask:NSBorderlessWindowMask backing:type defer:FALSE screen:[NSScreen mainScreen]]; + Window = [[NSWindow alloc] initWithContentRect:[[NSScreen mainScreen] frame] styleMask:NSBorderlessWindowMask backing:backing_type defer:FALSE screen:[NSScreen mainScreen]]; [Window setLevel: CGShieldingWindowLevel()]; [Window setBackgroundColor:[NSColor blackColor]]; @@ -823,6 +837,20 @@ void CIrrDeviceMacOSX::setResize(int width, int height) getVideoDriver()->OnResize(core::dimension2d( (s32)driverFrame.size.width, (s32)driverFrame.size.height)); DeviceWidth = (s32)driverFrame.size.width; DeviceHeight = (s32)driverFrame.size.height; + + //SceneManager ( Camera ) should react with reset, otherwise sticky mouse + irr::SEvent ievent; + ievent.EventType = irr::EET_MOUSE_INPUT_EVENT; + MouseButtonStates &= ~irr::EMBSM_LEFT; + ievent.MouseInput.ButtonStates = MouseButtonStates; + ievent.MouseInput.Event = irr::EMIE_LMOUSE_LEFT_UP; + ievent.MouseInput.Control = false; + ievent.MouseInput.Shift = false; + + const core::position2di& curr = ((CCursorControl *)CursorControl)->getPosition(false); + ievent.MouseInput.X = curr.X; + ievent.MouseInput.Y = curr.Y; + postEventFromUser(ievent); } else getVideoDriver()->OnResize(core::dimension2d( (s32)width, (s32)height)); @@ -837,6 +865,10 @@ void CIrrDeviceMacOSX::createDriver() #ifdef _IRR_COMPILE_WITH_SOFTWARE_ VideoDriver = video::createSoftwareDriver(CreationParams.WindowSize, CreationParams.Fullscreen, FileSystem, this); SoftwareRendererType = 2; + if (Window) + { + Window.contentView.wantsLayer = YES; + } #else os::Printer::log("No Software driver support compiled in.", ELL_ERROR); #endif @@ -846,6 +878,12 @@ void CIrrDeviceMacOSX::createDriver() #ifdef _IRR_COMPILE_WITH_BURNINGSVIDEO_ VideoDriver = video::createBurningVideoDriver(CreationParams, FileSystem, this); SoftwareRendererType = 1; + if (Window) + { + Window.contentView.wantsLayer = YES; + [ Window setOpaque:YES]; + } + #else os::Printer::log("Burning's video driver was not compiled in.", ELL_ERROR); #endif @@ -965,7 +1003,7 @@ bool CIrrDeviceMacOSX::run() case NSLeftMouseUp: ievent.EventType = irr::EET_MOUSE_INPUT_EVENT; - MouseButtonStates &= !irr::EMBSM_LEFT; + MouseButtonStates &= ~irr::EMBSM_LEFT; ievent.MouseInput.ButtonStates = MouseButtonStates; ievent.MouseInput.Event = irr::EMIE_LMOUSE_LEFT_UP; postMouseEvent(event,ievent); @@ -981,7 +1019,7 @@ bool CIrrDeviceMacOSX::run() case NSOtherMouseUp: ievent.EventType = irr::EET_MOUSE_INPUT_EVENT; - MouseButtonStates &= !irr::EMBSM_MIDDLE; + MouseButtonStates &= ~irr::EMBSM_MIDDLE; ievent.MouseInput.ButtonStates = MouseButtonStates; ievent.MouseInput.Event = irr::EMIE_MMOUSE_LEFT_UP; postMouseEvent(event,ievent); @@ -1008,7 +1046,7 @@ bool CIrrDeviceMacOSX::run() case NSRightMouseUp: ievent.EventType = irr::EET_MOUSE_INPUT_EVENT; ievent.MouseInput.Event = irr::EMIE_RMOUSE_LEFT_UP; - MouseButtonStates &= !irr::EMBSM_RIGHT; + MouseButtonStates &= ~irr::EMBSM_RIGHT; ievent.MouseInput.ButtonStates = MouseButtonStates; postMouseEvent(event,ievent); break; @@ -1471,6 +1509,106 @@ core::position2di CIrrDeviceMacOSX::getWindowPosition() bool CIrrDeviceMacOSX::present(video::IImage* surface, void* windowId, core::rect* src ) +{ + if (SoftwareRendererType > 0 && surface) + { + int src_width = surface->getDimension().Width; + int src_height = surface->getDimension().Height; + const u32 src_pitch = surface->getPitch(); + + const u8* src = (u8*)surface->getData(); + const video::ECOLOR_FORMAT src_format = surface->getColorFormat(); + + //little endian likely not in memory ARGB + //ECOLOR_FORMAT dstFormat = ECF_B8G8R8A8; + const u32 dst_colorsamples = SoftwareRendererType == 2 ? 3 : 3; + const u32 dst_pitch = src_width * dst_colorsamples; + + @autoreleasepool { + NSBitmapImageRep *rep = [[ + [NSBitmapImageRep alloc] initWithBitmapDataPlanes: nil + pixelsWide: src_width + pixelsHigh: src_height + bitsPerSample: 8 + samplesPerPixel: dst_colorsamples + hasAlpha: dst_colorsamples == 4 ? YES : NO + isPlanar: NO + colorSpaceName: NSDeviceRGBColorSpace + bitmapFormat: NSAlphaNonpremultipliedBitmapFormat + bytesPerRow: dst_pitch + bitsPerPixel: 8 * dst_colorsamples] autorelease + ]; + + if ( rep == nil) return false; + // convert to BGR + u8* dst = (u8*) [rep bitmapData]; + if ( 0 == dst ) return false; + + + int blitter = 0; + if ( src_format == video::ECF_A8R8G8B8 && dst_colorsamples == 3 ) blitter = 1; + else if ( src_format == video::ECF_A8R8G8B8 && dst_colorsamples == 4 ) blitter = 2; + else if ( src_format == video::ECF_A1R5G5B5 && dst_colorsamples == 3 ) blitter = 3; + + for (s32 y=0; y < src_height; ++y) + { + switch(blitter) + { + // video::CColorConverter::convert_A8R8G8B8toB8G8R8(srcdata, minWidth, destData); // broken ? + case 1: + { + const u8* sB = src; + u8* dB = dst; + + for (s32 x = 0; x < src_width; ++x) + { + dB[0] = sB[2]; + dB[1] = sB[1]; + dB[2] = sB[0]; + //dB[3] = sB[3]; + + sB += 4; + dB += 3; + } + } break; + + case 2: + { + const u32* sB = (const u32*)src; + u32 * dB = (u32*)dst; + + for (s32 x = 0; x < src_width; ++x) + { + size_t v = *sB++; + *dB++ = + (( v & 0x00ff0000 ) >> 16 ) | + (( v & 0x0000ff00 ) ) | + (( v & 0x000000ff ) << 16 ) | + 0xff000000; + } + } break; + + case 3: video::CColorConverter::convert_A1R5G5B5toB8G8R8(src, src_width, dst); break; + default: video::CColorConverter::convert_viaFormat(src, src_format, src_width, dst, video::ECF_R8G8B8); break; + } + src += src_pitch; + dst += dst_pitch; + } + + // add layer + NSSize imageSize = NSMakeSize(src_width, src_height); + NSImage *image = [[[NSImage alloc] initWithSize: imageSize] autorelease]; + + [image addRepresentation: rep]; + Window.contentView.layer.contents = image; + } + return true; + } + return false; +} + +#if 0 +bool CIrrDeviceMacOSX::present_v0(video::IImage* surface, void* windowId, core::rect* src ) { // todo: implement window ID and src rectangle @@ -1548,6 +1686,7 @@ bool CIrrDeviceMacOSX::present(video::IImage* surface, void* windowId, core::rec return false; } +#endif #if defined (_IRR_COMPILE_WITH_JOYSTICK_EVENTS_) diff --git a/source/Irrlicht/CNSOGLManager.h b/source/Irrlicht/CNSOGLManager.h index a05e6ec4..fdd5a638 100644 --- a/source/Irrlicht/CNSOGLManager.h +++ b/source/Irrlicht/CNSOGLManager.h @@ -49,7 +49,7 @@ namespace video void destroyContext() IRR_OVERRIDE; //! Get current context - const SExposedVideoData& getContext() const; + const SExposedVideoData& getContext() const IRR_OVERRIDE; //! Change render context, disable old and activate new defined by videoData bool activateContext(const SExposedVideoData& videoData, bool restorePrimaryOnZero) IRR_OVERRIDE; diff --git a/source/Irrlicht/CSoftwareDriver2.cpp b/source/Irrlicht/CSoftwareDriver2.cpp index fd5cd6a3..b04e3030 100644 --- a/source/Irrlicht/CSoftwareDriver2.cpp +++ b/source/Irrlicht/CSoftwareDriver2.cpp @@ -1743,12 +1743,14 @@ f32 MipmapLevel(const sVec2& uv, const sVec2& textureSize) #define MAT_TEXTURE(tex) ( (video::CSoftwareTexture2*) Material.org.TextureLayer[tex].Texture ) //! clamp(value,0,1) +#if 0 static inline float clampfuv(const float v, const float b) { // b = 1.f - (2.f * (1/width)) return v < b ? b : v > 1.f - b ? 1.f - b : v; //return v < b ? b : v > 1.f-b ? 1.f-b : v; } +#endif static inline float clampf01(const float v) { diff --git a/source/Irrlicht/CSoftwareTexture2.cpp b/source/Irrlicht/CSoftwareTexture2.cpp index 9b266bc5..94027fa2 100644 --- a/source/Irrlicht/CSoftwareTexture2.cpp +++ b/source/Irrlicht/CSoftwareTexture2.cpp @@ -336,7 +336,7 @@ void CSoftwareTexture2::regenerateMipMapLevels(void* data) } #endif -#if 1 +#if 0 //save mipmap chain if (0) { diff --git a/source/Irrlicht/Irrlicht.xcodeproj/project.pbxproj b/source/Irrlicht/Irrlicht.xcodeproj/project.pbxproj index 671d01ce..c6411697 100644 --- a/source/Irrlicht/Irrlicht.xcodeproj/project.pbxproj +++ b/source/Irrlicht/Irrlicht.xcodeproj/project.pbxproj @@ -1235,7 +1235,7 @@ 5E34C7931B7F4AFC00F212E8 /* SMeshBuffer.h */, 5E34C7941B7F4AFC00F212E8 /* SMeshBufferLightMap.h */, 5E34C7951B7F4AFC00F212E8 /* SMeshBufferTangents.h */, - 84A219A4249F823800E189FC /* SOverrideMaterial.h */, + 84A219A4249F823800E189FC /* SOverrideMaterial.h */, 5E34C7961B7F4AFC00F212E8 /* SParticle.h */, 5E34C7971B7F4AFC00F212E8 /* SSharedMeshBuffer.h */, 5E34C7981B7F4AFC00F212E8 /* SSkinMeshBuffer.h */, @@ -2144,7 +2144,6 @@ 5E34C6D91B7F4A0C00F212E8 /* Project object */ = { isa = PBXProject; attributes = { - BuildIndependentTargetsInParallel = YES; LastUpgradeCheck = 1150; TargetAttributes = { 5E34C9F21B7F6E3400F212E8 = { @@ -2549,7 +2548,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.7; + MACOSX_DEPLOYMENT_TARGET = 10.9; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; PRODUCT_NAME = Irrlicht; @@ -2577,12 +2576,13 @@ ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; EXECUTABLE_PREFIX = lib; + GCC_OPTIMIZATION_LEVEL = s; 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; - MACOSX_DEPLOYMENT_TARGET = 10.7; + MACOSX_DEPLOYMENT_TARGET = 10.9; MTL_ENABLE_DEBUG_INFO = NO; PRODUCT_NAME = Irrlicht; SDKROOT = macosx; diff --git a/source/Irrlicht/Irrlicht.xcodeproj/xcshareddata/xcschemes/Irrlicht_OSX.xcscheme b/source/Irrlicht/Irrlicht.xcodeproj/xcshareddata/xcschemes/Irrlicht_OSX.xcscheme index 5c7a50b7..e385f72a 100644 --- a/source/Irrlicht/Irrlicht.xcodeproj/xcshareddata/xcschemes/Irrlicht_OSX.xcscheme +++ b/source/Irrlicht/Irrlicht.xcodeproj/xcshareddata/xcschemes/Irrlicht_OSX.xcscheme @@ -1,6 +1,6 @@