Merge branch 'main' of http://116.236.50.103:8789/Huijue-Network/emsApplication

2024-11-25 11:24:27 +08:00 · 2024-11-25 11:24:27 +08:00 · c3cd98bf82
parent 23eb2f89a8 e30be08198
commit c3cd98bf82
3 changed files with 6 additions and 0 deletions
--- a/.gitignore
+++ b/.gitignore
@ -27,3 +27,8 @@
 /sdk/include/mysql.9
 /sdk/include/openssl
 /sdk/bin
+/applications/ems_datahubs/logs
+/applications/emsConfigurer/debug
+/applications/emsConfigurer/logs
+/applications/emsConfigurer/release
+/applications/emsConfigurer/*.qtvscr
--- a/3rdPartner/libhv/CMakeLists.txt
+++ b/3rdPartner/libhv/CMakeLists.txt
@ -52,6 +52,7 @@ if(IOS)
    set(BUILD_EXAMPLES OFF)
 endif()

+set(CMAKE_DEBUG_POSTFIX "d")
 set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake;${CMAKE_MODULE_PATH}")
 include(utils)
 include(vars)
--- a/3rdPartner/zlib-1.3.1.tar.gz
+++ b/3rdPartner/zlib-1.3.1.tar.gz