Add support for bundling the -system .dll's into the MinGW builds.

4 files changed, 177 insertions, 32 deletions

diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 80b866839c19..bffd5bcfb48b 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -810,32 +810,6 @@ End
 #endif
 
 
-#if defined(WNT) && defined( _gcc3 )
-
-#if defined(MINGW_GCCDLL)
-
-File gid_Brand_File_Lib_Mingw_GccS
-    TXT_FILE_BODY;
-    Dir = gid_Brand_Dir_Program;
-    Name = MINGW_GCCDLL;
-    Styles = (PACKED);
-End
-
-#endif
-
-#if defined(MINGW_GXXDLL)
-
-File gid_Brand_File_Lib_Mingw_Stdcpp
-    TXT_FILE_BODY;
-    Dir = gid_Brand_Dir_Program;
-    Name = MINGW_GXXDLL;
-    Styles = (PACKED);
-End
-
-#endif
-
-#endif
-
 // Profiles
 
 Profile gid_Brand_Profile_Bootstrap_Ini
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 44a85f82f38d..568ab94e3a65 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -1528,7 +1528,7 @@ File gid_File_Lib_Onlinecheck
 End
 #endif
 
-#ifdef OPENSSL
+#ifndef SYSTEM_OPENSSL
 File gid_File_Lib_Openssl
     TXT_FILE_BODY;
     Styles = (PACKED);
@@ -1539,7 +1539,7 @@ File gid_File_Lib_Openssl
 End
 #endif
 
-#ifdef OPENSSL
+#ifndef SYSTEM_OPENSSL
 File gid_File_Lib_Crypto
     TXT_FILE_BODY;
     Styles = (PACKED);
diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk
index 391348a51124..ce2ab526fb22 100644
--- a/scp2/source/ooo/makefile.mk
+++ b/scp2/source/ooo/makefile.mk
@@ -103,6 +103,10 @@ SCPDEFS+=-DENABLE_CAIROCANVAS
 .ENDIF
 .ENDIF
 
+.IF "$(SYSTEM_EXPAT)" == "YES"
+SCPDEFS+=-DSYSTEM_EXPAT
+.ENDIF
+
 .IF "$(SYSTEM_CAIRO)" == "YES"
 SCPDEFS+=-DSYSTEM_CAIRO
 .ENDIF
@@ -158,6 +162,18 @@ SCPDEFS+=-DSYSTEM_PORTAUDIO
 SCPDEFS+=-DSYSTEM_HUNSPELL
 .ENDIF
 
+.IF "$(SYSTEM_HYPH)" == "YES"
+SCPDEFS+=-DSYSTEM_HYPH
+.ENDIF
+
+.IF "$(SYSTEM_MYTHES)" == "YES"
+SCPDEFS+=-DSYSTEM_MYTHES
+.ENDIF
+
+.IF "$(SYSTEM_LPSOLVE)" == "YES"
+SCPDEFS+=-DSYSTEM_LPSOLVE
+.ENDIF
+
 .IF "$(SYSTEM_REDLAND)" == "YES"
 SCPDEFS+=-DSYSTEM_REDLAND
 .ELSE
@@ -189,7 +205,11 @@ SCPDEFS+=-DSYSTEM_LUCENE
 .ENDIF
 
 .IF "$(SYSTEM_ICU)" == "YES"
-SCPDEFS+=-DSYSTEM_ICU
+SCPDEFS+=\
+    -DSYSTEM_ICU \
+    -DICU_MAJOR=$(ICU_MAJOR) \
+    -DICU_MINOR=$(ICU_MINOR) \
+    -DICU_MICRO=$(ICU_MICRO)
 .ELSE
 .INCLUDE :  icuversion.mk
 SCPDEFS+=\
@@ -198,6 +218,10 @@ SCPDEFS+=\
     -DICU_MICRO=$(ICU_MICRO)
 .ENDIF
 
+.IF "$(SYSTEM_GRAPHITE)" == "YES"
+SCPDEFS+=-DSYSTEM_GRAPHITE
+.ENDIF
+
 SCPDEFS+=-DISOLANG_MAJOR=$(ISOLANG_MAJOR)
 
 .IF "$(DISABLE_NEON)" == "TRUE"
