diff options
| author | 2016-03-05 09:52:54 -0500 | |
|---|---|---|
| committer | 2016-03-05 09:52:54 -0500 | |
| commit | 50fc05a49fcc6b689271ecff2dfae209bb4bfd47 (patch) | |
| tree | 9bce43cfb23e17399376f45ee18a417b0dee5eef /src/osd/modules | |
| parent | f7b8e47a17efd84963e685c39840ff111787d929 (diff) | |
| parent | 23eaaa9244ffa216e0b8365916d9cf3af785279b (diff) | |
Merge branch 'master' of https://github.com/mamedev/mame.git
Diffstat (limited to 'src/osd/modules')
| -rw-r--r-- | src/osd/modules/input/input_sdl.cpp | 19 | ||||
| -rw-r--r-- | src/osd/modules/opengl/shader/glsl_bilinear_idx16_lut.fsh | 3 | ||||
| -rw-r--r-- | src/osd/modules/opengl/shader/glsl_bilinear_rgb32_dir.fsh | 3 | ||||
| -rw-r--r-- | src/osd/modules/opengl/shader/glsl_bilinear_rgb32_lut.fsh | 3 | ||||
| -rw-r--r-- | src/osd/modules/opengl/shader/glsl_plain_idx16_lut.fsh | 3 | ||||
| -rw-r--r-- | src/osd/modules/opengl/shader/glsl_plain_rgb32_dir.fsh | 3 | ||||
| -rw-r--r-- | src/osd/modules/opengl/shader/glsl_plain_rgb32_lut.fsh | 3 | ||||
| -rw-r--r-- | src/osd/modules/render/bgfx/statereader.cpp | 2 | ||||
| -rw-r--r-- | src/osd/modules/render/bgfx/statereader.h | 2 | ||||
| -rw-r--r-- | src/osd/modules/render/bgfx/writereader.cpp | 2 | ||||
| -rw-r--r-- | src/osd/modules/render/bgfx/writereader.h | 2 | ||||
| -rw-r--r-- | src/osd/modules/render/binpacker.h | 2 | ||||
| -rw-r--r-- | src/osd/modules/render/drawbgfx.h | 2 | ||||
| -rw-r--r-- | src/osd/modules/sound/xaudio2_sound.cpp | 7 |
14 files changed, 45 insertions, 11 deletions
diff --git a/src/osd/modules/input/input_sdl.cpp b/src/osd/modules/input/input_sdl.cpp index 3894f25e1b4..43d4cbf6a6c 100644 --- a/src/osd/modules/input/input_sdl.cpp +++ b/src/osd/modules/input/input_sdl.cpp @@ -688,11 +688,20 @@ public: int physical_stick; for (physical_stick = 0; physical_stick < SDL_NumJoysticks(); physical_stick++) { - SDL_Joystick *joy = SDL_JoystickOpen(physical_stick); - std::string joy_name = remove_spaces(SDL_JoystickName(joy)); - SDL_JoystickClose(joy); - - devmap_register(&m_joy_map, physical_stick, joy_name.c_str()); + if (SDL_IsGameController(physical_stick)) { + osd_printf_verbose("Joystick %i is supported by the game controller interface!\n", physical_stick); + osd_printf_verbose("Compatible controller, named \'%s\'\n", SDL_GameControllerNameForIndex(physical_stick)); + SDL_GameController *joy = SDL_GameControllerOpen(physical_stick); + osd_printf_verbose("Controller is mapped as \"%s\".\n", SDL_GameControllerMapping(joy)); + std::string joy_name = remove_spaces(SDL_GameControllerName(joy)); + SDL_GameControllerClose(joy); + devmap_register(&m_joy_map, physical_stick, joy_name.c_str()); + } else { + SDL_Joystick *joy = SDL_JoystickOpen(physical_stick); + std::string joy_name = remove_spaces(SDL_JoystickName(joy)); + SDL_JoystickClose(joy); + devmap_register(&m_joy_map, physical_stick, joy_name.c_str()); + } } for (int stick = 0; stick < MAX_DEVMAP_ENTRIES; stick++) diff --git a/src/osd/modules/opengl/shader/glsl_bilinear_idx16_lut.fsh b/src/osd/modules/opengl/shader/glsl_bilinear_idx16_lut.fsh index ef0030b7519..c2fba95bdc6 100644 --- a/src/osd/modules/opengl/shader/glsl_bilinear_idx16_lut.fsh +++ b/src/osd/modules/opengl/shader/glsl_bilinear_idx16_lut.fsh @@ -1,4 +1,5 @@ - +// license:BSD-3-Clause +// copyright-holders:Sven Gothel #pragma optimize (on) #pragma debug (off) diff --git a/src/osd/modules/opengl/shader/glsl_bilinear_rgb32_dir.fsh b/src/osd/modules/opengl/shader/glsl_bilinear_rgb32_dir.fsh index c739c16934e..97278c65df5 100644 --- a/src/osd/modules/opengl/shader/glsl_bilinear_rgb32_dir.fsh +++ b/src/osd/modules/opengl/shader/glsl_bilinear_rgb32_dir.fsh @@ -1,4 +1,5 @@ - +// license:BSD-3-Clause +// copyright-holders:Sven Gothel #pragma optimize (on) #pragma debug (off) diff --git a/src/osd/modules/opengl/shader/glsl_bilinear_rgb32_lut.fsh b/src/osd/modules/opengl/shader/glsl_bilinear_rgb32_lut.fsh index d6c9f5e7f59..93cd172e0b1 100644 --- a/src/osd/modules/opengl/shader/glsl_bilinear_rgb32_lut.fsh +++ b/src/osd/modules/opengl/shader/glsl_bilinear_rgb32_lut.fsh @@ -1,4 +1,5 @@ - +// license:BSD-3-Clause +// copyright-holders:Sven Gothel #pragma optimize (on) #pragma debug (off) diff --git a/src/osd/modules/opengl/shader/glsl_plain_idx16_lut.fsh b/src/osd/modules/opengl/shader/glsl_plain_idx16_lut.fsh index 465aa610d59..9c8728d90b9 100644 --- a/src/osd/modules/opengl/shader/glsl_plain_idx16_lut.fsh +++ b/src/osd/modules/opengl/shader/glsl_plain_idx16_lut.fsh @@ -1,4 +1,5 @@ - +// license:BSD-3-Clause +// copyright-holders:Sven Gothel #pragma optimize (on) #pragma debug (off) diff --git a/src/osd/modules/opengl/shader/glsl_plain_rgb32_dir.fsh b/src/osd/modules/opengl/shader/glsl_plain_rgb32_dir.fsh index 0e5a4605ac8..eb3f902f93b 100644 --- a/src/osd/modules/opengl/shader/glsl_plain_rgb32_dir.fsh +++ b/src/osd/modules/opengl/shader/glsl_plain_rgb32_dir.fsh @@ -1,4 +1,5 @@ - +// license:BSD-3-Clause +// copyright-holders:Sven Gothel #pragma optimize (on) #pragma debug (off) diff --git a/src/osd/modules/opengl/shader/glsl_plain_rgb32_lut.fsh b/src/osd/modules/opengl/shader/glsl_plain_rgb32_lut.fsh index 14c05aaa844..3bc16870166 100644 --- a/src/osd/modules/opengl/shader/glsl_plain_rgb32_lut.fsh +++ b/src/osd/modules/opengl/shader/glsl_plain_rgb32_lut.fsh @@ -1,4 +1,5 @@ - +// license:BSD-3-Clause +// copyright-holders:Sven Gothel #pragma optimize (on) #pragma debug (off) diff --git a/src/osd/modules/render/bgfx/statereader.cpp b/src/osd/modules/render/bgfx/statereader.cpp index 93fb021be5c..0a459c60102 100644 --- a/src/osd/modules/render/bgfx/statereader.cpp +++ b/src/osd/modules/render/bgfx/statereader.cpp @@ -1,3 +1,5 @@ +// license:BSD-3-Clause +// copyright-holders:Ryan Holtz #include "statereader.h" uint64_t state_reader::get_enum_from_value(const Value& value, std::string name, const uint64_t default_value, const string_to_enum* enums, const int count) diff --git a/src/osd/modules/render/bgfx/statereader.h b/src/osd/modules/render/bgfx/statereader.h index d32cf52c817..ce52536ca0a 100644 --- a/src/osd/modules/render/bgfx/statereader.h +++ b/src/osd/modules/render/bgfx/statereader.h @@ -1,3 +1,5 @@ +// license:BSD-3-Clause +// copyright-holders:Ryan Holtz #pragma once #ifndef __DRAWBGFX_STATE_READER__ diff --git a/src/osd/modules/render/bgfx/writereader.cpp b/src/osd/modules/render/bgfx/writereader.cpp index 5d6ca0fcf93..7fd36a03fda 100644 --- a/src/osd/modules/render/bgfx/writereader.cpp +++ b/src/osd/modules/render/bgfx/writereader.cpp @@ -1,3 +1,5 @@ +// license:BSD-3-Clause +// copyright-holders:Ryan Holtz #include <bgfx/bgfx.h> #include "writereader.h" diff --git a/src/osd/modules/render/bgfx/writereader.h b/src/osd/modules/render/bgfx/writereader.h index 5210a8df286..bd43b5899f5 100644 --- a/src/osd/modules/render/bgfx/writereader.h +++ b/src/osd/modules/render/bgfx/writereader.h @@ -1,3 +1,5 @@ +// license:BSD-3-Clause +// copyright-holders:Ryan Holtz #pragma once #ifndef __DRAWBGFX_WRITE_READER__ diff --git a/src/osd/modules/render/binpacker.h b/src/osd/modules/render/binpacker.h index 696bd18eb7d..33f02dc2642 100644 --- a/src/osd/modules/render/binpacker.h +++ b/src/osd/modules/render/binpacker.h @@ -1,3 +1,5 @@ +// license:BSD-3-Clause +// copyright-holders:Ryan Holtz #pragma once #ifndef __RECTPACKER_H__ diff --git a/src/osd/modules/render/drawbgfx.h b/src/osd/modules/render/drawbgfx.h index 62e00dd7d1d..806bc651344 100644 --- a/src/osd/modules/render/drawbgfx.h +++ b/src/osd/modules/render/drawbgfx.h @@ -1,3 +1,5 @@ +// license:BSD-3-Clause +// copyright-holders:Ryan Holtz #pragma once #ifndef __RENDER_BGFX__ diff --git a/src/osd/modules/sound/xaudio2_sound.cpp b/src/osd/modules/sound/xaudio2_sound.cpp index 9dc3d0461be..8388cea521e 100644 --- a/src/osd/modules/sound/xaudio2_sound.cpp +++ b/src/osd/modules/sound/xaudio2_sound.cpp @@ -38,6 +38,13 @@ #include "emu.h" #include "osdepend.h" #include "emuopts.h" +#if !defined(XAUDIO2_DLL) +#if defined(UNICODE) +#define XAUDIO2_DLL L"xaudio2_8.dll" +#else +#define XAUDIO2_DLL "xaudio2_8.dll" +#endif +#endif //============================================================ // Constants |
