Skip to content

Commit 36ba920

Browse files
dgburrdgburr
authored
Fix building sbp2rinex with MSVC15 (#89)
Update sbp2rinex MSVC build to account for changes introduced by the update to RTKLIB 2.4.3 b34: * Rename to vc15 since Visual Studio 14 no longer seems to be available from official Microsoft sources * Update source paths (due to introduction of consapp directory) * Add/remove source files Tested with Visual Studio 15 Community Edition
1 parent d3cee84 commit 36ba920

File tree

4 files changed

+110
-130
lines changed

4 files changed

+110
-130
lines changed

‎app/consapp/convbin/vs14/convbin-swiftnav.vcxproj.filters

-101
This file was deleted.

‎app/consapp/convbin/vs14/convbin-swiftnav.sln renamed to ‎app/consapp/convbin/vs15/convbin-swiftnav.sln

File renamed without changes.

‎app/consapp/convbin/vs14/convbin-swiftnav.vcxproj renamed to ‎app/consapp/convbin/vs15/convbin-swiftnav.vcxproj

+24-29
Original file line numberDiff line numberDiff line change
@@ -11,33 +11,28 @@
1111
</ProjectConfiguration>
1212
</ItemGroup>
1313
<ItemGroup>
14-
<ClCompile Include="..\..\..\src\convrnx.c" />
15-
<ClCompile Include="..\..\..\src\ephemeris.c" />
16-
<ClCompile Include="..\..\..\src\ionex.c" />
17-
<ClCompile Include="..\..\..\src\pntpos.c" />
18-
<ClCompile Include="..\..\..\src\preceph.c" />
19-
<ClCompile Include="..\..\..\src\qzslex.c" />
20-
<ClCompile Include="..\..\..\src\rcvraw.c" />
21-
<ClCompile Include="..\..\..\src\rcv\binex.c" />
22-
<ClCompile Include="..\..\..\src\rcv\cmr.c" />
23-
<ClCompile Include="..\..\..\src\rcv\crescent.c" />
24-
<ClCompile Include="..\..\..\src\rcv\tersus.c" />
25-
<ClCompile Include="..\..\..\src\rcv\gw10.c" />
26-
<ClCompile Include="..\..\..\src\rcv\javad.c" />
27-
<ClCompile Include="..\..\..\src\rcv\novatel.c" />
28-
<ClCompile Include="..\..\..\src\rcv\nvs.c" />
29-
<ClCompile Include="..\..\..\src\rcv\rt17.c" />
30-
<ClCompile Include="..\..\..\src\rcv\septentrio.c" />
31-
<ClCompile Include="..\..\..\src\rcv\skytraq.c" />
32-
<ClCompile Include="..\..\..\src\rcv\swiftnav.c" />
33-
<ClCompile Include="..\..\..\src\rcv\ublox.c" />
34-
<ClCompile Include="..\..\..\src\rinex.c" />
35-
<ClCompile Include="..\..\..\src\rtcm.c" />
36-
<ClCompile Include="..\..\..\src\rtcm2.c" />
37-
<ClCompile Include="..\..\..\src\rtcm3.c" />
38-
<ClCompile Include="..\..\..\src\rtcm3e.c" />
39-
<ClCompile Include="..\..\..\src\rtkcmn.c" />
40-
<ClCompile Include="..\..\..\src\sbas.c" />
14+
<ClCompile Include="..\..\..\..\src\convrnx.c" />
15+
<ClCompile Include="..\..\..\..\src\ephemeris.c" />
16+
<ClCompile Include="..\..\..\..\src\ionex.c" />
17+
<ClCompile Include="..\..\..\..\src\pntpos.c" />
18+
<ClCompile Include="..\..\..\..\src\preceph.c" />
19+
<ClCompile Include="..\..\..\..\src\rcvraw.c" />
20+
<ClCompile Include="..\..\..\..\src\rcv\binex.c" />
21+
<ClCompile Include="..\..\..\..\src\rcv\javad.c" />
22+
<ClCompile Include="..\..\..\..\src\rcv\novatel.c" />
23+
<ClCompile Include="..\..\..\..\src\rcv\nvs.c" />
24+
<ClCompile Include="..\..\..\..\src\rcv\rt17.c" />
25+
<ClCompile Include="..\..\..\..\src\rcv\septentrio.c" />
26+
<ClCompile Include="..\..\..\..\src\rcv\skytraq.c" />
27+
<ClCompile Include="..\..\..\..\src\rcv\swiftnav.c" />
28+
<ClCompile Include="..\..\..\..\src\rcv\ublox.c" />
29+
<ClCompile Include="..\..\..\..\src\rinex.c" />
30+
<ClCompile Include="..\..\..\..\src\rtcm.c" />
31+
<ClCompile Include="..\..\..\..\src\rtcm2.c" />
32+
<ClCompile Include="..\..\..\..\src\rtcm3.c" />
33+
<ClCompile Include="..\..\..\..\src\rtcm3e.c" />
34+
<ClCompile Include="..\..\..\..\src\rtkcmn.c" />
35+
<ClCompile Include="..\..\..\..\src\sbas.c" />
4136
<ClCompile Include="..\convbin.c" />
4237
</ItemGroup>
4338
<PropertyGroup Label="Globals">
@@ -90,7 +85,7 @@
9085
<WarningLevel>Level3</WarningLevel>
9186
<Optimization>Disabled</Optimization>
9287
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;ENAGLO;ENAQZS;ENAGAL;ENACMP;ENAIRN;NFREQ=7;NEXOBS=3;%(PreprocessorDefinitions)</PreprocessorDefinitions>
93-
<AdditionalIncludeDirectories>..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
88+
<AdditionalIncludeDirectories>..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
9489
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
9590
</ClCompile>
9691
<Link>
@@ -109,7 +104,7 @@
109104
<FunctionLevelLinking>true</FunctionLevelLinking>
110105
<IntrinsicFunctions>true</IntrinsicFunctions>
111106
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;ENAGLO;ENAQZS;ENAGAL;ENACMP;ENAIRN;NFREQ=7;NEXOBS=3;%(PreprocessorDefinitions)</PreprocessorDefinitions>
112-
<AdditionalIncludeDirectories>..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
107+
<AdditionalIncludeDirectories>..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
113108
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
114109
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
115110
<DebugInformationFormat>None</DebugInformationFormat>

‎app/consapp/convbin/vs15/convbin-swiftnav.vcxproj.filters

+86
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ItemGroup>
4+
<Filter Include="Source Files">
5+
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
6+
<Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
7+
</Filter>
8+
<Filter Include="Source Files\src">
9+
<UniqueIdentifier>{e467857c-cd58-4c0e-be68-bef5943d3c0f}</UniqueIdentifier>
10+
</Filter>
11+
<Filter Include="Source Files\src\rcv">
12+
<UniqueIdentifier>{21d2225d-5fd3-46c6-bfd3-01bfcffd4b76}</UniqueIdentifier>
13+
</Filter>
14+
</ItemGroup>
15+
<ItemGroup>
16+
<ClCompile Include="..\convbin.c">
17+
<Filter>Source Files</Filter>
18+
</ClCompile>
19+
<ClCompile Include="..\..\..\..\src\convrnx.c">
20+
<Filter>Source Files</Filter>
21+
</ClCompile>
22+
<ClCompile Include="..\..\..\..\src\ephemeris.c">
23+
<Filter>Source Files</Filter>
24+
</ClCompile>
25+
<ClCompile Include="..\..\..\..\src\ionex.c">
26+
<Filter>Source Files</Filter>
27+
</ClCompile>
28+
<ClCompile Include="..\..\..\..\src\pntpos.c">
29+
<Filter>Source Files</Filter>
30+
</ClCompile>
31+
<ClCompile Include="..\..\..\..\src\preceph.c">
32+
<Filter>Source Files</Filter>
33+
</ClCompile>
34+
<ClCompile Include="..\..\..\..\src\rcvraw.c">
35+
<Filter>Source Files</Filter>
36+
</ClCompile>
37+
<ClCompile Include="..\..\..\..\src\rcv\binex.c">
38+
<Filter>Source Files</Filter>
39+
</ClCompile>
40+
<ClCompile Include="..\..\..\..\src\rcv\javad.c">
41+
<Filter>Source Files</Filter>
42+
</ClCompile>
43+
<ClCompile Include="..\..\..\..\src\rcv\novatel.c">
44+
<Filter>Source Files</Filter>
45+
</ClCompile>
46+
<ClCompile Include="..\..\..\..\src\rcv\nvs.c">
47+
<Filter>Source Files</Filter>
48+
</ClCompile>
49+
<ClCompile Include="..\..\..\..\src\rcv\rt17.c">
50+
<Filter>Source Files</Filter>
51+
</ClCompile>
52+
<ClCompile Include="..\..\..\..\src\rcv\septentrio.c">
53+
<Filter>Source Files</Filter>
54+
</ClCompile>
55+
<ClCompile Include="..\..\..\..\src\rcv\skytraq.c">
56+
<Filter>Source Files</Filter>
57+
</ClCompile>
58+
<ClCompile Include="..\..\..\..\src\rcv\swiftnav.c">
59+
<Filter>Source Files</Filter>
60+
</ClCompile>
61+
<ClCompile Include="..\..\..\..\src\rcv\ublox.c">
62+
<Filter>Source Files</Filter>
63+
</ClCompile>
64+
<ClCompile Include="..\..\..\..\src\rinex.c">
65+
<Filter>Source Files</Filter>
66+
</ClCompile>
67+
<ClCompile Include="..\..\..\..\src\rtcm2.c">
68+
<Filter>Source Files</Filter>
69+
</ClCompile>
70+
<ClCompile Include="..\..\..\..\src\rtcm3e.c">
71+
<Filter>Source Files</Filter>
72+
</ClCompile>
73+
<ClCompile Include="..\..\..\..\src\rtkcmn.c">
74+
<Filter>Source Files</Filter>
75+
</ClCompile>
76+
<ClCompile Include="..\..\..\..\src\sbas.c">
77+
<Filter>Source Files</Filter>
78+
</ClCompile>
79+
<ClCompile Include="..\..\..\..\src\rtcm3.c">
80+
<Filter>Source Files</Filter>
81+
</ClCompile>
82+
<ClCompile Include="..\..\..\..\src\rtcm.c">
83+
<Filter>Source Files</Filter>
84+
</ClCompile>
85+
</ItemGroup>
86+
</Project>

0 commit comments

Comments
 (0)