From a040ff06e8c499ec362ab546726da4a19a49c6fa Mon Sep 17 00:00:00 2001 From: Benjamin Sergeant Date: Tue, 28 Apr 2020 18:37:19 -0700 Subject: [PATCH] rename LuaPlayer.hpp to LuaWebSocket.h --- luarocks/{LuaPlayer.hpp => LuaWebSocket.h} | 5 +---- luarocks/main.cpp | 3 +-- makefile | 4 ++++ 3 files changed, 6 insertions(+), 6 deletions(-) rename luarocks/{LuaPlayer.hpp => LuaWebSocket.h} (96%) diff --git a/luarocks/LuaPlayer.hpp b/luarocks/LuaWebSocket.h similarity index 96% rename from luarocks/LuaPlayer.hpp rename to luarocks/LuaWebSocket.h index 475a45a5..2da43264 100644 --- a/luarocks/LuaPlayer.hpp +++ b/luarocks/LuaWebSocket.h @@ -1,5 +1,4 @@ -#ifndef LUAPLAYER_HPP -#define LUAPLAYER_HPP +#pragma once #include #include @@ -89,5 +88,3 @@ int luaopen_Player(lua_State* L) ); return 1; } - -#endif // LUAPLAYER_HPP \ No newline at end of file diff --git a/luarocks/main.cpp b/luarocks/main.cpp index a96711a1..3295dcf4 100644 --- a/luarocks/main.cpp +++ b/luarocks/main.cpp @@ -8,7 +8,7 @@ extern "C" } #include "functions.hpp" -#include "LuaPlayer.hpp" +#include "LuaWebSocket.h" int main() { @@ -24,4 +24,3 @@ int main() luaL_dofile(L, "ia.lua"); lua_close(L); } - diff --git a/makefile b/makefile index 81afc159..22a84c30 100644 --- a/makefile +++ b/makefile @@ -159,6 +159,9 @@ test_no_ssl: mkdir -p build && (cd build ; cmake -DCMAKE_BUILD_TYPE=Debug -DUSE_TEST=1 .. ; make -j 4) (cd test ; python2.7 run.py -r) +luarocks: + mkdir -p build && (cd build ; cmake -GNinja -DCMAKE_BUILD_TYPE=Debug -DUSE_LUAROCKS=1 .. ; ninja) + ws_test: ws (cd ws ; env DEBUG=1 PATH=../ws/build:$$PATH bash test_ws.sh) @@ -185,3 +188,4 @@ doc: .PHONY: test .PHONY: build .PHONY: ws +.PHONY: luarocks