From ec9dacf150fb6788d52fd7cb92c8e598ec15824d Mon Sep 17 00:00:00 2001 From: Zoe Roux Date: Wed, 16 Jun 2021 15:02:09 +0200 Subject: [PATCH 01/12] Trying to fix the CI for lua --- .github/workflows/build_web.yml | 2 ++ .github/workflows/build_windows.yml | 8 +++++++- .github/workflows/test.yml | 2 +- CMakeLists.txt | 4 +--- lib/LuaGate/CMakeLists.txt | 2 +- 5 files changed, 12 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build_web.yml b/.github/workflows/build_web.yml index 2b9a2f3e..cfcc7e90 100644 --- a/.github/workflows/build_web.yml +++ b/.github/workflows/build_web.yml @@ -9,6 +9,8 @@ jobs: - uses: actions/checkout@v1 with: submodules: true + - name: Install lua + run: sudo apt install -y lua-devel - name: Exec shell: bash run: ./build_web.sh diff --git a/.github/workflows/build_windows.yml b/.github/workflows/build_windows.yml index a3a21944..f6d3daf9 100644 --- a/.github/workflows/build_windows.yml +++ b/.github/workflows/build_windows.yml @@ -22,10 +22,16 @@ jobs: - name: Install Xorg lib if: matrix.name == 'Linux' run: | - sudo apt install -y libasound2-dev mesa-common-dev libx11-dev libxrandr-dev libxi-dev xorg-dev libgl1-mesa-dev libglu1-mesa-dev + sudo apt install -y libasound2-dev mesa-common-dev libx11-dev libxrandr-dev libxi-dev xorg-dev libgl1-mesa-dev libglu1-mesa-dev lua-devel - name: Update G++ if: matrix.name == 'Linux' run: sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-10 100 + - name: Install Lua + if: matrix.name == 'Windows' + shell: bash + run: | + curl https://sourceforge.net/projects/luabinaries/files/5.4.2/Windows%20Libraries/Dynamic/lua-5.4.2_Win64_dll16_lib.zip/download -L > lua.zip + unzip lua - name: Build run: | mkdir build && cd build diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e87b9b9d..02435bb5 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -12,7 +12,7 @@ jobs: submodules: true - name: Install Xorg lib run: | - sudo apt install -y libasound2-dev mesa-common-dev libx11-dev libxrandr-dev libxi-dev xorg-dev libgl1-mesa-dev libglu1-mesa-dev + sudo apt install -y libasound2-dev mesa-common-dev libx11-dev libxrandr-dev libxi-dev xorg-dev libgl1-mesa-dev libglu1-mesa-dev lua-devel - name: Update G++ run: sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-10 100 - name: Build diff --git a/CMakeLists.txt b/CMakeLists.txt index c724de45..b61bcca1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,8 +3,6 @@ project(bomberman) set(CMAKE_CXX_STANDARD 20) -cmake_minimum_required(VERSION 3.10) - include_directories(bomberman lib/Ray/sources) include_directories(bomberman lib/wal/sources) include_directories(bomberman lib/LuaGate/sources) @@ -157,7 +155,7 @@ target_link_libraries(bomberman PUBLIC wal ray ${LUA_LIBRARIES} LuaGate) add_executable(unit_tests EXCLUDE_FROM_ALL ${SOURCES} - tests/CacheTest.cpp + tests/CacheTest.cpp tests/EntityTests.cpp tests/MainTest.cpp tests/EngineTests.cpp diff --git a/lib/LuaGate/CMakeLists.txt b/lib/LuaGate/CMakeLists.txt index 527fd990..371618e7 100644 --- a/lib/LuaGate/CMakeLists.txt +++ b/lib/LuaGate/CMakeLists.txt @@ -1,4 +1,4 @@ -CMAKE_MINIMUM_REQUIRED(VERSION 3.11) +cmake_minimum_required(VERSION 3.11) set(CMAKE_CXX_STANDARD 20) set(LIB_NAME "LuaGate") From d1a69eefc501f01a06fb3859706009773729b6ab Mon Sep 17 00:00:00 2001 From: Zoe Roux Date: Wed, 16 Jun 2021 15:04:10 +0200 Subject: [PATCH 02/12] Fixing lua lib name --- .github/workflows/build_web.yml | 2 +- .github/workflows/build_windows.yml | 2 +- .github/workflows/test.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build_web.yml b/.github/workflows/build_web.yml index cfcc7e90..88d67e18 100644 --- a/.github/workflows/build_web.yml +++ b/.github/workflows/build_web.yml @@ -10,7 +10,7 @@ jobs: with: submodules: true - name: Install lua - run: sudo apt install -y lua-devel + run: sudo apt install -y liblua5.3-dev - name: Exec shell: bash run: ./build_web.sh diff --git a/.github/workflows/build_windows.yml b/.github/workflows/build_windows.yml index f6d3daf9..192c4d0b 100644 --- a/.github/workflows/build_windows.yml +++ b/.github/workflows/build_windows.yml @@ -22,7 +22,7 @@ jobs: - name: Install Xorg lib if: matrix.name == 'Linux' run: | - sudo apt install -y libasound2-dev mesa-common-dev libx11-dev libxrandr-dev libxi-dev xorg-dev libgl1-mesa-dev libglu1-mesa-dev lua-devel + sudo apt install -y libasound2-dev mesa-common-dev libx11-dev libxrandr-dev libxi-dev xorg-dev libgl1-mesa-dev libglu1-mesa-dev liblua5.3-dev - name: Update G++ if: matrix.name == 'Linux' run: sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-10 100 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 02435bb5..ae5f9a29 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -12,7 +12,7 @@ jobs: submodules: true - name: Install Xorg lib run: | - sudo apt install -y libasound2-dev mesa-common-dev libx11-dev libxrandr-dev libxi-dev xorg-dev libgl1-mesa-dev libglu1-mesa-dev lua-devel + sudo apt install -y libasound2-dev mesa-common-dev libx11-dev libxrandr-dev libxi-dev xorg-dev libgl1-mesa-dev libglu1-mesa-dev liblua5.3-dev - name: Update G++ run: sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-10 100 - name: Build From ea1e2254273d99d74259b360fae34f3689ecab7c Mon Sep 17 00:00:00 2001 From: Zoe Roux Date: Wed, 16 Jun 2021 15:39:52 +0200 Subject: [PATCH 03/12] Removing lua.hpp in favor of an external C --- lib/LuaGate/sources/LuaGate.hpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/LuaGate/sources/LuaGate.hpp b/lib/LuaGate/sources/LuaGate.hpp index dfaa2965..f26bcdf5 100644 --- a/lib/LuaGate/sources/LuaGate.hpp +++ b/lib/LuaGate/sources/LuaGate.hpp @@ -3,7 +3,12 @@ // #include -#include "lua.hpp" + +extern "C" { + #include "lua.h" + #include "lualib.h" + #include "lauxlib.h" +} namespace LuaG { From 9ca15ecfff1d87d457b4e34c0e3d8b93e1b1ade9 Mon Sep 17 00:00:00 2001 From: Zoe Roux Date: Wed, 16 Jun 2021 15:42:46 +0200 Subject: [PATCH 04/12] Removing uncapsulated includes --- sources/Component/IAControllable/IAControllableComponent.cpp | 1 - sources/Component/IAControllable/IAControllableComponent.hpp | 1 - 2 files changed, 2 deletions(-) diff --git a/sources/Component/IAControllable/IAControllableComponent.cpp b/sources/Component/IAControllable/IAControllableComponent.cpp index 5bfa2643..f594ef19 100644 --- a/sources/Component/IAControllable/IAControllableComponent.cpp +++ b/sources/Component/IAControllable/IAControllableComponent.cpp @@ -7,7 +7,6 @@ #include "Map/MapInfo.hpp" #include "Component/IAControllable/IAControllableComponent.hpp" -//#include "System/IAControllable/IAControllableSystem.hpp" namespace BBM { diff --git a/sources/Component/IAControllable/IAControllableComponent.hpp b/sources/Component/IAControllable/IAControllableComponent.hpp index 99e6393e..a1556662 100644 --- a/sources/Component/IAControllable/IAControllableComponent.hpp +++ b/sources/Component/IAControllable/IAControllableComponent.hpp @@ -11,7 +11,6 @@ #include "Component/Component.hpp" #include "Entity/Entity.hpp" #include "Models/Vector3.hpp" -#include "lua.hpp" #include "LuaGate.hpp" namespace BBM From 5af28111a291652bbe435f14b896a6722f651df2 Mon Sep 17 00:00:00 2001 From: Zoe Roux Date: Wed, 16 Jun 2021 15:45:55 +0200 Subject: [PATCH 05/12] Adding a debug message in the cmake --- lib/LuaGate/CMakeLists.txt | 1 + lib/LuaGate/sources/LuaGate.hpp | 7 +------ 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/lib/LuaGate/CMakeLists.txt b/lib/LuaGate/CMakeLists.txt index 371618e7..b7f21559 100644 --- a/lib/LuaGate/CMakeLists.txt +++ b/lib/LuaGate/CMakeLists.txt @@ -22,5 +22,6 @@ add_library(${LIB_NAME} STATIC ${SRC} ${HEADERS}) include(FindLua) +message(LUA INCLUDE PATH: ${LUA_INCLUDE_DIR}) include_directories(${LIB_NAME} ${LUA_INCLUDE_DIR}) target_link_libraries(${LIB_NAME} ${LUA_LIBRARIES}) diff --git a/lib/LuaGate/sources/LuaGate.hpp b/lib/LuaGate/sources/LuaGate.hpp index f26bcdf5..cf59833a 100644 --- a/lib/LuaGate/sources/LuaGate.hpp +++ b/lib/LuaGate/sources/LuaGate.hpp @@ -3,12 +3,7 @@ // #include - -extern "C" { - #include "lua.h" - #include "lualib.h" - #include "lauxlib.h" -} +#include namespace LuaG { From e05bdfcf0c6b5a8d213fb41343f969205617fc11 Mon Sep 17 00:00:00 2001 From: Zoe Roux Date: Wed, 16 Jun 2021 15:52:30 +0200 Subject: [PATCH 06/12] Fixing the cmake --- CMakeLists.txt | 15 ++++++--------- lib/LuaGate/CMakeLists.txt | 15 ++++++--------- 2 files changed, 12 insertions(+), 18 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b61bcca1..72fa0713 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,10 +3,10 @@ project(bomberman) set(CMAKE_CXX_STANDARD 20) -include_directories(bomberman lib/Ray/sources) -include_directories(bomberman lib/wal/sources) -include_directories(bomberman lib/LuaGate/sources) -include_directories(bomberman sources) +include_directories(lib/Ray/sources) +include_directories(lib/wal/sources) +include_directories(lib/LuaGate/sources) +include_directories(sources) add_subdirectory(${PROJECT_SOURCE_DIR}/lib/wal) add_subdirectory(${PROJECT_SOURCE_DIR}/lib/Ray) @@ -149,9 +149,7 @@ add_executable(bomberman sources/main.cpp ${SOURCES} ) - -target_include_directories(bomberman PUBLIC sources ${LUA_INCLUDE_DIR}) -target_link_libraries(bomberman PUBLIC wal ray ${LUA_LIBRARIES} LuaGate) +target_link_libraries(bomberman PUBLIC wal ray LuaGate) add_executable(unit_tests EXCLUDE_FROM_ALL ${SOURCES} @@ -164,8 +162,7 @@ add_executable(unit_tests EXCLUDE_FROM_ALL tests/ViewTest.cpp tests/CollisionTest.cpp ) -target_include_directories(unit_tests PUBLIC sources) -target_link_libraries(unit_tests PUBLIC wal ray ${LUA_LIBRARIES}) +target_link_libraries(unit_tests PUBLIC wal ray LuaGate) find_package(Catch2 QUIET) if (NOT Catch2_FOUND) diff --git a/lib/LuaGate/CMakeLists.txt b/lib/LuaGate/CMakeLists.txt index b7f21559..666ffd3e 100644 --- a/lib/LuaGate/CMakeLists.txt +++ b/lib/LuaGate/CMakeLists.txt @@ -1,9 +1,8 @@ cmake_minimum_required(VERSION 3.11) set(CMAKE_CXX_STANDARD 20) -set(LIB_NAME "LuaGate") +project(LuaGate) -project("${LIB_NAME}") -include_directories(${LIB_NAME} ./sources) +include_directories(sources) if (CMAKE_COMPILER_IS_GNUCXX) set(GCC_COVERAGE_COMPILE_FLAGS "-Wall -Wextra -Werror -Wshadow") @@ -18,10 +17,8 @@ set(SRC sources/LuaGate.cpp ) -add_library(${LIB_NAME} STATIC ${SRC} ${HEADERS}) - - include(FindLua) -message(LUA INCLUDE PATH: ${LUA_INCLUDE_DIR}) -include_directories(${LIB_NAME} ${LUA_INCLUDE_DIR}) -target_link_libraries(${LIB_NAME} ${LUA_LIBRARIES}) +include_directories(${LUA_INCLUDE_DIR}) + +add_library(LuaGate STATIC ${SRC} ${HEADERS}) +target_link_libraries(LuaGate ${LUA_LIBRARIES}) From a0ea2a6018bb5dd3dfa13242cd3c041c87e9e00d Mon Sep 17 00:00:00 2001 From: Zoe Roux Date: Wed, 16 Jun 2021 16:00:01 +0200 Subject: [PATCH 07/12] Using lua includes as INTERFACE --- lib/LuaGate/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/LuaGate/CMakeLists.txt b/lib/LuaGate/CMakeLists.txt index 666ffd3e..4d553905 100644 --- a/lib/LuaGate/CMakeLists.txt +++ b/lib/LuaGate/CMakeLists.txt @@ -18,7 +18,7 @@ set(SRC ) include(FindLua) -include_directories(${LUA_INCLUDE_DIR}) add_library(LuaGate STATIC ${SRC} ${HEADERS}) +target_include_directories(LuaGate INTERFACE ${LUA_INCLUDE_DIR}) target_link_libraries(LuaGate ${LUA_LIBRARIES}) From 001d146e3adee3c11af533f3e4755dbd2e1acfb1 Mon Sep 17 00:00:00 2001 From: Zoe Roux Date: Wed, 16 Jun 2021 16:03:00 +0200 Subject: [PATCH 08/12] Using public instead of interface --- lib/LuaGate/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/LuaGate/CMakeLists.txt b/lib/LuaGate/CMakeLists.txt index 4d553905..9e53daeb 100644 --- a/lib/LuaGate/CMakeLists.txt +++ b/lib/LuaGate/CMakeLists.txt @@ -20,5 +20,5 @@ set(SRC include(FindLua) add_library(LuaGate STATIC ${SRC} ${HEADERS}) -target_include_directories(LuaGate INTERFACE ${LUA_INCLUDE_DIR}) +target_include_directories(LuaGate PUBLIC ${LUA_INCLUDE_DIR}) target_link_libraries(LuaGate ${LUA_LIBRARIES}) From efba6bf3c4fa79d3ba52229911aed6a73e84e5c2 Mon Sep 17 00:00:00 2001 From: Zoe Roux Date: Wed, 16 Jun 2021 16:55:08 +0200 Subject: [PATCH 09/12] Trying to fix windows compilation --- .../{build_windows.yml => build.yml} | 4 ++-- .github/workflows/build_linux.yml | 21 ------------------- CMakeLists.txt | 6 +++--- lib/LuaGate/CMakeLists.txt | 4 ++++ 4 files changed, 9 insertions(+), 26 deletions(-) rename .github/workflows/{build_windows.yml => build.yml} (96%) delete mode 100644 .github/workflows/build_linux.yml diff --git a/.github/workflows/build_windows.yml b/.github/workflows/build.yml similarity index 96% rename from .github/workflows/build_windows.yml rename to .github/workflows/build.yml index 192c4d0b..1514d6b7 100644 --- a/.github/workflows/build_windows.yml +++ b/.github/workflows/build.yml @@ -9,8 +9,8 @@ jobs: strategy: matrix: include: - # - os: ubuntu-latest - # name: Linux + - os: ubuntu-latest + name: Linux # - os: macOS-latest # name: MacOS - os: windows-latest diff --git a/.github/workflows/build_linux.yml b/.github/workflows/build_linux.yml deleted file mode 100644 index 9f352ac4..00000000 --- a/.github/workflows/build_linux.yml +++ /dev/null @@ -1,21 +0,0 @@ -name: Linux Build (Epitech Container) -on: [push, pull_request] - -jobs: - testbox: - if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository - runs-on: ubuntu-latest - container: - image: epitechcontent/epitest-docker:latest - steps: - - uses: actions/checkout@v2 - with: - submodules: true - - name: Build - run: | - mkdir build && cd build - cmake .. - cmake --build . - - name: CheckBinaryName - shell: bash - run: test -f build/bomberman \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index 72fa0713..62a1882b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,10 +13,10 @@ add_subdirectory(${PROJECT_SOURCE_DIR}/lib/Ray) add_subdirectory(${PROJECT_SOURCE_DIR}/lib/LuaGate) if (EMSCRIPTEN) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -s USE_GLFW=3 -s ASSERTIONS=1 -s WASM=1 -s ASYNCIFY") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -s USE_GLFW=3 -s ASSERTIONS=1 -s WASM=1 -s ASYNCIFY") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -s USE_GLFW=3 -s ASSERTIONS=1 -s WASM=1 -s ASYNCIFY") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -s USE_GLFW=3 -s ASSERTIONS=1 -s WASM=1 -s ASYNCIFY") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -s NO_DISABLE_EXCEPTION_CATCHING --shell-file ../sources/wasm/frontend.html --preload-file ../assets") - set(CMAKE_EXECUTABLE_SUFFIX ".html") + set(CMAKE_EXECUTABLE_SUFFIX ".html") endif() set(SOURCES diff --git a/lib/LuaGate/CMakeLists.txt b/lib/LuaGate/CMakeLists.txt index 9e53daeb..635d88bd 100644 --- a/lib/LuaGate/CMakeLists.txt +++ b/lib/LuaGate/CMakeLists.txt @@ -18,6 +18,10 @@ set(SRC ) include(FindLua) +if (NOT LUA_FOUND AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/include/lua.hpp) + set(LUA_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include/) + set(LUA_LIBRARIES ${CMAKE_CURRENT_SOURCE_DIR}) +endif() add_library(LuaGate STATIC ${SRC} ${HEADERS}) target_include_directories(LuaGate PUBLIC ${LUA_INCLUDE_DIR}) From 12db15d8a659cfaf987a33a2008da995a7a47c4d Mon Sep 17 00:00:00 2001 From: Zoe Roux Date: Wed, 16 Jun 2021 17:05:14 +0200 Subject: [PATCH 10/12] Second try --- .github/workflows/build.yml | 3 ++- lib/LuaGate/CMakeLists.txt | 11 ++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1514d6b7..19241197 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,4 +1,4 @@ -name: Windows Build +name: Build on: [push, pull_request] jobs: @@ -7,6 +7,7 @@ jobs: runs-on: ${{ matrix.os }} if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository strategy: + fail-fast: false matrix: include: - os: ubuntu-latest diff --git a/lib/LuaGate/CMakeLists.txt b/lib/LuaGate/CMakeLists.txt index 635d88bd..a4d9ad74 100644 --- a/lib/LuaGate/CMakeLists.txt +++ b/lib/LuaGate/CMakeLists.txt @@ -18,9 +18,14 @@ set(SRC ) include(FindLua) -if (NOT LUA_FOUND AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/include/lua.hpp) - set(LUA_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include/) - set(LUA_LIBRARIES ${CMAKE_CURRENT_SOURCE_DIR}) +if (NOT LUA_FOUND) + if (EXISTS ${CMAKE_SOURCE_DIR}/include/lua.hpp) + message("Using local lua") + set(LUA_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/include/) + set(LUA_LIBRARIES ${CMAKE_SOURCE_DIR}) + else() + message(FATAL_ERROR "Lua could not be found.") + endif() endif() add_library(LuaGate STATIC ${SRC} ${HEADERS}) From ddd848dd8cd09c339dae2530428a6b21d8b75fae Mon Sep 17 00:00:00 2001 From: Zoe Roux Date: Wed, 16 Jun 2021 17:12:24 +0200 Subject: [PATCH 11/12] Linking with the lua54.dll --- lib/LuaGate/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/LuaGate/CMakeLists.txt b/lib/LuaGate/CMakeLists.txt index a4d9ad74..d12cbc48 100644 --- a/lib/LuaGate/CMakeLists.txt +++ b/lib/LuaGate/CMakeLists.txt @@ -22,7 +22,7 @@ if (NOT LUA_FOUND) if (EXISTS ${CMAKE_SOURCE_DIR}/include/lua.hpp) message("Using local lua") set(LUA_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/include/) - set(LUA_LIBRARIES ${CMAKE_SOURCE_DIR}) + set(LUA_LIBRARIES ${CMAKE_SOURCE_DIR}/lua54.dll) else() message(FATAL_ERROR "Lua could not be found.") endif() From 7af629535dce256a33bcf735be1eaffa92a5887a Mon Sep 17 00:00:00 2001 From: Zoe Roux Date: Wed, 16 Jun 2021 17:20:10 +0200 Subject: [PATCH 12/12] Linking with the .lib instead of the .dll --- lib/LuaGate/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/LuaGate/CMakeLists.txt b/lib/LuaGate/CMakeLists.txt index d12cbc48..eb227570 100644 --- a/lib/LuaGate/CMakeLists.txt +++ b/lib/LuaGate/CMakeLists.txt @@ -22,7 +22,7 @@ if (NOT LUA_FOUND) if (EXISTS ${CMAKE_SOURCE_DIR}/include/lua.hpp) message("Using local lua") set(LUA_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/include/) - set(LUA_LIBRARIES ${CMAKE_SOURCE_DIR}/lua54.dll) + set(LUA_LIBRARIES ${CMAKE_SOURCE_DIR}/lua54.lib) else() message(FATAL_ERROR "Lua could not be found.") endif()