Skip to content

Commit cbfb9f6

Browse files
committed
update:v9.10 release support
1 parent e461eda commit cbfb9f6

File tree

3 files changed

+16
-12
lines changed

3 files changed

+16
-12
lines changed

XEngine_BaseLib/BaseLib_APPBaselib/BaseLib_APPBaselib.cpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ void TimeSpanTest()
5252
__int64x nHourTTime = 0;
5353
LPCXSTR lpszStartTime = _X("2019-11-01 12:31:10");
5454
LPCXSTR lpszEndTime = _X("2020-10-02 12:31:10");
55-
XENGINE_LIBTIMER st_LibTimer;
56-
memset(&st_LibTimer, '\0', sizeof(XENGINE_LIBTIMER));
55+
XENGINE_LIBTIME st_LibTimer;
56+
memset(&st_LibTimer, '\0', sizeof(XENGINE_LIBTIME));
5757

5858
BaseLib_TimeSpan_GetForStr(lpszStartTime, lpszEndTime, &nDayTTime, 0);
5959
BaseLib_TimeSpan_GetForStr(lpszStartTime, lpszEndTime, &nHourTTime, 1);
@@ -68,8 +68,8 @@ void TimeSpanTest()
6868
void TimeTest()
6969
{
7070
time_t nTime = 2706010596;
71-
XENGINE_LIBTIMER st_LibTimer;
72-
memset(&st_LibTimer, '\0', sizeof(XENGINE_LIBTIMER));
71+
XENGINE_LIBTIME st_LibTimer;
72+
memset(&st_LibTimer, '\0', sizeof(XENGINE_LIBTIME));
7373

7474
BaseLib_Time_GetSysTime(&st_LibTimer);
7575
BaseLib_Time_TTimeToStuTime(nTime, &st_LibTimer);
@@ -249,11 +249,11 @@ int test_TTrigger()
249249
void Test_GetTimeofday()
250250
{
251251
XENGINE_VALTIME st_Timeval;
252-
XENGINE_LIBTIMER st_LibTime;
252+
XENGINE_LIBTIME st_LibTime;
253253
XCHAR tszMsgTimer[128];
254254

255255
memset(&st_Timeval, '\0', sizeof(XENGINE_VALTIME));
256-
memset(&st_LibTime, '\0', sizeof(XENGINE_LIBTIMER));
256+
memset(&st_LibTime, '\0', sizeof(XENGINE_LIBTIME));
257257
memset(tszMsgTimer, '\0', sizeof(tszMsgTimer));
258258

259259
BaseLib_Time_GetTimeOfday(&st_Timeval);

XEngine_NetHelp/NetHelp_APPAddr/NetHelp_APPAddr.vcxproj

+4
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,10 @@
7474
<IncludePath>$(XEngine_Include);$(IncludePath)</IncludePath>
7575
<LibraryPath>$(XEngine_Lib64);$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64)</LibraryPath>
7676
</PropertyGroup>
77+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
78+
<IncludePath>$(XEngine_Include);$(IncludePath)</IncludePath>
79+
<LibraryPath>$(XEngine_Lib32);$(LibraryPath)</LibraryPath>
80+
</PropertyGroup>
7781
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
7882
<ClCompile>
7983
<WarningLevel>Level3</WarningLevel>

XEngine_SystemSdk/SystemSdk_APPApi/SystemSdk_APPApi.cpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -105,10 +105,10 @@ int Test_CPUInfo()
105105
int Test_ProcessInfo()
106106
{
107107
int nUsage = 0;
108-
XENGINE_LIBTIMER st_LibTimer;
108+
XENGINE_LIBTIME st_LibTimer;
109109
SYSTEMAPI_PROCESS_INFOMATION st_ProcessInfo;
110110

111-
memset(&st_LibTimer, '\0', sizeof(XENGINE_LIBTIMER));
111+
memset(&st_LibTimer, '\0', sizeof(XENGINE_LIBTIME));
112112
memset(&st_ProcessInfo, '\0', sizeof(SYSTEMAPI_PROCESS_INFOMATION));
113113

114114
SystemApi_Process_GetProcessInfo(&st_ProcessInfo);
@@ -123,10 +123,10 @@ int Test_SystemInfo()
123123
{
124124
int nUsage = 0;
125125
int nProcessCount = 0;
126-
XENGINE_LIBTIMER st_LibTimer;
126+
XENGINE_LIBTIME st_LibTimer;
127127
SYSTEMAPI_MEMORY_INFOMATION st_MemoryInfo;
128128

129-
memset(&st_LibTimer, '\0', sizeof(XENGINE_LIBTIMER));
129+
memset(&st_LibTimer, '\0', sizeof(XENGINE_LIBTIME));
130130
memset(&st_MemoryInfo, '\0', sizeof(SYSTEMAPI_MEMORY_INFOMATION));
131131

132132
SystemApi_System_GetMemoryUsage(&st_MemoryInfo, XENGINE_SYSTEMSDK_API_SYSTEM_SIZE_MB);
@@ -167,10 +167,10 @@ int Test_EnumFile()
167167
int nCount = 0;
168168
XCHAR** ppszListDir;
169169
SYSTEMAPI_FILE_ATTR st_FileAttr = {};
170-
SystemApi_File_GetFileAttr(_X("D:\\xengine_apps"), &st_FileAttr);
170+
SystemApi_File_GetFileAttr(_X("D:\\xengine_apps\\x64"), &st_FileAttr);
171171

172172
#ifdef _MSC_BUILD
173-
SystemApi_File_EnumFile("D:\\test\\", &ppszListDir, &nCount, true, 1);
173+
SystemApi_File_EnumFile("D:\\xengine_apps\\x64", &ppszListDir, &nCount, true, 1);
174174
#else
175175
SystemApi_File_EnumFile("/tmp/", &ppszListDir, &nCount);
176176
#endif

0 commit comments

Comments
 (0)