paul
/
monocoque
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refer explicitly to lua 5.4 in headers

This commit is contained in:
Paul Dino Jones 2026-05-25 20:46:47 -04:00
parent c38cf44f05
commit bcc2d410a7
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -17,7 +17,7 @@ set(CMAKE_EXE_LINKER_FLAGS "-Wl,--no-as-needed -ldl")
set(LIBUSB_INCLUDE_DIR /usr/include/libusb-1.0) set(LIBUSB_INCLUDE_DIR /usr/include/libusb-1.0)
set(LIBXML_INCLUDE_DIR /usr/include/libxml2) set(LIBXML_INCLUDE_DIR /usr/include/libxml2)
FIND_PACKAGE(Lua REQUIRED 5.4 EXACT) FIND_PACKAGE(Lua REQUIRED 5.4)
if(Lua_FOUND AND NOT TARGET Lua::Lua) if(Lua_FOUND AND NOT TARGET Lua::Lua)
add_library(Lua::Lua INTERFACE IMPORTED) add_library(Lua::Lua INTERFACE IMPORTED)
set_target_properties( set_target_properties(
@ -66,7 +66,7 @@ endif()
message("Using pulseaudio backend...") message("Using pulseaudio backend...")
add_compile_definitions(USE_PULSEAUDIO=true) add_compile_definitions(USE_PULSEAUDIO=true)
target_link_libraries(monocoque m hidapi-hidraw pulse serialport xml2 argtable2 config gameloop helper devices slog simulatorapi uv xdg-basedir Lua::Lua proc2) target_link_libraries(monocoque m hidapi-hidraw pulse serialport xml2 argtable2 config gameloop helper devices slog simulatorapi uv xdg-basedir lua5.4 proc2)
target_include_directories(monocoque PUBLIC config ${LIBXML_INCLUDE_DIR} ${LUA_INCLUDE_DIR}) target_include_directories(monocoque PUBLIC config ${LIBXML_INCLUDE_DIR} ${LUA_INCLUDE_DIR})

4
src/monocoque/devices/serial/arduinoledlua.h
View File

@ -2,8 +2,8 @@
#define _ARDUINOLEDLUA_H #define _ARDUINOLEDLUA_H
//#include <lua.h> //#include <lua.h>
#include <lauxlib.h> #include <lua5.4/lauxlib.h>
#include <lualib.h> #include <lua5.4/lualib.h>
#include "../../simulatorapi/simapi/simapi/simdata.h" #include "../../simulatorapi/simapi/simapi/simdata.h"

2
src/monocoque/devices/simdevice.h
View File

@ -4,7 +4,7 @@
#include <stdbool.h> #include <stdbool.h>
#include <hidapi/hidapi.h> #include <hidapi/hidapi.h>
#include <lua.h> #include <lua5.4/lua.h>
#include "usbdevice.h" #include "usbdevice.h"
#include "sounddevice.h" #include "sounddevice.h"