Skip to content

Commit b3ed33a

Browse files
committed
Bump CMake min version for IBIze and clean up build files
Bump the CMake minimum version for IBIze to make it generate Makefiles without errors or warnings about unsupported or deprecated CMake versions. Delete the top-level CMake file, as IBIze is the only CMake project in OpenJK-Tools. Add the project definition in the ibize subdirectory and adjust the README accordingly.
1 parent 8875bb4 commit b3ed33a

File tree

3 files changed

+16
-15
lines changed

3 files changed

+16
-15
lines changed

CMakeLists.txt

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

README.md

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,34 +6,36 @@ the GNU GPLv2 license.
66

77
## Building the code
88

9-
The OpenJK tools use CMake to generate the project files or makefiles for the
10-
source code. The project files or makefiles can then be used to compile the
11-
source code.
9+
IBIze is being built using CMake and generated Makefiles. This works on all
10+
platforms, including Windows, Linux and MacOS.
11+
12+
ModView and Assimilate are Visual Studio projects and as such only work on
13+
Windows.
1214

1315

1416
### Windows
1517

1618
Generate the project files either by following the Linux and macOS instructions
17-
or by using the CMake GUI. For the CMake GUI, the source directory should be
18-
the root of the repository. The build directory is a directory of your choice
19-
where the project files will be generated.
19+
or by using the CMake GUI. For the CMake GUI, the source directory should be the
20+
`ibize` directory in this repository. The build directory is a directory of your
21+
choice where the project files will be generated, e.g. `ibize/build/`.
2022

2123
Load the generated project file (likely to be a Visual Studio project), and
2224
then build in the IDE.
2325

2426

2527
### Linux and macOS
2628

27-
Generate the makefiles by running:
29+
Generate the makefiles (for IBIze only) by running:
2830
```bash
31+
cd ibize
2932
mkdir build
3033
cd build
3134
cmake ..
3235
```
3336

34-
Compile the code:
37+
Compile the code, while being in `ibize/build/`:
3538
```bash
36-
cd build
3739
make
3840
```
3941

ibize/CMakeLists.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
cmake_minimum_required(VERSION 3.1...3.31)
2+
project(IBIze)
3+
4+
set(CMAKE_CXX_STANDARD 11)
5+
16
add_executable(ibize
27
blockstream.cpp
38
ibize.cpp

0 commit comments

Comments
 (0)