diff --git a/.github/workflows/build_mac64.yml b/.github/workflows/build_mac64.yml index e28254bed..5382e2199 100644 --- a/.github/workflows/build_mac64.yml +++ b/.github/workflows/build_mac64.yml @@ -21,8 +21,8 @@ jobs: LATEST_FLAG=-DCC_COMMIT_SHA=\"$(git rev-parse --short "$GITHUB_SHA")\" cd src - clang *.c interop_cocoa.m ${{ env.COMMON_FLAGS }} ${{ env.MAC64_FLAGS }} $LATEST_FLAG -o cc-mac64-gl1 -framework Cocoa -framework OpenGL -framework IOKit -lobjc - clang *.c interop_cocoa.m ${{ env.COMMON_FLAGS }} ${{ env.MAC64_FLAGS }} $LATEST_FLAG -DCC_BUILD_GLMODERN -o cc-mac64-gl2 -framework Cocoa -framework OpenGL -framework IOKit -lobjc + MACOSX_DEPLOYMENT_TARGET=10.9 clang *.c interop_cocoa.m ${{ env.COMMON_FLAGS }} ${{ env.MAC64_FLAGS }} $LATEST_FLAG -o cc-mac64-gl1 -framework Cocoa -framework OpenGL -framework IOKit -lobjc + MACOSX_DEPLOYMENT_TARGET=10.9 clang *.c interop_cocoa.m ${{ env.COMMON_FLAGS }} ${{ env.MAC64_FLAGS }} $LATEST_FLAG -DCC_BUILD_GLMODERN -o cc-mac64-gl2 -framework Cocoa -framework OpenGL -framework IOKit -lobjc - uses: ./.github/actions/notify_failure if: ${{ always() && steps.compile.outcome == 'failure' }} diff --git a/src/interop_cocoa.m b/src/interop_cocoa.m index 5c5d4d39b..29bef4a13 100644 --- a/src/interop_cocoa.m +++ b/src/interop_cocoa.m @@ -209,8 +209,8 @@ void Window_Init(void) { /*########################################################################################################################* *-----------------------------------------------------------Window--------------------------------------------------------* *#########################################################################################################################*/ -#ifndef kCGBitmapByteOrder32Host -// Undefined in < 10.4 SDK. No issue since < 10.4 is only Big Endian PowerPC anyways +#if !defined MAC_OS_X_VERSION_10_4 +// Doesn't exist in < 10.4 SDK. No issue since < 10.4 is only Big Endian PowerPC anyways #define kCGBitmapByteOrder32Host 0 #endif @@ -810,7 +810,7 @@ void GLContext_SetFpsLimit(cc_bool vsync, float minFrameMs) { [ctxHandle setValues:&value forParameter: NSOpenGLCPSwapInterval]; } -/* kCGLCPCurrentRendererID is only available on macOS 10.4 and later */ +// kCGLCPCurrentRendererID is only available on macOS 10.4 and later #if defined MAC_OS_X_VERSION_10_4 static const char* GetAccelerationMode(CGLContextObj ctx) { GLint fGPU, vGPU;