try fix cims

Makefile

@@ -48,6 +48,8 @@ else
 		endif
 	else
 		OPTFLAGS += -march=native
+		MonetDB_LIB += $AQ_MONETDB_LIB
+		MonetDB_INC += $AQ_MONETDB_INC
 		MonetDB_INC += -I/usr/local/include/monetdb -I/usr/include/monetdb 
 	endif
 	MonetDB_LIB += -lmonetdbe

arch-check.sh

@@ -1,9 +1,9 @@
 ARCH=`uname -m`
 ARCH2=`arch`
-echo Current architechure: $ARCH $ARCH2
+echo "Current architechure: (uname -m) => $ARCH; (arch) => $ARCH2"
 echo Current shell: $SHELL
 PASSED=1
-for i in python3 c++ make ranlib libtool $SHELL
+for i in python3 c++ make ranlib libtool $SHELL $CXX
 do
 	FILEPATH=`which $i`
 	FILEINFO=`file $FILEPATH`

build.py

@@ -70,16 +70,16 @@ class checksums:
         
 class build_manager:
     sourcefiles = [
-                   'build.py', 'Makefile',
+                   'build.py', 'Makefile', 
                    'server/server.cpp', 'server/io.cpp',  
-                   'server/monetdb_conn.cpp', 'server/threading.cpp',
+                   'server/monetdb_conn.cpp', 'server/threading.cpp', 
-                   'server/winhelper.cpp'
+                   'server/winhelper.cpp' 
                    ]
-    headerfiles = ['server/aggregations.h', 'server/hasher.h', 'server/io.h',
+    headerfiles = ['server/aggregations.h', 'server/hasher.h', 'server/io.h', 
-                   'server/libaquery.h', 'server/monetdb_conn.h', 'server/pch.hpp',
+                   'server/libaquery.h', 'server/monetdb_conn.h', 'server/pch.hpp', 
-                   'server/table.h', 'server/threading.h', 'server/types.h', 'server/utils.h',
+                   'server/table.h', 'server/threading.h', 'server/types.h', 'server/utils.h', 
                    'server/winhelper.h', 'server/gc.hpp', 'server/vector_type.hpp', 
-                   'server/table_ext_monetdb.hpp'
+                   'server/table_ext_monetdb.hpp' 
                    ]
    
     class DriverBase:

requirements.txt

@@ -3,7 +3,5 @@ mo-dots==9.173.22126
 mo-parsing==8.183.22158
 mo-imports==7.169.22121
 dataclasses; python_version < '3.7'
-readline; sys_platform == 'linux'
 vswhere; sys_platform == 'win32'
 numpy
-

server/io.cpp

@@ -1,4 +1,4 @@
-#include "pch.hpp"
+#include "pch_msc.hpp"
 
 #include "io.h"
 #include "table.h"

server/pch.hpp

@@ -11,12 +11,11 @@
 #include "../csv.h"
 #ifdef _WIN32
 #include "winhelper.h"
+#undef max
+#undef min
 #else
 #include <dlfcn.h>
 #include <fcntl.h>
 #include <sys/mman.h>
 #endif
-#endif
+#endif
-
-#undef max
-#undef min

server/pch_msc.hpp

@@ -0,0 +1,3 @@
+#ifdef _MSCVER
+#include "pch.hpp"
+#endif

server/server.cpp

@@ -1,4 +1,4 @@
-#include "pch.hpp"
+#include "pch_msc.hpp"
 
 #include "../csv.h"
 #include <iostream>

server/winhelper.cpp

@@ -1,4 +1,4 @@
-#include "pch.hpp"
+#include "pch_msc.hpp"
 
 #ifdef _WIN32
 #include "winhelper.h"