updated build system

scripts/copy_mingw64_deps.sh

@@ -18,6 +18,10 @@ if [ "${PROJECT_IS_MINGW}" == "1" ] && [ "${PROJECT_STATIC_LINK}" == "OFF" ]; th
     /mingw64/bin/zlib1.dll
   )
 
+  if [ "${PROJECT_ENABLE_BACKWARD_CPP}" == "ON" ]; then
+    PROJECT_MINGW64_COPY_DEPENDENCIES+=(/mingw64/bin/msvcr90.dll)
+  fi
+
   if [ "${PROJECT_ENABLE_BOOST}" == "ON" ]; then
     PROJECT_MINGW64_COPY_DEPENDENCIES+=(/mingw64/bin/libboost*.dll)
   fi
@@ -26,10 +30,18 @@ if [ "${PROJECT_IS_MINGW}" == "1" ] && [ "${PROJECT_STATIC_LINK}" == "OFF" ]; th
     PROJECT_MINGW64_COPY_DEPENDENCIES+=(/mingw64/bin/libcli11*.dll)
   fi
 
+  if [ "${PROJECT_ENABLE_CURL}" == "ON" ]; then
+    PROJECT_MINGW64_COPY_DEPENDENCIES+=(/mingw64/bin/libcurl*.dll)
+  fi
+
   if [ "${PROJECT_ENABLE_FLAC}" == "ON" ]; then
     PROJECT_MINGW64_COPY_DEPENDENCIES+=(/mingw64/bin/libFLAC*.dll)
   fi
 
+  if [ "${PROJECT_ENABLE_FMT}" == "ON" ]; then
+    PROJECT_MINGW64_COPY_DEPENDENCIES+=(/mingw64/bin/libfmt*.dll)
+  fi
+
   if [ "${PROJECT_ENABLE_FONTCONFIG}" == "ON" ]; then
     PROJECT_MINGW64_COPY_DEPENDENCIES+=(
       /mingw64/bin/libexpat*.dll
@@ -93,14 +105,26 @@ if [ "${PROJECT_IS_MINGW}" == "1" ] && [ "${PROJECT_STATIC_LINK}" == "OFF" ]; th
     PROJECT_MINGW64_COPY_DEPENDENCIES+=(/mingw64/bin/libpugi*.dll)
   fi
 
+  if [ "${PROJECT_ENABLE_ROCKSDB}" == "ON" ]; then
+    PROJECT_MINGW64_COPY_DEPENDENCIES+=(/mingw64/bin/librocksdb*.dll)
+  fi
+
   if [ "${PROJECT_ENABLE_SDL}" == "ON" ]; then
     PROJECT_MINGW64_COPY_DEPENDENCIES+=(/mingw64/bin/SDL2*.dll)
   fi
 
+  if [ "${PROJECT_ENABLE_SECP256K1}" == "ON" ]; then
+    PROJECT_MINGW64_COPY_DEPENDENCIES+=(/mingw64/bin/libsecp256k1*.dll)
+  fi
+
   if [ "${PROJECT_ENABLE_SFML}" == "ON" ]; then
     PROJECT_MINGW64_COPY_DEPENDENCIES+=(/mingw64/bin/libsfml*.dll)
   fi
 
+  if [ "${PROJECT_ENABLE_SPDLOG}" == "ON" ]; then
+    PROJECT_MINGW64_COPY_DEPENDENCIES+=(/mingw64/bin/libspdlog*.dll)
+  fi
+
   if [ "${PROJECT_ENABLE_SQLITE}" == "ON" ]; then
     PROJECT_MINGW64_COPY_DEPENDENCIES+=(/mingw64/bin/libsqlite3-*.dll)
   fi
@@ -116,14 +140,32 @@ if [ "${PROJECT_IS_MINGW}" == "1" ] && [ "${PROJECT_STATIC_LINK}" == "OFF" ]; th
     )
   fi
 
+  if [ "${PROJECT_ENABLE_TPL}" == "ON" ]; then
+    PROJECT_MINGW64_COPY_DEPENDENCIES+=(/mingw64/bin/libtiny-process*.dll)
+  fi
+
   if [ "${PROJECT_ENABLE_VORBIS}" == "ON" ]; then
     PROJECT_MINGW64_COPY_DEPENDENCIES+=(/mingw64/bin/libvorbis*.dll)
   fi
 
   if [ "${PROJECT_ENABLE_WXWIDGETS}" == "ON" ]; then
+    PROJECT_MINGW64_COPY_DEPENDENCIES+=(/mingw64/bin/libLerc.dll)
+    PROJECT_MINGW64_COPY_DEPENDENCIES+=(/mingw64/bin/libsharpyuv-*.dll)
+    PROJECT_MINGW64_COPY_DEPENDENCIES+=(/mingw64/bin/libdeflate.dll)
+    PROJECT_MINGW64_COPY_DEPENDENCIES+=(/mingw64/bin/libglib-2*.dll)
+    PROJECT_MINGW64_COPY_DEPENDENCIES+=(/mingw64/bin/libgraphite2.dll)
+    PROJECT_MINGW64_COPY_DEPENDENCIES+=(/mingw64/bin/libharfbuzz-*.dll)
+    PROJECT_MINGW64_COPY_DEPENDENCIES+=(/mingw64/bin/libjbig-*.dll)
+    PROJECT_MINGW64_COPY_DEPENDENCIES+=(/mingw64/bin/libpcre2-*.dll)
+    PROJECT_MINGW64_COPY_DEPENDENCIES+=(/mingw64/bin/libtiff-*.dll)
+    PROJECT_MINGW64_COPY_DEPENDENCIES+=(/mingw64/bin/libwebp-*.dll)
+    PROJECT_MINGW64_COPY_DEPENDENCIES+=(/mingw64/bin/libwxbase*.dll)
     PROJECT_MINGW64_COPY_DEPENDENCIES+=(/mingw64/bin/libwxm*.dll)
