Skip to content

[cmds] Build fsck-dos.os2 and paint.os2 when WATCOM environment installed #2425

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ghaerr merged 2 commits into from
Oct 28, 2025
Merged

[cmds] Build fsck-dos.os2 and paint.os2 when WATCOM environment installed #2425

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bb539d2
[cmds] Build fsck-dos.os2 and paint.os2 when WATCOM environment insta…
ghaerr Oct 28, 2025
b4606c4
Remove bin/*.os2 bin/*.c86 on make clean
ghaerr Oct 28, 2025
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
1 change: 1 addition & 0 deletions elkscmd/fsck_dos/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
fsck-dos
fsck-dos.os2
7 changes: 6 additions & 1 deletion elkscmd/fsck_dos/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ LOCALCFLAGS += -Wno-shift-count-overflow
###############################################################################

PRGS = fsck-dos
ifdef WATCOM
PRGS += fsck-dos.os2
endif

all: $(PRGS)

Expand All @@ -37,7 +40,9 @@ fsck-dos: main.o boot.o check.o dir.o fat.o

fsck-dos.os2:
ewcc -Dlint=1 -DELKS=1 boot.c check.c dir.c fat.c main.c mem.c
ewlink -o fsck-dos.os2 boot.obj check.obj dir.obj fat.obj main.obj mem.obj
ewlink -o $@ boot.obj check.obj dir.obj fat.obj main.obj mem.obj
cp $@ $(TOPDIR)/elkscmd/rootfs_template/bin

clean:
$(RM) *.o $(PRGS) *.obj *.os2
$(RM) $(TOPDIR)/elkscmd/rootfs_template/bin/fsck-dos.os2
4 changes: 2 additions & 2 deletions elkscmd/gui/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
paint
opaint
cpaint
paint.os2
paint.c86
*.oaj
*.obj
*.ocj
4 changes: 0 additions & 4 deletions elkscmd/gui/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,5 @@ c86:

clean:
make -f Makefile.gcc clean
ifdef WATCOM
make -f Makefile.owc clean
endif
ifdef C86
make -f Makefile.c86 clean
endif
13 changes: 7 additions & 6 deletions elkscmd/gui/Makefile.c86
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ ifndef TOPDIR
$(error ELKS TOPDIR is not defined)
endif

ifndef C86
$(error C86 is not defined)
endif
#ifndef C86
#$(error C86 is not defined)
#endif

CPP=cpp86
CC=c86
Expand Down Expand Up @@ -49,7 +49,7 @@ DEFINES +=
LOCALFLAGS =

BINDIR = .
PROG = $(BINDIR)/cpaint
PROG = $(BINDIR)/paint.c86
SRCS = app.c gui.c input.c render.c event.c mouse.c graphics.c drawbmp.c cursor.c \
drawscanline.c
OBJS += vga-c86.o8j
Expand All @@ -58,7 +58,8 @@ all: $(PROG)

$(PROG): $(OBJS)
$(LD) $(LDFLAGS) -o $@ $^ $(LDLIBS)
cp $(PROG) $(TOPDIR)/elkscmd/rootfs_template/bin
cp $@ $(TOPDIR)/elkscmd/rootfs_template/bin

clean:
rm -f $(PROG) *.o8j *.as *.i *.lst
$(RM) $(PROG) *.o8j *.as *.i *.lst
$(RM) $(TOPDIR)/elkscmd/rootfs_template/bin/$(PROG)
2 changes: 1 addition & 1 deletion elkscmd/gui/Makefile.gcc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,4 +49,4 @@ vga-ia16.oaj: vga-ia16.o
mv vga-ia16.o vga-ia16.oaj

clean:
rm -f $(PROG) *.oaj
$(RM) $(PROG) *.oaj
13 changes: 7 additions & 6 deletions elkscmd/gui/Makefile.owc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ ifndef TOPDIR
$(error ELKS TOPDIR is not defined)
endif

ifndef WATCOM
$(error OpenWatcom WATCOM is not defined)
endif
#ifndef WATCOM
#$(error OpenWatcom WATCOM is not defined)
#endif

CC = owcc
LD = owcc
Expand Down Expand Up @@ -38,15 +38,16 @@ OBJS = $(SRCS:.c=.obj)

BINDIR = .
LOCALFLAGS =
PROG = $(BINDIR)/opaint
PROG = $(BINDIR)/paint.os2
SRCS = app.c gui.c input.c render.c event.c mouse.c graphics.c drawbmp.c cursor.c
SRCS += drawscanline.c

all: $(PROG)

$(PROG): $(OBJS)
$(LD) $(LDFLAGS) -o $@ $^ $(LDLIBS)
cp $(PROG) $(TOPDIR)/elkscmd/rootfs_template/bin
cp $@ $(TOPDIR)/elkscmd/rootfs_template/bin

clean:
rm -f $(PROG) *.obj
$(RM) $(PROG) *.obj
$(RM) $(TOPDIR)/elkscmd/rootfs_template/bin/$(PROG)