Miroirs/mame
1
0
Fork 0
mirror of https://github.com/mamedev/mame.git synced 2024-11-16 07:48:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Added platform parameter and some ARM fixes (nw)

Browse source
This commit is contained in:
Miodrag Milanovic 2015-12-27 15:35:29 +01:00
parent a6fc794c3a
commit 9c2669081c
2 changed files with 24 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
makefile
View file

@ -115,9 +115,18 @@ MAKEPARAMS := -R
ifeq ($(OS),Windows_NT) ifeq ($(OS),Windows_NT)
OS := windows OS := windows
GENIEOS := windows GENIEOS := windows
PLATFORM := x86
else else
UNAME := $(shell uname -mps) UNAME := $(shell uname -mps)
GENIEOS := linux GENIEOS := linux
PLATFORM := unknown
ifeq ($(firstword $(filter x86,$(UNAME))),x86)
PLATFORM := x86
endif
ifeq ($(firstword $(filter arm,$(UNAME))),arm)
PLATFORM := arm
endif
ifeq ($(firstword $(filter Linux,$(UNAME))),Linux) ifeq ($(firstword $(filter Linux,$(UNAME))),Linux)
OS := linux OS := linux
endif endif
@ -650,6 +659,10 @@ ifdef FORCE_VERSION_COMPILE
PARAMS += --FORCE_VERSION_COMPILE='$(FORCE_VERSION_COMPILE)' PARAMS += --FORCE_VERSION_COMPILE='$(FORCE_VERSION_COMPILE)'
endif endif
ifdef PLATFORM
PARAMS += --PLATFORM='$(PLATFORM)'
endif
#------------------------------------------------- #-------------------------------------------------
# All scripts # All scripts
#------------------------------------------------- #-------------------------------------------------

14
scripts/genie.lua
View file

@ -388,6 +388,11 @@ newoption {
} }
} }
newoption {
trigger = "PLATFORM",
description = "Target machine platform (x86,arm,...)",
}
if _OPTIONS["SHLIB"]=="1" then if _OPTIONS["SHLIB"]=="1" then
LIBTYPE = "SharedLib" LIBTYPE = "SharedLib"
else else
@ -1012,9 +1017,12 @@ end
} }
end end
end end
--ifeq ($(findstring arm,$(UNAME)),arm)
-- CCOMFLAGS += -Wno-cast-align if (_OPTIONS["PLATFORM"]=="arm") then
--endif buildoptions {
"-Wno-cast-align",
}
end
local subdir local subdir
if (_OPTIONS["target"] == _OPTIONS["subtarget"]) then if (_OPTIONS["target"] == _OPTIONS["subtarget"]) then