Commit 1f277fd6 authored by jean-pierre charras's avatar jean-pierre charras
Browse files

Remove Kbool from Kicad. Use Clipper instead.

parent 7fd24c7f

3d-viewer/3d_draw.cpp

+2 −6
Original line number Original line Diff line number Diff line
@@ -170,13 +170,9 @@ GLuint EDA_3D_CANVAS::CreateDrawGL_List() 
    if( g_Parm_3D_Visu.m_Layers < 2 )

    if( g_Parm_3D_Visu.m_Layers < 2 )

        g_Parm_3D_Visu.m_Layers = 2;

        g_Parm_3D_Visu.m_Layers = 2;





    g_Parm_3D_Visu.m_BoardScale = 2.0 / max( g_Parm_3D_Visu.m_BoardSize.x,

    g_Parm_3D_Visu.m_BoardScale = 2.0 / std::max( g_Parm_3D_Visu.m_BoardSize.x,

                                                  g_Parm_3D_Visu.m_BoardSize.y );

                                                  g_Parm_3D_Visu.m_BoardSize.y );





    // @TODO: epoxy_width (board thickness) must be set by user,

    // because all boards thickness no not match with this setup:

    // double epoxy_width = 1.6;    // epoxy width in mm



    g_Parm_3D_Visu.m_Epoxy_Width = pcb->GetDesignSettings().GetBoardThickness()

    g_Parm_3D_Visu.m_Epoxy_Width = pcb->GetDesignSettings().GetBoardThickness()

                                   * g_Parm_3D_Visu.m_BoardScale;

                                   * g_Parm_3D_Visu.m_BoardScale;

bitmap2component/CMakeLists.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -46,7 +46,7 @@ endif(APPLE) 
target_link_libraries( bitmap2component common polygon bitmaps

target_link_libraries( bitmap2component common polygon bitmaps

                        ${wxWidgets_LIBRARIES}

                        ${wxWidgets_LIBRARIES}

                        potrace

                        potrace

                        kbool )

                        )





install(TARGETS bitmap2component

install(TARGETS bitmap2component

        DESTINATION ${KICAD_BIN}

        DESTINATION ${KICAD_BIN}

common/footprint_info.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -70,7 +70,7 @@ bool FOOTPRINT_LIST::ReadFootprintFiles( wxArrayString& aFootprintsLibNames ) 




                for( unsigned i=0; i<fpnames.GetCount();  ++i )

                for( unsigned i=0; i<fpnames.GetCount();  ++i )

                {

                {

                    auto_ptr<MODULE> m( pi->FootprintLoad( libPath, fpnames[i] ) );

                    std::auto_ptr<MODULE> m( pi->FootprintLoad( libPath, fpnames[i] ) );





                    // we're loading what we enumerated, all must be there.

                    // we're loading what we enumerated, all must be there.

                    wxASSERT( m.get() );

                    wxASSERT( m.get() );

cvpcb/CMakeLists.txt

+0 −1
Original line number Original line Diff line number Diff line
@@ -98,7 +98,6 @@ target_link_libraries(cvpcb 
    common

    common

    bitmaps

    bitmaps

    polygon

    polygon

    kbool

    ${wxWidgets_LIBRARIES}

    ${wxWidgets_LIBRARIES}

    ${OPENGL_LIBRARIES}

    ${OPENGL_LIBRARIES}

    ${GDI_PLUS_LIBRARIES}

    ${GDI_PLUS_LIBRARIES}

eeschema/CMakeLists.txt

+0 −1
Original line number Original line Diff line number Diff line
@@ -217,7 +217,6 @@ target_link_libraries(eeschema 
    common

    common

    bitmaps

    bitmaps

    polygon

    polygon

    kbool

    ${wxWidgets_LIBRARIES}

    ${wxWidgets_LIBRARIES}

    ${GDI_PLUS_LIBRARIES}

    ${GDI_PLUS_LIBRARIES}

    )

    )