Skip to content

Commit e4ed489

Browse files
vnenBastiaanOlij
authored andcommitted
Replace bindgins to work with extensions
1 parent ee70866 commit e4ed489

Some content is hidden

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

88 files changed

+212915
-12822
lines changed

.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
# Godot auto generated files
2+
*.gen.*
3+
.import/
4+
/gen/
5+
16
# Misc
27
logs/*
38

CMakeLists.txt

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,36 @@
11
# cmake arguments
22
# CMAKE_BUILD_TYPE: Compilation target (Debug or Release defaults to Debug)
3-
#
3+
#
44
# godot-cpp cmake arguments
55
# GODOT_HEADERS_DIR: This is where the gdnative include folder is (godot_source/modules/gdnative/include)
66
# GODOT_CUSTOM_API_FILE: This is if you have another path for the godot_api.json
7-
#
7+
#
88
# Android cmake arguments
99
# CMAKE_TOOLCHAIN_FILE: The path to the android cmake toolchain ($ANDROID_NDK/build/cmake/android.toolchain.cmake)
1010
# ANDROID_NDK: The path to the android ndk root folder
1111
# ANDROID_TOOLCHAIN_NAME: The android toolchain (arm-linux-androideabi-4.9 or aarch64-linux-android-4.9 or x86-4.9 or x86_64-4.9)
1212
# ANDROID_PLATFORM: The android platform version (android-23)
1313
# More info here: https://godot.readthedocs.io/en/latest/development/compiling/compiling_for_android.html
14-
#
14+
#
1515
# Examples
16-
#
16+
#
1717
# Builds a debug version:
1818
# cmake .
1919
# cmake --build .
20-
#
20+
#
2121
# Builds a release version with clang
2222
# CC=/usr/bin/clang CXX=/usr/bin/clang++ cmake -DCMAKE_BUILD_TYPE=Release -G "Unix Makefiles" .
2323
# cmake --build .
24-
#
24+
#
2525
# Builds an android armeabi-v7a debug version:
2626
# cmake -DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK/build/cmake/android.toolchain.cmake -DANDROID_NDK=$ANDROID_NDK \
2727
# -DANDROID_TOOLCHAIN_NAME=arm-linux-androideabi-4.9 -DANDROID_PLATFORM=android-23 -DCMAKE_BUILD_TYPE=Debug .
2828
# cmake --build .
29-
#
29+
#
3030
# Protip
3131
# Generate the buildfiles in a sub directory to not clutter the root directory with build files:
3232
# mkdir build && cd build && cmake -G "Unix Makefiles" .. && cmake --build .
33-
#
33+
#
3434
# Todo
3535
# Test build for Windows, Mac and mingw.
3636

@@ -62,14 +62,14 @@ else()
6262
add_definitions(-DNDEBUG)
6363
endif(CMAKE_BUILD_TYPE MATCHES Debug)
6464

65-
# Set the c++ standard to c++14
66-
set(CMAKE_CXX_STANDARD 14)
65+
# Set the c++ standard to c++17
66+
set(CMAKE_CXX_STANDARD 17)
6767
set(CMAKE_CXX_STANDARD_REQUIRED ON)
6868
set(CMAKE_CXX_EXTENSIONS OFF)
6969

7070
# Input from user for godot headers and the api file
71-
set(GODOT_HEADERS_DIR "godot-headers" CACHE STRING "")
72-
set(GODOT_CUSTOM_API_FILE "godot-headers/api.json" CACHE STRING "")
71+
set(GODOT_HEADERS_DIR "godot-headers-temp" CACHE STRING "")
72+
set(GODOT_CUSTOM_API_FILE "godot-headers-temp/extension_api.json" CACHE STRING "")
7373

7474
set(GODOT_COMPILE_FLAGS )
7575
set(GODOT_LINKER_FLAGS )
@@ -178,8 +178,7 @@ add_library(${PROJECT_NAME}
178178
target_include_directories(${PROJECT_NAME}
179179
PUBLIC
180180
include
181-
include/core
182-
${CMAKE_CURRENT_BINARY_DIR}/include/gen/
181+
${CMAKE_CURRENT_BINARY_DIR}/gen/include
183182
)
184183

185184
# Put godot headers as SYSTEM PUBLIC to exclude warnings from irrelevant headers

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
GENERATE_BINDINGS = no
1+
GENERATE_BINDINGS = auto
22
HEADERS = godot-headers
33
TARGET = debug
44
USE_CLANG = no

0 commit comments

Comments
 (0)