Merge branch 'MockbaTheBorg:master' into test-parseopt-win

pzembrod · May 6, 2024 · cf0ff72 · cf0ff72
2 parents 6c7d34e + 596adf9
commit cf0ff72
Show file tree

Hide file tree

Showing 82 changed files with 559 additions and 30,233 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "RunCPM/lua"]
+	path = RunCPM/lua
+	url = https://github.com/lua/lua
diff --git a/RunCPM/Makefile b/RunCPM/Makefile
@@ -18,9 +18,13 @@ clean:
 build:
 	$(MAKE) -f Makefile.$(SYS) all
 
+rebuild:
+	$(MAKE) -f Makefile.$(SYS) rebuild
+
 none:
 	@echo "To build RunCPM issue 'make PLATFORM build'."
 	@echo "To clean RunCPM issue 'make PLATFORM clean'."
+	@echo "To clean,then build RunCPM issue 'make PLATFORM rebuild'."
 	@echo "Valid platforms are: $(PLATS)"
 
 .PHONY: all $(PLATS) clean build none
diff --git a/RunCPM/Makefile.macosx b/RunCPM/Makefile.macosx
@@ -9,19 +9,19 @@ CC = gcc
 #CC = gcc -DDEBUG=1 -DDEBUGLOG=1
 
 # Flags to pass to the compiler - add "-g" to include debug information
-CFLAGS = -Wall -O3 -fPIC -Wno-unused-variable -DHASLUA
+CFLAGS = -Wall -O3 -fPIC -Wno-unused-variable
 #uncomment next line to include debug symbols
 CFLAGS+=-ggdb
 
 # Flags to pass to the linker
 LDFLAGS = -lm -ldl
 
 # Objects to build
-OBJS = main.o lua/liblua.a
+OBJS = main.o # lua/liblua.a
 
 # Lua building
-LUABUILD = $(MAKE) -C lua macosx
-LUACLEAN = $(MAKE) -C lua clean
+#LUABUILD = $(MAKE) -C lua
+#LUACLEAN = $(MAKE) -C lua clean
 
 # Clean up program
 RM = rm -f
@@ -34,13 +34,13 @@ $(PROG): main.o
 	$(CC) $(OBJS) -o $(PROG) $(LDFLAGS)
 
 main.o: main.c $(wildcard *.h) $(MFILE)
-	$(LUABUILD)
+#	$(LUABUILD)
 	$(CC) $(CFLAGS) -c main.c
 
 rebuild: clean all
 
 .PHONY: clean
 clean:
-	$(LUACLEAN)
+#	$(LUACLEAN)
 	$(RM) *.o
 	$(RM) $(PROG)
diff --git a/RunCPM/Makefile.mingw b/RunCPM/Makefile.mingw
@@ -16,14 +16,14 @@ CFLAGS = -Wall -O3 -fPIC -Wno-unused-variable
 LDFLAGS = -mconsole -lm -ldl
 
 # Objects to build
-OBJS = main.o lua/liblua.a
+OBJS = main.o # lua/liblua.a
 
 # Lua building
-LUABUILD = $(MAKE) -C lua mingw
-LUACLEAN = $(MAKE) -C lua clean
+#LUABUILD = $(MAKE) -C lua
+#LUACLEAN = $(MAKE) -C lua clean
 
 # Clean up program
-RM = rm -f
+RM = del /Q
 
 #------------------------------------------------------------------------
 
@@ -33,13 +33,13 @@ $(PROG): main.o
 	$(CC) $(OBJS) -o $(PROG) $(LDFLAGS)
 
 main.o: main.c $(wildcard *.h) $(MFILE)
-	$(LUABUILD)
+#	$(LUABUILD)
 	$(CC) $(CFLAGS) -c main.c
 
 rebuild: clean all
 
 .PHONY: clean
 clean:
-	$(LUACLEAN)
+#	$(LUACLEAN)
 	$(RM) *.o
 	$(RM) $(PROG)
