Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-20 15:32:45 +03:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Added MSBUILD support, msbuild.exe must be in path so update your tools (nw)

Browse Source
This commit is contained in:
Miodrag Milanovic 2015-11-23 10:01:21 +01:00
parent 247036c2e5
commit 4b4b659679
2 changed files with 47 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
makefile
View File

@ -95,6 +95,8 @@
# FORCE_VERSION_COMPILE = 1
# MS BUILD = 1
ifdef PREFIX_MAKEFILE
include $(PREFIX_MAKEFILE)
else
@ -737,6 +739,24 @@ 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 :=
ifdef MSBUILD
MSBUILD_PARAMS := /v:minimal /m:$(NUMBER_OF_PROCESSORS)
ifeq ($(CONFIG),debug)
MSBUILD_PARAMS += /p:Configuration=Debug
else
MSBUILD_PARAMS += /p:Configuration=Release
endif
ifeq ($(ARCHITECTURE),_x64)
MSBUILD_PARAMS += /p:Platform=x64
else
MSBUILD_PARAMS += /p:Platform=win32
endif
ifeq ($(SUBTARGET),mess)
MSBUILD_SOLUTION := $(SUBTARGET).sln
else
MSBUILD_SOLUTION := $(TARGET)$(SUBTARGET).sln
endif
endif
else
GCC_VERSION := $(shell $(subst @,,$(CC)) -dumpversion 2> /dev/null)
ifneq ($(OS),solaris)
@ -834,12 +854,21 @@ vs2012_xp: generate
vs2013: generate
$(SILENT) $(GENIE) $(PARAMS) vs2013
ifdef MSBUILD
$(SILENT) msbuild $(PROJECTDIR)/vs2013/$(MSBUILD_SOLUTION) $(MSBUILD_PARAMS)
endif
vs2013_intel: generate
$(SILENT) $(GENIE) $(PARAMS) --vs=intel-15 vs2013
ifdef MSBUILD
$(SILENT) msbuild $(PROJECTDIR)/vs2013-intel/$(MSBUILD_SOLUTION) $(MSBUILD_PARAMS)
endif
vs2013_xp: generate
$(SILENT) $(GENIE) $(PARAMS) --vs=vs2013-xp vs2013
ifdef MSBUILD
$(SILENT) msbuild $(PROJECTDIR)/vs2013-xp/$(MSBUILD_SOLUTION) $(MSBUILD_PARAMS)
endif
vs2013_clang: generate
$(SILENT) $(GENIE) $(PARAMS) --vs=vs2013-clang vs2013
@ -849,15 +878,24 @@ vs2013_winrt: generate
vs2015: generate
$(SILENT) $(GENIE) $(PARAMS) vs2015
ifdef MSBUILD
$(SILENT) msbuild $(PROJECTDIR)/vs2015/$(MSBUILD_SOLUTION) $(MSBUILD_PARAMS)
endif
vs2015_intel: generate
$(SILENT) $(GENIE) $(PARAMS) --vs=intel-15 vs2015
ifdef MSBUILD
$(SILENT) msbuild $(PROJECTDIR)/vs2015-intel/$(MSBUILD_SOLUTION) $(MSBUILD_PARAMS)
endif
vs2015_xp: generate
$(SILENT) $(GENIE) $(PARAMS) --vs=vs2013-xp vs2015
$(SILENT) $(GENIE) $(PARAMS) --vs=vs2015-xp vs2015
ifdef MSBUILD
$(SILENT) msbuild $(PROJECTDIR)/vs2015-xp/$(MSBUILD_SOLUTION) $(MSBUILD_PARAMS)
endif
vs2015_clang: generate
$(SILENT) $(GENIE) $(PARAMS) --vs=vs2013-clang vs2015
$(SILENT) $(GENIE) $(PARAMS) --vs=vs2015-clang vs2015
vs2015_winrt: generate
$(SILENT) $(GENIE) $(PARAMS) --vs=winstore81 vs2015

7
scripts/toolchain.lua
View File

@ -44,8 +44,10 @@ newoption {
{ "intel-15", "Intel C++ Compiler XE 15.0" },
{ "vs2012-clang", "Clang 3.6" },
{ "vs2013-clang", "Clang 3.6" },
{ "vs2015-clang", "Clang 3.6" },
{ "vs2012-xp", "Visual Studio 2012 targeting XP" },
{ "vs2013-xp", "Visual Studio 2013 targeting XP" },
{ "vs2015-xp", "Visual Studio 2015 targeting XP" },
{ "winphone8", "Windows Phone 8.0" },
{ "winphone81", "Windows Phone 8.1" },
{ "winstore81", "Windows Store 8.1" },
@ -376,6 +378,11 @@ function toolchain(_buildDir, _subDir)
premake.vstudio.toolset = ("v120_xp")
location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-xp")
end
if ("vs2015-xp") == _OPTIONS["vs"] then
premake.vstudio.toolset = ("v140_xp")
location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-xp")
end
elseif _ACTION == "xcode4" then
if "osx" == _OPTIONS["xcode"] then