Commit 3582df6a authored by Dick Hollenbeck's avatar Dick Hollenbeck
Browse files

molding mercury.

parent d8b270ca

common/footprint_info.cpp

+1 −1
Original line number Diff line number Diff line
@@ -321,7 +321,7 @@ bool FOOTPRINT_LIST::ReadFootprintFiles( FP_LIB_TABLE* aTable, const wxString* a 
        i += jobz;

    }



    // Wait for all the worder threads to complete, it does not matter in what order

    // Wait for all the worker threads to complete, it does not matter in what order

    // we wait for them as long as a full sweep is made.  Think of the great race,

    // everyone must finish.

    for( unsigned i=0;  i<threads.size();  ++i )

cvpcb/CMakeLists.txt

+3 −1
Original line number Diff line number Diff line
@@ -107,7 +107,6 @@ target_link_libraries( cvpcb 
    ${GDI_PLUS_LIBRARIES}

    ${GLEW_LIBRARIES}

    ${CAIRO_LIBRARIES}

    ${Boost_LIBRARIES}

    )



# Only for win32 cross compilation using MXE
@@ -127,6 +126,9 @@ if( BUILD_GITHUB_PLUGIN ) 
    target_link_libraries( cvpcb github_plugin )

endif()



# Must follow github_plugin

target_link_libraries( cvpcb ${Boost_LIBRARIES} )





###

# Add cvpcb as install target

pcbnew/CMakeLists.txt

+2 −4
Original line number Diff line number Diff line
@@ -379,7 +379,7 @@ if( KICAD_SCRIPTING_MODULES ) 
        ${GDI_PLUS_LIBRARIES}

        ${PYTHON_LIBRARIES}

        ${PCBNEW_EXTRA_LIBS}

        ${Boost_LIBRARIES}

        ${Boost_LIBRARIES}      # must follow GITHUB

        )



     # create .i files from XML doxygen parsing, docstrings.i will include all of them
@@ -533,8 +533,6 @@ endif() 
# Link executable target pcbnew with correct libraries

###



message( STATUS "Boost_LIBRARIES:${Boost_LIBRARIES}" )



target_link_libraries( pcbnew

    3d-viewer

    pcbcommon
@@ -553,7 +551,7 @@ target_link_libraries( pcbnew 
    ${PCBNEW_EXTRA_LIBS}

    ${GLEW_LIBRARIES}

    ${CAIRO_LIBRARIES}

    ${Boost_LIBRARIES}

    ${Boost_LIBRARIES}      # must follow GITHUB

    )



# Only for win32 cross compilation using MXE