Skip to content
This repository was archived by the owner on Jan 5, 2024. It is now read-only.

Commit 0bd77b3

Browse files
garethyrgarethyr
committed
Merge branch 'development'
2 parents a5a0930 + f1c6704 commit 0bd77b3

3,614 files changed

Lines changed: 206381 additions & 286186 deletions

File tree

Some content is hidden

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

‎.github/CODEOWNERS‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66
* @administrators
77

88
#C++ Owners
9-
*.cpp @core-game-coders
10-
*.h @core-game-coders
11-
*.c++ @core-game-coders
9+
*.cpp @core-game-code-managers
10+
*.h @core-game-code-managers
11+
*.c++ @core-game-code-managers

‎.github/workflows/build-check.yml‎

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
name: Compile check
2+
3+
# Controls when the action will run.
4+
on:
5+
# Triggers the workflow on push or pull request events but only for the development branch
6+
push:
7+
branches: [master, development]
8+
pull_request:
9+
types: [opened, reopened, ready_for_review, synchronize]
10+
11+
workflow_dispatch:
12+
13+
jobs:
14+
build-linux:
15+
# The type of runner that the job will run on
16+
runs-on: ubuntu-20.04
17+
18+
19+
# Steps represent a sequence of tasks that will be executed as part of the job
20+
steps:
21+
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
22+
- uses: actions/checkout@v2
23+
- uses: actions/setup-python@v2
24+
25+
- name: Install Dependencies
26+
run: |
27+
sudo apt-get update -yq
28+
sudo apt-get install --no-install-recommends liballegro4-dev libloadpng4-dev libflac++-dev luajit-5.1-dev liblua5.2-dev libminizip-dev liblz4-dev libpng++-dev libx11-dev libboost-dev
29+
30+
- name: Install Clang
31+
# You may pin to the exact commit or the version.
32+
# uses: egor-tensin/setup-clang@d16e36d5f8a7eb00aa6627c1a536d94dfc4a913d
33+
uses: egor-tensin/setup-clang@v1
34+
with:
35+
# Set up cc/c++ executables
36+
cc: 1 # optional, default is 1
37+
38+
- name: Setup ccache
39+
uses: hendrikmuhs/ccache-action@v1
40+
with:
41+
key: build-check-${{runner.os}}-regressed
42+
max-size: 5G
43+
44+
- name: Build
45+
# You may pin to the exact commit or the version.
46+
# uses: BSFishy/meson-build@6f1930d878fd3eed3853c1c91285ec604c37f3a5
47+
uses: BSFishy/meson-build@v1.0.3
48+
env:
49+
CC: "clang"
50+
CXX: "clang++"
51+
CCACHE_SLOPPINESS: pch_defines,time_macros,include_file_mtime,include_file_ctime
52+
with:
53+
# The action to run
54+
setup-options: --buildtype=debug -Ddebug_type=full
55+
meson-version: 0.55.3
56+
ninja-version: 1.10.0
57+
action: build
58+
59+
build-windows:
60+
env:
61+
# Path to the solution file relative to the root of the project.
62+
SOLUTION_FILE_PATH: RTEA.sln
63+
64+
# Configuration type to build.
65+
# You can convert this to a build matrix if you need coverage of multiple configuration types.
66+
# https://docs.github.com/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
67+
BUILD_CONFIGURATION: "Final"
68+
69+
runs-on: windows-latest
70+
71+
steps:
72+
- uses: actions/checkout@v2
73+
74+
- name: Add MSBuild to PATH
75+
uses: microsoft/setup-msbuild@v1
76+
77+
78+
- name: Build
79+
working-directory: ${{env.GITHUB_WORKSPACE}}
80+
# Add additional options to the MSBuild command line here (like platform or verbosity level).
81+
# See https://docs.microsoft.com/visualstudio/msbuild/msbuild-command-line-reference
82+
run: msbuild /m /p:Configuration="${{env.BUILD_CONFIGURATION}}" ${{env.SOLUTION_FILE_PATH}}

‎.github/workflows/meson.yml‎

