Change directory structure

luprex/.gitignore

@@ -8,22 +8,11 @@ gmon.out
 *.dll
 *.exe
 *.a
-core/main
-core/inc/**
-core/lib/**
-core/obj/**
-core/lobj/**
+main
+obj/**
 .vscode/**
-luajit/src/lj_bcdef.h
-luajit/src/lj_ffdef.h
-luajit/src/lj_folddef.h
-luajit/src/lj_libdef.h
-luajit/src/lj_recdef.h
-luajit/src/host/buildvm_arch.h
-luajit/src/jit/vmdef.lua
-luajit/src/libluajit.a
-eris-master/src/lua
-eris-master/src/luac
-eris-master/test/persist
-eris-master/test/unpersist
+ext/eris-master/src/lua
+ext/eris-master/src/luac
+ext/eris-master/test/persist
+ext/eris-master/test/unpersist
 

luprex/Makefile

@@ -0,0 +1,107 @@
+all: main
+
+OBJ_ERIS=\
+	obj/eris/lapi.o \
+	obj/eris/lcode.o \
+	obj/eris/lctype.o \
+	obj/eris/ldebug.o \
+	obj/eris/ldo.o \
+	obj/eris/ldump.o \
+	obj/eris/lfunc.o \
+	obj/eris/lgc.o \
+	obj/eris/llex.o \
+	obj/eris/lmem.o \
+	obj/eris/lobject.o \
+	obj/eris/lopcodes.o \
+	obj/eris/lparser.o \
+	obj/eris/lstate.o \
+	obj/eris/lstring.o \
+	obj/eris/ltable.o \
+	obj/eris/ltm.o \
+	obj/eris/lundump.o \
+	obj/eris/lvm.o \
+	obj/eris/lzio.o \
+	obj/eris/lauxlib.o \
+	obj/eris/lbaselib.o \
+	obj/eris/lbitlib.o \
+	obj/eris/lcorolib.o \
+	obj/eris/ldblib.o \
+	obj/eris/liolib.o \
+	obj/eris/lmathlib.o \
+	obj/eris/loslib.o \
+	obj/eris/lstrlib.o \
+	obj/eris/ltablib.o \
+	obj/eris/loadlib.o \
+	obj/eris/linit.o \
+	obj/eris/eris.o \
+
+
+OBJ_CORE=\
+	obj/core/invocation.o\
+	obj/core/spookyv2.o\
+	obj/core/eng-malloc.o\
+	obj/core/debugcollector.o\
+	obj/core/drivenengine.o\
+	obj/core/util.o\
+	obj/core/luastack.o\
+	obj/core/traceback.o\
+	obj/core/planemap.o\
+	obj/core/pprint.o\
+	obj/core/luaconsole.o\
+	obj/core/idalloc.o\
+	obj/core/globaldb.o\
+	obj/core/sched.o\
+	obj/core/http.o\
+	obj/core/json.o\
+	obj/core/table.o\
+	obj/core/gui.o\
+	obj/core/luasnap.o\
+	obj/core/animqueue.o\
+	obj/core/streambuffer.o\
+	obj/core/source.o\
+	obj/core/world-core.o\
+	obj/core/world-accessor.o\
+	obj/core/world-difftab.o\
+	obj/core/world-diffxmit.o\
+	obj/core/world-pairtab.o\
+	obj/core/world-testing.o\
+	obj/core/textgame.o\
+	obj/core/lpxserver.o\
+	obj/core/lpxclient.o\
+	obj/core/eng-tests.o\
+	obj/core/printbuffer.o\
+
+
+OBJ_DRV=\
+	obj/drv/drvutil.o\
+	obj/drv/sslutil.o\
+
+
+-include $(OBJ_ERIS:%.o=%.d)
+-include $(OBJ_CORE:%.o=%.d)
+-include $(OBJ_DRV:%.o=%.d)
+
+
+ifeq ($(OS),linux)
+
+OPT=-g -O0
+
+main: $(OBJ_DRV) $(OBJ_CORE) $(OBJ_ERIS) obj/drv/driver-linux.o
+	g++ $(OPT) -std=c++17 -export-dynamic -Wall -o $@ $(OBJ_DRV) $(OBJ_CORE) $(OBJ_ERIS) obj/drv/driver-linux.o -L./ext/openssl-linux -lssl -lcrypto -ldl
+
+obj/eris/%.o: ext/eris-master/src/%.c
+	gcc $(OPT) -Wall -fvisibility=hidden -DLUA_USE_APICHECK -DLUA_USE_POSIX -c -MMD $< -o $@
+
+obj/core/%.o: cpp/core/%.cpp
+	g++ $(OPT) -Wall -fvisibility=hidden -std=c++17 -I./ext/eris-master/src -I./cpp/wrap -I./cpp/core -c -MMD $< -o $@
+
+obj/drv/%.o: cpp/drv/%.cpp
+	g++ $(OPT) -Wall -fvisibility=hidden -std=c++17 -I./ext/openssl -I./src/drv -c -MMD $< -o $@
+
+endif
+
+clean:
+	rm -f main.exe main obj/*/*.*
+
+
+

