Skip to content

Commit 36c8fa6

Browse files
committed
Updated readme and meson info to the best of my limited understanding:
* GCC 12 wasn't compiling for me anymore. I had to update to 13- unsure if this is MacOSX specific, but updating * We use SDL3 now, not SDL2. * SDL2_Image is gone * Upped meson version to 1.6 SDL3 seems to require it, and tracy at least requires 1.3. In any case I had to update past 1.0.0 (which I had) to build. * Updated version number in meson to be representative of the actual project now (not pre 4.1!)
1 parent 30c25d5 commit 36c8fa6

File tree

2 files changed

+7
-14
lines changed

2 files changed

+7
-14
lines changed

README.md

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,7 @@ You may also want to check out the list of recommended Visual Studio plugins [he
3838

3939
2. Clone this Repository into a folder.
4040

41-
3. Copy the following libraries from `Cortex-Command-Community-Project\external\lib\win` into the root directory:
42-
* `fmod.dll`
43-
* `SDL2.dll`
44-
45-
For 32-bit builds, copy the following libraries from the `x86` folder inside `...\lib\win` as well:
46-
* `fmodL.dll`
47-
* `SDL2-32.dll`
41+
3. Copy the `fmod.dll` library from `Cortex-Command-Community-Project\external\lib\win` into the root directory.
4842

4943
Now you're ready to build and launch the game.
5044
Simply open `RTEA.sln` with Visual Studio, choose your target platform (x86 or x64) and configuration, and run the project.
@@ -75,10 +69,10 @@ The Linux build uses the meson build system, and builds against system libraries
7569

7670
## Dependencies
7771

78-
* [`meson`](https://www.mesonbuild.com)`>= 1.0.0` (`pip install meson` if your distro doesn't include a recent version)
72+
* [`meson`](https://www.mesonbuild.com)`>= 1.6.0` (`pip install meson`/`brew install meson` if your distro doesn't include a recent version)
7973
* `ninja`
80-
* `gcc`, `g++` (>=12, clang unsupported)
81-
* `sdl2`
74+
* `gcc`, `g++` (>=13, clang unsupported)
75+
* `sdl3`
8276
* `opengl` (usually provided by the gpu driver)
8377
* `flac`
8478
* `luajit`
@@ -88,7 +82,6 @@ The Linux build uses the meson build system, and builds against system libraries
8882
* `lz4>=1.9.0`
8983
* `libpng`
9084
* `dylibbundler` (required only if installing on macOS)
91-
* `SDL2_image` (linux only)
9285

9386
For unspecified versions assume compatibility with the latest ubuntu LTS release.
9487

@@ -123,10 +116,10 @@ If you want to change the buildtype afterwards, you can use `meson configure --b
123116
- `Xcode` or `Command Line Tools for Xcode` (if you need to, you can also generate an xcode project from meson using the `--backend=xcode` option on setup)
124117

125118
**Homebrew (macOS):**
126-
`brew install pkg-config sdl2 minizip lz4 flac luajit lua libpng tbb gcc@13 ninja meson dylibbundler`
119+
`brew install pkg-config sdl3 minizip lz4 flac luajit lua libpng tbb gcc@13 ninja meson dylibbundler`
127120

128121
**Arch Linux:**
129-
`sudo pacman -S sdl2 sdl2_image tbb flac luajit lua minizip lz4 libpng meson ninja base-devel`
122+
`sudo pacman -S sdl3 tbb flac luajit lua minizip lz4 libpng meson ninja base-devel`
130123

131124
**Ubuntu >=22.04:**
132125
`sudo apt-get install build-essential libsdl2-dev libsdl2-image-dev libloadpng4-dev libflac++-dev luajit-5.1-dev liblua5.1-dev libminizip-dev liblz4-dev libpng++-dev libtbb-dev ninja-build python3-pip`

meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
project('Cortex-Command-Community-Project', ['cpp','c'], subproject_dir: 'external/sources', default_options:['cpp_std=c++20', 'buildtype=release', 'default_library=static'], version:'0.1.0-Pre-4.1', meson_version:'>=1.0.0')
1+
project('Cortex-Command-Community-Project', ['cpp','c'], subproject_dir: 'external/sources', default_options:['cpp_std=c++20', 'buildtype=release', 'default_library=static'], version:'7.0.0-dev', meson_version:'>=1.6.0')
22

33
#### Build environment Setup ####
44

0 commit comments

Comments
 (0)