diff --git a/RunCPM/Makefile.msys2 b/RunCPM/Makefile.msys2
@@ -16,11 +16,11 @@ CFLAGS = -Wall -O3 -fPIC -Wno-unused-variable
 LDFLAGS = -lm
 
 # Objects to build
-OBJS = main.o lua/liblua.a
+OBJS = main.o # lua/liblua.a
 
 # Lua building
-LUABUILD = $(MAKE) -C lua mingw
-LUACLEAN = $(MAKE) -C lua clean
+#LUABUILD = $(MAKE) -C lua
+#LUACLEAN = $(MAKE) -C lua clean
 
 # Clean up program
 RM = rm -f
@@ -30,16 +30,17 @@ RM = rm -f
 all: $(PROG)
 
 $(PROG): main.o
-	$(CC) $(OBJS) -o $(PROG) $(LDFLAGS)
+	windres msys2.rc -O coff -o RunCPM.res
+	$(CC) $(OBJS) RunCPM.res -o $(PROG) $(LDFLAGS)
 
 main.o: main.c $(wildcard *.h) $(MFILE)
-	$(LUABUILD)
+#	$(LUABUILD)
 	$(CC) $(CFLAGS) -c main.c
 
 rebuild: clean all
 
 .PHONY: clean
 clean:
-	$(LUACLEAN)
+#	$(LUACLEAN)
 	$(RM) *.o
 	$(RM) $(PROG)
diff --git a/RunCPM/Makefile.posix b/RunCPM/Makefile.posix
@@ -16,11 +16,11 @@ CFLAGS = -Wall -O3 -fPIC -Wno-unused-variable
 LDFLAGS = -lm -ldl
 
 # Objects to build
-OBJS = main.o lua/liblua.a
+OBJS = main.o # lua/liblua.a
 
 # Lua building
-LUABUILD = $(MAKE) -C lua linux
-LUACLEAN = $(MAKE) -C lua clean
+#LUABUILD = $(MAKE) -C lua
+#LUACLEAN = $(MAKE) -C lua clean
 
 # Clean up program
 RM = rm -f
@@ -33,13 +33,13 @@ $(PROG): main.o
 	$(CC) $(OBJS) -o $(PROG) $(LDFLAGS)
 
 main.o: main.c $(wildcard *.h) $(MFILE)
-	$(LUABUILD)
+#	$(LUABUILD)
 	$(CC) $(CFLAGS) -c main.c
 
 rebuild: clean all
 
 .PHONY: clean
 clean:
-	$(LUACLEAN)
+#	$(LUACLEAN)
 	$(RM) *.o
 	$(RM) $(PROG)
diff --git a/RunCPM/Makefile.tdm b/RunCPM/Makefile.tdm
@@ -16,11 +16,11 @@ CFLAGS = -Wall -O3 -fPIC -Wno-unused-variable
 LDFLAGS = -mconsole
 
 # Objects to build
-OBJS = main.o lua/liblua.a
+OBJS = main.o # lua/liblua.a
 
 # Lua building
-LUABUILD = $(MAKE) -C lua mingw
-LUACLEAN = $(RM) lua\*.o ; $(RM) lua\*.a ; $(RM) lua\*.exe
+#LUABUILD = $(MAKE) -C lua mingw
+#LUACLEAN = $(RM) lua\*.o ; $(RM) lua\*.a ; $(RM) lua\*.exe
 
 # Clean up program
 RM = del
@@ -33,13 +33,13 @@ $(PROG): main.o
 	$(CC) $(OBJS) -o $(PROG) $(LDFLAGS)
 
 main.o: main.c $(wildcard *.h) $(MFILE)
-	$(LUABUILD)
+#	$(LUABUILD)
 	$(CC) $(CFLAGS) -c main.c
 
 rebuild: clean all
 
 .PHONY: clean
 clean:
