Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,8 @@ jobs:
build:
strategy:
matrix:
os: [ubuntu-20.04, windows-2019, ubuntu-latest, windows-latest]
os: [ubuntu-latest, windows-latest]
include:
- os: ubuntu-20.04
cc: clang-10
cxx: clang++-10
- os: windows-2019
cc: msvc
- os: ubuntu-latest
cc: clang
cxx: clang++
Expand Down Expand Up @@ -144,7 +139,7 @@ jobs:

- uses: actions/upload-artifact@v4
name: Upload artifacts
if: (github.event_name == 'push' || github.event_name == 'workflow_dispatch') && (startsWith(matrix.os, 'windows-latest') || startsWith(matrix.os, 'ubuntu-latest'))
if: (github.event_name == 'push' || github.event_name == 'workflow_dispatch')
with:
name: "${{ env.ARTIFACT_NAME }}"
path: "extension/build/package/"
27 changes: 18 additions & 9 deletions AMBuildScript
Original file line number Diff line number Diff line change
Expand Up @@ -392,7 +392,7 @@ class ExtensionConfig(object):
cxx.cflags += ["/Oy-"]

def configure_linux(self, cxx):
cxx.defines += ["_LINUX", "POSIX"]
cxx.defines += ["LINUX", "_LINUX", "POSIX", "_FILE_OFFSET_BITS=64"]
cxx.linkflags += ["-Wl,--exclude-libs,ALL", "-lm"]
if cxx.vendor == "gcc":
cxx.linkflags += ["-static-libgcc"]
Expand Down Expand Up @@ -512,10 +512,13 @@ class ExtensionConfig(object):
if compiler.target.platform == "linux":
if sdk.name == "episode1":
lib_folder = os.path.join(sdk.path, "linux_sdk")
elif sdk.name in ["sdk2013", "bms"]:
lib_folder = os.path.join(sdk.path, "lib", "public", "linux32")
elif (
sdk.name in ["tf2", "dods", "css", "hl2dm", "sdk2013", "bms"]
and compiler.target.arch == "x86"
):
lib_folder = os.path.join(sdk.path, "lib", "public", "linux")
elif compiler.target.arch == "x86_64":
lib_folder = os.path.join(sdk.path, "lib", "linux64")
lib_folder = os.path.join(sdk.path, "lib", "public", "linux64")
else:
lib_folder = os.path.join(sdk.path, "lib", "linux")
elif compiler.target.platform == "mac":
Expand Down Expand Up @@ -573,12 +576,18 @@ class ExtensionConfig(object):
if sdk.name in ["swarm", "blade", "insurgency", "doi", "csgo"]:
libs.append("interfaces")
for lib in libs:
if compiler.target.arch == "x86":
if sdk.name in ["l4d", "l4d2"]:
# l4d and l4d2 engines don't have 64-bit libs
lib_path = os.path.join(sdk.path, "lib", "public", lib) + ".lib"
elif compiler.target.arch == "x86_64":
lib_path = (
os.path.join(sdk.path, "lib", "public", "win64", lib) + ".lib"
)
else:
if compiler.target.arch == "x86":
lib_path = (
os.path.join(sdk.path, "lib", "public", "x86", lib) + ".lib"
)
elif compiler.target.arch == "x86_64":
lib_path = (
os.path.join(sdk.path, "lib", "public", "x64", lib) + ".lib"
)
compiler.linkflags.append(lib_path)

for library in dynamic_libs:
Expand Down
224 changes: 0 additions & 224 deletions src/Makefile

This file was deleted.