Skip to content

Commit fe3f6fb

Browse files
committed
fixed:build error on windows with env xengine mode
1 parent 086ce40 commit fe3f6fb

File tree

7 files changed

+12
-6
lines changed

7 files changed

+12
-6
lines changed

XEngine_AVCodec/AVCodec_APPFilter/AVCodec_APPFilter.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
#include "../../../XEngine/XEngine_SourceCode/XEngine_AVCodec/XEngine_AVFilter/AVFilter_Define.h"
3434
#include "../../../XEngine/XEngine_SourceCode/XEngine_AVCodec/XEngine_AVFilter/AVFilter_Error.h"
3535
#ifdef _MSC_BUILD
36-
#ifdef _MSC_BUILD
36+
#ifdef _WIN64
3737
#pragma comment(lib,"../../../XEngine/XEngine_SourceCode/x64/Debug/XEngine_BaseLib.lib")
3838
#pragma comment(lib,"../../../XEngine/XEngine_SourceCode/x64/Debug/XEngine_AVFilter.lib")
3939
#else

XEngine_Core/XCore_APPSslServer/XCore_APPSslServer.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
#include <locale.h>
1313
#include <thread>
1414
using namespace std;
15-
1615
#if 1 == _XENGINE_USER_DIR_SYSTEM
1716
#include <XEngine_Include/XEngine_CommHdr.h>
1817
#include <XEngine_Include/XEngine_Types.h>
@@ -29,7 +28,7 @@ using namespace std;
2928
#pragma comment(lib,"XEngine_BaseLib/XEngine_BaseLib.lib")
3029
#pragma comment(lib,"XEngine_Core/XEngine_Core.lib")
3130
#pragma comment(lib,"XEngine_Core/XEngine_Cryption.lib")
32-
#pragma comment(lib,"XEngine_Core/NetHelp_APIAddr.lib")
31+
#pragma comment(lib,"XEngine_NetHelp/NetHelp_APIAddr.lib")
3332
#endif
3433
#else
3534
#include "../../../XEngine/XEngine_SourceCode/XEngine_CommHdr.h"

XEngine_Core/XCore_SslClient/XCore_SslClient.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#include <XEngine_Include/XEngine_Core/Cryption_Error.h>
2323
#ifdef _MSC_BUILD
2424
#pragma comment(lib,"XEngine_Client/XClient_Socket.lib")
25-
#pragma comment(lib,"XEngine_Client/XEngine_Cryption.lib")
25+
#pragma comment(lib,"XEngine_Core/XEngine_Cryption.lib")
2626
#endif
2727
#else
2828
#include "../../../XEngine/XEngine_SourceCode/XEngine_CommHdr.h"

XEngine_Core/XCore_SslClient/XCore_SslClient.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_ExampleHdr.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@
1313
///////////////////////////////////////////////////////////////////////////
1414
// 导出枚举型
1515
///////////////////////////////////////////////////////////////////////////
16-
#define _XENGINE_USER_DIR_SYSTEM 0
16+
#define _XENGINE_USER_DIR_SYSTEM 1

XEngine_NetHelp/NetHelp_APPHelp/NetHelp_APPHelp.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
#include <stdio.h>
77
#include <stdlib.h>
88
#include <string.h>
9-
109
#if 1 == _XENGINE_USER_DIR_SYSTEM
1110
#include <XEngine_Include/XEngine_CommHdr.h>
1211
#include <XEngine_Include/XEngine_NetHelp/APIHelp_Define.h>

XEngine_NetHelp/NetHelp_APPHelp/NetHelp_APPHelp.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>

0 commit comments

Comments
 (0)