Skip to content

Commit 3c6e22d

Browse files
committed
More makefile fixes, for macOS (make acts weirdly for some reason)
1 parent 8260453 commit 3c6e22d

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

src/example_makefile

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ add_dirs:
241241
@echo Looking for changes...
242242

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

247247
$(BINDIR)/$(TARGETHEX): $(CSTARTUPOBJ) $(LIBHOBJ) $(OBJECTS)
@@ -256,26 +256,26 @@ $(OBJDIR)/$(ICON_OBJ): $(ICONPNG)
256256
#This rule builds the assembly files and places them in the object directory
257257
$(OBJDIR)/%.obj: $(SRCDIR)/%.asm
258258
$(CD) $(OBJDIR) $(chain) \
259-
@$(AS) $(ASM_FLAGS) $(call WINPATH,$(addprefix $(CURDIR)/,$<))
259+
$(AS) $(ASM_FLAGS) $(call WINPATH,$(addprefix $(CURDIR)/,$<))
260260

261261
#These rules compile the source files into object files
262262
$(OBJDIR)/%.obj: $(SRCDIR)/%.c $(USERHEADERS)
263263
$(CD) $(OBJDIR) $(chain) \
264-
@$(CC) $(CFLAGS) $(call WINPATH,$(addprefix $(CURDIR)/,$<))
264+
$(CC) $(CFLAGS) $(call WINPATH,$(addprefix $(CURDIR)/,$<))
265265

266266
$(OBJDIR)/%.obj: $(GFXDIR)/%.c $(USERHEADERS)
267267
$(CD) $(OBJDIR) $(chain) \
268-
@$(CC) $(CFLAGS) $(call WINPATH,$(addprefix $(CURDIR)/,$<))
268+
$(CC) $(CFLAGS) $(call WINPATH,$(addprefix $(CURDIR)/,$<))
269269

270270
$(CSTARTUPOBJ): $(CSTARTUP_LOC)
271-
@$(CD) $(OBJDIR) $(chain) \
272-
@$(AS) $(ASM_FLAGS) $(call WINPATH,$<)
271+
$(CD) $(OBJDIR) $(chain) \
272+
$(AS) $(ASM_FLAGS) $(call WINPATH,$<)
273273

274274
$(LIBHOBJ): $(LIBHEADER_LOC)
275-
@$(CD) $(OBJDIR) $(chain) \
276-
@$(AS) $(ASM_FLAGS) $(call WINPATH,$<)
277-
@$(CD) $(OBJDIR) $(chain) \
278-
@$(AS) $(ASM_FLAGS) $(LIBS)
275+
$(CD) $(OBJDIR) $(chain) \
276+
$(AS) $(ASM_FLAGS) $(call WINPATH,$<)
277+
$(CD) $(OBJDIR) $(chain) \
278+
$(AS) $(ASM_FLAGS) $(LIBS)
279279

280280
clean:
281281
@$(RM) $(call NATIVEPATH,$(BINDIR)/$(TARGETHEX) $(BINDIR)/$(TARGETTYPE) $(BINDIR)/$(TARGETMAP) $(CSTARTUPOBJ) $(OBJECTS) $(LIBHOBJ) $(OBJDIR)/*.src $(OBJDIR)/*.asm)

0 commit comments

Comments
 (0)