Skip to content

Commit 670305c

Browse files
skuzzisskuzzis
authored
Merge pull request #32 from swiftly-solution/rewrite
Update - v1.0.0
2 parents 4738798 + eaefbb1 commit 670305c

File tree

1,062 files changed

+173344
-160058
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,062 files changed

+173344
-160058
lines changed

‎.github/FUNDING.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
buy_me_a_coffee: swiftlycs2
2-
custom: ["https://www.tipeeestream.com/skuzzi/donation", "https://paypal.me/skuzzis"]
1+
custom: https://www.tipeeestream.com/skuzzi/donation

‎.github/workflows/builder.yml‎

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
name: "Swiftly Compiler"
2+
3+
on:
4+
push:
5+
branches:
6+
- '**'
7+
pull_request:
8+
9+
jobs:
10+
build:
11+
name: Build
12+
runs-on: ${{ matrix.os }}
13+
env:
14+
MMSOURCE20: ${{ github.workspace }}/swiftly/alliedmodders/metamod
15+
HL2SDKCS2: ${{ github.workspace }}/swiftly/alliedmodders/hl2sdk
16+
container: ${{ matrix.container }}
17+
strategy:
18+
fail-fast: false
19+
matrix:
20+
os: [Linux, windows-latest]
21+
include:
22+
- os: Linux
23+
container: registry.gitlab.steamos.cloud/steamrt/sniper/sdk
24+
steps:
25+
- name: Checkout
26+
uses: actions/checkout@v4
27+
with:
28+
path: swiftly
29+
submodules: recursive
30+
31+
- name: Checkout AMBuild
32+
uses: actions/checkout@v4
33+
with:
34+
repository: alliedmodders/ambuild
35+
path: ambuild
36+
37+
- name: Install AMBuild
38+
run: |
39+
cd ambuild; python setup.py install; cd ..
40+
41+
- name: Build - Linux
42+
if: matrix.os == 'Linux'
43+
working-directory: swiftly
44+
shell: bash
45+
run: |
46+
sudo apt update
47+
sudo apt install -y libreadline-dev libboost-all-dev fdupes unzip
48+
bash ./setup.sh
49+
50+
- name: Prepare Build - Windows
51+
if: matrix.os == 'windows-latest'
52+
working-directory: swiftly
53+
run: |
54+
./setup.ps1
55+
56+
- name: Upload Artifacts Linux
57+
if: matrix.os == 'Linux'
58+
uses: actions/upload-artifact@v4
59+
with:
60+
name: Swiftly Plugin Linux
61+
path: ${{ github.workspace }}/swiftly/build/package
62+
63+
- name: Upload Artifacts Windows
64+
if: matrix.os == 'windows-latest'
65+
uses: actions/upload-artifact@v4
66+
with:
67+
name: Swiftly Plugin Windows
68+
path: ${{ github.workspace }}/swiftly/build/package

‎.github/workflows/main.yml‎

Lines changed: 0 additions & 132 deletions
This file was deleted.

‎.gitignore‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
build/
2+
prototemp/
3+
.xmake/
24
custom_builder.sh
3-
.xmake
4-
prototemp
5+
swiftly.so

‎.gitmodules‎