-	$(LUACLEAN)
+#	$(LUACLEAN)
 	$(RM) *.o
 	$(RM) $(PROG)
diff --git a/RunCPM/RunCPM.vcxproj b/RunCPM/RunCPM.vcxproj
@@ -153,38 +153,6 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="lua\lapi.c" />
-    <ClCompile Include="lua\lauxlib.c" />
-    <ClCompile Include="lua\lbaselib.c" />
-    <ClCompile Include="lua\lcode.c" />
-    <ClCompile Include="lua\lcorolib.c" />
-    <ClCompile Include="lua\lctype.c" />
-    <ClCompile Include="lua\ldblib.c" />
-    <ClCompile Include="lua\ldebug.c" />
-    <ClCompile Include="lua\ldo.c" />
-    <ClCompile Include="lua\ldump.c" />
-    <ClCompile Include="lua\lfunc.c" />
-    <ClCompile Include="lua\lgc.c" />
-    <ClCompile Include="lua\linit.c" />
-    <ClCompile Include="lua\liolib.c" />
-    <ClCompile Include="lua\llex.c" />
-    <ClCompile Include="lua\lmathlib.c" />
-    <ClCompile Include="lua\lmem.c" />
-    <ClCompile Include="lua\loadlib.c" />
-    <ClCompile Include="lua\lobject.c" />
-    <ClCompile Include="lua\lopcodes.c" />
-    <ClCompile Include="lua\loslib.c" />
-    <ClCompile Include="lua\lparser.c" />
-    <ClCompile Include="lua\lstate.c" />
-    <ClCompile Include="lua\lstring.c" />
-    <ClCompile Include="lua\lstrlib.c" />
-    <ClCompile Include="lua\ltable.c" />
-    <ClCompile Include="lua\ltablib.c" />
-    <ClCompile Include="lua\ltm.c" />
-    <ClCompile Include="lua\lundump.c" />
-    <ClCompile Include="lua\lutf8lib.c" />
-    <ClCompile Include="lua\lvm.c" />
-    <ClCompile Include="lua\lzio.c" />
     <ClCompile Include="main.c" />
   </ItemGroup>
   <ItemGroup>
@@ -197,32 +165,6 @@
     <ClInclude Include="cpu.h" />
     <ClInclude Include="disk.h" />
     <ClInclude Include="globals.h" />
-    <ClInclude Include="lua.h" />
-    <ClInclude Include="lua\lapi.h" />
-    <ClInclude Include="lua\lauxlib.h" />
-    <ClInclude Include="lua\lcode.h" />
-    <ClInclude Include="lua\lctype.h" />
-    <ClInclude Include="lua\ldebug.h" />
-    <ClInclude Include="lua\ldo.h" />
-    <ClInclude Include="lua\lfunc.h" />
-    <ClInclude Include="lua\lgc.h" />
-    <ClInclude Include="lua\llex.h" />
-    <ClInclude Include="lua\llimits.h" />
-    <ClInclude Include="lua\lmem.h" />
-    <ClInclude Include="lua\lobject.h" />
-    <ClInclude Include="lua\lopcodes.h" />
-    <ClInclude Include="lua\lparser.h" />
-    <ClInclude Include="lua\lprefix.h" />
-    <ClInclude Include="lua\lstate.h" />
-    <ClInclude Include="lua\lstring.h" />
-    <ClInclude Include="lua\ltable.h" />
-    <ClInclude Include="lua\ltm.h" />
-    <ClInclude Include="lua\lua.h" />
-    <ClInclude Include="lua\luaconf.h" />
-    <ClInclude Include="lua\lualib.h" />
-    <ClInclude Include="lua\lundump.h" />
-    <ClInclude Include="lua\lvm.h" />
-    <ClInclude Include="lua\lzio.h" />
     <ClInclude Include="ram.h" />
     <ClInclude Include="resource.h" />
   </ItemGroup>