Skip to content

Commit 4ad5a8b

Browse files
xengine-qytxengine-qyt
committed
support x64 debug compile on windows
1 parent b28fe55 commit 4ad5a8b

File tree

11 files changed

+46
-34
lines changed

11 files changed

+46
-34
lines changed

‎XEngine_Release/XEngine_Config/XEngine_Config.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@
7575
},
7676
"XVer":{
7777
"StorageVersion":[
78+
"3.4.1.1001 Build20220126",
7879
"3.4.0.1001 Build20220121",
7980
"3.3.0.1001 Build20220106",
8081
"3.2.0.1001 Build20211211",

‎XEngine_Source/StorageModule_APIHelp/StorageModule_APIHelp.vcxproj‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
<ConfigurationType>DynamicLibrary</ConfigurationType>
4444
<UseDebugLibraries>true</UseDebugLibraries>
4545
<PlatformToolset>v142</PlatformToolset>
46-
<CharacterSet>Unicode</CharacterSet>
46+
<CharacterSet>MultiByte</CharacterSet>
4747
</PropertyGroup>
4848
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
4949
<ConfigurationType>DynamicLibrary</ConfigurationType>
@@ -82,6 +82,8 @@
8282
</PropertyGroup>
8383
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
8484
<LinkIncremental>true</LinkIncremental>
85+
<IncludePath>$(XEngine_Include);$(IncludePath)</IncludePath>
86+
<LibraryPath>$(XEngine_Lib64);$(LibraryPath)</LibraryPath>
8587
</PropertyGroup>
8688
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
8789
<LinkIncremental>false</LinkIncremental>
@@ -131,7 +133,7 @@
131133
<ClCompile>
132134
<WarningLevel>Level3</WarningLevel>
133135
<SDLCheck>true</SDLCheck>
134-
<PreprocessorDefinitions>_DEBUG;STORAGEMODULEAPIHELP_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
136+
<PreprocessorDefinitions>_DEBUG;STORAGEMODULEAPIHELP_EXPORTS;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
135137
<ConformanceMode>true</ConformanceMode>
136138
<PrecompiledHeader>Use</PrecompiledHeader>
137139
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>

‎XEngine_Source/StorageModule_Config/StorageModule_Config.vcxproj‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
<ConfigurationType>DynamicLibrary</ConfigurationType>
4444
<UseDebugLibraries>true</UseDebugLibraries>
4545
<PlatformToolset>v142</PlatformToolset>
46-
<CharacterSet>Unicode</CharacterSet>
46+
<CharacterSet>MultiByte</CharacterSet>
4747
</PropertyGroup>
4848
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
4949
<ConfigurationType>DynamicLibrary</ConfigurationType>
@@ -81,6 +81,7 @@
8181
</PropertyGroup>
8282
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
8383
<LinkIncremental>true</LinkIncremental>
84+
<IncludePath>$(XEngine_Include);$(IncludePath)</IncludePath>
8485
</PropertyGroup>
8586
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
8687
<LinkIncremental>false</LinkIncremental>
@@ -129,7 +130,7 @@
129130
<ClCompile>
130131
<WarningLevel>Level3</WarningLevel>
131132
<SDLCheck>true</SDLCheck>
132-
<PreprocessorDefinitions>_DEBUG;STORAGEMODULECONFIG_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
133+
<PreprocessorDefinitions>_DEBUG;STORAGEMODULECONFIG_EXPORTS;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
133134
<ConformanceMode>true</ConformanceMode>
134135
<PrecompiledHeader>Use</PrecompiledHeader>
135136
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>

‎XEngine_Source/StorageModule_Protocol/StorageModule_Protocol.vcxproj‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
<ConfigurationType>DynamicLibrary</ConfigurationType>
4444
<UseDebugLibraries>true</UseDebugLibraries>
4545
<PlatformToolset>v142</PlatformToolset>
46-
<CharacterSet>Unicode</CharacterSet>
46+
<CharacterSet>MultiByte</CharacterSet>
4747
</PropertyGroup>
4848
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
4949
<ConfigurationType>DynamicLibrary</ConfigurationType>
@@ -82,6 +82,8 @@
8282
</PropertyGroup>
8383
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
8484
<LinkIncremental>true</LinkIncremental>
85+
<IncludePath>$(XEngine_Include);$(IncludePath)</IncludePath>
86+
<LibraryPath>$(XEngine_Lib64);$(LibraryPath)</LibraryPath>
8587
</PropertyGroup>
8688
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
8789
<LinkIncremental>false</LinkIncremental>
@@ -131,7 +133,7 @@
131133
<ClCompile>
132134
<WarningLevel>Level3</WarningLevel>
133135
<SDLCheck>true</SDLCheck>
134-
<PreprocessorDefinitions>_DEBUG;STORAGEMODULEPROTOCOL_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
136+
<PreprocessorDefinitions>_DEBUG;STORAGEMODULEPROTOCOL_EXPORTS;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
135137
<ConformanceMode>true</ConformanceMode>
136138
<PrecompiledHeader>Use</PrecompiledHeader>
137139
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>

‎XEngine_Source/StorageModule_Session/StorageModule_Session.vcxproj‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
<ConfigurationType>DynamicLibrary</ConfigurationType>
4444
<UseDebugLibraries>true</UseDebugLibraries>
4545
<PlatformToolset>v142</PlatformToolset>
46-
<CharacterSet>Unicode</CharacterSet>
46+
<CharacterSet>MultiByte</CharacterSet>
4747
</PropertyGroup>
4848
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
4949
<ConfigurationType>DynamicLibrary</ConfigurationType>
@@ -73,20 +73,22 @@
7373
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
7474
<LinkIncremental>true</LinkIncremental>
7575
<IncludePath>$(XEngine_Include);$(IncludePath)</IncludePath>
76-
<LibraryPath>$(XEngine_Library);$(LibraryPath)</LibraryPath>
76+
<LibraryPath>$(XEngine_Lib32);$(LibraryPath)</LibraryPath>
7777
</PropertyGroup>
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>
85+
<IncludePath>$(XEngine_Include);$(IncludePath)</IncludePath>
86+
<LibraryPath>$(XEngine_Lib64);$(LibraryPath)</LibraryPath>
8587
</PropertyGroup>
8688
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
8789
<LinkIncremental>false</LinkIncremental>
8890
<IncludePath>$(XEngine_Include);$(IncludePath)</IncludePath>
89-
<LibraryPath>$(XEngine_Library);$(LibraryPath)</LibraryPath>
91+
<LibraryPath>$(XEngine_Lib64);$(LibraryPath)</LibraryPath>
9092
</PropertyGroup>
9193
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
9294
<ClCompile>
@@ -131,7 +133,7 @@
131133
<ClCompile>
132134
<WarningLevel>Level3</WarningLevel>
133135
<SDLCheck>true</SDLCheck>
134-
<PreprocessorDefinitions>_DEBUG;STORAGEMODULESESSION_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
136+
<PreprocessorDefinitions>_DEBUG;STORAGEMODULESESSION_EXPORTS;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
135137
<ConformanceMode>true</ConformanceMode>
136138
<PrecompiledHeader>Use</PrecompiledHeader>
137139
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>

‎XEngine_Source/StorageModule_Session/pch.h‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,5 @@ extern BOOL Session_IsErrorOccur;
5050
extern DWORD Session_dwErrorCode;
5151

5252
#ifdef _WINDOWS
53-
#ifdef _WIN64
54-
#pragma comment(lib,"x64/XEngine_BaseLib/XEngine_BaseLib.lib")
55-
#else
56-
#pragma comment(lib,"x86/XEngine_BaseLib/XEngine_BaseLib.lib")
57-
#endif
53+
#pragma comment(lib,"XEngine_BaseLib/XEngine_BaseLib.lib")
5854
#endif

‎XEngine_Source/XEngine_StorageApp/StorageApp_Hdr.h‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,12 +128,21 @@ extern XENGINE_LBCONFIG st_LoadbalanceCfg;
128128
#pragma comment(lib,"XEngine_NetHelp/NetHelp_APIHelp.lib")
129129
#pragma comment(lib,"XEngine_SystemSdk/XEngine_SystemApi.lib")
130130
#ifdef _WIN64
131+
#ifdef _DEBUG
132+
#pragma comment(lib,"../x64/Debug/StorageModule_Session.lib")
133+
#pragma comment(lib,"../x64/Debug/StorageModule_Config.lib")
134+
#pragma comment(lib,"../x64/Debug/StorageModule_APIHelp.lib")
135+
#pragma comment(lib,"../x64/Debug/StorageModule_Protocol.lib")
136+
#pragma comment(lib,"../x64/Debug/XStorage_SQLPacket.lib")
137+
#pragma comment(lib,"../x64/Debug/XStorage_P2XPPeer.lib")
138+
#else
131139
#pragma comment(lib,"../x64/Release/StorageModule_Session.lib")
132140
#pragma comment(lib,"../x64/Release/StorageModule_Config.lib")
133141
#pragma comment(lib,"../x64/Release/StorageModule_APIHelp.lib")
134142
#pragma comment(lib,"../x64/Release/StorageModule_Protocol.lib")
135143
#pragma comment(lib,"../x64/Release/XStorage_SQLPacket.lib")
136144
#pragma comment(lib,"../x64/Release/XStorage_P2XPPeer.lib")
145+
#endif
137146
#else
138147
#ifdef _DEBUG
139148
#pragma comment(lib,"../Debug/StorageModule_Session.lib")

‎XEngine_Source/XEngine_StorageApp/XEngine_StorageApp.vcxproj‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
<ConfigurationType>Application</ConfigurationType>
4444
<UseDebugLibraries>true</UseDebugLibraries>
4545
<PlatformToolset>v142</PlatformToolset>
46-
<CharacterSet>Unicode</CharacterSet>
46+
<CharacterSet>MultiByte</CharacterSet>
4747
</PropertyGroup>
4848
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
4949
<ConfigurationType>Application</ConfigurationType>
@@ -82,6 +82,8 @@
8282
</PropertyGroup>
8383
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
8484
<LinkIncremental>true</LinkIncremental>
85+
<IncludePath>$(XEngine_Include);$(IncludePath)</IncludePath>
86+
<LibraryPath>$(XEngine_Lib64);$(LibraryPath)</LibraryPath>
8587
</PropertyGroup>
8688
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
8789
<LinkIncremental>false</LinkIncremental>
@@ -123,7 +125,7 @@
123125
<ClCompile>
124126
<WarningLevel>Level3</WarningLevel>
125127
<SDLCheck>true</SDLCheck>
126-
<PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
128+
<PreprocessorDefinitions>_DEBUG;_CONSOLE;_WINDOWS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
127129
<ConformanceMode>true</ConformanceMode>
128130
</ClCompile>
129131
<Link>

‎XEngine_Source/XEngine_StorageComponents/XStorage_P2XPPeer/XStorage_P2XPPeer.vcxproj‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
<ConfigurationType>DynamicLibrary</ConfigurationType>
4444
<UseDebugLibraries>true</UseDebugLibraries>
4545
<PlatformToolset>v142</PlatformToolset>
46-
<CharacterSet>Unicode</CharacterSet>
46+
<CharacterSet>MultiByte</CharacterSet>
4747
</PropertyGroup>
4848
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
4949
<ConfigurationType>DynamicLibrary</ConfigurationType>
@@ -82,6 +82,8 @@
8282
</PropertyGroup>
8383
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
8484
<LinkIncremental>true</LinkIncremental>
85+
<IncludePath>$(XEngine_Include);$(IncludePath)</IncludePath>
86+
<LibraryPath>$(XEngine_Lib64);$(LibraryPath)</LibraryPath>
8587
</PropertyGroup>
8688
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
8789
<LinkIncremental>false</LinkIncremental>
@@ -131,7 +133,7 @@
131133
<ClCompile>
132134
<WarningLevel>Level3</WarningLevel>
133135
<SDLCheck>true</SDLCheck>
134-
<PreprocessorDefinitions>_DEBUG;XSTORAGEP2XPPEER_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
136+
<PreprocessorDefinitions>_DEBUG;XSTORAGEP2XPPEER_EXPORTS;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
135137
<ConformanceMode>true</ConformanceMode>
136138
<PrecompiledHeader>Use</PrecompiledHeader>
137139
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>

‎XEngine_Source/XEngine_StorageComponents/XStorage_SQLPacket/XStorage_SQLPacket.vcxproj‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
<ConfigurationType>DynamicLibrary</ConfigurationType>
4444
<UseDebugLibraries>true</UseDebugLibraries>
4545
<PlatformToolset>v142</PlatformToolset>
46-
<CharacterSet>Unicode</CharacterSet>
46+
<CharacterSet>MultiByte</CharacterSet>
4747
</PropertyGroup>
4848
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
4949
<ConfigurationType>DynamicLibrary</ConfigurationType>
@@ -73,20 +73,22 @@
7373
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
7474
<LinkIncremental>true</LinkIncremental>
7575
<IncludePath>$(XEngine_Include);$(IncludePath)</IncludePath>
76-
<LibraryPath>$(XEngine_Library);$(LibraryPath)</LibraryPath>
76+
<LibraryPath>$(XEngine_Lib32);$(LibraryPath)</LibraryPath>
7777
</PropertyGroup>
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>
85+
<IncludePath>$(XEngine_Include);$(IncludePath)</IncludePath>
86+
<LibraryPath>$(XEngine_Lib64);$(LibraryPath)</LibraryPath>
8587
</PropertyGroup>
8688
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
8789
<LinkIncremental>false</LinkIncremental>
8890
<IncludePath>$(XEngine_Include);$(IncludePath)</IncludePath>
89-
<LibraryPath>$(XEngine_Library);$(LibraryPath)</LibraryPath>
91+
<LibraryPath>$(XEngine_Lib64);$(LibraryPath)</LibraryPath>
9092
</PropertyGroup>
9193
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
9294
<ClCompile>
@@ -131,7 +133,7 @@
131133
<ClCompile>
132134
<WarningLevel>Level3</WarningLevel>
133135
<SDLCheck>true</SDLCheck>
134-
<PreprocessorDefinitions>_DEBUG;XSTORAGESQLPACKET_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
136+
<PreprocessorDefinitions>_DEBUG;XSTORAGESQLPACKET_EXPORTS;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
135137
<ConformanceMode>true</ConformanceMode>
136138
<PrecompiledHeader>Use</PrecompiledHeader>
137139
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>

0 commit comments

Comments
 (0)