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

Commit 2440737

Browse files
committed
remove cruft, fix BUILDING and README
!! NOTE !! I MESSED UP THIS COMMIT BY FORGETTING TO MAKE A NEW BRANCH AND FORGETTING TO PULL SO IT'S A RE-MERGE * feat: attempt to make a windows runner * fix: typo * fix: runners, separate linux/windows, change BUILDING a bit * feat: add sccache to windows build * chore: rip out buildsystem for now, add ccache for windows * fix: make win runner actually use ccache * fix: install ninja (doesn't come preinstalled somehow) * fix: use action for ninja instead of vcpkg * fix: linux action, weird linker error * fix: another attempt at fixing the linux runner * fix: linux builds, output paths * fix: github action paths * remove cruft, fix BUILDING and README
1 parent 704d524 commit 2440737

8 files changed

Lines changed: 13 additions & 336 deletions

File tree

AdastralCMakeConfig.cmake

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

BUILDING.md

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,18 @@
1-
Building ~~should be relatively straightforward~~ is a somewhat arcane process. As of now, there's nothing currently hooking into the GDExtension
2-
bindings that'd work, so building is just an exercise in filesize and checking nothing's exploded.
1+
## Note:
2+
We have CI set up for Winter, so you should be able to download the latest libraries without needing to build.
33

4-
Note that libcurl is required currently to build as well.
54

5+
## Building
6+
Building should be relatively straightforward, libcurl is needed as a dependency - all other deps are handled by cmake.
67

7-
# ON WINDOWS:
8+
However, do add the following cmake flags when configuring:
9+
10+
``-DGODOT=1 -DGODOT_GDEXTENSION_DIR="gdextension" -DGODOT_CPP_SYSTEM_HEADERS=ON``
811

9-
install libcurl from vcpkg (MAKE SURE THEY'RE X64)
12+
These enable the Godot bindings extension - set ``-DGODOT=0`` to build the headless module instead.
1013

11-
make a build folder, ninja probably works if you're 100% sure it's using c++20 but use vs otherwise
14+
# ON WINDOWS:
1215

13-
``cmake .. -DCMAKE_TOOLCHAIN_FILE=something-goes-here -DCMAKE_BUILD_TYPE=Debug``
16+
Note that only MSVC seems to work, though you can use MSBuild or Ninja. Also seemingly only Debug build types work.
1417

15-
build. it should... build if everything's gone to plan.
18+
Fish out the .dll and associated libraries (libcurl and zlib generally) and put them in the Belmont repository in bin/.

GenerateWin64vs2022.bat

Lines changed: 0 additions & 1 deletion
This file was deleted.

README.md

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,9 @@
22

33
## Adastral's C++ Component(s)
44

5-
This contains all of the C++ modules that Adastral uses, the L2->L3 Shim (Coldfield), The main L2 (Palace) and the L1 (Emley).
5+
This contains all of the C++ modules that Adastral uses, mainly the main L2 (Palace) and the L1 (Emley).
66

7-
# Building Adastral Manager
8-
9-
## Requirements
10-
11-
- Git CMD (https://git-scm.com/download)
12-
13-
- CMake (CMD/GUI) (https://cmake.org/download/)
14-
15-
- A IDE (Visual Studio, XCode, etc)
16-
17-
Coldfield relies on Godot 4.0 for gdextension. everything is automated through CMake, so configuring the project through CMake-GUI will handle grabbing dependency's, creating the solution, etc.
187

198
# License
209

21-
Winter is licensed under the GPL-v3 License. Please look at 'LICENSE' for more details.
10+
Winter is licensed under the GNU GPL-v3. Please look at 'LICENSE' for more details.

RunCMake.ps1

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

RunCMake.sh

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

test.toml

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

version.txt

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)