Fix build problems with generated files.
This commit is contained in:
parent
5ab9363d2a
commit
ad8862e2e2
24
make/tail.mk
24
make/tail.mk
|
@ -11,6 +11,9 @@ BUILDTARGET=$(DISKIMAGE)
|
||||||
EXECTARGET=executeGUI
|
EXECTARGET=executeGUI
|
||||||
DISKIMAGEDEST=.
|
DISKIMAGEDEST=.
|
||||||
AUXTYPE=
|
AUXTYPE=
|
||||||
|
CFLAGS+=-i$(GENDIR)
|
||||||
|
|
||||||
|
vpath $(GENDIR)
|
||||||
|
|
||||||
ifeq ($(TARGETTYPE),shell)
|
ifeq ($(TARGETTYPE),shell)
|
||||||
FILETYPE=exe
|
FILETYPE=exe
|
||||||
|
@ -46,7 +49,7 @@ else ifeq ($(TARGETTYPE),xcmd)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
||||||
ASM_SRCS=$(patsubst ./%, %, $(wildcard $(addsuffix /*.s, $(SRCDIRS))))
|
ASM_SRCS=$(patsubst $(GENDIR)/%, %, $(patsubst ./%, %, $(wildcard $(addsuffix /*.s, $(SRCDIRS)))))
|
||||||
|
|
||||||
ifeq ($(ASSEMBLER),orcam)
|
ifeq ($(ASSEMBLER),orcam)
|
||||||
ASM_MACROS=$(patsubst %.s, $(OBJDIR)/%.macros, $(ASM_SRCS))
|
ASM_MACROS=$(patsubst %.s, $(OBJDIR)/%.macros, $(ASM_SRCS))
|
||||||
|
@ -59,12 +62,12 @@ ifeq ($(ASSEMBLER),orcam)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
C_ROOTS=$(patsubst %.c, $(OBJDIR)/%.root, $(ROOTCFILE))
|
C_ROOTS=$(patsubst %.c, $(OBJDIR)/%.root, $(ROOTCFILE))
|
||||||
C_SRCS+=$(filter-out $(ROOTCFILE), $(patsubst ./%, %, $(wildcard $(addsuffix /*.c, $(SRCDIRS)))))
|
C_SRCS+=$(filter-out $(ROOTCFILE), $(patsubst $(GENDIR)/%, %, $(patsubst ./%, %, $(wildcard $(addsuffix /*.c, $(SRCDIRS))))))
|
||||||
C_OBJS=$(patsubst %.c, $(OBJDIR)/%.a, $(C_SRCS))
|
C_OBJS=$(patsubst %.c, $(OBJDIR)/%.a, $(C_SRCS))
|
||||||
C_DEPS=$(patsubst %.c, $(OBJDIR)/%.d, $(ROOTCFILE)) $(patsubst %.c, $(OBJDIR)/%.d, $(C_SRCS))
|
C_DEPS=$(patsubst %.c, $(OBJDIR)/%.d, $(ROOTCFILE)) $(patsubst %.c, $(OBJDIR)/%.d, $(C_SRCS))
|
||||||
endif
|
endif
|
||||||
|
|
||||||
REZ_SRCS=$(patsubst ./%, %, $(wildcard $(addsuffix /*.rez, $(SRCDIRS))))
|
REZ_SRCS=$(patsubst $(GENDIR)/%, %, $(patsubst ./%, %, $(wildcard $(addsuffix /*.rez, $(SRCDIRS)))))
|
||||||
REZ_DEPS=$(patsubst %.rez, $(OBJDIR)/%.rez.d, $(REZ_SRCS))
|
REZ_DEPS=$(patsubst %.rez, $(OBJDIR)/%.rez.d, $(REZ_SRCS))
|
||||||
REZ_OBJS=$(patsubst %.rez, $(OBJDIR)/%.r, $(REZ_SRCS))
|
REZ_OBJS=$(patsubst %.rez, $(OBJDIR)/%.r, $(REZ_SRCS))
|
||||||
|
|
||||||
|
@ -186,18 +189,33 @@ executeShell: all
|
||||||
$(OBJDIR)/%.a: %.c
|
$(OBJDIR)/%.a: %.c
|
||||||
$(COMPILE) $< $(@:.a=) $(CFLAGS) --noroot
|
$(COMPILE) $< $(@:.a=) $(CFLAGS) --noroot
|
||||||
|
|
||||||
|
$(OBJDIR)/%.a: $(GENDIR)/%.c
|
||||||
|
$(COMPILE) $< $(@:.a=) $(CFLAGS) --noroot
|
||||||
|
|
||||||
$(OBJDIR)/%.root: %.c
|
$(OBJDIR)/%.root: %.c
|
||||||
$(COMPILE) $< $(@:.root=) $(CFLAGS)
|
$(COMPILE) $< $(@:.root=) $(CFLAGS)
|
||||||
|
|
||||||
|
$(OBJDIR)/%.root: $(GENDIR)/%.c
|
||||||
|
$(COMPILE) $< $(@:.root=) $(CFLAGS)
|
||||||
|
|
||||||
$(OBJDIR)/%.ROOT: %.s
|
$(OBJDIR)/%.ROOT: %.s
|
||||||
MACGENFLAGS="$(MACGENFLAGS)" MACGENMACROS="$(MACGENMACROS)" $(ASSEMBLE) $< $(@:.ROOT=) $(ASMFLAGS)
|
MACGENFLAGS="$(MACGENFLAGS)" MACGENMACROS="$(MACGENMACROS)" $(ASSEMBLE) $< $(@:.ROOT=) $(ASMFLAGS)
|
||||||
|
|
||||||
|
$(OBJDIR)/%.ROOT: $(GENDIR)/%.s
|
||||||
|
MACGENFLAGS="$(MACGENFLAGS)" MACGENMACROS="$(MACGENMACROS)" $(ASSEMBLE) $< $(@:.ROOT=) $(ASMFLAGS)
|
||||||
|
|
||||||
$(OBJDIR)/%.r: %.rez
|
$(OBJDIR)/%.r: %.rez
|
||||||
$(REZ) $< $(@:.r=) $(REZFLAGS)
|
$(REZ) $< $(@:.r=) $(REZFLAGS)
|
||||||
ifneq ($(RLINT_PATH),)
|
ifneq ($(RLINT_PATH),)
|
||||||
$(ORCA) $(RLINT_PATH) $@
|
$(ORCA) $(RLINT_PATH) $@
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
$(OBJDIR)/%.r: $(GENDIR)/%.rez
|
||||||
|
$(REZ) $< $(@:.r=) $(REZFLAGS)
|
||||||
|
ifneq ($(RLINT_PATH),)
|
||||||
|
$(ORCA) $(RLINT_PATH) $@
|
||||||
|
endif
|
||||||
|
|
||||||
$(OBJS): Makefile
|
$(OBJS): Makefile
|
||||||
|
|
||||||
# Include the C and rez dependencies which were generated from the last build
|
# Include the C and rez dependencies which were generated from the last build
|
||||||
|
|
|
@ -189,7 +189,8 @@
|
||||||
extended=double
|
extended=double
|
||||||
pascal=""</string>
|
pascal=""</string>
|
||||||
<key>HEADER_SEARCH_PATHS</key>
|
<key>HEADER_SEARCH_PATHS</key>
|
||||||
<string>$GOLDEN_GATE/Libraries/ORCACDefs
|
<string>$TEMP_ROOT/___PACKAGENAME___.build/$CONFIGURATION/___PACKAGENAME___.build/DerivedSources
|
||||||
|
$GOLDEN_GATE/Libraries/ORCACDefs
|
||||||
~/Library/GoldenGate/Libraries/ORCACDefs
|
~/Library/GoldenGate/Libraries/ORCACDefs
|
||||||
/Library/GoldenGate/Libraries/ORCACDefs
|
/Library/GoldenGate/Libraries/ORCACDefs
|
||||||
~/GoldenGate/Libraries/ORCACDefs</string>
|
~/GoldenGate/Libraries/ORCACDefs</string>
|
||||||
|
|
|
@ -195,7 +195,8 @@
|
||||||
extended=double
|
extended=double
|
||||||
pascal=""</string>
|
pascal=""</string>
|
||||||
<key>HEADER_SEARCH_PATHS</key>
|
<key>HEADER_SEARCH_PATHS</key>
|
||||||
<string>$GOLDEN_GATE/Libraries/ORCACDefs
|
<string>$TEMP_ROOT/___PACKAGENAME___.build/$CONFIGURATION/___PACKAGENAME___.build/DerivedSources
|
||||||
|
$GOLDEN_GATE/Libraries/ORCACDefs
|
||||||
~/Library/GoldenGate/Libraries/ORCACDefs
|
~/Library/GoldenGate/Libraries/ORCACDefs
|
||||||
/Library/GoldenGate/Libraries/ORCACDefs
|
/Library/GoldenGate/Libraries/ORCACDefs
|
||||||
~/GoldenGate/Libraries/ORCACDefs</string>
|
~/GoldenGate/Libraries/ORCACDefs</string>
|
||||||
|
|
|
@ -213,7 +213,8 @@
|
||||||
extended=double
|
extended=double
|
||||||
pascal=""</string>
|
pascal=""</string>
|
||||||
<key>HEADER_SEARCH_PATHS</key>
|
<key>HEADER_SEARCH_PATHS</key>
|
||||||
<string>$GOLDEN_GATE/Libraries/ORCACDefs
|
<string>$TEMP_ROOT/___PACKAGENAME___.build/$CONFIGURATION/___PACKAGENAME___.build/DerivedSources
|
||||||
|
$GOLDEN_GATE/Libraries/ORCACDefs
|
||||||
~/Library/GoldenGate/Libraries/ORCACDefs
|
~/Library/GoldenGate/Libraries/ORCACDefs
|
||||||
/Library/GoldenGate/Libraries/ORCACDefs
|
/Library/GoldenGate/Libraries/ORCACDefs
|
||||||
~/GoldenGate/Libraries/ORCACDefs</string>
|
~/GoldenGate/Libraries/ORCACDefs</string>
|
||||||
|
|
|
@ -195,7 +195,8 @@
|
||||||
extended=double
|
extended=double
|
||||||
pascal=""</string>
|
pascal=""</string>
|
||||||
<key>HEADER_SEARCH_PATHS</key>
|
<key>HEADER_SEARCH_PATHS</key>
|
||||||
<string>$GOLDEN_GATE/Libraries/ORCACDefs
|
<string>$TEMP_ROOT/___PACKAGENAME___.build/$CONFIGURATION/___PACKAGENAME___.build/DerivedSources
|
||||||
|
$GOLDEN_GATE/Libraries/ORCACDefs
|
||||||
~/Library/GoldenGate/Libraries/ORCACDefs
|
~/Library/GoldenGate/Libraries/ORCACDefs
|
||||||
/Library/GoldenGate/Libraries/ORCACDefs
|
/Library/GoldenGate/Libraries/ORCACDefs
|
||||||
~/GoldenGate/Libraries/ORCACDefs</string>
|
~/GoldenGate/Libraries/ORCACDefs</string>
|
||||||
|
|
|
@ -191,7 +191,8 @@
|
||||||
extended=double
|
extended=double
|
||||||
pascal=""</string>
|
pascal=""</string>
|
||||||
<key>HEADER_SEARCH_PATHS</key>
|
<key>HEADER_SEARCH_PATHS</key>
|
||||||
<string>$GOLDEN_GATE/Libraries/ORCACDefs
|
<string>$TEMP_ROOT/___PACKAGENAME___.build/$CONFIGURATION/___PACKAGENAME___.build/DerivedSources
|
||||||
|
$GOLDEN_GATE/Libraries/ORCACDefs
|
||||||
~/Library/GoldenGate/Libraries/ORCACDefs
|
~/Library/GoldenGate/Libraries/ORCACDefs
|
||||||
/Library/GoldenGate/Libraries/ORCACDefs
|
/Library/GoldenGate/Libraries/ORCACDefs
|
||||||
~/GoldenGate/Libraries/ORCACDefs</string>
|
~/GoldenGate/Libraries/ORCACDefs</string>
|
||||||
|
|
|
@ -203,7 +203,8 @@
|
||||||
extended=double
|
extended=double
|
||||||
pascal=""</string>
|
pascal=""</string>
|
||||||
<key>HEADER_SEARCH_PATHS</key>
|
<key>HEADER_SEARCH_PATHS</key>
|
||||||
<string>$GOLDEN_GATE/Libraries/ORCACDefs
|
<string>$TEMP_ROOT/___PACKAGENAME___.build/$CONFIGURATION/___PACKAGENAME___.build/DerivedSources
|
||||||
|
$GOLDEN_GATE/Libraries/ORCACDefs
|
||||||
~/Library/GoldenGate/Libraries/ORCACDefs
|
~/Library/GoldenGate/Libraries/ORCACDefs
|
||||||
/Library/GoldenGate/Libraries/ORCACDefs
|
/Library/GoldenGate/Libraries/ORCACDefs
|
||||||
~/GoldenGate/Libraries/ORCACDefs</string>
|
~/GoldenGate/Libraries/ORCACDefs</string>
|
||||||
|
|
|
@ -233,7 +233,8 @@
|
||||||
extended=double
|
extended=double
|
||||||
pascal=""</string>
|
pascal=""</string>
|
||||||
<key>HEADER_SEARCH_PATHS</key>
|
<key>HEADER_SEARCH_PATHS</key>
|
||||||
<string>$GOLDEN_GATE/Libraries/ORCACDefs
|
<string>$TEMP_ROOT/___PACKAGENAME___.build/$CONFIGURATION/___PACKAGENAME___.build/DerivedSources
|
||||||
|
$GOLDEN_GATE/Libraries/ORCACDefs
|
||||||
~/Library/GoldenGate/Libraries/ORCACDefs
|
~/Library/GoldenGate/Libraries/ORCACDefs
|
||||||
/Library/GoldenGate/Libraries/ORCACDefs
|
/Library/GoldenGate/Libraries/ORCACDefs
|
||||||
~/GoldenGate/Libraries/ORCACDefs</string>
|
~/GoldenGate/Libraries/ORCACDefs</string>
|
||||||
|
|
|
@ -146,7 +146,8 @@
|
||||||
extended=double
|
extended=double
|
||||||
pascal=""</string>
|
pascal=""</string>
|
||||||
<key>HEADER_SEARCH_PATHS</key>
|
<key>HEADER_SEARCH_PATHS</key>
|
||||||
<string>$GOLDEN_GATE/Libraries/ORCACDefs
|
<string>$TEMP_ROOT/___PACKAGENAME___.build/$CONFIGURATION/___PACKAGENAME___.build/DerivedSources
|
||||||
|
$GOLDEN_GATE/Libraries/ORCACDefs
|
||||||
~/Library/GoldenGate/Libraries/ORCACDefs
|
~/Library/GoldenGate/Libraries/ORCACDefs
|
||||||
/Library/GoldenGate/Libraries/ORCACDefs
|
/Library/GoldenGate/Libraries/ORCACDefs
|
||||||
~/GoldenGate/Libraries/ORCACDefs</string>
|
~/GoldenGate/Libraries/ORCACDefs</string>
|
||||||
|
|
|
@ -203,7 +203,8 @@
|
||||||
extended=double
|
extended=double
|
||||||
pascal=""</string>
|
pascal=""</string>
|
||||||
<key>HEADER_SEARCH_PATHS</key>
|
<key>HEADER_SEARCH_PATHS</key>
|
||||||
<string>$GOLDEN_GATE/Libraries/ORCACDefs
|
<string>$TEMP_ROOT/___PACKAGENAME___.build/$CONFIGURATION/___PACKAGENAME___.build/DerivedSources
|
||||||
|
$GOLDEN_GATE/Libraries/ORCACDefs
|
||||||
~/Library/GoldenGate/Libraries/ORCACDefs
|
~/Library/GoldenGate/Libraries/ORCACDefs
|
||||||
/Library/GoldenGate/Libraries/ORCACDefs
|
/Library/GoldenGate/Libraries/ORCACDefs
|
||||||
~/GoldenGate/Libraries/ORCACDefs</string>
|
~/GoldenGate/Libraries/ORCACDefs</string>
|
||||||
|
|
|
@ -146,7 +146,8 @@
|
||||||
extended=double
|
extended=double
|
||||||
pascal=""</string>
|
pascal=""</string>
|
||||||
<key>HEADER_SEARCH_PATHS</key>
|
<key>HEADER_SEARCH_PATHS</key>
|
||||||
<string>$GOLDEN_GATE/Libraries/ORCACDefs
|
<string>$TEMP_ROOT/___PACKAGENAME___.build/$CONFIGURATION/___PACKAGENAME___.build/DerivedSources
|
||||||
|
$GOLDEN_GATE/Libraries/ORCACDefs
|
||||||
~/Library/GoldenGate/Libraries/ORCACDefs
|
~/Library/GoldenGate/Libraries/ORCACDefs
|
||||||
/Library/GoldenGate/Libraries/ORCACDefs
|
/Library/GoldenGate/Libraries/ORCACDefs
|
||||||
~/GoldenGate/Libraries/ORCACDefs</string>
|
~/GoldenGate/Libraries/ORCACDefs</string>
|
||||||
|
|
|
@ -191,7 +191,8 @@
|
||||||
extended=double
|
extended=double
|
||||||
pascal=""</string>
|
pascal=""</string>
|
||||||
<key>HEADER_SEARCH_PATHS</key>
|
<key>HEADER_SEARCH_PATHS</key>
|
||||||
<string>$GOLDEN_GATE/Libraries/ORCACDefs
|
<string>$TEMP_ROOT/___PACKAGENAME___.build/$CONFIGURATION/___PACKAGENAME___.build/DerivedSources
|
||||||
|
$GOLDEN_GATE/Libraries/ORCACDefs
|
||||||
~/Library/GoldenGate/Libraries/ORCACDefs
|
~/Library/GoldenGate/Libraries/ORCACDefs
|
||||||
/Library/GoldenGate/Libraries/ORCACDefs
|
/Library/GoldenGate/Libraries/ORCACDefs
|
||||||
~/GoldenGate/Libraries/ORCACDefs</string>
|
~/GoldenGate/Libraries/ORCACDefs</string>
|
||||||
|
|
|
@ -197,7 +197,8 @@
|
||||||
extended=double
|
extended=double
|
||||||
pascal=""</string>
|
pascal=""</string>
|
||||||
<key>HEADER_SEARCH_PATHS</key>
|
<key>HEADER_SEARCH_PATHS</key>
|
||||||
<string>$GOLDEN_GATE/Libraries/ORCACDefs
|
<string>$TEMP_ROOT/___PACKAGENAME___.build/$CONFIGURATION/___PACKAGENAME___.build/DerivedSources
|
||||||
|
$GOLDEN_GATE/Libraries/ORCACDefs
|
||||||
~/Library/GoldenGate/Libraries/ORCACDefs
|
~/Library/GoldenGate/Libraries/ORCACDefs
|
||||||
/Library/GoldenGate/Libraries/ORCACDefs
|
/Library/GoldenGate/Libraries/ORCACDefs
|
||||||
~/GoldenGate/Libraries/ORCACDefs</string>
|
~/GoldenGate/Libraries/ORCACDefs</string>
|
||||||
|
|
|
@ -215,7 +215,8 @@
|
||||||
extended=double
|
extended=double
|
||||||
pascal=""</string>
|
pascal=""</string>
|
||||||
<key>HEADER_SEARCH_PATHS</key>
|
<key>HEADER_SEARCH_PATHS</key>
|
||||||
<string>$GOLDEN_GATE/Libraries/ORCACDefs
|
<string>$TEMP_ROOT/___PACKAGENAME___.build/$CONFIGURATION/___PACKAGENAME___.build/DerivedSources
|
||||||
|
$GOLDEN_GATE/Libraries/ORCACDefs
|
||||||
~/Library/GoldenGate/Libraries/ORCACDefs
|
~/Library/GoldenGate/Libraries/ORCACDefs
|
||||||
/Library/GoldenGate/Libraries/ORCACDefs
|
/Library/GoldenGate/Libraries/ORCACDefs
|
||||||
~/GoldenGate/Libraries/ORCACDefs</string>
|
~/GoldenGate/Libraries/ORCACDefs</string>
|
||||||
|
|
|
@ -197,7 +197,8 @@
|
||||||
extended=double
|
extended=double
|
||||||
pascal=""</string>
|
pascal=""</string>
|
||||||
<key>HEADER_SEARCH_PATHS</key>
|
<key>HEADER_SEARCH_PATHS</key>
|
||||||
<string>$GOLDEN_GATE/Libraries/ORCACDefs
|
<string>$TEMP_ROOT/___PACKAGENAME___.build/$CONFIGURATION/___PACKAGENAME___.build/DerivedSources
|
||||||
|
$GOLDEN_GATE/Libraries/ORCACDefs
|
||||||
~/Library/GoldenGate/Libraries/ORCACDefs
|
~/Library/GoldenGate/Libraries/ORCACDefs
|
||||||
/Library/GoldenGate/Libraries/ORCACDefs
|
/Library/GoldenGate/Libraries/ORCACDefs
|
||||||
~/GoldenGate/Libraries/ORCACDefs</string>
|
~/GoldenGate/Libraries/ORCACDefs</string>
|
||||||
|
|
|
@ -146,7 +146,8 @@
|
||||||
extended=double
|
extended=double
|
||||||
pascal=""</string>
|
pascal=""</string>
|
||||||
<key>HEADER_SEARCH_PATHS</key>
|
<key>HEADER_SEARCH_PATHS</key>
|
||||||
<string>$GOLDEN_GATE/Libraries/ORCACDefs
|
<string>$TEMP_ROOT/___PACKAGENAME___.build/$CONFIGURATION/___PACKAGENAME___.build/DerivedSources
|
||||||
|
$GOLDEN_GATE/Libraries/ORCACDefs
|
||||||
~/Library/GoldenGate/Libraries/ORCACDefs
|
~/Library/GoldenGate/Libraries/ORCACDefs
|
||||||
/Library/GoldenGate/Libraries/ORCACDefs
|
/Library/GoldenGate/Libraries/ORCACDefs
|
||||||
~/GoldenGate/Libraries/ORCACDefs</string>
|
~/GoldenGate/Libraries/ORCACDefs</string>
|
||||||
|
|
Loading…
Reference in New Issue