From c5895fb0b82fd14fbe45b58d5fc7f75d67625d15 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Wed, 1 Feb 2023 23:32:40 +0800 Subject: Use gmake2 as a premake target over gmake (#2587) The gmake generator has been deprecated by gmake2 https://premake.github.io/docs/Using-Premake/#using-premake-to-generate-project-files gmake2 has better dependency handling around our custom rules leading in fewer runs of slang-generate etc... --- github_macos_build.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'github_macos_build.sh') diff --git a/github_macos_build.sh b/github_macos_build.sh index cd986e70d..1e8548239 100644 --- a/github_macos_build.sh +++ b/github_macos_build.sh @@ -14,7 +14,7 @@ fi if [[ "${ARCH}" != "${TARGETARCH}" ]]; then # Create the makefile -./premake5 gmake --cc=${CC} --enable-xlib=false --enable-embed-stdlib=true --arch=${ARCH} --deps=true --no-progress=true +./premake5 gmake2 --cc=${CC} --enable-xlib=false --enable-embed-stdlib=true --arch=${ARCH} --deps=true --no-progress=true # Build the configuration make config=${CONFIGURATION}_${ARCH} -j`sysctl -n hw.ncpu` @@ -23,11 +23,11 @@ rm -rf ./bin ARCH="arm64" # Create the makefile -./premake5 gmake --cc=${CC} --enable-xlib=false --enable-embed-stdlib=true --arch=${TARGETARCH} --deps=true --no-progress=true --skip-source-generation=true --deploy-slang-llvm=false --deploy-slang-glslang=false +./premake5 gmake2 --cc=${CC} --enable-xlib=false --enable-embed-stdlib=true --arch=${TARGETARCH} --deps=true --no-progress=true --skip-source-generation=true --deploy-slang-llvm=false --deploy-slang-glslang=false make config=${CONFIGURATION}_${TARGETARCH} -j`sysctl -n hw.ncpu` else # Create the makefile -./premake5 gmake --cc=${CC} --enable-xlib=false --enable-embed-stdlib=true --arch=${TARGETARCH} --deps=true --no-progress=true +./premake5 gmake2 --cc=${CC} --enable-xlib=false --enable-embed-stdlib=true --arch=${TARGETARCH} --deps=true --no-progress=true # Build the configuration make config=${CONFIGURATION}_${TARGETARCH} -j`sysctl -n hw.ncpu` fi -- cgit v1.2.3