Skip to content

Commit 40d7b63

Browse files
committed
added:ms build utf-8 support
1 parent d0af6c1 commit 40d7b63

File tree

15 files changed

+46
-10
lines changed

15 files changed

+46
-10
lines changed

.github/workflows/msbuild.yml

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,6 @@ jobs:
5656
Write-Host "Latest Tag: $url"
5757
Invoke-WebRequest -Uri $url -OutFile "XEngine_Windows_x86-32.zip"
5858
Expand-Archive -Path ./XEngine_Windows_x86-32.zip -DestinationPath ./XEngine_Windows -Force
59-
ls XEngine_Windows/
60-
ls XEngine_Windows/XEngine_Include
61-
ls XEngine_Windows/XEngine_Windows
6259
6360
echo "XENGINE_INCLUDE=${{ github.workspace }}/XEngine_Windows" | Out-File -FilePath $env:GITHUB_ENV -Append
6461
echo "XENGINE_LIB32=${{ github.workspace }}/XEngine_Windows/XEngine_Windows" | Out-File -FilePath $env:GITHUB_ENV -Append
@@ -85,14 +82,14 @@ jobs:
8582
./XEngine_SimpleApp -t
8683
./XEngine_WebSocketApp -t
8784
shell: pwsh
88-
- name: Conditional Step for x86 Debug
89-
if: matrix.configuration == 'Debug' && matrix.platform == 'x86'
85+
- name: Conditional Step for x64 Release
86+
if: matrix.configuration == 'Release' && matrix.platform == 'x64'
9087
run: |
91-
cp -r XEngine_Source/Debug/*.dll XEngine_Release/
92-
cp -r XEngine_Source/Debug/*.exe XEngine_Release/
93-
cp -r XEngine_Source/VSCopy_x86.bat XEngine_Release/
88+
cp -r XEngine_Source/x64/Release/*.dll XEngine_Release/
89+
cp -r XEngine_Source/x64/Release/*.exe XEngine_Release/
90+
cp -r XEngine_Source/VSCopy_x64.bat XEngine_Release/
9491
cd XEngine_Release
95-
./VSCopy_x86.bat
92+
./VSCopy_x64.bat
9693
./XEngine_CenterApp -t
9794
./XEngine_Http2App -t
9895
./XEngine_HttpApp -t

.github/workflows/rockybuild.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
chmod 777 *
3838
./XEngine_LINEnv.sh -i 3
3939
40-
dnf install jq -y
40+
dnf install jq unzip -y
4141
latest_tag=$(curl -s https://api.github.com/repos/libxengine/libxengine/releases/latest | jq -r .tag_name)
4242
wget https://github.com/libxengine/libxengine/releases/download/$latest_tag/XEngine_RockyLinux_9_x86-64.zip
4343
unzip ./XEngine_RockyLinux_9_x86-64.zip -d ./XEngine_RockyLinux_9_x86-64

XEngine_Source/XEngine_ModuleConfigure/XEngine_ModuleConfigure.vcxproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,7 @@
158158
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
159159
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
160160
<DisableSpecificWarnings>4819</DisableSpecificWarnings>
161+
<AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
161162
</ClCompile>
162163
<Link>
163164
<SubSystem>Windows</SubSystem>

XEngine_Source/XEngine_ModuleDatabase/XEngine_ModuleDatabase.vcxproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,7 @@
154154
<ConformanceMode>true</ConformanceMode>
155155
<PrecompiledHeader>Use</PrecompiledHeader>
156156
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
157+
<AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
157158
</ClCompile>
158159
<Link>
159160
<SubSystem>Windows</SubSystem>

XEngine_Source/XEngine_ModuleProtocol/XEngine_ModuleProtocol.vcxproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,7 @@
153153
<ConformanceMode>true</ConformanceMode>
154154
<PrecompiledHeader>Use</PrecompiledHeader>
155155
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
156+
<AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
156157
</ClCompile>
157158
<Link>
158159
<SubSystem>Windows</SubSystem>

XEngine_Source/XEngine_ServiceApp/XEngine_CenterApp/XEngine_CenterApp.cpp

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,13 @@ int main(int argc, char** argv)
7676
#ifdef _MSC_BUILD
7777
WSADATA st_WSAData;
7878
WSAStartup(MAKEWORD(2, 2), &st_WSAData);
79+
80+
#ifndef _DEBUG
81+
if (setlocale(LC_ALL, ".UTF8") == NULL)
82+
{
83+
return -1;
84+
}
85+
#endif
7986
#endif
8087
bIsRun = true;
8188
int nRet = -1;

XEngine_Source/XEngine_ServiceApp/XEngine_CenterApp/XEngine_CenterApp.vcxproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,7 @@
145145
<ConformanceMode>true</ConformanceMode>
146146
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
147147
<DisableSpecificWarnings>4819</DisableSpecificWarnings>
148+
<AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
148149
</ClCompile>
149150
<Link>
150151
<SubSystem>Console</SubSystem>

XEngine_Source/XEngine_ServiceApp/XEngine_HTTP2App/XEngine_HTTP2App.cpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,12 @@ int main(int argc, char** argv)
7777
#ifdef _MSC_BUILD
7878
WSADATA st_WSAData;
7979
WSAStartup(MAKEWORD(2, 2), &st_WSAData);
80+
#ifndef _DEBUG
81+
if (setlocale(LC_ALL, ".UTF8") == NULL)
82+
{
83+
return -1;
84+
}
85+
#endif
8086
#endif
8187
bIsRun = true;
8288
int nRet = -1;

XEngine_Source/XEngine_ServiceApp/XEngine_HTTP2App/XEngine_HTTP2App.vcxproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,7 @@
139139
<SDLCheck>true</SDLCheck>
140140
<PreprocessorDefinitions>NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
141141
<ConformanceMode>true</ConformanceMode>
142+
<AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
142143
</ClCompile>
143144
<Link>
144145
<SubSystem>Console</SubSystem>

XEngine_Source/XEngine_ServiceApp/XEngine_HttpApp/XEngine_HttpApp.cpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,12 @@ int main(int argc, char** argv)
7777
#ifdef _MSC_BUILD
7878
WSADATA st_WSAData;
7979
WSAStartup(MAKEWORD(2, 2), &st_WSAData);
80+
#ifndef _DEBUG
81+
if (setlocale(LC_ALL, ".UTF8") == NULL)
82+
{
83+
return -1;
84+
}
85+
#endif
8086
#endif
8187
bIsRun = true;
8288
int nRet = -1;

0 commit comments

Comments
 (0)