Changeset: 9aa8cb614c9a for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9aa8cb614c9a
Modified Files:
NT/mksqlwxs.py
Branch: default
Log Message:
Merge with Mar2018 branch.
diffs (12 lines):
diff --git a/NT/mksqlwxs.py b/NT/mksqlwxs.py
--- a/NT/mksqlwxs.py
+++ b/NT/mksqlwxs.py
@@ -126,7 +126,7 @@ def main():
r'lib\libmapi.lib',
r'lib\libmonetdb5.lib',
r'lib\libstream.lib',
- r'%s\lib\iconv.lib' % makedefs['LIBICONV'],
+ r'%s\lib\iconv.dll.lib' % makedefs['LIBICONV'],
r'%s\lib\libbz2.lib' % makedefs['LIBBZIP2'],
r'%s\lib\libcrypto.lib' % makedefs['LIBOPENSSL'],
r'%s\lib\libxml2.lib' % makedefs['LIBXML2'],
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
