From a917a2a713fa8e913772ef8d397dd55b9e4ad5b7 Mon Sep 17 00:00:00 2001
From: NepDisk <16447892+NepDisk@users.noreply.github.com>
Date: Tue, 22 Oct 2024 12:43:03 -0400
Subject: [PATCH] Basic work to get make compiling again

Fonts are beyond fucked so this will have to be figured out in a new commit
---
 src/Makefile                  | 11 ++++++++---
 src/Sourcefile                |  4 +---
 src/acs/ACSVM/Sourcefile      | 22 ++++++++++++++++++++++
 src/acs/ACSVM/Util/Floats.cpp |  2 +-
 src/acs/Sourcefile            |  6 ++++++
 src/hardware/Sourcefile       | 13 +++++++++++++
 src/objects/Sourcefile        |  2 +-
 src/sdl/Sourcefile            |  7 +++++++
 8 files changed, 59 insertions(+), 8 deletions(-)
 create mode 100644 src/acs/ACSVM/Sourcefile
 create mode 100644 src/acs/Sourcefile
 create mode 100644 src/hardware/Sourcefile
 create mode 100644 src/sdl/Sourcefile

diff --git a/src/Makefile b/src/Makefile
index b22e07541..c12581bbf 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -220,10 +220,12 @@ sources+=\
 	$(call List,Sourcefile)\
 	$(call List,blua/Sourcefile)\
 	$(call List,blan/Sourcefile)\
+	$(call List,acs/Sourcefile)\
+	$(call List,acs/ACSVM/Sourcefile)\
 	$(call List,objects/Sourcefile)\
 
-depends:=$(basename $(filter %.c %.s,$(sources)))
-objects:=$(basename $(filter %.c %.s %.nas,$(sources)))
+depends:=$(basename $(filter %.c %.cpp %.s,$(sources)))
+objects:=$(basename $(filter %.c %.cpp %.s %.nas,$(sources)))
 
 depends:=$(depends:%=$(depdir)/%.d)
 
@@ -292,10 +294,11 @@ opts+=$(debug_opts)
 opts+=$(foreach v,$(passthru_opts),$(if $($(v)),-D$(v)))
 
 opts+=$(WFLAGS) $(CPPFLAGS) $(CFLAGS)
-libs+=$(LDFLAGS)
+libs+=$(LDFLAGS) -lstdc++
 asflags:=$(ASFLAGS) -x assembler-with-cpp
 
 cc=$(CC)
+cxx=$(CXX)
 
 ifdef DISTCC
 cc=distcc $(CC)
@@ -398,6 +401,7 @@ endif
 endef
 
 $(eval $(call _recipe,c))
+$(eval $(call _recipe,cpp))
 $(eval $(call _recipe,s,$(asflags)))
 
 # compiling recipe template
@@ -412,6 +416,7 @@ endef
 
 $(eval $(call _recipe,o,c,$(cc) -c -o $$@ $$<))
 $(eval $(call _recipe,o,nas,$(nasm) -o $$@ $$<))
+$(eval $(call _recipe,o,cpp,$(cxx) -c -o $$@ $$<))
 $(eval $(call _recipe,o,s,$(cc) $(asflags) -c -o $$@ $$<))
 $(eval $(call _recipe,res,rc,$(windres) -i $$< -o $$@))
 
diff --git a/src/Sourcefile b/src/Sourcefile
index f84cfb6f4..997bac977 100644
--- a/src/Sourcefile
+++ b/src/Sourcefile
@@ -122,6 +122,4 @@ k_terrain.c
 k_brightmap.c
 k_director.c
 k_follower.c
-k_acs.c
-k_acs-func.c
-
+k_mapuser.c
diff --git a/src/acs/ACSVM/Sourcefile b/src/acs/ACSVM/Sourcefile
new file mode 100644
index 000000000..a9a45549d
--- /dev/null
+++ b/src/acs/ACSVM/Sourcefile
@@ -0,0 +1,22 @@
+ACSVM/Action.cpp
+ACSVM/Array.cpp
+ACSVM/BinaryIO.cpp
+ACSVM/CallFunc.cpp
+ACSVM/CodeData.cpp
+ACSVM/Environment.cpp
+ACSVM/Error.cpp
+ACSVM/Function.cpp
+ACSVM/Init.cpp
+ACSVM/Jump.cpp
+ACSVM/Module.cpp
+ACSVM/ModuleACS0.cpp
+ACSVM/ModuleACSE.cpp
+ACSVM/PrintBuf.cpp
+ACSVM/Scope.cpp
+ACSVM/Script.cpp
+ACSVM/Serial.cpp
+ACSVM/String.cpp
+ACSVM/Thread.cpp
+ACSVM/ThreadExec.cpp
+ACSVM/Tracer.cpp
+Util/Floats.cpp
\ No newline at end of file
diff --git a/src/acs/ACSVM/Util/Floats.cpp b/src/acs/ACSVM/Util/Floats.cpp
index 7436e6ea4..b776ca26f 100644
--- a/src/acs/ACSVM/Util/Floats.cpp
+++ b/src/acs/ACSVM/Util/Floats.cpp
@@ -12,7 +12,7 @@
 
 #include "Floats.hpp"
 
-#include "ACSVM/Thread.hpp"
+#include "../ACSVM/Thread.hpp"
 
 #include <cstdio>
 
diff --git a/src/acs/Sourcefile b/src/acs/Sourcefile
new file mode 100644
index 000000000..35143baab
--- /dev/null
+++ b/src/acs/Sourcefile
@@ -0,0 +1,6 @@
+environment.cpp
+thread.cpp
+thread.hpp
+call-funcs.cpp
+stream.cpp
+interface.cpp
\ No newline at end of file
diff --git a/src/hardware/Sourcefile b/src/hardware/Sourcefile
new file mode 100644
index 000000000..1c05de76c
--- /dev/null
+++ b/src/hardware/Sourcefile
@@ -0,0 +1,13 @@
+hw_bsp.c
+hw_draw.c
+hw_light.c
+hw_main.c
+hw_clip.c
+hw_md2.c
+hw_cache.c
+hw_md2load.c
+hw_md3load.c
+hw_model.c
+u_list.c
+hw_batching.c
+r_opengl/r_opengl.c
diff --git a/src/objects/Sourcefile b/src/objects/Sourcefile
index 23c6b035b..4e778081b 100644
--- a/src/objects/Sourcefile
+++ b/src/objects/Sourcefile
@@ -1 +1 @@
-loops.c
\ No newline at end of file
+loops.cpp
diff --git a/src/sdl/Sourcefile b/src/sdl/Sourcefile
new file mode 100644
index 000000000..82d5ce073
--- /dev/null
+++ b/src/sdl/Sourcefile
@@ -0,0 +1,7 @@
+i_net.c
+i_system.c
+i_main.c
+i_video.c
+dosstr.c
+endtxt.c
+hwsym_sdl.c