Skip to content

Commit 7e62c2c

Browse files
trauntstraunts
committed
Merge branch 'development' into cf/468-add-proper-semantic-version-comparison-to-check-mod-compatibility
# Conflicts: # .gitignore # Menus/MainMenuGUI.cpp # RTEA.vcxproj # RTEA.vcxproj.filters # System/meson.build
2 parents 9193456 + 66b362c commit 7e62c2c

File tree

4,692 files changed

+889458
-233426
lines changed

Some content is hidden

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

4,692 files changed

+889458
-233426
lines changed

‎.github/workflows/build-check.yml

Lines changed: 33 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -2,30 +2,33 @@ name: Compile check
22

33
# Controls when the action will run.
44
on:
5-
# Triggers the workflow on push or pull request events but only for the development branch
5+
# Triggers the workflow for pushes to master or development, for pull request events, and for the merge queue
66
push:
77
branches: [master, development]
88
pull_request:
99
types: [opened, reopened, ready_for_review, synchronize]
10+
merge_group:
11+
types: [checks_requested]
1012

1113
workflow_dispatch:
1214

1315
jobs:
1416
build-linux:
1517
# The type of runner that the job will run on
16-
runs-on: ubuntu-20.04
18+
runs-on: ubuntu-latest
1719

1820

1921
# Steps represent a sequence of tasks that will be executed as part of the job
2022
steps:
2123
# 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+
- uses: actions/checkout@v3
25+
- uses: actions/setup-python@v3
2426

2527
- name: Install Dependencies
2628
run: |
2729
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
30+
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 libtbb-dev libsdl2-dev libopengl-dev ninja-build
31+
sudo pip install meson==0.60.3
2932
3033
- name: Install Clang
3134
# You may pin to the exact commit or the version.
@@ -35,26 +38,33 @@ jobs:
3538
# Set up cc/c++ executables
3639
cc: 1 # optional, default is 1
3740

38-
- name: Setup ccache
39-
uses: hendrikmuhs/ccache-action@v1
40-
with:
41-
key: build-check-${{runner.os}}-regressed
42-
max-size: 5G
41+
- name: Build
42+
env:
43+
CC: "gcc"
44+
CXX: "g++"
45+
run: |
46+
meson setup --buildtype=debug -Ddebug_type=full build
47+
meson compile -C build
48+
49+
build-macos:
50+
runs-on: macos-latest
51+
52+
53+
steps:
54+
- uses: actions/checkout@v3
55+
- uses: actions/setup-python@v3
56+
57+
- name: Install Dependencies
58+
run: |
59+
brew install pkg-config tbb sdl2 minizip lz4 flac luajit [email protected] libpng gcc@12 ninja meson
4360
4461
- name: Build
45-
# You may pin to the exact commit or the version.
46-
# uses: BSFishy/meson-build@6f1930d878fd3eed3853c1c91285ec604c37f3a5
47-
uses: BSFishy/[email protected]
4862
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.60.0
56-
ninja-version: 1.10.2
57-
action: build
63+
CC: "gcc-12"
64+
CXX: "g++-12"
65+
run: |
66+
meson setup --buildtype=debug -Ddebug_type=full build
67+
meson compile -C build
5868
5969
build-windows:
6070
env:
@@ -69,7 +79,7 @@ jobs:
6979
runs-on: windows-latest
7080

7181
steps:
72-
- uses: actions/checkout@v2
82+
- uses: actions/checkout@v3
7383

7484
- name: Add MSBuild to PATH
7585
uses: microsoft/setup-msbuild@v1

‎.github/workflows/meson.yml

Lines changed: 39 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Linux Build
1+
name: Meson Build (Linux, macOS)
22
# Controls when the action will run.
33
on:
44
# Triggers the workflow on push or pull request events but only for the development branch
@@ -13,19 +13,20 @@ jobs:
1313
# This workflow contains a single job called "build"
1414
build-release-linux:
1515
# The type of runner that the job will run on
16-
runs-on: ubuntu-20.04
16+
runs-on: ubuntu-latest
1717

1818

1919
# Steps represent a sequence of tasks that will be executed as part of the job
2020
steps:
2121
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
22-
- uses: actions/checkout@v2
23-
- uses: actions/setup-python@v2
22+
- uses: actions/checkout@v3
23+
- uses: actions/setup-python@v3
2424

