Skip to content

Commit d4d8139

Browse files
rtklibexplorerrtklibexplorer
authored
Merge pull request #886 from ourairquality/win32-msc-consapp
Win32 msc consapp
2 parents 4e466de + 0de8f43 commit d4d8139

5 files changed

Lines changed: 218 additions & 54 deletions

File tree

‎app/consapp/convbin/msc/msc.sln‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,31 @@
11

2-
Microsoft Visual Studio Solution File, Format Version 11.00
3-
# Visual C++ Express 2010
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio Version 18
4+
VisualStudioVersion = 18.6.11822.322
5+
MinimumVisualStudioVersion = 10.0.40219.1
46
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "msc", "msc.vcxproj", "{A9A9B274-2448-4FA0-AC05-857D411DCA48}"
57
EndProject
68
Global
79
GlobalSection(SolutionConfigurationPlatforms) = preSolution
810
Debug|Win32 = Debug|Win32
11+
Debug|x64 = Debug|x64
912
Release|Win32 = Release|Win32
13+
Release|x64 = Release|x64
1014
EndGlobalSection
1115
GlobalSection(ProjectConfigurationPlatforms) = postSolution
1216
{A9A9B274-2448-4FA0-AC05-857D411DCA48}.Debug|Win32.ActiveCfg = Debug|Win32
1317
{A9A9B274-2448-4FA0-AC05-857D411DCA48}.Debug|Win32.Build.0 = Debug|Win32
18+
{A9A9B274-2448-4FA0-AC05-857D411DCA48}.Debug|x64.ActiveCfg = Debug|x64
19+
{A9A9B274-2448-4FA0-AC05-857D411DCA48}.Debug|x64.Build.0 = Debug|x64
1420
{A9A9B274-2448-4FA0-AC05-857D411DCA48}.Release|Win32.ActiveCfg = Release|Win32
1521
{A9A9B274-2448-4FA0-AC05-857D411DCA48}.Release|Win32.Build.0 = Release|Win32
22+
{A9A9B274-2448-4FA0-AC05-857D411DCA48}.Release|x64.ActiveCfg = Release|x64
23+
{A9A9B274-2448-4FA0-AC05-857D411DCA48}.Release|x64.Build.0 = Release|x64
1624
EndGlobalSection
1725
GlobalSection(SolutionProperties) = preSolution
1826
HideSolutionNode = FALSE
1927
EndGlobalSection
28+
GlobalSection(ExtensibilityGlobals) = postSolution
29+
SolutionGuid = {3E1704BE-3ED0-4969-81B9-0AD591AF4943}
30+
EndGlobalSection
2031
EndGlobal

‎app/consapp/convbin/msc/msc.vcxproj‎

