aboutsummaryrefslogtreecommitdiff
path: root/CruUI.sln
diff options
context:
space:
mode:
author杨宇千 <crupest@outlook.com>2018-11-13 17:18:18 +0800
committerGitHub <noreply@github.com>2018-11-13 17:18:18 +0800
commit91dda866a0919f9e6cfb5e7857ac0466572d96d8 (patch)
treec3b5fc6afeb4dad0de65212d1dae38940706a58a /CruUI.sln
parent92bec65a76b62bbbee56b44c3020171606bb8bbb (diff)
parent97c35edea2ca67a06ba66f124b94ea62f0519def (diff)
downloadcru-91dda866a0919f9e6cfb5e7857ac0466572d96d8.tar.gz
cru-91dda866a0919f9e6cfb5e7857ac0466572d96d8.tar.bz2
cru-91dda866a0919f9e6cfb5e7857ac0466572d96d8.zip
Merge pull request #17 from crupest/cppmerge-init
Add c++ source merge tools.
Diffstat (limited to 'CruUI.sln')
-rw-r--r--CruUI.sln13
1 files changed, 13 insertions, 0 deletions
diff --git a/CruUI.sln b/CruUI.sln
index 876bbf39..5d886878 100644
--- a/CruUI.sln
+++ b/CruUI.sln
@@ -5,6 +5,11 @@ VisualStudioVersion = 15.0.28010.2036
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CruUI", "CruUI.vcxproj", "{A987AC8E-C365-44F3-8324-CBA95B33AB97}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CruUI-Generate", "CruUI-Generate\CruUI-Generate.vcxproj", "{E823676A-8860-4177-B062-B003B7F66A6F}"
+ ProjectSection(ProjectDependencies) = postProject
+ {A987AC8E-C365-44F3-8324-CBA95B33AB97} = {A987AC8E-C365-44F3-8324-CBA95B33AB97}
+ EndProjectSection
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|x64 = Debug|x64
@@ -21,6 +26,14 @@ Global
{A987AC8E-C365-44F3-8324-CBA95B33AB97}.Release|x64.Build.0 = Release|x64
{A987AC8E-C365-44F3-8324-CBA95B33AB97}.Release|x86.ActiveCfg = Release|Win32
{A987AC8E-C365-44F3-8324-CBA95B33AB97}.Release|x86.Build.0 = Release|Win32
+ {E823676A-8860-4177-B062-B003B7F66A6F}.Debug|x64.ActiveCfg = Debug|x64
+ {E823676A-8860-4177-B062-B003B7F66A6F}.Debug|x64.Build.0 = Debug|x64
+ {E823676A-8860-4177-B062-B003B7F66A6F}.Debug|x86.ActiveCfg = Debug|Win32
+ {E823676A-8860-4177-B062-B003B7F66A6F}.Debug|x86.Build.0 = Debug|Win32
+ {E823676A-8860-4177-B062-B003B7F66A6F}.Release|x64.ActiveCfg = Release|x64
+ {E823676A-8860-4177-B062-B003B7F66A6F}.Release|x64.Build.0 = Release|x64
+ {E823676A-8860-4177-B062-B003B7F66A6F}.Release|x86.ActiveCfg = Release|Win32
+ {E823676A-8860-4177-B062-B003B7F66A6F}.Release|x86.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE