maelstrom/openblocks
1
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

chore: ported lua to vcpkg

Browse source
This commit is contained in:
maelstrom 2025-05-02 23:12:42 +02:00
parent a16643dbab
commit 3cb5d34ced
3 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/CMakeLists.txt
View file

@ -14,6 +14,7 @@ include_directories(${Stb_INCLUDE_DIR})
# PkgConfig packages # PkgConfig packages
find_package(PkgConfig REQUIRED) find_package(PkgConfig REQUIRED)
pkg_check_modules(LUAJIT REQUIRED luajit) pkg_check_modules(LUAJIT REQUIRED luajit)
link_directories(${LUAJIT_LIBRARY_DIRS})
# Run autogen # Run autogen
file(GLOB_RECURSE AUTOGEN_SOURCES RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}/src" "src/objects/*.h" "src/datatypes/*.h" "src/enum/*.h") file(GLOB_RECURSE AUTOGEN_SOURCES RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}/src" "src/objects/*.h" "src/datatypes/*.h" "src/enum/*.h")
@ -42,8 +43,9 @@ file(GLOB_RECURSE SOURCES "src/*.cpp" "src/*.h")
list(APPEND SOURCES ${AUTOGEN_OUTS}) list(APPEND SOURCES ${AUTOGEN_OUTS})
add_library(openblocks STATIC ${SOURCES}) add_library(openblocks STATIC ${SOURCES})
set_target_properties(openblocks PROPERTIES OUTPUT_NAME "openblocks") set_target_properties(openblocks PROPERTIES OUTPUT_NAME "openblocks")
target_link_directories(openblocks PUBLIC ${LUAJIT_LIBRARY_DIRS})
target_link_libraries(openblocks ${GLEW_LIBRARIES} ${LUAJIT_LIBRARIES} OpenGL::GL ReactPhysics3D::ReactPhysics3D pugixml::pugixml) target_link_libraries(openblocks ${GLEW_LIBRARIES} ${LUAJIT_LIBRARIES} OpenGL::GL ReactPhysics3D::ReactPhysics3D pugixml::pugixml)
target_include_directories(openblocks PUBLIC "src" "../include" ${LUAJIT_INCLUDE_DIR}) target_include_directories(openblocks PUBLIC "src" "../include" ${LUAJIT_INCLUDE_DIRS})
add_dependencies(openblocks autogen_build autogen) add_dependencies(openblocks autogen_build autogen)
# Windows-specific dependencies # Windows-specific dependencies

8
core/src/lua.h
View file

@ -1,7 +1,7 @@
#pragma once #pragma once
extern "C" { extern "C" {
#include <luajit-2.1/luajit.h> #include <luajit.h>
#include <luajit-2.1/lauxlib.h> #include <lauxlib.h>
#include <luajit-2.1/lualib.h> #include <lualib.h>
#include <luajit-2.1/lua.h> #include <lua.h>
} }

4
vcpkg.json
View file

@ -6,7 +6,9 @@
{ "name": "pugixml", "version>=": "1.15" }, { "name": "pugixml", "version>=": "1.15" },
"sdl2", "sdl2",
"stb", "stb",
"reactphysics3d" "reactphysics3d",
"pkgconf",
"luajit"
], ],
"overrides": [ "overrides": [
{ {