Skip to content
This repository was archived by the owner on May 30, 2022. It is now read-only.

Commit 239608a

Browse files
committed
Update Godot headers and toolchains.
1 parent 4697f81 commit 239608a

11 files changed

+138
-6
lines changed

.gitignore

-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,5 @@ _build/*
55
*.dylib
66
*.dll
77
*.a
8-
*.toolchain
98
_*/**
109
export_presets.cfg

.gitmodules

-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +0,0 @@
1-
[submodule "godot_headers"]
2-
path = godot_headers
3-
url = https://github.com/GodotNativeTools/godot_headers

.toolchains/linux.arm64.toolchain

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
[binaries]
2+
c = 'aarch64-linux-gnu-gcc'
3+
cpp = 'aarch64-linux-gnu-g++'
4+
ar = 'aarch64-linux-gnu-ar'
5+
strip = 'aarch64-linux-gnu-strip'
6+
pkgconfig = 'aarch64-linux-gnu-pkg-config'
7+
8+
[host_machine]
9+
system = 'linux'
10+
cpu_family = 'aarch64'
11+
cpu = 'aarch64'
12+
endian = 'little'
13+
14+
[built-in options]
15+
c_args = ['-march=armv8-a', '-fPIC']
16+
cpp_args = ['-march=armv8-a', '-fPIC']
17+
c_link_args = ['-march=armv8-a']
18+
cpp_link_args = ['-march=armv8-a']

.toolchains/linux.armv7.toolchain

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
[binaries]
2+
c = 'arm-linux-gnueabihf-gcc'
3+
cpp = 'arm-linux-gnueabihf-g++'
4+
ar = 'arm-linux-gnueabihf-ar'
5+
strip = 'arm-linux-gnueabihf-strip'
6+
pkgconfig = 'arm-linux-gnueabihf-pkg-config'
7+
8+
[host_machine]
9+
system = 'linux'
10+
cpu_family = 'arm'
11+
cpu = 'armv7'
12+
endian = 'little'
13+
14+
[built-in options]
15+
c_args = ['-march=armv7', '-fPIC']
16+
cpp_args = ['-march=armv7', '-fPIC']
17+
c_link_args = ['-march=armv7']
18+
cpp_link_args = ['-march=armv7']

.toolchains/linux.x86.toolchain

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
[binaries]
2+
c = 'i686-linux-gnu-gcc'
3+
cpp = 'i686-linux-gnu-g++'
4+
ar = 'i686-linux-gnu-ar'
5+
strip = 'i686-linux-gnu-strip'
6+
pkgconfig = 'i686-linux-gnu-pkg-config'
7+
8+
[host_machine]
9+
system = 'linux'
10+
cpu_family = 'x86'
11+
cpu = 'i686'
12+
endian = 'little'
13+
14+
[built-in options]
15+
c_args = ['-march=i686', '-fPIC']
16+
cpp_args = ['-march=i686', '-fPIC']
17+
c_link_args = ['-march=i686']
18+
cpp_link_args = ['-march=i686']

.toolchains/linux.x86_64.toolchain

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
[binaries]
2+
c = 'x86_64-linux-gnu-gcc'
3+
cpp = 'x86_64-linux-gnu-g++'
4+
ar = 'x86_64-linux-gnu-ar'
5+
strip = 'x86_64-linux-gnu-strip'
6+
pkgconfig = 'x86_64-linux-gnu-pkg-config'
7+
8+
[host_machine]
9+
system = 'linux'
10+
cpu_family = 'x86_64'
11+
cpu = 'x86_64'
12+
endian = 'little'
13+
14+
[built-in options]
15+
c_args = ['-march=x86-64', '-fPIC']
16+
cpp_args = ['-march=x86-64', '-fPIC']
17+
c_link_args = ['-march=x86-64']
18+
cpp_link_args = ['-march=x86-64']

.toolchains/macos.arm64.toolchain

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
[binaries]
2+
c = 'clang'
3+
cpp = 'clang++'
4+
objcpp = 'clang++'
5+
ar = 'ar'
6+
strip = 'strip'
7+
pkgconfig = 'pkg-config'
8+
9+
[host_machine]
10+
system = 'darwin'
11+
cpu_family = 'aarch64'
12+
cpu = 'aarch64'
13+
endian = 'little'
14+
15+
[built-in options]
16+
c_args = ['-arch', 'arm64']
17+
cpp_args = ['-arch', 'arm64']
18+
objcpp_args = ['-arch', 'arm64']
19+
c_link_args = ['-arch', 'arm64']
20+
cpp_link_args = ['-arch', 'arm64']
21+
objcpp_link_args = ['-arch', 'arm64']

.toolchains/macos.x86_64.toolchain

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
[binaries]
2+
c = 'clang'
3+
cpp = 'clang++'
4+
objcpp = 'clang++'
5+
ar = 'ar'
6+
strip = 'strip'
7+
pkgconfig = 'pkg-config'
8+
9+
[host_machine]
10+
system = 'darwin'
11+
cpu_family = 'x86_64'
12+
cpu = 'x86_64'
13+
endian = 'little'
14+
15+
[built-in options]
16+
c_args = ['-arch', 'x86_64']
17+
cpp_args = ['-arch', 'x86_64']
18+
objcpp_args = ['-arch', 'x86_64']
19+
c_link_args = ['-arch', 'x86_64']
20+
cpp_link_args = ['-arch', 'x86_64']
21+
objcpp_link_args = ['-arch', 'x86_64']

build_commands

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
meson ./_macos_arm64 --buildtype=release --cross-file ./.toolchains/macos.arm64.toolchain
2+
ninja -C ./_macos_arm64
3+
4+
meson ./_macos_x86_64 --buildtype=release --cross-file ./.toolchains/macos.x86_64.toolchain
5+
ninja -C ./_macos_x86_64
6+
7+
meson ./_windows_x86_64 --buildtype=release --cross-file ./.toolchains/mingw.x86_64.toolchain
8+
ninja -C ./_windows_x86_64
9+
10+
meson ./_windows_x86 --buildtype=release --cross-file ./.toolchains/mingw.x86.toolchain
11+
ninja -C ./_windows_x86
12+
13+
meson ./_linux_arm64 --buildtype=release --cross-file ./.toolchains/linux.arm64.toolchain
14+
ninja -C ./_linux_arm64
15+
16+
meson ./_linux_armv7 --buildtype=release --cross-file ./.toolchains/linux.armv7.toolchain
17+
ninja -C ./_linux_armv7
18+
19+
meson ./_linux_x86 --buildtype=release --cross-file ./.toolchains/linux.x86.toolchain
20+
ninja -C ./_linux_x86
21+
22+
meson ./_linux_x86_64 --buildtype=release --cross-file ./.toolchains/linux.x86_64.toolchain
23+
ninja -C ./_linux_x86_64

godot_headers

-1
This file was deleted.

meson.build

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ project(
33
'cpp',
44
meson_version : '>= 0.45'
55
)
6-
library_version = '0.1.0'
6+
library_version = '0.2.0'
77

88
prefix = ''
99
cpp_args = []

0 commit comments

Comments
 (0)