From 2d3c0e88afdbe1c358e6ccad73dc232e17fb7504 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mart=C3=ADn=20Lucas=20Golini?= Date: Tue, 1 Oct 2024 18:51:04 -0300 Subject: [PATCH] This should localize SDL2 locally. --- .gitignore | 2 ++ premake5.lua | 2 +- projects/macos/ecode/cross.build.app.sh | 2 -- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index e17e49e3f..61f874d6d 100644 --- a/.gitignore +++ b/.gitignore @@ -68,3 +68,5 @@ ecode.dmg /compile_commands.json /bin/unit_tests/eepp* /bin/unit_tests/lib* +/src/thirdparty/SDL2.framework/ +/SDL2/ diff --git a/premake5.lua b/premake5.lua index 20c3b6791..22e311a20 100644 --- a/premake5.lua +++ b/premake5.lua @@ -562,7 +562,7 @@ function set_apple_config() if is_xcode() or _OPTIONS["use-frameworks"] then linkoptions { "-F /Library/Frameworks", "-F ~/Library/Frameworks", "-F src/thirdparty" } buildoptions { "-F /Library/Frameworks", "-F ~/Library/Frameworks", "-F src/thirdparty" } - local sdl2local = _MAIN_SCRIPT_DIR .. "src/thirdparty/SDL2.framework"; + local sdl2local = _MAIN_SCRIPT_DIR .. "/src/thirdparty/SDL2.framework"; local sdl2user = "~/Library/Frameworks/SDL2.framework"; if os.isdir(sdl2local) then incdirs { sdl2local .. "/Headers" } diff --git a/projects/macos/ecode/cross.build.app.sh b/projects/macos/ecode/cross.build.app.sh index 94eaaa850..b6f9e3abf 100755 --- a/projects/macos/ecode/cross.build.app.sh +++ b/projects/macos/ecode/cross.build.app.sh @@ -22,8 +22,6 @@ done premake5 --file=../../../premake5.lua --use-frameworks gmake2 || exit -find ../../../make/macosx/ -name "*.make" -exec sed -i '' 's/\$(AR) -rcs/\$(AR) -rcsv/g' {} + - make -C ../../../make/macosx/ -j$(sysctl -n hw.ncpu) -e verbose=true -e config=release_x86_64 ecode || exit rm -rf ./ecode.app mkdir -p ecode.app/Contents/MacOS/