Changeset: ccbc691e85e9 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ccbc691e85e9
Modified Files:
NT/monetdb_config.h.in
tools/embedded/rpackage/configure.win
Branch: Jun2016
Log Message:
Windows fix
diffs (27 lines):
diff --git a/NT/monetdb_config.h.in b/NT/monetdb_config.h.in
--- a/NT/monetdb_config.h.in
+++ b/NT/monetdb_config.h.in
@@ -1134,6 +1134,11 @@ typedef __uint128_t uhge;
#ifdef HAVE_EMBEDDED_R
#define _MSC_EXTENSIONS 1
#undef HAVE_CTIME_R
+#define PROMPT1 "\001\001\n" /* prompt: ready for new query
*/
+#define PROMPT2 "\001\002\n" /* prompt: more data needed */
+#else
+#define HAVE_MAPI 1
#endif
+
#endif /* _SEEN_MONETDB_CONFIG_H */
diff --git a/tools/embedded/rpackage/configure.win
b/tools/embedded/rpackage/configure.win
--- a/tools/embedded/rpackage/configure.win
+++ b/tools/embedded/rpackage/configure.win
@@ -25,7 +25,7 @@ R --quiet -e "setwd('src/tools/embedded/
cd src
make -j
-OFILES=`find common clients/mapilib/ gdk monetdb5/mal monetdb5/modules
monetdb5/optimizer sql tools/embedded -name "*.lo" | tr "\n" " "`
+OFILES=`find common gdk monetdb5/mal monetdb5/modules monetdb5/optimizer sql
tools/embedded -name "*.lo" | tr "\n" " "`
$CC -shared -o libmonetdb5.dll $OFILES -lws2_32 -lpthread -lpsapi
-Ltools/embedded/windows/pcre-8.37/libs/$R_ARCH/ -lpcre `$R_CMD config
--ldflags`
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