Lines changed: 109 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -5,56 +5,84 @@
55
<Configuration>Debug</Configuration>
66
<Platform>Win32</Platform>
77
</ProjectConfiguration>
8+
<ProjectConfiguration Include="Debug|x64">
9+
<Configuration>Debug</Configuration>
10+
<Platform>x64</Platform>
11+
</ProjectConfiguration>
812
<ProjectConfiguration Include="Release|Win32">
913
<Configuration>Release</Configuration>
1014
<Platform>Win32</Platform>
1115
</ProjectConfiguration>
16+
<ProjectConfiguration Include="Release|x64">
17+
<Configuration>Release</Configuration>
18+
<Platform>x64</Platform>
19+
</ProjectConfiguration>
1220
</ItemGroup>
1321
<PropertyGroup Label="Globals">
1422
<ProjectGuid>{A9A9B274-2448-4FA0-AC05-857D411DCA48}</ProjectGuid>
1523
<RootNamespace>msc</RootNamespace>
1624
<Keyword>Win32Proj</Keyword>
17-
<WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion>
25+
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
1826
</PropertyGroup>
1927
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
2028
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
2129
<ConfigurationType>Application</ConfigurationType>
2230
<CharacterSet>NotSet</CharacterSet>
2331
<WholeProgramOptimization>true</WholeProgramOptimization>
24-
<PlatformToolset>v141</PlatformToolset>
32+
<PlatformToolset>v145</PlatformToolset>
33+
</PropertyGroup>
34+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
35+
<ConfigurationType>Application</ConfigurationType>
36+
<CharacterSet>NotSet</CharacterSet>
37+
<WholeProgramOptimization>true</WholeProgramOptimization>
38+
<PlatformToolset>v145</PlatformToolset>
2539
</PropertyGroup>
2640
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
2741
<ConfigurationType>Application</ConfigurationType>
28-
<CharacterSet>Unicode</CharacterSet>
29-
<PlatformToolset>v141</PlatformToolset>
42+
<CharacterSet>NotSet</CharacterSet>
43+
<PlatformToolset>v145</PlatformToolset>
44+
</PropertyGroup>
45+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
46+
<ConfigurationType>Application</ConfigurationType>
47+
<CharacterSet>NotSet</CharacterSet>
48+
<PlatformToolset>v145</PlatformToolset>
3049
</PropertyGroup>
3150
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
3251
<ImportGroup Label="ExtensionSettings">
3352
</ImportGroup>
3453
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
3554
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
3655
</ImportGroup>
56+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
57+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
58+
</ImportGroup>
3759
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
3860
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
3961
</ImportGroup>
62+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
63+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
64+
</ImportGroup>
4065
<PropertyGroup Label="UserMacros" />
4166
<PropertyGroup>
4267
<_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
4368
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
4469
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
4570
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
71+
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
4672
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
4773
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
4874
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
75+
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
4976
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">convbin</TargetName>
77+
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">convbin</TargetName>
5078
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">convbin</TargetName>
79+
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">convbin</TargetName>
5180
</PropertyGroup>
5281
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
5382
<ClCompile>
5483
<Optimization>Disabled</Optimization>
55-
<AdditionalIncludeDirectories>..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
56-
<PreprocessorDefinitions>WIN32;TRACE;_CRT_SECURE_NO_DEPRECATE;ENAGLO;ENAQZS;ENAGAL;ENACMP;ENAIRN;NFREQ=3;NEXOBS=3;%(PreprocessorDefinitions)</PreprocessorDefinitions>
57-
<MinimalRebuild>true</MinimalRebuild>
84+
<AdditionalIncludeDirectories>..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
85+
<PreprocessorDefinitions>WIN32;WIN_STATIC;TRACE;_CRT_SECURE_NO_DEPRECATE;ENAGLO;ENAQZS;ENAGAL;ENACMP;ENAIRN;NFREQ=4;NEXOBS=3;%(PreprocessorDefinitions)</PreprocessorDefinitions>
5886
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
5987
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
6088
<PrecompiledHeader>
@@ -73,10 +101,32 @@
73101
<TargetMachine>MachineX86</TargetMachine>
74102
</Link>
75103
</ItemDefinitionGroup>
104+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
105+
<ClCompile>
106+
<Optimization>Disabled</Optimization>
107+
<AdditionalIncludeDirectories>..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
108+
<PreprocessorDefinitions>WIN32;WIN_STATIC;TRACE;_CRT_SECURE_NO_DEPRECATE;ENAGLO;ENAQZS;ENAGAL;ENACMP;ENAIRN;NFREQ=4;NEXOBS=3;%(PreprocessorDefinitions)</PreprocessorDefinitions>
109+
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
110+
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
111+
<PrecompiledHeader>
112+
</PrecompiledHeader>
113+
<WarningLevel>Level3</WarningLevel>
114+
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
115+
</ClCompile>
116+
<Link>
117+
<AdditionalDependencies>winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
118+
<OutputFile>$(OutDir)convbin.exe</OutputFile>
119+
<GenerateDebugInformation>true</GenerateDebugInformation>
120+
<SubSystem>Console</SubSystem>
121+
<RandomizedBaseAddress>false</RandomizedBaseAddress>
122+
<DataExecutionPrevention>
123+
</DataExecutionPrevention>
124+
</Link>
125+
</ItemDefinitionGroup>
76126
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
77127
<ClCompile>
78-
<AdditionalIncludeDirectories>..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
79-
<PreprocessorDefinitions>WIN32;TRACE;_CRT_SECURE_NO_DEPRECATE;ENAGLO;ENAQZS;ENAGAL;ENACMP;ENAIRN;NFREQ=3;NEXOBS=3;%(PreprocessorDefinitions)</PreprocessorDefinitions>
128+
<AdditionalIncludeDirectories>..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
129+
<PreprocessorDefinitions>WIN32;WIN_STATIC;TRACE;_CRT_SECURE_NO_DEPRECATE;ENAGLO;ENAQZS;ENAGAL;ENACMP;ENAIRN;NFREQ=4;NEXOBS=3;%(PreprocessorDefinitions)</PreprocessorDefinitions>
80130
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
81131
<PrecompiledHeader>
82132
</PrecompiledHeader>
@@ -97,38 +147,58 @@
97147
<TargetMachine>MachineX86</TargetMachine>
98148
</Link>
99149
</ItemDefinitionGroup>
150+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
151+
<ClCompile>
152+
<AdditionalIncludeDirectories>..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
153+
<PreprocessorDefinitions>WIN32;WIN_STATIC;TRACE;_CRT_SECURE_NO_DEPRECATE;ENAGLO;ENAQZS;ENAGAL;ENACMP;ENAIRN;NFREQ=4;NEXOBS=3;%(PreprocessorDefinitions)</PreprocessorDefinitions>
154+
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
155+
<PrecompiledHeader>
156+
</PrecompiledHeader>
157+
<WarningLevel>Level3</WarningLevel>
158+
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
159+
</ClCompile>
160+
<Link>
161+
<AdditionalDependencies>winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
162+
<OutputFile>$(OutDir)convbin.exe</OutputFile>
163+
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
164+
<GenerateDebugInformation>true</GenerateDebugInformation>
165+
<SubSystem>Console</SubSystem>
166+
<OptimizeReferences>true</OptimizeReferences>
167+
<EnableCOMDATFolding>true</EnableCOMDATFolding>
168+
<RandomizedBaseAddress>false</RandomizedBaseAddress>
169+
<DataExecutionPrevention>
170+
</DataExecutionPrevention>
171+
</Link>
172+
</ItemDefinitionGroup>
100173
<ItemGroup>
101-
<ClCompile Include="..\..\..\src\ephemeris.c" />
102-
<ClCompile Include="..\..\..\src\ionex.c" />
103-
<ClCompile Include="..\..\..\src\pntpos.c" />
104-
<ClCompile Include="..\..\..\src\qzslex.c" />
105-
<ClCompile Include="..\..\..\src\rcv\binex.c" />
106-
<ClCompile Include="..\..\..\src\rcv\cmr.c" />
107-
<ClCompile Include="..\..\..\src\rcv\rcvlex.c" />
108-
<ClCompile Include="..\..\..\src\rcv\rt17.c" />
109-
<ClCompile Include="..\..\..\src\rcv\septentrio.c" />
110-
<ClCompile Include="..\..\..\src\rcv\swiftnav.c" />
111-
<ClCompile Include="..\..\..\src\rcv\tersus.c" />
112-
<ClCompile Include="..\..\..\src\rcv\comnav.c" />
113-
<ClCompile Include="..\..\..\src\rtcm3e.c" />
174+
<ClCompile Include="..\..\..\..\src\rtkcmn.c" />
175+
<ClCompile Include="..\..\..\..\src\trace.c" />
176+
<ClCompile Include="..\..\..\..\src\rinex.c" />
177+
<ClCompile Include="..\..\..\..\src\sbas.c" />
178+
<ClCompile Include="..\..\..\..\src\preceph.c" />
179+
<ClCompile Include="..\..\..\..\src\rcvraw.c" />
180+
<ClCompile Include="..\..\..\..\src\convrnx.c" />
181+
<ClCompile Include="..\..\..\..\src\rtcm.c" />
182+
<ClCompile Include="..\..\..\..\src\rtcm2.c" />
183+
<ClCompile Include="..\..\..\..\src\rtcm3.c" />
184+
<ClCompile Include="..\..\..\..\src\rtcm3e.c" />
185+
<ClCompile Include="..\..\..\..\src\pntpos.c" />
186+
<ClCompile Include="..\..\..\..\src\ionex.c" />
187+
<ClCompile Include="..\..\..\..\src\tides.c" />
188+
<ClCompile Include="..\..\..\..\src\ephemeris.c" />
189+
<ClCompile Include="..\..\..\..\src\sofa.c" />
190+
<ClCompile Include="..\..\..\..\src\rcv\binex.c" />
191+
<ClCompile Include="..\..\..\..\src\rcv\novatel.c" />
192+
<ClCompile Include="..\..\..\..\src\rcv\ublox.c" />
193+
<ClCompile Include="..\..\..\..\src\rcv\crescent.c" />
194+
<ClCompile Include="..\..\..\..\src\rcv\skytraq.c" />
195+
<ClCompile Include="..\..\..\..\src\rcv\javad.c" />
196+
<ClCompile Include="..\..\..\..\src\rcv\nvs.c" />
197+
<ClCompile Include="..\..\..\..\src\rcv\rt17.c" />
198+
<ClCompile Include="..\..\..\..\src\rcv\septentrio.c" />
199+
<ClCompile Include="..\..\..\..\src\rcv\swiftnav.c" />
200+
<ClCompile Include="..\..\..\..\src\rcv\unicore.c" />
114201
<ClCompile Include="..\convbin.c" />
115-
<ClCompile Include="..\..\..\src\convrnx.c" />
116-
<ClCompile Include="..\..\..\src\rcv\crescent.c" />
117-
<ClCompile Include="..\..\..\src\rcv\gw10.c" />
118-
<ClCompile Include="..\..\..\src\rcv\javad.c" />
119-
<ClCompile Include="..\..\..\src\rcv\novatel.c" />
120-
<ClCompile Include="..\..\..\src\rcv\nvs.c" />
121-
<ClCompile Include="..\..\..\src\preceph.c" />
122-
<ClCompile Include="..\..\..\src\rcvraw.c" />
123-
<ClCompile Include="..\..\..\src\rinex.c" />
124-
<ClCompile Include="..\..\..\src\rtcm.c" />
125-
<ClCompile Include="..\..\..\src\rtcm2.c" />
126-
<ClCompile Include="..\..\..\src\rtcm3.c" />
127-
<ClCompile Include="..\..\..\src\rtkcmn.c" />
128-
<ClCompile Include="..\..\..\src\trace.c" />
129-
<ClCompile Include="..\..\..\src\sbas.c" />
130-
<ClCompile Include="..\..\..\src\rcv\skytraq.c" />
131-
<ClCompile Include="..\..\..\src\rcv\ublox.c" />
132202
</ItemGroup>
133203
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
134204
<ImportGroup Label="ExtensionTargets">

