| Previous | 199869 Revisions | Next |
| r36838 Tuesday 31st March, 2015 at 16:03:18 UTC by Vasantha Crabb |
|---|
| Restore SDL2_MULTIAPI |
| [/trunk] | makefile |
| [scripts/src/osd] | sdl.lua sdl_cfg.lua |
| r245349 | r245350 | |
|---|---|---|
| 330 | 330 | PARAMS += --SDL_LIBVER='$(SDL_LIBVER)' |
| 331 | 331 | endif |
| 332 | 332 | |
| 333 | ifdef SDL2_MULTIAPI | |
| 334 | PARAMS += --SDL2_MULTIAPI='$(SDL2_MULTIAPI)' | |
| 335 | endif | |
| 336 | ||
| 333 | 337 | ifdef SDL_INSTALL_ROOT |
| 334 | 338 | PARAMS += --SDL_INSTALL_ROOT='$(SDL_INSTALL_ROOT)' |
| 335 | 339 | endif |
| r245349 | r245350 | |
|---|---|---|
| 225 | 225 | end |
| 226 | 226 | |
| 227 | 227 | newoption { |
| 228 | trigger = "SDL2_MULTIAPI", | |
| 229 | description = "Use couriersud's multi-keyboard patch for SDL 2.1? (this API was removed prior to the 2.0 release)", | |
| 230 | allowed = { | |
| 231 | { "0", "Use single-keyboard API" }, | |
| 232 | { "1", "Use multi-keyboard API" }, | |
| 233 | }, | |
| 234 | } | |
| 235 | ||
| 236 | if not _OPTIONS["SDL2_MULTIAPI"] then | |
| 237 | _OPTIONS["SDL2_MULTIAPI"] = "0" | |
| 238 | end | |
| 239 | ||
| 240 | newoption { | |
| 228 | 241 | trigger = "SDL_INSTALL_ROOT", |
| 229 | 242 | description = "Equivalent to the ./configure --prefix=<path>", |
| 230 | 243 | } |
| r245349 | r245350 | |
|---|---|---|
| 62 | 62 | defines { |
| 63 | 63 | "SDLMAME_SDL2=1", |
| 64 | 64 | } |
| 65 | if _OPTIONS["SDL2_MULTIAPI"]=="1" then | |
| 66 | defines { | |
| 67 | "SDL2_MULTIAPI", | |
| 68 | } | |
| 69 | end | |
| 65 | 70 | else |
| 66 | 71 | defines { |
| 67 | 72 | "SDLMAME_SDL2=0", |
| https://github.com/mamedev/mame/commit/1f2763cc32a0f42d6146cbb73a659742c142e39c |
| Previous | 199869 Revisions | Next |