Lines changed: 155 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,155 @@
1+
name: Linux Build
2+
# Controls when the action will run.
3+
on:
4+
# Triggers the workflow on push or pull request events but only for the development branch
5+
push:
6+
branches: [ master, development ]
7+
release:
8+
workflow_dispatch:
9+
10+
11+
# A workflow run is made up of one or more jobs that can run sequentially or in parallel
12+
jobs:
13+
# This workflow contains a single job called "build"
14+
build-release-linux:
15+
# The type of runner that the job will run on
16+
runs-on: ubuntu-20.04
17+
18+
19+
# Steps represent a sequence of tasks that will be executed as part of the job
20+
steps:
21+
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
22+
- uses: actions/checkout@v2
23+
- uses: actions/setup-python@v2
24+
25+
- name: Install Dependencies
26+
run: |
27+
sudo apt-get update -yq
28+
sudo apt-get install --no-install-recommends wget liballegro4-dev libloadpng4-dev libflac++-dev luajit-5.1-dev liblua5.2-dev libminizip-dev liblz4-dev libpng++-dev libx11-dev libboost-dev
29+
30+
- name: Install Clang
31+
# You may pin to the exact commit or the version.
32+
# uses: egor-tensin/setup-clang@d16e36d5f8a7eb00aa6627c1a536d94dfc4a913d
33+
uses: egor-tensin/setup-clang@v1
34+
with:
35+
# Set up cc/c++ executables
36+
cc: 1 # optional, default is 1
37+
38+
- name: Setup ccache
39+
uses: hendrikmuhs/ccache-action@v1
40+
with:
41+
key: build-release-${{runner.os}}
42+
max-size: 5G
43+
44+
- name: Build
45+
# You may pin to the exact commit or the version.
46+
# uses: BSFishy/meson-build@6f1930d878fd3eed3853c1c91285ec604c37f3a5
47+
uses: BSFishy/meson-build@v1.0.3
48+
env:
49+
CC: "clang"
50+
CXX: "clang++"
51+
CCACHE_SLOPPINESS: pch_defines,time_macros,include_file_mtime,include_file_ctime
52+
with:
53+
# The action to run
54+
setup-options: --buildtype=release -Dinstall_data=false -Dinstall_runner=false -Dfmod_dir=/usr/lib/ --prefix=/usr/
55+
meson-version: 0.55.3
56+
ninja-version: 1.10.0
57+
action: build
58+
59+
- name: Create AppDir
60+
run: |
61+
echo "Setting output prefix"
62+
DESTDIR=${GITHUB_WORKSPACE}/build/AppDir meson install -C $GITHUB_WORKSPACE"/build"
63+
64+
- name: Download linuxdeploy
65+
working-directory: ${{env.GITHUB_WORKSPACE}}
66+
run: |
67+
wget https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage -O lindeploy
68+
chmod +x lindeploy
69+
70+
- name: Create AppImage
71+
working-directory: ${{env.GITHUB_WORKSPACE}}
72+
env:
73+
LD_LIBRARY_PATH: ./external/lib/linux/x86_64/
74+
OUTPUT: CortexCommand.AppImage
75+
run: |
76+
echo ${LD_LIBRARY_PATH}
77+
./lindeploy --appdir=build/AppDir --output appimage
78+
79+
- name: Upload Appimage
80+
uses: actions/upload-artifact@v2
81+
with:
82+
name: CortexCommand.AppImage
83+
path: CortexCommand.AppImage
84+
85+
86+
build-debug-linux:
87+
# The type of runner that the job will run on
88+
runs-on: ubuntu-20.04
89+
90+
91+
# Steps represent a sequence of tasks that will be executed as part of the job
92+
steps:
93+
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
94+
- uses: actions/checkout@v2
95+
- uses: actions/setup-python@v2
96+
97+
- name: Install Dependencies
98+
run: |
99+
sudo apt-get update -yq
100+
sudo apt-get install --no-install-recommends wget liballegro4-dev libloadpng4-dev libflac++-dev luajit-5.1-dev libminizip-dev liblz4-dev libpng++-dev libx11-dev libboost-dev
101+
102+
- name: Install Clang
103+
# You may pin to the exact commit or the version.
104+
# uses: egor-tensin/setup-clang@d16e36d5f8a7eb00aa6627c1a536d94dfc4a913d
105+
uses: egor-tensin/setup-clang@v1
106+
with:
107+
# Set up cc/c++ executables
108+
cc: 1 # optional, default is 1
109+
110+
- name: Setup ccache
111+
uses: hendrikmuhs/ccache-action@v1
112+
with:
113+
key: build-release-${{runner.os}}
114+
max-size: 5G
115+
116+
- name: Build
117+
# You may pin to the exact commit or the version.
118+
# uses: BSFishy/meson-build@6f1930d878fd3eed3853c1c91285ec604c37f3a5
119+
uses: BSFishy/meson-build@v1.0.3
120+
env:
121+
CC: "clang"
122+
CXX: "clang++"
123+
CCACHE_SLOPPINESS: pch_defines,time_macros,include_file_mtime,include_file_ctime
124+
with:
125+
# The action to run
126+
setup-options: -Ddebug=true --optimization=g -Dinstall_data=false -Dinstall_runner=false -Dfmod_dir=/usr/lib/ --prefix=/usr/ -Ddebug_type=release
127+
meson-version: 0.55.3
128+
ninja-version: 1.10.0
129+
action: build
130+
131+
- name: Create AppDir
132+
run: |
133+
echo "Setting output prefix"
134+
DESTDIR=${GITHUB_WORKSPACE}/build/AppDir meson install -C $GITHUB_WORKSPACE"/build"
135+
136+
- name: Download linuxdeploy
137+
working-directory: ${{env.GITHUB_WORKSPACE}}
138+
run: |
139+
wget https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage -O lindeploy
140+
chmod +x lindeploy
141+
142+
- name: Create AppImage
143+
working-directory: ${{env.GITHUB_WORKSPACE}}
144+
env:
145+
LD_LIBRARY_PATH: ./external/lib/linux/x86_64/
146+
OUTPUT: CortexCommand-debug.AppImage
147+
run: |
148+
echo ${LD_LIBRARY_PATH}
149+
./lindeploy --appdir=build/AppDir --output appimage
150+
151+
- name: Upload Appimage
152+
uses: actions/upload-artifact@v2
153+
with:
154+
name: CortexCommand-debug.AppImage
155+
path: CortexCommand-debug.AppImage

