From f31c069a535d4114dfeaaa9fa927be4078cef406 Mon Sep 17 00:00:00 2001 From: "R. Belmont" Date: Sun, 14 Feb 2010 17:44:34 +0000 Subject: Fix for non-standard OS X builds [Scott Michel] --- makefile | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) (limited to 'makefile') diff --git a/makefile b/makefile index 78f9315817a..20abf51b354 100644 --- a/makefile +++ b/makefile @@ -462,6 +462,19 @@ CCOMFLAGS += \ -I$(SRC)/osd/$(OSD) \ +#------------------------------------------------- +# archiving flags +#------------------------------------------------- +# Default to something reasonable for all platforms +ARFLAGS = -cr +# Deal with macosx brain damage if COMMAND_MODE is in +# the luser's environment: +ifeq ($(TARGETOS),macosx) +ifeq ($(COMMAND_MODE),"legacy") +ARFLAGS = -crs +endif +endif + #------------------------------------------------- # linking flags @@ -680,7 +693,7 @@ $(OBJ)/%.fh: $(SRC)/%.png $(PNG2BDC) $(FILE2STR) $(OBJ)/%.a: @echo Archiving $@... $(RM) $@ - $(AR) -cr $@ $^ + $(AR) $(ARFLAGS) $@ $^ ifeq ($(TARGETOS),macosx) $(OBJ)/%.o: $(SRC)/%.m | $(OSPREBUILD) -- cgit v1.2.3