Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-07-01 08:18:59 +03:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Goodbye 64 suffix on the main executable, it was nice knowing you.

Browse Source 
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).
This commit is contained in:
Vas Crabb 2021-01-26 15:37:11 +11:00
parent 39ed223cf8
commit adc23f3f74
5 changed files with 28 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dist.mak
View File

@ -67,10 +67,8 @@ else
endif endif
ifeq ($(PTR64),1) ifeq ($(PTR64),1)
MAINBINARCH := 64
BUILDARCH := x64 BUILDARCH := x64
else else
MAINBINARCH :=
BUILDARCH := x32 BUILDARCH := x32
endif endif
@ -97,7 +95,7 @@ ifndef TARGET
TARGET := mame TARGET := mame
endif endif
MAINBIN := $(TARGET)$(MAINBINARCH)$(MAINBINVARIANT) MAINBIN := $(TARGET)$(MAINBINVARIANT)
BINDIR := build/$(PROJECTTYPE)/bin/$(BUILDARCH)/$(BUILDVARIANT) BINDIR := build/$(PROJECTTYPE)/bin/$(BUILDARCH)/$(BUILDVARIANT)
STAGEDIR := build/release/$(BUILDARCH)/$(BUILDVARIANT)/$(TARGET) STAGEDIR := build/release/$(BUILDARCH)/$(BUILDVARIANT)/$(TARGET)

28
scripts/src/main.lua
View File

@ -98,37 +98,13 @@ end
configuration "**/*" configuration "**/*"
flags { "DeploymentContent" } flags { "DeploymentContent" }
configuration { "x64", "Release" } configuration { "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 "" targetsuffix ""
if _OPTIONS["PROFILE"] then if _OPTIONS["PROFILE"] then
targetsuffix "p" targetsuffix "p"
end end
configuration { "x32", "Debug" } configuration { "Debug" }
targetsuffix "d"
if _OPTIONS["PROFILE"] then
targetsuffix "dp"
end
configuration { "Native", "Release" }
targetsuffix ""
if _OPTIONS["PROFILE"] then
targetsuffix "p"
end
configuration { "Native", "Debug" }
targetsuffix "d" targetsuffix "d"
if _OPTIONS["PROFILE"] then if _OPTIONS["PROFILE"] then
targetsuffix "dp" targetsuffix "dp"

28
scripts/src/tests.lua
View File

@ -21,37 +21,13 @@ project("mametests")
targetdir(MAME_DIR) targetdir(MAME_DIR)
end end
configuration { "x64", "Release" } configuration { "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 "" targetsuffix ""
if _OPTIONS["PROFILE"] then if _OPTIONS["PROFILE"] then
targetsuffix "p" targetsuffix "p"
end end
configuration { "x32", "Debug" } configuration { "Debug" }
targetsuffix "d"
if _OPTIONS["PROFILE"] then
targetsuffix "dp"
end
configuration { "Native", "Release" }
targetsuffix ""
if _OPTIONS["PROFILE"] then
targetsuffix "p"
end
configuration { "Native", "Debug" }
targetsuffix "d" targetsuffix "d"
if _OPTIONS["PROFILE"] then if _OPTIONS["PROFILE"] then
targetsuffix "dp" targetsuffix "dp"

23
src/osd/modules/debugger/win/debugviewinfo.cpp
View File

@ -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) void debugview_info::handle_context_menu(unsigned command)
{ {
switch (command) switch (command)
@ -709,6 +715,7 @@ bool debugview_info::process_context_menu(int x, int y)
} }
// show the context menu // show the context menu
update_context_menu(m_contextmenu);
BOOL const command(TrackPopupMenu( BOOL const command(TrackPopupMenu(
m_contextmenu, m_contextmenu,
(GetSystemMetrics(SM_MENUDROPALIGNMENT) ? TPM_RIGHTALIGN : TPM_LEFTALIGN) | TPM_LEFTBUTTON | TPM_NONOTIFY | TPM_RETURNCMD, (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 // mouse click
case WM_LBUTTONDOWN: case WM_LBUTTONDOWN:
case WM_MBUTTONDOWN:
{ {
debug_view_xy topleft = m_view->visible_position(); debug_view_xy topleft = m_view->visible_position();
debug_view_xy newpos; debug_view_xy newpos;
newpos.x = topleft.x + GET_X_LPARAM(lparam) / metrics().debug_font_width(); newpos.x = topleft.x + GET_X_LPARAM(lparam) / metrics().debug_font_width();
newpos.y = topleft.y + GET_Y_LPARAM(lparam) / metrics().debug_font_height(); 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); SetFocus(m_wnd);
break; 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 // horizontal scroll
case WM_HSCROLL: case WM_HSCROLL:
{ {

1
src/osd/modules/debugger/win/debugviewinfo.h
View File

@ -61,6 +61,7 @@ protected:
template <typename T> T *view() const { return downcast<T *>(m_view); } template <typename T> T *view() const { return downcast<T *>(m_view); }
virtual void add_items_to_context_menu(HMENU menu); virtual void add_items_to_context_menu(HMENU menu);
virtual void update_context_menu(HMENU menu);
virtual void handle_context_menu(unsigned command); virtual void handle_context_menu(unsigned command);
private: private: