Skip to content

Commit a6c667d

Browse files
jannamartinekjannamartinek
committed
Moving clear-sky DNI calculations into separate library
1 parent c9823f1 commit a6c667d

File tree

11 files changed

+573
-107
lines changed

11 files changed

+573
-107
lines changed

‎app/scripting.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -260,8 +260,8 @@ void _test(lk::invoke_t &cxt)
260260
P->m_variables.n_wash_crews.assign( 3 );
261261
P->m_variables.N_panels.assign( 16 );
262262

263-
//P->m_parameters.solar_resource_file.assign( "/home/mike/workspace/dao-tk/deploy/samples/USA CA Daggett Barstow-daggett Ap (TMY3).csv" );
264-
P->m_parameters.solar_resource_file.assign("C:/Users/jmartine/Documents/Projects/dao-tk/deploy/samples/USA CA Daggett Barstow-daggett Ap (TMY3).csv");
263+
P->m_parameters.solar_resource_file.assign( "/home/mike/workspace/dao-tk/deploy/samples/USA CA Daggett Barstow-daggett Ap (TMY3).csv" );
264+
265265
P->D();
266266
P->M();
267267
P->O();
@@ -797,7 +797,7 @@ void _simulate_performance(lk::invoke_t &cxt)
797797
mw.Log("Specified clustering algorithm not recognized");
798798
}
799799
else
800-
P->m_cluster_parameters.alg = KMEANS;
800+
P->m_cluster_parameters.alg = AFFINITY_PROPAGATION;
801801
}
802802

803803
//--- Price array from price file

‎build_vs2017/dao-tk_vs2017.sln‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dao-tk", "dao-tk_vs2017.vcx
77
ProjectSection(ProjectDependencies) = postProject
88
{D0B9A03F-F041-4108-9728-098275555C89} = {D0B9A03F-F041-4108-9728-098275555C89}
99
{46D1EE84-840B-4325-910A-BC205A0D4C08} = {46D1EE84-840B-4325-910A-BC205A0D4C08}
10+
{809D27CE-1241-4503-A38A-4BF90B683612} = {809D27CE-1241-4503-A38A-4BF90B683612}
1011
{C273DFFB-F8E1-4B59-885F-B1B4097FD8F6} = {C273DFFB-F8E1-4B59-885F-B1B4097FD8F6}
1112
{03C32DFE-081B-4DA8-8944-776BA8EE0A10} = {03C32DFE-081B-4DA8-8944-776BA8EE0A10}
1213
EndProjectSection
@@ -16,8 +17,16 @@ EndProject
1617
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liboptical", "liboptical.vcxproj", "{C273DFFB-F8E1-4B59-885F-B1B4097FD8F6}"
1718
EndProject
1819
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsolar", "libsolar.vcxproj", "{03C32DFE-081B-4DA8-8944-776BA8EE0A10}"
20+
ProjectSection(ProjectDependencies) = postProject
21+
{809D27CE-1241-4503-A38A-4BF90B683612} = {809D27CE-1241-4503-A38A-4BF90B683612}
22+
EndProjectSection
1923
EndProject
2024
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcluster", "libcluster.vcxproj", "{D0B9A03F-F041-4108-9728-098275555C89}"
25+
ProjectSection(ProjectDependencies) = postProject
26+
{809D27CE-1241-4503-A38A-4BF90B683612} = {809D27CE-1241-4503-A38A-4BF90B683612}
27+
EndProjectSection
28+
EndProject
29+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libclearsky", "libclearsky.vcxproj", "{809D27CE-1241-4503-A38A-4BF90B683612}"
2130
EndProject
2231
Global
2332
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -67,6 +76,14 @@ Global
6776
{D0B9A03F-F041-4108-9728-098275555C89}.Release|x64.Build.0 = Release|x64
6877
{D0B9A03F-F041-4108-9728-098275555C89}.Release|x86.ActiveCfg = Release|Win32
6978
{D0B9A03F-F041-4108-9728-098275555C89}.Release|x86.Build.0 = Release|Win32
79+
{809D27CE-1241-4503-A38A-4BF90B683612}.Debug|x64.ActiveCfg = Debug|x64
80+
{809D27CE-1241-4503-A38A-4BF90B683612}.Debug|x64.Build.0 = Debug|x64
81+
{809D27CE-1241-4503-A38A-4BF90B683612}.Debug|x86.ActiveCfg = Debug|Win32
82+
{809D27CE-1241-4503-A38A-4BF90B683612}.Debug|x86.Build.0 = Debug|Win32
83+
{809D27CE-1241-4503-A38A-4BF90B683612}.Release|x64.ActiveCfg = Release|x64
84+
{809D27CE-1241-4503-A38A-4BF90B683612}.Release|x64.Build.0 = Release|x64
85+
{809D27CE-1241-4503-A38A-4BF90B683612}.Release|x86.ActiveCfg = Release|Win32
86+
{809D27CE-1241-4503-A38A-4BF90B683612}.Release|x86.Build.0 = Release|Win32
7087
EndGlobalSection
7188
GlobalSection(SolutionProperties) = preSolution
7289
HideSolutionNode = FALSE

