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

Refresh retained Android package CMake

Browse Source
This commit is contained in:
omigamedev
2026-06-05 12:17:04 +02:00
parent e17463bf5a
commit ac4fef8346
13 changed files with 264 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
android/android/CMakeLists.txt
View File

@@ -2,7 +2,9 @@
# This ensures that a certain set of CMake features is available to
# your build.
cmake_minimum_required(VERSION 3.4.1)
cmake_minimum_required(VERSION 3.10)
include(../cmake/PanoPainterAndroidLegacyCompat.cmake)
link_directories(
../../libs/curl-android-ios/android/${ANDROID_ABI}
@@ -23,11 +25,66 @@ add_library(yuv SHARED IMPORTED)
set_target_properties(yuv PROPERTIES IMPORTED_LOCATION
${CMAKE_SOURCE_DIR}/../../libs/libyuv/lib/android/${ANDROID_ABI}/libyuv.so)
# now build app's shared lib
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
set(PP_MODERN_COMPONENT_SOURCES
../../src/app_core/document_export.cpp
../../src/app_core/document_route.cpp
../../src/app_core/document_session.cpp
../../src/assets/brush_package.cpp
../../src/assets/image_format.cpp
../../src/assets/image_metadata.cpp
../../src/assets/image_pixels.cpp
../../src/assets/ppi_header.cpp
../../src/assets/settings_document.cpp
../../src/document/document.cpp
../../src/document/ppi_export.cpp
../../src/document/ppi_import.cpp
../../src/foundation/binary_stream.cpp
../../src/foundation/event.cpp
../../src/foundation/log.cpp
../../src/foundation/parse.cpp
../../src/foundation/task_queue.cpp
../../src/foundation/trace.cpp
../../src/paint/blend.cpp
../../src/paint/brush.cpp
../../src/paint/stroke.cpp
../../src/paint/stroke_script.cpp
../../src/paint_renderer/compositor.cpp
../../src/platform_api/asset_file_load_policy.cpp
../../src/platform_api/network_tls_policy.cpp
../../src/platform_api/platform_policy.cpp
../../src/platform_api/platform_services.cpp
../../src/platform_legacy/legacy_platform_services.cpp
../../src/renderer_api/recording_renderer.cpp
../../src/renderer_api/renderer_api.cpp
../../src/renderer_api/shader_catalog.cpp
../../src/renderer_gl/command_plan.cpp
../../src/renderer_gl/opengl_capabilities.cpp
../../src/renderer_gl/shader_bindings.cpp
../../src/legacy_app_dialog_services.cpp
../../src/legacy_app_preference_services.cpp
../../src/legacy_app_shell_services.cpp
../../src/legacy_app_startup_services.cpp
../../src/legacy_brush_package_export_services.cpp
../../src/legacy_brush_package_import_services.cpp
../../src/legacy_brush_ui_services.cpp
../../src/legacy_canvas_tool_services.cpp
../../src/legacy_canvas_view_services.cpp
../../src/legacy_cloud_services.cpp
../../src/legacy_document_animation_services.cpp
../../src/legacy_document_canvas_services.cpp
../../src/legacy_document_export_services.cpp
../../src/legacy_document_layer_services.cpp
../../src/legacy_document_open_services.cpp
../../src/legacy_document_session_services.cpp
../../src/legacy_grid_ui_services.cpp
../../src/legacy_history_services.cpp
../../src/legacy_quick_ui_services.cpp
../../src/legacy_recording_services.cpp
)
add_library(
native-lib SHARED
${PP_MODERN_COMPONENT_SOURCES}
../../libs/yoga/yoga/event/event.cpp
../../libs/yoga/yoga/internal/experiments.cpp
../../libs/yoga/yoga/log.cpp
@@ -128,6 +185,10 @@ add_library(
../../src/node_metadata.cpp
)
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
../src/cpp

19
android/cmake/PanoPainterAndroidLegacyCompat.cmake Normal file
View File

@@ -0,0 +1,19 @@
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()

72
android/focus/CMakeLists.txt
View File

@@ -2,7 +2,9 @@
# This ensures that a certain set of CMake features is available to
# your build.
cmake_minimum_required(VERSION 3.4.1)
cmake_minimum_required(VERSION 3.10)
include(../cmake/PanoPainterAndroidLegacyCompat.cmake)
# build native_app_glue as a static lib
add_library(
@@ -17,23 +19,79 @@ set_target_properties(
${CMAKE_SOURCE_DIR}/../../libs/wave_sdk/wvr_client/lib/${ANDROID_ABI}/libwvr_api.so
)
set(PP_MODERN_COMPONENT_SOURCES
../../src/app_core/document_export.cpp
../../src/app_core/document_route.cpp
../../src/app_core/document_session.cpp
../../src/assets/brush_package.cpp
../../src/assets/image_format.cpp
../../src/assets/image_metadata.cpp
../../src/assets/image_pixels.cpp
../../src/assets/ppi_header.cpp
../../src/assets/settings_document.cpp
../../src/document/document.cpp
../../src/document/ppi_export.cpp
../../src/document/ppi_import.cpp
../../src/foundation/binary_stream.cpp
../../src/foundation/event.cpp
../../src/foundation/log.cpp
../../src/foundation/parse.cpp
../../src/foundation/task_queue.cpp
../../src/foundation/trace.cpp
../../src/paint/blend.cpp
../../src/paint/brush.cpp
../../src/paint/stroke.cpp
../../src/paint/stroke_script.cpp
../../src/paint_renderer/compositor.cpp
../../src/platform_api/asset_file_load_policy.cpp
../../src/platform_api/network_tls_policy.cpp
../../src/platform_api/platform_policy.cpp
../../src/platform_api/platform_services.cpp
../../src/platform_legacy/legacy_platform_services.cpp
../../src/renderer_api/recording_renderer.cpp
../../src/renderer_api/renderer_api.cpp
../../src/renderer_api/shader_catalog.cpp
../../src/renderer_gl/command_plan.cpp
../../src/renderer_gl/opengl_capabilities.cpp
../../src/renderer_gl/shader_bindings.cpp
../../src/legacy_app_dialog_services.cpp
../../src/legacy_app_preference_services.cpp
../../src/legacy_app_shell_services.cpp
../../src/legacy_app_startup_services.cpp
../../src/legacy_brush_package_export_services.cpp
../../src/legacy_brush_package_import_services.cpp
../../src/legacy_brush_ui_services.cpp
../../src/legacy_canvas_tool_services.cpp
../../src/legacy_canvas_view_services.cpp
../../src/legacy_cloud_services.cpp
../../src/legacy_document_animation_services.cpp
../../src/legacy_document_canvas_services.cpp
../../src/legacy_document_export_services.cpp
../../src/legacy_document_layer_services.cpp
../../src/legacy_document_open_services.cpp
../../src/legacy_document_session_services.cpp
../../src/legacy_grid_ui_services.cpp
../../src/legacy_history_services.cpp
../../src/legacy_quick_ui_services.cpp
../../src/legacy_recording_services.cpp
)
# Specifies a library name, specifies whether the library is STATIC or
# SHARED, and provides relative paths to the source code. You can
# define multiple libraries by adding multiple add.library() commands,
# and CMake builds them for you. When you build your app, Gradle
# automatically packages shared libraries with your APK.
# now build app's shared lib
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
add_library(
native-lib SHARED
${PP_MODERN_COMPONENT_SOURCES}
../../libs/yoga/yoga/event/event.cpp
../../libs/yoga/yoga/internal/experiments.cpp
../../libs/yoga/yoga/log.cpp
../../libs/yoga/yoga/Utils.cpp
../../libs/yoga/yoga/YGConfig.cpp
../../libs/yoga/yoga/YGEnums.cpp
../../libs/yoga/yoga/YGLayout.cpp
../../libs/yoga/yoga/YGMarker.cpp
../../libs/yoga/yoga/YGNode.cpp
../../libs/yoga/yoga/YGNodePrint.cpp
../../libs/yoga/yoga/YGStyle.cpp
@@ -121,6 +179,10 @@ add_library(
../../src/settings.cpp
)
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
src/main/cpp

72
android/quest/CMakeLists.txt
View File

@@ -2,7 +2,9 @@
# This ensures that a certain set of CMake features is available to
# your build.
cmake_minimum_required(VERSION 3.4.1)
cmake_minimum_required(VERSION 3.10)
include(../cmake/PanoPainterAndroidLegacyCompat.cmake)
# build native_app_glue as a static lib
add_library(
@@ -25,23 +27,79 @@ set_target_properties(
)
set(PP_MODERN_COMPONENT_SOURCES
../../src/app_core/document_export.cpp
../../src/app_core/document_route.cpp
../../src/app_core/document_session.cpp
../../src/assets/brush_package.cpp
../../src/assets/image_format.cpp
../../src/assets/image_metadata.cpp
../../src/assets/image_pixels.cpp
../../src/assets/ppi_header.cpp
../../src/assets/settings_document.cpp
../../src/document/document.cpp
../../src/document/ppi_export.cpp
../../src/document/ppi_import.cpp
../../src/foundation/binary_stream.cpp
../../src/foundation/event.cpp
../../src/foundation/log.cpp
../../src/foundation/parse.cpp
../../src/foundation/task_queue.cpp
../../src/foundation/trace.cpp
../../src/paint/blend.cpp
../../src/paint/brush.cpp
../../src/paint/stroke.cpp
../../src/paint/stroke_script.cpp
../../src/paint_renderer/compositor.cpp
../../src/platform_api/asset_file_load_policy.cpp
../../src/platform_api/network_tls_policy.cpp
../../src/platform_api/platform_policy.cpp
../../src/platform_api/platform_services.cpp
../../src/platform_legacy/legacy_platform_services.cpp
../../src/renderer_api/recording_renderer.cpp
../../src/renderer_api/renderer_api.cpp
../../src/renderer_api/shader_catalog.cpp
../../src/renderer_gl/command_plan.cpp
../../src/renderer_gl/opengl_capabilities.cpp
../../src/renderer_gl/shader_bindings.cpp
../../src/legacy_app_dialog_services.cpp
../../src/legacy_app_preference_services.cpp
../../src/legacy_app_shell_services.cpp
../../src/legacy_app_startup_services.cpp
../../src/legacy_brush_package_export_services.cpp
../../src/legacy_brush_package_import_services.cpp
../../src/legacy_brush_ui_services.cpp
../../src/legacy_canvas_tool_services.cpp
../../src/legacy_canvas_view_services.cpp
../../src/legacy_cloud_services.cpp
../../src/legacy_document_animation_services.cpp
../../src/legacy_document_canvas_services.cpp
../../src/legacy_document_export_services.cpp
../../src/legacy_document_layer_services.cpp
../../src/legacy_document_open_services.cpp
../../src/legacy_document_session_services.cpp
../../src/legacy_grid_ui_services.cpp
../../src/legacy_history_services.cpp
../../src/legacy_quick_ui_services.cpp
../../src/legacy_recording_services.cpp
)
# Specifies a library name, specifies whether the library is STATIC or
# SHARED, and provides relative paths to the source code. You can
# define multiple libraries by adding multiple add.library() commands,
# and CMake builds them for you. When you build your app, Gradle
# automatically packages shared libraries with your APK.
# now build app's shared lib
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
add_library(
native-lib SHARED
${PP_MODERN_COMPONENT_SOURCES}
../../libs/yoga/yoga/event/event.cpp
../../libs/yoga/yoga/internal/experiments.cpp
../../libs/yoga/yoga/log.cpp
../../libs/yoga/yoga/Utils.cpp
../../libs/yoga/yoga/YGConfig.cpp
../../libs/yoga/yoga/YGEnums.cpp
../../libs/yoga/yoga/YGLayout.cpp
../../libs/yoga/yoga/YGMarker.cpp
../../libs/yoga/yoga/YGNode.cpp
../../libs/yoga/yoga/YGNodePrint.cpp
../../libs/yoga/yoga/YGStyle.cpp
@@ -129,6 +187,10 @@ add_library(
../../src/settings.cpp
)
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
../../libs/ovr_platform/Include

2
android/src/cpp/main.cpp
View File

@@ -35,7 +35,9 @@
#include "keymap.h"
#include "main.h"
#include "settings.h"
#if __has_include("com_omixlab_panopainter_MainActivity.h")
#include "com_omixlab_panopainter_MainActivity.h"
#endif
#ifdef __QUEST__
#include "oculus_vr.h"

18
docs/modernization/build-inventory.md
View File

@@ -14,9 +14,9 @@ Keep it updated as platform paths move to shared CMake targets.
| Windows AppX | `PanoPainterPackage/Package.appxmanifest`, `.wapproj` referenced by solution | Distribution packaging |
| macOS | `PanoPainter-OSX/` project files and `Info.plist` | Uses `NSOpenGLView` today |
| iOS | `PanoPainter/Info.plist`, related Apple sources | Uses OpenGL ES today |
| Android standard | `android/android/build.gradle`, `android/android/CMakeLists.txt` | Native library target `native-lib` |
| Android Quest | `android/quest/build.gradle`, `android/quest/CMakeLists.txt` | OVR SDK imported libraries |
| Android Focus/Wave | `android/focus/build.gradle`, `android/focus/CMakeLists.txt` | Wave SDK imported libraries |
| Android standard | `android/android/build.gradle`, `android/android/CMakeLists.txt` | Retained native library target `native-lib`; CMake 3.10/C++23 baseline now links the standard arm64 package path with modern component/service sources and the generated `nanort` overlay helper |
| Android Quest | `android/quest/build.gradle`, `android/quest/CMakeLists.txt` | OVR SDK imported libraries; CMake 3.10/C++23 baseline and current Yoga source list configure with the shared Android package compatibility helper |
| Android Focus/Wave | `android/focus/build.gradle`, `android/focus/CMakeLists.txt` | Wave SDK imported libraries; CMake 3.10/C++23 baseline and current Yoga source list configure with the shared Android package compatibility helper |
| Linux | `linux/CMakeLists.txt` | Old CMake 3.4, C++14 flag |
| WebGL/Emscripten | `webgl/CMakeLists.txt` | Old CMake 3.4, WebGL2 flags |
@@ -73,6 +73,10 @@ powershell -ExecutionPolicy Bypass -File scripts\automation\platform-build.ps1 -
ctest --preset desktop-fast-vcpkg --build-config Debug
cmake --preset android-arm64
powershell -ExecutionPolicy Bypass -File scripts\automation\platform-build.ps1 -Presets android-arm64
cmake -S android/android -B out/build/android-legacy-standard-arm64 -G Ninja -DCMAKE_TOOLCHAIN_FILE="$env:ANDROID_NDK_HOME\build\cmake\android.toolchain.cmake" -DANDROID_ABI=arm64-v8a -DANDROID_PLATFORM=android-23
cmake --build out/build/android-legacy-standard-arm64 --target native-lib
cmake -S android/quest -B out/build/android-legacy-quest-arm64 -G Ninja -DCMAKE_TOOLCHAIN_FILE="$env:ANDROID_NDK_HOME\build\cmake\android.toolchain.cmake" -DANDROID_ABI=arm64-v8a -DANDROID_PLATFORM=android-23
cmake -S android/focus -B out/build/android-legacy-focus-arm64 -G Ninja -DCMAKE_TOOLCHAIN_FILE="$env:ANDROID_NDK_HOME\build\cmake\android.toolchain.cmake" -DANDROID_ABI=arm64-v8a -DANDROID_PLATFORM=android-23
powershell -ExecutionPolicy Bypass -File scripts\automation\package-smoke.ps1 -Preset windows-msvc-default -Configuration Debug
powershell -ExecutionPolicy Bypass -File scripts\automation\package-smoke.ps1 -ReadinessOnly
cmake --fresh --preset windows-clangcl-asan
@@ -1032,10 +1036,10 @@ Known warnings after the current CMake app build:
handles instead of public mutable Android asset-manager state or SDK forward
declarations; concrete Android asset-manager headers remain in `asset.cpp`
and the retained Android entrypoint while DEBT-0056 tracks replacing the
static Android asset bridge with injected asset storage. A focused legacy
Android object build validates `src/asset.cpp`; the full old Android
`native-lib` target still fails later on unrelated C++ standard/header
modernization issues.
static Android asset bridge with injected asset storage. The retained Android
standard package now links `native-lib` for arm64 through the refreshed C++23
package CMake path; DEBT-0060 tracks the generated `nanort` overlay that keeps
that package gate clean without modifying the vendor submodule.
- `pp_legacy_paint_document` is an object-library containment boundary for
retained action, bezier, brush, canvas, canvas-layer, and event code. It
should shrink as app painting and document behavior consume `pp_paint` and

16
docs/modernization/debt.md
View File

File diff suppressed because one or more lines are too long

13
docs/modernization/roadmap.md
View File

@@ -1410,6 +1410,14 @@ layout XML file mtime reload policy, recording cleanup policy, default canvas
resolution, and canvas tip visibility. Platform SDK calls and filesystem probes
remain in the platform shells or thin runtime wrappers while those decisions are
headless-testable.
The retained Android standard/Quest/Focus package CMake files now use CMake
3.10, request C++23 through target compile features, include the extracted
modern component/service source set that the legacy package still links
monolithically, and share a generated `nanort` compatibility overlay from
`android/cmake/PanoPainterAndroidLegacyCompat.cmake` instead of dirtying the
vendor submodule. The standard package `native-lib` arm64 target now compiles
and links with the current NDK; Quest and Focus configure with the aligned Yoga
source list and their SDK imported-library paths.
Implementation tasks:
@@ -2359,7 +2367,10 @@ Results:
through the platform-build wrapper by default. Focused validation compiled
representative headless component/tool targets across all four presets, and
the full refreshed component/test matrix remains the default gate for local
platform sweeps.
platform sweeps. The retained Android standard package CMake path also now
configures/builds `native-lib` directly for arm64 using C++23 and the shared
modern component source set, while Quest and Focus package CMake paths
configure with the same compatibility helper and current Yoga source list.
- Desktop VR drawing now routes generic OpenGL scissor/depth/blend state,
blend/depth state snapshots and restores, depth clears, active texture units,
and fallback 2D texture unbinds through tested renderer GL backend dispatch;

3
src/app.h
View File

@@ -19,7 +19,6 @@
#include "node_canvas.h"
#include "node_dialog_layer_rename.h"
#include "node_progress_bar.h"
#include "node_panel_grid.h"
#include "node_panel_quick.h"
#include "node_input_box.h"
#include "node_panel_animation.h"
@@ -32,6 +31,8 @@ class PlatformServices;
struct PlatformStoragePaths;
}
class NodePanelGrid;
#if defined(__OBJC__) && defined(__IOS__)
@class GameViewController;
@class AppDelegate;

1
src/app_layout.cpp
View File

@@ -1,5 +1,6 @@
#include "pch.h"
#include "app.h"
#include "node_panel_grid.h"
#include "node_icon.h"
#include "node_dialog_open.h"
#include "node_text.h"

1
src/app_vr.cpp
View File

@@ -3,6 +3,7 @@
#include <cstdint>
#include "app.h"
#include "node_panel_grid.h"
#include "util.h"
#include "shape.h"
#include "renderer_gl/opengl_capabilities.h"

1
src/node_canvas.cpp
View File

@@ -11,6 +11,7 @@
#include "app_core/canvas_view.h"
#include "app_core/document_animation.h"
#include "app.h"
#include "node_panel_grid.h"
#include "legacy_canvas_tool_services.h"
#include "legacy_history_services.h"
#include "log.h"

11
src/pch.cpp
View File

@@ -7,13 +7,12 @@
#include <stb/stb_image.h>
#include <stb/stb_image_write.h>
#ifdef _DEBUG
#pragma comment (lib, "libcurl_debug.lib")
#else
#pragma comment (lib, "libcurl.lib")
#endif // DEBUG
#ifdef _WIN32
#ifdef _DEBUG
#pragma comment (lib, "libcurl_debug.lib")
#else
#pragma comment (lib, "libcurl.lib")
#endif // DEBUG
#pragma comment(lib, "BugTrapU-x64.lib")
#pragma comment(lib, "shell32.lib")
#pragma comment(lib, "opengl32.lib")