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.

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

プロジェクトファイルをsakura配下に集めませんか?の実装案 #36

Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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 appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ build_script:
artifacts:
- path: sakura\Debug\sakura.exe
- path: sakura\Debug\sakura.pdb
- path: sakura_lang_en_US\Debug\sakura_lang_en_US.dll
- path: sakura\Debug\sakura_lang_en_US.dll
- path: sakura\Release\sakura.exe
- path: sakura\Release\sakura.pdb
- path: sakura_lang_en_US\Release\sakura_lang_en_US.dll
- path: sakura\Release\sakura_lang_en_US.dll
32 changes: 27 additions & 5 deletions HeaderMake/HeaderMake.vcxproj → sakura/HeaderMake.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,13 @@
<_ProjectFileVersion>15.0.27130.2020</_ProjectFileVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<OutDir>$(SolutionDir)</OutDir>
<IntDir>$(Configuration)\</IntDir>
<OutDir>$(Configuration)\</OutDir>
<IntDir>$(Configuration)\$(TargetName).obj\</IntDir>
<LinkIncremental>true</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<OutDir>$(SolutionDir)</OutDir>
<IntDir>$(Configuration)\</IntDir>
<OutDir>$(Configuration)\</OutDir>
<IntDir>$(Configuration)\$(TargetName).obj\</IntDir>
<LinkIncremental>false</LinkIncremental>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
Expand All @@ -68,6 +68,17 @@
<SubSystem>Console</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
</Link>
<PostBuildEvent>
<Command>IF NOT EXIST "$(SolutionDir)$(TargetName)$(TargetExt)" (
MKLINK /H "$(SolutionDir)$(TargetName)$(TargetExt)" "$(TargetPath)"
) ELSE (
ECHO n | COMP "$(SolutionDir)$(TargetName)$(TargetExt)" "$(TargetPath)" &gt; NUL 2&gt;&amp;1
IF ERRORLEVEL 1 (
ERASE /F "$(SolutionDir)$(TargetName)$(TargetExt)"
MKLINK /H "$(SolutionDir)$(TargetName)$(TargetExt)" "$(TargetPath)"
)
)</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
Expand All @@ -86,9 +97,20 @@
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<TargetMachine>MachineX86</TargetMachine>
</Link>
<PostBuildEvent>
<Command>IF NOT EXIST "$(SolutionDir)$(TargetName)$(TargetExt)" (
MKLINK /H "$(SolutionDir)$(TargetName)$(TargetExt)" "$(TargetPath)"
) ELSE (
ECHO n | COMP "$(SolutionDir)$(TargetName)$(TargetExt)" "$(TargetPath)" &gt; NUL 2&gt;&amp;1
IF ERRORLEVEL 1 (
ERASE /F "$(SolutionDir)$(TargetName)$(TargetExt)"
MKLINK /H "$(SolutionDir)$(TargetName)$(TargetExt)" "$(TargetPath)"
)
)</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="HeaderMake.cpp" />
<ClCompile Include="..\HeaderMake\HeaderMake.cpp" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
Expand Down
32 changes: 27 additions & 5 deletions MakefileMake/MakefileMake.vcxproj → sakura/MakefileMake.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,13 @@
<_ProjectFileVersion>15.0.27130.2020</_ProjectFileVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<OutDir>$(SolutionDir)</OutDir>
<IntDir>$(Configuration)\</IntDir>
<OutDir>$(Configuration)\</OutDir>
<IntDir>$(Configuration)\$(TargetName).obj\</IntDir>
<LinkIncremental>true</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<OutDir>$(SolutionDir)</OutDir>
<IntDir>$(Configuration)\</IntDir>
<OutDir>$(Configuration)\</OutDir>
<IntDir>$(Configuration)\$(TargetName).obj\</IntDir>
<LinkIncremental>false</LinkIncremental>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
Expand All @@ -68,6 +68,17 @@
<SubSystem>Console</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
</Link>
<PostBuildEvent>
<Command>IF NOT EXIST "$(SolutionDir)$(TargetName)$(TargetExt)" (
MKLINK /H "$(SolutionDir)$(TargetName)$(TargetExt)" "$(TargetPath)"
) ELSE (
ECHO n | COMP "$(SolutionDir)$(TargetName)$(TargetExt)" "$(TargetPath)" &gt; NUL 2&gt;&amp;1
IF ERRORLEVEL 1 (
ERASE /F "$(SolutionDir)$(TargetName)$(TargetExt)"
MKLINK /H "$(SolutionDir)$(TargetName)$(TargetExt)" "$(TargetPath)"
)
)</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
Expand All @@ -86,9 +97,20 @@
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<TargetMachine>MachineX86</TargetMachine>
</Link>
<PostBuildEvent>
<Command>IF NOT EXIST "$(SolutionDir)$(TargetName)$(TargetExt)" (
MKLINK /H "$(SolutionDir)$(TargetName)$(TargetExt)" "$(TargetPath)"
) ELSE (
ECHO n | COMP "$(SolutionDir)$(TargetName)$(TargetExt)" "$(TargetPath)" &gt; NUL 2&gt;&amp;1
IF ERRORLEVEL 1 (
ERASE /F "$(SolutionDir)$(TargetName)$(TargetExt)"
MKLINK /H "$(SolutionDir)$(TargetName)$(TargetExt)" "$(TargetPath)"
)
)</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="MakefileMake.cpp" />
<ClCompile Include="..\MakefileMake\MakefileMake.cpp" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
Expand Down
6 changes: 3 additions & 3 deletions sakura/sakura.sln
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ 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}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HeaderMake", "HeaderMake.vcxproj", "{0F2918B0-23E3-42E8-A1A8-8739F726A23E}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MakefileMake", "..\MakefileMake\MakefileMake.vcxproj", "{40735439-B12B-40AC-92F7-F1183D8B6862}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "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}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sakura_lang_en_US", "sakura_lang.vcxproj", "{7A6D0F29-E560-4985-835B-5F92A08EB242}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down
4 changes: 2 additions & 2 deletions sakura/sakura.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -856,11 +856,11 @@
<Text Include="..\sakura_core\util\ReadMe_util.txt" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\HeaderMake\HeaderMake.vcxproj">
<ProjectReference Include="HeaderMake.vcxproj">
<Project>{0f2918b0-23e3-42e8-a1a8-8739f726a23e}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
<ProjectReference Include="..\MakefileMake\MakefileMake.vcxproj">
<ProjectReference Include="MakefileMake.vcxproj">
<Project>{40735439-b12b-40ac-92f7-f1183d8b6862}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
Expand Down
98 changes: 98 additions & 0 deletions sakura/sakura_lang.vcxproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
<?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|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{7A6D0F29-E560-4985-835B-5F92A08EB242}</ProjectGuid>
<ProjectName>sakura_lang_en_US</ProjectName>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<PlatformToolset>v141</PlatformToolset>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<PlatformToolset>v141</PlatformToolset>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<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" />
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
</ImportGroup>
<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" />
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>15.0.27130.2020</_ProjectFileVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<OutDir>$(Configuration)\</OutDir>
<IntDir>$(Configuration)\$(TargetName).obj\</IntDir>
<IgnoreImportLibrary>true</IgnoreImportLibrary>
<LinkIncremental>true</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<OutDir>$(Configuration)\</OutDir>
<IntDir>$(Configuration)\$(TargetName).obj\</IntDir>
<IgnoreImportLibrary>true</IgnoreImportLibrary>
<LinkIncremental>false</LinkIncremental>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Culture>0x0411</Culture>
</ResourceCompile>
<Link>
<NoEntryPoint>true</NoEntryPoint>
</Link>
<PreBuildEvent>
<Command>HeaderMake -in=..\sakura_core\Funccode_x.hsrc -out=..\sakura_core\Funccode_define.h -mode=define
HeaderMake -in=..\sakura_core\Funccode_x.hsrc -out=..\sakura_core\Funccode_enum.h -mode=enum -enum=EFunctionCode</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Culture>0x0411</Culture>
</ResourceCompile>
<Link>
<NoEntryPoint>true</NoEntryPoint>
</Link>
<PreBuildEvent>
<Command>HeaderMake -in=..\sakura_core\Funccode_x.hsrc -out=..\sakura_core\Funccode_define.h -mode=define
HeaderMake -in=..\sakura_core\Funccode_x.hsrc -out=..\sakura_core\Funccode_enum.h -mode=enum -enum=EFunctionCode</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
<ResourceCompile Include="..\sakura_lang_en_US\sakura_lang_rc.rc" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\sakura_lang_en_US\sakura_rc.h" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="HeaderMake.vcxproj">
<Project>{0f2918b0-23e3-42e8-a1a8-8739f726a23e}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
Loading