Changeset: 7ce8e86340bf for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7ce8e86340bf Modified Files: tools/embedded/rpackage/configure tools/embedded/windows/monetdb_config.h.in Branch: embedded Log Message:
make this run on windows again diffs (24 lines): diff --git a/tools/embedded/rpackage/configure b/tools/embedded/rpackage/configure --- a/tools/embedded/rpackage/configure +++ b/tools/embedded/rpackage/configure @@ -6,7 +6,7 @@ CFLAGS="-I$R_INCLUDE_DIR" ./configure -- --disable-jdbc --disable-merocontrol --disable-odbc --disable-console --disable-microhttpd \ --without-perl --without-python2 --without-python3 --without-rubygem --without-unixodbc \ --without-samtools --without-sphinxclient --without-geos --without-samtools --without-readline \ ---enable-optimize --enable-debug --enable-silent-rules --disable-assert --disable-strict +--enable-optimize --enable-silent-rules --disable-assert --disable-strict # Dirty hack, normally R would call make, but we need to also do a make install to get the libs in place. # So we do it ourselves instead and then render the MonetDB makefile inert. diff --git a/tools/embedded/windows/monetdb_config.h.in b/tools/embedded/windows/monetdb_config.h.in --- a/tools/embedded/windows/monetdb_config.h.in +++ b/tools/embedded/windows/monetdb_config.h.in @@ -19,6 +19,8 @@ * _MSC_VER = 1900: Visual Studio 14.0 */ +#define HAVE_EMBEDDED 1 + #ifndef _SEEN_MONETDB_CONFIG_H #define _SEEN_MONETDB_CONFIG_H 1 _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
