From b1182ed63ba29a6cb646a0cff49b42b323d90ad1 Mon Sep 17 00:00:00 2001 From: Jeffrey Clark Date: Sat, 5 Mar 2016 14:36:09 -0600 Subject: fix build errors (nw) --- src/osd/modules/input/input_xinput.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/osd/modules/input/input_xinput.cpp') diff --git a/src/osd/modules/input/input_xinput.cpp b/src/osd/modules/input/input_xinput.cpp index e256b04b101..a531bbdfefb 100644 --- a/src/osd/modules/input/input_xinput.cpp +++ b/src/osd/modules/input/input_xinput.cpp @@ -16,7 +16,7 @@ #include // XInput header -#include +#include #undef interface -- cgit v1.2.3-70-g09d2 From 679574e96589fb62c12c4614bf8a5c96c97c9fdf Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Fri, 11 Mar 2016 15:00:29 +0100 Subject: With latest package from MSYS of clang 3.8.0 build at least compile fine on windows (nw) Strange crashing while executing --- scripts/src/tests.lua | 5 ----- src/osd/modules/input/input_dinput.cpp | 8 ++------ src/osd/modules/input/input_rawinput.cpp | 10 +++++----- src/osd/modules/input/input_win32.cpp | 13 +++++-------- src/osd/modules/input/input_xinput.cpp | 2 +- src/osd/modules/sound/xaudio2_sound.cpp | 2 -- 6 files changed, 13 insertions(+), 27 deletions(-) (limited to 'src/osd/modules/input/input_xinput.cpp') diff --git a/scripts/src/tests.lua b/scripts/src/tests.lua index d30cff64df2..baba88df28c 100644 --- a/scripts/src/tests.lua +++ b/scripts/src/tests.lua @@ -22,11 +22,6 @@ project "gtest" "-Wno-unused-variable", } - configuration { "mingw-clang" } - buildoptions { - "-O0", -- crash of compiler when doing optimization - } - configuration { "vs*" } if _OPTIONS["vs"]=="intel-15" then buildoptions { diff --git a/src/osd/modules/input/input_dinput.cpp b/src/osd/modules/input/input_dinput.cpp index a80eb4c994d..a56f913854d 100644 --- a/src/osd/modules/input/input_dinput.cpp +++ b/src/osd/modules/input/input_dinput.cpp @@ -115,8 +115,6 @@ protected: class dinput_keyboard_device : public dinput_device { private: - HANDLE m_dataEvent; - HANDLE m_exitEvent; std::mutex m_device_lock; public: @@ -124,7 +122,7 @@ public: dinput_keyboard_device(running_machine &machine, const char *name, input_module &module) : dinput_device(machine, name, DEVICE_CLASS_KEYBOARD, module), - keyboard({0}) + keyboard({{0}}) { } @@ -152,8 +150,6 @@ class dinput_module : public wininput_module private: LPDIRECTINPUT m_dinput; int m_dinput_version; - int didevtype_keyboard; - int didevtype_mouse; public: dinput_module(const char* type, const char* name) @@ -493,7 +489,7 @@ public: dinput_joystick_device(running_machine &machine, const char *name, input_module &module) : dinput_device(machine, name, DEVICE_CLASS_JOYSTICK, module), - joystick({0}) + joystick({{0}}) { } diff --git a/src/osd/modules/input/input_rawinput.cpp b/src/osd/modules/input/input_rawinput.cpp index 84d8a96fec3..2bfdf134f34 100644 --- a/src/osd/modules/input/input_rawinput.cpp +++ b/src/osd/modules/input/input_rawinput.cpp @@ -263,7 +263,7 @@ public: rawinput_keyboard_device(running_machine& machine, const char* name, input_module& module) : rawinput_device(machine, name, DEVICE_CLASS_KEYBOARD, module), - keyboard({0}) + keyboard({{0}}) { } @@ -549,8 +549,8 @@ public: } protected: - USHORT usagepage() { return 1; } - USHORT usage() { return 6; } + USHORT usagepage() override { return 1; } + USHORT usage() override { return 6; } void add_rawinput_device(running_machine& machine, RAWINPUTDEVICELIST * device) override { // make sure this is a keyboard @@ -596,8 +596,8 @@ public: } protected: - USHORT usagepage() { return 1; } - USHORT usage() { return 2; } + USHORT usagepage() override { return 1; } + USHORT usage() override { return 2; } void add_rawinput_device(running_machine& machine, RAWINPUTDEVICELIST * device) override { // make sure this is a mouse diff --git a/src/osd/modules/input/input_win32.cpp b/src/osd/modules/input/input_win32.cpp index e1b69c8091c..0fb86095112 100644 --- a/src/osd/modules/input/input_win32.cpp +++ b/src/osd/modules/input/input_win32.cpp @@ -45,7 +45,7 @@ public: win32_keyboard_device(running_machine& machine, const char *name, input_module &module) : event_based_device(machine, name, DEVICE_CLASS_KEYBOARD, module), - keyboard({0}) + keyboard({{0}}) { } @@ -68,7 +68,6 @@ protected: class keyboard_input_win32 : public wininput_module { private: - const osd_options * m_options; public: keyboard_input_win32() @@ -138,7 +137,7 @@ public: win32_mouse_device(running_machine& machine, const char *name, input_module &module) : event_based_device(machine, name, DEVICE_CLASS_MOUSE, module), mouse({0}), - win32_mouse({0}) + win32_mouse({{0}}) { } @@ -172,10 +171,11 @@ public: void reset() override { memset(&mouse, 0, sizeof(mouse)); + memset(&win32_mouse, 0, sizeof(win32_mouse)); } protected: - void process_event(MouseButtonEventArgs &args) + void process_event(MouseButtonEventArgs &args) override { // set the button state mouse.rgbButtons[args.button] = args.keydown ? 0x80 : 0x00; @@ -192,9 +192,6 @@ protected: class mouse_input_win32 : public wininput_module { -private: - const osd_options * m_options; - public: mouse_input_win32() : wininput_module(OSD_MOUSEINPUT_PROVIDER, "win32") @@ -301,7 +298,7 @@ public: } protected: - void process_event(MouseButtonEventArgs &args) + void process_event(MouseButtonEventArgs &args) override { // Are we in shared axis mode? if (m_lightgun_shared_axis_mode) diff --git a/src/osd/modules/input/input_xinput.cpp b/src/osd/modules/input/input_xinput.cpp index a531bbdfefb..b88dbe24c1a 100644 --- a/src/osd/modules/input/input_xinput.cpp +++ b/src/osd/modules/input/input_xinput.cpp @@ -187,7 +187,7 @@ private: public: xinput_joystick_device(running_machine &machine, const char *name, input_module &module) : device_info(machine, name, DEVICE_CLASS_JOYSTICK, module), - gamepad({0}), + gamepad({{0}}), xinput_state({0}), xinput_api(nullptr) { diff --git a/src/osd/modules/sound/xaudio2_sound.cpp b/src/osd/modules/sound/xaudio2_sound.cpp index 4beb2de9da7..e09d87aa6c6 100644 --- a/src/osd/modules/sound/xaudio2_sound.cpp +++ b/src/osd/modules/sound/xaudio2_sound.cpp @@ -205,7 +205,6 @@ private: std::thread m_audioThread; std::queue m_queue; std::unique_ptr m_buffer_pool; - HMODULE m_xaudio2_module; UINT32 m_overflows; UINT32 m_underflows; BOOL m_in_underflow; @@ -227,7 +226,6 @@ public: m_hEventDataAvailable(nullptr), m_hEventExiting(nullptr), m_buffer_pool(nullptr), - m_xaudio2_module(nullptr), m_overflows(0), m_underflows(0), m_in_underflow(FALSE), -- cgit v1.2.3-70-g09d2