Skip to content

Commit

Permalink
Fixed Linux build; Closed #33
Browse files Browse the repository at this point in the history
  • Loading branch information
yuanming-hu committed Mar 21, 2017
1 parent 2d37c38 commit e096bc6
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 6 deletions.
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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")
Expand Down
4 changes: 0 additions & 4 deletions python/taichi/core/load_core.py
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down

0 comments on commit e096bc6

Please sign in to comment.