Changeset: f257c4958546 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f257c4958546 Modified Files: .vscode/extraMakefile .vscode/monetdb-environment.bat Branch: configurable_working_set Log Message:
Moving more definitions from extraMakefile to monetdb-environment.bat. diffs (63 lines): diff --git a/.vscode/extraMakefile b/.vscode/extraMakefile --- a/.vscode/extraMakefile +++ b/.vscode/extraMakefile @@ -1,20 +1,5 @@ -HAVE_STRICT=1 -HAVE_DEBUG=1 -HAVE_MONETDB5=1 -HAVE_LIBXML=1 -HAVE_LIBZ=1 -HAVE_LIBBZ2=1 -HAVE_SQL=1 -HAVE_PCRE=1 -HAVE_GDK=1 -HAVE_OPENSSL=1 -HAVE_MAPI=1 -HAVE_GEOM=1 -HAVE_PYTHON=1 -HAVE_TESTING=1 -HAVE_ICONV=1 - -bits=64 +bits= $(BITS) +prefix = $(PREFIX) LIBICONV=C:\iconv LIBZLIB=C:\zlib-1.2.11-win64-x86_64 @@ -27,4 +12,4 @@ LIBGEOS=C:\geos-3.4.2 PYTHON2=C:\Python27 PYTHON2_LIBDIR=C:\Python27\libs -prefix = $(PREFIX) + diff --git a/.vscode/monetdb-environment.bat b/.vscode/monetdb-environment.bat --- a/.vscode/monetdb-environment.bat +++ b/.vscode/monetdb-environment.bat @@ -4,8 +4,27 @@ set BUILD=%SOURCE%\build set PREFIX=%USERPROFILE%\monetdb-installation set Path=%PREFIX%\bin;%PREFIX%\lib\monetdb;%PREFIX%\lib;%Path% +rem Set Windows type. +set BITS=64 + rem additional libraries and additional tools +set HAVE_STRICT=1 +set HAVE_DEBUG=1 +set HAVE_MONETDB5=1 +set HAVE_LIBXML=1 +set HAVE_LIBZ=1 +set HAVE_LIBBZ2=1 +set HAVE_SQL=1 +set HAVE_PCRE=1 +set HAVE_GDK=1 +set HAVE_OPENSSL=1 +set HAVE_MAPI=1 +set HAVE_GEOM=1 +set HAVE_PYTHON=1 +set HAVE_TESTING=1 +set HAVE_ICONV=1 + rem Look in Cygwin's bin as a default location for programs, e.g. Bison. rem When appropriate, Windows specific packages like the Python distributions are given priority over the possible Cygwin alternatives. set CYGWIN=C:\cygwin64 _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
