From 1ed99e1bb7dd8d675be546eac2bef073f54adf90 Mon Sep 17 00:00:00 2001
From: Bill <sunyinqi0508@gmail.com>
Date: Wed, 28 Sep 2022 00:17:33 +0800
Subject: [PATCH] try fix cims

---
 Makefile             |  2 ++
 arch-check.sh        |  4 ++--
 build.py             | 14 +++++++-------
 requirements.txt     |  2 --
 server/io.cpp        |  2 +-
 server/pch.hpp       |  7 +++----
 server/pch_msc.hpp   |  3 +++
 server/server.cpp    |  2 +-
 server/winhelper.cpp |  2 +-
 9 files changed, 20 insertions(+), 18 deletions(-)
 create mode 100644 server/pch_msc.hpp

diff --git a/Makefile b/Makefile
index 291a2a6..8d8c62a 100644
--- a/Makefile
+++ b/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
diff --git a/arch-check.sh b/arch-check.sh
index a472028..98dcc2d 100644
--- a/arch-check.sh
+++ b/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`
diff --git a/build.py b/build.py
index 172b30c..d0fa6c8 100644
--- a/build.py
+++ b/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/winhelper.cpp'
+                   'server/monetdb_conn.cpp', 'server/threading.cpp', 
+                   'server/winhelper.cpp' 
                    ]
-    headerfiles = ['server/aggregations.h', 'server/hasher.h', 'server/io.h',
-                   'server/libaquery.h', 'server/monetdb_conn.h', 'server/pch.hpp',
-                   'server/table.h', 'server/threading.h', 'server/types.h', 'server/utils.h',
+    headerfiles = ['server/aggregations.h', 'server/hasher.h', 'server/io.h', 
+                   'server/libaquery.h', 'server/monetdb_conn.h', 'server/pch.hpp', 
+                   '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:
diff --git a/requirements.txt b/requirements.txt
index 412a5f1..766c81c 100644
--- a/requirements.txt
+++ b/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
-
diff --git a/server/io.cpp b/server/io.cpp
index a47b3b3..4bc4896 100644
--- a/server/io.cpp
+++ b/server/io.cpp
@@ -1,4 +1,4 @@
-#include "pch.hpp"
+#include "pch_msc.hpp"
 
 #include "io.h"
 #include "table.h"
diff --git a/server/pch.hpp b/server/pch.hpp
index c8df28e..3c7f1e0 100644
--- a/server/pch.hpp
+++ b/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
-
-#undef max
-#undef min
+#endif
\ No newline at end of file
diff --git a/server/pch_msc.hpp b/server/pch_msc.hpp
new file mode 100644
index 0000000..8ec6fab
--- /dev/null
+++ b/server/pch_msc.hpp
@@ -0,0 +1,3 @@
+#ifdef _MSCVER
+#include "pch.hpp"
+#endif
diff --git a/server/server.cpp b/server/server.cpp
index c7b130d..f0a930e 100644
--- a/server/server.cpp
+++ b/server/server.cpp
@@ -1,4 +1,4 @@
-#include "pch.hpp"
+#include "pch_msc.hpp"
 
 #include "../csv.h"
 #include <iostream>
diff --git a/server/winhelper.cpp b/server/winhelper.cpp
index ed418af..48bfa86 100644
--- a/server/winhelper.cpp
+++ b/server/winhelper.cpp
@@ -1,4 +1,4 @@
-#include "pch.hpp"
+#include "pch_msc.hpp"
 
 #ifdef _WIN32
 #include "winhelper.h"