Changeset - r180:f8588315108d
Parent rev.
Child rev.
[Not reviewed]
master
0 2 0
bjarni - 20 years ago 2004-09-08 09:07:18
bjarni@openttd.org
(svn r181) Makefile: enabled ability to supress output of missing strings in lng files
Makefile: added versiontag for autoupdate of outdated makefile.config files
2 files changed with 16 insertions and 10 deletions:
Makefile
13
10
makefiledir/Makefile.config_writer
3
0 comments (0 inline, 0 general)
Makefile
➞
Show inline comments
 
@@ -78,12 +78,16 @@
 

			




	
	
	
		
 
##############################################################################

			




	
	
	
		
 
#

			




	
	
	
		
 
# Configuration

			




	
	
	
		
 
#

			




	
	
	
		
 

			




	
	
	
		
 
# Makefile version tag

			




	
	
	
		
 
# it checks if the version tag in makefile.config is the same and force update outdated config files

			




	
	
	
		
 
MAKEFILE_VERSION:=1

			




	
	
	
		
 

			




	
	
	
		
 
# CONFIG_WRITER have to be found even for manual configuration

			




	
	
	
		
 
CONFIG_WRITER=makefiledir/Makefile.config_writer

			




	
	
	
		
 

			




	
	
	
		
 
ifndef MANUAL_CONFIG

			




	
	
	
		
 
# Automatic configuration

			




	
	
	
		
 
MAKE_CONFIG:=Makefile.config

			




	
	
		
 
@@ -96,31 +100,24 @@ CONFIG_WRITER=makefiledir/Makefile.confi

			




	
	
	
		
 
# since first time it isn't found but make reads this twice

			




	
	
	
		
 
-include $(MAKE_CONFIG)

			




	
	
	
		
 
else

			




	
	
	
		
 
CONFIG_INCLUDED:=1

			




	
	
	
		
 
endif

			




	
	
	
		
 

			




	
	
	
		
 
# tests if makefile.config contains the new needed SDL-CONFIG

			




	
	
	
		
 
# it updates makefile.config if needed. Flags like ENABLE_NETWORK are remembered

			




	
	
	
		
 
ifndef SDL-CONFIG

			




	
	
	
		
 
ifdef WITH_SDL

			




	
	
	
		
 
ifndef MANUAL_CONFIG

			




	
	
	
		
 
#network is enabled by default

			




	
	
	
		
 
ENABLE_NETWORK:=1

			




	
	
	
		
 
# updates makefile.config if it's outdated

			




	
	
	
		
 
ifneq ($(MAKEFILE_VERSION),$(CONFIG_VERSION))

			




	
	
	
		
 
UPDATECONFIG:=upgradeconf

			




	
	
	
		
 
CONFIG_INCLUDED:=

			




	
	
	
		
 
else

			




	
	
	
		
 
# this should define SDL-CONFIG for manual configuration

			




	
	
	
		
 
ifeq ($(shell uname),FreeBSD)

			




	
	
	
		
 
SDL-CONFIG:=sdl11-config

			




	
	
	
		
 
else

			




	
	
	
		
 
SDL-CONFIG:=sdl-config

			




	
	
	
		
 
endif

			




	
	
	
		
 
endif

			




	
	
	
		
 
endif

			




	
	
	
		
 
endif

			




	
	
	
		
 

			




	
	
	
		
 
ifndef CONFIG_INCLUDED

			




	
	
	
		
 
-include $(LIB_DETECTION)

			




	
	
	
		
 
endif

			




	
	
	
		
 

			




	
	
	
		
 
# Verbose filter

			




	
	
		
 
@@ -135,12 +132,18 @@ ifdef DISPLAY_WARNINGS

			




	
	
	
		
 
WARNING_DISPLAY:=-fstrict-aliasing

			




	
	
	
		
 
VERBOSE_FILTER =  

			




	
	
	
		
 
else

			




	
	
	
		
 
WARNING_DISPLAY:=-fno-strict-aliasing

			




	
	
	
		
 
endif

			




	
	
	
		
 

			




	
	
	
		
 
ifdef SUPRESS_LANG_ERRORS

			




	
	
	
		
 
ifndef VERBOSE_FILTER

			




	
	
	
		
 
LANG_ERRORS =  >/dev/null 2>&1

			




	
	
	
		
 
endif

			




	
	
	
		
 
endif

			




	
	
	
		
 

			




	
	
	
		
 
ifdef STATIC

			




	
	
	
		
 
ifndef WIN32

			




	
	
	
		
 
ifndef OSX

			




	
	
	
		
 
ifndef MORPHOS

			




	
	
	
		
 
ifndef SKIP_STATIC_CHECK

			




	
	
	
		
 
$(error Static is only known to work on MorphOS and MacOSX!!! --- Check makefile.config for more info and howto bypass this check)

			




	
	
		
 
