summaryrefslogtreecommitdiff
path: root/tools/root.make
diff options
context:
space:
mode:
Diffstat (limited to 'tools/root.make')
-rw-r--r--tools/root.make5
1 files changed, 2 insertions, 3 deletions
diff --git a/tools/root.make b/tools/root.make
index f1bd14b827..2a83a32292 100644
--- a/tools/root.make
+++ b/tools/root.make
@@ -16,7 +16,6 @@ INCLUDES = -I$(BUILDDIR) -I$(BUILDDIR)/lang $(TARGET_INC)
16 16
17CFLAGS = $(INCLUDES) $(DEFINES) $(GCCOPTS) 17CFLAGS = $(INCLUDES) $(DEFINES) $(GCCOPTS)
18PPCFLAGS = $(filter-out -g -Dmain=SDL_main,$(CFLAGS)) # cygwin sdl-config fix 18PPCFLAGS = $(filter-out -g -Dmain=SDL_main,$(CFLAGS)) # cygwin sdl-config fix
19ASMFLAGS = -D__ASSEMBLER__ # work around gcc 3.4.x bug with -std=gnu99, only meant for .S files
20CORE_LDOPTS = $(GLOBAL_LDOPTS) # linker ops specifically for core build 19CORE_LDOPTS = $(GLOBAL_LDOPTS) # linker ops specifically for core build
21 20
22TOOLS = $(TOOLSDIR)/rdf2binary $(TOOLSDIR)/convbdf \ 21TOOLS = $(TOOLSDIR)/rdf2binary $(TOOLSDIR)/convbdf \
@@ -436,7 +435,7 @@ $(BUILDDIR)/%.o: $(ROOTDIR)/%.c
436 435
437$(BUILDDIR)/%.o: $(ROOTDIR)/%.S 436$(BUILDDIR)/%.o: $(ROOTDIR)/%.S
438 $(SILENT)mkdir -p $(dir $@) 437 $(SILENT)mkdir -p $(dir $@)
439 $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(CFLAGS) $(ASMFLAGS) -c $< -o $@ 438 $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(CFLAGS) -c $< -o $@
440 439
441# generated definitions for use in .S files 440# generated definitions for use in .S files
442$(BUILDDIR)/%_asmdefs.h: $(ROOTDIR)/%_asmdefs.c 441$(BUILDDIR)/%_asmdefs.h: $(ROOTDIR)/%_asmdefs.c
@@ -451,7 +450,7 @@ $(BUILDDIR)/%_asmdefs.h: $(ROOTDIR)/%_asmdefs.c
451 450
452%.o: %.S 451%.o: %.S
453 $(SILENT)mkdir -p $(dir $@) 452 $(SILENT)mkdir -p $(dir $@)
454 $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(CFLAGS) $(ASMFLAGS) -c $< -o $@ 453 $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(CFLAGS) -c $< -o $@
455 454
456Makefile: $(TOOLSDIR)/configure 455Makefile: $(TOOLSDIR)/configure
457ifneq (reconf,$(MAKECMDGOALS)) 456ifneq (reconf,$(MAKECMDGOALS))