diff --git a/compiler.cmake b/compiler.cmake index 2ad9a62..7396ab4 100644 --- a/compiler.cmake +++ b/compiler.cmake @@ -8,7 +8,6 @@ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /std:c++14") - add_compile_options(/arch:AVX2) add_definitions(-D_CRT_SECURE_NO_WARNINGS) ELSE() @@ -20,13 +19,11 @@ ELSE() ENDIF() if(USE_CLANG) - SET(CMAKE_C_COMPILER clang) - SET(CMAKE_CXX_COMPILER clang++) + SET(CMAKE_C_COMPILER /usr/bin/clang) + SET(CMAKE_CXX_COMPILER /usr/bin/clang++) endif() ENDIF() - add_compile_options(-mavx) - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11") diff --git a/math.cmake b/math.cmake index 7c715b3..d1aecfb 100644 --- a/math.cmake +++ b/math.cmake @@ -1,4 +1,10 @@ macro(use_mgl MGL_PATH) + IF(WIN32) + add_compile_options(/arch:AVX2) + ELSE() + add_compile_options(-mavx2) + ENDIF() + add_definitions(-DMATH_USE_OPENGL) add_definitions(-DMATH_RIGHTHANDED_CAMERA) add_definitions(-DMATH_AVX)