trunk/makefile
| r245201 | r245202 | |
|---|
| 302 | 302 | GCC_VERSION:=$(shell gcc -dumpversion 2> NUL) |
| 303 | 303 | CLANG_VERSION:=$(shell %CLANG%\bin\clang --version 2> NUL| head -n 1 | sed "s/[^0-9,.]//g") |
| 304 | 304 | PYTHON_AVAILABLE:=$(shell python --version > NUL 2>&1 && echo python) |
| 305 | CHECK_CLANG:= |
| 305 | 306 | else |
| 306 | 307 | GCC_VERSION:=$(shell gcc -dumpversion 2> /dev/null) |
| 307 | | CLANG_VERSION:=$(shell clang --version 2> /dev/null | grep '[0-9]\.[0-9]' -o | head -n 1) |
| 308 | CLANG_VERSION:=$(shell clang --version 2> /dev/null | grep 'LLVM [0-9]\.[0-9]' -o | grep '[0-9]\.[0-9]' -o | head -n 1) |
| 308 | 309 | PYTHON_AVAILABLE:=$(shell python --version > /dev/null 2>&1 && echo python) |
| 310 | CHECK_CLANG:=$(shell gcc --version 2> /dev/null | grep 'clang' | head -n 1) |
| 309 | 311 | endif |
| 310 | | |
| 312 | ifneq ($(CHECK_CLANG),) |
| 313 | ifeq ($(ARCHITECTURE),x64) |
| 314 | ARCHITECTURE=x64_clang |
| 315 | else |
| 316 | ARCHITECTURE=x86_clang |
| 317 | endif |
| 318 | endif |
| 311 | 319 | ifneq ($(PYTHON_AVAILABLE),python) |
| 312 | 320 | $(error Python is not available in path) |
| 313 | 321 | endif |
| r245201 | r245202 | |
|---|
| 495 | 503 | endif |
| 496 | 504 | $(SILENT) $(MAKE) --no-print-directory -R -C build/projects/gmake-osx config=$(CONFIG)32 |
| 497 | 505 | |
| 506 | macosx_x64_clang: generate |
| 507 | ifndef COMPILE |
| 508 | $(SILENT) $(GENIE) $(PARAMS) --gcc=osx-clang --targetos=macosx --osd=$(OSD) --gcc_version=$(GCC_VERSION) --target=$(TARGET) --subtarget=$(SUBTARGET) gmake |
| 509 | endif |
| 510 | $(SILENT) $(MAKE) --no-print-directory -R -C build/projects/gmake-osx-clang config=$(CONFIG)64 |
| 511 | |
| 512 | macosx_x86_clang: generate |
| 513 | ifndef COMPILE |
| 514 | $(SILENT) $(GENIE) $(PARAMS) --gcc=osx-clang --targetos=macosx --os_version=$(DARWIN_VERSION) --osd=$(OSD) --gcc_version=$(GCC_VERSION) --target=$(TARGET) --subtarget=$(SUBTARGET) gmake |
| 515 | endif |
| 516 | $(SILENT) $(MAKE) --no-print-directory -R -C build/projects/gmake-osx-clang config=$(CONFIG)32 |
| 517 | |
| 498 | 518 | $(GENIE): |
| 499 | 519 | $(SILENT) $(MAKE) --no-print-directory -R -C 3rdparty/genie/build/gmake.$(OS) -f genie.make |
| 500 | 520 | |
trunk/scripts/toolchain.lua
| r245201 | r245202 | |
|---|
| 24 | 24 | { "mingw-clang", "MinGW (clang compiler)" }, |
| 25 | 25 | { "nacl", "Native Client" }, |
| 26 | 26 | { "nacl-arm", "Native Client - ARM" }, |
| 27 | | { "osx", "OSX" }, |
| 27 | { "osx", "OSX (GCC compiler)" }, |
| 28 | { "osx-clang", "OSX (Clang compiler)" }, |
| 28 | 29 | { "pnacl", "Native Client - PNaCl" }, |
| 29 | 30 | { "qnx-arm", "QNX/Blackberry - ARM" }, |
| 30 | 31 | { "rpi", "RaspberryPi" }, |
| r245201 | r245202 | |
|---|
| 257 | 258 | location (_buildDir .. "projects/" .. _ACTION .. "-osx") |
| 258 | 259 | end |
| 259 | 260 | |
| 261 | if "osx-clang" == _OPTIONS["gcc"] then |
| 262 | location (_buildDir .. "projects/" .. _ACTION .. "-osx-clang") |
| 263 | end |
| 264 | |
| 260 | 265 | if "pnacl" == _OPTIONS["gcc"] then |
| 261 | 266 | |
| 262 | 267 | if not os.getenv("NACL_SDK_ROOT") then |
| r245201 | r245202 | |
|---|
| 631 | 636 | configuration { "pnacl", "Release" } |
| 632 | 637 | libdirs { "$(NACL_SDK_ROOT)/lib/pnacl/Release" } |
| 633 | 638 | |
| 634 | | configuration { "osx", "x32" } |
| 639 | configuration { "osx*", "x32" } |
| 635 | 640 | targetdir (_buildDir .. "osx32_clang" .. "/bin") |
| 636 | 641 | objdir (_buildDir .. "osx32_clang" .. "/obj") |
| 637 | 642 | buildoptions { |
| 638 | 643 | "-m32", |
| 639 | 644 | } |
| 640 | 645 | |
| 641 | | configuration { "osx", "x64" } |
| 646 | configuration { "osx*", "x64" } |
| 642 | 647 | targetdir (_buildDir .. "osx64_clang" .. "/bin") |
| 643 | 648 | objdir (_buildDir .. "osx64_clang" .. "/obj") |
| 644 | 649 | buildoptions { |