omar/panopainter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove Android nanort overlay

Browse Source
This commit is contained in:
omigamedev
2026-06-12 20:23:23 +02:00
parent 876d19f481
commit 648404eec6
8 changed files with 49 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
android/android/CMakeLists.txt
View File

@@ -6,7 +6,8 @@ cmake_minimum_required(VERSION 3.10)
project(PanoPainterAndroidNative LANGUAGES C CXX)
include(../cmake/PanoPainterAndroidLegacyCompat.cmake)
include(../cmake/PanoPainterAndroidVendorPatches.cmake)
pp_apply_android_nanort_patch()
link_directories(
../../libs/curl-android-ios/android/${ANDROID_ABI}
@@ -80,8 +81,10 @@ set(PP_MODERN_COMPONENT_SOURCES
../../src/legacy_document_session_services.cpp
../../src/legacy_grid_ui_services.cpp
../../src/legacy_history_services.cpp
../../src/legacy_preference_storage.cpp
../../src/legacy_quick_ui_services.cpp
../../src/legacy_recording_services.cpp
../../src/legacy_ui_overlay_services.cpp
)
add_library(
@@ -189,7 +192,6 @@ add_library(
target_compile_features(native-lib PRIVATE cxx_std_23)
set_target_properties(native-lib PROPERTIES CXX_EXTENSIONS OFF)
pp_configure_legacy_nanort_overlay(native-lib)
target_include_directories(native-lib PRIVATE
src/main/cpp

19
android/cmake/PanoPainterAndroidLegacyCompat.cmake
View File

@@ -1,19 +0,0 @@
set(PP_ANDROID_LEGACY_COMPAT_DIR "${CMAKE_CURRENT_LIST_DIR}")
function(pp_configure_legacy_nanort_overlay target_name)
set(nanort_source "${PP_ANDROID_LEGACY_COMPAT_DIR}/../../libs/nanort/nanort.h")
set(nanort_overlay_dir "${CMAKE_CURRENT_BINARY_DIR}/generated/nanort_compat")
set(nanort_overlay_header "${nanort_overlay_dir}/nanort.h")
file(READ "${nanort_source}" nanort_header)
string(REPLACE
" const size_t vertex_stride_bytes_;"
" size_t vertex_stride_bytes_;"
nanort_header
"${nanort_header}")
file(MAKE_DIRECTORY "${nanort_overlay_dir}")
file(WRITE "${nanort_overlay_header}" "${nanort_header}")
target_include_directories(${target_name} BEFORE PRIVATE "${nanort_overlay_dir}")
endfunction()

20
android/cmake/PanoPainterAndroidVendorPatches.cmake Normal file
View File

@@ -0,0 +1,20 @@
set(PP_ANDROID_VENDOR_PATCH_DIR "${CMAKE_CURRENT_LIST_DIR}")
function(pp_apply_android_nanort_patch)
set(nanort_header "${PP_ANDROID_VENDOR_PATCH_DIR}/../../libs/nanort/nanort.h")
file(READ "${nanort_header}" nanort_contents)
set(nanort_before " const size_t vertex_stride_bytes_;")
set(nanort_after " size_t vertex_stride_bytes_;")
if(nanort_contents MATCHES "${nanort_before}")
string(REPLACE
"${nanort_before}"
"${nanort_after}"
nanort_contents
"${nanort_contents}")
file(WRITE "${nanort_header}" "${nanort_contents}")
elseif(NOT nanort_contents MATCHES "${nanort_after}")
message(FATAL_ERROR "Unexpected nanort.h layout; Android nanort patch could not be applied")
endif()
endfunction()

6
android/focus/CMakeLists.txt
View File

@@ -6,7 +6,8 @@ cmake_minimum_required(VERSION 3.10)
project(PanoPainterFocusNative LANGUAGES C CXX)
include(../cmake/PanoPainterAndroidLegacyCompat.cmake)
include(../cmake/PanoPainterAndroidVendorPatches.cmake)
pp_apply_android_nanort_patch()
# build native_app_glue as a static lib
add_library(
@@ -74,8 +75,10 @@ set(PP_MODERN_COMPONENT_SOURCES
../../src/legacy_document_session_services.cpp
../../src/legacy_grid_ui_services.cpp
../../src/legacy_history_services.cpp
../../src/legacy_preference_storage.cpp
../../src/legacy_quick_ui_services.cpp
../../src/legacy_recording_services.cpp
../../src/legacy_ui_overlay_services.cpp
)
# Specifies a library name, specifies whether the library is STATIC or
@@ -183,7 +186,6 @@ add_library(
target_compile_features(native-lib PRIVATE cxx_std_23)
set_target_properties(native-lib PROPERTIES CXX_EXTENSIONS OFF)
pp_configure_legacy_nanort_overlay(native-lib)
target_include_directories(native-lib PRIVATE
../../libs/wave_sdk/wvr_client/include

6
android/quest/CMakeLists.txt
View File

@@ -6,7 +6,8 @@ cmake_minimum_required(VERSION 3.10)
project(PanoPainterQuestNative LANGUAGES C CXX)
include(../cmake/PanoPainterAndroidLegacyCompat.cmake)
include(../cmake/PanoPainterAndroidVendorPatches.cmake)
pp_apply_android_nanort_patch()
# build native_app_glue as a static lib
add_library(
@@ -82,8 +83,10 @@ set(PP_MODERN_COMPONENT_SOURCES
../../src/legacy_document_session_services.cpp
../../src/legacy_grid_ui_services.cpp
../../src/legacy_history_services.cpp
../../src/legacy_preference_storage.cpp
../../src/legacy_quick_ui_services.cpp
../../src/legacy_recording_services.cpp
../../src/legacy_ui_overlay_services.cpp
)
# Specifies a library name, specifies whether the library is STATIC or
@@ -191,7 +194,6 @@ add_library(
target_compile_features(native-lib PRIVATE cxx_std_23)
set_target_properties(native-lib PROPERTIES CXX_EXTENSIONS OFF)
pp_configure_legacy_nanort_overlay(native-lib)
target_include_directories(native-lib PRIVATE
../../libs/ovr_mobile/include