summaryrefslogtreecommitdiffstatshomepage
path: root/makefile
diff options
context:
space:
mode:
authorGravatarGravatar R. Belmont <rb6502@users.noreply.github.com>2010-02-14 17:44:34 +0000
committerGravatarGravatar R. Belmont <rb6502@users.noreply.github.com>2010-02-14 17:44:34 +0000
commitf31c069a535d4114dfeaaa9fa927be4078cef406 (patch)
tree1b207ec47aa13cffe8777baf24bf3cb976b70eea /makefile
parent6b663f66a75dc2a832262b55d1e450b89d1da464 (diff)
Fix for non-standard OS X builds [Scott Michel]
Diffstat (limited to 'makefile')
-rw-r--r--makefile15
1 files changed, 14 insertions, 1 deletions
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)