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

Jump to bottom

プロジェクト構造の整理 #31

Merged
merged 6 commits into from
Jun 3, 2018
+231 −1,582
Merged

プロジェクト構造の整理 #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
717d166
プロジェクト名から '_vc2017' プリフィックスを削除
kobake Jun 1, 2018
ca86a61
ビルドコンフィグ名を Debug, Release のみに整理（両者とも Unicode版）。
kobake Jun 1, 2018
379e218
sakura_lang をビルド対象に追加 (既存プロジェクトを VS2017 形式に変更した上で追加)
kobake Jun 1, 2018
d7137e8
AppVeyor の artifacts の設定順序を整頓
kobake Jun 2, 2018
86d411f
HeaderMake が生成するファイル (Funccode_define.h, Funccode_enum.h) をリポジトリから除外
kobake Jun 2, 2018
0d9c105
sakura_lang_en_US の依存プロジェクトとして sakura を追加
kobake Jun 2, 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
2 changes: 1 addition & 1 deletion HeaderMake/HeaderMake_vc2017.vcxproj → HeaderMake/HeaderMake.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{0F2918B0-23E3-42E8-A1A8-8739F726A23E}</ProjectGuid>
<RootNamespace>HeaderMake_vc2017</RootNamespace>
<RootNamespace>HeaderMake</RootNamespace>
<Keyword>Win32Proj</Keyword>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
Expand Down
2 changes: 1 addition & 1 deletion MakefileMake/MakefileMake_vc2017.vcxproj → MakefileMake/MakefileMake.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{40735439-B12B-40AC-92F7-F1183D8B6862}</ProjectGuid>
<RootNamespace>MakefileMake_vc2017</RootNamespace>
<RootNamespace>MakefileMake</RootNamespace>
<Keyword>Win32Proj</Keyword>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ https://github.com/sakura-editor/sakura/wiki
More information: https://github.com/sakura-editor/sakura/issues/6

## How to build
Visual Studio Community 2017 で `sakura/sakura_vc2017.sln` を開いてビルド。
Visual Studio Community 2017 で `sakura/sakura.sln` を開いてビルド。

## CI Build (AppVeyor)
本リポジトリの最新 master は以下の AppVeyor プロジェクト上で自動ビルドされます。
Expand Down
20 changes: 11 additions & 9 deletions appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,24 +8,26 @@ init:

build_script:
- cmd: >-
set SLN_FILE=sakura\sakura_vc2017.sln
set SLN_FILE=sakura\sakura.sln


set EXTRA_CMD=/verbosity:minimal /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"

set MSBUILD_EXE="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin\MSBuild.exe"


echo %MSBUILD_EXE% %SLN_FILE% /p:Platform=x86 /p:Configuration=Debug_Unicode /t:"Clean","Rebuild" %EXTRA_CMD%
%MSBUILD_EXE% %SLN_FILE% /p:Platform=x86 /p:Configuration=Debug_Unicode /t:"Clean","Rebuild" %EXTRA_CMD%
echo %MSBUILD_EXE% %SLN_FILE% /p:Platform=x86 /p:Configuration=Debug /t:"Clean","Rebuild" %EXTRA_CMD%
%MSBUILD_EXE% %SLN_FILE% /p:Platform=x86 /p:Configuration=Debug /t:"Clean","Rebuild" %EXTRA_CMD%

echo %MSBUILD_EXE% %SLN_FILE% /p:Platform=x86 /p:Configuration=Release_Unicode /t:"Clean","Rebuild" %EXTRA_CMD%
%MSBUILD_EXE% %SLN_FILE% /p:Platform=x86 /p:Configuration=Release_Unicode /t:"Clean","Rebuild" %EXTRA_CMD%
echo %MSBUILD_EXE% %SLN_FILE% /p:Platform=x86 /p:Configuration=Release /t:"Clean","Rebuild" %EXTRA_CMD%
%MSBUILD_EXE% %SLN_FILE% /p:Platform=x86 /p:Configuration=Release /t:"Clean","Rebuild" %EXTRA_CMD%

echo appveyor_yml

