From df7928cfb41f6df239d01b7c59e00df490c8d634 Mon Sep 17 00:00:00 2001 From: richard Date: Thu, 7 Jul 2022 01:18:16 +0100 Subject: [PATCH] fix macos missing gnu grep --- .github/workflows/macos.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 686307ff0..1b828b62f 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -49,7 +49,6 @@ jobs: # Generating static + shared library, note that i386 architecture is deprecated # Defining GL_SILENCE_DEPRECATION because OpenGL is deprecated on macOS - # TODO: Support Universal ARCH libraries (build arm64 + x86_64 and merge) - name: Build Library run: | cd src @@ -60,8 +59,9 @@ jobs: make clean make PLATFORM=PLATFORM_DESKTOP RAYLIB_LIBTYPE=SHARED RAYLIB_LIB_NAME=raylib_x86_64 CUSTOM_CFLAGS="-target x86_64-apple-macos10.12 -DGL_SILENCE_DEPRECATION" CUSTOM_LDFLAGS="-target x86_64-apple-macos10.12" -B make PLATFORM=PLATFORM_DESKTOP RAYLIB_LIBTYPE=SHARED RAYLIB_LIB_NAME=raylib_arm64 CUSTOM_CFLAGS="-target arm64-apple-macos11 -DGL_SILENCE_DEPRECATION" CUSTOM_LDFLAGS="-target arm64-apple-macos11" -B - RAYLIB_API_VERSION=`grep -Po 'RAYLIB_API_VERSION\s*=\s\K(.*)' Makefile` - RAYLIB_VERSION=`grep -Po 'RAYLIB_VERSION\s*=\s\K(.*)' Makefile` + brew install grep + RAYLIB_API_VERSION=`ggrep -Po 'RAYLIB_API_VERSION\s*=\s\K(.*)' Makefile` + RAYLIB_VERSION=`ggrep -Po 'RAYLIB_VERSION\s*=\s\K(.*)' Makefile` lipo -create -output ../build/${{ env.RELEASE_NAME }}/lib/libraylib.${RAYLIB_VERSION}.dylib libraylib_x86_64.${RAYLIB_VERSION}.dylib libraylib_arm64.${RAYLIB_VERSION}.dylib ln -sv libraylib.${RAYLIB_VERSION}.dylib ../build/${{ env.RELEASE_NAME }}/lib/libraylib.dylib ln -sv libraylib.${RAYLIB_VERSION}.dylib ../build/${{ env.RELEASE_NAME }}/lib/libraylib.${RAYLIB_API_VERSION}.dylib