From 0d4ebe65e19bd87f2319e8fbd91ede5006ad939a Mon Sep 17 00:00:00 2001
From: teppy999 <teppy@egenesis.com>
Date: Thu, 8 Jun 2023 16:31:38 -0400
Subject: [PATCH] Fix makefile

---
 luprex/Makefile | 158 +++++++++++++++++++++++++-----------------------
 1 file changed, 81 insertions(+), 77 deletions(-)

diff --git a/luprex/Makefile b/luprex/Makefile
index a1c5bfff..d1113f8f 100644
--- a/luprex/Makefile
+++ b/luprex/Makefile
@@ -27,83 +27,83 @@ $(info Building for $(OS)...)
 #######################################################################
 
 OBJ_ERIS=\
-	obj/$(OS)/eris/lapi.obj \
-	obj/$(OS)/eris/lcode.obj \
-	obj/$(OS)/eris/lctype.obj \
-	obj/$(OS)/eris/ldebug.obj \
-	obj/$(OS)/eris/ldo.obj \
-	obj/$(OS)/eris/ldump.obj \
-	obj/$(OS)/eris/lfunc.obj \
-	obj/$(OS)/eris/lgc.obj \
-	obj/$(OS)/eris/llex.obj \
-	obj/$(OS)/eris/lmem.obj \
-	obj/$(OS)/eris/lobject.obj \
-	obj/$(OS)/eris/lopcodes.obj \
-	obj/$(OS)/eris/lparser.obj \
-	obj/$(OS)/eris/lstate.obj \
-	obj/$(OS)/eris/lstring.obj \
-	obj/$(OS)/eris/ltable.obj \
-	obj/$(OS)/eris/ltm.obj \
-	obj/$(OS)/eris/lundump.obj \
-	obj/$(OS)/eris/lvm.obj \
-	obj/$(OS)/eris/lzio.obj \
-	obj/$(OS)/eris/lauxlib.obj \
-	obj/$(OS)/eris/lbaselib.obj \
-	obj/$(OS)/eris/lbitlib.obj \
-	obj/$(OS)/eris/lcorolib.obj \
-	obj/$(OS)/eris/ldblib.obj \
-	obj/$(OS)/eris/liolib.obj \
-	obj/$(OS)/eris/lmathlib.obj \
-	obj/$(OS)/eris/loslib.obj \
-	obj/$(OS)/eris/lstrlib.obj \
-	obj/$(OS)/eris/ltablib.obj \
-	obj/$(OS)/eris/loadlib.obj \
-	obj/$(OS)/eris/linit.obj \
-	obj/$(OS)/eris/eris.obj \
+	build/$(OS)/eris/lapi.obj \
+	build/$(OS)/eris/lcode.obj \
+	build/$(OS)/eris/lctype.obj \
+	build/$(OS)/eris/ldebug.obj \
+	build/$(OS)/eris/ldo.obj \
+	build/$(OS)/eris/ldump.obj \
+	build/$(OS)/eris/lfunc.obj \
+	build/$(OS)/eris/lgc.obj \
+	build/$(OS)/eris/llex.obj \
+	build/$(OS)/eris/lmem.obj \
+	build/$(OS)/eris/lobject.obj \
+	build/$(OS)/eris/lopcodes.obj \
+	build/$(OS)/eris/lparser.obj \
+	build/$(OS)/eris/lstate.obj \
+	build/$(OS)/eris/lstring.obj \
+	build/$(OS)/eris/ltable.obj \
+	build/$(OS)/eris/ltm.obj \
+	build/$(OS)/eris/lundump.obj \
+	build/$(OS)/eris/lvm.obj \
+	build/$(OS)/eris/lzio.obj \
+	build/$(OS)/eris/lauxlib.obj \
+	build/$(OS)/eris/lbaselib.obj \
+	build/$(OS)/eris/lbitlib.obj \
+	build/$(OS)/eris/lcorolib.obj \
+	build/$(OS)/eris/ldblib.obj \
+	build/$(OS)/eris/liolib.obj \
+	build/$(OS)/eris/lmathlib.obj \
+	build/$(OS)/eris/loslib.obj \
+	build/$(OS)/eris/lstrlib.obj \
+	build/$(OS)/eris/ltablib.obj \
+	build/$(OS)/eris/loadlib.obj \
+	build/$(OS)/eris/linit.obj \
+	build/$(OS)/eris/eris.obj \
 
 OBJ_CORE=\