2525
- name: Install Dependencies
2626
run: |
2727
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
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 libtbb-dev libsdl2-dev libopengl-dev libfuse2 ninja-build
29+
sudo pip install meson==0.60.0
2930
3031
- name: Install Clang
3132
# You may pin to the exact commit or the version.
@@ -35,26 +36,13 @@ jobs:
3536
# Set up cc/c++ executables
3637
cc: 1 # optional, default is 1
3738

38-
- name: Setup ccache
39-
uses: hendrikmuhs/ccache-action@v1
40-
with:
41-
key: build-release-${{runner.os}}
42-
max-size: 5G
43-
4439
- name: Build
45-
# You may pin to the exact commit or the version.
46-
# uses: BSFishy/meson-build@6f1930d878fd3eed3853c1c91285ec604c37f3a5
47-
uses: BSFishy/[email protected]
4840
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.60.0
56-
ninja-version: 1.10.2
57-
action: build
41+
CC: "gcc"
42+
CXX: "g++"
43+
run: |
44+
meson setup --buildtype=release -Dinstall_data=false -Dinstall_runner=false -Dfmod_dir=/usr/lib/ --prefix=/usr/ build
45+
meson compile -C build
5846
5947
- name: Create AppDir
6048
run: |
@@ -77,7 +65,33 @@ jobs:
7765
./lindeploy --appdir=build/AppDir --output appimage
7866
7967
- name: Upload Appimage
80-
uses: actions/upload-artifact@v2
68+
uses: actions/upload-artifact@v3
8169
with:
82-
name: CortexCommand.AppImage
70+
name: CortexCommand (Linux)
8371
path: CortexCommand.AppImage
72+
73+
build-release-macos:
74+
runs-on: macos-latest
75+
76+
steps:
77+
- uses: actions/checkout@v3
78+
- uses: actions/setup-python@v3
79+
80+
- name: Install Dependencies
81+
run: |
82+
brew install pkg-config tbb sdl2 minizip lz4 flac luajit [email protected] libpng gcc ninja meson
83+
84+
- name: Build
85+
env:
86+
CC: "gcc-12"
87+
CXX: "g++-12"
88+
LDFLAGS: "-static-libgcc -static-libstdc++"
89+
run: |
90+
meson setup --buildtype=release -Ddebug_type=release build
91+
meson compile -C build
92+
93+
- name: Artifact Deploy
94+
uses: actions/upload-artifact@v3
95+
with:
96+
name: CortexCommand (macOS)
97+
path: build/CortexCommand

‎.github/workflows/msbuild.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
runs-on: windows-latest
2323

2424
steps:
25-
- uses: actions/checkout@v2
25+
- uses: actions/checkout@v3
2626

2727
- name: Add MSBuild to PATH
2828
uses: microsoft/setup-msbuild@v1
@@ -34,7 +34,7 @@ jobs:
3434
run: msbuild /m /p:Configuration="${{env.BUILD_CONFIGURATION}}" ${{env.SOLUTION_FILE_PATH}}
3535

3636
- name: Upload Artifact2
37-
uses: actions/upload-artifact@v2.2.2
37+
uses: actions/upload-artifact@v3
3838
with:
3939
name: Cortex Command.exe
4040
path: D:/a/Cortex-Command-Community-Project-Source/Cortex-Command-Community-Project-Data/Cortex Command x64.exe

‎.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,6 @@ compile_commands.json
2020
/NATPunchServer/Server/NATCompleteServer/Release
2121
/Documentation/Doxygen/Output
2222
MemCleanupInfo.txt
23+
RTEA.vcxproj.user
24+
.DS_Store
2325
.vscode

‎Activities/ActorEditor.cpp

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -28,20 +28,6 @@
2828
#include "Scene.h"
2929
#include "DataModule.h"
3030

31-
#include "GUI.h"
32-
#include "GUIFont.h"
33-
#include "AllegroScreen.h"
34-
#include "AllegroBitmap.h"
35-
#include "AllegroInput.h"
36-
#include "GUIControlManager.h"
37-
#include "GUICollectionBox.h"
38-
#include "GUITab.h"
39-
#include "GUIListBox.h"
40-
#include "GUITextBox.h"
41-
#include "GUIButton.h"
42-
#include "GUILabel.h"
43-
#include "GUIComboBox.h"
44-
4531
#include "ObjectPickerGUI.h"
4632

4733
namespace RTE {

0 commit comments

Comments
 (0)