@@ -207,9 +231,8 @@ SCPDEFS+=-DDISABLE_NEON
 SCPDEFS+=-DSYSTEM_NEON
 .ENDIF
 
-# if yes or unset (neon not used) -> do not install openssl library!
-.IF "$(SYSTEM_OPENSSL)" != "YES"
-SCPDEFS+=-DOPENSSL
+.IF "$(SYSTEM_OPENSSL)" == "YES"
+SCPDEFS+=-DSYSTEM_OPENSSL
 .ENDIF
 
 .IF "$(DISABLE_ATL)"!=""
@@ -329,6 +352,7 @@ PARFILES +=                        \
         folderitem_ooo.par         \
         registryitem_ooo.par       \
         vc_redist.par              \
+        mingw_dlls.par             \
         windowscustomaction_ooo.par
 .ENDIF
 
diff --git a/scp2/source/ooo/mingw_dlls.scp b/scp2/source/ooo/mingw_dlls.scp
new file mode 100644
index 000000000000..a6ace0dcc41c
--- /dev/null
+++ b/scp2/source/ooo/mingw_dlls.scp
@@ -0,0 +1,147 @@
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License or as specified alternatively below. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * Major Contributor(s):
+ * Jan Holesovsky <kendy@suse.cz> (initial developer) ]
+ *
+ * All Rights Reserved.
+ *
+ * For minor contributions see the git repository.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+
+#include "macros.inc"
+
+#if defined(WNT) && defined( _gcc3 )
+
+#define MINGW_DLL(id,name) \
+    File id \
+        PACKED_LIB_FILE_BODY; \
+        Dir = gid_Brand_Dir_Program; \
+        Name = name; \
+        Styles = (PACKED); \
+    End
+
+#ifdef SYSTEM_EXPAT
+MINGW_DLL( gid_Brand_File_Lib_Mingw_Libexpat, libexpat-1.dll )
+#endif
+
+#ifdef SYSTEM_LIBXSLT
+MINGW_DLL( gid_Brand_File_Lib_Mingw_Libxslt, libxslt-1.dll )
+#endif
+
+#ifdef SYSTEM_LIBXML
+MINGW_DLL( gid_Brand_File_Lib_Mingw_Zlib,    zlib1.dll )
+MINGW_DLL( gid_Brand_File_Lib_Mingw_Libxml2, libxml2-2.dll )
+#endif
+
+#ifdef SYSTEM_DB
+MINGW_DLL( gid_Brand_File_Lib_Mingw_Libdb, libdb-4.8.dll )
+#endif
+
+#ifdef SYSTEM_CURL
+MINGW_DLL( gid_Brand_File_Lib_Mingw_Libintl,     libintl-8.dll )
+MINGW_DLL( gid_Brand_File_Lib_Mingw_Libdn,       libidn-11.dll )
+MINGW_DLL( gid_Brand_File_Lib_Mingw_Libnspr,     libnspr4.dll )
+MINGW_DLL( gid_Brand_File_Lib_Mingw_Nssutil,     nssutil3.dll )
+MINGW_DLL( gid_Brand_File_Lib_Mingw_Libplc,      libplc4.dll )
+MINGW_DLL( gid_Brand_File_Lib_Mingw_Libplds,     libplds4.dll )
+MINGW_DLL( gid_Brand_File_Lib_Mingw_nss,         nss3.dll )
+MINGW_DLL( gid_Brand_File_Lib_Mingw_ssl,         ssl3.dll )
+MINGW_DLL( gid_Brand_File_Lib_Mingw_Libgpgerror, libgpg-error-0.dll )
+MINGW_DLL( gid_Brand_File_Lib_Mingw_Libgcrypt,   libgcrypt-11.dll )
+MINGW_DLL( gid_Brand_File_Lib_Mingw_Libssh,      libssh2-1.dll )
+MINGW_DLL( gid_Brand_File_Lib_Mingw_Libcurl,     libcurl-4.dll )
+#endif
+
+#ifdef SYSTEM_ICU
+MINGW_DLL( gid_Brand_File_Lib_Mingw_Icui18n, STRING(CONCAT4(icui18n,ICU_MAJOR,ICU_MINOR,.dll)) )
+MINGW_DLL( gid_Brand_File_Lib_Mingw_Icuuc,   STRING(CONCAT4(icuuc,ICU_MAJOR,ICU_MINOR,.dll)) )
+MINGW_DLL( gid_Brand_File_Lib_Mingw_Icudata, STRING(CONCAT4(icudata,ICU_MAJOR,ICU_MINOR,.dll)) )
+#endif
+
+#ifdef SYSTEM_GRAPHITE
+MINGW_DLL( gid_Brand_File_Lib_Mingw_Libgrahpite, libgraphite2.dll )
+#endif
+
+#ifdef SYSTEM_NEON
+MINGW_DLL( gid_Brand_File_Lib_Mingw_Libtasn,   libtasn1-3.dll )
+MINGW_DLL( gid_Brand_File_Lib_Mingw_Libgnutls, libgnutls-26.dll )
+MINGW_DLL( gid_Brand_File_Lib_Mingw_Libneon,   libneon-27.dll )
+#endif
+
+#ifdef SYSTEM_OPENSSL
+MINGW_DLL( gid_Brand_File_Lib_Mingw_Libssl, libssl-8.dll )
+MINGW_DLL( gid_Brand_File_Lib_Mingw_Libcrypto, libcrypto-8.dll )
+#endif
+
+#ifdef SYSTEM_REDLAND
+MINGW_DLL( gid_Brand_File_Lib_Mingw_Libraptor, libraptor-1.dll )
+MINGW_DLL( gid_Brand_File_Lib_Mingw_Librasqal, librasqal-2.dll )
+MINGW_DLL( gid_Brand_File_Lib_Mingw_Libqslite, libsqlite3-0.dll )
+MINGW_DLL( gid_Brand_File_Lib_Mingw_Librdf,    librdf-0.dll )
+#endif
+
+#ifdef SYSTEM_HUNSPELL
+MINGW_DLL( gid_Brand_File_Lib_Mingw_Libhunspell, libhunspell-1.3-0.dll )
+#endif
+
+#ifdef SYSTEM_HYPH
+MINGW_DLL( gid_Brand_File_Lib_Mingw_Libhyphen, libhyphen-0.dll )
+#endif
+
+#ifdef SYSTEM_MYTHES
+MINGW_DLL( gid_Brand_File_Lib_Mingw_Libmythes, libmythes-1.2-0.dll )
+#endif
+
+#ifdef SYSTEM_LPSOLVE
+MINGW_DLL( gid_Brand_File_Lib_Mingw_Lpsolve, lpsolve55.dll )
+#endif
+
+#ifdef SYSTEM_CAIRO
+MINGW_DLL( gid_Brand_File_Lib_Mingw_Libfontconfig, libfontconfig-1.dll )
+MINGW_DLL( gid_Brand_File_Lib_Mingw_Libfreetype,   libfreetype-6.dll )
+MINGW_DLL( gid_Brand_File_Lib_Mingw_Libpixman,     libpixman-1-0.dll )
+MINGW_DLL( gid_Brand_File_Lib_Mingw_Libpng,        libpng15-15.dll )
+MINGW_DLL( gid_Brand_File_Lib_Mingw_Libcairo,      libcairo-2.dll )
+#endif
+
+#if defined(MINGW_GCCDLL)
+
+File gid_Brand_File_Lib_Mingw_GccS
+    TXT_FILE_BODY;
+    Dir = gid_Brand_Dir_Program;
+    Name = MINGW_GCCDLL;
+    Styles = (PACKED);
+End
+
+#endif
+
+#if defined(MINGW_GXXDLL)
+
+File gid_Brand_File_Lib_Mingw_Stdcpp
+    TXT_FILE_BODY;
+    Dir = gid_Brand_Dir_Program;
+    Name = MINGW_GXXDLL;
+    Styles = (PACKED);
+End
+
+#endif
+
+#endif
+