diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6cccdbdc..48425b7a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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: [ diff --git a/.github/workflows/scripts/mac/scons-build.sh b/.github/workflows/scripts/mac/scons-build.sh index ce73e603..10ee22d2 100755 --- a/.github/workflows/scripts/mac/scons-build.sh +++ b/.github/workflows/scripts/mac/scons-build.sh @@ -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" diff --git a/SConstruct b/SConstruct index ed796aa6..8460663a 100644 --- a/SConstruct +++ b/SConstruct @@ -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)