Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/MockbaTheBorg/RunCPM
Browse files Browse the repository at this point in the history
  • Loading branch information
MockbaTheBorg committed Oct 16, 2024
2 parents 951c5f0 + f87f6ea commit f1e5ac9
Show file tree
Hide file tree
Showing 25 changed files with 19 additions and 945 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/windows-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ jobs:
uses: actions/[email protected]
with:
# Artifact name
name: runcpm-windows
name: RunCPM.exe
# A file, directory or wildcard pattern that describes what to upload
path: output
path: Release
# The desired behavior if no files are found using the provided path.
if-no-files-found: error
3 changes: 0 additions & 3 deletions .gitmodules

This file was deleted.

Binary file removed DISK/A.ZIP
Binary file not shown.
Binary file added DISK/A0.ZIP
Binary file not shown.
9 changes: 1 addition & 8 deletions RunCPM/Makefile.macosx
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,9 @@ CFLAGS+=-ggdb

# Flags to pass to the linker
LDFLAGS =
#LDFLAGS = -lm -ldl

# Objects to build
OBJS = main.o # lua/liblua.a

# Lua building
#LUABUILD = $(MAKE) -C lua
#LUACLEAN = $(MAKE) -C lua clean
OBJS = main.o

# Clean up program
RM = rm -f
Expand All @@ -35,13 +30,11 @@ $(PROG): main.o
$(CC) $(OBJS) -o $(PROG) $(LDFLAGS)

main.o: main.c $(wildcard *.h) $(MFILE)
# $(LUABUILD)
$(CC) $(CFLAGS) -c main.c

rebuild: clean all

.PHONY: clean
clean:
# $(LUACLEAN)
$(RM) *.o
$(RM) $(PROG)
9 changes: 1 addition & 8 deletions RunCPM/Makefile.mingw
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,9 @@ CFLAGS = -Wall -O3 -fPIC -Wno-unused-variable

# Flags to pass to the linker
LDFLAGS =
#LDFLAGS = -mconsole -lm -ldl

# Objects to build
OBJS = main.o # lua/liblua.a

# Lua building
#LUABUILD = $(MAKE) -C lua
#LUACLEAN = $(MAKE) -C lua clean
OBJS = main.o

# Clean up program
RM = del /Q
Expand All @@ -34,13 +29,11 @@ $(PROG): main.o
$(CC) $(OBJS) -o $(PROG) $(LDFLAGS)

main.o: main.c $(wildcard *.h) $(MFILE)
# $(LUABUILD)
$(CC) $(CFLAGS) -c main.c

rebuild: clean all

.PHONY: clean
clean:
# $(LUACLEAN)
$(RM) *.o
$(RM) $(PROG)
9 changes: 1 addition & 8 deletions RunCPM/Makefile.msys2
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,9 @@ CFLAGS = -Wall -O3 -fPIC -Wno-unused-variable

# Flags to pass to the linker
LDFLAGS =
#LDFLAGS = -lm

# Objects to build
OBJS = main.o # lua/liblua.a

# Lua building
#LUABUILD = $(MAKE) -C lua
#LUACLEAN = $(MAKE) -C lua clean
OBJS = main.o

# Clean up program
RM = rm -f
Expand All @@ -35,13 +30,11 @@ $(PROG): main.o
$(CC) $(OBJS) RunCPM.res -o $(PROG) $(LDFLAGS)

main.o: main.c $(wildcard *.h) $(MFILE)
# $(LUABUILD)
$(CC) $(CFLAGS) -c main.c

rebuild: clean all

.PHONY: clean
clean:
# $(LUACLEAN)
$(RM) *.o
$(RM) $(PROG)
9 changes: 1 addition & 8 deletions RunCPM/Makefile.posix
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,9 @@ CFLAGS = -Wall -O3 -fPIC -Wno-unused-variable

# Flags to pass to the linker
LDFLAGS =
#LDFLAGS = -lm -ldl

# Objects to build
OBJS = main.o # lua/liblua.a

# Lua building
#LUABUILD = $(MAKE) -C lua
#LUACLEAN = $(MAKE) -C lua clean
OBJS = main.o

# Clean up program
RM = rm -f
Expand All @@ -34,13 +29,11 @@ $(PROG): main.o
$(CC) $(OBJS) -o $(PROG) $(LDFLAGS)

main.o: main.c $(wildcard *.h) $(MFILE)
# $(LUABUILD)
$(CC) $(CFLAGS) -c main.c

rebuild: clean all

.PHONY: clean
clean:
# $(LUACLEAN)
$(RM) *.o
$(RM) $(PROG)
9 changes: 1 addition & 8 deletions RunCPM/Makefile.tdm
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,9 @@ CFLAGS = -Wall -O3 -fPIC -Wno-unused-variable

# Flags to pass to the linker
LDFLAGS =
#LDFLAGS = -mconsole

# Objects to build
OBJS = main.o # lua/liblua.a

# Lua building
#LUABUILD = $(MAKE) -C lua mingw
#LUACLEAN = $(RM) lua\*.o ; $(RM) lua\*.a ; $(RM) lua\*.exe
OBJS = main.o

# Clean up program
RM = del
Expand All @@ -34,13 +29,11 @@ $(PROG): main.o
$(CC) $(OBJS) -o $(PROG) $(LDFLAGS)

main.o: main.c $(wildcard *.h) $(MFILE)
# $(LUABUILD)
$(CC) $(CFLAGS) -c main.c

rebuild: clean all

.PHONY: clean
clean:
# $(LUACLEAN)
$(RM) *.o
$(RM) $(PROG)
Loading

0 comments on commit f1e5ac9

Please sign in to comment.