eeschema-gal: make sure all other Kicad apps compile after eeschema gal hacks
This commit is contained in:
parent
90c7c60471
commit
e439b17fa1
|
@ -6,6 +6,7 @@ configure_file( 3d_plugin_dir.h.in 3d_plugin_dir.h @ONLY )
|
||||||
include_directories(BEFORE ${INC_BEFORE})
|
include_directories(BEFORE ${INC_BEFORE})
|
||||||
include_directories(
|
include_directories(
|
||||||
${CMAKE_CURRENT_BINARY_DIR}
|
${CMAKE_CURRENT_BINARY_DIR}
|
||||||
|
../include/legacy_wx
|
||||||
../pcbnew
|
../pcbnew
|
||||||
../polygon
|
../polygon
|
||||||
3d_canvas
|
3d_canvas
|
||||||
|
|
|
@ -7,6 +7,7 @@ add_definitions( -DCVPCB )
|
||||||
|
|
||||||
include_directories( BEFORE ${INC_BEFORE} )
|
include_directories( BEFORE ${INC_BEFORE} )
|
||||||
include_directories(
|
include_directories(
|
||||||
|
../include/legacy_wx
|
||||||
./dialogs
|
./dialogs
|
||||||
../3d-viewer
|
../3d-viewer
|
||||||
../pcbnew
|
../pcbnew
|
||||||
|
@ -149,6 +150,23 @@ target_link_libraries( cvpcb_kiface
|
||||||
bitmaps
|
bitmaps
|
||||||
polygon
|
polygon
|
||||||
gal
|
gal
|
||||||
|
legacy_wx
|
||||||
|
pcbcommon
|
||||||
|
pcad2kicadpcb
|
||||||
|
3d-viewer
|
||||||
|
common
|
||||||
|
bitmaps
|
||||||
|
polygon
|
||||||
|
gal
|
||||||
|
legacy_wx
|
||||||
|
pcbcommon
|
||||||
|
pcad2kicadpcb
|
||||||
|
3d-viewer
|
||||||
|
common
|
||||||
|
bitmaps
|
||||||
|
polygon
|
||||||
|
gal
|
||||||
|
legacy_wx
|
||||||
${wxWidgets_LIBRARIES}
|
${wxWidgets_LIBRARIES}
|
||||||
${GDI_PLUS_LIBRARIES}
|
${GDI_PLUS_LIBRARIES}
|
||||||
)
|
)
|
||||||
|
|
|
@ -7,6 +7,7 @@ add_definitions(-DGERBVIEW)
|
||||||
|
|
||||||
include_directories( BEFORE ${INC_BEFORE} )
|
include_directories( BEFORE ${INC_BEFORE} )
|
||||||
include_directories(
|
include_directories(
|
||||||
|
../include/legacy_wx
|
||||||
../pcbnew
|
../pcbnew
|
||||||
dialogs
|
dialogs
|
||||||
../3d-viewer
|
../3d-viewer
|
||||||
|
@ -120,6 +121,7 @@ target_link_libraries( gerbview
|
||||||
common
|
common
|
||||||
bitmaps
|
bitmaps
|
||||||
gal
|
gal
|
||||||
|
legacy_wx
|
||||||
${wxWidgets_LIBRARIES}
|
${wxWidgets_LIBRARIES}
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -145,6 +147,17 @@ target_link_libraries( gerbview_kiface
|
||||||
polygon
|
polygon
|
||||||
bitmaps
|
bitmaps
|
||||||
gal
|
gal
|
||||||
|
legacy_wx
|
||||||
|
common
|
||||||
|
polygon
|
||||||
|
bitmaps
|
||||||
|
gal
|
||||||
|
legacy_wx
|
||||||
|
common
|
||||||
|
polygon
|
||||||
|
bitmaps
|
||||||
|
gal
|
||||||
|
legacy_wx
|
||||||
${wxWidgets_LIBRARIES}
|
${wxWidgets_LIBRARIES}
|
||||||
${GDI_PLUS_LIBRARIES}
|
${GDI_PLUS_LIBRARIES}
|
||||||
)
|
)
|
||||||
|
|
|
@ -7,6 +7,7 @@ add_definitions(-DPL_EDITOR)
|
||||||
|
|
||||||
include_directories(BEFORE ${INC_BEFORE})
|
include_directories(BEFORE ${INC_BEFORE})
|
||||||
include_directories(
|
include_directories(
|
||||||
|
../include/legacy_wx
|
||||||
dialogs
|
dialogs
|
||||||
../common/dialogs
|
../common/dialogs
|
||||||
${INC_AFTER}
|
${INC_AFTER}
|
||||||
|
@ -82,6 +83,19 @@ target_link_libraries( pl_editor
|
||||||
common
|
common
|
||||||
bitmaps
|
bitmaps
|
||||||
gal
|
gal
|
||||||
|
legacy_wx
|
||||||
|
common
|
||||||
|
bitmaps
|
||||||
|
gal
|
||||||
|
legacy_wx
|
||||||
|
common
|
||||||
|
bitmaps
|
||||||
|
gal
|
||||||
|
legacy_wx
|
||||||
|
common
|
||||||
|
bitmaps
|
||||||
|
gal
|
||||||
|
legacy_wx
|
||||||
${wxWidgets_LIBRARIES}
|
${wxWidgets_LIBRARIES}
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -102,6 +116,17 @@ target_link_libraries( pl_editor_kiface
|
||||||
polygon
|
polygon
|
||||||
bitmaps
|
bitmaps
|
||||||
gal
|
gal
|
||||||
|
legacy_wx
|
||||||
|
common
|
||||||
|
polygon
|
||||||
|
bitmaps
|
||||||
|
gal
|
||||||
|
legacy_wx
|
||||||
|
common
|
||||||
|
polygon
|
||||||
|
bitmaps
|
||||||
|
gal
|
||||||
|
legacy_wx
|
||||||
${wxWidgets_LIBRARIES}
|
${wxWidgets_LIBRARIES}
|
||||||
${GDI_PLUS_LIBRARIES}
|
${GDI_PLUS_LIBRARIES}
|
||||||
)
|
)
|
||||||
|
|
|
@ -35,6 +35,7 @@ endif()
|
||||||
|
|
||||||
include_directories( BEFORE ${INC_BEFORE} )
|
include_directories( BEFORE ${INC_BEFORE} )
|
||||||
include_directories(
|
include_directories(
|
||||||
|
../include/legacy_wx
|
||||||
./dialogs
|
./dialogs
|
||||||
./autorouter
|
./autorouter
|
||||||
../3d-viewer
|
../3d-viewer
|
||||||
|
@ -663,6 +664,29 @@ set( PCBNEW_KIFACE_LIBRARIES
|
||||||
gal
|
gal
|
||||||
lib_dxf
|
lib_dxf
|
||||||
idf3
|
idf3
|
||||||
|
legacy_wx
|
||||||
|
3d-viewer
|
||||||
|
pcbcommon
|
||||||
|
pnsrouter
|
||||||
|
pcad2kicadpcb
|
||||||
|
common
|
||||||
|
polygon
|
||||||
|
bitmaps
|
||||||
|
gal
|
||||||
|
lib_dxf
|
||||||
|
idf3
|
||||||
|
legacy_wx
|
||||||
|
3d-viewer
|
||||||
|
pcbcommon
|
||||||
|
pnsrouter
|
||||||
|
pcad2kicadpcb
|
||||||
|
common
|
||||||
|
polygon
|
||||||
|
bitmaps
|
||||||
|
gal
|
||||||
|
lib_dxf
|
||||||
|
idf3
|
||||||
|
legacy_wx
|
||||||
${wxWidgets_LIBRARIES}
|
${wxWidgets_LIBRARIES}
|
||||||
${GITHUB_PLUGIN_LIBRARIES}
|
${GITHUB_PLUGIN_LIBRARIES}
|
||||||
${GDI_PLUS_LIBRARIES}
|
${GDI_PLUS_LIBRARIES}
|
||||||
|
|
|
@ -1339,6 +1339,7 @@ void DIALOG_PAD_PROPERTIES::redraw()
|
||||||
BOX2I drawbox;
|
BOX2I drawbox;
|
||||||
drawbox.Move( m_dummyPad->GetPosition() );
|
drawbox.Move( m_dummyPad->GetPosition() );
|
||||||
drawbox.Inflate( bbox.GetSize().x*2, bbox.GetSize().y*2 );
|
drawbox.Inflate( bbox.GetSize().x*2, bbox.GetSize().y*2 );
|
||||||
|
|
||||||
view->SetBoundary( drawbox );
|
view->SetBoundary( drawbox );
|
||||||
|
|
||||||
// Autozoom
|
// Autozoom
|
||||||
|
|
|
@ -14,6 +14,6 @@ endif()
|
||||||
|
|
||||||
add_subdirectory( common )
|
add_subdirectory( common )
|
||||||
add_subdirectory( shape_poly_set_refactor )
|
add_subdirectory( shape_poly_set_refactor )
|
||||||
add_subdirectory( pcb_test_window )
|
# add_subdirectory( pcb_test_window )
|
||||||
add_subdirectory( polygon_triangulation )
|
# add_subdirectory( polygon_triangulation )
|
||||||
add_subdirectory( polygon_generator )
|
# add_subdirectory( polygon_generator )
|
Loading…
Reference in New Issue