Lines changed: 26 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,32 @@
1-
[submodule "metamod"]
2-
path = metamod
3-
url = https://github.com/alliedmodders/metamod-source
4-
[submodule "hl2sdk"]
5-
path = hl2sdk
1+
[submodule "alliedmodders/hl2sdk"]
2+
path = alliedmodders/hl2sdk
63
url = https://github.com/alliedmodders/hl2sdk
74
branch = cs2
8-
[submodule "vendor/rapidjson"]
9-
path = vendor/rapidjson
5+
[submodule "alliedmodders/metamod"]
6+
path = alliedmodders/metamod
7+
url = https://github.com/alliedmodders/metamod-source
8+
[submodule "vendor/LuaBridge"]
9+
path = vendor/LuaBridge
10+
url = https://github.com/vinniefalco/LuaBridge
11+
[submodule "vendor/dynlib"]
12+
path = vendor/dynlib
13+
url = https://github.com/komashchenko/DynLibUtils
14+
[submodule "vendor/json"]
15+
path = vendor/json
1016
url = https://github.com/Tencent/rapidjson
11-
[submodule "vendor/luacpp"]
12-
path = vendor/luacpp
13-
url = https://github.com/ouonline/luacpp
14-
[submodule "vendor/lua-rapidjson"]
15-
path = vendor/lua-rapidjson
16-
url = https://github.com/xpol/lua-rapidjson
1717
[submodule "hl2sdk-manifests"]
1818
path = hl2sdk-manifests
1919
url = https://github.com/alliedmodders/hl2sdk-manifests
20-
[submodule "vendor/dynlibutils"]
21-
path = vendor/dynlibutils
22-
url = https://github.com/komashchenko/DynLibUtils
20+
[submodule "vendor/msgpack"]
21+
path = vendor/msgpack
22+
url = https://github.com/msgpack/msgpack-c
23+
branch = cpp_master
24+
[submodule "vendor/json-lua"]
25+
path = vendor/json-lua
26+
url = https://github.com/xpol/lua-rapidjson
27+
[submodule "vendor/asmjit"]
28+
path = vendor/asmjit
29+
url = https://github.com/asmjit/asmjit
30+
[submodule "vendor/asmtk"]
31+
path = vendor/asmtk
32+
url = https://github.com/asmjit/asmtk

‎.vscode/c_cpp_properties.json‎

