From 20d81e43532992681616c11f78d4904f4fd97e06 Mon Sep 17 00:00:00 2001 From: Galois Date: Sun, 6 Aug 2023 11:35:18 +0800 Subject: [PATCH 1/3] =?UTF-8?q?Fix:=20readme=5Fzh=20=E4=B8=8A=E8=BF=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Galois --- README_zh.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README_zh.md b/README_zh.md index d20c49e4..ff7f6beb 100644 --- a/README_zh.md +++ b/README_zh.md @@ -101,4 +101,4 @@ ## 📝 License 1. 允许打包自用，但不允许分发（举例：你可以教别人如何打包，避免花钱购买App，但不能与他人分享你打包的App） -2. 除去上诉情形：遵循 `GPLv3` +2. 除去上述情形：遵循 `GPLv3` From ae970124561831a774486cedb9a9269a9b28fcbc Mon Sep 17 00:00:00 2001 From: Galois Date: Sun, 6 Aug 2023 19:48:39 +0800 Subject: [PATCH 2/3] Update: Windows title Signed-off-by: Galois --- windows/runner/Runner.rc | 10 +++++----- windows/runner/main.cpp | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/windows/runner/Runner.rc b/windows/runner/Runner.rc index d25a3fc7..367a8587 100644 --- a/windows/runner/Runner.rc +++ b/windows/runner/Runner.rc @@ -60,14 +60,14 @@ IDI_APP_ICON ICON "resources\\app_icon.ico" // Version // -#ifdef FLUTTER_BUILD_NUMBER -#define VERSION_AS_NUMBER FLUTTER_BUILD_NUMBER +#if defined(FLUTTER_VERSION_MAJOR) && defined(FLUTTER_VERSION_MINOR) && defined(FLUTTER_VERSION_PATCH) && defined(FLUTTER_VERSION_BUILD) +#define VERSION_AS_NUMBER FLUTTER_VERSION_MAJOR,FLUTTER_VERSION_MINOR,FLUTTER_VERSION_PATCH,FLUTTER_VERSION_BUILD #else -#define VERSION_AS_NUMBER 1,0,0 +#define VERSION_AS_NUMBER 1,0,0,0 #endif -#ifdef FLUTTER_BUILD_NAME -#define VERSION_AS_STRING #FLUTTER_BUILD_NAME +#if defined(FLUTTER_VERSION) +#define VERSION_AS_STRING FLUTTER_VERSION #else #define VERSION_AS_STRING "1.0.0" #endif diff --git a/windows/runner/main.cpp b/windows/runner/main.cpp index eff8f581..4e290d0d 100644 --- a/windows/runner/main.cpp +++ b/windows/runner/main.cpp @@ -27,7 +27,7 @@ int APIENTRY wWinMain(_In_ HINSTANCE instance, _In_opt_ HINSTANCE prev, FlutterWindow window(project); Win32Window::Point origin(10, 10); Win32Window::Size size(1280, 720); - if (!window.CreateAndShow(L"toolbox", origin, size)) { + if (!window.CreateAndShow(L"ServerBox", origin, size)) { return EXIT_FAILURE; } window.SetQuitOnClose(true); From 140a3de5eda2de4d5d2b60320b8efd14f4c85ef9 Mon Sep 17 00:00:00 2001 From: Galois Date: Sun, 6 Aug 2023 19:54:17 +0800 Subject: [PATCH 3/3] Update: linux BINARY_NAME Signed-off-by: Galois --- linux/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux/CMakeLists.txt b/linux/CMakeLists.txt index 25b3df0d..621aaed1 100644 --- a/linux/CMakeLists.txt +++ b/linux/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.10) project(runner LANGUAGES CXX) -set(BINARY_NAME "toolbox") +set(BINARY_NAME "ServerBox") set(APPLICATION_ID "tech.lolli.toolbox") cmake_policy(SET CMP0063 NEW)