Skip to content

Commit 257ea7e

Browse files
committed
build x86 and x64 on vs2019
1 parent fd20f7d commit 257ea7e

File tree

6 files changed

+27
-12
lines changed

6 files changed

+27
-12
lines changed

XEngine_Docment/Docment_en.docx

48 Bytes
Binary file not shown.

XEngine_Docment/Docment_zh.docx

20 Bytes
Binary file not shown.

XEngine_Release/XEngine_Config/XEngine_Config.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
"bResumable": 1,
4040
"nHashMode": 2,
4141
"bRename": 0,
42-
"tszFileDir": "./XEngine_File"
42+
"tszFileDir": "/home/ubuntu/桌面/XEngine_Storage/XEngine_Source/Debug/XEngine_File"
4343
},
4444
"XProxy": {
4545
"XProxyAuth": {
@@ -68,6 +68,7 @@
6868
},
6969
"XVer": {
7070
"StorageVersion": [
71+
"3.0.0.1001 Build20211029",
7172
"2.5.0.1001 Build20210930",
7273
"2.4.0.1001 Build20210918",
7374
"2.3.0.1001 Build20210903",
@@ -82,4 +83,4 @@
8283
"1.0.0.1001 Build20210501"
8384
]
8485
}
85-
}
86+
}

XEngine_Source/StorageModule_Protocol/StorageModule_Protocol.vcxproj

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<UseDebugLibraries>false</UseDebugLibraries>
3838
<PlatformToolset>v142</PlatformToolset>
3939
<WholeProgramOptimization>true</WholeProgramOptimization>
40-
<CharacterSet>Unicode</CharacterSet>
40+
<CharacterSet>MultiByte</CharacterSet>
4141
</PropertyGroup>
4242
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
4343
<ConfigurationType>DynamicLibrary</ConfigurationType>
@@ -50,7 +50,7 @@
5050
<UseDebugLibraries>false</UseDebugLibraries>
5151
<PlatformToolset>v142</PlatformToolset>
5252
<WholeProgramOptimization>true</WholeProgramOptimization>
53-
<CharacterSet>Unicode</CharacterSet>
53+
<CharacterSet>MultiByte</CharacterSet>
5454
</PropertyGroup>
5555
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
5656
<ImportGroup Label="ExtensionSettings">
@@ -77,12 +77,16 @@
7777
</PropertyGroup>
7878
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
7979
<LinkIncremental>false</LinkIncremental>
80+
<IncludePath>$(XEngine_Include);$(IncludePath)</IncludePath>
81+
<LibraryPath>$(XEngine_Lib32);$(LibraryPath)</LibraryPath>
8082
</PropertyGroup>
8183
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
8284
<LinkIncremental>true</LinkIncremental>
8385
</PropertyGroup>
8486
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
8587
<LinkIncremental>false</LinkIncremental>
88+
<IncludePath>$(XEngine_Include);$(IncludePath)</IncludePath>
89+
<LibraryPath>$(XEngine_Lib64);$(LibraryPath)</LibraryPath>
8690
</PropertyGroup>
8791
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
8892
<ClCompile>
@@ -107,10 +111,12 @@
107111
<FunctionLevelLinking>true</FunctionLevelLinking>
108112
<IntrinsicFunctions>true</IntrinsicFunctions>
109113
<SDLCheck>true</SDLCheck>
110-
<PreprocessorDefinitions>WIN32;NDEBUG;STORAGEMODULEPROTOCOL_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
114+
<PreprocessorDefinitions>WIN32;NDEBUG;STORAGEMODULEPROTOCOL_EXPORTS;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
111115
<ConformanceMode>true</ConformanceMode>
112116
<PrecompiledHeader>Use</PrecompiledHeader>
113117
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
118+
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
119+
<DisableSpecificWarnings>4819</DisableSpecificWarnings>
114120
</ClCompile>
115121
<Link>
116122
<SubSystem>Windows</SubSystem>
@@ -143,10 +149,11 @@
143149
<FunctionLevelLinking>true</FunctionLevelLinking>
144150
<IntrinsicFunctions>true</IntrinsicFunctions>
145151
<SDLCheck>true</SDLCheck>
146-
<PreprocessorDefinitions>NDEBUG;STORAGEMODULEPROTOCOL_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
152+
<PreprocessorDefinitions>NDEBUG;STORAGEMODULEPROTOCOL_EXPORTS;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
147153
<ConformanceMode>true</ConformanceMode>
148154
<PrecompiledHeader>Use</PrecompiledHeader>
149155
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
156+
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
150157
</ClCompile>
151158
<Link>
152159
<SubSystem>Windows</SubSystem>

