Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

appveyorでロケール設定するのをやめる #482

Merged
merged 4 commits into from
Sep 25, 2018
Merged

appveyorでロケール設定するのをやめる #482

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6ba7bc9
appveyorのロケール変更をやめる
berryzplus Sep 24, 2018
7e46fe9
ソースコードのUNICODE対応
berryzplus Sep 24, 2018
82c4220
不要コードの除去
berryzplus Sep 24, 2018
7820d34
execution-charsetをSJISに戻す
berryzplus Sep 25, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions HeaderMake/HeaderMake.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
#include <errno.h>
using namespace std;

#define PREPROCESSOR "cl.exe /EP %s"
#define PREPROCESSOR "cl.exe /nologo /source-charset:utf-8 /execution-charset:shift_jis /EP %s"

#ifdef __MINGW32__
#include <windows.h>
Expand All @@ -78,7 +78,7 @@ using namespace std;
#define strncpy_s(A, B, C, D) strncpy((A), (C), (D))

#undef PREPROCESSOR
#define PREPROCESSOR "gcc -x c++ -finput-charset=cp932 -fexec-charset=cp932 -E %s"
#define PREPROCESSOR "gcc -x c++ -finput-charset=utf-8 -fexec-charset=cp932 -E %s"

void fopen_s(
FILE** pFile,
Expand Down
3 changes: 0 additions & 3 deletions MakefileMake/MakefileMake.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,6 @@
#define sprintf_s(A, B, C, ...) sprintf((A), (C), (__VA_ARGS__))
#define strncpy_s(A, B, C, D) strncpy((A), (C), (D))

#undef PREPROCESSOR
#define PREPROCESSOR "gcc -x c++ -finput-charset=cp932 -fexec-charset=cp932 -E %s"

int fopen_s(
FILE** pFile,
const char *filename,
Expand Down
5 changes: 0 additions & 5 deletions appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
version: 1.0.{build}
image: Visual Studio 2017
install:
- ps: Set-WinSystemLocale ja-JP
- ps: Start-Sleep -s 10
- ps: Restart-Computer
- ps: Start-Sleep -s 10

configuration:
- Release
Expand Down
8 changes: 4 additions & 4 deletions sakura/sakura.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@
<PrecompiledHeaderFile>StdAfx.h</PrecompiledHeaderFile>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<AdditionalOptions>/source-charset:shift_jis %(AdditionalOptions)</AdditionalOptions>
<AdditionalOptions>/source-charset:utf-8 /execution-charset:shift_jis %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>
<UseUnicodeForAssemblerListing>true</UseUnicodeForAssemblerListing>
Expand Down Expand Up @@ -146,7 +146,7 @@
<PrecompiledHeaderFile>StdAfx.h</PrecompiledHeaderFile>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<AdditionalOptions>/source-charset:shift_jis %(AdditionalOptions)</AdditionalOptions>
<AdditionalOptions>/source-charset:utf-8 /execution-charset:shift_jis %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>
<UseUnicodeForAssemblerListing>true</UseUnicodeForAssemblerListing>
Expand Down Expand Up @@ -186,7 +186,7 @@
<PrecompiledHeaderFile>StdAfx.h</PrecompiledHeaderFile>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<AdditionalOptions>/source-charset:shift_jis %(AdditionalOptions)</AdditionalOptions>
<AdditionalOptions>/source-charset:utf-8 /execution-charset:shift_jis %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>
<UseUnicodeForAssemblerListing>true</UseUnicodeForAssemblerListing>
Expand Down Expand Up @@ -226,7 +226,7 @@
<PrecompiledHeaderFile>StdAfx.h</PrecompiledHeaderFile>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<AdditionalOptions>/source-charset:shift_jis %(AdditionalOptions)</AdditionalOptions>
<AdditionalOptions>/source-charset:utf-8 /execution-charset:shift_jis %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>
<UseUnicodeForAssemblerListing>true</UseUnicodeForAssemblerListing>
Expand Down
Loading