artifacts:
- path: sakura\Debug_Unicode\sakura.exe
- path: sakura\Debug_Unicode\sakura.pdb
- path: sakura\Release_Unicode\sakura.exe
- path: sakura\Release_Unicode\sakura.pdb
- path: sakura\Debug\sakura.exe
- path: sakura\Debug\sakura.pdb
- path: sakura\Release\sakura.exe
- path: sakura\Release\sakura.pdb
- path: sakura_lang_en_US\Debug\sakura_lang_en_US.dll
- path: sakura_lang_en_US\Release\sakura_lang_en_US.dll
11 changes: 2 additions & 9 deletions sakura/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,8 @@
/*.tds
/*.user
# /*.vcxproj
/Debug
/Debug_Ansi
/Debug_Unicode
/Debug_bcc
/Debug_one
/Release_Ansi
/Release_Unicode
/Release_bcc
/Release_one
/Debug*
/Release*
Copy link
Member

@m-tmatma m-tmatma Jun 3, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

末尾の * は要らないのでは?
MakefileMake/.gitignore や HeaderMake/.gitignore では * は含まれていません。

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

上記以外は指摘ありません。

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

要らないとおもいます。
あっても問題ないと考えられるのでapproveと判断しました。

move Release Release_bk20180603_01
などとローカルで微妙な修正を繰り返しビルドする場合に
Release*にしておけばstage対象にならなくて便利だと思います。

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Release_Unicode や Release_Ansi 等は明確に削除した意思はあるのですが、Release_bcc や Release_one 等は（歴史的経緯で残骸として残っているだけな気がしますが）自分としては明確に削除した意思がなかったので、念のためこれらの ignore 状態は残しておこうかと思い、* を入れておいた次第です。

現実問題として bcc, one はたぶん使われないと思いますが、将来的に x64 対応をしたとき等に出力フォルダが増える可能性はあり、そのときに楽できると良いかな、という気持ちです。

一旦今回は * は残させてください。

/Toolkit2003Env.bat
/_UpgradeReport_Files
/ipch
Expand Down
45 changes: 45 additions & 0 deletions sakura/sakura.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.27130.2026
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sakura", "sakura.vcxproj", "{AF03508C-515E-4A0E-87BE-67ED1E254BD0}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HeaderMake", "..\HeaderMake\HeaderMake.vcxproj", "{0F2918B0-23E3-42E8-A1A8-8739F726A23E}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MakefileMake", "..\MakefileMake\MakefileMake.vcxproj", "{40735439-B12B-40AC-92F7-F1183D8B6862}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sakura_lang_en_US", "..\sakura_lang_en_US\sakura_lang.vcxproj", "{7A6D0F29-E560-4985-835B-5F92A08EB242}"
ProjectSection(ProjectDependencies) = postProject
{AF03508C-515E-4A0E-87BE-67ED1E254BD0} = {AF03508C-515E-4A0E-87BE-67ED1E254BD0}
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|x86 = Debug|x86
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{AF03508C-515E-4A0E-87BE-67ED1E254BD0}.Debug|x86.ActiveCfg = Debug|Win32
{AF03508C-515E-4A0E-87BE-67ED1E254BD0}.Debug|x86.Build.0 = Debug|Win32
{AF03508C-515E-4A0E-87BE-67ED1E254BD0}.Release|x86.ActiveCfg = Release|Win32
{AF03508C-515E-4A0E-87BE-67ED1E254BD0}.Release|x86.Build.0 = Release|Win32
{0F2918B0-23E3-42E8-A1A8-8739F726A23E}.Debug|x86.ActiveCfg = Debug|Win32
{0F2918B0-23E3-42E8-A1A8-8739F726A23E}.Debug|x86.Build.0 = Debug|Win32
{0F2918B0-23E3-42E8-A1A8-8739F726A23E}.Release|x86.ActiveCfg = Release|Win32
{0F2918B0-23E3-42E8-A1A8-8739F726A23E}.Release|x86.Build.0 = Release|Win32
{40735439-B12B-40AC-92F7-F1183D8B6862}.Debug|x86.ActiveCfg = Debug|Win32
{40735439-B12B-40AC-92F7-F1183D8B6862}.Debug|x86.Build.0 = Debug|Win32
{40735439-B12B-40AC-92F7-F1183D8B6862}.Release|x86.ActiveCfg = Release|Win32
{40735439-B12B-40AC-92F7-F1183D8B6862}.Release|x86.Build.0 = Release|Win32
{7A6D0F29-E560-4985-835B-5F92A08EB242}.Debug|x86.ActiveCfg = Debug|Win32
{7A6D0F29-E560-4985-835B-5F92A08EB242}.Debug|x86.Build.0 = Debug|Win32
{7A6D0F29-E560-4985-835B-5F92A08EB242}.Release|x86.ActiveCfg = Release|Win32
{7A6D0F29-E560-4985-835B-5F92A08EB242}.Release|x86.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {06C18222-C02C-4F04-A17C-2453F9C27866}
EndGlobalSection
EndGlobal
140 changes: 16 additions & 124 deletions sakura/sakura_vc2017.vcxproj → sakura/sakura.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug_Ansi|Win32">
<Configuration>Debug_Ansi</Configuration>
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug_Unicode|Win32">
<Configuration>Debug_Unicode</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release_Ansi|Win32">
<Configuration>Release_Ansi</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release_Unicode|Win32">
<Configuration>Release_Unicode</Configuration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
</ItemGroup>
Expand All @@ -23,26 +15,13 @@
<ProjectGuid>{AF03508C-515E-4A0E-87BE-67ED1E254BD0}</ProjectGuid>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Ansi|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<PlatformToolset>v141</PlatformToolset>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_Ansi|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<PlatformToolset>v141</PlatformToolset>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Unicode|Win32'" Label="Configuration">
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<PlatformToolset>v141</PlatformToolset>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_Unicode|Win32'" Label="Configuration">
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<PlatformToolset>v141</PlatformToolset>
<UseOfMfc>false</UseOfMfc>
Expand All @@ -52,43 +31,27 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Ansi|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_Ansi|Win32'" Label="PropertySheets">
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Unicode|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_Unicode|Win32'" Label="PropertySheets">
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>15.0.27130.2020</_ProjectFileVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_Unicode|Win32'">
<OutDir>$(Configuration)\</OutDir>
<IntDir>$(Configuration)\obj\</IntDir>
<LinkIncremental>false</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Unicode|Win32'">
<OutDir>$(Configuration)\</OutDir>
<IntDir>$(Configuration)\obj\</IntDir>
<LinkIncremental>true</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_Ansi|Win32'">
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<OutDir>$(Configuration)\</OutDir>
<IntDir>$(Configuration)\obj\</IntDir>
<LinkIncremental>false</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Ansi|Win32'">
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<OutDir>$(Configuration)\</OutDir>
<IntDir>$(Configuration)\obj\</IntDir>
<LinkIncremental>true</LinkIncremental>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_Unicode|Win32'">
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<Optimization>MinSpace</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
Expand Down Expand Up @@ -125,76 +88,7 @@
<Culture>0x0411</Culture>
</ResourceCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Unicode|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\sakura_core;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_WINDOWS;NOMINMAX;WINVER=0x0500;_WIN32_WINNT=0x0500;_WIN32_IE=0x0501;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
<ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
<PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>StdAfx.h</PrecompiledHeaderFile>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<AdditionalOptions>/source-charset:shift_jis %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
<Link>
<AdditionalDependencies>comctl32.lib;Imm32.lib;mpr.lib;imagehlp.lib;Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
</Link>
<PostBuildEvent>
<Command>call postBuild.bat "$(TargetPath).manifest"</Command>
</PostBuildEvent>
<PreBuildEvent>
<Command>call preBuild.bat</Command>
</PreBuildEvent>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Culture>0x0411</Culture>
</ResourceCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_Ansi|Win32'">
<ClCompile>
<Optimization>MinSpace</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<AdditionalIncludeDirectories>..\sakura_core;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_WINDOWS;NOMINMAX;WINVER=0x0500;_WIN32_WINNT=0x0500;_WIN32_IE=0x0501;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
<ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
<PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>StdAfx.h</PrecompiledHeaderFile>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<AdditionalOptions>/source-charset:shift_jis %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
<Link>
<AdditionalDependencies>comctl32.lib;Imm32.lib;mpr.lib;imagehlp.lib;Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
<SubSystem>Windows</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<TargetMachine>MachineX86</TargetMachine>
</Link>
<PostBuildEvent>
<Command>call postBuild.bat "$(TargetPath).manifest"</Command>
</PostBuildEvent>
<PreBuildEvent>
<Command>call preBuild.bat</Command>
</PreBuildEvent>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Culture>0x0411</Culture>
</ResourceCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Ansi|Win32'">
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\sakura_core;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
Expand Down Expand Up @@ -825,10 +719,8 @@
<ClCompile Include="..\sakura_core\recent\CRecentSearch.cpp" />
<ClCompile Include="..\sakura_core\recent\CRecentTagjumpKeyword.cpp" />
<ClCompile Include="..\sakura_core\StdAfx.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug_Ansi|Win32'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug_Unicode|Win32'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release_Ansi|Win32'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release_Unicode|Win32'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
</ClCompile>
<ClCompile Include="..\sakura_core\typeprop\CDlgKeywordSelect.cpp" />
<ClCompile Include="..\sakura_core\typeprop\CDlgSameColor.cpp" />
Expand Down Expand Up @@ -964,11 +856,11 @@
<Text Include="..\sakura_core\util\ReadMe_util.txt" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\HeaderMake\HeaderMake_vc2017.vcxproj">
<ProjectReference Include="..\HeaderMake\HeaderMake.vcxproj">
<Project>{0f2918b0-23e3-42e8-a1a8-8739f726a23e}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
<ProjectReference Include="..\MakefileMake\MakefileMake_vc2017.vcxproj">
<ProjectReference Include="..\MakefileMake\MakefileMake.vcxproj">
<Project>{40735439-b12b-40ac-92f7-f1183d8b6862}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
Expand Down
1 change: 1 addition & 0 deletions sakura/sakura_vc2017.vcxproj.filters → sakura/sakura.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1084,6 +1084,7 @@
<ClInclude Include="..\sakura_core\uiparts\HandCursor.h">
<Filter>Cpp Source Files\uiparts</Filter>
</ClInclude>
<ClInclude Include="..\sakura_core\gitrev.h" />
</ItemGroup>
<ItemGroup>
<None Include="..\sakura_core\Funccode_x.hsrc">
Expand Down
Loading