Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-10-04 16:34:53 +03:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Get rid of unnecessary distro nonsense

Browse Source
This commit is contained in:
Vas Crabb 2015-04-01 02:32:56 +11:00
parent 5c03885252
commit 399a5f914b
3 changed files with 0 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
makefile
View File

@ -169,35 +169,9 @@ DISTRO := generic
else
ifeq ($(DISTRO),debian-stable)
else
ifeq ($(DISTRO),ubuntu-intrepid)
# Force gcc-4.2 on ubuntu-intrepid
CC := $(SILENT)gcc -V 4.2
LD := $(SILENT)g++-4.2
else
ifeq ($(DISTRO),gcc44-generic)
CC := $(SILENT)gcc-4.4
LD := $(SILENT)g++-4.4
else
ifeq ($(DISTRO),gcc45-generic)
CC := $(SILENT)gcc-4.5
LD := $(SILENT)g++-4.5
else
ifeq ($(DISTRO),gcc46-generic)
CC := $(SILENT)gcc-4.6
LD := $(SILENT)g++-4.6
else
ifeq ($(DISTRO),gcc47-generic)
CC := $(SILENT)gcc-4.7
LD := $(SILENT)g++-4.7
else
$(error DISTRO $(DISTRO) unknown)
endif
endif
endif
endif
endif
endif
endif
PARAMS+= --distro=$(DISTRO)

8
scripts/genie.lua
View File

@ -84,10 +84,6 @@ newoption {
{ "generic", "generic" },
{ "debian-stable", "debian-stable" },
{ "ubuntu-intrepid", "ubuntu-intrepid" },
{ "gcc44-generic", "gcc44-generic" },
{ "gcc45-generic", "gcc45-generic" },
{ "gcc46-generic", "gcc46-generic" },
{ "gcc47-generic", "gcc47-generic" },
},
}
@ -698,10 +694,6 @@ configuration { "linux-*" }
links {
"dl",
}
defines
{
"DISTRO=" .. _OPTIONS["distro"] ,
}
if _OPTIONS["distro"]=="debian-stable" then
defines
{

16
scripts/toolchain.lua
View File

@ -154,22 +154,6 @@ function toolchain(_buildDir, _subDir)
premake.gcc.cc = "@gcc -V 4.2"
premake.gcc.cxx = "@g++-4.2"
end
if _OPTIONS["distro"]=="gcc44-generic" then
premake.gcc.cc = "@gcc-4.4"
premake.gcc.cxx = "@g++-4.4"
end
if _OPTIONS["distro"]=="gcc45-generic" then
premake.gcc.cc = "@gcc-4.5"
premake.gcc.cxx = "@g++-4.5"
end
if _OPTIONS["distro"]=="gcc46-generic" then
premake.gcc.cc = "@gcc-4.6"
premake.gcc.cxx = "@g++-4.6"
end
if _OPTIONS["distro"]=="gcc47-generic" then
premake.gcc.cc = "@gcc-4.7"
premake.gcc.cxx = "@g++-4.7"
end
premake.gcc.ar = "ar"
location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-linux")
end