‎app/consapp/rnx2rtkp/msc/msc.sln‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 15
4-
VisualStudioVersion = 15.0.26430.14
3+
# Visual Studio Version 18
4+
VisualStudioVersion = 18.6.11822.322
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "msc", "msc.vcxproj", "{830901EE-9359-489F-BA7E-04289F28D5E0}"
77
EndProject
@@ -15,12 +15,17 @@ Global
1515
GlobalSection(ProjectConfigurationPlatforms) = postSolution
1616
{830901EE-9359-489F-BA7E-04289F28D5E0}.Debug|Win32.ActiveCfg = Debug|Win32
1717
{830901EE-9359-489F-BA7E-04289F28D5E0}.Debug|Win32.Build.0 = Debug|Win32
18-
{830901EE-9359-489F-BA7E-04289F28D5E0}.Debug|x64.ActiveCfg = Debug|Win32
18+
{830901EE-9359-489F-BA7E-04289F28D5E0}.Debug|x64.ActiveCfg = Debug|x64
19+
{830901EE-9359-489F-BA7E-04289F28D5E0}.Debug|x64.Build.0 = Debug|x64
1920
{830901EE-9359-489F-BA7E-04289F28D5E0}.Release|Win32.ActiveCfg = Release|Win32
2021
{830901EE-9359-489F-BA7E-04289F28D5E0}.Release|Win32.Build.0 = Release|Win32
21-
{830901EE-9359-489F-BA7E-04289F28D5E0}.Release|x64.ActiveCfg = Release|Win32
22+
{830901EE-9359-489F-BA7E-04289F28D5E0}.Release|x64.ActiveCfg = Release|x64
23+
{830901EE-9359-489F-BA7E-04289F28D5E0}.Release|x64.Build.0 = Release|x64
2224
EndGlobalSection
2325
GlobalSection(SolutionProperties) = preSolution
2426
HideSolutionNode = FALSE
2527
EndGlobalSection
28+
GlobalSection(ExtensibilityGlobals) = postSolution
29+
SolutionGuid = {5E8C4733-2D0A-4323-A580-F50E9C46CA7F}
30+
EndGlobalSection
2631
EndGlobal

0 commit comments

Comments
 (0)