Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-06-07 05:13:46 +03:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge tag 'mame0179'

Browse Source 
Tag for 0.179
This commit is contained in:
Vas Crabb 2016-10-26 11:43:18 +11:00
commit 0671e2c044
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
android-project/app/src/main/AndroidManifest.xml
View File

@ -4,8 +4,8 @@
--> -->
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.mamedev.mame" package="org.mamedev.mame"
android:versionCode="178" android:versionCode="179"
android:versionName="0.178" android:versionName="0.179"
android:installLocation="auto"> android:installLocation="auto">
<!-- Android 4.0 --> <!-- Android 4.0 -->

4
makefile
View File

@ -1464,14 +1464,14 @@ endif
ifeq (posix,$(SHELLTYPE)) ifeq (posix,$(SHELLTYPE))
$(GENDIR)/version.cpp: $(GENDIR)/git_desc | $(GEN_FOLDERS) $(GENDIR)/version.cpp: $(GENDIR)/git_desc | $(GEN_FOLDERS)
@echo '#define BARE_BUILD_VERSION "0.178"' > $@ @echo '#define BARE_BUILD_VERSION "0.179"' > $@
@echo 'extern const char bare_build_version[];' >> $@ @echo 'extern const char bare_build_version[];' >> $@
@echo 'extern const char build_version[];' >> $@ @echo 'extern const char build_version[];' >> $@
@echo 'const char bare_build_version[] = BARE_BUILD_VERSION;' >> $@ @echo 'const char bare_build_version[] = BARE_BUILD_VERSION;' >> $@
@echo 'const char build_version[] = BARE_BUILD_VERSION " ($(NEW_GIT_VERSION))";' >> $@ @echo 'const char build_version[] = BARE_BUILD_VERSION " ($(NEW_GIT_VERSION))";' >> $@
else else
$(GENDIR)/version.cpp: $(GENDIR)/git_desc $(GENDIR)/version.cpp: $(GENDIR)/git_desc
@echo #define BARE_BUILD_VERSION "0.178" > $@ @echo #define BARE_BUILD_VERSION "0.179" > $@
@echo extern const char bare_build_version[]; >> $@ @echo extern const char bare_build_version[]; >> $@
@echo extern const char build_version[]; >> $@ @echo extern const char build_version[]; >> $@
@echo const char bare_build_version[] = BARE_BUILD_VERSION; >> $@ @echo const char bare_build_version[] = BARE_BUILD_VERSION; >> $@

2
src/osd/sdl/window.cpp
View File

@ -298,7 +298,7 @@ void sdl_window_info::toggle_full_screen()
machine().ui().menu_reset(); machine().ui().menu_reset();
// kill off the drawers // kill off the drawers
renderer_reset(); renderer_reset();
// set_platform_window(nullptr); // set_platform_window(nullptr);
bool is_osx = false; bool is_osx = false;
#ifdef SDLMAME_MACOSX #ifdef SDLMAME_MACOSX
// FIXME: This is weird behaviour and certainly a bug in SDL // FIXME: This is weird behaviour and certainly a bug in SDL