Compare commits

...
3 Commits
3 changed files with 18 additions and 6 deletions
+10 -3
View File
@@ -17,7 +17,8 @@ set(CMAKE_EXE_LINKER_FLAGS "-Wl,--no-as-needed -ldl")
set(LIBUSB_INCLUDE_DIR /usr/include/libusb-1.0)
set(LIBXML_INCLUDE_DIR /usr/include/libxml2)
FIND_PACKAGE(Lua REQUIRED 5.4)
FIND_PACKAGE(Lua)
#FIND_PACKAGE(Lua 5.4 REQUIRED EXACT)
if(Lua_FOUND AND NOT TARGET Lua::Lua)
add_library(Lua::Lua INTERFACE IMPORTED)
set_target_properties(
@@ -26,7 +27,13 @@ if(Lua_FOUND AND NOT TARGET Lua::Lua)
INTERFACE_INCLUDE_DIRECTORIES "${LUA_INCLUDE_DIR}"
INTERFACE_LINK_LIBRARIES "${LUA_LIBRARIES}"
)
message("Lua ${Lua_VERSION} found")
endif()
message("Lua ${Lua_VERSION} found")
if (Lua_VERSION VERSION_GREATER_EQUAL "5.5.0")
add_compile_definitions(USE_LUA_55)
else()
remove_definitions(USE_LUA_55)
endif()
#FIND_PATH(LIBUSB_INCLUDE_DIR libusb.h
@@ -66,7 +73,7 @@ endif()
message("Using pulseaudio backend...")
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 lua5.4 proc2)
target_link_libraries(monocoque m hidapi-hidraw pulse serialport xml2 argtable2 config gameloop helper devices slog simulatorapi uv xdg-basedir lua proc2)
target_include_directories(monocoque PUBLIC config ${LIBXML_INCLUDE_DIR} ${LUA_INCLUDE_DIR})
+7 -2
View File
@@ -2,8 +2,13 @@
#define _ARDUINOLEDLUA_H
//#include <lua.h>
#include <lua5.4/lauxlib.h>
#include <lua5.4/lualib.h>
#include "lauxlib.h"
#include "lualib.h"
#ifdef USE_LUA_55
/* open all libraries */
#define luaL_openlibs(L) luaL_openselectedlibs(L, ~0, 0)
#endif
#include "../../simulatorapi/simapi/simapi/simdata.h"
+1 -1
View File
@@ -4,7 +4,7 @@
#include <stdbool.h>
#include <hidapi/hidapi.h>
#include <lua5.4/lua.h>
#include "lua.h"
#include "usbdevice.h"
#include "sounddevice.h"