Skip to content

Commit

Permalink
Update to AMBuild 2.2.
Browse files Browse the repository at this point in the history
This is a pretty big diff because SourceMod had lots of multi-arch
workarounds that can now go away. I've also changed 'x64' to 'x86_64' in
many places since this is how AMBuild normalizes it, and it's far too
late to pick the shorter string, so we might as well suck it up.

The --target-archs parameter has been replaced with --targets. It works
the same way.

The default behavior for SDK inclusion is now "present" instead of
"all" since this lowers the burden of storing many SDKs. Official builds
will still be made with --sdks=all.
  • Loading branch information
dvander committed Aug 19, 2020
1 parent 1b86c85 commit 785c6aa
Show file tree
Hide file tree
Showing 26 changed files with 293 additions and 239 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,4 @@ obj-*/
*.smx
*.swp
*.gdb_history
objdir
8 changes: 4 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
- MATRIX_EVAL="CC=clang-3.8 && CXX=clang++-3.8"
- SDKS=episode1,css,tf2,l4d2,csgo
- MODE=optimize
- ARCH=x86,x64
- ARCH=x86,x86_64

- os: linux
dist: trusty
Expand All @@ -34,7 +34,7 @@ jobs:
- MATRIX_EVAL="CC=clang && CXX=clang++"
- SDKS=episode1,css,tf2,l4d2,csgo
- MODE=optimize
- ARCH=x86,x64
- ARCH=x86,x86_64

- os: osx
osx_image: xcode7.2
Expand All @@ -43,7 +43,7 @@ jobs:
- MATRIX_EVAL="CC=clang && CXX=clang++"
- SDKS=episode1,css,tf2,l4d2,csgo
- MODE=optimize
- ARCH=x64,x86
- ARCH=x86_64,x86

# # This is a faster test for the latest g++.
# - os: linux
Expand Down Expand Up @@ -82,5 +82,5 @@ script:
- eval "${MATRIX_EVAL}"
- eval "${CC} --version"
- eval "${CXX} --version"
- python ../configure.py --enable-${MODE} --sdks=${SDKS} --target-arch=${ARCH}
- python ../configure.py --enable-${MODE} --sdks=${SDKS} --targets=${ARCH}
- ambuild
Loading

0 comments on commit 785c6aa

Please sign in to comment.