Previous 199869 Revisions Next

r36835 Tuesday 31st March, 2015 at 16:03:17 UTC by Vasantha Crabb
Get rid of unnecessary distro nonsense
[/trunk]makefile
[scripts]genie.lua toolchain.lua

trunk/makefile
r245346r245347
169169else
170170ifeq ($(DISTRO),debian-stable)
171171else
172ifeq ($(DISTRO),ubuntu-intrepid)
173# Force gcc-4.2 on ubuntu-intrepid
174CC := $(SILENT)gcc -V 4.2
175LD := $(SILENT)g++-4.2
176else
177ifeq ($(DISTRO),gcc44-generic)
178CC := $(SILENT)gcc-4.4
179LD := $(SILENT)g++-4.4
180else
181ifeq ($(DISTRO),gcc45-generic)
182CC := $(SILENT)gcc-4.5
183LD := $(SILENT)g++-4.5
184else
185ifeq ($(DISTRO),gcc46-generic)
186CC := $(SILENT)gcc-4.6
187LD := $(SILENT)g++-4.6
188else
189ifeq ($(DISTRO),gcc47-generic)
190CC := $(SILENT)gcc-4.7
191LD := $(SILENT)g++-4.7
192else
193172$(error DISTRO $(DISTRO) unknown)
194173endif
195174endif
196endif
197endif
198endif
199endif
200endif
201175
202176PARAMS+= --distro=$(DISTRO)
203177
trunk/scripts/genie.lua
r245346r245347
8484      { "generic",          "generic"            },
8585      { "debian-stable",     "debian-stable"      },
8686      { "ubuntu-intrepid",   "ubuntu-intrepid"    },
87      { "gcc44-generic",     "gcc44-generic"      },
88      { "gcc45-generic",     "gcc45-generic"        },
89      { "gcc46-generic",     "gcc46-generic"       },
90      { "gcc47-generic",     "gcc47-generic"      },
9187   },
9288}
9389
r245346r245347
698694      links {
699695         "dl",
700696      }
701      defines
702      {
703         "DISTRO=" .. _OPTIONS["distro"] ,
704      }
705697      if _OPTIONS["distro"]=="debian-stable" then
706698         defines
707699         {
trunk/scripts/toolchain.lua
r245346r245347
154154            premake.gcc.cc   = "@gcc -V 4.2"
155155            premake.gcc.cxx  = "@g++-4.2"
156156         end     
157         if _OPTIONS["distro"]=="gcc44-generic" then
158            premake.gcc.cc   = "@gcc-4.4"
159            premake.gcc.cxx  = "@g++-4.4"
160         end               
161         if _OPTIONS["distro"]=="gcc45-generic" then
162            premake.gcc.cc   = "@gcc-4.5"
163            premake.gcc.cxx  = "@g++-4.5"
164         end               
165         if _OPTIONS["distro"]=="gcc46-generic" then
166            premake.gcc.cc   = "@gcc-4.6"
167            premake.gcc.cxx  = "@g++-4.6"
168         end               
169         if _OPTIONS["distro"]=="gcc47-generic" then
170            premake.gcc.cc   = "@gcc-4.7"
171            premake.gcc.cxx  = "@g++-4.7"
172         end   
173157         premake.gcc.ar  = "ar"
174158         location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-linux")
175159      end


Previous 199869 Revisions Next


© 1997-2024 The MAME Team