openboe/oboe
2
0
Fork 0
Code Issues 146 Pull Requests 4 Actions Packages Projects Releases Wiki Activity

CI: Enable the mac-scons build

Browse Source
This commit is contained in:
Celtic Minstrel
2023-01-21 15:48:56 -05:00
parent e1d6fe1d12
commit 5c0e60711c
3 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
.github/workflows/ci.yml vendored
View File

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

1
.github/workflows/scripts/mac/scons-build.sh vendored
View File

@@ -2,5 +2,6 @@
export CC="$(brew --prefix llvm)/bin/clang" export CC="$(brew --prefix llvm)/bin/clang"
export CXX="$(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" scons CXXFLAGS="-I/usr/local/opt/zlib/include" LINKFLAGS="-L/usr/local/opt/zlib/lib"

8
SConstruct
View File

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