From df04a87831faec2e75b20e5ee2505e78216b8bc1 Mon Sep 17 00:00:00 2001
From: James Duley <jagduley@gmail.com>
Date: Wed, 25 Nov 2015 10:25:38 +0000
Subject: [PATCH] LP-187 MSYS2: correct copy data dlls for msys2

---
 ground/gcs/copydata.pro                     | 33 ++++++++++++++-------
 ground/gcs/src/libs/osgearth/copydata.pro   | 12 ++++----
 ground/gcs/src/libs/sdlgamepad/copydata.pro |  2 +-
 package/winx86/gcs.nsi                      |  2 +-
 4 files changed, 31 insertions(+), 18 deletions(-)

diff --git a/ground/gcs/copydata.pro b/ground/gcs/copydata.pro
index 4fb80f27c..6e1593b95 100644
--- a/ground/gcs/copydata.pro
+++ b/ground/gcs/copydata.pro
@@ -81,13 +81,26 @@ equals(copyqt, 1) {
                   Qt5Quick$${DS}.dll \
                   Qt5QuickWidgets$${DS}.dll \
                   Qt5Qml$${DS}.dll \
-                  icuin54.dll \
-                  icudt54.dll \
-                  icuuc54.dll
-        # it is more robust to take the following DLLs from Qt rather than from MinGW
-        QT_DLLS += libgcc_s_dw2-1.dll \
-                   libstdc++-6.dll \
-                   libwinpthread-1.dll
+                  libicuin56.dll \
+                  libicudt56.dll \
+                  libicuuc56.dll \
+                  libstdc++-6.dll \
+                  libwinpthread-1.dll \
+                  libpcre16-0.dll \
+                  zlib1.dll \
+                  libharfbuzz-0.dll \
+                  libfreetype-6.dll \
+                  libbz2-1.dll \
+                  libpng16-16.dll \
+                  libglib-2.0-0.dll \
+                  libintl-8.dll \
+                  libiconv-2.dll
+        contains(QT_ARCH, i386) {
+            QT_DLLS += libgcc_s_dw2-1.dll
+        } else {
+            QT_DLLS += libgcc_s_seh-1.dll
+        }
+
         for(dll, QT_DLLS) {
             addCopyFileTarget($${dll},$$[QT_INSTALL_BINS],$${GCS_APP_PATH})
         }
@@ -97,14 +110,14 @@ equals(copyqt, 1) {
             ssleay32.dll \
             libeay32.dll
         for(dll, OPENSSL_DLLS) {
-            addCopyFileTarget($${dll},$${OPENSSL_DIR},$${GCS_APP_PATH})
+            addCopyFileTarget($${dll},$$[QT_INSTALL_BINS],$${GCS_APP_PATH})
         }
 
         # copy OpenGL DLL
         OPENGL_DLLS = \
-            opengl32_32/opengl32.dll
+            opengl32.dll
         for(dll, OPENGL_DLLS) {
-            addCopyFileTarget($${dll},$${MESAWIN_DIR},$${GCS_APP_PATH})
+            addCopyFileTarget($${dll},$$[QT_INSTALL_BINS],$${GCS_APP_PATH}/opengl32)
         }
 
         QT_PLUGINS = iconengines/qsvgicon$${DS}.dll \
diff --git a/ground/gcs/src/libs/osgearth/copydata.pro b/ground/gcs/src/libs/osgearth/copydata.pro
index bd93a4fe1..98953ea79 100644
--- a/ground/gcs/src/libs/osgearth/copydata.pro
+++ b/ground/gcs/src/libs/osgearth/copydata.pro
@@ -3,7 +3,7 @@
 #
 equals(copyosg, 1) {
 
-    OSG_VERSION = 3.4.0
+    OSG_VERSION = 3.5.1
 
     linux {
         # copy osg libraries
@@ -42,12 +42,12 @@ equals(copyosg, 1) {
         OSG_LIBS = \
             libcurl-4.dll \
             libfreetype-6.dll \
-            libgdal.dll \
-            libgeos-3-3-8.dll \
-            libgeos_c-1.dll \
-            libjpeg-9.dll \
+            libgdal-20.dll \
+            libgeos.dll \
+            libgeos_c.dll \
+            libjpeg-8.dll \
             libpng16-16.dll \
-            libproj-0.dll \
+            libproj-9.dll \
             libtiff-5.dll \
             libtiffxx-5.dll \
             zlib1.dll \
diff --git a/ground/gcs/src/libs/sdlgamepad/copydata.pro b/ground/gcs/src/libs/sdlgamepad/copydata.pro
index af9cecbff..ce6d8ff01 100644
--- a/ground/gcs/src/libs/sdlgamepad/copydata.pro
+++ b/ground/gcs/src/libs/sdlgamepad/copydata.pro
@@ -4,7 +4,7 @@ equals(copydata, 1) {
         SDL_DLLS = \
             SDL.dll
         for(dll, SDL_DLLS) {
-            addCopyFileTarget($${dll},$${SDL_DIR}/bin,$${GCS_APP_PATH})
+            addCopyFileTarget($${dll},$$[QT_INSTALL_BINS],$${GCS_APP_PATH})
         }
     }
 }
diff --git a/package/winx86/gcs.nsi b/package/winx86/gcs.nsi
index 4f1f5bb14..c447c6c2b 100644
--- a/package/winx86/gcs.nsi
+++ b/package/winx86/gcs.nsi
@@ -222,7 +222,7 @@ SectionEnd
 ; Copy Opengl32.dll if needed (disabled by default)
 Section /o "Mesa OpenGL driver" InSecInstallOpenGL
   SetOutPath "$INSTDIR\bin"
-  File /r "${GCS_BUILD_TREE}\bin\opengl32_32\opengl32.dll"
+  File /r "${GCS_BUILD_TREE}\bin\opengl32\opengl32.dll"
 SectionEnd
 
 ; AeroSimRC plugin files