From 8d07ee64a03ba66daa502fbfea573fd56f97c3e9 Mon Sep 17 00:00:00 2001 From: RandomityGuy <31925790+RandomityGuy@users.noreply.github.com> Date: Sat, 18 Feb 2023 20:26:19 +0530 Subject: [PATCH] alter build conf for mac --- .circleci/config.yml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b02fcd2a..0c36e804 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -174,6 +174,16 @@ jobs: cmake --build build --config Release -j$NPROC sudo cmake --install build fi + - run: + name: Compile libuv + command: | + mkdir -p ~/deps + cd ~/deps + curl https://dist.libuv.org/dist/v1.44.2/libuv-v1.44.2.tar.gz | tar xz + cd libuv-v1.44.2 + cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=Release -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DCMAKE_OSX_DEPLOYMENT_TARGET="10.15" -DCMAKE_MACOSX_RPATH=TRUE + cmake --build build --config Release -j$NPROC + sudo cmake --install build - run: name: Install hashlink @@ -225,7 +235,7 @@ jobs: haxe compile-macos.hxml cd native cp ~/deps/hashlink/src/hlc_main.c . - clang -mmacosx-version-min=10.15 -arch x86_64 -arch arm64 -o marblegame -I . -L /usr/local/lib/ -std=c11 marblegame.c /usr/local/lib/{ui.hdll,openal.hdll,fmt.hdll,sdl.hdll,uv.hdll,ssl.hdll} -lsdl2 -lhl + clang -mmacosx-version-min=10.15 -arch x86_64 -arch arm64 -o marblegame -I . -L /usr/local/lib/ -std=c11 marblegame.c /usr/local/lib/{ui.hdll,openal.hdll,fmt.hdll,sdl.hdll,uv.hdll} -lsdl2 -lhl - run: name: Package app bundle @@ -245,6 +255,7 @@ jobs: cp /usr/local/lib/libvorbisfile.3.3.8.dylib libvorbisfile.3.3.8.dylib cp /usr/local/lib/libvorbisenc.2.0.12.dylib libvorbisenc.2.0.12.dylib cp /usr/local/lib/libz.1.2.13.dylib libz.1.dylib + cp /usr/local/lib/libuv.1.44.2.dylib libuv.1.44.2.dylib # These libraries have dangling RPATHs install_name_tool -delete_rpath /usr/local/lib libturbojpeg.0.dylib for i in fmt.hdll libpng16.16.dylib