caiyu/nextpnr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix MSVC build

Browse Source
This commit is contained in:
Miodrag Milanovic 2018-07-16 08:07:57 +02:00
parent 5531546d6b
commit 29df566a60
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -214,7 +214,10 @@ foreach (family ${ARCH})
# Include family-specific source files to all family targets and set defines appropriately # Include family-specific source files to all family targets and set defines appropriately
target_include_directories(${target} PRIVATE ${family}/ ${CMAKE_CURRENT_BINARY_DIR}/generated/) target_include_directories(${target} PRIVATE ${family}/ ${CMAKE_CURRENT_BINARY_DIR}/generated/)
target_compile_definitions(${target} PRIVATE NEXTPNR_NAMESPACE=nextpnr_${family} ARCH_${ufamily} ARCHNAME=${family}) target_compile_definitions(${target} PRIVATE NEXTPNR_NAMESPACE=nextpnr_${family} ARCH_${ufamily} ARCHNAME=${family})
target_link_libraries(${target} LINK_PUBLIC ${Boost_LIBRARIES} pthread) target_link_libraries(${target} LINK_PUBLIC ${Boost_LIBRARIES})
if (NOT MSVC)
target_link_libraries(${target} LINK_PUBLIC pthread)
endif()
add_sanitizers(${target}) add_sanitizers(${target})
if (BUILD_GUI) if (BUILD_GUI)
target_include_directories(${target} PRIVATE gui/${family}/ gui/) target_include_directories(${target} PRIVATE gui/${family}/ gui/)

8
gui/fpgaviewwidget.cc
View File

@ -400,10 +400,10 @@ void FPGAViewWidget::paintGL()
} }
lineShader_.draw(grid, gridColor_, thick1Px, matrix); lineShader_.draw(grid, gridColor_, thick1Px, matrix);
LineShaderData shaders[4] = {[GraphicElement::G_FRAME] = LineShaderData(), LineShaderData shaders[4] = {LineShaderData(),
[GraphicElement::G_HIDDEN] = LineShaderData(), LineShaderData(),
[GraphicElement::G_INACTIVE] = LineShaderData(), LineShaderData(),
[GraphicElement::G_ACTIVE] = LineShaderData()}; LineShaderData()};
if (ctx_) { if (ctx_) {
// Draw Bels. // Draw Bels.