Changeset - r18351:542adacdaa0f
Parent rev.
Child rev.
[Not reviewed]
master
0 1 0
smatz - 13 years ago 2011-11-12 10:26:37
smatz@openttd.org
(svn r23197) -Fix: -Wno-narrowing didn't have any effect anymore
1 file changed with 5 insertions and 5 deletions:
Makefile.src.in
5
5
0 comments (0 inline, 0 general)
Makefile.src.in
➞
Show inline comments
 
@@ -110,13 +110,13 @@ REV := norev000
 
endif
 
ifeq ($(REV_NR),)
 
REV_NR := 0
 
endif
 

			




	
	
	
		
 
# This helps to recompile if flags change

			




	
	
	
		
 
RES := $(shell if [ "`cat $(CONFIG_CACHE_COMPILER) 2>/dev/null`" != "$(CXXFLAGS) $(CFLAGS)" ]; then echo "$(CXXFLAGS) $(CFLAGS)" > $(CONFIG_CACHE_COMPILER); fi )

			




	
	
	
		
 
RES := $(shell if [ "`cat $(CONFIG_CACHE_COMPILER) 2>/dev/null`" != "$(CFLAGS) $(CXXFLAGS)" ]; then echo "$(CFLAGS) $(CXXFLAGS)" > $(CONFIG_CACHE_COMPILER); fi )

			




	
	
	
		
 
RES := $(shell if [ "`cat $(CONFIG_CACHE_LINKER) 2>/dev/null`" != "$(LDFLAGS) $(LIBS)" ]; then echo "$(LDFLAGS) $(LIBS)" > $(CONFIG_CACHE_LINKER); fi )

			




	
	
	
		
 
RES := $(shell if [ "`cat $(CONFIG_CACHE_ENDIAN) 2>/dev/null`" != "$(ENDIAN_FORCE)" ]; then echo "$(ENDIAN_FORCE)" > $(CONFIG_CACHE_ENDIAN); fi )

			




	
	
	
		
 

			




	
	
	
		
 
# If there is a change in the source-file-list, make sure we recheck the deps

			




	
	
	
		
 
RES := $(shell if [ "`cat $(CONFIG_CACHE_SOURCE) 2>/dev/null`" != "$(SRCS)" ]; then echo "$(SRCS)" > $(CONFIG_CACHE_SOURCE); fi )

			




	
	
	
		
 
# If there is a change in the revision, make sure we recompile rev.cpp

			




	
	
		
 
@@ -143,13 +143,13 @@ endif

			




	
	
	
		
 
$(OBJS_C:%.o=%.d): %.d: $(SRC_DIR)/%.c $(FILE_DEP)

			




	
	
	
		
 
	$(E) '$(STAGE) DEP $(<:$(SRC_DIR)/%.c=%.c)'

			




	
	
	
		
 
	$(Q)$(CC_HOST) $(CFLAGS) -MM $< | sed 's@^$(@F:%.d=%.o):@$@ $(@:%.d=%.o):@' > $@

			




	
	
	
		
 

			




	
	
	
		
 
$(OBJS_CPP:%.o=%.d): %.d: $(SRC_DIR)/%.cpp $(FILE_DEP)

			




	
	
	
		
 
	$(E) '$(STAGE) DEP $(<:$(SRC_DIR)/%.cpp=%.cpp)'

			




	
	
	
		
 
	$(Q)$(CXX_HOST) $(CXXFLAGS) $(CFLAGS) -MM $< | sed 's@^$(@F:%.d=%.o):@$@ $(@:%.d=%.o):@' > $@

			




	
	
	
		
 
	$(Q)$(CXX_HOST) $(CFLAGS) $(CXXFLAGS) -MM $< | sed 's@^$(@F:%.d=%.o):@$@ $(@:%.d=%.o):@' > $@

			




	
	
	
		
 

			




	
	
	
		
 
$(OBJS_MM:%.o=%.d): %.d: $(SRC_DIR)/%.mm $(FILE_DEP)

			




	
	
	
		
 
	$(E) '$(STAGE) DEP $(<:$(SRC_DIR)/%.mm=%.mm)'

			




	
	
	
		
 
	$(Q)$(CC_HOST) $(CFLAGS) -MM $< | sed 's@^$(@F:%.d=%.o):@$@ $(@:%.d=%.o):@' > $@

			




	
	
	
		
 

			




	
	
	
		
 
$(OBJS_RC:%.o=%.d): %.d: $(SRC_DIR)/%.rc $(FILE_DEP)

			




	
	
		
 
