diff --git a/script/setup.sh b/script/setup.sh index 73f4898f..c70e4952 100755 --- a/script/setup.sh +++ b/script/setup.sh @@ -57,14 +57,14 @@ fi # Create Debug and Release folders echo -e $INFO "create build folders" if [ $PLATFORM == "Windows" ]; then - mkdir -p build/win32/Debug/app - mkdir -p build/win32/Debug/test - mkdir -p build/win32/Release/app - mkdir -p build/win32/Release/test - mkdir -p build/win64/Debug/app - mkdir -p build/win64/Debug/test - mkdir -p build/win64/Release/app - mkdir -p build/win64/Release/test + mkdir -p build/win32/Debug/app/platforms + mkdir -p build/win32/Debug/test/platforms + mkdir -p build/win32/Release/app/platforms + mkdir -p build/win32/Release/test/platforms + mkdir -p build/win64/Debug/app/platforms + mkdir -p build/win64/Debug/test/platforms + mkdir -p build/win64/Release/app/platforms + mkdir -p build/win64/Release/test/platforms else mkdir -p build/Debug/app mkdir -p build/Debug/test @@ -74,22 +74,60 @@ fi # Copy necessary dynamic libraries to bin folder if [ $PLATFORM == "Windows" ]; then - echo -e $INFO "copy dynamic libraries" + echo -e $INFO "copy dynamic libraries for app" cp -u -r setup/dynamic_libraries/win32/app/Debug/* build/win32/Debug/app + cp -u -r ${QT_WIN32_DIR}/bin/Qt5Cored.dll build/win32/Debug/app + cp -u -r ${QT_WIN32_DIR}/bin/Qt5Guid.dll build/win32/Debug/app + cp -u -r ${QT_WIN32_DIR}/bin/Qt5Networkd.dll build/win32/Debug/app + cp -u -r ${QT_WIN32_DIR}/bin/Qt5Widgetsd.dll build/win32/Debug/app + cp -u -r ${QT_WIN32_DIR}/plugins/platforms/qwindowsd.dll build/win32/Debug/app/platforms + cp -u -r setup/dynamic_libraries/win32/app/Release/* build/win32/Release/app + cp -u -r ${QT_WIN32_DIR}/bin/Qt5Core.dll build/win32/Release/app + cp -u -r ${QT_WIN32_DIR}/bin/Qt5Gui.dll build/win32/Release/app + cp -u -r ${QT_WIN32_DIR}/bin/Qt5Network.dll build/win32/Release/app + cp -u -r ${QT_WIN32_DIR}/bin/Qt5Widgets.dll build/win32/Release/app + cp -u -r ${QT_WIN32_DIR}/plugins/platforms/qwindows.dll build/win32/Release/app/platforms cp -u -r setup/dynamic_libraries/win64/app/Debug/* build/win64/Debug/app + cp -u -r ${QT_WIN64_DIR}/bin/Qt5Cored.dll build/win64/Debug/app + cp -u -r ${QT_WIN64_DIR}/bin/Qt5Guid.dll build/win64/Debug/app + cp -u -r ${QT_WIN64_DIR}/bin/Qt5Networkd.dll build/win64/Debug/app + cp -u -r ${QT_WIN64_DIR}/bin/Qt5Widgetsd.dll build/win64/Debug/app + cp -u -r ${QT_WIN64_DIR}/plugins/platforms/qwindowsd.dll build/win64/Debug/app/platforms + cp -u -r setup/dynamic_libraries/win64/app/Release/* build/win64/Release/app + cp -u -r ${QT_WIN64_DIR}/bin/Qt5Core.dll build/win64/Release/app + cp -u -r ${QT_WIN64_DIR}/bin/Qt5Gui.dll build/win64/Release/app + cp -u -r ${QT_WIN64_DIR}/bin/Qt5Network.dll build/win64/Release/app + cp -u -r ${QT_WIN64_DIR}/bin/Qt5Widgets.dll build/win64/Release/app + cp -u -r ${QT_WIN64_DIR}/plugins/platforms/qwindows.dll build/win64/Release/app/platforms - cp -u -r setup/dynamic_libraries/win32/app/Debug/Qt5* build/win32/Debug/test - cp -u -r setup/dynamic_libraries/win32/app/Debug/platforms* build/win32/Debug/test/platforms - cp -u -r setup/dynamic_libraries/win32/app/Release/Qt5* build/win32/Release/test - cp -u -r setup/dynamic_libraries/win32/app/Release/platforms* build/win32/Release/test/platforms - cp -u -r setup/dynamic_libraries/win64/app/Debug/Qt5* build/win64/Debug/test - cp -u -r setup/dynamic_libraries/win64/app/Debug/platforms* build/win64/Debug/test/platforms - cp -u -r setup/dynamic_libraries/win64/app/Release/Qt5* build/win64/Release/test - cp -u -r setup/dynamic_libraries/win64/app/Release/platforms* build/win64/Release/test/platforms + echo -e $INFO "copy dynamic libraries for tests" + cp -u -r ${QT_WIN32_DIR}/bin/Qt5Cored.dll build/win32/Debug/test + cp -u -r ${QT_WIN32_DIR}/bin/Qt5Guid.dll build/win32/Debug/test + cp -u -r ${QT_WIN32_DIR}/bin/Qt5Networkd.dll build/win32/Debug/test + cp -u -r ${QT_WIN32_DIR}/bin/Qt5Widgetsd.dll build/win32/Debug/test + cp -u -r ${QT_WIN32_DIR}/plugins/platforms/qwindowsd.dll build/win32/Debug/test/platforms + + cp -u -r ${QT_WIN32_DIR}/bin/Qt5Core.dll build/win32/Release/test + cp -u -r ${QT_WIN32_DIR}/bin/Qt5Gui.dll build/win32/Release/test + cp -u -r ${QT_WIN32_DIR}/bin/Qt5Network.dll build/win32/Release/test + cp -u -r ${QT_WIN32_DIR}/bin/Qt5Widgets.dll build/win32/Release/test + cp -u -r ${QT_WIN32_DIR}/plugins/platforms/qwindows.dll build/win32/Release/test/platforms + + cp -u -r ${QT_WIN64_DIR}/bin/Qt5Cored.dll build/win64/Debug/test + cp -u -r ${QT_WIN64_DIR}/bin/Qt5Guid.dll build/win64/Debug/test + cp -u -r ${QT_WIN64_DIR}/bin/Qt5Networkd.dll build/win64/Debug/test + cp -u -r ${QT_WIN64_DIR}/bin/Qt5Widgetsd.dll build/win64/Debug/test + cp -u -r ${QT_WIN64_DIR}/plugins/platforms/qwindowsd.dll build/win64/Debug/test/platforms + + cp -u -r ${QT_WIN64_DIR}/bin/Qt5Core.dll build/win64/Release/test + cp -u -r ${QT_WIN64_DIR}/bin/Qt5Gui.dll build/win64/Release/test + cp -u -r ${QT_WIN64_DIR}/bin/Qt5Network.dll build/win64/Release/test + cp -u -r ${QT_WIN64_DIR}/bin/Qt5Widgets.dll build/win64/Release/test + cp -u -r ${QT_WIN64_DIR}/plugins/platforms/qwindows.dll build/win64/Release/test/platforms echo -e $INFO "copy test_main file" cp -u setup/cxx_test/windows/test_main.cpp build/win32 diff --git a/setup/dynamic_libraries/win32/app/Debug/Qt5Cored.dll b/setup/dynamic_libraries/win32/app/Debug/Qt5Cored.dll deleted file mode 100644 index eed29951..00000000 Binary files a/setup/dynamic_libraries/win32/app/Debug/Qt5Cored.dll and /dev/null differ diff --git a/setup/dynamic_libraries/win32/app/Debug/Qt5Guid.dll b/setup/dynamic_libraries/win32/app/Debug/Qt5Guid.dll deleted file mode 100644 index e891bca5..00000000 Binary files a/setup/dynamic_libraries/win32/app/Debug/Qt5Guid.dll and /dev/null differ diff --git a/setup/dynamic_libraries/win32/app/Debug/Qt5Networkd.dll b/setup/dynamic_libraries/win32/app/Debug/Qt5Networkd.dll deleted file mode 100644 index 06aaec07..00000000 Binary files a/setup/dynamic_libraries/win32/app/Debug/Qt5Networkd.dll and /dev/null differ diff --git a/setup/dynamic_libraries/win32/app/Debug/Qt5Widgetsd.dll b/setup/dynamic_libraries/win32/app/Debug/Qt5Widgetsd.dll deleted file mode 100644 index ffb4fc15..00000000 Binary files a/setup/dynamic_libraries/win32/app/Debug/Qt5Widgetsd.dll and /dev/null differ diff --git a/setup/dynamic_libraries/win32/app/Debug/platforms/qwindowsd.dll b/setup/dynamic_libraries/win32/app/Debug/platforms/qwindowsd.dll deleted file mode 100644 index 4aa2c51f..00000000 Binary files a/setup/dynamic_libraries/win32/app/Debug/platforms/qwindowsd.dll and /dev/null differ diff --git a/setup/dynamic_libraries/win32/app/Release/Qt5Core.dll b/setup/dynamic_libraries/win32/app/Release/Qt5Core.dll deleted file mode 100644 index ece7d12c..00000000 Binary files a/setup/dynamic_libraries/win32/app/Release/Qt5Core.dll and /dev/null differ diff --git a/setup/dynamic_libraries/win32/app/Release/Qt5Gui.dll b/setup/dynamic_libraries/win32/app/Release/Qt5Gui.dll deleted file mode 100644 index 9f872a38..00000000 Binary files a/setup/dynamic_libraries/win32/app/Release/Qt5Gui.dll and /dev/null differ diff --git a/setup/dynamic_libraries/win32/app/Release/Qt5Network.dll b/setup/dynamic_libraries/win32/app/Release/Qt5Network.dll deleted file mode 100644 index 48830605..00000000 Binary files a/setup/dynamic_libraries/win32/app/Release/Qt5Network.dll and /dev/null differ diff --git a/setup/dynamic_libraries/win32/app/Release/Qt5Widgets.dll b/setup/dynamic_libraries/win32/app/Release/Qt5Widgets.dll deleted file mode 100644 index de881568..00000000 Binary files a/setup/dynamic_libraries/win32/app/Release/Qt5Widgets.dll and /dev/null differ diff --git a/setup/dynamic_libraries/win32/app/Release/platforms/qwindows.dll b/setup/dynamic_libraries/win32/app/Release/platforms/qwindows.dll deleted file mode 100644 index cc51ce89..00000000 Binary files a/setup/dynamic_libraries/win32/app/Release/platforms/qwindows.dll and /dev/null differ diff --git a/setup/dynamic_libraries/win64/app/Debug/Qt5Cored.dll b/setup/dynamic_libraries/win64/app/Debug/Qt5Cored.dll deleted file mode 100644 index 56a1d51b..00000000 Binary files a/setup/dynamic_libraries/win64/app/Debug/Qt5Cored.dll and /dev/null differ diff --git a/setup/dynamic_libraries/win64/app/Debug/Qt5Guid.dll b/setup/dynamic_libraries/win64/app/Debug/Qt5Guid.dll deleted file mode 100644 index 1d39761f..00000000 Binary files a/setup/dynamic_libraries/win64/app/Debug/Qt5Guid.dll and /dev/null differ diff --git a/setup/dynamic_libraries/win64/app/Debug/Qt5Networkd.dll b/setup/dynamic_libraries/win64/app/Debug/Qt5Networkd.dll deleted file mode 100644 index 13b1f4ed..00000000 Binary files a/setup/dynamic_libraries/win64/app/Debug/Qt5Networkd.dll and /dev/null differ diff --git a/setup/dynamic_libraries/win64/app/Debug/Qt5Widgetsd.dll b/setup/dynamic_libraries/win64/app/Debug/Qt5Widgetsd.dll deleted file mode 100644 index be30afde..00000000 Binary files a/setup/dynamic_libraries/win64/app/Debug/Qt5Widgetsd.dll and /dev/null differ diff --git a/setup/dynamic_libraries/win64/app/Debug/platforms/qwindowsd.dll b/setup/dynamic_libraries/win64/app/Debug/platforms/qwindowsd.dll deleted file mode 100644 index a76e9a29..00000000 Binary files a/setup/dynamic_libraries/win64/app/Debug/platforms/qwindowsd.dll and /dev/null differ diff --git a/setup/dynamic_libraries/win64/app/Release/Qt5Core.dll b/setup/dynamic_libraries/win64/app/Release/Qt5Core.dll deleted file mode 100644 index f61330dc..00000000 Binary files a/setup/dynamic_libraries/win64/app/Release/Qt5Core.dll and /dev/null differ diff --git a/setup/dynamic_libraries/win64/app/Release/Qt5Gui.dll b/setup/dynamic_libraries/win64/app/Release/Qt5Gui.dll deleted file mode 100644 index 2706f855..00000000 Binary files a/setup/dynamic_libraries/win64/app/Release/Qt5Gui.dll and /dev/null differ diff --git a/setup/dynamic_libraries/win64/app/Release/Qt5Network.dll b/setup/dynamic_libraries/win64/app/Release/Qt5Network.dll deleted file mode 100644 index 6378dbe0..00000000 Binary files a/setup/dynamic_libraries/win64/app/Release/Qt5Network.dll and /dev/null differ diff --git a/setup/dynamic_libraries/win64/app/Release/Qt5Widgets.dll b/setup/dynamic_libraries/win64/app/Release/Qt5Widgets.dll deleted file mode 100644 index af336484..00000000 Binary files a/setup/dynamic_libraries/win64/app/Release/Qt5Widgets.dll and /dev/null differ diff --git a/setup/dynamic_libraries/win64/app/Release/platforms/qwindows.dll b/setup/dynamic_libraries/win64/app/Release/platforms/qwindows.dll deleted file mode 100644 index 62afc772..00000000 Binary files a/setup/dynamic_libraries/win64/app/Release/platforms/qwindows.dll and /dev/null differ