Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 16 additions & 2 deletions ci_prereq.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,20 @@ sudo apt install -y \
devscripts \
equivs

sudo add-apt-repository ppa:stsp-0/thunk-gen
sudo add-apt-repository ppa:stsp-0/dj64
add_ppa() {
PPA="$1"
for i in 1 2 3 4 5 6 7 8 9 10; do
echo "Adding $PPA (attempt $i)..."
if sudo add-apt-repository -y "$PPA"; then
return 0
fi
sleep 8
done
return 1
}

add_ppa ppa:stsp-0/thunk-gen
add_ppa ppa:stsp-0/dj64

sudo apt update
mk-build-deps --install --root-cmd sudo
14 changes: 13 additions & 1 deletion ci_test_prereq.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,18 @@
#!/bin/sh

sudo add-apt-repository ppa:dosemu2/ppa
add_ppa() {
PPA="$1"
for i in 1 2 3 4 5 6 7 8 9 10; do
echo "Adding $PPA (attempt $i)..."
if sudo add-apt-repository -y "$PPA"; then
return 0
fi
sleep 8
done
return 1
}

add_ppa ppa:dosemu2/ppa

sudo apt update -q

Expand Down
2 changes: 1 addition & 1 deletion djgpp/makefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ C_OPT = -Wall -O2 -Wmissing-declarations -Wwrite-strings -I $(SRCDIR) -I . \
# avoid CMOVxx instructions
C_OPT += -march=i386
LINK_OPT =
SRCS = $(SRCDIR)/command.c $(SRCDIR)/cmdbuf.c $(SRCDIR)/ms.c $(SRCDIR)/djterm.c \
SRCS = $(SRCDIR)/command.c $(SRCDIR)/cmdbuf.c $(SRCDIR)/ms.c $(SRCDIR)/djterm.c $(SRCDIR)/mem.c \
$(SRCDIR)/env.c $(SRCDIR)/psp.c $(SRCDIR)/umb.c $(SRCDIR)/ae0x.c \
$(SRCDIR)/compl.c $(SRCDIR)/clip.c memmem.c fmemcpy.c findclos.c
ASSRCS = $(SRCDIR)/asm.S $(SRCDIR)/int23.S $(SRCDIR)/int0.S $(SRCDIR)/int75.S \
Expand Down
2 changes: 2 additions & 0 deletions src/command.c
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@
#include "ae0x.h"
#include "compl.h"
#include "clip.h"
#include "mem.h"
#include "command.h"

/*
Expand Down Expand Up @@ -305,6 +306,7 @@ struct built_in_cmd cmd_table[] =
{"loadhigh", perform_loadhigh, "", "load program to UMB"},
{"md", perform_md, "", "create directory"},
{"mkdir", perform_md, "", "create directory"},
{"mem", perform_mem, "", "display memory statistics"},
{"move", perform_move, "", "move file"},
{"more", perform_more, "", "scroll-pause long output"},
{"mouseopt", perform_mouseopt, "", "mouse options"},
Expand Down
4 changes: 2 additions & 2 deletions src/makefile.inc
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ DJCFLAGS = -Wall -O2 -Wmissing-declarations -Wwrite-strings \
DJCPPFLAGS += -I. -I$(srcdir) -DCOMCOM_VERSION=\"$(VERSION)\"
DJASFLAGS += -I. -I$(srcdir)
DJASCPPFLAGS += -I. -I$(srcdir)
SOURCES = command.c cmdbuf.c mouse.c env.c psp.c umb.c ae0x.c compl.c clip.c \
SOURCES = command.c cmdbuf.c mouse.c env.c psp.c umb.c ae0x.c compl.c clip.c mem.c \
djterm.c thunks_a.c thunks_c.c
HEADERS = $(addprefix $(srcdir)/,ae0x.h cmdbuf.h compl.h psp.h command.h env.h mouse.h umb.h \
glob_asm.h asm.h)
mem.h glob_asm.h asm.h)
PDHDR = $(srcdir)/asm.h
GLOB_ASM = $(srcdir)/glob_asm.h
OBJECTS = $(SOURCES:.c=.o)
Expand Down
Loading