From db8a939c0e07a12d7af1b77ce74dc5f706ee679e Mon Sep 17 00:00:00 2001 From: qyt <486179@qq.com> Date: Sat, 22 Jan 2022 10:29:58 +0800 Subject: [PATCH 1/6] fixed:linux build error and warn --- XEngine_Source/StorageModule_Session/pch.h | 2 +- .../XStorage_SQLPacket/XStorage_SQLHelp/XStorage_SQLHelp.cpp | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/XEngine_Source/StorageModule_Session/pch.h b/XEngine_Source/StorageModule_Session/pch.h index 05b469c..65eb4cd 100644 --- a/XEngine_Source/StorageModule_Session/pch.h +++ b/XEngine_Source/StorageModule_Session/pch.h @@ -11,6 +11,7 @@ // 添加要在此处预编译的标头 #include "framework.h" #include +#include #else #include #endif @@ -20,7 +21,6 @@ #include #include #include -#include #include #include #include diff --git a/XEngine_Source/XEngine_StorageComponents/XStorage_SQLPacket/XStorage_SQLHelp/XStorage_SQLHelp.cpp b/XEngine_Source/XEngine_StorageComponents/XStorage_SQLPacket/XStorage_SQLHelp/XStorage_SQLHelp.cpp index 4085548..938e69a 100644 --- a/XEngine_Source/XEngine_StorageComponents/XStorage_SQLPacket/XStorage_SQLHelp/XStorage_SQLHelp.cpp +++ b/XEngine_Source/XEngine_StorageComponents/XStorage_SQLPacket/XStorage_SQLHelp/XStorage_SQLHelp.cpp @@ -163,7 +163,6 @@ BOOL CXStorage_SQLHelp::XStorage_SQLHelp_Query(TCHAR* ptszSQLBuffer, LPCTSTR lps { XStorage_IsErrorOccur = FALSE; - BOOL bInit = FALSE; TCHAR tszSQLQuery[1024]; memset(tszSQLQuery, '\0', sizeof(tszSQLQuery)); -- Gitee From 3567af17a2c229fe8599e313eb9faac68743fa93 Mon Sep 17 00:00:00 2001 From: qyt <486179@qq.com> Date: Sat, 22 Jan 2022 10:36:23 +0800 Subject: [PATCH 2/6] fixed:linux build --- .../StorageModule_APIHelp/APIHelp_Api/APIHelp_Api.cpp | 1 - XEngine_Source/XEngine_StorageApp/Makefile | 6 ++---- XEngine_Source/XEngine_StorageApp/StorageApp_Hdr.h | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/XEngine_Source/StorageModule_APIHelp/APIHelp_Api/APIHelp_Api.cpp b/XEngine_Source/StorageModule_APIHelp/APIHelp_Api/APIHelp_Api.cpp index 5d73f92..d717a21 100644 --- a/XEngine_Source/StorageModule_APIHelp/APIHelp_Api/APIHelp_Api.cpp +++ b/XEngine_Source/StorageModule_APIHelp/APIHelp_Api/APIHelp_Api.cpp @@ -54,7 +54,6 @@ BOOL CAPIHelp_Api::APIHelp_Api_ProxyAuth(TCHAR* ptszUser, TCHAR* ptszPass, TCHAR { APIHelp_IsErrorOccur = FALSE; - int nSDLen = 1024; int nAuthType = 0; int nAuthLen = MAX_PATH; diff --git a/XEngine_Source/XEngine_StorageApp/Makefile b/XEngine_Source/XEngine_StorageApp/Makefile index 92debd5..0dea35c 100644 --- a/XEngine_Source/XEngine_StorageApp/Makefile +++ b/XEngine_Source/XEngine_StorageApp/Makefile @@ -5,7 +5,7 @@ LOADBIN = -L /usr/local/lib/XEngine_Release/XEngine_BaseLib -L /usr/local/lib/XE LIB = -lXEngine_BaseLib -lXEngine_Algorithm -lXEngine_Core -lXEngine_ManagePool -lXEngine_NetXApi -lXEngine_OPenSsl -lXEngine_ProcFile -lXEngine_SystemApi -lHelpComponents_XLog -lHelpComponents_Packets -lRfcComponents_HttpServer -lNetHelp_APIHelp -lXStorage_SQLPacket -lXStorage_P2XPPeer -lStorageModule_Config -lStorageModule_Session -lStorageModule_APIHelp -lStorageModule_Protocol LIBEX = -static-libgcc -ldl -lrt -lpthread LOADSO = -Wl,-rpath=./,--disable-new-dtags -LIBINCLUDE = StorageApp_Config.o StorageApp_Download.o StorageApp_Network.o StorageApp_Center.o StorageApp_UPLoader.o StorageApp_P2XPNet.o Storage_APPHelp.o Storage_TaskPass.o Storage_TaskManage.o Storage_TaskP2p.o XEngine_StorageApp.o +LIBINCLUDE = StorageApp_Config.o StorageApp_Download.o StorageApp_Network.o StorageApp_Center.o StorageApp_UPLoader.o StorageApp_P2XPNet.o Storage_TaskPass.o Storage_TaskManage.o Storage_TaskP2p.o XEngine_StorageApp.o ifeq ($(RELEASE),1) FLAGS = -c -O2 @@ -36,9 +36,7 @@ StorageApp_UPLoader.o:./StorageApp_UPLoader.cpp $(CC) $(DEBUG) $(FLAGS) $(UNICODE) ./StorageApp_UPLoader.cpp StorageApp_P2XPNet.o:./StorageApp_P2XPNet.cpp $(CC) $(DEBUG) $(FLAGS) $(UNICODE) ./StorageApp_P2XPNet.cpp - -Storage_APPHelp.o:./Storage_APPHelp/Storage_APPHelp.cpp - $(CC) $(DEBUG) $(FLAGS) $(UNICODE) ./Storage_APPHelp/Storage_APPHelp.cpp + Storage_TaskPass.o:./Storage_APPTask/Storage_TaskPass.cpp $(CC) $(DEBUG) $(FLAGS) $(UNICODE) ./Storage_APPTask/Storage_TaskPass.cpp Storage_TaskManage.o:./Storage_APPTask/Storage_TaskManage.cpp diff --git a/XEngine_Source/XEngine_StorageApp/StorageApp_Hdr.h b/XEngine_Source/XEngine_StorageApp/StorageApp_Hdr.h index 560b6ea..d5bbe8e 100644 --- a/XEngine_Source/XEngine_StorageApp/StorageApp_Hdr.h +++ b/XEngine_Source/XEngine_StorageApp/StorageApp_Hdr.h @@ -5,7 +5,6 @@ #include #include #include -#include #include #include #include @@ -14,6 +13,7 @@ #ifdef _WINDOWS #include #include +#include #else #include #include -- Gitee From 5829f126de6f26d5d6a9869da9ea22a195669baa Mon Sep 17 00:00:00 2001 From: qyt <486179@qq.com> Date: Sat, 22 Jan 2022 11:33:31 +0800 Subject: [PATCH 3/6] fixed:not send result when get upload storagekey name failed --- XEngine_Source/XEngine_StorageApp/StorageApp_UPLoader.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/XEngine_Source/XEngine_StorageApp/StorageApp_UPLoader.cpp b/XEngine_Source/XEngine_StorageApp/StorageApp_UPLoader.cpp index 086ebbb..99fca49 100644 --- a/XEngine_Source/XEngine_StorageApp/StorageApp_UPLoader.cpp +++ b/XEngine_Source/XEngine_StorageApp/StorageApp_UPLoader.cpp @@ -148,6 +148,11 @@ BOOL XEngine_Task_HttpUPLoader(LPCTSTR lpszClientAddr, LPCTSTR lpszMsgBuffer, in if (!APIHelp_Distributed_UPStorage(pSt_HTTPParam->tszHttpUri, st_LoadbalanceCfg.st_LoadBalance.pStl_ListBucket, &st_StorageBucket, st_LoadbalanceCfg.st_LBLocation.nUPLoadMode)) { + st_HDRParam.bIsClose = TRUE; + st_HDRParam.nHttpCode = 413; + + RfcComponents_HttpServer_SendMsgEx(xhUPHttp, tszSDBuffer, &nSDLen, &st_HDRParam); + XEngine_Net_SendMsg(lpszClientAddr, tszSDBuffer, nSDLen, STORAGE_NETTYPE_HTTPUPLOADER); XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _T("上传客户端:%s,请求上传文件失败,可能BUCKET:% 不正确,错误：%lX"), lpszClientAddr, pSt_HTTPParam->tszHttpUri, APIHelp_GetLastError()); return FALSE; } -- Gitee From 0d231c5e4ae5aed775064bc261623d665bd119eb Mon Sep 17 00:00:00 2001 From: qyt <486179@qq.com> Date: Mon, 24 Jan 2022 09:46:58 +0800 Subject: [PATCH 4/6] fixed:Specifying the bucket name does not handle problem of space size --- .../APIHelp_Distributed.cpp | 19 +++++++++++++++++++ .../StorageModule_APIHelp/APIHelp_Error.h | 3 ++- .../StorageApp_Download.cpp | 1 - 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/XEngine_Source/StorageModule_APIHelp/APIHelp_Distributed/APIHelp_Distributed.cpp b/XEngine_Source/StorageModule_APIHelp/APIHelp_Distributed/APIHelp_Distributed.cpp index a72bdd5..0b784e7 100644 --- a/XEngine_Source/StorageModule_APIHelp/APIHelp_Distributed/APIHelp_Distributed.cpp +++ b/XEngine_Source/StorageModule_APIHelp/APIHelp_Distributed/APIHelp_Distributed.cpp @@ -257,6 +257,25 @@ BOOL CAPIHelp_Distributed::APIHelp_Distributed_UPStorage(LPCTSTR lpszMsgBuffer, { return FALSE; } + //жĿ¼СǷ + int nListCount = 0; + __int64u nDirCount = 0; //ǰĿ¼С + CHAR** ppListFile; + SystemApi_File_EnumFile(pSt_StorageBucket->tszFilePath, &ppListFile, &nListCount, NULL, NULL, TRUE, 1); + for (int j = 0; j < nListCount; j++) + { + struct __stat64 st_FStat; + _stat64(ppListFile[j], &st_FStat); + nDirCount += st_FStat.st_size; + } + BaseLib_OperatorMemory_Free((XPPPMEM)&ppListFile, nListCount); + //ǰĿ¼С趨ĴС. + if (nDirCount >= APIHelp_Distributed_GetSize(pSt_StorageBucket->tszBuckSize)) + { + APIHelp_IsErrorOccur = TRUE; + APIHelp_dwErrorCode = ERROR_STORAGE_MODULE_APIHELP_SIZE; + return FALSE; + } } else { diff --git a/XEngine_Source/StorageModule_APIHelp/APIHelp_Error.h b/XEngine_Source/StorageModule_APIHelp/APIHelp_Error.h index aa66fd1..59f3959 100644 --- a/XEngine_Source/StorageModule_APIHelp/APIHelp_Error.h +++ b/XEngine_Source/StorageModule_APIHelp/APIHelp_Error.h @@ -18,4 +18,5 @@ #define ERROR_STORAGE_MODULE_APIHELP_NOTLENGTH 0x0030012 //没有长度信息 #define ERROR_STORAGE_MODULE_APIHELP_PARSELEN 0x0030013 //解析长度失败 #define ERROR_STORAGE_MODULE_APIHELP_NOTHASH 0x0030014 //没有HASH值 -#define ERROR_STORAGE_MODULE_APIHELP_NOTMATCH 0x0030015 //HASH不匹配 \ No newline at end of file +#define ERROR_STORAGE_MODULE_APIHELP_NOTMATCH 0x0030015 //HASH不匹配 +#define ERROR_STORAGE_MODULE_APIHELP_SIZE 0x0030016 //目录大小已经满了 \ No newline at end of file diff --git a/XEngine_Source/XEngine_StorageApp/StorageApp_Download.cpp b/XEngine_Source/XEngine_StorageApp/StorageApp_Download.cpp index 8106562..a98ed28 100644 --- a/XEngine_Source/XEngine_StorageApp/StorageApp_Download.cpp +++ b/XEngine_Source/XEngine_StorageApp/StorageApp_Download.cpp @@ -64,7 +64,6 @@ void CALLBACK XEngine_Download_CBSend(LPCSTR lpszClientAddr, SOCKET hSocket, LPV memset(&st_StorageInfo, '\0', sizeof(SESSION_STORAGEINFO)); Session_DLStroage_GetInfo(lpszClientAddr, &st_StorageInfo); - Protocol_StoragePacket_UPDown(tszProxyStr, &nPLen, st_StorageInfo.tszFileDir, st_StorageInfo.tszBuckKey, st_StorageInfo.tszClientAddr, st_StorageInfo.ullRWCount, TRUE, st_StorageInfo.tszFileHash); if (APIHelp_HttpRequest_Post(st_ServiceCfg.st_XProxy.st_XProxyPass.tszDLPass, tszProxyStr, &nHttpCode)) { -- Gitee From b28fe55812e731a4bb4c944f4ea14d45d097d5ca Mon Sep 17 00:00:00 2001 From: qyt <486179@qq.com> Date: Mon, 24 Jan 2022 13:18:30 +0800 Subject: [PATCH 5/6] added:x86 and x64 copy bat --- XEngine_Source/VSCopy_x64.bat | 27 +++++++++++++++++++ XEngine_Source/{VSCopy.bat => VSCopy_x86.bat} | 0 2 files changed, 27 insertions(+) create mode 100644 XEngine_Source/VSCopy_x64.bat rename XEngine_Source/{VSCopy.bat => VSCopy_x86.bat} (100%) diff --git a/XEngine_Source/VSCopy_x64.bat b/XEngine_Source/VSCopy_x64.bat new file mode 100644 index 0000000..5f12f97 --- /dev/null +++ b/XEngine_Source/VSCopy_x64.bat @@ -0,0 +1,27 @@ +copy /y "%XEngine_Library%\x64\XEngine_BaseLib\XEngine_BaseLib.dll" "./" +copy /y "%XEngine_Library%\x64\XEngine_BaseLib\XEngine_Algorithm.dll" "./" +copy /y "%XEngine_Library%\x64\XEngine_Core\XEngine_Core.dll" "./" +copy /y "%XEngine_Library%\x64\XEngine_Core\XEngine_ManagePool.dll" "./" +copy /y "%XEngine_Library%\x64\XEngine_Core\XEngine_NetXApi.dll" "./" +copy /y "%XEngine_Library%\x64\XEngine_Core\XEngine_OPenSsl.dll" "./" + +copy /y "%XEngine_Library%\x64\XEngine_SystemSdk\XEngine_SystemApi.dll" "./" + +copy /y "%XEngine_Library%\x64\XEngine_HelpComponents\HelpComponents_DataBase.dll" "./" +copy /y "%XEngine_Library%\x64\XEngine_HelpComponents\HelpComponents_Packets.dll" "./" +copy /y "%XEngine_Library%\x64\XEngine_HelpComponents\HelpComponents_XLog.dll" "./" + +copy /y "%XEngine_Library%\x64\XEngine_NetHelp\NetHelp_APIHelp.dll" "./" + +copy /y "%XEngine_Library%\x64\XEngine_RfcComponents\RfcComponents_HttpServer.dll" "./" + +copy /y "%XEngine_Library%\x64\XEngine_HelpComponents\bson-1.0.dll" "./" +copy /y "%XEngine_Library%\x64\XEngine_HelpComponents\mongoc-1.0.dll" "./" +copy /y "%XEngine_Library%\x64\XEngine_HelpComponents\libmariadb.dll" "./" +copy /y "%XEngine_Library%\x64\XEngine_HelpComponents\libpq.dll" "./" +copy /y "%XEngine_Library%\x64\XEngine_HelpComponents\sqlite3.dll" "./" +copy /y "%XEngine_Library%\x64\XEngine_HelpComponents\zlib1.dll" "./" +copy /y "%XEngine_Library%\x64\XEngine_HelpComponents\plugin\caching_sha2_password.dll" "./" +copy /y "%XEngine_Library%\x64\XEngine_LibEx\libcrypto-1_1.dll" "./" +copy /y "%XEngine_Library%\x64\XEngine_LibEx\libssl-1_1.dll" "./" +copy /y "%XEngine_Library%\x64\XEngine_LibEx\libcurl.dll" "./" \ No newline at end of file diff --git a/XEngine_Source/VSCopy.bat b/XEngine_Source/VSCopy_x86.bat similarity index 100% rename from XEngine_Source/VSCopy.bat rename to XEngine_Source/VSCopy_x86.bat -- Gitee From 4ad5a8bf6aec5a9018fc00c44a84f2552520f19e Mon Sep 17 00:00:00 2001 From: qyt <486179@qq.com> Date: Wed, 26 Jan 2022 10:37:46 +0800 Subject: [PATCH 6/6] support x64 debug compile on windows --- XEngine_Release/XEngine_Config/XEngine_Config.json | 1 + .../StorageModule_APIHelp.vcxproj | 6 ++++-- .../StorageModule_Config.vcxproj | 5 +++-- .../StorageModule_Protocol.vcxproj | 6 ++++-- .../StorageModule_Session.vcxproj | 12 +++++++----- XEngine_Source/StorageModule_Session/pch.h | 6 +----- XEngine_Source/XEngine_StorageApp/StorageApp_Hdr.h | 9 +++++++++ .../XEngine_StorageApp/XEngine_StorageApp.vcxproj | 6 ++++-- .../XStorage_P2XPPeer/XStorage_P2XPPeer.vcxproj | 6 ++++-- .../XStorage_SQLPacket/XStorage_SQLPacket.vcxproj | 12 +++++++----- .../XStorage_SQLPacket/pch.h | 11 ++--------- 11 files changed, 46 insertions(+), 34 deletions(-) diff --git a/XEngine_Release/XEngine_Config/XEngine_Config.json b/XEngine_Release/XEngine_Config/XEngine_Config.json index 58f2a32..89914cc 100644 --- a/XEngine_Release/XEngine_Config/XEngine_Config.json +++ b/XEngine_Release/XEngine_Config/XEngine_Config.json @@ -75,6 +75,7 @@ }, "XVer":{ "StorageVersion":[ + "3.4.1.1001 Build20220126", "3.4.0.1001 Build20220121", "3.3.0.1001 Build20220106", "3.2.0.1001 Build20211211", diff --git a/XEngine_Source/StorageModule_APIHelp/StorageModule_APIHelp.vcxproj b/XEngine_Source/StorageModule_APIHelp/StorageModule_APIHelp.vcxproj index 95b37e6..16cc326 100644 --- a/XEngine_Source/StorageModule_APIHelp/StorageModule_APIHelp.vcxproj +++ b/XEngine_Source/StorageModule_APIHelp/StorageModule_APIHelp.vcxproj @@ -43,7 +43,7 @@ DynamicLibrary true v142 - Unicode + MultiByte DynamicLibrary @@ -82,6 +82,8 @@ true + $(XEngine_Include);$(IncludePath) + $(XEngine_Lib64);$(LibraryPath) false @@ -131,7 +133,7 @@ Level3 true - _DEBUG;STORAGEMODULEAPIHELP_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + _DEBUG;STORAGEMODULEAPIHELP_EXPORTS;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true Use pch.h diff --git a/XEngine_Source/StorageModule_Config/StorageModule_Config.vcxproj b/XEngine_Source/StorageModule_Config/StorageModule_Config.vcxproj index 65c20d3..29a564a 100644 --- a/XEngine_Source/StorageModule_Config/StorageModule_Config.vcxproj +++ b/XEngine_Source/StorageModule_Config/StorageModule_Config.vcxproj @@ -43,7 +43,7 @@ DynamicLibrary true v142 - Unicode + MultiByte DynamicLibrary @@ -81,6 +81,7 @@ true + $(XEngine_Include);$(IncludePath) false @@ -129,7 +130,7 @@ Level3 true - _DEBUG;STORAGEMODULECONFIG_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + _DEBUG;STORAGEMODULECONFIG_EXPORTS;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true Use pch.h diff --git a/XEngine_Source/StorageModule_Protocol/StorageModule_Protocol.vcxproj b/XEngine_Source/StorageModule_Protocol/StorageModule_Protocol.vcxproj index c977589..624c519 100644 --- a/XEngine_Source/StorageModule_Protocol/StorageModule_Protocol.vcxproj +++ b/XEngine_Source/StorageModule_Protocol/StorageModule_Protocol.vcxproj @@ -43,7 +43,7 @@ DynamicLibrary true v142 - Unicode + MultiByte DynamicLibrary @@ -82,6 +82,8 @@ true + $(XEngine_Include);$(IncludePath) + $(XEngine_Lib64);$(LibraryPath) false @@ -131,7 +133,7 @@ Level3 true - _DEBUG;STORAGEMODULEPROTOCOL_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + _DEBUG;STORAGEMODULEPROTOCOL_EXPORTS;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true Use pch.h diff --git a/XEngine_Source/StorageModule_Session/StorageModule_Session.vcxproj b/XEngine_Source/StorageModule_Session/StorageModule_Session.vcxproj index ea7f39b..9d77abc 100644 --- a/XEngine_Source/StorageModule_Session/StorageModule_Session.vcxproj +++ b/XEngine_Source/StorageModule_Session/StorageModule_Session.vcxproj @@ -43,7 +43,7 @@ DynamicLibrary true v142 - Unicode + MultiByte DynamicLibrary @@ -73,20 +73,22 @@ true $(XEngine_Include);$(IncludePath) - $(XEngine_Library);$(LibraryPath) + $(XEngine_Lib32);$(LibraryPath) false $(XEngine_Include);$(IncludePath) - $(XEngine_Library);$(LibraryPath) + $(XEngine_Lib32);$(LibraryPath) true + $(XEngine_Include);$(IncludePath) + $(XEngine_Lib64);$(LibraryPath) false $(XEngine_Include);$(IncludePath) - $(XEngine_Library);$(LibraryPath) + $(XEngine_Lib64);$(LibraryPath) @@ -131,7 +133,7 @@ Level3 true - _DEBUG;STORAGEMODULESESSION_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + _DEBUG;STORAGEMODULESESSION_EXPORTS;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true Use pch.h diff --git a/XEngine_Source/StorageModule_Session/pch.h b/XEngine_Source/StorageModule_Session/pch.h index 65eb4cd..25d2634 100644 --- a/XEngine_Source/StorageModule_Session/pch.h +++ b/XEngine_Source/StorageModule_Session/pch.h @@ -50,9 +50,5 @@ extern BOOL Session_IsErrorOccur; extern DWORD Session_dwErrorCode; #ifdef _WINDOWS -#ifdef _WIN64 -#pragma comment(lib,"x64/XEngine_BaseLib/XEngine_BaseLib.lib") -#else -#pragma comment(lib,"x86/XEngine_BaseLib/XEngine_BaseLib.lib") -#endif +#pragma comment(lib,"XEngine_BaseLib/XEngine_BaseLib.lib") #endif \ No newline at end of file diff --git a/XEngine_Source/XEngine_StorageApp/StorageApp_Hdr.h b/XEngine_Source/XEngine_StorageApp/StorageApp_Hdr.h index d5bbe8e..3d15619 100644 --- a/XEngine_Source/XEngine_StorageApp/StorageApp_Hdr.h +++ b/XEngine_Source/XEngine_StorageApp/StorageApp_Hdr.h @@ -128,12 +128,21 @@ extern XENGINE_LBCONFIG st_LoadbalanceCfg; #pragma comment(lib,"XEngine_NetHelp/NetHelp_APIHelp.lib") #pragma comment(lib,"XEngine_SystemSdk/XEngine_SystemApi.lib") #ifdef _WIN64 +#ifdef _DEBUG +#pragma comment(lib,"../x64/Debug/StorageModule_Session.lib") +#pragma comment(lib,"../x64/Debug/StorageModule_Config.lib") +#pragma comment(lib,"../x64/Debug/StorageModule_APIHelp.lib") +#pragma comment(lib,"../x64/Debug/StorageModule_Protocol.lib") +#pragma comment(lib,"../x64/Debug/XStorage_SQLPacket.lib") +#pragma comment(lib,"../x64/Debug/XStorage_P2XPPeer.lib") +#else #pragma comment(lib,"../x64/Release/StorageModule_Session.lib") #pragma comment(lib,"../x64/Release/StorageModule_Config.lib") #pragma comment(lib,"../x64/Release/StorageModule_APIHelp.lib") #pragma comment(lib,"../x64/Release/StorageModule_Protocol.lib") #pragma comment(lib,"../x64/Release/XStorage_SQLPacket.lib") #pragma comment(lib,"../x64/Release/XStorage_P2XPPeer.lib") +#endif #else #ifdef _DEBUG #pragma comment(lib,"../Debug/StorageModule_Session.lib") diff --git a/XEngine_Source/XEngine_StorageApp/XEngine_StorageApp.vcxproj b/XEngine_Source/XEngine_StorageApp/XEngine_StorageApp.vcxproj index 3386144..23df154 100644 --- a/XEngine_Source/XEngine_StorageApp/XEngine_StorageApp.vcxproj +++ b/XEngine_Source/XEngine_StorageApp/XEngine_StorageApp.vcxproj @@ -43,7 +43,7 @@ Application true v142 - Unicode + MultiByte Application @@ -82,6 +82,8 @@ true + $(XEngine_Include);$(IncludePath) + $(XEngine_Lib64);$(LibraryPath) false @@ -123,7 +125,7 @@ Level3 true - _DEBUG;_CONSOLE;%(PreprocessorDefinitions) + _DEBUG;_CONSOLE;_WINDOWS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true diff --git a/XEngine_Source/XEngine_StorageComponents/XStorage_P2XPPeer/XStorage_P2XPPeer.vcxproj b/XEngine_Source/XEngine_StorageComponents/XStorage_P2XPPeer/XStorage_P2XPPeer.vcxproj index 9f15567..759d64b 100644 --- a/XEngine_Source/XEngine_StorageComponents/XStorage_P2XPPeer/XStorage_P2XPPeer.vcxproj +++ b/XEngine_Source/XEngine_StorageComponents/XStorage_P2XPPeer/XStorage_P2XPPeer.vcxproj @@ -43,7 +43,7 @@ DynamicLibrary true v142 - Unicode + MultiByte DynamicLibrary @@ -82,6 +82,8 @@ true + $(XEngine_Include);$(IncludePath) + $(XEngine_Lib64);$(LibraryPath) false @@ -131,7 +133,7 @@ Level3 true - _DEBUG;XSTORAGEP2XPPEER_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + _DEBUG;XSTORAGEP2XPPEER_EXPORTS;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true Use pch.h diff --git a/XEngine_Source/XEngine_StorageComponents/XStorage_SQLPacket/XStorage_SQLPacket.vcxproj b/XEngine_Source/XEngine_StorageComponents/XStorage_SQLPacket/XStorage_SQLPacket.vcxproj index 780d233..dd52e08 100644 --- a/XEngine_Source/XEngine_StorageComponents/XStorage_SQLPacket/XStorage_SQLPacket.vcxproj +++ b/XEngine_Source/XEngine_StorageComponents/XStorage_SQLPacket/XStorage_SQLPacket.vcxproj @@ -43,7 +43,7 @@ DynamicLibrary true v142 - Unicode + MultiByte DynamicLibrary @@ -73,20 +73,22 @@ true $(XEngine_Include);$(IncludePath) - $(XEngine_Library);$(LibraryPath) + $(XEngine_Lib32);$(LibraryPath) false $(XEngine_Include);$(IncludePath) - $(XEngine_Library);$(LibraryPath) + $(XEngine_Lib32);$(LibraryPath) true + $(XEngine_Include);$(IncludePath) + $(XEngine_Lib64);$(LibraryPath) false $(XEngine_Include);$(IncludePath) - $(XEngine_Library);$(LibraryPath) + $(XEngine_Lib64);$(LibraryPath) @@ -131,7 +133,7 @@ Level3 true - _DEBUG;XSTORAGESQLPACKET_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + _DEBUG;XSTORAGESQLPACKET_EXPORTS;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true Use pch.h diff --git a/XEngine_Source/XEngine_StorageComponents/XStorage_SQLPacket/pch.h b/XEngine_Source/XEngine_StorageComponents/XStorage_SQLPacket/pch.h index ab4b5e9..5cdd511 100644 --- a/XEngine_Source/XEngine_StorageComponents/XStorage_SQLPacket/pch.h +++ b/XEngine_Source/XEngine_StorageComponents/XStorage_SQLPacket/pch.h @@ -55,13 +55,6 @@ extern BOOL XStorage_IsErrorOccur; extern DWORD XStorage_dwErrorCode; #ifdef _WINDOWS -#ifdef _WIN64 -#pragma comment(lib,"x64/XEngine_BaseLib/XEngine_BaseLib.lib") -#pragma comment(lib,"x64/XEngine_HelpComponents/HelpComponents_DataBase.lib") -#else -#pragma comment(lib,"x86/XEngine_BaseLib/XEngine_BaseLib.lib") -#pragma comment(lib,"x86/XEngine_HelpComponents/HelpComponents_DataBase.lib") -#endif // _WIN64 -#else - +#pragma comment(lib,"XEngine_BaseLib/XEngine_BaseLib.lib") +#pragma comment(lib,"XEngine_HelpComponents/HelpComponents_DataBase.lib") #endif -- Gitee