diff --git a/CMakeLists.txt b/CMakeLists.txt index 2249446..d9c4c9d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -30,17 +30,23 @@ elseif(WIN32) else() set(ARCH "x86") endif() - set(CMAKE_PREFIX_PATH "Qt/6.6.3/gcc_64") ## 按照自己电脑上qt6.6.3的位置来替换 + if(NOT DEFINED CMAKE_PREFIX_PATH) + set(CMAKE_PREFIX_PATH "Qt/6.6.3/gcc_64") ## 按照自己电脑上qt6.6.3的位置来替换 + endif() add_definitions(-DCSM_TARGET_WIN_GL) elseif(APPLE) set(PLAT "macos") set(ARCH "x86_64") # 或通用二进制,可根据需要调整 - set(CMAKE_PREFIX_PATH "/home/misaki/Qt/6.6.3/gcc_64") + if(NOT DEFINED CMAKE_PREFIX_PATH) + set(CMAKE_PREFIX_PATH "/home/misaki/Qt/6.6.3/gcc_64") + endif() add_definitions(-DCSM_TARGET_MAC_GL) elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux") set(PLAT "linux_64") set(ARCH "x86_64") - set(CMAKE_PREFIX_PATH "/home/misaki/Qt6.3/6.6.3/gcc_64") + if(NOT DEFINED CMAKE_PREFIX_PATH) + set(CMAKE_PREFIX_PATH "/home/misaki/Qt6.3/6.6.3/gcc_64") + endif() add_definitions(-DCSM_TARGET_LINUX_GL) else() message(FATAL_ERROR "Unsupported platform") @@ -61,6 +67,8 @@ if(NOT CMAKE_BUILD_TYPE) set(CMAKE_BUILD_TYPE Debug) endif() +message(STATUS " 当前编译方式: ${CMAKE_BUILD_TYPE}") + # 设置渲染方式,选择为OpenGL,不然默认是Cocos2d,编译会报错的,CMake也会给你警告的 set(FRAMEWORK_SOURCE OpenGL) diff --git a/CMakePresets.json b/CMakePresets.json index 3d64224..a45c6a8 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -34,7 +34,7 @@ "binaryDir": "${sourceDir}/build_linux", "generator": "Ninja", "cacheVariables": { - "CMAKE_BUILD_TYPE": "Debug", + "CMAKE_BUILD_TYPE": "Release", "CMAKE_PREFIX_PATH": "/home/misaki/Qt6.3/6.6.3/gcc_64" } }, @@ -113,19 +113,5 @@ "EGL_LIBRARY": "/home/misaki/MisakiCodes/Redmi5Plus-SDK/vince-rootfs/usr/lib/libEGL.so" } } - ], - "buildPresets": [ - { "name": "linux-debug", "configurePreset": "linux-native", "configuration": "Debug" }, - { "name": "linux-release", "configurePreset": "linux-native", "configuration": "Release" }, - { "name": "win-mingw-debug", "configurePreset": "windows-mingw", "configuration": "Debug" }, - { "name": "win-mingw-release", "configurePreset": "windows-mingw", "configuration": "Release" }, - { "name": "win-msvc-debug", "configurePreset": "windows-msvc", "configuration": "Debug" }, - { "name": "win-msvc-release", "configurePreset": "windows-msvc", "configuration": "Release" }, - { "name": "macos-debug", "configurePreset": "macos-native", "configuration": "Debug" }, - { "name": "macos-release", "configurePreset": "macos-native", "configuration": "Release" }, - { "name": "rk3566-debug", "configurePreset": "rk3566-cross", "configuration": "Debug" }, - { "name": "rk3566-release", "configurePreset": "rk3566-cross", "configuration": "Release" }, - { "name": "vince-debug", "configurePreset": "vince-cross", "configuration": "Debug" }, - { "name": "vince-release", "configurePreset": "vince-cross", "configuration": "Release" } ] } \ No newline at end of file diff --git a/README.md b/README.md index 2de351a..cfc560c 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ _**本项目为Yosuga.**_ 本项目使用CMake构建,基于C++Qt6.6.3以及Live2D官方SDK(CubismSdkForNative-5-r.4.1)实现Live2D桌面助手 (本项目由[Yosuga-qt5](https://github.com/Misakityan/Yosuga-qt5) 发展更新而来,项目架构与代码都有所不同,最显著的特点是本项目支持多平台) -环境为: +本项目开发环境为: - cmake version 3.5 @@ -59,11 +59,24 @@ make 当前支持平台(已测试过的): - Windows: Windows 10 - Linux: kUbuntu 24.04 +- Linux ARM: RK3566, Xiaomi Redmi 5 Plus 相关教程见BiliBili:https://www.bilibili.com/video/BV1TtkHYpEDA/?spm_id_from=333.1387.homepage.video_card.click&vd_source=d66e155c7b27c10078bc67965ea1989e 实现效果: +- 主机平台: +
+ +
+
+ +
+ +- 嵌入式Linux平台: +
+ +
关于授权
本项目采用多重授权结构: diff --git a/doc/img/Yosuga for Desktop1.png b/doc/img/Yosuga for Desktop1.png new file mode 100644 index 0000000..529fcc9 Binary files /dev/null and b/doc/img/Yosuga for Desktop1.png differ diff --git a/doc/img/Yosuga for Desktop2.png b/doc/img/Yosuga for Desktop2.png new file mode 100644 index 0000000..45ff021 Binary files /dev/null and b/doc/img/Yosuga for Desktop2.png differ diff --git a/doc/img/YosugaforArmLinux.jpg b/doc/img/YosugaforArmLinux.jpg new file mode 100644 index 0000000..c1d125d Binary files /dev/null and b/doc/img/YosugaforArmLinux.jpg differ