Skip to content

demos: fix dj32 arm build #62

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
stsp merged 1 commit into from
Jun 21, 2026
Merged

demos: fix dj32 arm build #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 10 additions & 3 deletions demos/asmsimp/32/makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ srcdir = ..
vpath %.c $(srcdir)
vpath %.S $(srcdir)

STRIP = @true
# or use `STRIP = djstrip` for non-debug build
DJSTRIP = @true
# or use `DJSTRIP = djstrip` for non-debug build

SOURCES := hello.c thunks_p.c
SOURCES := $(addprefix $(srcdir)/,$(SOURCES))
Expand Down Expand Up @@ -42,7 +42,14 @@ else
include $(DJMK)
endif

ifneq ($(CROSS_PREFIX),)
# for djlink on arm
export READELF = $(CROSS_PREFIX)readelf
export OBJCOPY = $(CROSS_PREFIX)objcopy
export STRIP = $(CROSS_PREFIX)strip
endif

# dj64 sets `DJ64_XOBJS`, `DJ64_XLIB`, `DJ64_XLDFLAGS`
$(TGT): $(DJ64_XLIB)
$(LINK) -d $@.dbg $^ -o $@ $(DJ64_XLDFLAGS)
$(STRIP) $@
$(DJSTRIP) $@
6 changes: 3 additions & 3 deletions demos/asmsimp/makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
STRIP = @true
# or use `STRIP = djstrip` for non-debug build
DJSTRIP = @true
# or use `DJSTRIP = djstrip` for non-debug build

SOURCES = hello.c thunks_p.c
AS_SOURCES = h.S
Expand Down Expand Up @@ -40,7 +40,7 @@ endif
# dj64 sets `DJ64_XOBJS`, `DJ64_XLIB`, `DJ64_XLDFLAGS`
$(TGT): $(DJ64_XLIB)
$(LINK) -d $@.dbg $^ -o $@ $(DJ64_XLDFLAGS)
$(STRIP) $@
$(DJSTRIP) $@

djgpp/%:
$(MAKE) -C djgpp $*
13 changes: 10 additions & 3 deletions demos/file/32/makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ srcdir = ..
vpath %.c $(srcdir)
vpath %.S $(srcdir)

STRIP = @true
# or use `STRIP = djstrip` for non-debug build
DJSTRIP = @true
# or use `DJSTRIP = djstrip` for non-debug build

SOURCES := file.c
SOURCES := $(addprefix $(srcdir)/,$(SOURCES))
Expand Down Expand Up @@ -37,7 +37,14 @@ else
include $(DJMK)
endif

ifneq ($(CROSS_PREFIX),)
# for djlink on arm
export READELF = $(CROSS_PREFIX)readelf
export OBJCOPY = $(CROSS_PREFIX)objcopy
export STRIP = $(CROSS_PREFIX)strip
endif

# dj64 sets `DJ64_XOBJS`, `DJ64_XLIB`, `DJ64_XLDFLAGS`
$(TGT): $(DJ64_XLIB)
$(LINK) -d $@.dbg $^ -o $@ $(DJ64_XLDFLAGS)
$(STRIP) $@
$(DJSTRIP) $@
6 changes: 3 additions & 3 deletions demos/file/makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
STRIP = @true
# or use `STRIP = djstrip` for non-debug build
DJSTRIP = @true
# or use `DJSTRIP = djstrip` for non-debug build

SOURCES = file.c
TGT = file.exe
Expand Down Expand Up @@ -37,7 +37,7 @@ endif
# dj64 sets `DJ64_XOBJS`, `DJ64_XLIB`, `DJ64_XLDFLAGS`
$(TGT): $(DJ64_XLIB)
$(LINK) -d $@.dbg $^ -o $@ $(DJ64_XLDFLAGS)
$(STRIP) $@
$(DJSTRIP) $@

djgpp/%:
$(MAKE) -C djgpp $*
13 changes: 10 additions & 3 deletions demos/helloasm/32/makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ srcdir = ..
vpath %.c $(srcdir)
vpath %.S $(srcdir)

STRIP = @true
# or use `STRIP = djstrip` for non-debug build
DJSTRIP = @true
# or use `DJSTRIP = djstrip` for non-debug build

SOURCES := hello.c thunks_a.c thunks_c.c thunks_p.c
SOURCES := $(addprefix $(srcdir)/,$(SOURCES))
Expand Down Expand Up @@ -44,7 +44,14 @@ else
include $(DJMK)
endif

ifneq ($(CROSS_PREFIX),)
# for djlink on arm
export READELF = $(CROSS_PREFIX)readelf
export OBJCOPY = $(CROSS_PREFIX)objcopy
export STRIP = $(CROSS_PREFIX)strip
endif

