summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2021-01-26 15:37:11 +1100
committer Vas Crabb <vas@vastheman.com>2021-01-26 15:37:11 +1100
commitadc23f3f74f64afa3a1258539a4f8ae2f7ae76c9 (patch)
tree53a4c85b8a2824a865b70c819044fbf9d3f1bac4
parent39ed223cf8afd8f406697b5a758e22f20347bffc (diff)
Goodbye 64 suffix on the main executable, it was nice knowing you.
If you want to build 64-bit and 32-bit in the same tree without them stomping on each other, use SEPARATE_BIN=1 (you already need to do this for TOOLS=1 anyway).
-rw-r--r--dist.mak4
-rw-r--r--scripts/src/main.lua28
-rw-r--r--scripts/src/tests.lua28
-rw-r--r--src/osd/modules/debugger/win/debugviewinfo.cpp23
-rw-r--r--src/osd/modules/debugger/win/debugviewinfo.h1
5 files changed, 28 insertions, 56 deletions
diff --git a/dist.mak b/dist.mak
index 1c8d9507aa6..c378dfdf708 100644
--- a/dist.mak
+++ b/dist.mak
@@ -67,10 +67,8 @@ else
endif
ifeq ($(PTR64),1)
- MAINBINARCH := 64
BUILDARCH := x64
else
- MAINBINARCH :=
BUILDARCH := x32
endif
@@ -97,7 +95,7 @@ ifndef TARGET
TARGET := mame
endif
-MAINBIN := $(TARGET)$(MAINBINARCH)$(MAINBINVARIANT)
+MAINBIN := $(TARGET)$(MAINBINVARIANT)
BINDIR := build/$(PROJECTTYPE)/bin/$(BUILDARCH)/$(BUILDVARIANT)
STAGEDIR := build/release/$(BUILDARCH)/$(BUILDVARIANT)/$(TARGET)
diff --git a/scripts/src/main.lua b/scripts/src/main.lua
index 46f23a256e5..256a99c690f 100644
--- a/scripts/src/main.lua
+++ b/scripts/src/main.lua
@@ -98,37 +98,13 @@ end
configuration "**/*"
flags { "DeploymentContent" }
- configuration { "x64", "Release" }
- targetsuffix "64"
- if _OPTIONS["PROFILE"] then
- targetsuffix "64p"
- end
-
- configuration { "x64", "Debug" }
- targetsuffix "64d"
- if _OPTIONS["PROFILE"] then
- targetsuffix "64dp"
- end
-
- configuration { "x32", "Release" }
- targetsuffix ""
- if _OPTIONS["PROFILE"] then
- targetsuffix "p"
- end
-
- configuration { "x32", "Debug" }
- targetsuffix "d"
- if _OPTIONS["PROFILE"] then
- targetsuffix "dp"
- end
-
- configuration { "Native", "Release" }
+ configuration { "Release" }
targetsuffix ""
if _OPTIONS["PROFILE"] then
targetsuffix "p"
end
- configuration { "Native", "Debug" }
+ configuration { "Debug" }
targetsuffix "d"
if _OPTIONS["PROFILE"] then
targetsuffix "dp"
diff --git a/scripts/src/tests.lua b/scripts/src/tests.lua
index 6d964737079..89c8c976c39 100644
--- a/scripts/src/tests.lua
+++ b/scripts/src/tests.lua
@@ -21,37 +21,13 @@ project("mametests")
targetdir(MAME_DIR)
end
- configuration { "x64", "Release" }
- targetsuffix "64"
- if _OPTIONS["PROFILE"] then
- targetsuffix "64p"
- end
-
- configuration { "x64", "Debug" }
- targetsuffix "64d"
- if _OPTIONS["PROFILE"] then
- targetsuffix "64dp"
- end
-
- configuration { "x32", "Release" }
- targetsuffix ""
- if _OPTIONS["PROFILE"] then
- targetsuffix "p"
- end
-
- configuration { "x32", "Debug" }
- targetsuffix "d"
- if _OPTIONS["PROFILE"] then
- targetsuffix "dp"
- end
-
- configuration { "Native", "Release" }
+ configuration { "Release" }
targetsuffix ""
if _OPTIONS["PROFILE"] then
targetsuffix "p"
end
- configuration { "Native", "Debug" }
+ configuration { "Debug" }
targetsuffix "d"
if _OPTIONS["PROFILE"] then
targetsuffix "dp"
diff --git a/src/osd/modules/debugger/win/debugviewinfo.cpp b/src/osd/modules/debugger/win/debugviewinfo.cpp
index a6fa3308ecb..e2b3e9f07a3 100644
--- a/src/osd/modules/debugger/win/debugviewinfo.cpp
+++ b/src/osd/modules/debugger/win/debugviewinfo.cpp
@@ -291,6 +291,12 @@ void debugview_info::add_items_to_context_menu(HMENU menu)
}
+void debugview_info::update_context_menu(HMENU menu)
+{
+ EnableMenuItem(menu, ID_CONTEXT_PASTE, MF_BYCOMMAND | (IsClipboardFormatAvailable(CF_UNICODETEXT) ? MF_ENABLED : MF_GRAYED));
+}
+
+
void debugview_info::handle_context_menu(unsigned command)
{
switch (command)
@@ -709,6 +715,7 @@ bool debugview_info::process_context_menu(int x, int y)
}
// show the context menu
+ update_context_menu(m_contextmenu);
BOOL const command(TrackPopupMenu(
m_contextmenu,
(GetSystemMetrics(SM_MENUDROPALIGNMENT) ? TPM_RIGHTALIGN : TPM_LEFTALIGN) | TPM_LEFTBUTTON | TPM_NONOTIFY | TPM_RETURNCMD,
@@ -855,16 +862,30 @@ LRESULT debugview_info::view_proc(UINT message, WPARAM wparam, LPARAM lparam)
// mouse click
case WM_LBUTTONDOWN:
+ case WM_MBUTTONDOWN:
{
debug_view_xy topleft = m_view->visible_position();
debug_view_xy newpos;
newpos.x = topleft.x + GET_X_LPARAM(lparam) / metrics().debug_font_width();
newpos.y = topleft.y + GET_Y_LPARAM(lparam) / metrics().debug_font_height();
- m_view->process_click(DCK_LEFT_CLICK, newpos);
+ m_view->process_click((message == WM_LBUTTONDOWN) ? DCK_LEFT_CLICK : DCK_MIDDLE_CLICK, newpos);
SetFocus(m_wnd);
break;
}
+ // right click
+ case WM_RBUTTONDOWN:
+ if (m_view->cursor_supported())
+ {
+ debug_view_xy topleft = m_view->visible_position();
+ debug_view_xy newpos;
+ newpos.x = topleft.x + GET_X_LPARAM(lparam) / metrics().debug_font_width();
+ newpos.y = topleft.y + GET_Y_LPARAM(lparam) / metrics().debug_font_height();
+ m_view->set_cursor_position(newpos);
+ m_view->set_cursor_visible(true);
+ }
+ return DefWindowProc(m_wnd, message, wparam, lparam);
+
// horizontal scroll
case WM_HSCROLL:
{
diff --git a/src/osd/modules/debugger/win/debugviewinfo.h b/src/osd/modules/debugger/win/debugviewinfo.h
index 4cbf71b7a81..beb5ee66ff0 100644
--- a/src/osd/modules/debugger/win/debugviewinfo.h
+++ b/src/osd/modules/debugger/win/debugviewinfo.h
@@ -61,6 +61,7 @@ protected:
template <typename T> T *view() const { return downcast<T *>(m_view); }
virtual void add_items_to_context_menu(HMENU menu);
+ virtual void update_context_menu(HMENU menu);
virtual void handle_context_menu(unsigned command);
private: