diff --git a/example/CMakeLists.txt b/example/CMakeLists.txt index f87c6574..279fc635 100644 --- a/example/CMakeLists.txt +++ b/example/CMakeLists.txt @@ -43,15 +43,15 @@ qt_add_resources(QT_RESOURCES ${RESOURCES}) add_executable(${PROJECT_NAME} ${SOURCES} ${HEADERS} ${QT_RESOURCES} ${RC_ICONS}) if(WIN32) - if(platform EQUAL 32) - file(GLOB DLL_FILES ${CMAKE_CURRENT_SOURCE_DIR}/../third/Win_x86/*.dll) + if(CMAKE_C_COMPILER_ID STREQUAL "MSVC") + file(GLOB DLL_FILES ${CMAKE_CURRENT_SOURCE_DIR}/../third/msvc/*.dll) add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy ${DLL_FILES} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} ) else() - file(GLOB DLL_FILES ${CMAKE_CURRENT_SOURCE_DIR}/../third/Win_x64/*.dll) + file(GLOB DLL_FILES ${CMAKE_CURRENT_SOURCE_DIR}/../third/mingw/*.dll) add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy ${DLL_FILES} diff --git a/example/example.pro b/example/example.pro index 733943f7..19c57cec 100644 --- a/example/example.pro +++ b/example/example.pro @@ -23,13 +23,15 @@ CONFIG(debug,debug|release) { } win32 { -contains(QT_ARCH, i386) { - COPYDLL = $$absolute_path($${_PRO_FILE_PWD_}/../third/Win_x86/*.dll) $$DESTDIR + +contains(QMAKE_CC, cl) { + COPYDLL = $$absolute_path($${_PRO_FILE_PWD_}/../third/msvc/*.dll) $$DESTDIR QMAKE_PRE_LINK += $$QMAKE_COPY $$replace(COPYDLL, /, $$QMAKE_DIR_SEP) } else { - COPYDLL = $$absolute_path($${_PRO_FILE_PWD_}/../third/Win_x64/*.dll) $$DESTDIR + COPYDLL = $$absolute_path($${_PRO_FILE_PWD_}/../third/mingw/*.dll) $$DESTDIR QMAKE_PRE_LINK += $$QMAKE_COPY $$replace(COPYDLL, /, $$QMAKE_DIR_SEP) } + } qnx: target.path = /tmp/$${TARGET}/bin diff --git a/example/page/AboutPage.qml b/example/page/AboutPage.qml index 9f9431e5..5a80e866 100644 --- a/example/page/AboutPage.qml +++ b/example/page/AboutPage.qml @@ -36,7 +36,7 @@ FluWindow { fontStyle: FluText.Title } FluText{ - text:"v1.2.0" + text:"v1.2.1" fontStyle: FluText.Body Layout.alignment: Qt.AlignBottom } diff --git a/third/Win_x86/libcrypto-1_1.dll b/third/Win_x86/libcrypto-1_1.dll deleted file mode 100644 index e69f7f40..00000000 Binary files a/third/Win_x86/libcrypto-1_1.dll and /dev/null differ diff --git a/third/Win_x86/libssl-1_1.dll b/third/Win_x86/libssl-1_1.dll deleted file mode 100644 index edea6240..00000000 Binary files a/third/Win_x86/libssl-1_1.dll and /dev/null differ diff --git a/third/Win_x64/libcrypto-1_1-x64.dll b/third/mingw/libcrypto-1_1-x64.dll similarity index 100% rename from third/Win_x64/libcrypto-1_1-x64.dll rename to third/mingw/libcrypto-1_1-x64.dll diff --git a/third/mingw/libgcc_s_seh-1.dll b/third/mingw/libgcc_s_seh-1.dll new file mode 100644 index 00000000..f1735a29 Binary files /dev/null and b/third/mingw/libgcc_s_seh-1.dll differ diff --git a/third/Win_x64/libssl-1_1-x64.dll b/third/mingw/libssl-1_1-x64.dll similarity index 100% rename from third/Win_x64/libssl-1_1-x64.dll rename to third/mingw/libssl-1_1-x64.dll diff --git a/third/mingw/libstdc++-6.dll b/third/mingw/libstdc++-6.dll new file mode 100644 index 00000000..fc6c1d0b Binary files /dev/null and b/third/mingw/libstdc++-6.dll differ diff --git a/third/mingw/libwinpthread-1.dll b/third/mingw/libwinpthread-1.dll new file mode 100644 index 00000000..245a6b74 Binary files /dev/null and b/third/mingw/libwinpthread-1.dll differ diff --git a/third/msvc/libcrypto-1_1-x64.dll b/third/msvc/libcrypto-1_1-x64.dll new file mode 100644 index 00000000..f996a04c Binary files /dev/null and b/third/msvc/libcrypto-1_1-x64.dll differ diff --git a/third/msvc/libssl-1_1-x64.dll b/third/msvc/libssl-1_1-x64.dll new file mode 100644 index 00000000..f6cf40b9 Binary files /dev/null and b/third/msvc/libssl-1_1-x64.dll differ