improve for ios

zlgopen · Nov 8, 2024 · 6decfd6 · 6decfd6
1 parent fa33cc6
commit 6decfd6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/3rd/nanovg_plus/base/nanovg_plus.c b/3rd/nanovg_plus/base/nanovg_plus.c
@@ -291,7 +291,7 @@ void nvgp_destroy(nvgp_context_t* ctx) {
   }
 }
 
-static nvgp_clear_path_cache(nvgp_path_cache_t* cache) {
+static void nvgp_clear_path_cache(nvgp_path_cache_t* cache) {
   cache->nverts = 0;
   NVGP_MEMSET(cache->bounds, 0x0, sizeof(cache->bounds));
   nvgp_darray_clear(&cache->paths);

diff --git a/scripts/awtk_mobile_common.mk b/scripts/awtk_mobile_common.mk
@@ -36,8 +36,11 @@ set(AWTK_COMMON_FLAGS "${AWTK_COMMON_FLAGS} -DWITH_GPU_GL ")
 set(AWTK_COMMON_FLAGS "${AWTK_COMMON_FLAGS} -DHAS_PTHREAD -DHAS_GET_TIME_US64=1 ")
 set(AWTK_COMMON_FLAGS "${AWTK_COMMON_FLAGS} -DWITH_DATA_READER_WRITER=1 ")
 
-set(AWTK_VGCANVAS_GLES2_FLAGS "-DWITH_GPU_GLES2 -DWITH_GPU_GL -DWITH_NANOVG_PLUS_GPU -DNVGP_GLES2 ")
-set(AWTK_VGCANVAS_GLES3_FLAGS "-DWITH_GPU_GLES3 -DWITH_GPU_GL -DWITH_NANOVG_PLUS_GPU -DNVGP_GLES3 ")
+set(AWTK_VGCANVAS_NANOVG_PLUS_GLES2_FLAGS "-DWITH_GPU_GLES2 -DWITH_GPU_GL -DWITH_NANOVG_PLUS_GPU -DNVGP_GLES2 ")
+set(AWTK_VGCANVAS_NANOVG_PLUS_GLES3_FLAGS "-DWITH_GPU_GLES3 -DWITH_GPU_GL -DWITH_NANOVG_PLUS_GPU -DNVGP_GLES3 ")
+
+set(AWTK_VGCANVAS_NANOVG_GLES2_FLAGS "-DWITH_GPU_GLES2 -DWITH_GPU_GL -DWITH_NANOVG_GPU -DWITH_NANOVG_GLES2 ")
+set(AWTK_VGCANVAS_NANOVG_GLES3_FLAGS "-DWITH_GPU_GLES3 -DWITH_GPU_GL -DWITH_NANOVG_GPU -DWITH_NANOVG_GLES3 ")
 
 file(GLOB AWTK_BASE_SOURCE_FILES 
   ${AWTK_3RD_PATH}/libunibreak/*.c