Lines changed: 43 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -3,26 +3,34 @@
33
{
44
"name": "Win32",
55
"includePath": [
6-
"${workspaceFolder}/hl2sdk/**",
7-
"${workspaceFolder}/metamod/**",
8-
"${workspaceFolder}/metamod/core/**",
9-
"${workspaceFolder}/vendor/rapidjson/include/**",
10-
"${workspaceFolder}/vendor/funchook/include/**",
11-
"${workspaceFolder}/vendor/mysql/win64/include/**",
12-
"${workspaceFolder}/vendor/openssl/win64/include/**",
13-
"${workspaceFolder}/vendor/curl/win64/include/**",
6+
"${workspaceFolder}/build/swiftly/windows-x86_64/**",
7+
"${workspaceFolder}/alliedmodders/hl2sdk/**",
8+
"${workspaceFolder}/alliedmodders/metamod/**",
9+
"${workspaceFolder}/alliedmodders/metamod/core/**",
10+
"${workspaceFolder}/src/**",
1411
"${workspaceFolder}/vendor/lua/**",
15-
"${workspaceFolder}/vendor/dynlibutils/**",
12+
"${workspaceFolder}/vendor/dynlib/**",
13+
"${workspaceFolder}/vendor/LuaBridge/Source/**",
14+
"${workspaceFolder}/vendor/json/include/**",
15+
"${workspaceFolder}/vendor/msgpack/include/**",
16+
"${workspaceFolder}/vendor/funchook/include/**",
1617
"${workspaceFolder}/vendor/texttable/**",
17-
"${workspaceFolder}/vendor/luacpp/include/**",
18-
"${workspaceFolder}/src/inc/**",
19-
"${workspaceFolder}/src/**",
20-
"${workspaceFolder}/build/swiftly/windows-x86_64"
18+
"${workspaceFolder}/vendor/curl/win64/include/**",
19+
"${workspaceFolder}/vendor/mysql/win64/include/**",
20+
"${workspaceFolder}/vendor/asmjit/src/**",
21+
"${workspaceFolder}/vendor/dynohook/win64/include/**",
22+
"${workspaceFolder}/vendor/dyncall/win64/include/**",
23+
"${workspaceFolder}/vendor/bzip2/win64/include/**"
2124
],
2225
"defines": [
2326
"_DEBUG",
2427
"UNICODE",
25-
"_UNICODE"
28+
"_UNICODE",
29+
"WIN32",
30+
"COMPILER_GCC",
31+
"CPPHTTPLIB_OPENSSL_SUPPORT",
32+
"CURL_STATICLIB",
33+
"MSGPACK_NO_BOOST"
2634
],
2735
"cStandard": "c17",
2836
"cppStandard": "c++17",
@@ -31,26 +39,33 @@
3139
{
3240
"name": "Linux",
3341
"includePath": [
34-
"${workspaceFolder}/hl2sdk/**",
35-
"${workspaceFolder}/metamod/**",
36-
"${workspaceFolder}/metamod/core/**",
37-
"${workspaceFolder}/vendor/rapidjson/include/**",
38-
"${workspaceFolder}/vendor/funchook/include/**",
39-
"${workspaceFolder}/vendor/mysql/win64/include/**",
40-
"${workspaceFolder}/vendor/openssl/win64/include/**",
41-
"${workspaceFolder}/vendor/curl/win64/include/**",
42+
"${workspaceFolder}/build/swiftly/linux-x86_64/**",
43+
"${workspaceFolder}/alliedmodders/hl2sdk/**",
44+
"${workspaceFolder}/alliedmodders/metamod/**",
45+
"${workspaceFolder}/alliedmodders/metamod/core/**",
46+
"${workspaceFolder}/src/**",
4247
"${workspaceFolder}/vendor/lua/**",
43-
"${workspaceFolder}/vendor/dynlibutils/**",
48+
"${workspaceFolder}/vendor/dynlib/**",
49+
"${workspaceFolder}/vendor/LuaBridge/Source/**",
50+
"${workspaceFolder}/vendor/json/include/**",
51+
"${workspaceFolder}/vendor/msgpack/include/**",
52+
"${workspaceFolder}/vendor/funchook/include/**",
4453
"${workspaceFolder}/vendor/texttable/**",
45-
"${workspaceFolder}/vendor/luacpp/include/**",
46-
"${workspaceFolder}/src/inc/**",
47-
"${workspaceFolder}/src/**",
48-
"${workspaceFolder}/build/swiftly/linux-x86_64"
54+
"${workspaceFolder}/vendor/curl/linuxsteamrt64/include/**",
55+
"${workspaceFolder}/vendor/mysql/linuxsteamrt64/include/**",
56+
"${workspaceFolder}/vendor/asmjit/src/**",
57+
"${workspaceFolder}/vendor/dynohook/linuxsteamrt64/include/**",
58+
"${workspaceFolder}/vendor/dyncall/linuxsteamrt64/include/**",
59+
"${workspaceFolder}/vendor/bzip2/linuxsteamrt64/include/**"
4960
],
5061
"defines": [
5162
"_DEBUG",
5263
"UNICODE",
53-
"_UNICODE"
64+
"_UNICODE",
65+
"POSIX",
66+
"COMPILER_GCC",
67+
"CPPHTTPLIB_OPENSSL_SUPPORT",
68+
"CURL_STATICLIB"
5469
],
5570
"cStandard": "c17",
5671
"cppStandard": "c++17",

‎.vscode/launch.json‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
{
2+
"configurations": [
3+
{
4+
"name": "(gdb) Launch",
5+
"type": "cppdbg",
6+
"request": "launch",
7+
"program": "enter program name, for example ${workspaceFolder}/a.out",
8+
"args": [],
9+
"stopAtEntry": false,
10+
"cwd": "${fileDirname}",
11+
"environment": [],
12+
"externalConsole": false,
13+
"MIMode": "gdb",
14+
"setupCommands": [
15+
{
16+
"description": "Enable pretty-printing for gdb",
17+
"text": "-enable-pretty-printing",
18+
"ignoreFailures": true
19+
},
20+
{
21+
"description": "Set Disassembly Flavor to Intel",
22+
"text": "-gdb-set disassembly-flavor intel",
23+
"ignoreFailures": true
24+
}
25+
]
26+
}
27+
],
28+
"version": "2.0.0"
29+
}

0 commit comments

Comments
 (0)