Skip to content

Commit 8260453

Browse files
committed
Fix some makefile things (spasm build params, @ weirdness etc.)
1 parent 3e5f01a commit 8260453

File tree

2 files changed

+18
-17
lines changed

2 files changed

+18
-17
lines changed

makefile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ MKDIR = mkdir
1515
PREFIX ?= C:
1616
INSTALLLOC := $(call NATIVEPATH,$(DESTDIR)$(PREFIX))
1717
CP = copy /y
18-
SPASMFLG = MINGW_COMPILE=YES
18+
SPASMFLG = NO_APPSIGN=1 MINGW_COMPILE=YES
1919
EXMPL_DIR = $(call NATIVEPATH,$(INSTALLLOC)/CEdev/examples)
2020
CP_EXMPLS = (if not exist "$(EXMPL_DIR)" mkdir $(EXMPL_DIR)) && xcopy /y /s /e $(call NATIVEPATH,$(CURDIR)/examples) $(EXMPL_DIR)
2121
ARCH = makensis.exe /DDIST_PATH=$(call NATIVEPATH,$(DESTDIR)$(PREFIX)/CEdev) $(call NATIVEPATH,$(CURDIR)\installer\installer.nsi) && \
@@ -28,6 +28,7 @@ MKDIR = mkdir -p
2828
RMDIR = rm -rf
2929
PREFIX ?= $(HOME)
3030
INSTALLLOC := $(call NATIVEPATH,$(DESTDIR)$(PREFIX))
31+
SPASMFLG = NO_APPSIGN=1
3132
CP = cp
3233
CP_EXMPLS = cp -r $(call NATIVEPATH,$(CURDIR)/examples) $(call NATIVEPATH,$(INSTALLLOC)/CEdev)
3334
ARCH = cd $(INSTALLLOC) ; tar -czf $(RELEASE_NAME).tar.gz $(RELEASE_NAME) ; \
@@ -159,7 +160,7 @@ $(DIRS):
159160

160161
dist: install
161162
$(ARCH)
162-
163+
163164
help:
164165
@echo Available targets:
165166
@echo all
@@ -178,6 +179,6 @@ help:
178179
@echo uninstall
179180
@echo dist
180181
@echo help
181-
182+
182183
.PHONY: all clean graphx clean-graphx fileioc clean-fileioc keypadc clean-keypadc install uninstall help dist
183184

src/example_makefile

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -242,29 +242,29 @@ add_dirs:
242242

243243
$(BINDIR)/$(TARGET8XP): $(BINDIR)/$(TARGETHEX)
244244
@$(CD) $(BINDIR) $(chain) \
245-
@$(CV) $(CVFLAGS) $(notdir $<)
245+
$(CV) $(CVFLAGS) $(notdir $<)
246246

247247
$(BINDIR)/$(TARGETHEX): $(CSTARTUPOBJ) $(LIBHOBJ) $(OBJECTS)
248-
@$(LD) $(LDFLAGS) $@ = "$(subst $(space),$(comma),$(call NATIVEPATH,$^) $(LOBJECTS)$(LIBRARIES))"
248+
@$(LD) $(LDFLAGS) $@ = "$(subst $(space),$(comma),$(subst $(space)$(space),$(space),$(call NATIVEPATH,$^) $(LOBJECTS) $(LIBRARIES)))"
249249

250250
#This rule handles conversion of the icon, if it is ever updated
251251
$(OBJDIR)/$(ICON_OBJ): $(ICONPNG)
252-
@$(ICON_CONV) $(chain) \
253-
@$(CD) $(OBJDIR) $(chain) \
254-
@$(AS) $(ASM_FLAGS) $(ICON_ASM)
255-
252+
$(ICON_CONV) $(chain) \
253+
$(CD) $(OBJDIR) $(chain) \
254+
$(AS) $(ASM_FLAGS) $(ICON_ASM)
255+
256256
#This rule builds the assembly files and places them in the object directory
257257
$(OBJDIR)/%.obj: $(SRCDIR)/%.asm
258-
@$(CD) $(OBJDIR) $(chain) \
258+
$(CD) $(OBJDIR) $(chain) \
259259
@$(AS) $(ASM_FLAGS) $(call WINPATH,$(addprefix $(CURDIR)/,$<))
260-
260+
261261
#These rules compile the source files into object files
262262
$(OBJDIR)/%.obj: $(SRCDIR)/%.c $(USERHEADERS)
263-
@$(CD) $(OBJDIR) $(chain) \
263+
$(CD) $(OBJDIR) $(chain) \
264264
@$(CC) $(CFLAGS) $(call WINPATH,$(addprefix $(CURDIR)/,$<))
265-
265+
266266
$(OBJDIR)/%.obj: $(GFXDIR)/%.c $(USERHEADERS)
267-
@$(CD) $(OBJDIR) $(chain) \
267+
$(CD) $(OBJDIR) $(chain) \
268268
@$(CC) $(CFLAGS) $(call WINPATH,$(addprefix $(CURDIR)/,$<))
269269

270270
$(CSTARTUPOBJ): $(CSTARTUP_LOC)
@@ -280,9 +280,9 @@ $(LIBHOBJ): $(LIBHEADER_LOC)
280280
clean:
281281
@$(RM) $(call NATIVEPATH,$(BINDIR)/$(TARGETHEX) $(BINDIR)/$(TARGETTYPE) $(BINDIR)/$(TARGETMAP) $(CSTARTUPOBJ) $(OBJECTS) $(LIBHOBJ) $(OBJDIR)/*.src $(OBJDIR)/*.asm)
282282
@echo Cleaned build files.
283-
283+
284284
version:
285285
@echo C SDK Version $(VERSION)
286-
286+
287287
.PHONY: all clean version add_dirs
288-
288+

0 commit comments

Comments
 (0)