This repository has been archived by the owner on Feb 1, 2024. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 34
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Version 3.3.0 of the Godot Quest plugin - Upgrade to version 33.0 of the Oculus mobile SDK - Upgrade to version 3.4.0 of the Godot Android library - Misc bug fixes and features add
- Loading branch information
Fredia Huya-Kouadio
authored
Nov 5, 2021
1 parent
7205e2c
commit eadb1ff
Showing
29 changed files
with
648 additions
and
279 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,12 @@ | ||
| ext.versions = [ | ||
| gradlePluginVersion: '4.1.0', | ||
| gradlePluginVersion: '4.2.1', | ||
| compileSdk : 30, | ||
| minSdk : 18, | ||
| minSdk : 19, | ||
| targetSdk : 30, | ||
| buildTools : '30.0.1', | ||
| kotlinVersion : '1.4.31', | ||
| ndkVersion : "21.3.6528147" | ||
| buildTools : '30.0.3', | ||
| kotlinVersion : '1.5.20', | ||
| ndkVersion : "21.4.7075529", | ||
| javaVersion : JavaVersion.VERSION_1_8, | ||
| libVersionCode : 30300, | ||
| libVersionName : '3.3.0' | ||
| ] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| #Wed Sep 23 18:33:41 PDT 2020 | ||
| #Wed Jun 23 23:40:19 PDT 2021 | ||
| distributionBase=GRADLE_USER_HOME | ||
| distributionPath=wrapper/dists | ||
| zipStoreBase=GRADLE_USER_HOME | ||
| zipStorePath=wrapper/dists | ||
| distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip | ||
| distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,171 +1,5 @@ | ||
| cmake_minimum_required(VERSION 3.6) | ||
|
|
||
| # Default android abi is arm64-v8a | ||
| if (NOT ANDROID_ABI) | ||
| set(ANDROID_ABI "arm64-v8a") | ||
| endif (NOT ANDROID_ABI) | ||
|
|
||
| # Default android platform is android-24 | ||
| if (NOT ANDROID_PLATFORM) | ||
| set(ANDROID_PLATFORM "android-24") | ||
| endif (NOT ANDROID_PLATFORM) | ||
|
|
||
| # Default build type is Debug | ||
| if (NOT CMAKE_BUILD_TYPE) | ||
| set(CMAKE_BUILD_TYPE Debug) | ||
| endif (NOT CMAKE_BUILD_TYPE) | ||
|
|
||
| if (CMAKE_BUILD_TYPE MATCHES Debug) | ||
| add_definitions(-D_DEBUG) | ||
| set(VRAPI_LIB_BUILD_TYPE Debug) | ||
| else () | ||
| add_definitions(-DNDEBUG) | ||
| set(VRAPI_LIB_BUILD_TYPE Release) | ||
| endif (CMAKE_BUILD_TYPE MATCHES Debug) | ||
|
|
||
| if (NOT (ANDROID_STL STREQUAL "c++_shared")) | ||
| set(ANDROID_STL "c++_shared") | ||
| endif (NOT (ANDROID_STL STREQUAL "c++_shared")) | ||
|
|
||
| # Check if ANDROID_NDK is set. | ||
| if (NOT ANDROID_NDK) | ||
| # Set to ANDROID_NDK_HOME environment variable if it's set. | ||
| if (DEFINED ENV{ANDROID_NDK_HOME}) | ||
| set(ANDROID_NDK $ENV{ANDROID_NDK_HOME}) | ||
| else (DEFINED ENV{ANDROID_NDK_HOME}) | ||
| message(WARNING "ANDROID_NDK_HOME is not set") | ||
| endif (DEFINED ENV{ANDROID_NDK_HOME}) | ||
| endif (NOT ANDROID_NDK) | ||
|
|
||
| # Check if CMAKE_TOOLCHAIN_FILE is set. | ||
| if (NOT CMAKE_TOOLCHAIN_FILE) | ||
| set(CMAKE_TOOLCHAIN_FILE "${ANDROID_NDK}/build/cmake/android.toolchain.cmake") | ||
| endif (NOT CMAKE_TOOLCHAIN_FILE) | ||
|
|
||
| set(CMAKE_CXX_STANDARD 14) | ||
| set(CMAKE_CXX_STANDARD_REQUIRED ON) | ||
| set(CMAKE_CXX_EXTENSIONS OFF) | ||
|
|
||
| project(godot_ovrmobile VERSION 2.0.0) | ||
|
|
||
| ############################################################################### | ||
| ## PROJECT SETUP | ||
| ## The variables below should be updated based on the setup instructions | ||
| ## in the project README. | ||
|
|
||
| # Sets the path to the VrApi containing directory. Update this variable if the api is in another location. | ||
| set(OVR_ROOT_DIR "${CMAKE_SOURCE_DIR}/libs/ovr_sdk_mobile") | ||
|
|
||
| # Location to the Godot headers directory. | ||
| set(GODOT_CPP_DIR "${CMAKE_SOURCE_DIR}/libs/godot-cpp") | ||
| set(GODOT_HEADERS_DIR "${GODOT_CPP_DIR}/godot_headers") | ||
| ############################################################################### | ||
|
|
||
| set(OVR_HEADERS_DIR "${OVR_ROOT_DIR}/VrApi/Include" CACHE STRING "") | ||
|
|
||
| set(GODOT_COMPILE_FLAGS) | ||
| set(GODOT_LINKER_FLAGS) | ||
|
|
||
| set(GODOT_LINKER_FLAGS "-Wl") | ||
|
|
||
| set(GODOT_COMPILE_FLAGS "-fPIC -g -Wwrite-strings") | ||
| set(GODOT_COMPILE_FLAGS "${GODOT_COMPILE_FLAGS} -Wchar-subscripts -Wcomment -Wdisabled-optimization") | ||
| set(GODOT_COMPILE_FLAGS "${GODOT_COMPILE_FLAGS} -Wformat -Wformat=2 -Wformat-security -Wformat-y2k") | ||
| set(GODOT_COMPILE_FLAGS "${GODOT_COMPILE_FLAGS} -Wimport -Winit-self -Winline -Winvalid-pch") | ||
| set(GODOT_COMPILE_FLAGS "${GODOT_COMPILE_FLAGS} -Wlong-long -Wmissing-braces -Wmissing-format-attribute") | ||
| set(GODOT_COMPILE_FLAGS "${GODOT_COMPILE_FLAGS} -Wmissing-include-dirs -Wmissing-noreturn -Wpacked -Wpointer-arith") | ||
| set(GODOT_COMPILE_FLAGS "${GODOT_COMPILE_FLAGS} -Wredundant-decls -Wreturn-type -Wsequence-point") | ||
| set(GODOT_COMPILE_FLAGS "${GODOT_COMPILE_FLAGS} -Wswitch -Wswitch-enum -Wtrigraphs") | ||
| set(GODOT_COMPILE_FLAGS "${GODOT_COMPILE_FLAGS} -Wuninitialized -Wunknown-pragmas -Wunreachable-code -Wunused-label") | ||
| set(GODOT_COMPILE_FLAGS "${GODOT_COMPILE_FLAGS} -Wunused-value -Wvariadic-macros -Wvolatile-register-var -Wno-error=attributes") | ||
|
|
||
| if (NOT CMAKE_SYSTEM_NAME STREQUAL "Android") | ||
| set(GODOT_COMPILE_FLAGS "${GODOT_COMPILE_FLAGS} -Wno-ignored-attributes") | ||
| if (FLAVOR STREQUAL "FULL") | ||
| add_subdirectory(${CMAKE_SOURCE_DIR}/src/main/cpp) | ||
| endif () | ||
|
|
||
| if (CMAKE_BUILD_TYPE MATCHES Debug) | ||
| set(GODOT_COMPILE_FLAGS "${GODOT_COMPILE_FLAGS} -fno-omit-frame-pointer -O0") | ||
| else () | ||
| set(GODOT_COMPILE_FLAGS "${GODOT_COMPILE_FLAGS} -O3") | ||
| endif (CMAKE_BUILD_TYPE MATCHES Debug) | ||
|
|
||
| ## OVR library | ||
| set(VRAPI_LIB_PATH "${OVR_ROOT_DIR}/VrApi/Libs/Android/${ANDROID_ABI}/${VRAPI_LIB_BUILD_TYPE}/libvrapi.so") | ||
| add_library(vrapi SHARED IMPORTED GLOBAL) | ||
| set_target_properties(vrapi PROPERTIES IMPORTED_LOCATION ${VRAPI_LIB_PATH}) | ||
|
|
||
| ## godot-cpp library | ||
| set(GODOT-CPP "godot-cpp") | ||
|
|
||
| file(GLOB_RECURSE GODOT_CPP_SOURCES ${GODOT_CPP_DIR}/src/*.c**) | ||
| file(GLOB_RECURSE GODOT_CPP_HEADERS ${GODOT_CPP_DIR}/include/*.h**) | ||
|
|
||
| add_library(${GODOT-CPP} | ||
| STATIC | ||
| ${GODOT_CPP_SOURCES} ${GODOT_CPP_HEADERS}) | ||
|
|
||
| target_include_directories(${GODOT-CPP} | ||
| PUBLIC | ||
| ${GODOT_CPP_DIR}/include | ||
| ${GODOT_CPP_DIR}/include/core | ||
| ${GODOT_CPP_DIR}/include/gen | ||
| ) | ||
|
|
||
| # Put godot headers as SYSTEM PUBLIC to exclude warnings from irrelevant headers | ||
| target_include_directories(${GODOT-CPP} | ||
| SYSTEM PUBLIC | ||
| ${GODOT_HEADERS_DIR} | ||
| ) | ||
|
|
||
| # Add the compile flags | ||
| set_property(TARGET ${GODOT-CPP} APPEND_STRING PROPERTY COMPILE_FLAGS ${GODOT_COMPILE_FLAGS}) | ||
| set_property(TARGET ${GODOT-CPP} APPEND_STRING PROPERTY LINK_FLAGS ${GODOT_LINKER_FLAGS}) | ||
|
|
||
| ## Setup the plugin library | ||
| # Get Sources | ||
| file(GLOB_RECURSE SOURCES src/main/cpp/*.c**) | ||
| file(GLOB_RECURSE HEADERS src/main/cpp/*.h**) | ||
|
|
||
| add_library(${PROJECT_NAME} | ||
| SHARED | ||
| ${SOURCES} ${HEADERS} VRAPI_SO_LIB) | ||
|
|
||
| target_include_directories(${PROJECT_NAME} | ||
| PRIVATE | ||
| src/main/cpp | ||
| ${GODOT_CPP_DIR}/src | ||
| ${GODOT_CPP_DIR}/src/core | ||
| ${GODOT_CPP_DIR}/src/gen | ||
| ${GODOT_CPP_DIR}/include | ||
| ${GODOT_CPP_DIR}/include/core | ||
| ${GODOT_CPP_DIR}/include/gen | ||
| ) | ||
|
|
||
| # Put godot headers as SYSTEM PUBLIC to exclude warnings from irrelevant headers | ||
| target_include_directories(${PROJECT_NAME} | ||
| SYSTEM PUBLIC | ||
| ${GODOT_HEADERS_DIR} | ||
| ${OVR_HEADERS_DIR} | ||
| ) | ||
|
|
||
| target_link_libraries(${PROJECT_NAME} | ||
| android | ||
| log | ||
| EGL | ||
| GLESv3 | ||
| vrapi | ||
| ${GODOT-CPP}) | ||
|
|
||
| # Add the compile flags | ||
| set_property(TARGET ${PROJECT_NAME} APPEND_STRING PROPERTY COMPILE_FLAGS ${GODOT_COMPILE_FLAGS}) | ||
| set_property(TARGET ${PROJECT_NAME} APPEND_STRING PROPERTY LINK_FLAGS ${GODOT_LINKER_FLAGS}) | ||
|
|
||
| # Copy the VrApi shared library to the output directory. | ||
| add_custom_command(OUTPUT VRAPI_SO_LIB | ||
| COMMAND ${CMAKE_COMMAND} -E make_directory $<TARGET_FILE_DIR:${PROJECT_NAME}> | ||
| COMMAND ${CMAKE_COMMAND} -E copy_if_different ${VRAPI_LIB_PATH} $<TARGET_FILE_DIR:${PROJECT_NAME}>) | ||
|
|
||
| set(BITS 32) | ||
| if (CMAKE_SIZEOF_VOID_P EQUAL 8) | ||
| set(BITS 64) | ||
| endif (CMAKE_SIZEOF_VOID_P EQUAL 8) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Submodule godot-cpp
updated
from 9ccbb8 to 836676
Binary file renamed
BIN
+37.7 MB
plugin/libs/godot-lib.3.3.stable.release.aar → plugin/libs/godot-lib.3.4.stable.release.aar
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.