+    PROJECT_MINGW64_COPY_DEPENDENCIES+=(/mingw64/bin/wxbase*.dll)
     PROJECT_MINGW64_COPY_DEPENDENCIES+=(/mingw64/bin/wxm*.dll)
+    PROJECT_MINGW64_COPY_DEPENDENCIES+=(/mingw64/lib/gcc_x64_dll/libwxbase*.dll)
     PROJECT_MINGW64_COPY_DEPENDENCIES+=(/mingw64/lib/gcc_x64_dll/libwxm*.dll)
+    PROJECT_MINGW64_COPY_DEPENDENCIES+=(/mingw64/lib/gcc_x64_dll/wxbase*.dll)
     PROJECT_MINGW64_COPY_DEPENDENCIES+=(/mingw64/lib/gcc_x64_dll/wxm*.dll)
   fi
 
@@ -132,42 +174,13 @@ if [ "${PROJECT_IS_MINGW}" == "1" ] && [ "${PROJECT_STATIC_LINK}" == "OFF" ]; th
     PROJECT_MINGW64_COPY_DEPENDENCIES+=(
       /mingw64/bin/libOpenCL*.dll
       /mingw64/bin/libopencl*.dll
+      /mingw64/bin/libgallium_wgl.dll
       /mingw64/bin/libva*.dll
       /mingw64/bin/opengl*.dll
       /mingw64/bin/vulkan*.dll
     )
   fi
 
-  if [ "${PROJECT_IS_MINGW_UNIX}" == "1" ]; then
-    if [ "${PROJECT_ENABLE_BACKWARD_CPP}" == "ON" ]; then
-      PROJECT_MINGW64_COPY_DEPENDENCIES+=(/mingw64/bin/msvcr90.dll)
-    fi
-
-    if [ "${PROJECT_ENABLE_FMT}" == "ON" ]; then
-      PROJECT_MINGW64_COPY_DEPENDENCIES+=(/mingw64/bin/libfmt*.dll)
-    fi
-
-    if [ "${PROJECT_ENABLE_CURL}" == "ON" ]; then
-      PROJECT_MINGW64_COPY_DEPENDENCIES+=(/mingw64/bin/libcurl*.dll)
-    fi
-
-    if [ "${PROJECT_ENABLE_ROCKSDB}" == "ON" ]; then
-      PROJECT_MINGW64_COPY_DEPENDENCIES+=(/mingw64/bin/librocksdb*.dll)
-    fi
-
-    if [ "${PROJECT_ENABLE_SECP256K1}" == "ON" ]; then
-      PROJECT_MINGW64_COPY_DEPENDENCIES+=(/mingw64/bin/libsecp256k1*.dll)
-    fi
-
-    if [ "${PROJECT_ENABLE_SPDLOG}" == "ON" ]; then
-      PROJECT_MINGW64_COPY_DEPENDENCIES+=(/mingw64/bin/libspdlog*.dll)
-    fi
-
-    if [ "${PROJECT_ENABLE_TPL}" == "ON" ]; then
-      PROJECT_MINGW64_COPY_DEPENDENCIES+=(/mingw64/bin/libtiny-process*.dll)
-    fi
-  fi
-
   rsync -av --progress ${PROJECT_EXTERNAL_BUILD_ROOT}/bin/*.dll "${PROJECT_DIST_DIR}/"
   rsync -av --progress ${PROJECT_EXTERNAL_BUILD_ROOT}/lib/*.dll "${PROJECT_DIST_DIR}/"
   if [ "${PROJECT_ENABLE_WXWIDGETS}" == "ON" ]; then
@@ -175,7 +188,7 @@ if [ "${PROJECT_IS_MINGW}" == "1" ] && [ "${PROJECT_STATIC_LINK}" == "OFF" ]; th
   fi
 fi
 
-if [ "${PROJECT_IS_MINGW}" == "1" ] && [ "${PROJECT_ENABLE_WINFSP}" == "ON" ]; then
+if [ "${PROJECT_ENABLE_WINFSP}" == "ON" ]; then
   if [ "${PROJECT_BUILD_ARCH}" == "x86_64" ]; then
     WINFSP_DLL_PART=x64
   fi
@@ -185,7 +198,7 @@ if [ "${PROJECT_IS_MINGW}" == "1" ] && [ "${PROJECT_ENABLE_WINFSP}" == "ON" ]; t
   fi
 fi
 
-if [ "${PROJECT_IS_MINGW}" == "1" ] && [ "${PROJECT_ENABLE_VLC}" == "ON" ]; then
+if [ "${PROJECT_ENABLE_VLC}" == "ON" ]; then
   rsync -av --progress ${PROJECT_3RD_PARTY_DIR}/vlc/ "${PROJECT_DIST_DIR}/vlc/"
 fi
 

scripts/env.sh

@@ -121,6 +121,7 @@ if [ "${PROJECT_ENABLE_VORBIS}" == "ON" ]; then
 fi
 
 if [ "${PROJECT_ENABLE_FLAC}" == "ON" ]; then
+  PROJECT_ENABLE_LIBICONV=ON
   PROJECT_ENABLE_OGG=ON
   PROJECT_ENABLE_VORBIS=ON
 fi