trunk/makefile
| r250343 | r250344 | |
|---|
| 95 | 95 | |
| 96 | 96 | # FORCE_VERSION_COMPILE = 1 |
| 97 | 97 | |
| 98 | # MS BUILD = 1 |
| 99 | |
| 98 | 100 | ifdef PREFIX_MAKEFILE |
| 99 | 101 | include $(PREFIX_MAKEFILE) |
| 100 | 102 | else |
| r250343 | r250344 | |
|---|
| 737 | 739 | CLANG_VERSION := $(shell %CLANG%\bin\clang --version 2> NUL| head -n 1 | sed "s/[^0-9,.]//g") |
| 738 | 740 | PYTHON_AVAILABLE := $(shell $(PYTHON) --version > NUL 2>&1 && echo python) |
| 739 | 741 | CHECK_CLANG := |
| 742 | ifdef MSBUILD |
| 743 | MSBUILD_PARAMS := /v:minimal /m:$(NUMBER_OF_PROCESSORS) |
| 744 | ifeq ($(CONFIG),debug) |
| 745 | MSBUILD_PARAMS += /p:Configuration=Debug |
| 740 | 746 | else |
| 747 | MSBUILD_PARAMS += /p:Configuration=Release |
| 748 | endif |
| 749 | ifeq ($(ARCHITECTURE),_x64) |
| 750 | MSBUILD_PARAMS += /p:Platform=x64 |
| 751 | else |
| 752 | MSBUILD_PARAMS += /p:Platform=win32 |
| 753 | endif |
| 754 | ifeq ($(SUBTARGET),mess) |
| 755 | MSBUILD_SOLUTION := $(SUBTARGET).sln |
| 756 | else |
| 757 | MSBUILD_SOLUTION := $(TARGET)$(SUBTARGET).sln |
| 758 | endif |
| 759 | endif |
| 760 | else |
| 741 | 761 | GCC_VERSION := $(shell $(subst @,,$(CC)) -dumpversion 2> /dev/null) |
| 742 | 762 | ifneq ($(OS),solaris) |
| 743 | 763 | CLANG_VERSION := $(shell clang --version 2> /dev/null | head -n 1 | grep -e 'version [0-9]\.[0-9]\(\.[0-9]\)\?' -o | grep -e '[0-9]\.[0-9]\(\.[0-9]\)\?' -o | tail -n 1) |
| r250343 | r250344 | |
|---|
| 834 | 854 | |
| 835 | 855 | vs2013: generate |
| 836 | 856 | $(SILENT) $(GENIE) $(PARAMS) vs2013 |
| 857 | ifdef MSBUILD |
| 858 | $(SILENT) msbuild $(PROJECTDIR)/vs2013/$(MSBUILD_SOLUTION) $(MSBUILD_PARAMS) |
| 859 | endif |
| 837 | 860 | |
| 838 | 861 | vs2013_intel: generate |
| 839 | 862 | $(SILENT) $(GENIE) $(PARAMS) --vs=intel-15 vs2013 |
| 863 | ifdef MSBUILD |
| 864 | $(SILENT) msbuild $(PROJECTDIR)/vs2013-intel/$(MSBUILD_SOLUTION) $(MSBUILD_PARAMS) |
| 865 | endif |
| 840 | 866 | |
| 841 | 867 | vs2013_xp: generate |
| 842 | 868 | $(SILENT) $(GENIE) $(PARAMS) --vs=vs2013-xp vs2013 |
| 869 | ifdef MSBUILD |
| 870 | $(SILENT) msbuild $(PROJECTDIR)/vs2013-xp/$(MSBUILD_SOLUTION) $(MSBUILD_PARAMS) |
| 871 | endif |
| 843 | 872 | |
| 844 | 873 | vs2013_clang: generate |
| 845 | 874 | $(SILENT) $(GENIE) $(PARAMS) --vs=vs2013-clang vs2013 |
| r250343 | r250344 | |
|---|
| 849 | 878 | |
| 850 | 879 | vs2015: generate |
| 851 | 880 | $(SILENT) $(GENIE) $(PARAMS) vs2015 |
| 881 | ifdef MSBUILD |
| 882 | $(SILENT) msbuild $(PROJECTDIR)/vs2015/$(MSBUILD_SOLUTION) $(MSBUILD_PARAMS) |
| 883 | endif |
| 852 | 884 | |
| 853 | 885 | vs2015_intel: generate |
| 854 | 886 | $(SILENT) $(GENIE) $(PARAMS) --vs=intel-15 vs2015 |
| 887 | ifdef MSBUILD |
| 888 | $(SILENT) msbuild $(PROJECTDIR)/vs2015-intel/$(MSBUILD_SOLUTION) $(MSBUILD_PARAMS) |
| 889 | endif |
| 855 | 890 | |
| 856 | 891 | vs2015_xp: generate |
| 857 | | $(SILENT) $(GENIE) $(PARAMS) --vs=vs2013-xp vs2015 |
| 892 | $(SILENT) $(GENIE) $(PARAMS) --vs=vs2015-xp vs2015 |
| 893 | ifdef MSBUILD |
| 894 | $(SILENT) msbuild $(PROJECTDIR)/vs2015-xp/$(MSBUILD_SOLUTION) $(MSBUILD_PARAMS) |
| 895 | endif |
| 858 | 896 | |
| 859 | 897 | vs2015_clang: generate |
| 860 | | $(SILENT) $(GENIE) $(PARAMS) --vs=vs2013-clang vs2015 |
| 898 | $(SILENT) $(GENIE) $(PARAMS) --vs=vs2015-clang vs2015 |
| 861 | 899 | |
| 862 | 900 | vs2015_winrt: generate |
| 863 | 901 | $(SILENT) $(GENIE) $(PARAMS) --vs=winstore81 vs2015 |
trunk/scripts/toolchain.lua
| r250343 | r250344 | |
|---|
| 44 | 44 | { "intel-15", "Intel C++ Compiler XE 15.0" }, |
| 45 | 45 | { "vs2012-clang", "Clang 3.6" }, |
| 46 | 46 | { "vs2013-clang", "Clang 3.6" }, |
| 47 | { "vs2015-clang", "Clang 3.6" }, |
| 47 | 48 | { "vs2012-xp", "Visual Studio 2012 targeting XP" }, |
| 48 | 49 | { "vs2013-xp", "Visual Studio 2013 targeting XP" }, |
| 50 | { "vs2015-xp", "Visual Studio 2015 targeting XP" }, |
| 49 | 51 | { "winphone8", "Windows Phone 8.0" }, |
| 50 | 52 | { "winphone81", "Windows Phone 8.1" }, |
| 51 | 53 | { "winstore81", "Windows Store 8.1" }, |
| r250343 | r250344 | |
|---|
| 376 | 378 | premake.vstudio.toolset = ("v120_xp") |
| 377 | 379 | location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-xp") |
| 378 | 380 | end |
| 381 | |
| 382 | if ("vs2015-xp") == _OPTIONS["vs"] then |
| 383 | premake.vstudio.toolset = ("v140_xp") |
| 384 | location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-xp") |
| 385 | end |
| 379 | 386 | elseif _ACTION == "xcode4" then |
| 380 | 387 | |
| 381 | 388 | if "osx" == _OPTIONS["xcode"] then |