diff --git a/.drone.yml b/.drone.yml index 601b1c5e..717682c8 100644 --- a/.drone.yml +++ b/.drone.yml @@ -224,7 +224,7 @@ steps: - flutter pub get - $Env:version += type .\VERSION - $Env:commitdate += type .\COMMIT_DATE - - $Env:releasedir = "build\\windows\\runner\\Release\\" + - $Env:releasedir = "build\\windows\\x64\\runner\\Release\\" - flutter build windows --dart-define BUILD_VER=$Env:version --dart-define BUILD_DATE=$Env:commitdate - copy windows\libCwtch.dll $Env:releasedir # flutter hasn't worked out it's packaging of required dll's so we have to resort to this manual nonsense @@ -251,7 +251,7 @@ steps: commands: - $Env:version += type .\VERSION - $Env:commitdate += type .\COMMIT_DATE - - $Env:releasedir = "build\\windows\\runner\\Release\\" + - $Env:releasedir = "build\\windows\\x64\\runner\\Release\\" - $Env:zip = 'cwtch-' + $Env:version + '.zip' - $Env:zipsha = $Env:zip + '.sha512.txt' - $Env:buildname = 'flwtch-' + $Env:commitdate + '-' + $Env:version diff --git a/test/buttontextfield01.png b/test/buttontextfield01.png index 89e5e50c..36113d48 100644 Binary files a/test/buttontextfield01.png and b/test/buttontextfield01.png differ diff --git a/test/profileimage_init.png b/test/profileimage_init.png index 03d875fe..a6a5314e 100644 Binary files a/test/profileimage_init.png and b/test/profileimage_init.png differ diff --git a/test/textfield_basic.png b/test/textfield_basic.png index 311e38d0..36b41b4d 100644 Binary files a/test/textfield_basic.png and b/test/textfield_basic.png differ diff --git a/test/textfield_form_42.png b/test/textfield_form_42.png index 3682c4dc..acea733b 100644 Binary files a/test/textfield_form_42.png and b/test/textfield_form_42.png differ diff --git a/test/textfield_form_alpha.png b/test/textfield_form_alpha.png index fb7bb79a..9ee79c8e 100644 Binary files a/test/textfield_form_alpha.png and b/test/textfield_form_alpha.png differ diff --git a/test/textfield_form_final.png b/test/textfield_form_final.png index 22cabad3..d47ffaa7 100644 Binary files a/test/textfield_form_final.png and b/test/textfield_form_final.png differ diff --git a/test/textfield_form_init.png b/test/textfield_form_init.png index 9a5fc65c..859b7a25 100644 Binary files a/test/textfield_form_init.png and b/test/textfield_form_init.png differ diff --git a/test/textfield_init.png b/test/textfield_init.png index ef33a065..2fb64253 100644 Binary files a/test/textfield_init.png and b/test/textfield_init.png differ diff --git a/windows/flutter/CMakeLists.txt b/windows/flutter/CMakeLists.txt index b02c5485..86edc67b 100644 --- a/windows/flutter/CMakeLists.txt +++ b/windows/flutter/CMakeLists.txt @@ -9,6 +9,11 @@ include(${EPHEMERAL_DIR}/generated_config.cmake) # https://github.com/flutter/flutter/issues/57146. set(WRAPPER_ROOT "${EPHEMERAL_DIR}/cpp_client_wrapper") +# Set fallback configurations for older versions of the flutter tool. +if (NOT DEFINED FLUTTER_TARGET_PLATFORM) + set(FLUTTER_TARGET_PLATFORM "windows-x64") +endif() + # === Flutter Library === set(FLUTTER_LIBRARY "${EPHEMERAL_DIR}/flutter_windows.dll") @@ -91,7 +96,7 @@ add_custom_command( COMMAND ${CMAKE_COMMAND} -E env ${FLUTTER_TOOL_ENVIRONMENT} "${FLUTTER_ROOT}/packages/flutter_tools/bin/tool_backend.bat" - windows-x64 $ + ${FLUTTER_TARGET_PLATFORM} $ VERBATIM ) add_custom_target(flutter_assemble DEPENDS