Skip to content

Commit 3633cc5

Browse files
maxchisttmaxchistt
committed
Make QtVision external
1 parent eeed340 commit 3633cc5

17 files changed

Lines changed: 31 additions & 2603 deletions

‎CellLifeSimulation.sln‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WpfCellLifeSimulationApp",
1313
EndProject
1414
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebCellLifeSimulationApp", "WebCellLifeSimulationApp\WebCellLifeSimulationApp.csproj", "{CECA30FE-246B-4FB4-B084-2004DD180739}"
1515
EndProject
16-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "QtVision", "QtVision\QtVision.vcxproj", "{24FBAF90-E7BC-4DF9-892B-9882E21A1CD0}"
17-
EndProject
1816
Global
1917
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2018
Debug|x64 = Debug|x64
@@ -61,12 +59,6 @@ Global
6159
{CECA30FE-246B-4FB4-B084-2004DD180739}.Release|x64.Build.0 = Release|x64
6260
{CECA30FE-246B-4FB4-B084-2004DD180739}.Release|x86.ActiveCfg = Release|x86
6361
{CECA30FE-246B-4FB4-B084-2004DD180739}.Release|x86.Build.0 = Release|x86
64-
{24FBAF90-E7BC-4DF9-892B-9882E21A1CD0}.Debug|x64.ActiveCfg = Debug|x64
65-
{24FBAF90-E7BC-4DF9-892B-9882E21A1CD0}.Debug|x64.Build.0 = Debug|x64
66-
{24FBAF90-E7BC-4DF9-892B-9882E21A1CD0}.Debug|x86.ActiveCfg = Debug|x64
67-
{24FBAF90-E7BC-4DF9-892B-9882E21A1CD0}.Release|x64.ActiveCfg = Release|x64
68-
{24FBAF90-E7BC-4DF9-892B-9882E21A1CD0}.Release|x64.Build.0 = Release|x64
69-
{24FBAF90-E7BC-4DF9-892B-9882E21A1CD0}.Release|x86.ActiveCfg = Release|x64
7062
EndGlobalSection
7163
GlobalSection(SolutionProperties) = preSolution
7264
HideSolutionNode = FALSE

‎QtCellLifeSimulationApp/QtCellLifeSimulationApp.vcxproj‎

