Skip to content

Build artifacts and functioning Windows builds. #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
irql-notlessorequal merged 4 commits into from
Jul 17, 2025
Merged

Build artifacts and functioning Windows builds. #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ea8ba96
workflow,build: Get artifacts working.
irql-notlessorequal Jul 16, 2025
93992bd
Extension: Fix Windows compilation.
irql-notlessorequal Jul 16, 2025
dd341c3
Extension: Silence warnings on Windows.
irql-notlessorequal Jul 16, 2025
87517a5
PackageScript: Output the extension in the x64 folder.
irql-notlessorequal Jul 16, 2025
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
7 changes: 7 additions & 0 deletions .github/workflows/c-cpp.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,3 +66,10 @@ jobs:
run: |
cd build
bash ./build
- uses: actions/upload-artifact@v4
name: Upload build artifacts
with:
name: "steamworks-x64-${{matrix.os}}-git"
path: build/package/
if-no-files-found: error
retention-days: 90
1 change: 0 additions & 1 deletion AMBuildScript
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,6 @@ class SteamWorksConfig(object):
'/EHsc',
'/GR-',
'/TP',
'/std:c++20'
]
cxx.linkflags += [
'/MACHINE:X86',
Expand Down
2 changes: 2 additions & 0 deletions Extension/AMBuilder
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ for sdk_name in SteamWorks.sdks:
binary.compiler.postlink += os.path.join(SteamWorks.steamworks_root, 'redistributable_bin', 'linux32', 'libsteam_api.so'),;

if binary.compiler.target.platform == 'windows':
binary.compiler.cxxflags += [ '/std:c++20', '/EHsc' ]

if binary.compiler.target.arch == 'x86_64':
binary.compiler.postlink += os.path.join(SteamWorks.steamworks_root, 'redistributable_bin', 'win64', 'steam_api64.lib'),;
else:
Expand Down
5 changes: 5 additions & 0 deletions Extension/swgameserver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,11 @@
*/

#include "swgameserver.h"

#if defined POSIX
#include <dlfcn.h>
#include <link.h>
#endif

static void GetGameSpecificConfigInterface(const char *pName, const char *&pVersion)
{
Expand Down Expand Up @@ -238,6 +241,7 @@ void SteamWorksGameServer::GetUserAndPipe(HSteamUser &hSteamUser, HSteamPipe &hS
hSteamPipe = SteamGameServer_GetHSteamPipe();
}

#if defined POSIX
std::string get_loaded_library_path(const std::string& libname) {
struct search_data_t {
const std::string& name;
Expand All @@ -257,6 +261,7 @@ std::string get_loaded_library_path(const std::string& libname) {

return search_data.path;
}
#endif

const char *SteamWorksGameServer::GetLibraryPath(void)
{
Expand Down
4 changes: 2 additions & 2 deletions buildbot/PackageScript
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import os
builder.SetBuildFolder('package')

folder_list = [
'addons/sourcemod/extensions',
'addons/sourcemod/extensions/x64',
'addons/sourcemod/scripting',
'addons/sourcemod/scripting/include',
]
Expand All @@ -16,7 +16,7 @@ for folder in folder_list:
folder_map[folder] = builder.AddFolder(norm_folder)

for extension in SteamWorks.extensions:
builder.AddCopy(extension.binary, folder_map['addons/sourcemod/extensions'])
builder.AddCopy(extension.binary, folder_map['addons/sourcemod/extensions/x64'])

# Do all straight-up file copies from the source tree.
def CopyFiles(src, dest, files):
Expand Down