diff options
-rw-r--r-- | android-project/app/src/main/AndroidManifest.xml | 4 | ||||
-rw-r--r-- | makefile | 4 | ||||
-rw-r--r-- | src/devices/sound/ks0164.cpp | 2 | ||||
-rw-r--r-- | src/lib/netlist/plib/pfunction.cpp | 1 | ||||
-rw-r--r-- | src/lib/util/zippath.cpp | 5 |
5 files changed, 9 insertions, 7 deletions
diff --git a/android-project/app/src/main/AndroidManifest.xml b/android-project/app/src/main/AndroidManifest.xml index 1c86e915138..9c3fb9d5c21 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="234" - android:versionName="0.234" + android:versionCode="235" + android:versionName="0.235" android:installLocation="auto"> <!-- OpenGL ES 2.0 --> @@ -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 index 8fdcbf026ba..3431c49c0f7 100644 --- 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 index f6b17941e0c..362615468e5 100644 --- 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 index f317319c8c3..9d2e51a6833 100644 --- a/src/lib/util/zippath.cpp +++ b/src/lib/util/zippath.cpp @@ -48,7 +48,9 @@ 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); @@ -56,6 +58,7 @@ bool is_root(std::string_view path) // 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 } |