From a00a7fd7d3a18670bc7237d2d410915c74d7380c Mon Sep 17 00:00:00 2001 From: Dimitar Trendafilov Date: Mon, 29 Oct 2018 19:56:04 +0200 Subject: Migrated the manual sln and vcxproj to generated by genie - lost Unicode character set, since genie breaks main function naming ATM - removed Win32 as platform --- JSImpl/solution/JSImpl.sln | 106 ++++++++------ JSImpl/solution/JSImpl.vcxproj | 251 +++++++++++++++++---------------- JSImpl/solution/JSImpl.vcxproj.filters | 19 ++- JSImpl/solution/JSLib.vcxproj | 140 ++++++++++++++++++ JSImpl/solution/JSLib.vcxproj.filters | 54 +++++++ JSImpl/solution/genie.lua | 21 +-- 6 files changed, 407 insertions(+), 184 deletions(-) create mode 100644 JSImpl/solution/JSLib.vcxproj create mode 100644 JSImpl/solution/JSLib.vcxproj.filters (limited to 'JSImpl/solution') diff --git a/JSImpl/solution/JSImpl.sln b/JSImpl/solution/JSImpl.sln index 9deeed2..bbd3b9f 100644 --- a/JSImpl/solution/JSImpl.sln +++ b/JSImpl/solution/JSImpl.sln @@ -1,45 +1,61 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JSImpl", "JSImpl.vcxproj", "{EE0F8C6F-3619-4A46-BC19-FAEAD4167EE4}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JS.Common", "..\projects\JS.Common\JS.Common.vcxitems", "{45D41ACC-2C3C-43D2-BC10-02AA73FFC7C7}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestApp", "..\projects\TestApp\TestApp.vcxproj", "{05DB0989-2720-45CC-8689-2FF047B4FD74}" -EndProject -Global - GlobalSection(SharedMSBuildProjectFiles) = preSolution - ..\projects\JS.Common\JS.Common.vcxitems*{05db0989-2720-45cc-8689-2ff047b4fd74}*SharedItemsImports = 4 - ..\projects\JS.Common\JS.Common.vcxitems*{45d41acc-2c3c-43d2-bc10-02aa73ffc7c7}*SharedItemsImports = 9 - ..\projects\JS.Common\JS.Common.vcxitems*{ee0f8c6f-3619-4a46-bc19-faead4167ee4}*SharedItemsImports = 4 - EndGlobalSection - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 - Release|x64 = Release|x64 - Release|x86 = Release|x86 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {EE0F8C6F-3619-4A46-BC19-FAEAD4167EE4}.Debug|x64.ActiveCfg = Debug|x64 - {EE0F8C6F-3619-4A46-BC19-FAEAD4167EE4}.Debug|x64.Build.0 = Debug|x64 - {EE0F8C6F-3619-4A46-BC19-FAEAD4167EE4}.Debug|x86.ActiveCfg = Debug|Win32 - {EE0F8C6F-3619-4A46-BC19-FAEAD4167EE4}.Debug|x86.Build.0 = Debug|Win32 - {EE0F8C6F-3619-4A46-BC19-FAEAD4167EE4}.Release|x64.ActiveCfg = Release|x64 - {EE0F8C6F-3619-4A46-BC19-FAEAD4167EE4}.Release|x64.Build.0 = Release|x64 - {EE0F8C6F-3619-4A46-BC19-FAEAD4167EE4}.Release|x86.ActiveCfg = Release|Win32 - {EE0F8C6F-3619-4A46-BC19-FAEAD4167EE4}.Release|x86.Build.0 = Release|Win32 - {05DB0989-2720-45CC-8689-2FF047B4FD74}.Debug|x64.ActiveCfg = Debug|x64 - {05DB0989-2720-45CC-8689-2FF047B4FD74}.Debug|x64.Build.0 = Debug|x64 - {05DB0989-2720-45CC-8689-2FF047B4FD74}.Debug|x86.ActiveCfg = Debug|Win32 - {05DB0989-2720-45CC-8689-2FF047B4FD74}.Debug|x86.Build.0 = Debug|Win32 - {05DB0989-2720-45CC-8689-2FF047B4FD74}.Release|x64.ActiveCfg = Release|x64 - {05DB0989-2720-45CC-8689-2FF047B4FD74}.Release|x64.Build.0 = Release|x64 - {05DB0989-2720-45CC-8689-2FF047B4FD74}.Release|x86.ActiveCfg = Release|Win32 - {05DB0989-2720-45CC-8689-2FF047B4FD74}.Release|x86.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 14 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Test", "..\test\Test.vcxproj", "{45DC8C7C-3113-8E0D-DAFF-7310C6150A0F}" + ProjectSection(ProjectDependencies) = postProject + {19EA680D-85FE-90BE-4E80-341EBA538DEF} = {19EA680D-85FE-90BE-4E80-341EBA538DEF} + {EC34880F-5849-B0C0-21CB-53208D9EACF1} = {EC34880F-5849-B0C0-21CB-53208D9EACF1} + {B686840F-229B-ACC0-EB1C-502057F0A8F1} = {B686840F-229B-ACC0-EB1C-502057F0A8F1} + {30B03E7E-1C68-80CB-856F-592771461BBC} = {30B03E7E-1C68-80CB-856F-592771461BBC} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JSLib", "JSLib.vcxproj", "{19EA680D-85FE-90BE-4E80-341EBA538DEF}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JSImpl", "JSImpl.vcxproj", "{549B84BA-403D-AF90-29F8-C2E4153936E1}" + ProjectSection(ProjectDependencies) = postProject + {19EA680D-85FE-90BE-4E80-341EBA538DEF} = {19EA680D-85FE-90BE-4E80-341EBA538DEF} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest", "..\test\gtest.vcxproj", "{EC34880F-5849-B0C0-21CB-53208D9EACF1}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gmock", "..\test\gmock.vcxproj", "{B686840F-229B-ACC0-EB1C-502057F0A8F1}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest_main", "..\test\gtest_main.vcxproj", "{30B03E7E-1C68-80CB-856F-592771461BBC}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|x64 = Debug|x64 + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {45DC8C7C-3113-8E0D-DAFF-7310C6150A0F}.Debug|x64.ActiveCfg = Debug|x64 + {45DC8C7C-3113-8E0D-DAFF-7310C6150A0F}.Debug|x64.Build.0 = Debug|x64 + {45DC8C7C-3113-8E0D-DAFF-7310C6150A0F}.Release|x64.ActiveCfg = Release|x64 + {45DC8C7C-3113-8E0D-DAFF-7310C6150A0F}.Release|x64.Build.0 = Release|x64 + {19EA680D-85FE-90BE-4E80-341EBA538DEF}.Debug|x64.ActiveCfg = Debug|x64 + {19EA680D-85FE-90BE-4E80-341EBA538DEF}.Debug|x64.Build.0 = Debug|x64 + {19EA680D-85FE-90BE-4E80-341EBA538DEF}.Release|x64.ActiveCfg = Release|x64 + {19EA680D-85FE-90BE-4E80-341EBA538DEF}.Release|x64.Build.0 = Release|x64 + {549B84BA-403D-AF90-29F8-C2E4153936E1}.Debug|x64.ActiveCfg = Debug|x64 + {549B84BA-403D-AF90-29F8-C2E4153936E1}.Debug|x64.Build.0 = Debug|x64 + {549B84BA-403D-AF90-29F8-C2E4153936E1}.Release|x64.ActiveCfg = Release|x64 + {549B84BA-403D-AF90-29F8-C2E4153936E1}.Release|x64.Build.0 = Release|x64 + {EC34880F-5849-B0C0-21CB-53208D9EACF1}.Debug|x64.ActiveCfg = Debug|x64 + {EC34880F-5849-B0C0-21CB-53208D9EACF1}.Debug|x64.Build.0 = Debug|x64 + {EC34880F-5849-B0C0-21CB-53208D9EACF1}.Release|x64.ActiveCfg = Release|x64 + {EC34880F-5849-B0C0-21CB-53208D9EACF1}.Release|x64.Build.0 = Release|x64 + {B686840F-229B-ACC0-EB1C-502057F0A8F1}.Debug|x64.ActiveCfg = Debug|x64 + {B686840F-229B-ACC0-EB1C-502057F0A8F1}.Debug|x64.Build.0 = Debug|x64 + {B686840F-229B-ACC0-EB1C-502057F0A8F1}.Release|x64.ActiveCfg = Release|x64 + {B686840F-229B-ACC0-EB1C-502057F0A8F1}.Release|x64.Build.0 = Release|x64 + {30B03E7E-1C68-80CB-856F-592771461BBC}.Debug|x64.ActiveCfg = Debug|x64 + {30B03E7E-1C68-80CB-856F-592771461BBC}.Debug|x64.Build.0 = Debug|x64 + {30B03E7E-1C68-80CB-856F-592771461BBC}.Release|x64.ActiveCfg = Release|x64 + {30B03E7E-1C68-80CB-856F-592771461BBC}.Release|x64.Build.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + EndGlobalSection +EndGlobal diff --git a/JSImpl/solution/JSImpl.vcxproj b/JSImpl/solution/JSImpl.vcxproj index 39beeba..e2d50d1 100644 --- a/JSImpl/solution/JSImpl.vcxproj +++ b/JSImpl/solution/JSImpl.vcxproj @@ -1,125 +1,126 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - {EE0F8C6F-3619-4A46-BC19-FAEAD4167EE4} - JSImpl - 8.1 - - - - Application - true - v140 - MultiByte - - - Application - false - v140 - true - MultiByte - - - Application - true - v140 - MultiByte - - - Application - false - v140 - true - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - Level4 - Disabled - true - true - - - - - Level4 - Disabled - true - true - - - - - Level4 - MaxSpeed - true - true - true - true - - - true - true - - - - - Level4 - MaxSpeed - true - true - true - None - true - true - - - true - true - - - - - - - - - \ No newline at end of file + + + + + Debug + x64 + + + Release + x64 + + + + {549B84BA-403D-AF90-29F8-C2E4153936E1} + JSImpl + 8.1 + Win32Proj + + + + Application + true + v140 + x64 + + + Application + false + v140 + x64 + + + + + + + + + + + + + ..\build\bin\Debug\ + ..\build\obj\Debug\x64\Debug\JSImpl\ + JSImpl + .exe + true + + + ..\build\bin\Release\ + ..\build\obj\Release\x64\Release\JSImpl\ + JSImpl + .exe + false + + + + %(AdditionalOptions) + Disabled + + false + EnableFastChecks + MultiThreadedDebugDLL + true + true + + Level4 + true + EditAndContinue + $(IntDir)JSImpl.compile.pdb + + + + + + Console + true + $(OutDir)JSImpl.pdb + $(OutDir)JSImpl.exe + mainCRTStartup + MachineX64 + + + + + %(AdditionalOptions) + MaxSpeed + + false + true + MultiThreadedDLL + true + true + + Level4 + true + ProgramDatabase + $(IntDir)JSImpl.compile.pdb + + + + + + Console + true + $(OutDir)JSImpl.pdb + true + true + $(OutDir)JSImpl.exe + mainCRTStartup + MachineX64 + + + + + + + + + {19EA680D-85FE-90BE-4E80-341EBA538DEF} + + + + + + diff --git a/JSImpl/solution/JSImpl.vcxproj.filters b/JSImpl/solution/JSImpl.vcxproj.filters index de250fc..daeea8c 100644 --- a/JSImpl/solution/JSImpl.vcxproj.filters +++ b/JSImpl/solution/JSImpl.vcxproj.filters @@ -1,6 +1,13 @@ - - - - - - \ No newline at end of file + + + + + {2DAB880B-99B4-887C-2230-9F7C8E38947C} + + + + + src + + + diff --git a/JSImpl/solution/JSLib.vcxproj b/JSImpl/solution/JSLib.vcxproj new file mode 100644 index 0000000..69f19e0 --- /dev/null +++ b/JSImpl/solution/JSLib.vcxproj @@ -0,0 +1,140 @@ + + + + + Debug + x64 + + + Release + x64 + + + + {19EA680D-85FE-90BE-4E80-341EBA538DEF} + JSLib + 8.1 + Win32Proj + + + + StaticLibrary + true + v140 + x64 + + + StaticLibrary + false + v140 + x64 + + + + + + + + + + + + + ..\build\bin\Debug\ + ..\build\obj\Debug\x64\Debug\JSLib\ + JSLib + .lib + + + ..\build\bin\Release\ + ..\build\obj\Release\x64\Release\JSLib\ + JSLib + .lib + + + + %(AdditionalOptions) + Disabled + + false + EnableFastChecks + MultiThreadedDebugDLL + true + true + + Level4 + true + EditAndContinue + $(OutDir)JSLib.pdb + + + + + + $(OutDir)JSLib.lib + MachineX64 + + + Windows + true + $(OutDir)JSLib.pdb + + + + + %(AdditionalOptions) + MaxSpeed + + false + true + MultiThreadedDLL + true + true + + Level4 + true + ProgramDatabase + $(OutDir)JSLib.pdb + + + + + + $(OutDir)JSLib.lib + MachineX64 + + + Windows + true + $(OutDir)JSLib.pdb + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/JSImpl/solution/JSLib.vcxproj.filters b/JSImpl/solution/JSLib.vcxproj.filters new file mode 100644 index 0000000..afcbbb9 --- /dev/null +++ b/JSImpl/solution/JSLib.vcxproj.filters @@ -0,0 +1,54 @@ + + + + + {2DAB880B-99B4-887C-2230-9F7C8E38947C} + + + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + + + src + + + src + + + src + + + src + + + src + + + diff --git a/JSImpl/solution/genie.lua b/JSImpl/solution/genie.lua index ced7ec1..8b34d97 100644 --- a/JSImpl/solution/genie.lua +++ b/JSImpl/solution/genie.lua @@ -1,20 +1,24 @@ -solution 'IPL' - configurations {'debug', 'release'} +solution 'JSImpl' + configurations {'Debug', 'Release'} + platforms { 'x64' } flags { 'FatalWarnings', 'ExtraWarnings', 'Cpp14', + 'Symbols', } + local root = '../build/' - configuration 'debug' - targetdir(root .. 'bin/debug') - objdir(root .. 'obj/debug') + configuration 'Debug' + targetdir(root .. 'bin/Debug') + objdir(root .. 'obj/Debug') - configuration 'release' - targetdir(root .. 'bin/release') - objdir(root .. 'obj/release') + configuration 'Release' + flags 'OptimizeSpeed' + targetdir(root .. 'bin/Release') + objdir(root .. 'obj/Release') configuration '*' project 'JSLib' @@ -33,3 +37,4 @@ solution 'IPL' links 'JSLib' include '../test' + startproject 'Test' -- cgit v1.3.1-23-gd82d