# dj64 sets `DJ64_XOBJS`, `DJ64_XLIB`, `DJ64_XLDFLAGS`
$(TGT): $(DJ64_XLIB)
$(LINK) -d $@.dbg $^ -o $@ $(DJ64_XLDFLAGS)
$(STRIP) $@
$(DJSTRIP) $@
6 changes: 3 additions & 3 deletions demos/helloasm/makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
STRIP = @true
# or use `STRIP = djstrip` for non-debug build
DJSTRIP = @true
# or use `DJSTRIP = djstrip` for non-debug build

SOURCES = hello.c thunks_a.c thunks_c.c thunks_p.c
AS_SOURCES = h.S
Expand Down Expand Up @@ -41,7 +41,7 @@ endif
# dj64 sets `DJ64_XOBJS`, `DJ64_XLIB`, `DJ64_XLDFLAGS`
$(TGT): $(DJ64_XLIB)
$(LINK) -d $@.dbg $^ -o $@ $(DJ64_XLDFLAGS)
$(STRIP) $@
$(DJSTRIP) $@

djgpp/%:
$(MAKE) -C djgpp $*
13 changes: 10 additions & 3 deletions demos/int86/32/makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ srcdir = ..
vpath %.c $(srcdir)
vpath %.S $(srcdir)

STRIP = @true
# or use `STRIP = djstrip` for non-debug build
DJSTRIP = @true
# or use `DJSTRIP = djstrip` for non-debug build

SOURCES := file.c
SOURCES := $(addprefix $(srcdir)/,$(SOURCES))
Expand Down Expand Up @@ -37,7 +37,14 @@ else
include $(DJMK)
endif

ifneq ($(CROSS_PREFIX),)
# for djlink on arm
export READELF = $(CROSS_PREFIX)readelf
export OBJCOPY = $(CROSS_PREFIX)objcopy
export STRIP = $(CROSS_PREFIX)strip
endif

# dj64 sets `DJ64_XOBJS`, `DJ64_XLIB`, `DJ64_XLDFLAGS`
$(TGT): $(DJ64_XLIB)
$(LINK) -d $@.dbg $^ -o $@ $(DJ64_XLDFLAGS)
$(STRIP) $@
$(DJSTRIP) $@
6 changes: 3 additions & 3 deletions demos/int86/makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
STRIP = @true
# or use `STRIP = djstrip` for non-debug build
DJSTRIP = @true
# or use `DJSTRIP = djstrip` for non-debug build

SOURCES = file.c
TGT = file.exe
Expand Down Expand Up @@ -37,7 +37,7 @@ endif
# dj64 sets `DJ64_XOBJS`, `DJ64_XLIB`, `DJ64_XLDFLAGS`
$(TGT): $(DJ64_XLIB)
$(LINK) -d $@.dbg $^ -o $@ $(DJ64_XLDFLAGS)
$(STRIP) $@
$(DJSTRIP) $@

djgpp/%:
$(MAKE) -C djgpp $*
13 changes: 10 additions & 3 deletions demos/rmcb/32/makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ srcdir = ..
vpath %.c $(srcdir)
vpath %.S $(srcdir)

STRIP = @true
# or use `STRIP = djstrip` for non-debug build
DJSTRIP = @true
# or use `DJSTRIP = djstrip` for non-debug build

SOURCES := main.c mouse.c thunks_a.c thunks_c.c
SOURCES := $(addprefix $(srcdir)/,$(SOURCES))
Expand Down Expand Up @@ -44,7 +44,14 @@ else
include $(DJMK)
endif

ifneq ($(CROSS_PREFIX),)
# for djlink on arm
export READELF = $(CROSS_PREFIX)readelf
export OBJCOPY = $(CROSS_PREFIX)objcopy
export STRIP = $(CROSS_PREFIX)strip
endif

# dj64 sets `DJ64_XOBJS`, `DJ64_XLIB`, `DJ64_XLDFLAGS`
$(TGT): $(DJ64_XLIB)
$(LINK) -d $@.dbg $^ -o $@ $(DJ64_XLDFLAGS)
$(STRIP) $@
$(DJSTRIP) $@
6 changes: 3 additions & 3 deletions demos/rmcb/makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
STRIP = @true
# or use `STRIP = djstrip` for non-debug build
DJSTRIP = @true
# or use `DJSTRIP = djstrip` for non-debug build

SOURCES = main.c mouse.c thunks_a.c thunks_c.c
AS_SOURCES = ms.S asm.S
Expand Down Expand Up @@ -41,7 +41,7 @@ endif
# dj64 sets `DJ64_XOBJS`, `DJ64_XLIB`, `DJ64_XLDFLAGS`
$(TGT): $(DJ64_XLIB)
$(LINK) -d $@.dbg $^ -o $@ $(DJ64_XLDFLAGS)
$(STRIP) $@
$(DJSTRIP) $@

djgpp/%:
$(MAKE) -C djgpp $*
Loading