Merge remote-tracking branch 'origin/master' into input-overhaul

2018-01-28 14:44:54 +01:00 · 2018-01-28 14:44:54 +01:00 · fb32b96456
parent 94385e865f 002b373361
commit fb32b96456
1 changed files with 2 additions and 0 deletions
--- a/makepanda/makepandacore.py
+++ b/makepanda/makepandacore.py
@ -296,6 +296,8 @@ def GetHost():
            osname = subprocess.check_output(["uname", "-o"])
            if osname.strip().lower() == b'android':
                return 'android'
+            else:
+                return 'linux'
        except:
            return 'linux'
    elif sys.platform.startswith('freebsd'):