Changeset: f216875bbf2a for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f216875bbf2a Added Files: .vscode/extraMakefile Modified Files: .vscode/run_install.bat Branch: configurable_working_set Log Message:
Add extraMakefile to version control and simplify install command. diffs (44 lines): diff --git a/.vscode/extraMakefile b/.vscode/extraMakefile new file mode 100644 --- /dev/null +++ b/.vscode/extraMakefile @@ -0,0 +1,30 @@ +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 + +LIBICONV=C:\iconv +LIBZLIB=C:\zlib-1.2.11-win64-x86_64 +LIBZLIBFILE=zlib +LIBXML2=C:\libxml2 +LIBBZIP2=C:\bzip2-1.0.6 +LIBOPENSSL=C:\openssl +LIBPCRE=C:\Program Files\PCRE +LIBGEOS=C:\geos-3.4.2 +PYTHON2=C:\Python27 +PYTHON2_LIBDIR=C:\Python27\libs + +prefix = $(PREFIX) diff --git a/.vscode/run_install.bat b/.vscode/run_install.bat --- a/.vscode/run_install.bat +++ b/.vscode/run_install.bat @@ -6,4 +6,4 @@ call "C:\Program Files (x86)\Microsoft V cd %BUILD% -nmake -nologo -f ..\NT\Makefile HAVE_LIBXML=1 HAVE_LIBZ=1 HAVE_LIBBZ2=1 HAVE_MONETDB5=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 "MAKE_INCLUDEFILE=%SOURCE%\.vscode\extraMakefile" install +nmake -nologo -f ..\NT\Makefile "MAKE_INCLUDEFILE=%SOURCE%\.vscode\extraMakefile" install _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
