From e096bc699ecd3d2f6457f22a6945c58ed69f9a29 Mon Sep 17 00:00:00 2001 From: Yuanming Hu Date: Tue, 21 Mar 2017 18:13:06 +0800 Subject: [PATCH] Fixed Linux build; Closed #33 --- CMakeLists.txt | 4 ++-- python/taichi/core/load_core.py | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index befb77454be18..ae282ed1b3a56 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,14 +1,14 @@ cmake_minimum_required(VERSION 2.8) project(taichi) -include_directories(src) - if (WIN32) link_directories(${CMAKE_CURRENT_SOURCE_DIR}/external/lib) endif () set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/build") +message("Using c++ compiler " ${CMAKE_CXX_COMPILER}) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -DGL_DO_NOT_WARN_IF_MULTI_GL_VERSION_HEADERS_INCLUDED") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DTC_PASS_EXCEPTION_TO_PYTHON") diff --git a/python/taichi/core/load_core.py b/python/taichi/core/load_core.py index 1b3175fb61420..3c287a18f2f4c 100644 --- a/python/taichi/core/load_core.py +++ b/python/taichi/core/load_core.py @@ -33,10 +33,6 @@ os.chdir(tmp_cwd) else: assert False, "Library taichi_core doesn't exist." - if os.path.exists('libtaichi_core.so'): - shutil.copy('libtaichi_core.so', 'taichi_core.so') - sys.path.append(".") - import taichi_core as tc_core elif get_os_name() == 'win': bin_dir = get_bin_directory() + '/' dll_path = bin_dir + '/Release/taichi_core.dll'