luprex/README.md

@@ -1 +1,28 @@
 "# luprex" 
+
+Directory Structure:
+
+cpp - C++ source code
+
+    cpp/core    - C++ source code for the engine proper
+    cpp/drv     - C++ source code for the driver
+    cpp/wrap    - C++ STL classes reconfigured to use eng-malloc
+
+ext - external third-party libraries
+
+    ext/dlmalloc.c      - Doug Lea's malloc (used by eng-malloc)
+    ext/openssl         - Header files for our version of openssl
+    ext/openssl-linux   - Library files for openssl, compiled for linux
+    ext/openssl-mingw   - Library files for openssl, compiled for mingw
+    ext/eris-master     - The C code for the lua interpreter, eris lua.
+
+obj - a place to store compiled C++ object code
+
+    obj/core  - Compiled from cpp/core
+    obj/drv   - Compiled from cpp/drv
+    obj/eris  - Compiled from ext/eris-master
+
+lua - game code written in lua
+
+misc - a place for tinkering, not part of the main project
+

luprex/core/Makefile

@@ -1,107 +0,0 @@
-all: main
-
-LUA_OBJ_FILES=\
-	obj/lua/lapi.o \
-	obj/lua/lcode.o \
-	obj/lua/lctype.o \
-	obj/lua/ldebug.o \
-	obj/lua/ldo.o \
-	obj/lua/ldump.o \
-	obj/lua/lfunc.o \
-	obj/lua/lgc.o \
-	obj/lua/llex.o \
-	obj/lua/lmem.o \
-	obj/lua/lobject.o \
-	obj/lua/lopcodes.o \
-	obj/lua/lparser.o \
-	obj/lua/lstate.o \
-	obj/lua/lstring.o \
-	obj/lua/ltable.o \
-	obj/lua/ltm.o \
-	obj/lua/lundump.o \
-	obj/lua/lvm.o \
-	obj/lua/lzio.o \
-	obj/lua/lauxlib.o \
-	obj/lua/lbaselib.o \
-	obj/lua/lbitlib.o \
-	obj/lua/lcorolib.o \
-	obj/lua/ldblib.o \
-	obj/lua/liolib.o \
-	obj/lua/lmathlib.o \
-	obj/lua/loslib.o \
-	obj/lua/lstrlib.o \
-	obj/lua/ltablib.o \
-	obj/lua/loadlib.o \
-	obj/lua/linit.o \
-	obj/lua/eris.o \
-
-
-CORE_OBJ_FILES=\
-	obj/cpp/invocation.o\
-	obj/cpp/spookyv2.o\
-	obj/cpp/eng-malloc.o\
-	obj/cpp/debugcollector.o\
-	obj/cpp/drivenengine.o\
-	obj/cpp/util.o\
-	obj/cpp/luastack.o\
-	obj/cpp/traceback.o\
-	obj/cpp/planemap.o\
-	obj/cpp/pprint.o\
-	obj/cpp/luaconsole.o\
-	obj/cpp/idalloc.o\
-	obj/cpp/globaldb.o\
-	obj/cpp/sched.o\
-	obj/cpp/http.o\
-	obj/cpp/json.o\
-	obj/cpp/table.o\
-	obj/cpp/gui.o\
-	obj/cpp/luasnap.o\
-	obj/cpp/animqueue.o\
-	obj/cpp/streambuffer.o\
-	obj/cpp/source.o\
-	obj/cpp/world-core.o\
-	obj/cpp/world-accessor.o\
-	obj/cpp/world-difftab.o\
-	obj/cpp/world-diffxmit.o\
-	obj/cpp/world-pairtab.o\
-	obj/cpp/world-testing.o\
-	obj/cpp/textgame.o\
-	obj/cpp/lpxserver.o\
-	obj/cpp/lpxclient.o\
-	obj/cpp/eng-tests.o\
-	obj/cpp/printbuffer.o\
-
-
-DRV_OBJ_FILES=\
-	obj/drv/drvutil.o\
-	obj/drv/sslutil.o\
-
-
--include $(LUA_OBJ_FILES:%.o=%.d)
--include $(CORE_OBJ_FILES:%.o=%.d)
--include $(DRV_OBJ_FILES:%.o=%.d)
-
-
-ifeq ($(OS),linux)
-
-OPT=-g -O0
-
-main:  $(DRV_OBJ_FILES) $(CORE_OBJ_FILES)  $(LUA_OBJ_FILES) obj/drv/driver-linux.o
-	g++ -std=c++17 -export-dynamic -Wall $(OPT) -o $@ $(DRV_OBJ_FILES) $(CORE_OBJ_FILES) $(LUA_OBJ_FILES) obj/drv/driver-linux.o -L../linuxlib -lssl -lcrypto -ldl
-
-obj/lua/%.o: ../eris-master/src/%.c
-	gcc -Wall -fvisibility=hidden $(OPT) -DLUA_USE_APICHECK -DLUA_USE_POSIX -c -MMD $< -o $@
-
-obj/cpp/%.o: cpp/%.cpp
-	g++ -Wall -fvisibility=hidden $(OPT) -std=c++17 -I../linuxlib -I../eris-master/src -Iwrap -Icpp -c -MMD $< -o $@
-
-obj/drv/%.o: drv/%.cpp
-	g++ -Wall -fvisibility=hidden $(OPT) -std=c++17 -I../linuxlib -Idrv -c -MMD $< -o $@
-
-endif
-
-clean:
-	rm -f main.exe main obj/cpp/*.* obj/drv/*.* obj/lua/*.*
-
-
-

luprex/core/badmem.sh

@@ -1,14 +0,0 @@
-#!/bin/sh
-
-grep std::string cpp/*
-grep std::vector cpp/*
-grep std::map cpp/*
-grep 'std::set<' cpp/*
-grep std::unordered_map cpp/*
-grep std::unordered_set cpp/*
-grep std::deque cpp/*
-grep std::ostringstream cpp/*
-grep std::ostream cpp/*
-
-grep std::cerr cpp/*
-grep std::cout cpp/*

luprex/cpp/core/eng-malloc.cpp

@@ -81,7 +81,7 @@ static void *emulated_sbrk(intptr_t increment) {
     return emulated_sbrk_base + old_used;
 }
 
-#include "dlmalloc/dlmalloc.c"
+#include "../../extern/dlmalloc.c"
 
 namespace eng {
     static uint32_t hash;

luprex/cpp/drv/driver-linux.cpp

@@ -2,7 +2,7 @@
 
 #include "drvutil.hpp"
 #include "sslutil.hpp"
-#include "../cpp/enginewrapper.hpp"
+#include "../core/enginewrapper.hpp"
 
 #include <iostream>
 #include <cstdio>