Skip to content

Commit

Permalink
#4 Visual Studio vcdMaker static library
Browse files Browse the repository at this point in the history
  • Loading branch information
WojciechRynczuk committed Jan 4, 2017
1 parent 034355f commit 75665f4
Show file tree
Hide file tree
Showing 9 changed files with 385 additions and 315 deletions.
24 changes: 24 additions & 0 deletions windows/Bootstrapper/Bootstrapper.sln
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,19 @@ Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Installer", "..\Installer\I
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vcdMerge", "..\vcdMaker\vcdMerge\vcdMerge.vcxproj", "{F2A67A23-8D8D-44FE-9F00-7C59DAD8A954}"
ProjectSection(ProjectDependencies) = postProject
{DBC389FC-FB63-430B-9443-F4DE90F1AB0E} = {DBC389FC-FB63-430B-9443-F4DE90F1AB0E}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vcdMaker", "..\vcdMaker\vcdMaker\vcdMaker.vcxproj", "{39CE447A-C072-4E08-9042-2208DF3A25D6}"
ProjectSection(ProjectDependencies) = postProject
{DBC389FC-FB63-430B-9443-F4DE90F1AB0E} = {DBC389FC-FB63-430B-9443-F4DE90F1AB0E}
EndProjectSection
EndProject
Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Bootstrapper", "Bootstrapper.wixproj", "{AA694554-90FE-4F5B-B432-1373894AA8DA}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vcdMakerCore", "..\vcdMaker\vcdMakerCore\vcdMakerCore.vcxproj", "{DBC389FC-FB63-430B-9443-F4DE90F1AB0E}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Mixed Platforms = Debug|Mixed Platforms
Expand Down Expand Up @@ -83,6 +91,22 @@ Global
{AA694554-90FE-4F5B-B432-1373894AA8DA}.Release|x64.ActiveCfg = Release|x86
{AA694554-90FE-4F5B-B432-1373894AA8DA}.Release|x86.ActiveCfg = Release|x86
{AA694554-90FE-4F5B-B432-1373894AA8DA}.Release|x86.Build.0 = Release|x86
{DBC389FC-FB63-430B-9443-F4DE90F1AB0E}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
{DBC389FC-FB63-430B-9443-F4DE90F1AB0E}.Debug|Mixed Platforms.Build.0 = Debug|Win32
{DBC389FC-FB63-430B-9443-F4DE90F1AB0E}.Debug|Win32.ActiveCfg = Debug|Win32
{DBC389FC-FB63-430B-9443-F4DE90F1AB0E}.Debug|Win32.Build.0 = Debug|Win32
{DBC389FC-FB63-430B-9443-F4DE90F1AB0E}.Debug|x64.ActiveCfg = Debug|x64
{DBC389FC-FB63-430B-9443-F4DE90F1AB0E}.Debug|x64.Build.0 = Debug|x64
{DBC389FC-FB63-430B-9443-F4DE90F1AB0E}.Debug|x86.ActiveCfg = Debug|Win32
{DBC389FC-FB63-430B-9443-F4DE90F1AB0E}.Debug|x86.Build.0 = Debug|Win32
{DBC389FC-FB63-430B-9443-F4DE90F1AB0E}.Release|Mixed Platforms.ActiveCfg = Release|Win32
{DBC389FC-FB63-430B-9443-F4DE90F1AB0E}.Release|Mixed Platforms.Build.0 = Release|Win32
{DBC389FC-FB63-430B-9443-F4DE90F1AB0E}.Release|Win32.ActiveCfg = Release|Win32
{DBC389FC-FB63-430B-9443-F4DE90F1AB0E}.Release|Win32.Build.0 = Release|Win32
{DBC389FC-FB63-430B-9443-F4DE90F1AB0E}.Release|x64.ActiveCfg = Release|x64
{DBC389FC-FB63-430B-9443-F4DE90F1AB0E}.Release|x64.Build.0 = Release|x64
{DBC389FC-FB63-430B-9443-F4DE90F1AB0E}.Release|x86.ActiveCfg = Release|Win32
{DBC389FC-FB63-430B-9443-F4DE90F1AB0E}.Release|x86.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
24 changes: 24 additions & 0 deletions windows/Installer/Installer.sln
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,16 @@ Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Installer", "Installer.wixp
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vcdMerge", "..\vcdMaker\vcdMerge\vcdMerge.vcxproj", "{F2A67A23-8D8D-44FE-9F00-7C59DAD8A954}"
ProjectSection(ProjectDependencies) = postProject
{DBC389FC-FB63-430B-9443-F4DE90F1AB0E} = {DBC389FC-FB63-430B-9443-F4DE90F1AB0E}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vcdMaker", "..\vcdMaker\vcdMaker\vcdMaker.vcxproj", "{39CE447A-C072-4E08-9042-2208DF3A25D6}"
ProjectSection(ProjectDependencies) = postProject
{DBC389FC-FB63-430B-9443-F4DE90F1AB0E} = {DBC389FC-FB63-430B-9443-F4DE90F1AB0E}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vcdMakerCore", "..\vcdMaker\vcdMakerCore\vcdMakerCore.vcxproj", "{DBC389FC-FB63-430B-9443-F4DE90F1AB0E}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down Expand Up @@ -67,6 +75,22 @@ Global
{39CE447A-C072-4E08-9042-2208DF3A25D6}.Release|x64.ActiveCfg = Release|Win32
{39CE447A-C072-4E08-9042-2208DF3A25D6}.Release|x86.ActiveCfg = Release|Win32
{39CE447A-C072-4E08-9042-2208DF3A25D6}.Release|x86.Build.0 = Release|Win32
{DBC389FC-FB63-430B-9443-F4DE90F1AB0E}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
{DBC389FC-FB63-430B-9443-F4DE90F1AB0E}.Debug|Mixed Platforms.Build.0 = Debug|Win32
{DBC389FC-FB63-430B-9443-F4DE90F1AB0E}.Debug|Win32.ActiveCfg = Debug|Win32
{DBC389FC-FB63-430B-9443-F4DE90F1AB0E}.Debug|Win32.Build.0 = Debug|Win32
{DBC389FC-FB63-430B-9443-F4DE90F1AB0E}.Debug|x64.ActiveCfg = Debug|x64
{DBC389FC-FB63-430B-9443-F4DE90F1AB0E}.Debug|x64.Build.0 = Debug|x64
{DBC389FC-FB63-430B-9443-F4DE90F1AB0E}.Debug|x86.ActiveCfg = Debug|Win32
{DBC389FC-FB63-430B-9443-F4DE90F1AB0E}.Debug|x86.Build.0 = Debug|Win32
{DBC389FC-FB63-430B-9443-F4DE90F1AB0E}.Release|Mixed Platforms.ActiveCfg = Release|Win32
{DBC389FC-FB63-430B-9443-F4DE90F1AB0E}.Release|Mixed Platforms.Build.0 = Release|Win32
{DBC389FC-FB63-430B-9443-F4DE90F1AB0E}.Release|Win32.ActiveCfg = Release|Win32
{DBC389FC-FB63-430B-9443-F4DE90F1AB0E}.Release|Win32.Build.0 = Release|Win32
{DBC389FC-FB63-430B-9443-F4DE90F1AB0E}.Release|x64.ActiveCfg = Release|x64
{DBC389FC-FB63-430B-9443-F4DE90F1AB0E}.Release|x64.Build.0 = Release|x64
{DBC389FC-FB63-430B-9443-F4DE90F1AB0E}.Release|x86.ActiveCfg = Release|Win32
{DBC389FC-FB63-430B-9443-F4DE90F1AB0E}.Release|x86.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
18 changes: 17 additions & 1 deletion windows/vcdMaker/vcdMaker.sln
Original file line number Diff line number Diff line change
@@ -1,11 +1,19 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25123.0
VisualStudioVersion = 14.0.24720.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vcdMaker", "vcdMaker\vcdMaker.vcxproj", "{39CE447A-C072-4E08-9042-2208DF3A25D6}"
ProjectSection(ProjectDependencies) = postProject
{DBC389FC-FB63-430B-9443-F4DE90F1AB0E} = {DBC389FC-FB63-430B-9443-F4DE90F1AB0E}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vcdMerge", "vcdMerge\vcdMerge.vcxproj", "{F2A67A23-8D8D-44FE-9F00-7C59DAD8A954}"
ProjectSection(ProjectDependencies) = postProject
{DBC389FC-FB63-430B-9443-F4DE90F1AB0E} = {DBC389FC-FB63-430B-9443-F4DE90F1AB0E}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vcdMakerCore", "vcdMakerCore\vcdMakerCore.vcxproj", "{DBC389FC-FB63-430B-9443-F4DE90F1AB0E}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand All @@ -27,6 +35,14 @@ Global
{F2A67A23-8D8D-44FE-9F00-7C59DAD8A954}.Release|Win32.ActiveCfg = Release|Win32
{F2A67A23-8D8D-44FE-9F00-7C59DAD8A954}.Release|Win32.Build.0 = Release|Win32
{F2A67A23-8D8D-44FE-9F00-7C59DAD8A954}.Release|x64.ActiveCfg = Release|Win32
{DBC389FC-FB63-430B-9443-F4DE90F1AB0E}.Debug|Win32.ActiveCfg = Debug|Win32
{DBC389FC-FB63-430B-9443-F4DE90F1AB0E}.Debug|Win32.Build.0 = Debug|Win32
{DBC389FC-FB63-430B-9443-F4DE90F1AB0E}.Debug|x64.ActiveCfg = Debug|x64
{DBC389FC-FB63-430B-9443-F4DE90F1AB0E}.Debug|x64.Build.0 = Debug|x64
{DBC389FC-FB63-430B-9443-F4DE90F1AB0E}.Release|Win32.ActiveCfg = Release|Win32
{DBC389FC-FB63-430B-9443-F4DE90F1AB0E}.Release|Win32.Build.0 = Release|Win32
{DBC389FC-FB63-430B-9443-F4DE90F1AB0E}.Release|x64.ActiveCfg = Release|x64
{DBC389FC-FB63-430B-9443-F4DE90F1AB0E}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
41 changes: 4 additions & 37 deletions windows/vcdMaker/vcdMaker/vcdMaker.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;vcdMakerCore.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(SolutionDir)$(Configuration)\</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
Expand All @@ -75,49 +77,14 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;vcdMakerCore.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(SolutionDir)$(Configuration)\</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClInclude Include="..\..\..\sources\common\inc\CliParser.h" />
<ClInclude Include="..\..\..\sources\common\inc\EventSignal.h" />
<ClInclude Include="..\..\..\sources\common\inc\EventSignalCreator.h" />
<ClInclude Include="..\..\..\sources\common\inc\FSignal.h" />
<ClInclude Include="..\..\..\sources\common\inc\FSignalCreator.h" />
<ClInclude Include="..\..\..\sources\common\inc\ISignal.h" />
<ClInclude Include="..\..\..\sources\common\inc\ISignalCreator.h" />
<ClInclude Include="..\..\..\sources\common\inc\LineCounter.h" />
<ClInclude Include="..\..\..\sources\common\inc\LogParser.h" />
<ClInclude Include="..\..\..\sources\common\inc\Signal.h" />
<ClInclude Include="..\..\..\sources\common\inc\SignalCreator.h" />
<ClInclude Include="..\..\..\sources\common\inc\SignalDb.h" />
<ClInclude Include="..\..\..\sources\common\inc\SignalFactory.h" />
<ClInclude Include="..\..\..\sources\common\inc\SignalStructureBuilder.h" />
<ClInclude Include="..\..\..\sources\common\inc\SourceRegistry.h" />
<ClInclude Include="..\..\..\sources\common\inc\TimeFrame.h" />
<ClInclude Include="..\..\..\sources\common\inc\TxtParser.h" />
<ClInclude Include="..\..\..\sources\common\inc\Utils.h" />
<ClInclude Include="..\..\..\sources\common\inc\VcdExceptions.h" />
<ClInclude Include="..\..\..\sources\common\inc\VCDTracer.h" />
<ClInclude Include="..\..\..\sources\common\inc\Version.h" />
<ClInclude Include="..\..\..\sources\vcdMaker\inc\CliMaker.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\sources\common\src\EventSignalCreator.cpp" />
<ClCompile Include="..\..\..\sources\common\src\FSignal.cpp" />
<ClCompile Include="..\..\..\sources\common\src\FSignalCreator.cpp" />
<ClCompile Include="..\..\..\sources\common\src\ISignal.cpp" />
<ClCompile Include="..\..\..\sources\common\src\ISignalCreator.cpp" />
<ClCompile Include="..\..\..\sources\common\src\LineCounter.cpp" />
<ClCompile Include="..\..\..\sources\common\src\LogParser.cpp" />
<ClCompile Include="..\..\..\sources\common\src\Signal.cpp" />
<ClCompile Include="..\..\..\sources\common\src\SignalDb.cpp" />
<ClCompile Include="..\..\..\sources\common\src\SignalFactory.cpp" />
<ClCompile Include="..\..\..\sources\common\src\SignalStructureBuilder.cpp" />
<ClCompile Include="..\..\..\sources\common\src\SourceRegistry.cpp" />
<ClCompile Include="..\..\..\sources\common\src\TimeFrame.cpp" />
<ClCompile Include="..\..\..\sources\common\src\TxtParser.cpp" />
<ClCompile Include="..\..\..\sources\common\src\Utils.cpp" />
<ClCompile Include="..\..\..\sources\common\src\VCDTracer.cpp" />
<ClCompile Include="..\..\..\sources\vcdMaker\src\vcdMaker.cpp" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
Expand Down
120 changes: 0 additions & 120 deletions windows/vcdMaker/vcdMaker/vcdMaker.vcxproj.filters
Original file line number Diff line number Diff line change
Expand Up @@ -9,135 +9,15 @@
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
<Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
</Filter>
<Filter Include="Common">
<UniqueIdentifier>{5236e438-b208-45cf-ba1d-81f606bd37cc}</UniqueIdentifier>
</Filter>
<Filter Include="Common\Header Files">
<UniqueIdentifier>{864f38ab-f79f-41f0-95b5-9b5fa6fe5401}</UniqueIdentifier>
</Filter>
<Filter Include="Common\Source Files">
<UniqueIdentifier>{eeae0b57-6901-40b7-a867-4e10f91f98bb}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\sources\vcdMaker\inc\CliMaker.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\sources\common\inc\CliParser.h">
<Filter>Common\Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\sources\common\inc\FSignal.h">
<Filter>Common\Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\sources\common\inc\FSignalCreator.h">
<Filter>Common\Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\sources\common\inc\ISignal.h">
<Filter>Common\Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\sources\common\inc\ISignalCreator.h">
<Filter>Common\Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\sources\common\inc\LineCounter.h">
<Filter>Common\Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\sources\common\inc\LogParser.h">
<Filter>Common\Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\sources\common\inc\Signal.h">
<Filter>Common\Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\sources\common\inc\SignalCreator.h">
<Filter>Common\Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\sources\common\inc\SignalDb.h">
<Filter>Common\Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\sources\common\inc\SignalFactory.h">
<Filter>Common\Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\sources\common\inc\SignalStructureBuilder.h">
<Filter>Common\Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\sources\common\inc\SourceRegistry.h">
<Filter>Common\Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\sources\common\inc\TimeFrame.h">
<Filter>Common\Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\sources\common\inc\TxtParser.h">
<Filter>Common\Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\sources\common\inc\VcdExceptions.h">
<Filter>Common\Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\sources\common\inc\VCDTracer.h">
<Filter>Common\Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\sources\common\inc\Version.h">
<Filter>Common\Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\sources\common\inc\Utils.h">
<Filter>Common\Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\sources\common\inc\EventSignal.h">
<Filter>Common\Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\sources\common\inc\EventSignalCreator.h">
<Filter>Common\Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\sources\vcdMaker\src\vcdMaker.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\sources\common\src\FSignal.cpp">
<Filter>Common\Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\sources\common\src\FSignalCreator.cpp">
<Filter>Common\Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\sources\common\src\ISignal.cpp">
<Filter>Common\Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\sources\common\src\ISignalCreator.cpp">
<Filter>Common\Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\sources\common\src\LineCounter.cpp">
<Filter>Common\Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\sources\common\src\LogParser.cpp">
<Filter>Common\Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\sources\common\src\Signal.cpp">
<Filter>Common\Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\sources\common\src\SignalDb.cpp">
<Filter>Common\Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\sources\common\src\SignalFactory.cpp">
<Filter>Common\Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\sources\common\src\SignalStructureBuilder.cpp">
<Filter>Common\Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\sources\common\src\SourceRegistry.cpp">
<Filter>Common\Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\sources\common\src\TimeFrame.cpp">
<Filter>Common\Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\sources\common\src\TxtParser.cpp">
<Filter>Common\Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\sources\common\src\VCDTracer.cpp">
<Filter>Common\Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\sources\common\src\Utils.cpp">
<Filter>Common\Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\sources\common\src\EventSignalCreator.cpp">
<Filter>Common\Source Files</Filter>
</ClCompile>
</ItemGroup>
</Project>
Loading

0 comments on commit 75665f4

Please sign in to comment.