diff --git a/.gitignore b/.gitignore index 1f906465c6..60517fbabd 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ Backup *.ipdb UpgradeLog.htm /Win32 +/x64 diff --git a/appveyor.yml b/appveyor.yml index 3fb5397c8f..24840e59ef 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -12,6 +12,7 @@ configuration: platform: - Win32 + - x64 build_script: - cmd: >- diff --git a/sakura.sln b/sakura.sln index 1cbdc2d0b7..30d1388313 100644 --- a/sakura.sln +++ b/sakura.sln @@ -16,25 +16,43 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 Release|Win32 = Release|Win32 + Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {AF03508C-515E-4A0E-87BE-67ED1E254BD0}.Debug|Win32.ActiveCfg = Debug|Win32 {AF03508C-515E-4A0E-87BE-67ED1E254BD0}.Debug|Win32.Build.0 = Debug|Win32 + {AF03508C-515E-4A0E-87BE-67ED1E254BD0}.Debug|x64.ActiveCfg = Debug|x64 + {AF03508C-515E-4A0E-87BE-67ED1E254BD0}.Debug|x64.Build.0 = Debug|x64 {AF03508C-515E-4A0E-87BE-67ED1E254BD0}.Release|Win32.ActiveCfg = Release|Win32 {AF03508C-515E-4A0E-87BE-67ED1E254BD0}.Release|Win32.Build.0 = Release|Win32 + {AF03508C-515E-4A0E-87BE-67ED1E254BD0}.Release|x64.ActiveCfg = Release|x64 + {AF03508C-515E-4A0E-87BE-67ED1E254BD0}.Release|x64.Build.0 = Release|x64 {0F2918B0-23E3-42E8-A1A8-8739F726A23E}.Debug|Win32.ActiveCfg = Debug|Win32 {0F2918B0-23E3-42E8-A1A8-8739F726A23E}.Debug|Win32.Build.0 = Debug|Win32 + {0F2918B0-23E3-42E8-A1A8-8739F726A23E}.Debug|x64.ActiveCfg = Debug|Win32 + {0F2918B0-23E3-42E8-A1A8-8739F726A23E}.Debug|x64.Build.0 = Debug|Win32 {0F2918B0-23E3-42E8-A1A8-8739F726A23E}.Release|Win32.ActiveCfg = Release|Win32 {0F2918B0-23E3-42E8-A1A8-8739F726A23E}.Release|Win32.Build.0 = Release|Win32 + {0F2918B0-23E3-42E8-A1A8-8739F726A23E}.Release|x64.ActiveCfg = Release|Win32 + {0F2918B0-23E3-42E8-A1A8-8739F726A23E}.Release|x64.Build.0 = Release|Win32 {40735439-B12B-40AC-92F7-F1183D8B6862}.Debug|Win32.ActiveCfg = Debug|Win32 {40735439-B12B-40AC-92F7-F1183D8B6862}.Debug|Win32.Build.0 = Debug|Win32 + {40735439-B12B-40AC-92F7-F1183D8B6862}.Debug|x64.ActiveCfg = Debug|Win32 + {40735439-B12B-40AC-92F7-F1183D8B6862}.Debug|x64.Build.0 = Debug|Win32 {40735439-B12B-40AC-92F7-F1183D8B6862}.Release|Win32.ActiveCfg = Release|Win32 {40735439-B12B-40AC-92F7-F1183D8B6862}.Release|Win32.Build.0 = Release|Win32 + {40735439-B12B-40AC-92F7-F1183D8B6862}.Release|x64.ActiveCfg = Release|Win32 + {40735439-B12B-40AC-92F7-F1183D8B6862}.Release|x64.Build.0 = Release|Win32 {7A6D0F29-E560-4985-835B-5F92A08EB242}.Debug|Win32.ActiveCfg = Debug|Win32 {7A6D0F29-E560-4985-835B-5F92A08EB242}.Debug|Win32.Build.0 = Debug|Win32 + {7A6D0F29-E560-4985-835B-5F92A08EB242}.Debug|x64.ActiveCfg = Debug|x64 + {7A6D0F29-E560-4985-835B-5F92A08EB242}.Debug|x64.Build.0 = Debug|x64 {7A6D0F29-E560-4985-835B-5F92A08EB242}.Release|Win32.ActiveCfg = Release|Win32 {7A6D0F29-E560-4985-835B-5F92A08EB242}.Release|Win32.Build.0 = Release|Win32 + {7A6D0F29-E560-4985-835B-5F92A08EB242}.Release|x64.ActiveCfg = Release|x64 + {7A6D0F29-E560-4985-835B-5F92A08EB242}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/sakura/.gitignore b/sakura/.gitignore index d8dde3c656..9df2552d32 100644 --- a/sakura/.gitignore +++ b/sakura/.gitignore @@ -21,6 +21,7 @@ /*.user # /*.vcxproj /Win32 +/x64 /Toolkit2003Env.bat /_UpgradeReport_Files /ipch diff --git a/sakura/sakura.vcxproj b/sakura/sakura.vcxproj index 411863f297..f6563d5f40 100644 --- a/sakura/sakura.vcxproj +++ b/sakura/sakura.vcxproj @@ -5,10 +5,18 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + sakura @@ -21,6 +29,12 @@ false Unicode + + Application + v141 + false + Unicode + Application v141 @@ -28,15 +42,28 @@ Unicode true + + Application + v141 + false + Unicode + true + + + + + + + <_ProjectFileVersion>15.0.27130.2020 @@ -46,11 +73,21 @@ $(Platform)\$(Configuration)\ false + + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + false + $(SolutionDir)$(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ true + + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + true + MinSpace @@ -88,6 +125,41 @@ 0x0411 + + + MinSpace + OnlyExplicitInline + ..\sakura_core;%(AdditionalIncludeDirectories) + WIN32;_WINDOWS;NOMINMAX;WINVER=0x0500;_WIN32_WINNT=0x0500;_WIN32_IE=0x0501;NDEBUG;%(PreprocessorDefinitions) + true + MultiThreaded + true + true + true + Use + StdAfx.h + Level3 + ProgramDatabase + /source-charset:shift_jis %(AdditionalOptions) + + + comctl32.lib;Imm32.lib;mpr.lib;imagehlp.lib;Shlwapi.lib;%(AdditionalDependencies) + true + Windows + true + true + + + call postBuild.bat "$(TargetPath).manifest" + + + call preBuild.bat + + + NDEBUG;%(PreprocessorDefinitions) + 0x0411 + + Disabled @@ -123,6 +195,39 @@ 0x0411 + + + Disabled + ..\sakura_core;%(AdditionalIncludeDirectories) + WIN32;_WINDOWS;NOMINMAX;WINVER=0x0500;_WIN32_WINNT=0x0500;_WIN32_IE=0x0501;_DEBUG;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + true + true + true + Use + StdAfx.h + Level3 + ProgramDatabase + /source-charset:shift_jis %(AdditionalOptions) + + + comctl32.lib;Imm32.lib;mpr.lib;imagehlp.lib;Shlwapi.lib;%(AdditionalDependencies) + true + Windows + false + + + call postBuild.bat "$(TargetPath).manifest" + + + call preBuild.bat + + + _DEBUG;%(PreprocessorDefinitions) + 0x0411 + + @@ -722,7 +827,9 @@ Create + Create Create + Create diff --git a/sakura_lang_en_US/.gitignore b/sakura_lang_en_US/.gitignore index 3cfd67a6f0..205fe45deb 100644 --- a/sakura_lang_en_US/.gitignore +++ b/sakura_lang_en_US/.gitignore @@ -1 +1,2 @@ /Win32 +/x64 diff --git a/sakura_lang_en_US/sakura_lang_en_US.vcxproj b/sakura_lang_en_US/sakura_lang_en_US.vcxproj index 92e24f73aa..15acd2e043 100644 --- a/sakura_lang_en_US/sakura_lang_en_US.vcxproj +++ b/sakura_lang_en_US/sakura_lang_en_US.vcxproj @@ -5,10 +5,18 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {7A6D0F29-E560-4985-835B-5F92A08EB242} @@ -21,12 +29,24 @@ false Unicode + + DynamicLibrary + v141 + false + Unicode + DynamicLibrary v141 false Unicode + + DynamicLibrary + v141 + false + Unicode + @@ -34,10 +54,18 @@ + + + + + + + + <_ProjectFileVersion>15.0.27130.2020 @@ -48,12 +76,24 @@ true true + + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + true + true + $(SolutionDir)$(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ true false + + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + true + false + _DEBUG;%(PreprocessorDefinitions) @@ -96,6 +136,46 @@ $(OutDir)$(TargetName).bsc + + + _DEBUG;%(PreprocessorDefinitions) + true + true + $(OutDir)$(TargetName).tlb + + + + + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;SAKURA_LANG_EN_US_EXPORTS;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + $(OutDir)$(TargetName).pch + $(OutDir) + $(Platform)\$(Configuration)\ + $(OutDir) + Level3 + true + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x0411 + + + odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + $(OutDir)$(TargetName)$(TargetExt) + true + true + $(OutDir)$(TargetName).pdb + true + $(OutDir)$(TargetName).lib + + + true + $(OutDir)$(TargetName).bsc + + NDEBUG;%(PreprocessorDefinitions) @@ -137,6 +217,46 @@ $(OutDir)$(TargetName).bsc + + + NDEBUG;%(PreprocessorDefinitions) + true + true + $(OutDir)$(TargetName).tlb + + + + + MaxSpeed + OnlyExplicitInline + WIN32;NDEBUG;_WINDOWS;_USRDLL;SAKURA_LANG_EN_US_EXPORTS;%(PreprocessorDefinitions) + true + MultiThreaded + true + $(OutDir)$(TargetName).pch + $(OutDir) + $(Platform)\$(Configuration)\ + $(OutDir) + Level3 + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0411 + + + odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + $(OutDir)$(TargetName)$(TargetExt) + true + $(OutDir)$(TargetName).pdb + true + $(OutDir)$(TargetName).lib + + + true + $(OutDir)$(TargetName).bsc + +