diff options
Diffstat (limited to 'tools')
-rw-r--r-- | tools/make.inc | 2 | ||||
-rw-r--r-- | tools/root.make | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/tools/make.inc b/tools/make.inc index 5521612f62..d03898b2e1 100644 --- a/tools/make.inc +++ b/tools/make.inc | |||
@@ -11,7 +11,7 @@ $(OBJDIR)/%.o: %.c | |||
11 | 11 | ||
12 | $(OBJDIR)/%.o: %.S | 12 | $(OBJDIR)/%.o: %.S |
13 | $(SILENT)mkdir -p $(dir $@) | 13 | $(SILENT)mkdir -p $(dir $@) |
14 | $(call PRINTS,CC $<)$(CC) $(CFLAGS) -c $< -o $@ | 14 | $(call PRINTS,CC $<)$(CC) $(CFLAGS) $(ASMFLAGS) -c $< -o $@ |
15 | 15 | ||
16 | # The echo stuff last in the dep update shell magic is to prevent any compiler | 16 | # The echo stuff last in the dep update shell magic is to prevent any compiler |
17 | # errors/warnings to cause an error code to get returned and thus stop the | 17 | # errors/warnings to cause an error code to get returned and thus stop the |
diff --git a/tools/root.make b/tools/root.make index 401599aeb5..885a80d2c6 100644 --- a/tools/root.make +++ b/tools/root.make | |||
@@ -16,6 +16,7 @@ INCLUDES = -I$(BUILDDIR) -I$(BUILDDIR)/lang $(TARGET_INC) | |||
16 | 16 | ||
17 | CFLAGS = $(INCLUDES) $(DEFINES) $(GCCOPTS) | 17 | CFLAGS = $(INCLUDES) $(DEFINES) $(GCCOPTS) |
18 | PPCFLAGS = $(filter-out -g -Dmain=SDL_main,$(CFLAGS)) # cygwin sdl-config fix | 18 | PPCFLAGS = $(filter-out -g -Dmain=SDL_main,$(CFLAGS)) # cygwin sdl-config fix |
19 | ASMFLAGS = -D__ASSEMBLER__ # work around gcc 3.4.x bug with -std=gnu99, only meant for .S files | ||
19 | 20 | ||
20 | TOOLS = $(TOOLSDIR)/rdf2binary $(TOOLSDIR)/convbdf \ | 21 | TOOLS = $(TOOLSDIR)/rdf2binary $(TOOLSDIR)/convbdf \ |
21 | $(TOOLSDIR)/codepages $(TOOLSDIR)/scramble $(TOOLSDIR)/bmp2rb \ | 22 | $(TOOLSDIR)/codepages $(TOOLSDIR)/scramble $(TOOLSDIR)/bmp2rb \ |
@@ -343,7 +344,7 @@ $(BUILDDIR)/%.o: $(ROOTDIR)/%.c | |||
343 | 344 | ||
344 | $(BUILDDIR)/%.o: $(ROOTDIR)/%.S | 345 | $(BUILDDIR)/%.o: $(ROOTDIR)/%.S |
345 | $(SILENT)mkdir -p $(dir $@) | 346 | $(SILENT)mkdir -p $(dir $@) |
346 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(CFLAGS) -c $< -o $@ | 347 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(CFLAGS) $(ASMFLAGS) -c $< -o $@ |
347 | 348 | ||
348 | # generated definitions for use in .S files | 349 | # generated definitions for use in .S files |
349 | $(BUILDDIR)/%_asmdefs.h: $(ROOTDIR)/%_asmdefs.c | 350 | $(BUILDDIR)/%_asmdefs.h: $(ROOTDIR)/%_asmdefs.c |
@@ -358,7 +359,7 @@ $(BUILDDIR)/%_asmdefs.h: $(ROOTDIR)/%_asmdefs.c | |||
358 | 359 | ||
359 | %.o: %.S | 360 | %.o: %.S |
360 | $(SILENT)mkdir -p $(dir $@) | 361 | $(SILENT)mkdir -p $(dir $@) |
361 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(CFLAGS) -c $< -o $@ | 362 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(CFLAGS) $(ASMFLAGS) -c $< -o $@ |
362 | 363 | ||
363 | Makefile: $(TOOLSDIR)/configure | 364 | Makefile: $(TOOLSDIR)/configure |
364 | ifneq (reconf,$(MAKECMDGOALS)) | 365 | ifneq (reconf,$(MAKECMDGOALS)) |