Skip to content

Commit 50c8c0b

Browse files
committed
fixed:release x86 build choice
1 parent ccb4867 commit 50c8c0b

File tree

10 files changed

+18
-8
lines changed

10 files changed

+18
-8
lines changed

.github/workflows/msbuild.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ jobs:
6464
uses: microsoft/setup-msbuild@v2
6565

6666
- name: Build Solution
67-
run: msbuild XEngine_Source/XEngine.sln /p:Configuration=${{ matrix.configuration }} /p:Platform=${{ matrix.platform }} /property:CharacterSet=UTF-8
67+
run: msbuild XEngine_Source/XEngine.sln /p:Configuration=${{ matrix.configuration }} /p:Platform=${{ matrix.platform }}
6868

6969
- name: Conditional Step for x86 Release
7070
if: matrix.configuration == 'Release' && matrix.platform == 'x86'

XEngine_Source/AuthorizeModule_CDKey/AuthorizeModule_CDKey.vcxproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@
116116
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
117117
<LanguageStandard>stdcpp20</LanguageStandard>
118118
<LanguageStandard_C>stdc17</LanguageStandard_C>
119+
<AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
119120
</ClCompile>
120121
<Link>
121122
<SubSystem>Windows</SubSystem>

XEngine_Source/AuthorizeModule_Client/AuthorizeModule_Client.vcxproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@
116116
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
117117
<LanguageStandard>stdcpp20</LanguageStandard>
118118
<LanguageStandard_C>stdc17</LanguageStandard_C>
119+
<AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
119120
</ClCompile>
120121
<Link>
121122
<SubSystem>Windows</SubSystem>

XEngine_Source/AuthorizeModule_Configure/AuthorizeModule_Configure.vcxproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<UseDebugLibraries>false</UseDebugLibraries>
3838
<PlatformToolset>v143</PlatformToolset>
3939
<WholeProgramOptimization>true</WholeProgramOptimization>
40-
<CharacterSet>MultiByte</CharacterSet>
40+
<CharacterSet>Unicode</CharacterSet>
4141
</PropertyGroup>
4242
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
4343
<ConfigurationType>DynamicLibrary</ConfigurationType>
@@ -121,6 +121,7 @@
121121
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
122122
<LanguageStandard>stdcpp20</LanguageStandard>
123123
<LanguageStandard_C>stdc17</LanguageStandard_C>
124+
<AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
124125
</ClCompile>
125126
<Link>
126127
<SubSystem>Windows</SubSystem>

XEngine_Source/AuthorizeModule_Database/AuthorizeModule_Database.vcxproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<UseDebugLibraries>false</UseDebugLibraries>
3838
<PlatformToolset>v143</PlatformToolset>
3939
<WholeProgramOptimization>true</WholeProgramOptimization>
40-
<CharacterSet>MultiByte</CharacterSet>
40+
<CharacterSet>Unicode</CharacterSet>
4141
</PropertyGroup>
4242
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
4343
<ConfigurationType>DynamicLibrary</ConfigurationType>
@@ -116,6 +116,7 @@
116116
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
117117
<LanguageStandard>stdcpp20</LanguageStandard>
118118
<LanguageStandard_C>stdc17</LanguageStandard_C>
119+
<AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
119120
</ClCompile>
120121
<Link>
121122
<SubSystem>Windows</SubSystem>

XEngine_Source/AuthorizeModule_Help/AuthorizeModule_Help.vcxproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<UseDebugLibraries>false</UseDebugLibraries>
3838
<PlatformToolset>v143</PlatformToolset>
3939
<WholeProgramOptimization>true</WholeProgramOptimization>
40-
<CharacterSet>MultiByte</CharacterSet>
40+
<CharacterSet>Unicode</CharacterSet>
4141
</PropertyGroup>
4242
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
4343
<ConfigurationType>DynamicLibrary</ConfigurationType>
@@ -116,6 +116,7 @@
116116
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
117117
<LanguageStandard>stdcpp20</LanguageStandard>
118118
<LanguageStandard_C>stdc17</LanguageStandard_C>
119+
<AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
119120
</ClCompile>
120121
<Link>
121122
<SubSystem>Windows</SubSystem>

XEngine_Source/AuthorizeModule_Protocol/AuthorizeModule_Protocol.vcxproj

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<UseDebugLibraries>false</UseDebugLibraries>
3838
<PlatformToolset>v143</PlatformToolset>
3939
<WholeProgramOptimization>true</WholeProgramOptimization>
40-
<CharacterSet>MultiByte</CharacterSet>
40+
<CharacterSet>Unicode</CharacterSet>
4141
</PropertyGroup>
4242
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
4343
<ConfigurationType>DynamicLibrary</ConfigurationType>
@@ -122,10 +122,11 @@
122122
<ConformanceMode>true</ConformanceMode>
123123
<PrecompiledHeader>Use</PrecompiledHeader>
124124
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
125-
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
125+
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
126126
<DisableSpecificWarnings>4819</DisableSpecificWarnings>
127127
<LanguageStandard>stdcpp20</LanguageStandard>
128128
<LanguageStandard_C>stdc17</LanguageStandard_C>
129+
<AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
129130
</ClCompile>
130131
<Link>
131132
<SubSystem>Windows</SubSystem>

XEngine_Source/AuthorizeModule_Session/AuthorizeModule_Session.vcxproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<UseDebugLibraries>false</UseDebugLibraries>
3838
<PlatformToolset>v143</PlatformToolset>
3939
<WholeProgramOptimization>true</WholeProgramOptimization>
40-
<CharacterSet>MultiByte</CharacterSet>
40+
<CharacterSet>Unicode</CharacterSet>
4141
</PropertyGroup>
4242
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
4343
<ConfigurationType>DynamicLibrary</ConfigurationType>
@@ -116,6 +116,7 @@
116116
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
117117
<LanguageStandard>stdcpp20</LanguageStandard>
118118
<LanguageStandard_C>stdc17</LanguageStandard_C>
119+
<AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
119120
</ClCompile>
120121
<Link>
121122
<SubSystem>Windows</SubSystem>

XEngine_Source/XEngine_APPService/XEngine_AuthorizeApp/XEngine_AuthorizeApp.vcxproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,8 @@
153153
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
154154
<LanguageStandard>stdcpp20</LanguageStandard>
155155
<LanguageStandard_C>stdc17</LanguageStandard_C>
156+
<AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
157+
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
156158
</ClCompile>
157159
<Link>
158160
<SubSystem>Windows</SubSystem>

XEngine_Source/XEngine_APPService/XEngine_AuthorizeService/XEngine_AuthorizeService.vcxproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<UseDebugLibraries>false</UseDebugLibraries>
3838
<PlatformToolset>v143</PlatformToolset>
3939
<WholeProgramOptimization>true</WholeProgramOptimization>
40-
<CharacterSet>MultiByte</CharacterSet>
40+
<CharacterSet>Unicode</CharacterSet>
4141
</PropertyGroup>
4242
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
4343
<ConfigurationType>Application</ConfigurationType>
@@ -116,6 +116,7 @@
116116
<DisableSpecificWarnings>4819</DisableSpecificWarnings>
117117
<LanguageStandard>stdcpp20</LanguageStandard>
118118
<LanguageStandard_C>stdc17</LanguageStandard_C>
119+
<AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
119120
</ClCompile>
120121
<Link>
121122
<SubSystem>Console</SubSystem>

0 commit comments

Comments
 (0)