From 5b30dc8f47d1f8ed6b0c158e95c299532c945a94 Mon Sep 17 00:00:00 2001
From: apexliu <apex.liu@qq.com>
Date: Wed, 12 Apr 2017 11:02:03 +0000
Subject: [PATCH] build rdp on linux.

---
 build/.idea/build.iml              | 2 +-
 build/builder/build-external.py    | 4 ++--
 common/libex/include/ex/ex_types.h | 2 +-
 common/libex/src/ex_str.cpp        | 6 +++---
 server/CMakeLists.txt              | 2 ++
 5 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/build/.idea/build.iml b/build/.idea/build.iml
index 9081e23..8a94704 100644
--- a/build/.idea/build.iml
+++ b/build/.idea/build.iml
@@ -2,7 +2,7 @@
 <module type="PYTHON_MODULE" version="4">
   <component name="NewModuleRootManager">
     <content url="file://$MODULE_DIR$/builder" />
-    <orderEntry type="jdk" jdkName="py" jdkType="Python SDK" />
+    <orderEntry type="jdk" jdkName="py34" jdkType="Python SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
   <component name="TestRunnerService">
diff --git a/build/builder/build-external.py b/build/builder/build-external.py
index 682db81..fdd9447 100644
--- a/build/builder/build-external.py
+++ b/build/builder/build-external.py
@@ -326,7 +326,7 @@ class BuilderLinux(BuilderBase):
         old_p = os.getcwd()
         os.chdir(self.LIBUV_PATH_SRC)
         os.system('sh autogen.sh')
-        os.system('./configure --prefix={}'.format(self.PATH_RELEASE))
+        os.system('./configure --prefix={} --with-pic'.format(self.PATH_RELEASE))
         os.system('make')
         os.system('make install')
         os.chdir(old_p)
@@ -411,7 +411,7 @@ class BuilderLinux(BuilderBase):
 
         old_p = os.getcwd()
         os.chdir(self.MBEDTLS_PATH_SRC)
-        os.system('make lib')
+        os.system('make CFLAGS="-fPIC" lib')
         os.system('make install')
         os.chdir(old_p)
 
diff --git a/common/libex/include/ex/ex_types.h b/common/libex/include/ex/ex_types.h
index 61fa4ca..0187b0a 100644
--- a/common/libex/include/ex/ex_types.h
+++ b/common/libex/include/ex/ex_types.h
@@ -20,7 +20,7 @@ typedef wchar_t ex_utf16;
 #else
 typedef unsigned long long ex_u64;
 typedef signed long long ex_i64;
-typedef ex_u16 ex_utf16;
+typedef ex_i16 ex_utf16;
 #endif
 
 typedef int EX_BOOL;
diff --git a/common/libex/src/ex_str.cpp b/common/libex/src/ex_str.cpp
index 93a828f..560d6df 100644
--- a/common/libex/src/ex_str.cpp
+++ b/common/libex/src/ex_str.cpp
@@ -381,9 +381,9 @@ ex_wstr& ex_replace_all(ex_wstr& str, const ex_wstr& old_value, const ex_wstr& n
 
 #ifndef EX_OS_WIN32
 
-// #define BYTE ts_u8
-// #define DWORD ts_u32
-// #define WCHAR ts_u16
+#define BYTE ex_u8
+#define DWORD ex_u32
+#define WCHAR ex_i16
 #define LPWSTR WCHAR*
 #define BOOL int
 #define TRUE 1
diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt
index 2b60b04..5733eb9 100644
--- a/server/CMakeLists.txt
+++ b/server/CMakeLists.txt
@@ -10,3 +10,5 @@ cmake_minimum_required(VERSION 3.5)
 add_subdirectory(tp_web/src)
 add_subdirectory(tp_core/core)
 add_subdirectory(tp_core/protocol/ssh)
+add_subdirectory(tp_core/protocol/rdp)
+