20210118

ldcsaa · Jan 18, 2021 · 285f755 · 285f755
1 parent cc2629e
commit 285f755
Show file tree

Hide file tree

Showing 63 changed files with 1,171 additions and 947 deletions.
diff --git a/Linux/compile.sh b/Linux/compile.sh
@@ -259,8 +259,8 @@ parse_args()
 
 do_build()
 {
-	C_LAN_OPTS="-c -x c -I $DEPT_INC_DIR -Wall -Wswitch -Wno-deprecated-declarations -Wempty-body -Wconversion -Wreturn-type -Wparentheses -Wno-pointer-sign -Wno-format -Wuninitialized -Wunreachable-code -Wunused-function -Wunused-value -Wunused-variable -fno-strict-aliasing -fpic -fvisibility=hidden -fexceptions -std=c11"
-	CPP_LAN_OPTS="-c -x c++ -I $DEPT_INC_DIR -Wall -Wno-class-memaccess -Wno-reorder -Wswitch -Wno-deprecated-declarations -Wempty-body -Wconversion -Wreturn-type -Wparentheses -Wno-format -Wuninitialized -Wunreachable-code -Wunused-function -Wunused-value -Wunused-variable -fno-strict-aliasing -fpic -fthreadsafe-statics -fvisibility=hidden -fexceptions -frtti -std=c++14"
+	C_LAN_OPTS="-c -x c -I $DEPT_INC_DIR -Wall -Wswitch -Wno-deprecated-declarations -Wempty-body -Wconversion -Wreturn-type -Wparentheses -Wno-pointer-sign -Wno-format -Wuninitialized -Wunreachable-code -Wunused-function -Wunused-value -Wunused-variable -fno-strict-aliasing -fPIC -fvisibility=hidden -fexceptions -std=c11"
+	CPP_LAN_OPTS="-c -x c++ -I $DEPT_INC_DIR -Wall -Wno-class-memaccess -Wno-reorder -Wswitch -Wno-deprecated-declarations -Wempty-body -Wconversion -Wreturn-type -Wparentheses -Wno-format -Wuninitialized -Wunreachable-code -Wunused-function -Wunused-value -Wunused-variable -fno-strict-aliasing -fPIC -fthreadsafe-statics -fvisibility=hidden -fexceptions -frtti -std=c++14"
 	LINK_OPTS="-Wl,--no-undefined -Wl,-L$DEPT_LIB_DIR -L$DEPT_LIB_DIR -Wl,-z,relro -Wl,-z,now -Wl,-z,noexecstack -shared -Wl,-Bsymbolic"
 	RELEASE_CFG_OPTS="-g0 -O3 -fomit-frame-pointer -DNDEBUG"
 	DEBUG_CFG_OPTS="-g2 -gdwarf-2 -O0 -fno-omit-frame-pointer -DDEBUG -D_DEBUG"

diff --git a/Linux/demo/Android.mk b/Linux/demo/Android.mk
@@ -6,7 +6,7 @@ DEPT_LIB_PATH := $(DEPT_PATH)/lib
 HP_LIB_PATH   := $(LOCAL_PATH)/../lib/android-ndk/$(TARGET_ARCH_ABI)
 
 MY_C_INCLUDES := $(LOCAL_PATH)/../include
-MY_CFLAGS     := -w -fpic -fvisibility=hidden -fno-strict-aliasing -Wall -Wextra -Wswitch -Wno-deprecated-declarations -Wno-empty-body -Wno-conversion -Wno-sign-conversion -Wno-sign-compare -Wreturn-type -Wparentheses -Wno-pointer-sign -Wno-format -Wno-missing-braces -Wuninitialized -Wunreachable-code -Wunused-function -Wunused-value -Wunused-variable -Wno-unused-parameter -Wno-missing-field-initializers
+MY_CFLAGS     := -w -fPIC -fvisibility=hidden -fno-strict-aliasing -Wall -Wextra -Wswitch -Wno-deprecated-declarations -Wno-empty-body -Wno-conversion -Wno-sign-conversion -Wno-sign-compare -Wreturn-type -Wparentheses -Wno-pointer-sign -Wno-format -Wno-missing-braces -Wuninitialized -Wunreachable-code -Wunused-function -Wunused-value -Wunused-variable -Wno-unused-parameter -Wno-missing-field-initializers
 MY_CPPFLAGS   := -fexceptions -frtti -fthreadsafe-statics -Wno-reorder -Wno-inconsistent-missing-override
 MY_LDFLAGS    := -Wl,--no-undefined -Wl,-z,relro -Wl,-z,now -Wl,-z,noexecstack -Wl,-Bsymbolic
 MY_WHOLE_STATIC_LIBRARIES := ssl crypto iconv

diff --git a/Linux/include/hpsocket/HPTypeDef.h b/Linux/include/hpsocket/HPTypeDef.h
@@ -29,7 +29,7 @@
 #define HP_VERSION_MAJOR	5	// 主版本号
 #define HP_VERSION_MINOR	8	// 子版本号
 #define HP_VERSION_REVISE	1	// 修正版本号
-#define HP_VERSION_BUILD	1	// 构建编号
+#define HP_VERSION_BUILD	2	// 构建编号
 
 //#define _UDP_DISABLED			// 禁用 UDP
 //#define _SSL_DISABLED			// 禁用 SSL

diff --git a/Linux/project/Version.props b/Linux/project/Version.props
@@ -5,7 +5,7 @@
     <VER_MAJOR>5</VER_MAJOR>
     <VER_MINOR>8</VER_MINOR>
     <VER_REVISE>1</VER_REVISE>
-    <VER_BUILD>1</VER_BUILD>
+    <VER_BUILD>2</VER_BUILD>
   </PropertyGroup>
   <PropertyGroup />
   <ItemDefinitionGroup />

diff --git a/Linux/project/android-ndk/jni/Android.mk b/Linux/project/android-ndk/jni/Android.mk
@@ -89,7 +89,7 @@ MY_SRC_FILES := ../../../src/common/BufferPool.cpp \
                 ../../../src/UdpClient.cpp \
                 ../../../src/UdpServer.cpp
 MY_C_INCLUDES := ../../../src
-MY_CFLAGS     := -fpic -fvisibility=hidden -fno-strict-aliasing -Wall -Wextra -Wswitch -Wno-deprecated-declarations -Wno-empty-body -Wno-conversion -Wno-sign-conversion -Wno-sign-compare -Wreturn-type -Wparentheses -Wno-pointer-sign -Wno-format -Wno-missing-braces -Wuninitialized -Wunreachable-code -Wunused-function -Wunused-value -Wunused-variable -Wno-unused-parameter -Wno-missing-field-initializers
+MY_CFLAGS     := -fPIC -fvisibility=hidden -fno-strict-aliasing -Wall -Wextra -Wswitch -Wno-deprecated-declarations -Wno-empty-body -Wno-conversion -Wno-sign-conversion -Wno-sign-compare -Wreturn-type -Wparentheses -Wno-pointer-sign -Wno-format -Wno-missing-braces -Wuninitialized -Wunreachable-code -Wunused-function -Wunused-value -Wunused-variable -Wno-unused-parameter -Wno-missing-field-initializers
 MY_CPPFLAGS   := -fexceptions -frtti -fthreadsafe-statics -Wno-reorder -Wno-inconsistent-missing-override
 MY_LDFLAGS    := -Wl,--no-undefined -Wl,-z,relro -Wl,-z,now -Wl,-z,noexecstack -Wl,-Bsymbolic
 MY_LDLIBS     := -ldl