piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'kilrah/vc_mp' into next

Browse Source
This commit is contained in:
Andre Bernet
2016-12-09 11:24:43 +01:00
parent fe85290a18 a743068fdc
commit e3cb1fe91b
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
companion/src/CMakeLists.txt
+1 -1
View File
@@ -55,7 +55,7 @@ endif()
add_definitions(-DQXT_STATIC)
if(MSVC)
set(CMAKE_CXX_FLAGS "/EHsc /LD")
set(CMAKE_CXX_FLAGS "/EHsc /LD /MP")
SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SUBSYSTEM:WINDOWS,5.01")
include_directories(${PROJECT_SOURCE_DIR}/winbuild C:/Programs/pthreads/Pre-built.2/include C:/Programs/msinttypes C:/Programs/dirent/include)
link_directories(C:/Programs/pthreads/Pre-built.2/lib/)
radio/src/CMakeLists.txt
+2
View File
@@ -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)
radio/src/targets/simu/CMakeLists.txt
+1 -1
View File
@@ -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()