‎build_vs2017/libclearsky.vcxproj‎

Lines changed: 287 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,287 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ItemGroup Label="ProjectConfigurations">
4+
<ProjectConfiguration Include="Debug|Win32">
5+
<Configuration>Debug</Configuration>
6+
<Platform>Win32</Platform>
7+
</ProjectConfiguration>
8+
<ProjectConfiguration Include="Debug|x64">
9+
<Configuration>Debug</Configuration>
10+
<Platform>x64</Platform>
11+
</ProjectConfiguration>
12+
<ProjectConfiguration Include="Release|Win32">
13+
<Configuration>Release</Configuration>
14+
<Platform>Win32</Platform>
15+
</ProjectConfiguration>
16+
<ProjectConfiguration Include="Release|x64">
17+
<Configuration>Release</Configuration>
18+
<Platform>x64</Platform>
19+
</ProjectConfiguration>
20+
</ItemGroup>
21+
<ItemGroup>
22+
<ClCompile Include="..\libclearsky\clearsky.cpp" />
23+
<ClCompile Include="..\libclearsky\solpos.cpp" />
24+
</ItemGroup>
25+
<ItemGroup>
26+
<ClInclude Include="..\libclearsky\clearsky.h" />
27+
<ClInclude Include="..\libclearsky\solpos00.h" />
28+
</ItemGroup>
29+
<PropertyGroup Label="Globals">
30+
<ProjectGuid>{809D27CE-1241-4503-A38A-4BF90B683612}</ProjectGuid>
31+
<Keyword>Win32Proj</Keyword>
32+
<RootNamespace>libclearsky</RootNamespace>
33+
<ProjectName>libclearsky</ProjectName>
34+
<WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
35+
</PropertyGroup>
36+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
37+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
38+
<ConfigurationType>StaticLibrary</ConfigurationType>
39+
<UseDebugLibraries>true</UseDebugLibraries>
40+
<CharacterSet>NotSet</CharacterSet>
41+
<PlatformToolset>v141</PlatformToolset>
42+
</PropertyGroup>
43+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
44+
<ConfigurationType>StaticLibrary</ConfigurationType>
45+
<UseDebugLibraries>true</UseDebugLibraries>
46+
<CharacterSet>NotSet</CharacterSet>
47+
<PlatformToolset>v141</PlatformToolset>
48+
</PropertyGroup>
49+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
50+
<ConfigurationType>StaticLibrary</ConfigurationType>
51+
<UseDebugLibraries>false</UseDebugLibraries>
52+
<WholeProgramOptimization>false</WholeProgramOptimization>
53+
<CharacterSet>NotSet</CharacterSet>
54+
<PlatformToolset>v141</PlatformToolset>
55+
</PropertyGroup>
56+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
57+
<ConfigurationType>StaticLibrary</ConfigurationType>
58+
<UseDebugLibraries>false</UseDebugLibraries>
59+
<WholeProgramOptimization>false</WholeProgramOptimization>
60+
<CharacterSet>NotSet</CharacterSet>
61+
<PlatformToolset>v141</PlatformToolset>
62+
</PropertyGroup>
63+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
64+
<ImportGroup Label="ExtensionSettings">
65+
</ImportGroup>
66+
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
67+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
68+
</ImportGroup>
69+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
70+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
71+
</ImportGroup>
72+
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
73+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
74+
</ImportGroup>
75+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
76+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
77+
</ImportGroup>
78+
<PropertyGroup Label="UserMacros" />
79+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
80+
<LinkIncremental>true</LinkIncremental>
81+
<OutDir>target\</OutDir>
82+
<IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
83+
<TargetName>libclearsky32d</TargetName>
84+
</PropertyGroup>
85+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
86+
<LinkIncremental>true</LinkIncremental>
87+
<OutDir>target\</OutDir>
88+
<IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
89+
<TargetName>libclearsky32d</TargetName>
90+
</PropertyGroup>
91+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
92+
<LinkIncremental>false</LinkIncremental>
93+
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
94+
<IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
95+
<TargetName>libclearsky32</TargetName>
96+
</PropertyGroup>
97+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
98+
<LinkIncremental>false</LinkIncremental>
99+
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
100+
<IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
101+
<TargetName>libclearsky</TargetName>
102+
</PropertyGroup>
103+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
104+
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
105+
</PropertyGroup>
106+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
107+
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
108+
</PropertyGroup>
109+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
110+
<IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
111+
</PropertyGroup>
112+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
113+
<IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
114+
</PropertyGroup>
115+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
116+
<TargetName>libclearskyd32</TargetName>
117+
</PropertyGroup>
118+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
119+
<TargetName>libclearskyd</TargetName>
120+
</PropertyGroup>
121+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug32|Win32'">
122+
<OutDir>target\</OutDir>
123+
</PropertyGroup>
124+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug32|Win32'">
125+
<IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
126+
</PropertyGroup>
127+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug32|Win32'">
128+
<TargetName>libclearsky32d</TargetName>
129+
</PropertyGroup>
130+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release32|Win32'">
131+
<OutDir>target\</OutDir>
132+
</PropertyGroup>
133+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release32|Win32'">
134+
<IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
135+
</PropertyGroup>
136+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release32|Win32'">
137+
<TargetName>libclearsky32</TargetName>
138+
</PropertyGroup>
139+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release32|x64'">
140+
<OutDir>target\</OutDir>
141+
</PropertyGroup>
142+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release32|x64'">
143+
<IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
144+
</PropertyGroup>
145+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release32|x64'">
146+
<TargetName>libclearsky64</TargetName>
147+
</PropertyGroup>
148+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug32|x64'">
149+
<OutDir>target\</OutDir>
150+
</PropertyGroup>
151+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug32|x64'">
152+
<IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
153+
</PropertyGroup>
154+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug32|x64'">
155+
<TargetName>libclearsky64d</TargetName>
156+
</PropertyGroup>
157+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
158+
<ClCompile>
159+
<PrecompiledHeader>
160+
</PrecompiledHeader>
161+
<WarningLevel>Level4</WarningLevel>
162+
<Optimization>Disabled</Optimization>
163+
<PreprocessorDefinitions>__32BIT__;__WIN__;WIN32;_DEBUG;_CONSOLE</PreprocessorDefinitions>
164+
</ClCompile>
165+
<Link>
166+
<SubSystem>Console</SubSystem>
167+
<GenerateDebugInformation>true</GenerateDebugInformation>
168+
</Link>
169+
</ItemDefinitionGroup>
170+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
171+
<ClCompile>
172+
<PrecompiledHeader>
173+
</PrecompiledHeader>
174+
<WarningLevel>Level4</WarningLevel>
175+
<Optimization>Disabled</Optimization>
176+
<PreprocessorDefinitions>__32BIT__;__WIN__;WIN32;_DEBUG;_CONSOLE</PreprocessorDefinitions>
177+
</ClCompile>
178+
<Link>
179+
<SubSystem>Console</SubSystem>
180+
<GenerateDebugInformation>true</GenerateDebugInformation>
181+
</Link>
182+
</ItemDefinitionGroup>
183+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
184+
<ClCompile>
185+
<WarningLevel>Level4</WarningLevel>
186+
<PrecompiledHeader>
187+
</PrecompiledHeader>
188+
<Optimization>MaxSpeed</Optimization>
189+
<FunctionLevelLinking>true</FunctionLevelLinking>
190+
<IntrinsicFunctions>true</IntrinsicFunctions>
191+
<PreprocessorDefinitions>__DLL__;__32BIT__;__WINDOWS__;__VISUALC__;_CRT_SECURE_NO_WARNINGS; _CRT_SECURE_NO_WARNINGS; _CRT_SECURE_NO_WARNINGS</PreprocessorDefinitions>
192+
<WholeProgramOptimization>false</WholeProgramOptimization>
193+
<AdditionalIncludeDirectories>$(SolutionDir)\..\libclearsky;$(SSCDIR)/shared;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
194+
</ClCompile>
195+
<Link>
196+
<SubSystem>Console</SubSystem>
197+
<GenerateDebugInformation>true</GenerateDebugInformation>
198+
<EnableCOMDATFolding>true</EnableCOMDATFolding>
199+
<OptimizeReferences>true</OptimizeReferences>
200+
<LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
201+
<AdditionalLibraryDirectories>$(SolutionDir)\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
202+
<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;%(AdditionalDependencies)</AdditionalDependencies>
203+
<ProgramDatabaseFile>$(OutDir)\$(TargetName).pdb</ProgramDatabaseFile>
204+
</Link>
205+
<PostBuildEvent>
206+
</PostBuildEvent>
207+
</ItemDefinitionGroup>
208+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
209+
<ClCompile>
210+
<WarningLevel>Level4</WarningLevel>
211+
<PrecompiledHeader>
212+
</PrecompiledHeader>
213+
<Optimization>MaxSpeed</Optimization>
214+
<FunctionLevelLinking>true</FunctionLevelLinking>
215+
<IntrinsicFunctions>true</IntrinsicFunctions>
216+
<PreprocessorDefinitions>__DLL__;__64BIT__;__WINDOWS__;__VISUALC__;_CRT_SECURE_NO_WARNINGS</PreprocessorDefinitions>
217+
<AdditionalIncludeDirectories>$(SolutionDir)\..\libclearsky;$(SSCDIR)/shared;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
218+
</ClCompile>
219+
<Link>
220+
<SubSystem>Console</SubSystem>
221+
<GenerateDebugInformation>true</GenerateDebugInformation>
222+
<EnableCOMDATFolding>true</EnableCOMDATFolding>
223+
<OptimizeReferences>true</OptimizeReferences>
224+
<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;%(AdditionalDependencies)</AdditionalDependencies>
225+
<AdditionalLibraryDirectories>$(SolutionDir)\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
226+
<ProgramDatabaseFile>$(OutDir)\$(TargetName).pdb</ProgramDatabaseFile>
227+
<StackReserveSize>
228+
</StackReserveSize>
229+
</Link>
230+
<PostBuildEvent>
231+
</PostBuildEvent>
232+
</ItemDefinitionGroup>
233+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
234+
<ClCompile>
235+
<Optimization>Disabled</Optimization>
236+
<PreprocessorDefinitions>__DLL__;__32BIT__;__WINDOWS__;_DEBUG;__VISUALC__;_CRT_SECURE_NO_WARNINGS</PreprocessorDefinitions>
237+
<AdditionalIncludeDirectories>$(SolutionDir)\..\libclearsky;$(SSCDIR)/shared;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
238+
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
239+
</ClCompile>
240+
<Link>
241+
<AdditionalLibraryDirectories>$(SolutionDir)\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
242+
<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;%(AdditionalDependencies)</AdditionalDependencies>
243+
<ProgramDatabaseFile>$(OutDir)\$(TargetName).pdb</ProgramDatabaseFile>
244+
</Link>
245+
<PostBuildEvent>
246+
</PostBuildEvent>
247+
</ItemDefinitionGroup>
248+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
249+
<ClCompile>
250+
<Optimization>Disabled</Optimization>
251+
<PreprocessorDefinitions>__DLL__;__64BIT__;__WINDOWS__;_DEBUG;__VISUALC__;_CRT_SECURE_NO_WARNINGS;</PreprocessorDefinitions>
252+
<AdditionalIncludeDirectories>$(SolutionDir)\..\libclearsky;$(SSCDIR)/shared;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
253+
</ClCompile>
254+
<Link>
255+
<AdditionalLibraryDirectories>$(SolutionDir)\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
256+
<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;%(AdditionalDependencies)</AdditionalDependencies>
257+
<ProgramDatabaseFile>$(OutDir)\$(TargetName).pdb</ProgramDatabaseFile>
258+
<StackReserveSize>
259+
</StackReserveSize>
260+
</Link>
261+
<PostBuildEvent>
262+
</PostBuildEvent>
263+
</ItemDefinitionGroup>
264+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug32|Win32'">
265+
<ClCompile>
266+
<PreprocessorDefinitions>__32BIT__;__WINDOWS__;__DEBUG__;_DEBUG</PreprocessorDefinitions>
267+
</ClCompile>
268+
</ItemDefinitionGroup>
269+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release32|Win32'">
270+
<ClCompile>
271+
<PreprocessorDefinitions>__32BIT__;__WINDOWS__</PreprocessorDefinitions>
272+
</ClCompile>
273+
</ItemDefinitionGroup>
274+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug32|x64'">
275+
<ClCompile>
276+
<PreprocessorDefinitions>__64BIT__;__WINDOWS__;__DEBUG__;_DEBUG</PreprocessorDefinitions>
277+
</ClCompile>
278+
</ItemDefinitionGroup>
279+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release32|x64'">
280+
<ClCompile>
281+
<PreprocessorDefinitions>__64BIT__;__WINDOWS__</PreprocessorDefinitions>
282+
</ClCompile>
283+
</ItemDefinitionGroup>
284+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
285+
<ImportGroup Label="ExtensionTargets">
286+
</ImportGroup>
287+
</Project>

‎build_vs2017/libcluster.vcxproj‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,17 @@
2222
<ClCompile Include="..\libcluster\cluster.cpp" />
2323
<ClCompile Include="..\libcluster\clustersim.cpp" />
2424
<ClCompile Include="..\libcluster\metrics.cpp" />
25-
<ClCompile Include="..\libcluster\solpos.cpp" />
2625
</ItemGroup>
2726
<ItemGroup>
2827
<ClInclude Include="..\libcluster\cluster.h" />
2928
<ClInclude Include="..\libcluster\clustersim.h" />
3029
<ClInclude Include="..\libcluster\matrixtools.h" />
3130
<ClInclude Include="..\libcluster\metrics.h" />
32-
<ClInclude Include="..\libcluster\solpos00.h" />
31+
</ItemGroup>
32+
<ItemGroup>
33+
<ProjectReference Include="libclearsky.vcxproj">
34+
<Project>{809d27ce-1241-4503-a38a-4bf90b683612}</Project>
35+
</ProjectReference>
3336
</ItemGroup>
3437
<PropertyGroup Label="Globals">
3538
<ProjectGuid>{D0B9A03F-F041-4108-9728-098275555C89}</ProjectGuid>

0 commit comments

Comments
 (0)