summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2018-12-26 06:11:07 +1100
committer Vas Crabb <vas@vastheman.com>2018-12-26 06:11:07 +1100
commit95538b9da8cdb85687784ad723d1a4efb2d631a1 (patch)
treef4377f1e7fa2644227c3232bb8afefcc0f612841
parentd3b3fafe4da5cd6eebb3853ad3d8fe4b547339a8 (diff)
parentb691c38273deb3231443e2a8ececd8a29dda8e62 (diff)
Merge tag 'mame0205'
MAME 0.205
-rw-r--r--android-project/app/src/main/AndroidManifest.xml4
-rw-r--r--makefile4
-rw-r--r--src/osd/modules/debugger/debugqt.cpp24
3 files changed, 19 insertions, 13 deletions
diff --git a/android-project/app/src/main/AndroidManifest.xml b/android-project/app/src/main/AndroidManifest.xml
index 88d23efaeb1..63576631b81 100644
--- a/android-project/app/src/main/AndroidManifest.xml
+++ b/android-project/app/src/main/AndroidManifest.xml
@@ -4,8 +4,8 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.mamedev.mame"
- android:versionCode="204"
- android:versionName="0.204"
+ android:versionCode="205"
+ android:versionName="0.205"
android:installLocation="auto">
<!-- OpenGL ES 2.0 -->
diff --git a/makefile b/makefile
index 11b5a3a27b1..573ebbba22e 100644
--- a/makefile
+++ b/makefile
@@ -1608,14 +1608,14 @@ endif
ifeq (posix,$(SHELLTYPE))
$(GENDIR)/version.cpp: $(GENDIR)/git_desc | $(GEN_FOLDERS)
- @echo '#define BARE_BUILD_VERSION "0.204"' > $@
+ @echo '#define BARE_BUILD_VERSION "0.205"' > $@
@echo 'extern const char bare_build_version[];' >> $@
@echo 'extern const char build_version[];' >> $@
@echo 'const char bare_build_version[] = BARE_BUILD_VERSION;' >> $@
@echo 'const char build_version[] = BARE_BUILD_VERSION " ($(NEW_GIT_VERSION))";' >> $@
else
$(GENDIR)/version.cpp: $(GENDIR)/git_desc
- @echo #define BARE_BUILD_VERSION "0.204" > $@
+ @echo #define BARE_BUILD_VERSION "0.205" > $@
@echo extern const char bare_build_version[]; >> $@
@echo extern const char build_version[]; >> $@
@echo const char bare_build_version[] = BARE_BUILD_VERSION; >> $@
diff --git a/src/osd/modules/debugger/debugqt.cpp b/src/osd/modules/debugger/debugqt.cpp
index c138aa074aa..9156fd31c16 100644
--- a/src/osd/modules/debugger/debugqt.cpp
+++ b/src/osd/modules/debugger/debugqt.cpp
@@ -59,15 +59,19 @@ private:
running_machine *m_machine;
};
+
+namespace {
+
//============================================================
// "Global" variables to make QT happy
//============================================================
-int qtArgc = 0;
-char** qtArgv = nullptr;
+int qtArgc = 1;
+char qtArg0[] = "mame";
+char *qtArgv[] = { qtArg0, nullptr };
bool oneShot = true;
-static MainWindow* mainQtWindow = nullptr;
+MainWindow *mainQtWindow = nullptr;
//============================================================
// XML configuration save/load
@@ -77,7 +81,7 @@ static MainWindow* mainQtWindow = nullptr;
std::vector<WindowQtConfig*> xmlConfigurations;
-static void xml_configuration_load(running_machine &machine, config_type cfg_type, util::xml::data_node const *parentnode)
+ void xml_configuration_load(running_machine &machine, config_type cfg_type, util::xml::data_node const *parentnode)
{
// We only care about game files
if (cfg_type != config_type::GAME)
@@ -112,7 +116,7 @@ static void xml_configuration_load(running_machine &machine, config_type cfg_typ
}
-static void xml_configuration_save(running_machine &machine, config_type cfg_type, util::xml::data_node *parentnode)
+void xml_configuration_save(running_machine &machine, config_type cfg_type, util::xml::data_node *parentnode)
{
// We only write to game configurations
if (cfg_type != config_type::GAME)
@@ -133,7 +137,7 @@ static void xml_configuration_save(running_machine &machine, config_type cfg_typ
}
-static void gather_save_configurations()
+void gather_save_configurations()
{
for (int i = 0; i < xmlConfigurations.size(); i++)
delete xmlConfigurations[i];
@@ -173,7 +177,7 @@ static void gather_save_configurations()
// Utilities
//============================================================
-static void load_and_clear_main_window_config(std::vector<WindowQtConfig*>& configList)
+void load_and_clear_main_window_config(std::vector<WindowQtConfig*>& configList)
{
for (int i = 0; i < configList.size(); i++)
{
@@ -188,7 +192,7 @@ static void load_and_clear_main_window_config(std::vector<WindowQtConfig*>& conf
}
-static void setup_additional_startup_windows(running_machine& machine, std::vector<WindowQtConfig*>& configList)
+void setup_additional_startup_windows(running_machine& machine, std::vector<WindowQtConfig*>& configList)
{
for (int i = 0; i < configList.size(); i++)
{
@@ -217,7 +221,7 @@ static void setup_additional_startup_windows(running_machine& machine, std::vect
}
-static void bring_main_window_to_front()
+void bring_main_window_to_front()
{
foreach (QWidget* widget, QApplication::topLevelWidgets())
{
@@ -228,6 +232,8 @@ static void bring_main_window_to_front()
}
}
+} // anonymous namespace
+
//============================================================
// Core functionality