try fix cims

dev
Bill 2 years ago
parent 15f11f1eab
commit 1ed99e1bb7

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

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

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

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

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

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

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

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

Loading…
Cancel
Save