summaryrefslogtreecommitdiff
path: root/makefiledir
diff options
context:
space:
mode:
Diffstat (limited to 'makefiledir')
-rw-r--r--makefiledir/Makefile.config_writer18
1 files changed, 12 insertions, 6 deletions
diff --git a/makefiledir/Makefile.config_writer b/makefiledir/Makefile.config_writer
index 362757e07..15780062c 100644
--- a/makefiledir/Makefile.config_writer
+++ b/makefiledir/Makefile.config_writer
@@ -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))