[libraries] Fix include path in xmake

engdoreis · engdoreis · commit 4d288a5cd9b8 · 2026-04-11T17:19:28.000+01:00
diff --git a/libraries/lcd.hh b/libraries/lcd.hh
@@ -14,12 +14,12 @@ namespace sonata::lcd
 	{
 		extern "C"
 		{
-#include "../third_party/display_drivers/src/core/lcd_base.h"
-#include "../third_party/display_drivers/src/core/lucida_console_10pt.h"
-#include "../third_party/display_drivers/src/core/lucida_console_12pt.h"
-#include "../third_party/display_drivers/src/core/m3x6_16pt.h"
-#include "../third_party/display_drivers/src/core/m5x7_16pt.h"
-#include "../third_party/display_drivers/src/st7735/lcd_st7735.h"
+#include "core/lcd_base.h"
+#include "core/lucida_console_10pt.h"
+#include "core/lucida_console_12pt.h"
+#include "core/m3x6_16pt.h"
+#include "core/m5x7_16pt.h"
+#include "st7735/lcd_st7735.h"
 		}
 		void __cheri_libcall lcd_init(LCD_Interface *,
 		                              St7735Context *,
diff --git a/libraries/xmake.lua b/libraries/xmake.lua
@@ -11,7 +11,7 @@ library("lcd")
   add_files("../third_party/display_drivers/src/st7735/lcd_st7735.c")
   add_files("lcd.cc")
   add_includedirs(
-  "../third_party/display_drivers/core/src/", {public = true}
+  "../third_party/display_drivers/src/", {public = true}
   )
 
 library("sense_hat")

Original file line number	Diff line number	Diff line change
`@@ -14,12 +14,12 @@ namespace sonata::lcd`
`14`	`14`	`{`
`15`	`15`	`extern "C"`
`16`	`16`	`{`
`17`		`-#include "../third_party/display_drivers/src/core/lcd_base.h"`
`18`		`-#include "../third_party/display_drivers/src/core/lucida_console_10pt.h"`
`19`		`-#include "../third_party/display_drivers/src/core/lucida_console_12pt.h"`
`20`		`-#include "../third_party/display_drivers/src/core/m3x6_16pt.h"`
`21`		`-#include "../third_party/display_drivers/src/core/m5x7_16pt.h"`
`22`		`-#include "../third_party/display_drivers/src/st7735/lcd_st7735.h"`
	`17`	`+#include "core/lcd_base.h"`
	`18`	`+#include "core/lucida_console_10pt.h"`
	`19`	`+#include "core/lucida_console_12pt.h"`
	`20`	`+#include "core/m3x6_16pt.h"`
	`21`	`+#include "core/m5x7_16pt.h"`
	`22`	`+#include "st7735/lcd_st7735.h"`
`23`	`23`	`}`
`24`	`24`	`void __cheri_libcall lcd_init(LCD_Interface *,`
`25`	`25`	`St7735Context *,`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ library("lcd")`
`11`	`11`	`add_files("../third_party/display_drivers/src/st7735/lcd_st7735.c")`
`12`	`12`	`add_files("lcd.cc")`
`13`	`13`	`add_includedirs(`
`14`		`- "../third_party/display_drivers/core/src/", {public = true}`
	`14`	`+ "../third_party/display_drivers/src/", {public = true}`
`15`	`15`	`)`
`16`	`16`
`17`	`17`	`library("sense_hat")`