Skip to content

Commit 0f1c73d

Browse files
committed
Fixed applet build in makefile
1 parent df65c45 commit 0f1c73d

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ WXVERSION=3.0
99
#
1010
# Source files
1111
#
12-
COMMON_SRCS=Samba.cpp Flash.cpp NvmFlash.cpp EfcFlash.cpp EefcFlash.cpp Applet.cpp WordCopyApplet.cpp Flasher.cpp Device.cpp
12+
COMMON_SRCS=Samba.cpp Flash.cpp D5xNvmFlash.cpp D2xNvmFlash.cpp EfcFlash.cpp EefcFlash.cpp Applet.cpp WordCopyApplet.cpp Flasher.cpp Device.cpp
1313
APPLET_SRCS=WordCopyArm.asm
1414
BOSSA_SRCS=BossaForm.cpp BossaWindow.cpp BossaAbout.cpp BossaApp.cpp BossaBitmaps.cpp BossaInfo.cpp BossaThread.cpp BossaProgress.cpp
1515
BOSSA_BMPS=BossaLogo.bmp BossaIcon.bmp ShumaTechLogo.bmp
@@ -238,9 +238,9 @@ $(foreach src,$(COMMON_SRCS),$(eval $(call common_obj,$(src))))
238238
define applet_obj
239239
$(SRCDIR)/$(1:%.asm=%.cpp): $(SRCDIR)/$(1)
240240
@echo APPLET $(1:%.asm=%)
241-
$$(Q)$$(ARMAS) -o $$(@:%.o=%.obj) $$<
242-
$$(Q)$$(ARMOBJCOPY) -O binary $$(@:%.o=%.obj) $$(@:%.o=%.bin)
243-
$$(Q)appletgen $(1:%.asm=%) $(SRCDIR) $(OBJDIR)
241+
$$(Q)$$(ARMAS) -o $$(@:$(SRCDIR)/%.cpp=$(OBJDIR)/%.obj) $$<
242+
$$(Q)$$(ARMOBJCOPY) -O binary $$(@:$(SRCDIR)/%.cpp=$(OBJDIR)/%.obj) $$(@:$(SRCDIR)/%.cpp=$(OBJDIR)/%.bin)
243+
$$(Q)./appletgen $(1:%.asm=%) $(SRCDIR) $(OBJDIR)
244244
$(OBJDIR)/$(1:%.asm=%.o): $(SRCDIR)/$(1:%.asm=%.cpp)
245245
@echo CPP APPLET $$<
246246
$$(Q)$$(CXX) $$(COMMON_CXXFLAGS) -c -o $$(@) $$(<:%.asm=%.cpp)

0 commit comments

Comments
 (0)