@@ -543,13 +546,13 @@ lang/english.lng: lang/english.txt $(STR

			




	
	
	
		
 
	$(STRGEN)

			




	
	
	
		
 
	

			




	
	
	
		
 
table/strings.h: lang/english.lng

			




	
	
	
		
 

			




	
	
	
		
 
lang/%.lng: lang/%.txt $(STRGEN)

			




	
	
	
		
 
	@echo 'Generating $@'; \

			




	
	
	
		
 
	$(STRGEN) $(STRGEN_FLAGS) $< $(VERBOSE_FILTER)

			




	
	
	
		
 
	$(STRGEN) $(STRGEN_FLAGS) $< $(VERBOSE_FILTER) $(LANG_ERRORS)

			




	
	
	
		
 

			




	
	
	
		
 
winres.o: ttd.rc

			




	
	
	
		
 
	windres -o $@ $<

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
rev.c: FORCE

			




        

    


    
    

    

        

                

                    makefiledir/Makefile.config_writer
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -13,19 +13,21 @@ CONFIG_LINE=@$(SHELL) -c 'echo $(1)' >> 

			




	
	
	
		
 
	

			




	
	
	
		
 
	$(call CONFIG_LINE,\# User setup flags)

			




	
	
	
		
 
	$(call CONFIG_LINE,\# Translator: adds TODO to any untranslated strings)

			




	
	
	
		
 
	$(call CONFIG_LINE,\# Display_Warnings: when off it hides some warnings while compiling)

			




	
	
	
		
 
	$(call CONFIG_LINE,\# MIDI: sets path to midi player)

			




	
	
	
		
 
	$(call CONFIG_LINE,\# MIDI_ARG: sets an argument which is used when calling the midi player. Default off)

			




	
	
	
		
 
	$(call CONFIG_LINE,\# SUPRESS_LANG_ERRORS: supresses output about missing and mismatched strings)

			




	
	
	
		
 
	$(call CONFIG_LINE,STATIC:=$(STATIC))

			




	
	
	
		
 
	$(call CONFIG_LINE,TRANSLATOR:=$(TRANSLATOR))

			




	
	
	
		
 
	$(call CONFIG_LINE,DISPLAY_WARNINGS:=$(DISPLAY_WARNINGS))

			




	
	
	
		
 
	$(call CONFIG_LINE,DEBUG:=$(DEBUG))

			




	
	
	
		
 
	$(call CONFIG_LINE,PROFILE:=$(PROFILE))

			




	
	
	
		
 
	$(call CONFIG_LINE,MIDI:=$(MIDI))

			




	
	
	
		
 
	$(call CONFIG_LINE,MIDI_ARG:=$(MIDI_ARG))

			




	
	
	
		
 
	$(call CONFIG_LINE,SUPRESS_LANG_ERRORS:=$(SUPRESS_LANG_ERRORS))

			




	
	
	
		
 
	$(call CONFIG_LINE,)

			




	
	
	
		
 
	

			




	
	
	
		
 
	$(call CONFIG_LINE,\# DATA_DIR_PREFIX is the path to OpenTTD. It can be absolute or relative)

			




	
	
	
		
 
	$(call CONFIG_LINE,\# USE_HOMEDIR sets \~/ in front of DATA_DIR_PREFIX so it uses the homedir)

			




	
	
	
		
 
	$(call CONFIG_LINE,\# do not type \~/ yourself because that will not work)

			




	
	
	
		
 
	$(call CONFIG_LINE,\# Folders should end with /)

			




	
	
		
 
@@ -76,6 +78,7 @@ CONFIG_LINE=@$(SHELL) -c 'echo $(1)' >> 

			




	
	
	
		
 
	$(call CONFIG_LINE,)	

			




	
	
	
		
 
	

			




	
	
	
		
 
	$(call CONFIG_LINE,\# misc)

			




	
	
	
		
 
	$(call CONFIG_LINE,SDL-CONFIG:=$(SDL-CONFIG))

			




	
	
	
		
 
	$(call CONFIG_LINE,CONFIG_INCLUDED:=yes)

			




	
	
	
		
 
	$(call CONFIG_LINE,PATH_SET:=$(PATH_SET))

			




	
	
	
		
 
	$(call CONFIG_LINE,CONFIG_VERSION:=$(MAKEFILE_VERSION))

			




        

    



    


    



    



      

      





    
    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