dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r3267) -Codechange: [OSX] universal binary makefile code cleanup

Browse Source 
now PPC code is always compiled before x86 code
	strgen and lng files are only compiled once, which results in shorter building time
	the makefile now assigns default values to undefined values so much less needs to be set up
	the code is now easier to maintain
This commit is contained in:
bjarni
2005-12-06 22:09:28 +00:00
parent bab6f56967
commit 967abb24e4
4 changed files with 124 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
makefiledir/Makefile.config_writer
View File

@@ -94,12 +94,18 @@ $(MAKE_CONFIG):
$(call CONFIG_LINE,)
$(call CONFIG_LINE,\# Universal binary setup)
$(call CONFIG_LINE,\# use these settings for the CPU type, that is not covered by the other settings)
$(call CONFIG_LINE,CC_UNI:=$(CC_UNI))
$(call CONFIG_LINE,CFLAGS_UNI:=$(CFLAGS_UNI))
$(call CONFIG_LINE,LDFLAGS_UNI:=$(LDFLAGS_UNI))
$(call CONFIG_LINE,SDL-CONFIG_UNI:=$(SDL-CONFIG_UNI))
$(call CONFIG_LINE,LIBPNG-CONFIG_UNI:=$(LIBPNG-CONFIG_UNI))
$(call CONFIG_LINE,\# use these settings for building universal binaries. Most settings should work with the default settings)
$(call CONFIG_LINE,UNIVERSAL_CFLAGS:=$(UNIVERSAL_CFLAGS))
$(call CONFIG_LINE,UNIVERSAL_LDFLAGS:=$(UNIVERSAL_LDFLAGS))
$(call CONFIG_LINE,SKIP_LIB_TEST:=$(SKIP_LIB_TEST))
$(call CONFIG_LINE,PPC_CC:=$(PPC_CC))
$(call CONFIG_LINE,SDL_PPC_CONFIG:=$(SDL_PPC_CONFIG))
$(call CONFIG_LINE,LIBPNG_PPC_CONFIG:=$(LIBPNG_PPC_CONFIG))
$(call CONFIG_LINE,x86_CC:=$(x86_CC))
$(call CONFIG_LINE,SDL_x86_CONFIG:=$(SDL_x86_CONFIG))
$(call CONFIG_LINE,LIBPNG_x86_CONFIG:=$(LIBPNG_x86_CONFIG))
$(call CONFIG_LINE,x86_SDL_LIB:=$(x86_SDL_LIB))
$(call CONFIG_LINE,)
$(call CONFIG_LINE,\# For cross-compiling)
$(call CONFIG_LINE,CC_TARGET:=$(CC_TARGET))