Merge latest changes from main branch

CMakeLists.txt

@@ -11,6 +11,7 @@ message("RTKLIB version: ${VERSION}-${PATCH_LEVEL}")
 
 project(rtklib LANGUAGES C CXX VERSION 2.4.3)
 
+include(GNUInstallDirs)
 include(CTest)
 
 option(IERS_MODEL "Use Earth models from IERS" OFF)

app/consapp/convbin/bcc/_convbin.cbproj

@@ -478,7 +478,6 @@
                 <DeployFile LocalName="..\..\..\..\src\rcv\rt17.c" Configuration="Release" Class="ProjectFile"/>
                 <DeployFile LocalName="..\..\..\..\src\rcv\septentrio.c" Configuration="Release" Class="ProjectFile"/>
                 <DeployFile LocalName="..\..\..\..\src\rcv\skytraq.c" Configuration="Release" Class="ProjectFile"/>
-                <DeployFile LocalName="..\..\..\..\src\rcv\ss2.c" Configuration="Release" Class="ProjectFile"/>
                 <DeployFile LocalName="..\..\..\..\src\rcv\swiftnav.c" Configuration="Release" Class="ProjectFile"/>
                 <DeployFile LocalName="..\..\..\..\src\rcv\tersus.c" Configuration="Release" Class="ProjectFile"/>
                 <DeployFile LocalName="..\..\..\..\src\rcv\ublox.c" Configuration="Release" Class="ProjectFile"/>

app/consapp/convbin/gcc/makefile

@@ -52,8 +52,6 @@ ephemeris.o: $(SRC)/ephemeris.c
 	$(CC) -c $(CFLAGS) $(SRC)/ephemeris.c
 novatel.o  : $(SRC)/rcv/novatel.c
 	$(CC) -c $(CFLAGS) $(SRC)/rcv/novatel.c
-ss2.o      : $(SRC)/rcv/ss2.c
-	$(CC) -c $(CFLAGS) $(SRC)/rcv/ss2.c
 ublox.o    : $(SRC)/rcv/ublox.c
 	$(CC) -c $(CFLAGS) $(SRC)/rcv/ublox.c
 crescent.o : $(SRC)/rcv/crescent.c
@@ -93,7 +91,6 @@ pntpos.o   : $(SRC)/rtklib.h
 ephemeris.o: $(SRC)/rtklib.h
 ionex.o    : $(SRC)/rtklib.h
 novatel.o  : $(SRC)/rtklib.h
-ss2.o      : $(SRC)/rtklib.h
 ublox.o    : $(SRC)/rtklib.h
 crescent.o : $(SRC)/rtklib.h
 skytraq.o  : $(SRC)/rtklib.h

app/consapp/convbin/msc/msc.sln

@@ -1,20 +1,31 @@
 
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual C++ Express 2010
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 18
+VisualStudioVersion = 18.6.11822.322
+MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "msc", "msc.vcxproj", "{A9A9B274-2448-4FA0-AC05-857D411DCA48}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
 		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{A9A9B274-2448-4FA0-AC05-857D411DCA48}.Debug|Win32.ActiveCfg = Debug|Win32
 		{A9A9B274-2448-4FA0-AC05-857D411DCA48}.Debug|Win32.Build.0 = Debug|Win32
+		{A9A9B274-2448-4FA0-AC05-857D411DCA48}.Debug|x64.ActiveCfg = Debug|x64
+		{A9A9B274-2448-4FA0-AC05-857D411DCA48}.Debug|x64.Build.0 = Debug|x64
 		{A9A9B274-2448-4FA0-AC05-857D411DCA48}.Release|Win32.ActiveCfg = Release|Win32
 		{A9A9B274-2448-4FA0-AC05-857D411DCA48}.Release|Win32.Build.0 = Release|Win32
+		{A9A9B274-2448-4FA0-AC05-857D411DCA48}.Release|x64.ActiveCfg = Release|x64
+		{A9A9B274-2448-4FA0-AC05-857D411DCA48}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {3E1704BE-3ED0-4969-81B9-0AD591AF4943}
+	EndGlobalSection
 EndGlobal

