Changeset: 20d125c6d685 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=20d125c6d685
Modified Files:
NT/mkodbcwxs.py
NT/mksqlwxs.py
Branch: config_rss
Log Message:
Merge with Mar2018 branch.
diffs (24 lines):
diff --git a/NT/mkodbcwxs.py b/NT/mkodbcwxs.py
--- a/NT/mkodbcwxs.py
+++ b/NT/mkodbcwxs.py
@@ -75,7 +75,7 @@ def main():
r'lib\libMonetODBC.dll', r'lib\libMonetODBC.pdb',
r'lib\libMonetODBCs.dll', r'lib\libMonetODBCs.pdb',
r'lib\libstream.dll', r'lib\libstream.pdb',
- r'%s\bin\iconv.dll' % makedefs['LIBICONV'],
+ r'%s\bin\iconv-2.dll' % makedefs['LIBICONV'],
r'%s\bin\libbz2.dll' % makedefs['LIBBZIP2'],
r'%s\bin\libcrypto-1_1%s.dll' % (makedefs['LIBOPENSSL'],
libcrypto),
r'%s\bin\zlib1.dll' % makedefs['LIBZLIB']])
diff --git a/NT/mksqlwxs.py b/NT/mksqlwxs.py
--- a/NT/mksqlwxs.py
+++ b/NT/mksqlwxs.py
@@ -86,7 +86,7 @@ def main():
r'lib\libmapi.dll', r'lib\libmapi.pdb',
r'lib\libmonetdb5.dll', r'lib\libmonetdb5.pdb',
r'lib\libstream.dll', r'lib\libstream.pdb',
- r'%s\bin\iconv.dll' % makedefs['LIBICONV'],
+ r'%s\bin\iconv-2.dll' % makedefs['LIBICONV'],
r'%s\bin\libbz2.dll' % makedefs['LIBBZIP2'],
r'%s\bin\libcrypto-1_1%s.dll' % (makedefs['LIBOPENSSL'],
libcrypto),
r'%s\bin\libxml2.dll' % makedefs['LIBXML2'],
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