Lines changed: 23 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -60,23 +60,33 @@
6060
</PropertyGroup>
6161
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
6262
<ClCompile>
63-
<AdditionalIncludeDirectories>..\QtVision\Include;..\C3D\Kernel\Include;..\C3D\Vision\Include;..\CellLifeSimulationModel;.\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
64-
<PreprocessorDefinitions>QT_VISION_STATIC</PreprocessorDefinitions>
63+
<AdditionalIncludeDirectories>..\C3D\Kernel\Include;..\C3D\Vision\Include;..\QtVision\Include;..\CellLifeSimulationModel;.\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
64+
<PreprocessorDefinitions>
65+
</PreprocessorDefinitions>
6566
</ClCompile>
6667
<Link>
67-
<AdditionalLibraryDirectories>..\C3D\Kernel\$(Configuration);..\C3D\Vision\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
68-
<AdditionalDependencies>c3dvision.lib;c3d.lib;%(AdditionalDependencies)</AdditionalDependencies>
68+
<AdditionalLibraryDirectories>..\C3D\Kernel\$(Configuration);..\C3D\Vision\$(Configuration);..\QtVision\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
69+
<AdditionalDependencies>c3dvision.lib;c3d.lib;qtvision.lib;%(AdditionalDependencies)</AdditionalDependencies>
6970
</Link>
71+
<PreBuildEvent>
72+
<Command>xcopy /y "$(SolutionDir)C3D\Vision\$(Configuration)\c3dvision.dll" "$(SolutionDir)$(Platform)\$(Configuration)"
73+
xcopy /y "$(SolutionDir)C3D\Kernel\$(Configuration)\c3d.dll" "$(SolutionDir)$(Platform)\$(Configuration)"</Command>
74+
</PreBuildEvent>
7075
</ItemDefinitionGroup>
7176
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
7277
<ClCompile>
73-
<AdditionalIncludeDirectories>..\QtVision\Include;..\C3D\Kernel\Include;..\C3D\Vision\Include;..\CellLifeSimulationModel;.\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
74-
<PreprocessorDefinitions>QT_VISION_STATIC</PreprocessorDefinitions>
78+
<AdditionalIncludeDirectories>..\C3D\Kernel\Include;..\C3D\Vision\Include;..\QtVision\Include;..\CellLifeSimulationModel;.\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
79+
<PreprocessorDefinitions>
80+
</PreprocessorDefinitions>
7581
</ClCompile>
7682
<Link>
77-
<AdditionalDependencies>c3dvision.lib;c3d.lib;%(AdditionalDependencies)</AdditionalDependencies>
78-
<AdditionalLibraryDirectories>..\C3D\Kernel\$(Configuration);..\C3D\Vision\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
83+
<AdditionalDependencies>c3dvision.lib;c3d.lib;qtvision.lib;%(AdditionalDependencies)</AdditionalDependencies>
84+
<AdditionalLibraryDirectories>..\C3D\Kernel\$(Configuration);..\C3D\Vision\$(Configuration);..\QtVision\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
7985
</Link>
86+
<PreBuildEvent>
87+
<Command>xcopy /y "$(SolutionDir)C3D\Vision\$(Configuration)\c3dvision.dll" "$(SolutionDir)$(Platform)\$(Configuration)"
88+
xcopy /y "$(SolutionDir)C3D\Kernel\$(Configuration)\c3d.dll" "$(SolutionDir)$(Platform)\$(Configuration)"</Command>
89+
</PreBuildEvent>
8090
</ItemDefinitionGroup>
8191
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'" Label="Configuration">
8292
<ClCompile>
@@ -123,14 +133,6 @@
123133
<ClCompile Include="main.cpp" />
124134
<QtUic Include="TimeSettingsDialog.ui" />
125135
</ItemGroup>
126-
<ItemGroup>
127-
<ProjectReference Include="..\CellLifeSimulationModel\CellLifeSimulationModel.vcxproj">
128-
<Project>{7a01aebd-767d-4d71-a500-3aefee76d1b7}</Project>
129-
</ProjectReference>
130-
<ProjectReference Include="..\QtVision\QtVision.vcxproj">
131-
<Project>{24fbaf90-e7bc-4df9-892b-9882e21a1cd0}</Project>
132-
</ProjectReference>
133-
</ItemGroup>
134136
<ItemGroup>
135137
<QtMoc Include="SimulationView.h" />
136138
</ItemGroup>
@@ -150,6 +152,11 @@
150152
<ItemGroup>
151153
<ResourceCompile Include="QtCellLifeSimulationApp.rc" />
152154
</ItemGroup>
155+
<ItemGroup>
156+
<ProjectReference Include="..\CellLifeSimulationModel\CellLifeSimulationModel.vcxproj">
157+
<Project>{7a01aebd-767d-4d71-a500-3aefee76d1b7}</Project>
158+
</ProjectReference>
159+
</ItemGroup>
153160
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
154161
<ImportGroup Condition="Exists('$(QtMsBuild)\qt.targets')">
155162
<Import Project="$(QtMsBuild)\qt.targets" />

‎QtCellLifeSimulationApp/SimulationViewC3D.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,8 @@ void SimulationViewC3D::prepareScene()
123123

124124
void SimulationViewC3D::checkLicense()
125125
{
126-
QtVision::setLicense(LKEY, LSIGN);
127-
QtVision::checkLicense();
126+
QtVision::setLicenseKeyValues(LKEY, LSIGN);
127+
QtVision::checkLicenseWithInput();
128128
}
129129

130130
#endif

‎QtCellLifeSimulationApp/SimulationViewC3D.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@
1010
#include <mesh_triangle.h>
1111
#include <mesh.h>
1212
#include <vsn_labelgeometry.h>
13-
#include <qlogging.h>
14-
#include <last.h>
1513

1614
VSN_USE_NAMESPACE
1715

‎QtCellLifeSimulationApp/main.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
#include <QtWidgets/QApplication>
33
#include <QStyleFactory>
44
#include "C3D_USAGE.h"
5+
56
#ifdef C3D_USAGE
67
#include <qt_openglwidget.h>
78
#include <qlogging.h>

‎QtVision/Include/lisencekey.h‎

Lines changed: 0 additions & 14 deletions
This file was deleted.

0 commit comments

Comments
 (0)