Previous 199869 Revisions Next

r36676 Thursday 26th March, 2015 at 13:01:14 UTC by Miodrag Milanović
added distro support for linux (nw)
[/trunk]makefile
[scripts]genie.lua toolchain.lua
[scripts/src]main.lua osd.lua
[src/build]verinfo.py

trunk/makefile
r245187r245188
136136ARCHITECTURE = x64
137137endif
138138
139
140PYTHON = @python
141CC = @gcc
142LD = @g++
143
144#-------------------------------------------------
145# distribution may change things
146#-------------------------------------------------
147
148ifeq ($(DISTRO),)
149DISTRO = generic
150else
151ifeq ($(DISTRO),debian-stable)
152else
153ifeq ($(DISTRO),ubuntu-intrepid)
154# Force gcc-4.2 on ubuntu-intrepid
155CC = @gcc -V 4.2
156LD = @g++-4.2
157else
158ifeq ($(DISTRO),gcc44-generic)
159CC = @gcc-4.4
160LD = @g++-4.4
161else
162ifeq ($(DISTRO),gcc45-generic)
163CC = @gcc-4.5
164LD = @g++-4.5
165else
166ifeq ($(DISTRO),gcc46-generic)
167CC = @gcc-4.6
168LD = @g++-4.6
169else
170ifeq ($(DISTRO),gcc47-generic)
171CC = @gcc-4.7
172LD = @g++-4.7
173else
174$(error DISTRO $(DISTRO) unknown)
175endif
176endif
177endif
178endif
179endif
180endif
181endif
182
139183# extension for executables
140184EXE =
141185
r245187r245188
164208
165209GENDIR = build/generated
166210
167PYTHON = @python
168CC = @gcc
169LD = @g++
170211# all sources are under the src/ directory
171212SRC = src
172213
r245187r245188
191232
192233SILENT?=@
193234
194PARAMS=
235PARAMS=--distro=$(DISTRO)
195236ifdef TOOLS
196PARAMS=--with-tools
237PARAMS+= --with-tools
197238endif
198239
199240all: $(GENIE) $(TARGETOS)_$(ARCHITECTURE)
trunk/scripts/genie.lua
r245187r245188
7070}
7171
7272newoption {
73   trigger = "distro",
74   description = "Choose distribution",
75   allowed = {
76      { "generic",          "generic"            },
77      { "debian-stable",     "debian-stable"      },
78      { "ubuntu-intrepid",   "ubuntu-intrepid"    },
79      { "gcc44-generic",     "gcc44-generic"      },
80      { "gcc45-generic",     "gcc45-generic"        },
81      { "gcc46-generic",     "gcc46-generic"       },
82      { "gcc47-generic",     "gcc47-generic"      },
83   },
84}
85
86newoption {
7387   trigger = "target",
7488   description = "Building target",
7589}
r245187r245188
491505         "X11",
492506         "Xinerama",
493507      }
508      defines
509      {
510         "DISTRO=" .. _OPTIONS["distro"] ,
511      }
512      if _OPTIONS["distro"]=="debian-stable" then
513         defines
514         {
515            "NO_AFFINITY_NP",
516         }
517      end
494518
519
495520configuration { "osx*" }
521
496522      links {
497523         "Cocoa.framework",
498524         "OpenGL.framework",
trunk/scripts/src/main.lua
r245187r245188
1414      "NoManifest",
1515   }
1616
17   configuration { "osx*" }
18      linkoptions {
19         "-sectcreate __TEXT __info_plist " .. GEN_DIR .. "/osd/sdl/" .. _OPTIONS["target"] .. "-Info.plist"
20      }
21
2217   configuration { "mingw*" }
2318      if _OPTIONS["osd"]=="sdl" then
2419         targetprefix "sdl"
r245187r245188
7873      MAME_DIR .. "3rdparty/zlib",
7974      GEN_DIR  .. "mame/layout",
8075      GEN_DIR  .. "ldplayer/layout",
81      GEN_DIR .. "osd/windows",
76      GEN_DIR .. "osd/windows",
8277   }
8378
8479   includeosd()
trunk/scripts/src/osd.lua
r245187r245188
193193         --else
194194         MAME_DIR .. "src/osd/modules/sync/work_osd.*",
195195      }
196      if _OPTIONS["targetos"]=="macosx" then
197         files {
198            MAME_DIR .. "src/osd/sdl/osxutils.m",
199         }
200      end
201196   end
202197   if _OPTIONS["osd"]=="windows" then
203198      includedirs {
trunk/scripts/toolchain.lua
r245187r245188
148148      end
149149
150150      if "linux-gcc" == _OPTIONS["gcc"] then
151         -- Force gcc-4.2 on ubuntu-intrepid
152         if _OPTIONS["distro"]=="ubuntu-intrepid" then
153            premake.gcc.cc   = "@gcc -V 4.2"
154            premake.gcc.cxx  = "@g++-4.2"
155         end     
156         if _OPTIONS["distro"]=="gcc44-generic" then
157            premake.gcc.cc   = "@gcc-4.4"
158            premake.gcc.cxx  = "@g++-4.4"
159         end               
160         if _OPTIONS["distro"]=="gcc45-generic" then
161            premake.gcc.cc   = "@gcc-4.5"
162            premake.gcc.cxx  = "@g++-4.5"
163         end               
164         if _OPTIONS["distro"]=="gcc46-generic" then
165            premake.gcc.cc   = "@gcc-4.6"
166            premake.gcc.cxx  = "@g++-4.6"
167         end               
168         if _OPTIONS["distro"]=="gcc47-generic" then
169            premake.gcc.cc   = "@gcc-4.7"
170            premake.gcc.cxx  = "@g++-4.7"
171         end   
172         premake.gcc.ar  = "ar"
151173         location (_buildDir .. "projects/" .. _ACTION .. "-linux")
152174      end
153175
trunk/src/build/verinfo.py
r245187r245188
108108    comments = "Multiple Arcade Machine Emulator"
109109    company_name = "MAME Team"
110110    file_description = "Multiple Arcade Machine Emulator"
111    internal_name = "MAME" if build == "mame" else build
112    original_filename = "MAME" if build == "mame" else build
113    product_name = "MAME" if build == "mame" else build
114    bundle_identifier = "org.mamedev." + build
111    internal_name = "MAME"
112    original_filename = "MAME"
113    product_name = "MAME"
114    bundle_identifier = "org.mamedev.mame"
115115
116116legal_copyright = "Copyright Nicola Salmoria and the MAME team"
117117

https://github.com/mamedev/mame/commit/5310d041d5e5845384ad6ffd4b8afd5deaba1585

Previous 199869 Revisions Next

© 1997-2024 The MAME Team