CI: Enable the mac-scons build

This commit is contained in:
2023-01-21 15:48:56 -05:00
parent e1d6fe1d12
commit 5c0e60711c
3 changed files with 23 additions and 22 deletions

View File

@@ -44,24 +44,24 @@
}
]
},
# macos-scons: {
# runs-on: macos-10.15,
# steps: [
# {
# name: checkout,
# uses: actions/checkout@v2,
# with: { submodules: true }
# },
# {
# name: install dependencies,
# run: brew install scons SFML Boost
# },
# {
# name: build and unit test,
# run: ./.github/workflows/scripts/mac/scons-build.sh
# }
# ]
# },
macos-scons: {
runs-on: macos-10.15,
steps: [
{
name: checkout,
uses: actions/checkout@v2,
with: { submodules: true }
},
{
name: install dependencies,
run: brew install scons SFML Boost
},
{
name: build and unit test,
run: ./.github/workflows/scripts/mac/scons-build.sh
}
]
},
win-vs32: {
runs-on: windows-2019,
steps: [

View File

@@ -2,5 +2,6 @@
export CC="$(brew --prefix llvm)/bin/clang"
export CXX="$(brew --prefix llvm)/bin/clang++"
export SDKROOT="$(xcrun --show-sdk-path)"
scons CXXFLAGS="-I/usr/local/opt/zlib/include" LINKFLAGS="-L/usr/local/opt/zlib/lib"

View File

@@ -91,10 +91,10 @@ if platform == "darwin":
/usr/include
/usr/local/include
"""), FRAMEWORKPATH=Split("""
/System/Library/Frameworks
/Library/Frameworks
%s/Library/Frameworks
""" % os.environ['HOME']))
{SDKROOT}/System/Library/Frameworks
{SDKROOT}/Library/Frameworks
{HOME}/Library/Frameworks
""".format(HOME = os.environ['HOME'], SDKROOT = os.environ['SDKROOT'])))
def build_app_package(env, source, build_dir, info):
source_name = source[0].name
pkg_path = path.join(build_dir, "%s.app/Contents/" % source_name)