Previous 199869 Revisions Next

r41738 Sunday 15th November, 2015 at 15:55:22 UTC by R. Belmont
Merge pull request #466 from Pernod70/master

bbc: hd6845 fix, saa5050, softlists
[3rdparty/genie/src/actions/cmake]cmake_project.lua
[3rdparty/genie/src/host]scripts.c
[scripts/src]cpu.lua
[src/mame/drivers]namcos23.cpp

trunk/3rdparty/genie/src/actions/cmake/cmake_project.lua
r250249r250250
4242         for _,v in ipairs(cfg.includedirs) do
4343            _p('include_directories(../%s)', premake.esc(v))
4444         end
45         for _,v in ipairs(cfg.defines) do
46            _p('add_definitions(-D%s)', premake.esc(v))
47         end
48         break
4549      end
50      break
4651   end
4752
4853   if (prj.kind=='StaticLib') then
trunk/3rdparty/genie/src/host/scripts.c
r250249r250250
176176   "function premake.cmake.workspace(sln)\n_p('cmake_minimum_required(VERSION 2.8.4)')\n_p('')\nfor i,prj in ipairs(sln.projects) do\nlocal name = premake.esc(prj.name)\n_p('add_subdirectory(%s)', name)\nend\nend\n",
177177
178178   /* actions/cmake/cmake_project.lua */
179   "local cmake = premake.cmake\nlocal tree = premake.tree\nfunction cmake.files(prj)\nlocal tr = premake.project.buildsourcetree(prj)\ntree.traverse(tr, {\nonbranchenter = function(node, depth)\nend,\nonbranchexit = function(node, depth)\nend,\nonleaf = function(node, depth)\n_p(1, '../%s', node.cfg.name)\nend,\n}, true, 1)\nend\nfunction premake.cmake.project(prj)\nio.indent = \"  \"\n_p('cmake_minimum_required(VERSION 2.8.4)')\n_p('')\n_p('project(%s)', premake.esc(prj.name))\n_p('set(')\n_p('source_list')\ncmake.files(prj)\n_p(')')\nlocal platforms = premake.filterplatforms(prj.solution, premake[_OPTIONS.cc].platforms, \"Native\")\nfor i = #platforms, 1, -1 do\nif premake.platforms[platforms[i]].iscrosscompiler then\ntable.remove(platforms, i)\nend\nend \nfor _, platform in ipairs(platforms) do\nfor cfg in premake.eachconfig(prj, platform) do\nfor _,v in ipairs(cfg.includedirs) do\n_p('include_directories(../%s)', premake.esc(v))\nend\nend\nend\nif (prj.kind=='StaticLib') then\n_p('add_library(%s STATIC ${sour"
180   "ce_list})',premake.esc(prj.name))\nend\nif (prj.kind=='SharedLib') then\n_p('add_library(%s SHARED ${source_list})',premake.esc(prj.name))\nend\nif (prj.kind=='ConsoleApp') then\n_p('add_executable(%s ${source_list})',premake.esc(prj.name))\nend\nif (prj.kind=='WindowedApp') then\n_p('add_executable(%s ${source_list})',premake.esc(prj.name))\nend\nend\n",
179   "local cmake = premake.cmake\nlocal tree = premake.tree\nfunction cmake.files(prj)\nlocal tr = premake.project.buildsourcetree(prj)\ntree.traverse(tr, {\nonbranchenter = function(node, depth)\nend,\nonbranchexit = function(node, depth)\nend,\nonleaf = function(node, depth)\n_p(1, '../%s', node.cfg.name)\nend,\n}, true, 1)\nend\nfunction premake.cmake.project(prj)\nio.indent = \"  \"\n_p('cmake_minimum_required(VERSION 2.8.4)')\n_p('')\n_p('project(%s)', premake.esc(prj.name))\n_p('set(')\n_p('source_list')\ncmake.files(prj)\n_p(')')\nlocal platforms = premake.filterplatforms(prj.solution, premake[_OPTIONS.cc].platforms, \"Native\")\nfor i = #platforms, 1, -1 do\nif premake.platforms[platforms[i]].iscrosscompiler then\ntable.remove(platforms, i)\nend\nend \nfor _, platform in ipairs(platforms) do\nfor cfg in premake.eachconfig(prj, platform) do\nfor _,v in ipairs(cfg.includedirs) do\n_p('include_directories(../%s)', premake.esc(v))\nend\nfor _,v in ipairs(cfg.defines) do\n_p('add_definitions(-D%s)', premake.esc("
180   "v))\nend\nbreak\nend\nbreak\nend\nif (prj.kind=='StaticLib') then\n_p('add_library(%s STATIC ${source_list})',premake.esc(prj.name))\nend\nif (prj.kind=='SharedLib') then\n_p('add_library(%s SHARED ${source_list})',premake.esc(prj.name))\nend\nif (prj.kind=='ConsoleApp') then\n_p('add_executable(%s ${source_list})',premake.esc(prj.name))\nend\nif (prj.kind=='WindowedApp') then\n_p('add_executable(%s ${source_list})',premake.esc(prj.name))\nend\nend\n",
181181
182182   /* actions/make/_make.lua */
183183   "_MAKE = { }\npremake.make = { }\nlocal make = premake.make\nfunction _MAKE.esc(value)\nlocal result\nif (type(value) == \"table\") then\nresult = { }\nfor _,v in ipairs(value) do\ntable.insert(result, _MAKE.esc(v))\nend\nreturn result\nelse\nresult = value:gsub(\"\\\\\", \"\\\\\\\\\")\nresult = result:gsub(\" \", \"\\\\ \")\nresult = result:gsub(\"%%(\", \"\\\\%(\")\nresult = result:gsub(\"%%)\", \"\\\\%)\")\nresult = result:gsub(\"$\\\\%((.-)\\\\%)\", \"$%(%1%)\")\nreturn result\nend\nend\nfunction premake.make_copyrule(source, target)\n_p('%s: %s', target, source)\n_p('\\t@echo Copying $(notdir %s)', target)\n_p('\\t-$(call COPY,%s,%s)', source, target)\nend\nfunction premake.make_mkdirrule(var)\n_p('\\t@echo Creating %s', var)\n_p('\\t-$(call MKDIR,%s)', var)\n_p('')\nend\nfunction make.list(value)\nif #value > 0 then\nreturn \" \" .. table.concat(value, \" \")\nelse\nreturn \"\"\nend\nend\nfunction _MAKE.getmakefilename(this, searchprjs)\nlocal count = 0\nfor sln in premake.solution.each() do\nif (sln.loca"
trunk/scripts/src/cpu.lua
r250249r250250
18951895      MAME_DIR .. "src/devices/cpu/tms9900/tms9995.h",
18961896      MAME_DIR .. "src/devices/cpu/tms9900/ti990_10.cpp",
18971897      MAME_DIR .. "src/devices/cpu/tms9900/ti990_10.h",
1898      MAME_DIR .. "src/devices/cpu/tms9900/99xxcore.h",
18991898      MAME_DIR .. "src/devices/cpu/tms9900/tms99com.h",
19001899   }
19011900end
trunk/src/mame/drivers/namcos23.cpp
r250249r250250
33773377INPUT_PORTS_END
33783378
33793379
3380static INPUT_PORTS_START( downhill )
3381   PORT_START("P1")
3382   PORT_BIT( 0xfff, IP_ACTIVE_LOW, IPT_UNKNOWN )
33803383
3384   PORT_START("P2")
3385   PORT_BIT( 0xfff, IP_ACTIVE_LOW, IPT_UNKNOWN )
33813386
3387   PORT_START("IN01")
3388   PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_BUTTON3)      // brake left
3389   PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_START1)      // start
3390   PORT_BIT(0x100, IP_ACTIVE_LOW, IPT_SERVICE) PORT_TOGGLE   // test switch
3391   PORT_BIT(0x200, IP_ACTIVE_LOW, IPT_JOYSTICK_UP)      // select up
3392   PORT_BIT(0x400, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN)   // select down
3393   PORT_BIT(0x800, IP_ACTIVE_LOW, IPT_BUTTON1)   // enter
3394   PORT_BIT(0xf00c, IP_ACTIVE_LOW, IPT_UNKNOWN)
33823395
3396   PORT_START("IN23")
3397   PORT_BIT(0x400, IP_ACTIVE_LOW, IPT_BUTTON4)      // brake right
3398   PORT_BIT(0xfbff, IP_ACTIVE_LOW, IPT_UNKNOWN)
3399
3400   PORT_START("SERVICE")
3401   PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE1 )   // service coin
3402
3403   PORT_START("DSW")
3404   PORT_SERVICE( 0x01, IP_ACTIVE_LOW )
3405   PORT_DIPNAME( 0x02, 0x02, "Skip POST" )
3406   PORT_DIPSETTING(    0x02, DEF_STR( Off ) )
3407   PORT_DIPSETTING(    0x00, DEF_STR( On ) )
3408   PORT_DIPNAME( 0x04, 0x04, "Freeze?" )
3409   PORT_DIPSETTING(    0x04, DEF_STR( Off ) )
3410   PORT_DIPSETTING(    0x00, DEF_STR( On ) )
3411   PORT_DIPNAME( 0x08, 0x08, DEF_STR( Unknown ) )
3412   PORT_DIPSETTING(    0x08, DEF_STR( Off ) )
3413   PORT_DIPSETTING(    0x00, DEF_STR( On ) )
3414   PORT_DIPNAME( 0x10, 0x10, DEF_STR( Unknown ) )
3415   PORT_DIPSETTING(    0x10, DEF_STR( Off ) )
3416   PORT_DIPSETTING(    0x00, DEF_STR( On ) )
3417   PORT_DIPNAME( 0x20, 0x20, DEF_STR( Unknown ) )
3418   PORT_DIPSETTING(    0x20, DEF_STR( Off ) )
3419   PORT_DIPSETTING(    0x00, DEF_STR( On ) )
3420   PORT_DIPNAME( 0x40, 0x40, DEF_STR( Unknown ) )
3421   PORT_DIPSETTING(    0x40, DEF_STR( Off ) )
3422   PORT_DIPSETTING(    0x00, DEF_STR( On ) )
3423   PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unknown ) )
3424   PORT_DIPSETTING(    0x80, DEF_STR( Off ) )
3425   PORT_DIPSETTING(    0x00, DEF_STR( On ) )
3426INPUT_PORTS_END
3427
3428
33833429/***************************************************************************
33843430
33853431  Machine Drivers
r250249r250250
50815127GAME( 1997, rapidrvrv2c, rapidrvr, gorgon,      rapidrvr,  namcos23_state, s23, ROT0, "Namco", "Rapid River (RD2 Ver. C)",     GAME_FLAGS ) // 97/11/27, Europe
50825128GAME( 1997, rapidrvrp,   rapidrvr, gorgon,      rapidrvrp, namcos23_state, s23, ROT0, "Namco", "Rapid River (prototype)",      GAME_FLAGS ) // 97/11/10, USA
50835129GAME( 1997, finfurl,     0,        gorgon,      finfurl,   namcos23_state, s23, ROT0, "Namco", "Final Furlong (FF2 Ver. A)",   GAME_FLAGS )
5084GAME( 1997, downhill,    0,        s23,         s23,       namcos23_state, s23, ROT0, "Namco", "Downhill Bikers (DH3 Ver. A)", GAME_FLAGS )
5130GAME( 1997, downhill,    0,        s23,         downhill,  namcos23_state, s23, ROT0, "Namco", "Downhill Bikers (DH3 Ver. A)", GAME_FLAGS )
50855131GAME( 1997, motoxgo,     0,        s23,         s23,       namcos23_state, s23, ROT0, "Namco", "Motocross Go! (MG3 Ver. A)",   GAME_FLAGS )
50865132GAME( 1997, motoxgov2a,  motoxgo,  s23,         s23,       namcos23_state, s23, ROT0, "Namco", "Motocross Go! (MG2 Ver. A)",   GAME_FLAGS )
50875133GAME( 1997, motoxgov1a,  motoxgo,  s23,         s23,       namcos23_state, s23, ROT0, "Namco", "Motocross Go! (MG1 Ver. A, set 1)", GAME_FLAGS )

https://github.com/mamedev/mame/commit/4c7e8c403b965ae21adba2325b7138aaa12b6784

Previous 199869 Revisions Next

© 1997-2024 The MAME Team