From 2639c6a5ca2a727a94d59282531f580e195fe9c0 Mon Sep 17 00:00:00 2001 From: Yu-Chen Lin Date: Sat, 14 Dec 2019 14:34:49 +0800 Subject: [PATCH] Get env in windows correctly Signed-off-by: Yu-Chen Lin --- app/src/server.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/src/server.c b/app/src/server.c index ff167aeb..d81c6a30 100644 --- a/app/src/server.c +++ b/app/src/server.c @@ -11,6 +11,7 @@ #include "command.h" #include "util/log.h" #include "util/net.h" +#include "util/str_util.h" #define SOCKET_NAME "scrcpy" #define SERVER_FILENAME "scrcpy-server" @@ -20,7 +21,12 @@ static const char * get_server_path(void) { +#ifndef _WIN32 const char *server_path_env = getenv("SCRCPY_SERVER_PATH"); +#else + const wchar_t *wide_server_path_env = _wgetenv(L"SCRCPY_SERVER_PATH"); + char *server_path_env = utf8_from_wide_char(wide_server_path_env); +#endif if (server_path_env) { LOGD("Using SCRCPY_SERVER_PATH: %s", server_path_env); // if the envvar is set, use it