aboutsummaryrefslogtreecommitdiff
path: root/drivers/unix
diff options
context:
space:
mode:
authorRémi Verschelde2016-12-08 07:46:37 +0100
committerGitHub2016-12-08 07:46:37 +0100
commit24a440a34f0b83c6e385f08b9254fde8064a941a (patch)
tree4c39e0eee0478179df82780d43f60f9639076781 /drivers/unix
parenta3582fa3cb11c785ecf61dd2b04656473864b27e (diff)
parent5ede1a1226edada5cf3825801a0e8b0d32809e74 (diff)
downloadgodot-24a440a34f0b83c6e385f08b9254fde8064a941a.tar.gz
godot-24a440a34f0b83c6e385f08b9254fde8064a941a.tar.zst
godot-24a440a34f0b83c6e385f08b9254fde8064a941a.zip
Merge pull request #7239 from eska014/2.1-asmjs
Backport web export changes for 2.1
Diffstat (limited to 'drivers/unix')
-rw-r--r--drivers/unix/os_unix.cpp3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/unix/os_unix.cpp b/drivers/unix/os_unix.cpp
index fd515d6dd..72582837e 100644
--- a/drivers/unix/os_unix.cpp
+++ b/drivers/unix/os_unix.cpp
@@ -522,9 +522,6 @@ String OS_Unix::get_executable_path() const {
delete[] resolved_path;
return path;
-#elif defined(EMSCRIPTEN)
- // We return nothing
- return String();
#else
ERR_PRINT("Warning, don't know how to obtain executable path on this OS! Please override this function properly.");
return OS::get_executable_path();