Merge branch 'kilrah/vc_mp' into next
This commit is contained in:
@@ -463,4 +463,6 @@ if(NOT MSVC)
|
||||
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
|
||||
)
|
||||
endif()
|
||||
else()
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
|
||||
endif(NOT MSVC)
|
||||
|
||||
@@ -39,7 +39,7 @@ if(Qt5Widgets_FOUND)
|
||||
endif()
|
||||
|
||||
if(MSVC)
|
||||
set(CMAKE_CXX_FLAGS "/EHsc /LD")
|
||||
set(CMAKE_CXX_FLAGS "/EHsc /LD /MP")
|
||||
include_directories(${PROJECT_SOURCE_DIR}/winbuild C:/Programs/pthreads/Pre-built.2/include C:/Programs/msinttypes C:/Programs/dirent/include)
|
||||
target_link_libraries(${SIMULATOR_TARGET} PRIVATE C:/Programs/pthreads/Pre-built.2/lib/pthreadVC2.lib)
|
||||
else()
|
||||
|
||||
Reference in New Issue
Block a user