Include directories are implied by legacy_gal linkage
This avoids having to manually specify include/legacy_gal in and legacy GAL targets, and harominizes with legacy_wx. This also means .cpp files in common/legacy_gal do not need to specify the legacy_gal subdirectory, so they will continue to work as needed when legacy_wx is removed.
This commit is contained in:
parent
02f81d7419
commit
075f428aca
|
@ -88,6 +88,7 @@ add_library( legacy_gal STATIC ${LEGACY_GAL_SRCS} )
|
|||
add_library( legacy_wx STATIC ${LEGACY_WX_SRCS} )
|
||||
|
||||
target_include_directories( legacy_wx PUBLIC ../include/legacy_wx )
|
||||
target_include_directories( legacy_gal PUBLIC ../include/legacy_gal )
|
||||
|
||||
target_link_libraries( gal
|
||||
${GLEW_LIBRARIES}
|
||||
|
|
|
@ -34,7 +34,7 @@
|
|||
#include <macros.h>
|
||||
#include <base_struct.h>
|
||||
#include <base_screen.h>
|
||||
#include <legacy_gal/class_drawpanel.h>
|
||||
#include <class_drawpanel.h>
|
||||
#include <confirm.h>
|
||||
#include <block_commande.h>
|
||||
|
||||
|
|
|
@ -35,7 +35,7 @@
|
|||
#include <bitmaps.h>
|
||||
#include <macros.h>
|
||||
#include <id.h>
|
||||
#include <legacy_gal/class_drawpanel.h>
|
||||
#include <class_drawpanel.h>
|
||||
#include <base_screen.h>
|
||||
#include <msgpanel.h>
|
||||
#include <draw_frame.h>
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
#include "base_screen.h"
|
||||
#include "common.h"
|
||||
#include "macros.h"
|
||||
#include "legacy_gal/class_drawpanel.h"
|
||||
#include "class_drawpanel.h"
|
||||
#include "marker_base.h"
|
||||
#include "dialog_display_info_HTML_base.h"
|
||||
|
||||
|
@ -12,5 +12,4 @@
|
|||
void MARKER_BASE::DrawMarker( EDA_DRAW_PANEL* aPanel, wxDC* aDC, GR_DRAWMODE aDrawMode,
|
||||
const wxPoint& aOffset )
|
||||
{
|
||||
|
||||
}
|
||||
|
|
|
@ -20,7 +20,6 @@ endif()
|
|||
|
||||
include_directories( BEFORE ${INC_BEFORE} )
|
||||
include_directories(
|
||||
../include/legacy_gal
|
||||
./dialogs
|
||||
./netlist_exporters
|
||||
./widgets
|
||||
|
|
Loading…
Reference in New Issue