-	obj/$(OS)/core/invocation.obj\
-	obj/$(OS)/core/spookyv2.obj\
-	obj/$(OS)/core/eng-malloc.obj\
-	obj/$(OS)/core/debugcollector.obj\
-	obj/$(OS)/core/drivenengine.obj\
-	obj/$(OS)/core/util.obj\
-	obj/$(OS)/core/luastack.obj\
-	obj/$(OS)/core/traceback.obj\
-	obj/$(OS)/core/planemap.obj\
-	obj/$(OS)/core/pprint.obj\
-	obj/$(OS)/core/luaconsole.obj\
-	obj/$(OS)/core/idalloc.obj\
-	obj/$(OS)/core/globaldb.obj\
-	obj/$(OS)/core/sched.obj\
-	obj/$(OS)/core/http.obj\
-	obj/$(OS)/core/json.obj\
-	obj/$(OS)/core/table.obj\
-	obj/$(OS)/core/gui.obj\
-	obj/$(OS)/core/luasnap.obj\
-	obj/$(OS)/core/animqueue.obj\
-	obj/$(OS)/core/streambuffer.obj\
-	obj/$(OS)/core/source.obj\
-	obj/$(OS)/core/world-core.obj\
-	obj/$(OS)/core/world-accessor.obj\
-	obj/$(OS)/core/world-difftab.obj\
-	obj/$(OS)/core/world-diffxmit.obj\
-	obj/$(OS)/core/world-pairtab.obj\
-	obj/$(OS)/core/world-testing.obj\
-	obj/$(OS)/core/textgame.obj\
-	obj/$(OS)/core/lpxserver.obj\
-	obj/$(OS)/core/lpxclient.obj\
-	obj/$(OS)/core/eng-tests.obj\
-	obj/$(OS)/core/printbuffer.obj\
-	obj/$(OS)/core/serializelua.obj\
+	build/$(OS)/core/invocation.obj\
+	build/$(OS)/core/spookyv2.obj\
+	build/$(OS)/core/eng-malloc.obj\
+	build/$(OS)/core/debugcollector.obj\
+	build/$(OS)/core/drivenengine.obj\
+	build/$(OS)/core/util.obj\
+	build/$(OS)/core/luastack.obj\
+	build/$(OS)/core/traceback.obj\
+	build/$(OS)/core/planemap.obj\
+	build/$(OS)/core/pprint.obj\
+	build/$(OS)/core/luaconsole.obj\
+	build/$(OS)/core/idalloc.obj\
+	build/$(OS)/core/globaldb.obj\
+	build/$(OS)/core/sched.obj\
+	build/$(OS)/core/http.obj\
+	build/$(OS)/core/json.obj\
+	build/$(OS)/core/table.obj\
+	build/$(OS)/core/gui.obj\
+	build/$(OS)/core/luasnap.obj\
+	build/$(OS)/core/animqueue.obj\
+	build/$(OS)/core/streambuffer.obj\
+	build/$(OS)/core/source.obj\
+	build/$(OS)/core/world-core.obj\
+	build/$(OS)/core/world-accessor.obj\
+	build/$(OS)/core/world-difftab.obj\
+	build/$(OS)/core/world-diffxmit.obj\
+	build/$(OS)/core/world-pairtab.obj\
+	build/$(OS)/core/world-testing.obj\
+	build/$(OS)/core/textgame.obj\
+	build/$(OS)/core/lpxserver.obj\
+	build/$(OS)/core/lpxclient.obj\
+	build/$(OS)/core/eng-tests.obj\
+	build/$(OS)/core/printbuffer.obj\
+	build/$(OS)/core/serializelua.obj\
 
 
 OBJ_DRV=\
-	obj/$(OS)/drv/driver.obj\
-	obj/$(OS)/drv/drvutil.obj\
-	obj/$(OS)/drv/osdrvutil.obj\
-	obj/$(OS)/drv/sslutil.obj\
-	obj/$(OS)/drv/readline.obj\
+	build/$(OS)/drv/driver.obj\
+	build/$(OS)/drv/drvutil.obj\
+	build/$(OS)/drv/osdrvutil.obj\
+	build/$(OS)/drv/sslutil.obj\
+	build/$(OS)/drv/readline.obj\
 
 
 #######################################################################
@@ -182,6 +182,9 @@ endif
 
 all: build/$(OS)/$(LUPREX_EXE) build/$(OS)/$(LUPREXSTATIC_EXE) build/$(OS)/$(LUPREXLIB_DLL)
 
+build:
+	mkdir -p build/$(OS)/core build/$(OS)/eris build/$(OS)/drv
+
 build/$(OS)/$(LUPREX_EXE): build/$(OS)/$(LUPREXLIB_DLL) $(OBJ_DRV)
 	$(LINKEXE) $@ $(OBJ_DRV) $(LIBS)
 	$(MAKEPDB) $@
@@ -194,23 +197,24 @@ build/$(OS)/$(LUPREXLIB_DLL): $(OBJ_ERIS) $(OBJ_CORE)
 	$(LINKDLL) $@ $^
 	$(MAKEPDB) $@
 
-obj/$(OS)/eris/%.obj: ext/eris-master/src/%.c
+build/$(OS)/eris/%.obj: ext/eris-master/src/%.c build
 	$(MAKEDEPS) $@d $(LUA_FLAGS) $<
 	$(COMPILE) $@ $(LUA_FLAGS) $<
 
-obj/$(OS)/core/%.obj: cpp/core/%.cpp
+build/$(OS)/core/%.obj: cpp/core/%.cpp build
 	$(MAKEDEPS) $@d -I./ext/eris-master/src -I./cpp/wrap -I./cpp/core $<
 	$(COMPILE) $@ -I./ext/eris-master/src -I./cpp/wrap -I./cpp/core $<
 
-obj/$(OS)/drv/%.obj: cpp/drv/%.cpp
+build/$(OS)/drv/%.obj: cpp/drv/%.cpp build
 	$(MAKEDEPS) $@d $(OPENSSL_INCLUDE) -I./src/drv $<
 	$(COMPILE) $@ $(OPENSSL_INCLUDE) -I./src/drv $<
 
 clean:
-	rm -f luprex* luprex*.* *.pdb build/*/* obj/*/*/*
+	rm -f luprex* luprex*.* *.pdb
+	rm -rf build
 
 clean-os:
-	rm -f luprex* luprex*.* *.pdb build/$(OS)/* obj/$(OS)/*/*
+	rm -f luprex* luprex*.* *.pdb build/$(OS)/* build/$(OS)/*/*
 
 #######################################################################
 ##