app/consapp/convbin/msc/msc.vcxproj

@@ -5,56 +5,84 @@
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{A9A9B274-2448-4FA0-AC05-857D411DCA48}</ProjectGuid>
     <RootNamespace>msc</RootNamespace>
     <Keyword>Win32Proj</Keyword>
-    <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>NotSet</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v145</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>NotSet</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v145</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
+    <CharacterSet>NotSet</CharacterSet>
+    <PlatformToolset>v145</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>NotSet</CharacterSet>
+    <PlatformToolset>v145</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">convbin</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">convbin</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">convbin</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">convbin</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;TRACE;_CRT_SECURE_NO_DEPRECATE;ENAGLO;ENAQZS;ENAGAL;ENACMP;ENAIRN;NFREQ=3;NEXOBS=3;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
+      <AdditionalIncludeDirectories>..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;WIN_STATIC;TRACE;_CRT_SECURE_NO_DEPRECATE;ENAGLO;ENAQZS;ENAGAL;ENACMP;ENAIRN;NFREQ=4;NEXOBS=3;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>
@@ -73,10 +101,32 @@
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;WIN_STATIC;TRACE;_CRT_SECURE_NO_DEPRECATE;ENAGLO;ENAQZS;ENAGAL;ENACMP;ENAIRN;NFREQ=4;NEXOBS=3;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)convbin.exe</OutputFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;TRACE;_CRT_SECURE_NO_DEPRECATE;ENAGLO;ENAQZS;ENAGAL;ENACMP;ENAIRN;NFREQ=3;NEXOBS=3;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;WIN_STATIC;TRACE;_CRT_SECURE_NO_DEPRECATE;ENAGLO;ENAQZS;ENAGAL;ENACMP;ENAIRN;NFREQ=4;NEXOBS=3;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader>
       </PrecompiledHeader>
@@ -97,38 +147,58 @@
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;WIN_STATIC;TRACE;_CRT_SECURE_NO_DEPRECATE;ENAGLO;ENAQZS;ENAGAL;ENACMP;ENAIRN;NFREQ=4;NEXOBS=3;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)convbin.exe</OutputFile>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\src\ephemeris.c" />
-    <ClCompile Include="..\..\..\src\ionex.c" />
-    <ClCompile Include="..\..\..\src\pntpos.c" />
-    <ClCompile Include="..\..\..\src\qzslex.c" />
-    <ClCompile Include="..\..\..\src\rcv\binex.c" />
-    <ClCompile Include="..\..\..\src\rcv\cmr.c" />
-    <ClCompile Include="..\..\..\src\rcv\rcvlex.c" />
-    <ClCompile Include="..\..\..\src\rcv\rt17.c" />
-    <ClCompile Include="..\..\..\src\rcv\septentrio.c" />
-    <ClCompile Include="..\..\..\src\rcv\swiftnav.c" />
-    <ClCompile Include="..\..\..\src\rcv\tersus.c" />
-    <ClCompile Include="..\..\..\src\rcv\comnav.c" />
-    <ClCompile Include="..\..\..\src\rtcm3e.c" />
+    <ClCompile Include="..\..\..\..\src\rtkcmn.c" />
+    <ClCompile Include="..\..\..\..\src\trace.c" />
+    <ClCompile Include="..\..\..\..\src\rinex.c" />
+    <ClCompile Include="..\..\..\..\src\sbas.c" />
+    <ClCompile Include="..\..\..\..\src\preceph.c" />
+    <ClCompile Include="..\..\..\..\src\rcvraw.c" />
+    <ClCompile Include="..\..\..\..\src\convrnx.c" />
+    <ClCompile Include="..\..\..\..\src\rtcm.c" />
+    <ClCompile Include="..\..\..\..\src\rtcm2.c" />
+    <ClCompile Include="..\..\..\..\src\rtcm3.c" />
+    <ClCompile Include="..\..\..\..\src\rtcm3e.c" />
+    <ClCompile Include="..\..\..\..\src\pntpos.c" />
+    <ClCompile Include="..\..\..\..\src\ionex.c" />
+    <ClCompile Include="..\..\..\..\src\tides.c" />
+    <ClCompile Include="..\..\..\..\src\ephemeris.c" />
+    <ClCompile Include="..\..\..\..\src\sofa.c" />
+    <ClCompile Include="..\..\..\..\src\rcv\binex.c" />
+    <ClCompile Include="..\..\..\..\src\rcv\novatel.c" />
+    <ClCompile Include="..\..\..\..\src\rcv\ublox.c" />
+    <ClCompile Include="..\..\..\..\src\rcv\crescent.c" />
+    <ClCompile Include="..\..\..\..\src\rcv\skytraq.c" />
+    <ClCompile Include="..\..\..\..\src\rcv\javad.c" />
+    <ClCompile Include="..\..\..\..\src\rcv\nvs.c" />
+    <ClCompile Include="..\..\..\..\src\rcv\rt17.c" />
+    <ClCompile Include="..\..\..\..\src\rcv\septentrio.c" />
+    <ClCompile Include="..\..\..\..\src\rcv\swiftnav.c" />
+    <ClCompile Include="..\..\..\..\src\rcv\unicore.c" />
     <ClCompile Include="..\convbin.c" />