@@ -167,13 +167,13 @@ ifeq ($(filter $(ENDIAN_TARGETS) depend 

			




	
	
	
		
 
endif

			




	
	
	
		
 

			




	
	
	
		
 
ifeq ("$(SRC_OBJS_DIR)/$(DEPEND)","$(MAKEDEPEND)")

			




	
	
	
		
 
DEP := $(MAKEDEPEND)

			




	
	
	
		
 
$(SRC_OBJS_DIR)/$(DEPEND): $(SRC_DIR)/depend/depend.cpp

			




	
	
	
		
 
	$(E) '$(STAGE) Compiling and linking $(DEPEND)'

			




	
	
	
		
 
	$(Q)$(CXX_BUILD) $(CXXFLAGS_BUILD) $(CFLAGS_BUILD) $(LDFLAGS_BUILD) -o $@ $<

			




	
	
	
		
 
	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $(CXXFLAGS_BUILD) $(LDFLAGS_BUILD) -o $@ $<

			




	
	
	
		
 
endif

			




	
	
	
		
 

			




	
	
	
		
 
# Make sure that only 'make depend' ALWAYS triggers a recheck

			




	
	
	
		
 
ifeq ($(filter depend, $(MAKECMDGOALS)),)

			




	
	
	
		
 
Makefile.dep: $(FILE_DEP) $(SRCS:%=$(SRC_DIR)/%) $(CONFIG_CACHE_SOURCE) $(DEP)

			




	
	
	
		
 
else

			




	
	
		
 
@@ -235,13 +235,13 @@ endif

			




	
	
	
		
 
$(OBJS_C): %.o: $(SRC_DIR)/%.c $(DEP_MASK) $(FILE_DEP)

			




	
	
	
		
 
	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.c=%.c)'

			




	
	
	
		
 
	$(Q)$(CC_HOST) $(CFLAGS) -c -o $@ $<

			




	
	
	
		
 

			




	
	
	
		
 
$(OBJS_CPP): %.o: $(SRC_DIR)/%.cpp $(DEP_MASK) $(FILE_DEP)

			




	
	
	
		
 
	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.cpp=%.cpp)'

			




	
	
	
		
 
	$(Q)$(CXX_HOST) $(CXXFLAGS) $(CFLAGS) -c -o $@ $<

			




	
	
	
		
 
	$(Q)$(CXX_HOST) $(CFLAGS) $(CXXFLAGS) -c -o $@ $<

			




	
	
	
		
 

			




	
	
	
		
 
$(OBJS_MM): %.o: $(SRC_DIR)/%.mm $(DEP_MASK) $(FILE_DEP)

			




	
	
	
		
 
	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.mm=%.mm)'

			




	
	
	
		
 
	$(Q)$(CC_HOST) $(CFLAGS) -c -o $@ $<

			




	
	
	
		
 

			




	
	
	
		
 
$(OBJS_RC): %.o: $(SRC_DIR)/%.rc $(FILE_DEP)

			




	
	
		
 
@@ -280,13 +280,13 @@ endif

			




	
	
	
		
 
endian_target.h: $(ENDIAN_CHECK) $(CONFIG_CACHE_ENDIAN)

			




	
	
	
		
 
	$(E) '$(STAGE) Testing endianness for target'

			




	
	
	
		
 
	$(Q)./$(ENDIAN_CHECK) $(ENDIAN_FORCE) > $@

			




	
	
	
		
 

			




	
	
	
		
 
$(ENDIAN_CHECK): $(SRC_DIR)/endian_check.cpp

			




	
	
	
		
 
	$(E) '$(STAGE) Compiling and Linking $@'

			




	
	
	
		
 
	$(Q)$(CXX_BUILD) $(CXXFLAGS_BUILD) $(CFLAGS_BUILD) $< -o $@

			




	
	
	
		
 
	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $(CXXFLAGS_BUILD) $< -o $@

			




	
	
	
		
 

			




	
	
	
		
 
# Revision files

			




	
	
	
		
 

			




	
	
	
		
 
$(SRC_DIR)/rev.cpp: $(CONFIG_CACHE_VERSION) $(SRC_DIR)/rev.cpp.in

			




	
	
	
		
 
	$(Q)cat $(SRC_DIR)/rev.cpp.in      | sed "s@\!\!REVISION\!\!@$(REV_NR)@g;s@!!VERSION!!@$(REV)@g;s@!!MODIFIED!!@$(MODIFIED)@g;s@!!DATE!!@`date +%d.%m.%y`@g" > $(SRC_DIR)/rev.cpp

			




	
	
	
		
 

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        Server instance: code.theleruby.com-48
    
    
        This site is powered by
            Kallithea,
        which is
        © 2010–2022 by various authors & licensed under GPLv3.
            – Support