‎.github/workflows/msbuild.yml‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
name: Windows Build
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
- development
8+
9+
workflow_dispatch:
10+
11+
env:
12+
# Path to the solution file relative to the root of the project.
13+
SOLUTION_FILE_PATH: RTEA.sln
14+
15+
# Configuration type to build.
16+
# You can convert this to a build matrix if you need coverage of multiple configuration types.
17+
# https://docs.github.com/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
18+
BUILD_CONFIGURATION: "Final"
19+
20+
jobs:
21+
build:
22+
runs-on: windows-latest
23+
24+
steps:
25+
- uses: actions/checkout@v2
26+
27+
- name: Add MSBuild to PATH
28+
uses: microsoft/setup-msbuild@v1
29+
30+
- name: Build
31+
working-directory: ${{env.GITHUB_WORKSPACE}}
32+
# Add additional options to the MSBuild command line here (like platform or verbosity level).
33+
# See https://docs.microsoft.com/visualstudio/msbuild/msbuild-command-line-reference
34+
run: msbuild /m /p:Configuration="${{env.BUILD_CONFIGURATION}}" ${{env.SOLUTION_FILE_PATH}}
35+
36+
- name: Upload Artifact2
37+
uses: actions/upload-artifact@v2.2.2
38+
with:
39+
name: Cortex Command.exe
40+
path: D:/a/Cortex-Command-Community-Project-Source/Cortex-Command-Community-Project-Data/Cortex Command x64.exe
41+
if-no-files-found: warn

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
compile_commands.json
1111
/.ccls-cache
1212

13-
/build
13+
/build*
1414

1515
/_Bin
1616
/NATPunchServer/Server/NATCompleteServer/Debug

0 commit comments

Comments
 (0)