|
@@ -1,17 +1,17 @@
|
|
|
-From 2b064b5808344fa33c7983c20b43d77e47eafc50 Mon Sep 17 00:00:00 2001
|
|
|
+From 2673d3b7d1c79d76e780853e7e1e00e7d76ad9f8 Mon Sep 17 00:00:00 2001
|
|
|
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
|
|
|
Date: Wed, 22 Jan 2014 02:32:01 +0100
|
|
|
Subject: [PATCH 25/25] contrib: reverse logic
|
|
|
|
|
|
---
|
|
|
- contrib/src/main.mak | 8 ++++----
|
|
|
- 1 file changed, 4 insertions(+), 4 deletions(-)
|
|
|
+ contrib/src/main.mak | 11 +++++++----
|
|
|
+ 1 file changed, 7 insertions(+), 4 deletions(-)
|
|
|
|
|
|
diff --git a/contrib/src/main.mak b/contrib/src/main.mak
|
|
|
-index ae76215..5c24cf0 100644
|
|
|
+index ae76215..12976a9 100644
|
|
|
--- a/contrib/src/main.mak
|
|
|
+++ b/contrib/src/main.mak
|
|
|
-@@ -130,12 +130,12 @@ CCAS=$(CC) -c
|
|
|
+@@ -130,12 +130,15 @@ CCAS=$(CC) -c
|
|
|
ifdef HAVE_IOS
|
|
|
CC=xcrun clang
|
|
|
CXX=xcrun clang++
|
|
@@ -19,7 +19,10 @@ index ae76215..5c24cf0 100644
|
|
|
-AS=perl $(abspath ../../extras/tools/build/bin/gas-preprocessor.pl) $(CC)
|
|
|
-CCAS=gas-preprocessor.pl $(CC) -c
|
|
|
-else
|
|
|
-+ifeq ($(ARCH), i386)
|
|
|
++ifeq ($(ARCH),i386)
|
|
|
++CCAS=$(CC) -c
|
|
|
++AS=xcrun as
|
|
|
++else ifeq ($(ARCH),x86_64)
|
|
|
CCAS=$(CC) -c
|
|
|
AS=xcrun as
|
|
|
+else
|