diff --git a/.gitignore b/.gitignore index ae106da..9021a47 100644 --- a/.gitignore +++ b/.gitignore @@ -48,7 +48,7 @@ __pycache__ /external/libuv /client/tools/putty /client/tools/winscp - +/client/tp_assist_macos/DerivedData # for dist folder **/_tmp_ @@ -72,3 +72,4 @@ __pycache__ /client/tp_rdp /server/tp_core/protocol/rdp /client/tools/tprdp +/client/tp_assist_macos diff --git a/common/libex/include/ex/ex_path.h b/common/libex/include/ex/ex_path.h index 81331aa..2aa8997 100644 --- a/common/libex/include/ex/ex_path.h +++ b/common/libex/include/ex/ex_path.h @@ -1,9 +1,9 @@ #ifndef __LIB_EX_PATH_H__ #define __LIB_EX_PATH_H__ -#include -#include -#include +#include "ex_platform.h" +#include "ex_types.h" +#include "ex_str.h" // fix `in_path` for current platform. // must use ex_free() to release returned value. diff --git a/common/libex/include/ex/ex_platform.h b/common/libex/include/ex/ex_platform.h index 67e0150..55a463a 100644 --- a/common/libex/include/ex/ex_platform.h +++ b/common/libex/include/ex/ex_platform.h @@ -66,6 +66,9 @@ #endif #ifdef EX_OS_MACOS # include // for _NSGetExecutablePath +# ifndef _T +# define _T(x) L##x +# endif #endif diff --git a/common/libex/include/ex/ex_thread.h b/common/libex/include/ex/ex_thread.h index 8c78c8c..9c66e35 100644 --- a/common/libex/include/ex/ex_thread.h +++ b/common/libex/include/ex/ex_thread.h @@ -1,7 +1,7 @@ #ifndef __EX_THREAD_H__ #define __EX_THREAD_H__ -#include +#include "ex_str.h" #include diff --git a/common/libex/include/ex/ex_util.h b/common/libex/include/ex/ex_util.h index f98918a..5dedb2f 100644 --- a/common/libex/include/ex/ex_util.h +++ b/common/libex/include/ex/ex_util.h @@ -1,8 +1,8 @@ #ifndef __LIB_EX_UTIL_H__ #define __LIB_EX_UTIL_H__ -#include -#include +#include "ex_types.h" +#include "ex_str.h" #ifdef EX_OS_WIN32 # include diff --git a/common/libex/src/ex_path.cpp b/common/libex/src/ex_path.cpp index b192845..8a665bc 100644 --- a/common/libex/src/ex_path.cpp +++ b/common/libex/src/ex_path.cpp @@ -185,7 +185,8 @@ bool ex_exec_file(ex_wstr& out_filename) if (!ex_astr2wstr(buffer, out_filename)) return false; - return ex_abspath(out_filename); + //return ex_abspath(out_filename); + return true; #else char buffer[EX_PATH_MAX];