summaryrefslogtreecommitdiffstatshomepage
path: root/makefile
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2015-03-26 19:07:46 +0100
committer Miodrag Milanovic <mmicko@gmail.com>2015-03-26 19:07:46 +0100
commit3a3fb1dc9d8cf4a0d1d909fbbe2553d0db4e0468 (patch)
treec8bfec5de0a7eb7189c4c577210fb50f79d32258 /makefile
parent7495d637764d8604012e898f872caf2c85082604 (diff)
fix for later OSX (nw)
Diffstat (limited to 'makefile')
-rw-r--r--makefile24
1 files changed, 22 insertions, 2 deletions
diff --git a/makefile b/makefile
index 06934fe6726..83d5a8004cb 100644
--- a/makefile
+++ b/makefile
@@ -302,12 +302,20 @@ ifeq ($(OS),windows)
GCC_VERSION:=$(shell gcc -dumpversion 2> NUL)
CLANG_VERSION:=$(shell %CLANG%\bin\clang --version 2> NUL| head -n 1 | sed "s/[^0-9,.]//g")
PYTHON_AVAILABLE:=$(shell python --version > NUL 2>&1 && echo python)
+CHECK_CLANG:=
else
GCC_VERSION:=$(shell gcc -dumpversion 2> /dev/null)
-CLANG_VERSION:=$(shell clang --version 2> /dev/null | grep '[0-9]\.[0-9]' -o | head -n 1)
+CLANG_VERSION:=$(shell clang --version 2> /dev/null | grep 'LLVM [0-9]\.[0-9]' -o | grep '[0-9]\.[0-9]' -o | head -n 1)
PYTHON_AVAILABLE:=$(shell python --version > /dev/null 2>&1 && echo python)
+CHECK_CLANG:=$(shell gcc --version 2> /dev/null | grep 'clang' | head -n 1)
+endif
+ifneq ($(CHECK_CLANG),)
+ifeq ($(ARCHITECTURE),x64)
+ARCHITECTURE=x64_clang
+else
+ARCHITECTURE=x86_clang
+endif
endif
-
ifneq ($(PYTHON_AVAILABLE),python)
$(error Python is not available in path)
endif
@@ -495,6 +503,18 @@ ifndef COMPILE
endif
$(SILENT) $(MAKE) --no-print-directory -R -C build/projects/gmake-osx config=$(CONFIG)32
+macosx_x64_clang: generate
+ifndef COMPILE
+ $(SILENT) $(GENIE) $(PARAMS) --gcc=osx-clang --targetos=macosx --osd=$(OSD) --gcc_version=$(GCC_VERSION) --target=$(TARGET) --subtarget=$(SUBTARGET) gmake
+endif
+ $(SILENT) $(MAKE) --no-print-directory -R -C build/projects/gmake-osx-clang config=$(CONFIG)64
+
+macosx_x86_clang: generate
+ifndef COMPILE
+ $(SILENT) $(GENIE) $(PARAMS) --gcc=osx-clang --targetos=macosx --os_version=$(DARWIN_VERSION) --osd=$(OSD) --gcc_version=$(GCC_VERSION) --target=$(TARGET) --subtarget=$(SUBTARGET) gmake
+endif
+ $(SILENT) $(MAKE) --no-print-directory -R -C build/projects/gmake-osx-clang config=$(CONFIG)32
+
$(GENIE):
$(SILENT) $(MAKE) --no-print-directory -R -C 3rdparty/genie/build/gmake.$(OS) -f genie.make