-    <ClCompile Include="..\..\..\src\convrnx.c" />
-    <ClCompile Include="..\..\..\src\rcv\crescent.c" />
-    <ClCompile Include="..\..\..\src\rcv\gw10.c" />
-    <ClCompile Include="..\..\..\src\rcv\javad.c" />
-    <ClCompile Include="..\..\..\src\rcv\novatel.c" />
-    <ClCompile Include="..\..\..\src\rcv\nvs.c" />
-    <ClCompile Include="..\..\..\src\preceph.c" />
-    <ClCompile Include="..\..\..\src\rcvraw.c" />
-    <ClCompile Include="..\..\..\src\rinex.c" />
-    <ClCompile Include="..\..\..\src\rtcm.c" />
-    <ClCompile Include="..\..\..\src\rtcm2.c" />
-    <ClCompile Include="..\..\..\src\rtcm3.c" />
-    <ClCompile Include="..\..\..\src\rtkcmn.c" />
-    <ClCompile Include="..\..\..\src\trace.c" />
-    <ClCompile Include="..\..\..\src\sbas.c" />
-    <ClCompile Include="..\..\..\src\rcv\skytraq.c" />
-    <ClCompile Include="..\..\..\src\rcv\ublox.c" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

app/consapp/rnx2rtkp/msc/msc.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.26430.14
+# Visual Studio Version 18
+VisualStudioVersion = 18.6.11822.322
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "msc", "msc.vcxproj", "{830901EE-9359-489F-BA7E-04289F28D5E0}"
 EndProject
@@ -15,12 +15,17 @@ Global
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{830901EE-9359-489F-BA7E-04289F28D5E0}.Debug|Win32.ActiveCfg = Debug|Win32
 		{830901EE-9359-489F-BA7E-04289F28D5E0}.Debug|Win32.Build.0 = Debug|Win32
-		{830901EE-9359-489F-BA7E-04289F28D5E0}.Debug|x64.ActiveCfg = Debug|Win32
+		{830901EE-9359-489F-BA7E-04289F28D5E0}.Debug|x64.ActiveCfg = Debug|x64
+		{830901EE-9359-489F-BA7E-04289F28D5E0}.Debug|x64.Build.0 = Debug|x64
 		{830901EE-9359-489F-BA7E-04289F28D5E0}.Release|Win32.ActiveCfg = Release|Win32
 		{830901EE-9359-489F-BA7E-04289F28D5E0}.Release|Win32.Build.0 = Release|Win32
-		{830901EE-9359-489F-BA7E-04289F28D5E0}.Release|x64.ActiveCfg = Release|Win32
+		{830901EE-9359-489F-BA7E-04289F28D5E0}.Release|x64.ActiveCfg = Release|x64
+		{830901EE-9359-489F-BA7E-04289F28D5E0}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {5E8C4733-2D0A-4323-A580-F50E9C46CA7F}
+	EndGlobalSection
 EndGlobal