Skip to content

Commit

Permalink
temporarily remove lua and rl eof stuff. it builds now probably
Browse files Browse the repository at this point in the history
  • Loading branch information
LDAsuku committed Nov 20, 2022
1 parent a8c8606 commit 0eb29bb
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 11 deletions.
10 changes: 5 additions & 5 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ target_compile_options(readline INTERFACE ${readline_CFLAGS})
target_link_libraries(readline INTERFACE ${readline_LDFLAGS})

# lua53
pkg_check_modules(lua53 IMPORTED_TARGET lua53 REQUIRED)
add_library(lua53 INTERFACE)
target_compile_options(lua53 INTERFACE ${lua53_CFLAGS})
target_link_libraries(lua53 INTERFACE ${lua53_LDFLAGS})
#pkg_check_modules(lua53 IMPORTED_TARGET lua53 REQUIRED)
#add_library(lua53 INTERFACE)
#target_compile_options(lua53 INTERFACE ${lua53_CFLAGS})
#target_link_libraries(lua53 INTERFACE ${lua53_LDFLAGS})

# protos
# use a shared library because linking a 100mb+ static library takes extremely long
Expand Down Expand Up @@ -69,4 +69,4 @@ set_target_properties(soggy PROPERTIES CXX_STANDARD "17")
target_link_libraries(soggy PRIVATE soggy_proto)
target_link_libraries(soggy PRIVATE libenet)
target_link_libraries(soggy PRIVATE readline)
target_link_libraries(soggy PRIVATE lua)
#target_link_libraries(soggy PRIVATE lua)
8 changes: 4 additions & 4 deletions src/game_data.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@
#include <nlohmann/json.hpp>

// lua
extern "C" {
/*extern "C" {
#include <lua.h>
#include <lualib.h>
#include <lauxlib.h>
}
}*/

// soggy
#include "game_enums.hpp"
Expand Down Expand Up @@ -135,7 +135,7 @@ std::vector<int> Excel::get_ints(const std::string key) {
// small wrapper for lua stack access
//

struct LuaIndex {
/*struct LuaIndex {
public:
LuaIndex(lua_State *L);
bool push_global_table(const char *global);
Expand Down Expand Up @@ -200,7 +200,7 @@ bool LuaIndex::get_field_bool(const char *key, bool def) {
}
void LuaIndex::pop(int n) {
lua_pop(this->L, n);
}
}*/

//
// binoutput json stuff
Expand Down
4 changes: 2 additions & 2 deletions src/soggy.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1476,8 +1476,8 @@ void process_line_sub(char *c_line) {
if (c_line == NULL) {
// soggy_log("EOF");
// go = false;
rl_eof_found = false;
RL_UNSETSTATE(RL_STATE_EOF);
//rl_eof_found = false;
//RL_UNSETSTATE(RL_STATE_EOF);
return;
}
if (*c_line == '\0') {
Expand Down

0 comments on commit 0eb29bb

Please sign in to comment.