XEngine_Source/XEngine_StorageApp/XEngine_StorageApp.vcxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,15 +78,15 @@
7878
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
7979
<LinkIncremental>false</LinkIncremental>
8080
<IncludePath>$(XEngine_Include);$(IncludePath)</IncludePath>
81-
<LibraryPath>$(XEngine_Library);$(LibraryPath)</LibraryPath>
81+
<LibraryPath>$(XEngine_Lib32);$(LibraryPath)</LibraryPath>
8282
</PropertyGroup>
8383
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
8484
<LinkIncremental>true</LinkIncremental>
8585
</PropertyGroup>
8686
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
8787
<LinkIncremental>false</LinkIncremental>
8888
<IncludePath>$(XEngine_Include);$(IncludePath)</IncludePath>
89-
<LibraryPath>$(XEngine_Library);$(LibraryPath)</LibraryPath>
89+
<LibraryPath>$(XEngine_Lib64);$(LibraryPath)</LibraryPath>
9090
</PropertyGroup>
9191
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
9292
<ClCompile>

XEngine_Source/XEngine_StorageComponents/XStorage_P2XPPeer/XStorage_P2XPPeer.vcxproj

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<UseDebugLibraries>false</UseDebugLibraries>
3838
<PlatformToolset>v142</PlatformToolset>
3939
<WholeProgramOptimization>true</WholeProgramOptimization>
40-
<CharacterSet>Unicode</CharacterSet>
40+
<CharacterSet>MultiByte</CharacterSet>
4141
</PropertyGroup>
4242
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
4343
<ConfigurationType>DynamicLibrary</ConfigurationType>
@@ -50,7 +50,7 @@
5050
<UseDebugLibraries>false</UseDebugLibraries>
5151
<PlatformToolset>v142</PlatformToolset>
5252
<WholeProgramOptimization>true</WholeProgramOptimization>
53-
<CharacterSet>Unicode</CharacterSet>
53+
<CharacterSet>MultiByte</CharacterSet>
5454
</PropertyGroup>
5555
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
5656
<ImportGroup Label="ExtensionSettings">
@@ -77,12 +77,16 @@
7777
</PropertyGroup>
7878
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
7979
<LinkIncremental>false</LinkIncremental>
80+
<IncludePath>$(XEngine_Include);$(IncludePath)</IncludePath>
81+
<LibraryPath>$(XEngine_Lib32);$(LibraryPath)</LibraryPath>
8082
</PropertyGroup>
8183
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
8284
<LinkIncremental>true</LinkIncremental>
8385
</PropertyGroup>
8486
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
8587
<LinkIncremental>false</LinkIncremental>
88+
<IncludePath>$(XEngine_Include);$(IncludePath)</IncludePath>
89+
<LibraryPath>$(XEngine_Lib64);$(LibraryPath)</LibraryPath>
8690
</PropertyGroup>
8791
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
8892
<ClCompile>
@@ -107,10 +111,12 @@
107111
<FunctionLevelLinking>true</FunctionLevelLinking>
108112
<IntrinsicFunctions>true</IntrinsicFunctions>
109113
<SDLCheck>true</SDLCheck>
110-
<PreprocessorDefinitions>WIN32;NDEBUG;XSTORAGEP2XPPEER_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
114+
<PreprocessorDefinitions>WIN32;NDEBUG;XSTORAGEP2XPPEER_EXPORTS;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
111115
<ConformanceMode>true</ConformanceMode>
112116
<PrecompiledHeader>Use</PrecompiledHeader>
113117
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
118+
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
119+
<DisableSpecificWarnings>4819</DisableSpecificWarnings>
114120
</ClCompile>
115121
<Link>
116122
<SubSystem>Windows</SubSystem>
@@ -143,10 +149,11 @@
143149
<FunctionLevelLinking>true</FunctionLevelLinking>
144150
<IntrinsicFunctions>true</IntrinsicFunctions>
145151
<SDLCheck>true</SDLCheck>
146-
<PreprocessorDefinitions>NDEBUG;XSTORAGEP2XPPEER_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
152+
<PreprocessorDefinitions>NDEBUG;XSTORAGEP2XPPEER_EXPORTS;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
147153
<ConformanceMode>true</ConformanceMode>
148154
<PrecompiledHeader>Use</PrecompiledHeader>
149155
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
156+
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
150157
</ClCompile>
151158
<Link>
152159
<SubSystem>Windows</SubSystem>

0 commit comments

Comments
 (0)