Merge tag 'mame0235' into mainline-master

MAME 0.235
mamedev · Aug 27, 2021 · 7000a52 · 7000a52
2 parents 81a6597 + ec9ba6f
commit 7000a52
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 7 deletions.
diff --git 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="234"
-      android:versionName="0.234"
+      android:versionCode="235"
+      android:versionName="0.235"
       android:installLocation="auto">
 
     <!-- OpenGL ES 2.0 -->

diff --git a/makefile b/makefile
@@ -1755,14 +1755,14 @@ endif
 
 ifeq (posix,$(SHELLTYPE))
 $(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS)
-	@echo '#define BARE_BUILD_VERSION "0.234"' > $@
+	@echo '#define BARE_BUILD_VERSION "0.235"' > $@
 	@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: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS)
-	@echo #define BARE_BUILD_VERSION "0.234" > $@
+	@echo #define BARE_BUILD_VERSION "0.235" > $@
 	@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/devices/sound/ks0164.cpp b/src/devices/sound/ks0164.cpp
@@ -421,7 +421,7 @@ u16 ks0164_device::uncomp_8_16(u8 value)
 	s16 o = (0x10 | (value & 0xf)) << 10;
 	o = o >> xp;
 	if(value & 0x10)
-	  o = -o;
+		o = -o;
 	return o;
 }
 

diff --git a/src/lib/netlist/plib/pfunction.cpp b/src/lib/netlist/plib/pfunction.cpp
@@ -11,7 +11,6 @@
 
 #include <array>
 #include <map>
-#include <map>
 #include <stack>
 #include <type_traits>
 #include <utility>

diff --git a/src/lib/util/zippath.cpp b/src/lib/util/zippath.cpp
@@ -48,14 +48,17 @@ int is_path_separator(char c)
 
 bool is_root(std::string_view path)
 {
-#if defined(OSD_WINDOWS)
+#if defined(WIN32)
+	// FIXME: don't assume paths are DOS-like - UNC paths, \\?\ long path prefix, etc. complicate this
+
 	// skip drive letter
 	if (path.length() >= 2 && isalpha(path[0]) && (path[1] == ':'))
 		path.remove_prefix(2);
 
 	// skip path separators
 	return path.find_first_not_of(PATH_SEPARATOR) == std::string_view::npos;
 #else
+	// FIXME: handle multiple successive path separators, current directory references, parent directory references
 	return (path.length() == 1) && (path[0] == '/');
 #endif
 }