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

Integrate dialog export and Apple service teams

Browse Source
This commit is contained in:
omigamedev
2026-06-12 20:18:20 +02:00
parent 90f5fb29a6
commit 46fb8efec4
21 changed files with 1271 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
CMakeLists.txt
View File

@@ -311,8 +311,24 @@ endif()
if(PP_BUILD_APP)
if(WIN32)
set(PP_LEGACY_FMT_SOURCES
libs/fmt/src/format.cc
libs/fmt/src/posix.cc)
set(PP_LEGACY_VENDOR_SOURCES ${PP_VENDOR_SOURCES})
list(REMOVE_ITEM PP_LEGACY_VENDOR_SOURCES ${PP_LEGACY_FMT_SOURCES})
set(PP_LEGACY_VENDOR_DEFINITIONS
ENUM_BITFIELDS_NOT_SUPPORTED
UNICODE
_UNICODE
_CRT_SECURE_NO_WARNINGS
_SCL_SECURE_NO_WARNINGS
_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING
_SILENCE_STDEXT_ARR_ITERS_DEPRECATION_WARNING
_CONSOLE
WITH_CURL=1)
add_library(pp_legacy_vendor OBJECT
${PP_VENDOR_SOURCES})
${PP_LEGACY_VENDOR_SOURCES})
target_link_libraries(pp_legacy_vendor
PUBLIC
pp_project_options
@@ -322,24 +338,39 @@ if(PP_BUILD_APP)
PUBLIC
${PP_LEGACY_INCLUDE_DIRS})
file(REMOVE_RECURSE "${CMAKE_CURRENT_BINARY_DIR}/compat/fmt-vs2026")
add_library(pp_legacy_fmt OBJECT
${PP_LEGACY_FMT_SOURCES})
target_link_libraries(pp_legacy_fmt
PUBLIC
pp_project_options
PRIVATE
pp_project_warnings)
target_include_directories(pp_legacy_fmt
PUBLIC
${PP_LEGACY_INCLUDE_DIRS})
if(MSVC_VERSION GREATER_EQUAL 1945)
target_compile_options(pp_legacy_vendor
set(PP_FMT_VS2026_COMPAT_HEADER "${CMAKE_CURRENT_BINARY_DIR}/compat/fmt-vs2026-secure-scl.h")
file(WRITE "${PP_FMT_VS2026_COMPAT_HEADER}"
"#pragma once\n"
"#include <yvals.h>\n"
"#ifdef _SECURE_SCL\n"
"#undef _SECURE_SCL\n"
"#endif\n")
target_compile_options(pp_legacy_fmt
PUBLIC
/U_SECURE_SCL)
/FI"${PP_FMT_VS2026_COMPAT_HEADER}")
endif()
target_compile_definitions(pp_legacy_vendor
PUBLIC
ENUM_BITFIELDS_NOT_SUPPORTED
UNICODE
_UNICODE
_CRT_SECURE_NO_WARNINGS
_SCL_SECURE_NO_WARNINGS
_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING
_SILENCE_STDEXT_ARR_ITERS_DEPRECATION_WARNING
_CONSOLE
WITH_CURL=1)
${PP_LEGACY_VENDOR_DEFINITIONS})
target_compile_definitions(pp_legacy_fmt
PUBLIC
${PP_LEGACY_VENDOR_DEFINITIONS})
set_target_properties(pp_legacy_vendor PROPERTIES
VS_GLOBAL_CharacterSet "Unicode")
set_target_properties(pp_legacy_fmt PROPERTIES
VS_GLOBAL_CharacterSet "Unicode")
add_library(pp_legacy_renderer_gl OBJECT
${PP_LEGACY_RENDERER_GL_SOURCES})
@@ -436,6 +467,7 @@ if(PP_BUILD_APP)
$<TARGET_OBJECTS:pp_legacy_assets_io>
$<TARGET_OBJECTS:pp_legacy_paint_document>
$<TARGET_OBJECTS:pp_legacy_renderer_gl>
$<TARGET_OBJECTS:pp_legacy_fmt>
$<TARGET_OBJECTS:pp_legacy_vendor>)
target_link_libraries(pp_legacy_engine