haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

newstroke_font can live in kicommon 

Turns out, gal doesnt even use newstroke_font.h anymore, stop bleeding it everywhere due to the gal header
This commit is contained in:
Marek Roszko 2023-09-18 07:29:55 -04:00
parent 6f62565093
commit 4a53c8f330
4 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
common/CMakeLists.txt
View File

@ -67,8 +67,11 @@ add_library( singletop STATIC EXCLUDE_FROM_ALL
# Functions and data all need to use the #include <import_export.h> and be declared # Functions and data all need to use the #include <import_export.h> and be declared
# as APIEXPORT # as APIEXPORT
set( KICOMMON_SRCS set( KICOMMON_SRCS
# Fonts
newstroke_font.cpp
# Gal
gal/color4d.cpp gal/color4d.cpp
# Jobs
jobs/job.cpp jobs/job.cpp
jobs/job_export_pcb_drill.cpp jobs/job_export_pcb_drill.cpp
jobs/job_export_pcb_dxf.cpp jobs/job_export_pcb_dxf.cpp

1
common/gal/CMakeLists.txt
View File

@ -3,7 +3,6 @@ set( GAL_SRCS
# Common part # Common part
../callback_gal.cpp ../callback_gal.cpp
../gl_context_mgr.cpp ../gl_context_mgr.cpp
../newstroke_font.cpp
painter.cpp painter.cpp
cursors.cpp cursors.cpp
dpi_scaling.cpp dpi_scaling.cpp

1
include/gal/graphics_abstraction_layer.h
View File

@ -37,7 +37,6 @@
#include <gal/cursors.h> #include <gal/cursors.h>
#include <gal/definitions.h> #include <gal/definitions.h>
#include <gal/gal_display_options.h> #include <gal/gal_display_options.h>
#include <newstroke_font.h>
#include <font/stroke_font.h> #include <font/stroke_font.h>
#include <geometry/eda_angle.h> #include <geometry/eda_angle.h>

6
include/newstroke_font.h
View File

@ -26,10 +26,12 @@
#ifndef __NEWSTROKE_FONT_H__ #ifndef __NEWSTROKE_FONT_H__
#define __NEWSTROKE_FONT_H__ #define __NEWSTROKE_FONT_H__
#include <kicommon.h>
/** /**
* Array containing strokes for unicode glyphs * Array containing strokes for unicode glyphs
*/ */
extern const char* const newstroke_font[]; //The font extern KICOMMON_API const char* const newstroke_font[]; //The font
extern const int newstroke_font_bufsize; //font buffer size extern KICOMMON_API const int newstroke_font_bufsize; //font buffer size
#endif /* __NEWSTROKE_FONT_H__ */ #endif /* __NEWSTROKE_FONT_H__ */