diff --git a/app/rtkget/rtkget.cbproj b/app/rtkget/rtkget.cbproj index 09a6f0c56f4c5d1634d579b823f3168cee9cfa11..e3cae01cb130ad36a40ff81f7181d645103627a1 100644 --- a/app/rtkget/rtkget.cbproj +++ b/app/rtkget/rtkget.cbproj @@ -6,7 +6,7 @@ <Base>True</Base> <Config Condition="'$(Config)'==''">Release</Config> <FrameworkType>VCL</FrameworkType> - <ProjectVersion>18.4</ProjectVersion> + <ProjectVersion>18.5</ProjectVersion> <Platform Condition="'$(Platform)'==''">Win32</Platform> <TargetedPlatforms>1</TargetedPlatforms> <AppType>Application</AppType> diff --git a/app/rtklaunch/rtklaunch.cbproj b/app/rtklaunch/rtklaunch.cbproj index 8d25855cd7a6c77d53c813e8bf2786caf8e39652..886d959738859413a493fdbf3d8a261b5c2e30e2 100644 --- a/app/rtklaunch/rtklaunch.cbproj +++ b/app/rtklaunch/rtklaunch.cbproj @@ -1,7 +1,7 @@ <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> <ProjectGuid>{B9D0F977-D158-4447-9818-D26CDBC2CE25}</ProjectGuid> - <ProjectVersion>18.4</ProjectVersion> + <ProjectVersion>18.5</ProjectVersion> <FrameworkType>VCL</FrameworkType> <MainSource>rtklaunch.cpp</MainSource> <Base>True</Base> @@ -166,8 +166,8 @@ <CppCompile Include="..\..\src\rtkcmn.c"> <BuildOrder>2</BuildOrder> </CppCompile> - <FormResources Include="launchmain.dfm"/> <FormResources Include="launchoptdlg.dfm"/> + <FormResources Include="launchmain.dfm"/> <BuildConfiguration Include="Release"> <Key>Cfg_2</Key> <CfgParent>Base</CfgParent> diff --git a/app/rtknavi/rtknavi.cbproj b/app/rtknavi/rtknavi.cbproj index d340e2acebc1d43cbf04ae8fb9f5cafa42de886d..401245aca9008410a0f8394ec616caddd23a2537 100644 --- a/app/rtknavi/rtknavi.cbproj +++ b/app/rtknavi/rtknavi.cbproj @@ -6,7 +6,7 @@ <Base>True</Base> <Config Condition="'$(Config)'==''">Release</Config> <FrameworkType>VCL</FrameworkType> - <ProjectVersion>18.4</ProjectVersion> + <ProjectVersion>18.5</ProjectVersion> <Platform Condition="'$(Platform)'==''">Win32</Platform> <TargetedPlatforms>1</TargetedPlatforms> <AppType>Application</AppType> @@ -400,10 +400,10 @@ <FormResources Include="..\appcmn\ftpoptdlg.dfm"/> <FormResources Include="..\appcmn\maskoptdlg.dfm"/> <FormResources Include="..\appcmn\keydlg.dfm"/> - <FormResources Include="naviopt.dfm"/> - <FormResources Include="navimain.dfm"/> <FormResources Include="mondlg.dfm"/> <FormResources Include="outstrdlg.dfm"/> + <FormResources Include="naviopt.dfm"/> + <FormResources Include="navimain.dfm"/> <FormResources Include="rcvoptdlg.dfm"/> <BuildConfiguration Include="Release"> <Key>Cfg_2</Key> @@ -485,6 +485,11 @@ <Platform value="Win32">True</Platform> </Platforms> <Deployment Version="3"> + <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'!='true'" LocalName="$(BDS)\bin\cc32c260.dll" Class="DependencyModule"> + <Platform Name="Win32"> + <Overwrite>true</Overwrite> + </Platform> + </DeployFile> <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'=='true'" LocalName="$(BDS)\bin\cc32c240mt.dll" Class="DependencyModule"> <Platform Name="Win32"> <Overwrite>true</Overwrite> @@ -496,6 +501,11 @@ <Overwrite>true</Overwrite> </Platform> </DeployFile> + <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'!='true'" LocalName="$(BDS)\bin\cc32260.dll" Class="DependencyModule"> + <Platform Name="Win32"> + <Overwrite>true</Overwrite> + </Platform> + </DeployFile> <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'=='true'" LocalName="$(BDS)\bin\cc32120mt.dll" Class="DependencyModule"> <Platform Name="Win32"> <Overwrite>true</Overwrite> @@ -507,20 +517,20 @@ <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile LocalName="..\..\src\rcv\novatel.c" Configuration="Release" Class="ProjectFile"> + <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'=='true'" LocalName="$(BDS)\bin\cc32240mt.dll" Class="DependencyModule"> <Platform Name="Win32"> - <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile LocalName="..\..\src\rtcm2.c" Configuration="Release" Class="ProjectFile"> + <DeployFile LocalName="..\..\src\rcv\novatel.c" Configuration="Release" Class="ProjectFile"> <Platform Name="Win32"> <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'=='true'" LocalName="$(BDS)\bin\cc32240mt.dll" Class="DependencyModule"> + <DeployFile LocalName="..\..\src\rtcm2.c" Configuration="Release" Class="ProjectFile"> <Platform Name="Win32"> + <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> </Platform> </DeployFile> @@ -558,13 +568,13 @@ <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile LocalName="..\..\src\rcv\skytraq.c" Configuration="Release" Class="ProjectFile"> + <DeployFile LocalName="..\..\src\rtkcmn.c" Configuration="Release" Class="ProjectFile"> <Platform Name="Win32"> <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile LocalName="..\..\src\rtkcmn.c" Configuration="Release" Class="ProjectFile"> + <DeployFile LocalName="..\..\src\rcv\skytraq.c" Configuration="Release" Class="ProjectFile"> <Platform Name="Win32"> <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> @@ -649,6 +659,11 @@ <Overwrite>true</Overwrite> </Platform> </DeployFile> + <DeployFile Condition="'$(DynamicRTL)'=='true'" LocalName="$(BDS)\Redist\osx64\libcgcrtl.dylib" Class="DependencyModule"> + <Platform Name="OSX64"> + <Overwrite>true</Overwrite> + </Platform> + </DeployFile> <DeployFile LocalName="..\..\src\rcv\binex.c" Configuration="Release" Class="ProjectFile"> <Platform Name="Win32"> <RemoteDir>.\</RemoteDir> @@ -667,6 +682,11 @@ <Overwrite>true</Overwrite> </Platform> </DeployFile> + <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'=='true'" LocalName="$(BDS)\bin64\cc64260mt.dll" Class="DependencyModule"> + <Platform Name="Win64"> + <Overwrite>true</Overwrite> + </Platform> + </DeployFile> <DeployFile LocalName="..\..\src\rinex.c" Configuration="Release" Class="ProjectFile"> <Platform Name="Win32"> <RemoteDir>.\</RemoteDir> @@ -689,31 +709,31 @@ <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile LocalName="..\..\src\qzslex.c" Configuration="Release" Class="ProjectFile"> + <DeployFile LocalName="..\..\src\rcv\swiftnav.c" Configuration="Release" Class="ProjectFile"> <Platform Name="Win32"> <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile LocalName="..\..\src\rtcm.c" Configuration="Release" Class="ProjectFile"> + <DeployFile LocalName="..\..\src\qzslex.c" Configuration="Release" Class="ProjectFile"> <Platform Name="Win32"> <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile LocalName="..\..\src\lambda.c" Configuration="Release" Class="ProjectFile"> + <DeployFile LocalName="..\..\src\rtcm.c" Configuration="Release" Class="ProjectFile"> <Platform Name="Win32"> <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile LocalName="..\..\src\rcv\tersus.c" Configuration="Release" Class="ProjectFile"> + <DeployFile LocalName="..\..\src\lambda.c" Configuration="Release" Class="ProjectFile"> <Platform Name="Win32"> <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile LocalName="..\..\src\rcv\comnav.c" Configuration="Release" Class="ProjectFile"> + <DeployFile LocalName="..\..\src\rcv\tersus.c" Configuration="Release" Class="ProjectFile"> <Platform Name="Win32"> <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> @@ -809,9 +829,13 @@ <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile LocalName="..\..\src\rcv\swiftnav.c" Configuration="Release" Class="ProjectFile"> + <DeployFile Condition="'$(DynamicRTL)'=='true'" LocalName="$(BDS)\Redist\osx64\libcgstl.dylib" Class="DependencyModule"> + <Platform Name="OSX64"> + <Overwrite>true</Overwrite> + </Platform> + </DeployFile> + <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'=='true'" LocalName="$(BDS)\bin\cc32260mt.dll" Class="DependencyModule"> <Platform Name="Win32"> - <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> </Platform> </DeployFile> @@ -832,6 +856,22 @@ <Overwrite>true</Overwrite> </Platform> </DeployFile> + <DeployFile LocalName="..\..\src\rcv\comnav.c" Configuration="Release" Class="ProjectFile"> + <Platform Name="Win32"> + <RemoteDir>.\</RemoteDir> + <Overwrite>true</Overwrite> + </Platform> + </DeployFile> + <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'!='true'" LocalName="$(BDS)\bin64\cc64260.dll" Class="DependencyModule"> + <Platform Name="Win64"> + <Overwrite>true</Overwrite> + </Platform> + </DeployFile> + <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'=='true'" LocalName="$(BDS)\bin\cc32c260mt.dll" Class="DependencyModule"> + <Platform Name="Win32"> + <Overwrite>true</Overwrite> + </Platform> + </DeployFile> <DeployFile LocalName="..\..\src\preceph.c" Configuration="Release" Class="ProjectFile"> <Platform Name="Win32"> <RemoteDir>.\</RemoteDir> @@ -847,7 +887,6 @@ <Operation>1</Operation> </Platform> <Platform Name="Win32"> - <RemoteDir>Contents\MacOS</RemoteDir> <Operation>0</Operation> </Platform> </DeployClass> @@ -857,6 +896,12 @@ <Operation>1</Operation> </Platform> </DeployClass> + <DeployClass Name="AndroidFileProvider"> + <Platform Name="Android"> + <RemoteDir>res\xml</RemoteDir> + <Operation>1</Operation> + </Platform> + </DeployClass> <DeployClass Name="AndroidGDBServer"> <Platform Name="Android"> <RemoteDir>library\lib\armeabi-v7a</RemoteDir> @@ -893,6 +938,12 @@ <Operation>1</Operation> </Platform> </DeployClass> + <DeployClass Name="AndroidSplashStylesV21"> + <Platform Name="Android"> + <RemoteDir>res\values-v21</RemoteDir> + <Operation>1</Operation> + </Platform> + </DeployClass> <DeployClass Name="Android_DefaultAppIcon"> <Platform Name="Android"> <RemoteDir>res\drawable</RemoteDir> @@ -971,6 +1022,11 @@ <Operation>1</Operation> <Extensions>.framework</Extensions> </Platform> + <Platform Name="OSX64"> + <RemoteDir>Contents\MacOS</RemoteDir> + <Operation>1</Operation> + <Extensions>.framework</Extensions> + </Platform> <Platform Name="Win32"> <Operation>0</Operation> </Platform> @@ -993,6 +1049,11 @@ <Operation>1</Operation> <Extensions>.dylib</Extensions> </Platform> + <Platform Name="OSX64"> + <RemoteDir>Contents\MacOS</RemoteDir> + <Operation>1</Operation> + <Extensions>.dylib</Extensions> + </Platform> <Platform Name="Win32"> <Operation>0</Operation> <Extensions>.dll;.bpl</Extensions> @@ -1016,6 +1077,11 @@ <Operation>1</Operation> <Extensions>.dylib</Extensions> </Platform> + <Platform Name="OSX64"> + <RemoteDir>Contents\MacOS</RemoteDir> + <Operation>1</Operation> + <Extensions>.dylib</Extensions> + </Platform> <Platform Name="Win32"> <Operation>0</Operation> <Extensions>.bpl</Extensions> @@ -1038,6 +1104,10 @@ <RemoteDir>Contents\Resources\StartUp\</RemoteDir> <Operation>0</Operation> </Platform> + <Platform Name="OSX64"> + <RemoteDir>Contents\Resources\StartUp\</RemoteDir> + <Operation>0</Operation> + </Platform> <Platform Name="Win32"> <Operation>0</Operation> </Platform> @@ -1174,23 +1244,41 @@ <Operation>1</Operation> </Platform> </DeployClass> + <DeployClass Name="ProjectOSXDebug"> + <Platform Name="OSX64"> + <RemoteDir>..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF</RemoteDir> + <Operation>1</Operation> + </Platform> + </DeployClass> <DeployClass Name="ProjectOSXEntitlements"> <Platform Name="OSX32"> <RemoteDir>..\</RemoteDir> <Operation>1</Operation> </Platform> + <Platform Name="OSX64"> + <RemoteDir>..\</RemoteDir> + <Operation>1</Operation> + </Platform> </DeployClass> <DeployClass Name="ProjectOSXInfoPList"> <Platform Name="OSX32"> <RemoteDir>Contents</RemoteDir> <Operation>1</Operation> </Platform> + <Platform Name="OSX64"> + <RemoteDir>Contents</RemoteDir> + <Operation>1</Operation> + </Platform> </DeployClass> <DeployClass Name="ProjectOSXResource"> <Platform Name="OSX32"> <RemoteDir>Contents\Resources</RemoteDir> <Operation>1</Operation> </Platform> + <Platform Name="OSX64"> + <RemoteDir>Contents\Resources</RemoteDir> + <Operation>1</Operation> + </Platform> </DeployClass> <DeployClass Required="true" Name="ProjectOutput"> <Platform Name="Android"> @@ -1213,6 +1301,10 @@ <RemoteDir>Contents\MacOS</RemoteDir> <Operation>1</Operation> </Platform> + <Platform Name="OSX64"> + <RemoteDir>Contents\MacOS</RemoteDir> + <Operation>1</Operation> + </Platform> <Platform Name="Win32"> <Operation>0</Operation> </Platform> @@ -1252,6 +1344,7 @@ <ProjectRoot Platform="Linux64" Name="$(PROJECTNAME)"/> <ProjectRoot Platform="OSX32" Name="$(PROJECTNAME).app"/> <ProjectRoot Platform="Android" Name="$(PROJECTNAME)"/> + <ProjectRoot Platform="OSX64" Name="$(PROJECTNAME).app"/> <ProjectRoot Platform="iOSSimulator" Name="$(PROJECTNAME).app"/> </Deployment> </BorlandProject> diff --git a/app/rtknavi_mkl/rtknavi_mkl.cbproj b/app/rtknavi_mkl/rtknavi_mkl.cbproj index b4d70df83081986d017fac096746f1af697c4671..48c76cac6a65ee758ce31e1ee2861c667e2d1c3e 100644 --- a/app/rtknavi_mkl/rtknavi_mkl.cbproj +++ b/app/rtknavi_mkl/rtknavi_mkl.cbproj @@ -6,7 +6,7 @@ <Base>True</Base> <Config Condition="'$(Config)'==''">Release</Config> <FrameworkType>VCL</FrameworkType> - <ProjectVersion>18.4</ProjectVersion> + <ProjectVersion>18.5</ProjectVersion> <Platform Condition="'$(Platform)'==''">Win32</Platform> <TargetedPlatforms>1</TargetedPlatforms> <AppType>Application</AppType> @@ -446,25 +446,25 @@ <CppCompile Include="..\..\src\tle.c"> <BuildOrder>53</BuildOrder> </CppCompile> + <FormResources Include="..\appcmn\vieweropt.dfm"/> <FormResources Include="..\appcmn\viewer.dfm"/> <FormResources Include="..\appcmn\tcpoptdlg.dfm"/> <FormResources Include="..\appcmn\serioptdlg.dfm"/> - <FormResources Include="..\appcmn\vieweropt.dfm"/> + <FormResources Include="..\rtknavi\mondlg.dfm"/> <FormResources Include="..\rtknavi\markdlg.dfm"/> <FormResources Include="..\rtknavi\logstrdlg.dfm"/> <FormResources Include="..\rtknavi\instrdlg.dfm"/> - <FormResources Include="..\appcmn\refdlg.dfm"/> + <FormResources Include="..\appcmn\ftpoptdlg.dfm"/> <FormResources Include="..\appcmn\confdlg.dfm"/> <FormResources Include="..\appcmn\cmdoptdlg.dfm"/> <FormResources Include="..\appcmn\aboutdlg.dfm"/> - <FormResources Include="..\appcmn\ftpoptdlg.dfm"/> + <FormResources Include="..\appcmn\refdlg.dfm"/> <FormResources Include="..\appcmn\maskoptdlg.dfm"/> <FormResources Include="..\appcmn\keydlg.dfm"/> - <FormResources Include="..\rtknavi\mondlg.dfm"/> + <FormResources Include="..\rtknavi\rcvoptdlg.dfm"/> <FormResources Include="..\rtknavi\outstrdlg.dfm"/> <FormResources Include="..\rtknavi\naviopt.dfm"/> <FormResources Include="..\rtknavi\navimain.dfm"/> - <FormResources Include="..\rtknavi\rcvoptdlg.dfm"/> <BuildConfiguration Include="Release"> <Key>Cfg_2</Key> <CfgParent>Base</CfgParent> @@ -549,6 +549,11 @@ <Platform value="Win64">False</Platform> </Platforms> <Deployment Version="3"> + <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'!='true'" LocalName="$(BDS)\bin\cc32c260.dll" Class="DependencyModule"> + <Platform Name="Win32"> + <Overwrite>true</Overwrite> + </Platform> + </DeployFile> <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'=='true'" LocalName="$(BDS)\bin\cc32c240mt.dll" Class="DependencyModule"> <Platform Name="Win32"> <Overwrite>true</Overwrite> @@ -560,6 +565,11 @@ <Overwrite>true</Overwrite> </Platform> </DeployFile> + <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'!='true'" LocalName="$(BDS)\bin\cc32260.dll" Class="DependencyModule"> + <Platform Name="Win32"> + <Overwrite>true</Overwrite> + </Platform> + </DeployFile> <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'=='true'" LocalName="$(BDS)\bin\cc32120mt.dll" Class="DependencyModule"> <Platform Name="Win32"> <Overwrite>true</Overwrite> @@ -571,20 +581,20 @@ <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile LocalName="..\..\src\rcv\novatel.c" Configuration="Release" Class="ProjectFile"> + <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'=='true'" LocalName="$(BDS)\bin\cc32240mt.dll" Class="DependencyModule"> <Platform Name="Win32"> - <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile LocalName="..\..\src\rtcm2.c" Configuration="Release" Class="ProjectFile"> + <DeployFile LocalName="..\..\src\rcv\novatel.c" Configuration="Release" Class="ProjectFile"> <Platform Name="Win32"> <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'=='true'" LocalName="$(BDS)\bin\cc32240mt.dll" Class="DependencyModule"> + <DeployFile LocalName="..\..\src\rtcm2.c" Configuration="Release" Class="ProjectFile"> <Platform Name="Win32"> + <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> </Platform> </DeployFile> @@ -622,13 +632,13 @@ <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile LocalName="..\..\src\rcv\skytraq.c" Configuration="Release" Class="ProjectFile"> + <DeployFile LocalName="..\..\src\rtkcmn.c" Configuration="Release" Class="ProjectFile"> <Platform Name="Win32"> <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile LocalName="..\..\src\rtkcmn.c" Configuration="Release" Class="ProjectFile"> + <DeployFile LocalName="..\..\src\rcv\skytraq.c" Configuration="Release" Class="ProjectFile"> <Platform Name="Win32"> <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> @@ -701,6 +711,11 @@ <Overwrite>true</Overwrite> </Platform> </DeployFile> + <DeployFile Condition="'$(DynamicRTL)'=='true'" LocalName="$(BDS)\Redist\osx64\libcgcrtl.dylib" Class="DependencyModule"> + <Platform Name="OSX64"> + <Overwrite>true</Overwrite> + </Platform> + </DeployFile> <DeployFile LocalName="..\..\src\rcv\binex.c" Configuration="Release" Class="ProjectFile"> <Platform Name="Win32"> <RemoteDir>.\</RemoteDir> @@ -719,6 +734,11 @@ <Overwrite>true</Overwrite> </Platform> </DeployFile> + <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'=='true'" LocalName="$(BDS)\bin64\cc64260mt.dll" Class="DependencyModule"> + <Platform Name="Win64"> + <Overwrite>true</Overwrite> + </Platform> + </DeployFile> <DeployFile LocalName="..\..\src\rinex.c" Configuration="Release" Class="ProjectFile"> <Platform Name="Win32"> <RemoteDir>.\</RemoteDir> @@ -747,31 +767,31 @@ <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile LocalName="..\..\src\qzslex.c" Configuration="Release" Class="ProjectFile"> + <DeployFile LocalName="..\..\src\rcv\swiftnav.c" Configuration="Release" Class="ProjectFile"> <Platform Name="Win32"> <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile LocalName="..\..\src\rtcm.c" Configuration="Release" Class="ProjectFile"> + <DeployFile LocalName="..\..\src\qzslex.c" Configuration="Release" Class="ProjectFile"> <Platform Name="Win32"> <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile LocalName="..\..\src\lambda.c" Configuration="Release" Class="ProjectFile"> + <DeployFile LocalName="..\..\src\rtcm.c" Configuration="Release" Class="ProjectFile"> <Platform Name="Win32"> <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile LocalName="..\..\src\rcv\tersus.c" Configuration="Release" Class="ProjectFile"> + <DeployFile LocalName="..\..\src\lambda.c" Configuration="Release" Class="ProjectFile"> <Platform Name="Win32"> <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile LocalName="..\..\src\rcv\comnav.c" Configuration="Release" Class="ProjectFile"> + <DeployFile LocalName="..\..\src\rcv\tersus.c" Configuration="Release" Class="ProjectFile"> <Platform Name="Win32"> <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> @@ -874,13 +894,17 @@ <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile LocalName="..\..\src\rcv\swiftnav.c" Configuration="Release" Class="ProjectFile"> + <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'!='true'" LocalName="$(BDS)\bin\cc32c250.dll" Class="DependencyModule"> <Platform Name="Win32"> - <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'!='true'" LocalName="$(BDS)\bin\cc32c250.dll" Class="DependencyModule"> + <DeployFile Condition="'$(DynamicRTL)'=='true'" LocalName="$(BDS)\Redist\osx64\libcgstl.dylib" Class="DependencyModule"> + <Platform Name="OSX64"> + <Overwrite>true</Overwrite> + </Platform> + </DeployFile> + <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'=='true'" LocalName="$(BDS)\bin\cc32260mt.dll" Class="DependencyModule"> <Platform Name="Win32"> <Overwrite>true</Overwrite> </Platform> @@ -902,6 +926,22 @@ <Overwrite>true</Overwrite> </Platform> </DeployFile> + <DeployFile LocalName="..\..\src\rcv\comnav.c" Configuration="Release" Class="ProjectFile"> + <Platform Name="Win32"> + <RemoteDir>.\</RemoteDir> + <Overwrite>true</Overwrite> + </Platform> + </DeployFile> + <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'!='true'" LocalName="$(BDS)\bin64\cc64260.dll" Class="DependencyModule"> + <Platform Name="Win64"> + <Overwrite>true</Overwrite> + </Platform> + </DeployFile> + <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'=='true'" LocalName="$(BDS)\bin\cc32c260mt.dll" Class="DependencyModule"> + <Platform Name="Win32"> + <Overwrite>true</Overwrite> + </Platform> + </DeployFile> <DeployFile LocalName="..\..\src\preceph.c" Configuration="Release" Class="ProjectFile"> <Platform Name="Win32"> <RemoteDir>.\</RemoteDir> @@ -917,7 +957,6 @@ <Operation>1</Operation> </Platform> <Platform Name="Win32"> - <RemoteDir>Contents\MacOS</RemoteDir> <Operation>0</Operation> </Platform> </DeployClass> @@ -927,6 +966,12 @@ <Operation>1</Operation> </Platform> </DeployClass> + <DeployClass Name="AndroidFileProvider"> + <Platform Name="Android"> + <RemoteDir>res\xml</RemoteDir> + <Operation>1</Operation> + </Platform> + </DeployClass> <DeployClass Name="AndroidGDBServer"> <Platform Name="Android"> <RemoteDir>library\lib\armeabi-v7a</RemoteDir> @@ -963,6 +1008,12 @@ <Operation>1</Operation> </Platform> </DeployClass> + <DeployClass Name="AndroidSplashStylesV21"> + <Platform Name="Android"> + <RemoteDir>res\values-v21</RemoteDir> + <Operation>1</Operation> + </Platform> + </DeployClass> <DeployClass Name="Android_DefaultAppIcon"> <Platform Name="Android"> <RemoteDir>res\drawable</RemoteDir> @@ -1041,6 +1092,11 @@ <Operation>1</Operation> <Extensions>.framework</Extensions> </Platform> + <Platform Name="OSX64"> + <RemoteDir>Contents\MacOS</RemoteDir> + <Operation>1</Operation> + <Extensions>.framework</Extensions> + </Platform> <Platform Name="Win32"> <Operation>0</Operation> </Platform> @@ -1063,6 +1119,11 @@ <Operation>1</Operation> <Extensions>.dylib</Extensions> </Platform> + <Platform Name="OSX64"> + <RemoteDir>Contents\MacOS</RemoteDir> + <Operation>1</Operation> + <Extensions>.dylib</Extensions> + </Platform> <Platform Name="Win32"> <Operation>0</Operation> <Extensions>.dll;.bpl</Extensions> @@ -1086,6 +1147,11 @@ <Operation>1</Operation> <Extensions>.dylib</Extensions> </Platform> + <Platform Name="OSX64"> + <RemoteDir>Contents\MacOS</RemoteDir> + <Operation>1</Operation> + <Extensions>.dylib</Extensions> + </Platform> <Platform Name="Win32"> <Operation>0</Operation> <Extensions>.bpl</Extensions> @@ -1108,6 +1174,10 @@ <RemoteDir>Contents\Resources\StartUp\</RemoteDir> <Operation>0</Operation> </Platform> + <Platform Name="OSX64"> + <RemoteDir>Contents\Resources\StartUp\</RemoteDir> + <Operation>0</Operation> + </Platform> <Platform Name="Win32"> <Operation>0</Operation> </Platform> @@ -1244,23 +1314,41 @@ <Operation>1</Operation> </Platform> </DeployClass> + <DeployClass Name="ProjectOSXDebug"> + <Platform Name="OSX64"> + <RemoteDir>..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF</RemoteDir> + <Operation>1</Operation> + </Platform> + </DeployClass> <DeployClass Name="ProjectOSXEntitlements"> <Platform Name="OSX32"> <RemoteDir>..\</RemoteDir> <Operation>1</Operation> </Platform> + <Platform Name="OSX64"> + <RemoteDir>..\</RemoteDir> + <Operation>1</Operation> + </Platform> </DeployClass> <DeployClass Name="ProjectOSXInfoPList"> <Platform Name="OSX32"> <RemoteDir>Contents</RemoteDir> <Operation>1</Operation> </Platform> + <Platform Name="OSX64"> + <RemoteDir>Contents</RemoteDir> + <Operation>1</Operation> + </Platform> </DeployClass> <DeployClass Name="ProjectOSXResource"> <Platform Name="OSX32"> <RemoteDir>Contents\Resources</RemoteDir> <Operation>1</Operation> </Platform> + <Platform Name="OSX64"> + <RemoteDir>Contents\Resources</RemoteDir> + <Operation>1</Operation> + </Platform> </DeployClass> <DeployClass Required="true" Name="ProjectOutput"> <Platform Name="Android"> @@ -1283,6 +1371,10 @@ <RemoteDir>Contents\MacOS</RemoteDir> <Operation>1</Operation> </Platform> + <Platform Name="OSX64"> + <RemoteDir>Contents\MacOS</RemoteDir> + <Operation>1</Operation> + </Platform> <Platform Name="Win32"> <Operation>0</Operation> </Platform> @@ -1322,6 +1414,7 @@ <ProjectRoot Platform="Linux64" Name="$(PROJECTNAME)"/> <ProjectRoot Platform="OSX32" Name="$(PROJECTNAME).app"/> <ProjectRoot Platform="Android" Name="$(PROJECTNAME)"/> + <ProjectRoot Platform="OSX64" Name="$(PROJECTNAME).app"/> <ProjectRoot Platform="iOSSimulator" Name="$(PROJECTNAME).app"/> </Deployment> </BorlandProject> diff --git a/app/rtknavi_win64/rtknavi_win64.cbproj b/app/rtknavi_win64/rtknavi_win64.cbproj index 5a23dda6e986bd4ab7ef7bf92efbac0406621bd7..9636df1a1fafe66e3cc27d344e1b2d0d8b7b9781 100644 --- a/app/rtknavi_win64/rtknavi_win64.cbproj +++ b/app/rtknavi_win64/rtknavi_win64.cbproj @@ -6,7 +6,7 @@ <Base>True</Base> <Config Condition="'$(Config)'==''">Release</Config> <FrameworkType>VCL</FrameworkType> - <ProjectVersion>18.4</ProjectVersion> + <ProjectVersion>18.5</ProjectVersion> <Platform Condition="'$(Platform)'==''">Win32</Platform> <TargetedPlatforms>3</TargetedPlatforms> <AppType>Application</AppType> @@ -147,10 +147,10 @@ <BCC_wpar>false</BCC_wpar> </PropertyGroup> <PropertyGroup Condition="'$(Cfg_1_Win64)'!=''"> - <AppEnableHighDPI>true</AppEnableHighDPI> <AppEnableRuntimeThemes>true</AppEnableRuntimeThemes> <Manifest_File>$(BDS)\bin\default_app.manifest</Manifest_File> <BCC_Defines>_DEBUG;$(BCC_Defines);$(BCC_Defines)</BCC_Defines> + <AppDPIAwarenessMode>PerMonitor</AppDPIAwarenessMode> </PropertyGroup> <PropertyGroup Condition="'$(Cfg_2)'!=''"> <DCC_AdditionalSwitches> -$O+</DCC_AdditionalSwitches> @@ -172,13 +172,13 @@ </PropertyGroup> <PropertyGroup Condition="'$(Cfg_2_Win64)'!=''"> <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo> - <AppEnableHighDPI>true</AppEnableHighDPI> <AppEnableRuntimeThemes>true</AppEnableRuntimeThemes> <LinkPackageStatics>rtl.lib;vcl.lib;vclx.lib;bindengine.lib</LinkPackageStatics> <VerInfo_Locale>1033</VerInfo_Locale> <Manifest_File>$(BDS)\bin\default_app.manifest</Manifest_File> <BCC_Defines>NDEBUG;$(BCC_Defines);$(BCC_Defines)</BCC_Defines> <BT_BuildType>Debug</BT_BuildType> + <AppDPIAwarenessMode>PerMonitor</AppDPIAwarenessMode> </PropertyGroup> <ItemGroup> <CppCompile Include="..\appcmn\aboutdlg.cpp"> @@ -465,10 +465,10 @@ <FormResources Include="..\appcmn\ftpoptdlg.dfm"/> <FormResources Include="..\appcmn\maskoptdlg.dfm"/> <FormResources Include="..\appcmn\keydlg.dfm"/> - <FormResources Include="..\rtknavi\naviopt.dfm"/> - <FormResources Include="..\rtknavi\navimain.dfm"/> <FormResources Include="..\rtknavi\mondlg.dfm"/> <FormResources Include="..\rtknavi\outstrdlg.dfm"/> + <FormResources Include="..\rtknavi\naviopt.dfm"/> + <FormResources Include="..\rtknavi\navimain.dfm"/> <FormResources Include="..\rtknavi\rcvoptdlg.dfm"/> <BuildConfiguration Include="Release"> <Key>Cfg_2</Key> @@ -554,6 +554,11 @@ <Platform value="Win64">True</Platform> </Platforms> <Deployment Version="3"> + <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'!='true'" LocalName="$(BDS)\bin\cc32c260.dll" Class="DependencyModule"> + <Platform Name="Win32"> + <Overwrite>true</Overwrite> + </Platform> + </DeployFile> <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'=='true'" LocalName="$(BDS)\bin\cc32c240mt.dll" Class="DependencyModule"> <Platform Name="Win32"> <Overwrite>true</Overwrite> @@ -571,6 +576,11 @@ <Overwrite>true</Overwrite> </Platform> </DeployFile> + <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'!='true'" LocalName="$(BDS)\bin\cc32260.dll" Class="DependencyModule"> + <Platform Name="Win32"> + <Overwrite>true</Overwrite> + </Platform> + </DeployFile> <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'=='true'" LocalName="$(BDS)\bin\cc32120mt.dll" Class="DependencyModule"> <Platform Name="Win32"> <Overwrite>true</Overwrite> @@ -588,13 +598,13 @@ </Platform> </DeployFile> <DeployFile LocalName="..\..\src\rtcm2.c" Configuration="Release" Class="ProjectFile"> - <Platform Name="Win32"> + <Platform Name="Win64"> <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> </Platform> </DeployFile> <DeployFile LocalName="..\..\src\rtcm2.c" Configuration="Release" Class="ProjectFile"> - <Platform Name="Win64"> + <Platform Name="Win32"> <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> </Platform> @@ -640,18 +650,6 @@ <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile LocalName="..\..\src\rcv\tersus.c" Configuration="Release" Class="ProjectFile"> - <Platform Name="Win64"> - <RemoteDir>.\</RemoteDir> - <Overwrite>true</Overwrite> - </Platform> - </DeployFile> - <DeployFile LocalName="..\..\src\rcv\comnav.c" Configuration="Release" Class="ProjectFile"> - <Platform Name="Win64"> - <RemoteDir>.\</RemoteDir> - <Overwrite>true</Overwrite> - </Platform> - </DeployFile> <DeployFile Condition="'$(UsingDelphiRTL)'=='true'" LocalName="$(BDS)\bin\borlndmm.dll" Class="DependencyModule"> <Platform Name="Win32"> <Overwrite>true</Overwrite> @@ -709,6 +707,17 @@ <Overwrite>true</Overwrite> </Platform> </DeployFile> + <DeployFile LocalName="..\..\src\rcv\tersus.c" Configuration="Release" Class="ProjectFile"> + <Platform Name="Win64"> + <RemoteDir>.\</RemoteDir> + <Overwrite>true</Overwrite> + </Platform> + </DeployFile> + <DeployFile Condition="'$(DynamicRTL)'=='true'" LocalName="$(BDS)\Redist\osx64\libcgcrtl.dylib" Class="DependencyModule"> + <Platform Name="OSX64"> + <Overwrite>true</Overwrite> + </Platform> + </DeployFile> <DeployFile LocalName="..\..\src\datum.c" Configuration="Release" Class="ProjectFile"> <Platform Name="Win64"> <RemoteDir>.\</RemoteDir> @@ -733,31 +742,36 @@ <Overwrite>true</Overwrite> </Platform> </DeployFile> + <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'=='true'" LocalName="$(BDS)\bin64\cc64260mt.dll" Class="DependencyModule"> + <Platform Name="Win64"> + <Overwrite>true</Overwrite> + </Platform> + </DeployFile> <DeployFile LocalName="..\..\src\ephemeris.c" Configuration="Release" Class="ProjectFile"> <Platform Name="Win64"> <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile LocalName="..\..\src\qzslex.c" Configuration="Release" Class="ProjectFile"> + <DeployFile LocalName="..\..\src\rcv\swiftnav.c" Configuration="Release" Class="ProjectFile"> <Platform Name="Win32"> <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile LocalName="..\..\src\rtcm.c" Configuration="Release" Class="ProjectFile"> + <DeployFile LocalName="..\..\src\qzslex.c" Configuration="Release" Class="ProjectFile"> <Platform Name="Win32"> <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile LocalName="..\..\src\rcv\tersus.c" Configuration="Release" Class="ProjectFile"> + <DeployFile LocalName="..\..\src\rtcm.c" Configuration="Release" Class="ProjectFile"> <Platform Name="Win32"> <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile LocalName="..\..\src\rcv\comnav.c" Configuration="Release" Class="ProjectFile"> + <DeployFile LocalName="..\..\src\rcv\tersus.c" Configuration="Release" Class="ProjectFile"> <Platform Name="Win32"> <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> @@ -811,6 +825,11 @@ <Overwrite>true</Overwrite> </Platform> </DeployFile> + <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'=='true'" LocalName="$(BDS)\bin\cc32260mt.dll" Class="DependencyModule"> + <Platform Name="Win32"> + <Overwrite>true</Overwrite> + </Platform> + </DeployFile> <DeployFile LocalName="..\..\src\ppp_corr.c" Configuration="Release" Class="ProjectFile"> <Platform Name="Win64"> <RemoteDir>.\</RemoteDir> @@ -829,19 +848,29 @@ <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile LocalName="..\..\src\preceph.c" Configuration="Release" Class="ProjectFile"> + <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'!='true'" LocalName="$(BDS)\bin64\cc64260.dll" Class="DependencyModule"> + <Platform Name="Win64"> + <Overwrite>true</Overwrite> + </Platform> + </DeployFile> + <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'=='true'" LocalName="$(BDS)\bin\cc32c260mt.dll" Class="DependencyModule"> <Platform Name="Win32"> - <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile LocalName="..\..\src\rtcm.c" Configuration="Release" Class="ProjectFile"> + <DeployFile LocalName="..\..\src\rcv\swiftnav.c" Configuration="Release" Class="ProjectFile"> <Platform Name="Win64"> <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile LocalName="..\..\src\rcv\swiftnav.c" Configuration="Release" Class="ProjectFile"> + <DeployFile LocalName="..\..\src\preceph.c" Configuration="Release" Class="ProjectFile"> + <Platform Name="Win32"> + <RemoteDir>.\</RemoteDir> + <Overwrite>true</Overwrite> + </Platform> + </DeployFile> + <DeployFile LocalName="..\..\src\rtcm.c" Configuration="Release" Class="ProjectFile"> <Platform Name="Win64"> <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> @@ -870,6 +899,12 @@ <Overwrite>true</Overwrite> </Platform> </DeployFile> + <DeployFile LocalName="..\..\src\rcv\comnav.c" Configuration="Release" Class="ProjectFile"> + <Platform Name="Win64"> + <RemoteDir>.\</RemoteDir> + <Overwrite>true</Overwrite> + </Platform> + </DeployFile> <DeployFile LocalName="Debug_Build\rtknavi_win64.exe" Configuration="Debug" Class="ProjectOutput"> <Platform Name="Win32"> <Overwrite>true</Overwrite> @@ -1076,14 +1111,13 @@ <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile LocalName="..\..\src\rtkcmn.c" Configuration="Release" Class="ProjectFile"> - <Platform Name="Win64"> - <RemoteDir>.\</RemoteDir> + <DeployFile Condition="'$(DynamicRTL)'=='true'" LocalName="$(BDS)\Redist\osx64\libcgstl.dylib" Class="DependencyModule"> + <Platform Name="OSX64"> <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile LocalName="..\..\src\rcv\swiftnav.c" Configuration="Release" Class="ProjectFile"> - <Platform Name="Win32"> + <DeployFile LocalName="..\..\src\rtkcmn.c" Configuration="Release" Class="ProjectFile"> + <Platform Name="Win64"> <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> </Platform> @@ -1130,6 +1164,12 @@ <Overwrite>true</Overwrite> </Platform> </DeployFile> + <DeployFile LocalName="..\..\src\rcv\comnav.c" Configuration="Release" Class="ProjectFile"> + <Platform Name="Win32"> + <RemoteDir>.\</RemoteDir> + <Overwrite>true</Overwrite> + </Platform> + </DeployFile> <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'=='true'" LocalName="$(BDS)\bin64\cc64250mt.dll" Class="DependencyModule"> <Platform Name="Win64"> <Overwrite>true</Overwrite> @@ -1162,7 +1202,6 @@ <Operation>1</Operation> </Platform> <Platform Name="Win32"> - <RemoteDir>Contents\MacOS</RemoteDir> <Operation>0</Operation> </Platform> </DeployClass> @@ -1172,6 +1211,12 @@ <Operation>1</Operation> </Platform> </DeployClass> + <DeployClass Name="AndroidFileProvider"> + <Platform Name="Android"> + <RemoteDir>res\xml</RemoteDir> + <Operation>1</Operation> + </Platform> + </DeployClass> <DeployClass Name="AndroidGDBServer"> <Platform Name="Android"> <RemoteDir>library\lib\armeabi-v7a</RemoteDir> @@ -1208,6 +1253,12 @@ <Operation>1</Operation> </Platform> </DeployClass> + <DeployClass Name="AndroidSplashStylesV21"> + <Platform Name="Android"> + <RemoteDir>res\values-v21</RemoteDir> + <Operation>1</Operation> + </Platform> + </DeployClass> <DeployClass Name="Android_DefaultAppIcon"> <Platform Name="Android"> <RemoteDir>res\drawable</RemoteDir> @@ -1286,6 +1337,11 @@ <Operation>1</Operation> <Extensions>.framework</Extensions> </Platform> + <Platform Name="OSX64"> + <RemoteDir>Contents\MacOS</RemoteDir> + <Operation>1</Operation> + <Extensions>.framework</Extensions> + </Platform> <Platform Name="Win32"> <Operation>0</Operation> </Platform> @@ -1308,6 +1364,11 @@ <Operation>1</Operation> <Extensions>.dylib</Extensions> </Platform> + <Platform Name="OSX64"> + <RemoteDir>Contents\MacOS</RemoteDir> + <Operation>1</Operation> + <Extensions>.dylib</Extensions> + </Platform> <Platform Name="Win32"> <Operation>0</Operation> <Extensions>.dll;.bpl</Extensions> @@ -1331,6 +1392,11 @@ <Operation>1</Operation> <Extensions>.dylib</Extensions> </Platform> + <Platform Name="OSX64"> + <RemoteDir>Contents\MacOS</RemoteDir> + <Operation>1</Operation> + <Extensions>.dylib</Extensions> + </Platform> <Platform Name="Win32"> <Operation>0</Operation> <Extensions>.bpl</Extensions> @@ -1353,6 +1419,10 @@ <RemoteDir>Contents\Resources\StartUp\</RemoteDir> <Operation>0</Operation> </Platform> + <Platform Name="OSX64"> + <RemoteDir>Contents\Resources\StartUp\</RemoteDir> + <Operation>0</Operation> + </Platform> <Platform Name="Win32"> <Operation>0</Operation> </Platform> @@ -1489,23 +1559,41 @@ <Operation>1</Operation> </Platform> </DeployClass> + <DeployClass Name="ProjectOSXDebug"> + <Platform Name="OSX64"> + <RemoteDir>..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF</RemoteDir> + <Operation>1</Operation> + </Platform> + </DeployClass> <DeployClass Name="ProjectOSXEntitlements"> <Platform Name="OSX32"> <RemoteDir>..\</RemoteDir> <Operation>1</Operation> </Platform> + <Platform Name="OSX64"> + <RemoteDir>..\</RemoteDir> + <Operation>1</Operation> + </Platform> </DeployClass> <DeployClass Name="ProjectOSXInfoPList"> <Platform Name="OSX32"> <RemoteDir>Contents</RemoteDir> <Operation>1</Operation> </Platform> + <Platform Name="OSX64"> + <RemoteDir>Contents</RemoteDir> + <Operation>1</Operation> + </Platform> </DeployClass> <DeployClass Name="ProjectOSXResource"> <Platform Name="OSX32"> <RemoteDir>Contents\Resources</RemoteDir> <Operation>1</Operation> </Platform> + <Platform Name="OSX64"> + <RemoteDir>Contents\Resources</RemoteDir> + <Operation>1</Operation> + </Platform> </DeployClass> <DeployClass Required="true" Name="ProjectOutput"> <Platform Name="Android"> @@ -1528,6 +1616,10 @@ <RemoteDir>Contents\MacOS</RemoteDir> <Operation>1</Operation> </Platform> + <Platform Name="OSX64"> + <RemoteDir>Contents\MacOS</RemoteDir> + <Operation>1</Operation> + </Platform> <Platform Name="Win32"> <Operation>0</Operation> </Platform> @@ -1567,6 +1659,7 @@ <ProjectRoot Platform="Linux64" Name="$(PROJECTNAME)"/> <ProjectRoot Platform="OSX32" Name="$(PROJECTNAME).app"/> <ProjectRoot Platform="Android" Name="$(PROJECTNAME)"/> + <ProjectRoot Platform="OSX64" Name="$(PROJECTNAME).app"/> <ProjectRoot Platform="iOSSimulator" Name="$(PROJECTNAME).app"/> </Deployment> </BorlandProject> diff --git a/app/rtkplot/rtkplot.cbproj b/app/rtkplot/rtkplot.cbproj index 02a0bc87202f7118f7ded3f24295aab4e058acfc..5e49f33305441c9708c1351ba279326ea7d94f6c 100644 --- a/app/rtkplot/rtkplot.cbproj +++ b/app/rtkplot/rtkplot.cbproj @@ -6,7 +6,7 @@ <Base>True</Base> <Config Condition="'$(Config)'==''">Release</Config> <FrameworkType>VCL</FrameworkType> - <ProjectVersion>18.4</ProjectVersion> + <ProjectVersion>18.5</ProjectVersion> <Platform Condition="'$(Platform)'==''">Win32</Platform> <TargetedPlatforms>1</TargetedPlatforms> <AppType>Application</AppType> @@ -234,12 +234,6 @@ <DependentOn>conndlg.h</DependentOn> <BuildOrder>1</BuildOrder> </CppCompile> - <CppCompile Include="geview.cpp"> - <Form>GoogleEarthView</Form> - <FormType>dfm</FormType> - <DependentOn>geview.h</DependentOn> - <BuildOrder>48</BuildOrder> - </CppCompile> <CppCompile Include="gmview.cpp"> <Form>GoogleMapView</Form> <DependentOn>gmview.h</DependentOn> @@ -446,7 +440,6 @@ <FormResources Include="plotmain.dfm"/> <FormResources Include="mapdlg.dfm"/> <FormResources Include="gmview.dfm"/> - <FormResources Include="geview.dfm"/> <BuildConfiguration Include="Release"> <Key>Cfg_2</Key> <CfgParent>Base</CfgParent> @@ -530,114 +523,166 @@ <Platform value="Win32">True</Platform> </Platforms> <Deployment Version="3"> - <DeployFile LocalName="..\..\src\rcv\binex.c" Configuration="Release" Class="ProjectFile"> + <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'!='true'" LocalName="$(BDS)\bin\cc32c260.dll" Class="DependencyModule"> + <Platform Name="Win32"> + <Overwrite>true</Overwrite> + </Platform> + </DeployFile> + <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'!='true'" LocalName="$(BDS)\bin\cc32260.dll" Class="DependencyModule"> + <Platform Name="Win32"> + <Overwrite>true</Overwrite> + </Platform> + </DeployFile> + <DeployFile LocalName="..\..\src\rcv\novatel.c" Configuration="Release" Class="ProjectFile"> <Platform Name="Win32"> <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile LocalName="..\..\src\rtcm3.c" Configuration="Release" Class="ProjectFile"> + <DeployFile LocalName="..\..\src\ephemeris.c" Configuration="Release" Class="ProjectFile"> <Platform Name="Win32"> <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile LocalName="..\..\src\rcv\ublox.c" Configuration="Release" Class="ProjectFile"> + <DeployFile LocalName="..\..\src\rtcm2.c" Configuration="Release" Class="ProjectFile"> <Platform Name="Win32"> <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile LocalName="..\..\src\rinex.c" Configuration="Release" Class="ProjectFile"> + <DeployFile LocalName="..\..\src\rcv\nvs.c" Configuration="Release" Class="ProjectFile"> <Platform Name="Win32"> <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile LocalName="..\..\src\ephemeris.c" Configuration="Release" Class="ProjectFile"> + <DeployFile LocalName="..\..\src\ionex.c" Configuration="Release" Class="ProjectFile"> <Platform Name="Win32"> <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile LocalName="Release_Build\rtkplot.exe" Configuration="Release" Class="ProjectOutput"> + <DeployFile LocalName="..\..\src\rtkcmn.c" Configuration="Release" Class="ProjectFile"> <Platform Name="Win32"> - <RemoteName>rtkplot.exe</RemoteName> + <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'=='true'" LocalName="$(BDS)\bin\cc32250mt.dll" Class="DependencyModule"> + <DeployFile LocalName="..\..\src\rcv\skytraq.c" Configuration="Release" Class="ProjectFile"> <Platform Name="Win32"> + <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile LocalName="..\..\src\rtcm3e.c" Configuration="Release" Class="ProjectFile"> + <DeployFile Condition="'$(UsingDelphiRTL)'=='true'" LocalName="$(BDS)\bin\borlndmm.dll" Class="DependencyModule"> + <Platform Name="Win32"> + <Overwrite>true</Overwrite> + </Platform> + </DeployFile> + <DeployFile LocalName="..\..\src\rcv\septentrio.c" Configuration="Release" Class="ProjectFile"> <Platform Name="Win32"> <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile LocalName="..\..\src\rcv\novatel.c" Configuration="Release" Class="ProjectFile"> + <DeployFile Condition="'$(DynamicRTL)'=='true'" LocalName="$(BDS)\Redist\osx32\libcgstl.dylib" Class="DependencyModule"> + <Platform Name="OSX32"> + <Overwrite>true</Overwrite> + </Platform> + </DeployFile> + <DeployFile LocalName="..\..\src\solution.c" Configuration="Release" Class="ProjectFile"> <Platform Name="Win32"> <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile LocalName="..\..\src\rcv\nvs.c" Configuration="Release" Class="ProjectFile"> + <DeployFile LocalName="..\..\src\gis.c" Configuration="Release" Class="ProjectFile"> <Platform Name="Win32"> <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile LocalName="..\..\src\qzslex.c" Configuration="Release" Class="ProjectFile"> + <DeployFile LocalName="..\..\src\stream.c" Configuration="Release" Class="ProjectFile"> <Platform Name="Win32"> <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile LocalName="..\..\src\ionex.c" Configuration="Release" Class="ProjectFile"> + <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'!='true'" LocalName="$(BDS)\bin\cc32250.dll" Class="DependencyModule"> + <Platform Name="Win32"> + <Overwrite>true</Overwrite> + </Platform> + </DeployFile> + <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'!='true'" LocalName="$(BDS)\bin64\cc64250.dll" Class="DependencyModule"> + <Platform Name="Win64"> + <Overwrite>true</Overwrite> + </Platform> + </DeployFile> + <DeployFile Condition="'$(DynamicRTL)'=='true'" LocalName="$(BDS)\Redist\osx64\libcgcrtl.dylib" Class="DependencyModule"> + <Platform Name="OSX64"> + <Overwrite>true</Overwrite> + </Platform> + </DeployFile> + <DeployFile LocalName="..\..\src\rcv\binex.c" Configuration="Release" Class="ProjectFile"> <Platform Name="Win32"> <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile LocalName="..\..\src\rtcm2.c" Configuration="Release" Class="ProjectFile"> + <DeployFile LocalName="..\..\src\rtcm3.c" Configuration="Release" Class="ProjectFile"> <Platform Name="Win32"> <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile LocalName="..\..\src\rtcm.c" Configuration="Release" Class="ProjectFile"> + <DeployFile LocalName="..\..\src\rcv\ublox.c" Configuration="Release" Class="ProjectFile"> <Platform Name="Win32"> <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile LocalName="..\..\src\rcvraw.c" Configuration="Release" Class="ProjectFile"> + <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'=='true'" LocalName="$(BDS)\bin64\cc64260mt.dll" Class="DependencyModule"> + <Platform Name="Win64"> + <Overwrite>true</Overwrite> + </Platform> + </DeployFile> + <DeployFile LocalName="..\..\src\rinex.c" Configuration="Release" Class="ProjectFile"> <Platform Name="Win32"> <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile LocalName="..\..\src\rcv\crescent.c" Configuration="Release" Class="ProjectFile"> + <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'=='true'" LocalName="$(BDS)\bin\cc32250mt.dll" Class="DependencyModule"> + <Platform Name="Win32"> + <Overwrite>true</Overwrite> + </Platform> + </DeployFile> + <DeployFile LocalName="..\..\src\rtcm3e.c" Configuration="Release" Class="ProjectFile"> <Platform Name="Win32"> <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile LocalName="..\..\src\rcv\cmr.c" Configuration="Release" Class="ProjectFile"> + <DeployFile LocalName="Release_Build\rtkplot.exe" Configuration="Release" Class="ProjectOutput"> + <Platform Name="Win32"> + <RemoteName>rtkplot.exe</RemoteName> + <Overwrite>true</Overwrite> + </Platform> + </DeployFile> + <DeployFile LocalName="..\..\src\rcv\swiftnav.c" Configuration="Release" Class="ProjectFile"> <Platform Name="Win32"> <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile LocalName="..\..\src\rcv\gw10.c" Configuration="Release" Class="ProjectFile"> + <DeployFile LocalName="..\..\src\qzslex.c" Configuration="Release" Class="ProjectFile"> <Platform Name="Win32"> <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile LocalName="..\..\src\sbas.c" Configuration="Release" Class="ProjectFile"> + <DeployFile LocalName="..\..\src\rtcm.c" Configuration="Release" Class="ProjectFile"> <Platform Name="Win32"> <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> @@ -649,87 +694,87 @@ <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile LocalName="..\..\src\rcv\swiftnav.c" Configuration="Release" Class="ProjectFile"> + <DeployFile LocalName="..\..\src\rcvraw.c" Configuration="Release" Class="ProjectFile"> <Platform Name="Win32"> <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile LocalName="..\..\src\tle.c" Configuration="Release" Class="ProjectFile"> + <DeployFile LocalName="..\..\src\rcv\crescent.c" Configuration="Release" Class="ProjectFile"> <Platform Name="Win32"> <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile LocalName="..\..\src\rcv\javad.c" Configuration="Release" Class="ProjectFile"> + <DeployFile LocalName="..\..\src\rcv\cmr.c" Configuration="Release" Class="ProjectFile"> <Platform Name="Win32"> <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile LocalName="..\..\src\geoid.c" Configuration="Release" Class="ProjectFile"> + <DeployFile LocalName="..\..\src\rcv\gw10.c" Configuration="Release" Class="ProjectFile"> <Platform Name="Win32"> <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile LocalName="..\..\src\pntpos.c" Configuration="Release" Class="ProjectFile"> + <DeployFile LocalName="..\..\src\sbas.c" Configuration="Release" Class="ProjectFile"> <Platform Name="Win32"> <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'=='true'" LocalName="$(BDS)\bin\cc32c250mt.dll" Class="DependencyModule"> + <DeployFile LocalName="..\..\src\tle.c" Configuration="Release" Class="ProjectFile"> <Platform Name="Win32"> + <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'!='true'" LocalName="$(BDS)\bin\cc32c250.dll" Class="DependencyModule"> + <DeployFile LocalName="..\..\src\rcv\javad.c" Configuration="Release" Class="ProjectFile"> <Platform Name="Win32"> + <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile Condition="'$(DynamicRTL)'=='true'" LocalName="$(BDS)\Redist\osx32\libcgcrtl.dylib" Class="DependencyModule"> - <Platform Name="OSX32"> + <DeployFile LocalName="..\..\src\geoid.c" Configuration="Release" Class="ProjectFile"> + <Platform Name="Win32"> + <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile Condition="'$(UsingDelphiRTL)'=='true'" LocalName="$(BDS)\bin64\borlndmm.dll" Class="DependencyModule"> - <Platform Name="Win64"> + <DeployFile LocalName="..\..\src\pntpos.c" Configuration="Release" Class="ProjectFile"> + <Platform Name="Win32"> + <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile Condition="'$(UsingDelphiRTL)'=='true'" LocalName="$(BDS)\bin\borlndmm.dll" Class="DependencyModule"> + <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'=='true'" LocalName="$(BDS)\bin\cc32c250mt.dll" Class="DependencyModule"> <Platform Name="Win32"> <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile LocalName="..\..\src\rtkcmn.c" Configuration="Release" Class="ProjectFile"> + <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'!='true'" LocalName="$(BDS)\bin\cc32c250.dll" Class="DependencyModule"> <Platform Name="Win32"> - <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile Condition="'$(DynamicRTL)'=='true'" LocalName="$(BDS)\Redist\osx32\libcgstl.dylib" Class="DependencyModule"> + <DeployFile Condition="'$(DynamicRTL)'=='true'" LocalName="$(BDS)\Redist\osx32\libcgcrtl.dylib" Class="DependencyModule"> <Platform Name="OSX32"> <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile LocalName="..\..\src\rcv\skytraq.c" Configuration="Release" Class="ProjectFile"> - <Platform Name="Win32"> - <RemoteDir>.\</RemoteDir> + <DeployFile Condition="'$(UsingDelphiRTL)'=='true'" LocalName="$(BDS)\bin64\borlndmm.dll" Class="DependencyModule"> + <Platform Name="Win64"> <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile LocalName="..\..\src\rcv\septentrio.c" Configuration="Release" Class="ProjectFile"> - <Platform Name="Win32"> - <RemoteDir>.\</RemoteDir> + <DeployFile Condition="'$(DynamicRTL)'=='true'" LocalName="$(BDS)\Redist\osx64\libcgstl.dylib" Class="DependencyModule"> + <Platform Name="OSX64"> <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile LocalName="..\..\src\solution.c" Configuration="Release" Class="ProjectFile"> + <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'=='true'" LocalName="$(BDS)\bin\cc32260mt.dll" Class="DependencyModule"> <Platform Name="Win32"> - <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> </Platform> </DeployFile> @@ -744,19 +789,18 @@ <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile LocalName="..\..\src\gis.c" Configuration="Release" Class="ProjectFile"> + <DeployFile LocalName="..\..\src\rcv\comnav.c" Configuration="Release" Class="ProjectFile"> <Platform Name="Win32"> <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile LocalName="..\..\src\stream.c" Configuration="Release" Class="ProjectFile"> - <Platform Name="Win32"> - <RemoteDir>.\</RemoteDir> + <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'!='true'" LocalName="$(BDS)\bin64\cc64260.dll" Class="DependencyModule"> + <Platform Name="Win64"> <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'!='true'" LocalName="$(BDS)\bin\cc32250.dll" Class="DependencyModule"> + <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'=='true'" LocalName="$(BDS)\bin\cc32c260mt.dll" Class="DependencyModule"> <Platform Name="Win32"> <Overwrite>true</Overwrite> </Platform> @@ -767,11 +811,6 @@ <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'!='true'" LocalName="$(BDS)\bin64\cc64250.dll" Class="DependencyModule"> - <Platform Name="Win64"> - <Overwrite>true</Overwrite> - </Platform> - </DeployFile> <DeployFile LocalName="..\..\src\preceph.c" Configuration="Release" Class="ProjectFile"> <Platform Name="Win32"> <RemoteDir>.\</RemoteDir> @@ -787,7 +826,6 @@ <Operation>1</Operation> </Platform> <Platform Name="Win32"> - <RemoteDir>Contents\MacOS</RemoteDir> <Operation>0</Operation> </Platform> </DeployClass> @@ -797,6 +835,12 @@ <Operation>1</Operation> </Platform> </DeployClass> + <DeployClass Name="AndroidFileProvider"> + <Platform Name="Android"> + <RemoteDir>res\xml</RemoteDir> + <Operation>1</Operation> + </Platform> + </DeployClass> <DeployClass Name="AndroidGDBServer"> <Platform Name="Android"> <RemoteDir>library\lib\armeabi-v7a</RemoteDir> @@ -833,6 +877,12 @@ <Operation>1</Operation> </Platform> </DeployClass> + <DeployClass Name="AndroidSplashStylesV21"> + <Platform Name="Android"> + <RemoteDir>res\values-v21</RemoteDir> + <Operation>1</Operation> + </Platform> + </DeployClass> <DeployClass Name="Android_DefaultAppIcon"> <Platform Name="Android"> <RemoteDir>res\drawable</RemoteDir> @@ -911,6 +961,11 @@ <Operation>1</Operation> <Extensions>.framework</Extensions> </Platform> + <Platform Name="OSX64"> + <RemoteDir>Contents\MacOS</RemoteDir> + <Operation>1</Operation> + <Extensions>.framework</Extensions> + </Platform> <Platform Name="Win32"> <Operation>0</Operation> </Platform> @@ -933,6 +988,11 @@ <Operation>1</Operation> <Extensions>.dylib</Extensions> </Platform> + <Platform Name="OSX64"> + <RemoteDir>Contents\MacOS</RemoteDir> + <Operation>1</Operation> + <Extensions>.dylib</Extensions> + </Platform> <Platform Name="Win32"> <Operation>0</Operation> <Extensions>.dll;.bpl</Extensions> @@ -956,6 +1016,11 @@ <Operation>1</Operation> <Extensions>.dylib</Extensions> </Platform> + <Platform Name="OSX64"> + <RemoteDir>Contents\MacOS</RemoteDir> + <Operation>1</Operation> + <Extensions>.dylib</Extensions> + </Platform> <Platform Name="Win32"> <Operation>0</Operation> <Extensions>.bpl</Extensions> @@ -978,6 +1043,10 @@ <RemoteDir>Contents\Resources\StartUp\</RemoteDir> <Operation>0</Operation> </Platform> + <Platform Name="OSX64"> + <RemoteDir>Contents\Resources\StartUp\</RemoteDir> + <Operation>0</Operation> + </Platform> <Platform Name="Win32"> <Operation>0</Operation> </Platform> @@ -1114,23 +1183,41 @@ <Operation>1</Operation> </Platform> </DeployClass> + <DeployClass Name="ProjectOSXDebug"> + <Platform Name="OSX64"> + <RemoteDir>..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF</RemoteDir> + <Operation>1</Operation> + </Platform> + </DeployClass> <DeployClass Name="ProjectOSXEntitlements"> <Platform Name="OSX32"> <RemoteDir>..\</RemoteDir> <Operation>1</Operation> </Platform> + <Platform Name="OSX64"> + <RemoteDir>..\</RemoteDir> + <Operation>1</Operation> + </Platform> </DeployClass> <DeployClass Name="ProjectOSXInfoPList"> <Platform Name="OSX32"> <RemoteDir>Contents</RemoteDir> <Operation>1</Operation> </Platform> + <Platform Name="OSX64"> + <RemoteDir>Contents</RemoteDir> + <Operation>1</Operation> + </Platform> </DeployClass> <DeployClass Name="ProjectOSXResource"> <Platform Name="OSX32"> <RemoteDir>Contents\Resources</RemoteDir> <Operation>1</Operation> </Platform> + <Platform Name="OSX64"> + <RemoteDir>Contents\Resources</RemoteDir> + <Operation>1</Operation> + </Platform> </DeployClass> <DeployClass Required="true" Name="ProjectOutput"> <Platform Name="Android"> @@ -1153,6 +1240,10 @@ <RemoteDir>Contents\MacOS</RemoteDir> <Operation>1</Operation> </Platform> + <Platform Name="OSX64"> + <RemoteDir>Contents\MacOS</RemoteDir> + <Operation>1</Operation> + </Platform> <Platform Name="Win32"> <Operation>0</Operation> </Platform> @@ -1192,6 +1283,7 @@ <ProjectRoot Platform="Win32" Name="$(PROJECTNAME)"/> <ProjectRoot Platform="OSX32" Name="$(PROJECTNAME).app"/> <ProjectRoot Platform="Android" Name="$(PROJECTNAME)"/> + <ProjectRoot Platform="OSX64" Name="$(PROJECTNAME).app"/> <ProjectRoot Platform="iOSSimulator" Name="$(PROJECTNAME).app"/> </Deployment> </BorlandProject> diff --git a/app/rtkplot/rtkplot.cpp b/app/rtkplot/rtkplot.cpp index f8badf3bbb81d482ebfaab36bd028f35156c25d8..acb95ee7c6b0a7b1ca87300edff13907301d9a19 100644 --- a/app/rtkplot/rtkplot.cpp +++ b/app/rtkplot/rtkplot.cpp @@ -42,7 +42,6 @@ -USEFORM("vmapdlg.cpp", VecMapDialog); USEFORM("..\appcmn\tcpoptdlg.cpp", TcpOptDialog); USEFORM("..\appcmn\serioptdlg.cpp", SerialOptDialog); USEFORM("..\appcmn\refdlg.cpp", RefDialog); @@ -57,15 +56,15 @@ USEFORM("..\appcmn\aboutdlg.cpp", AboutDialog); USEFORM("..\appcmn\console.cpp", Console); USEFORM("..\appcmn\ftpoptdlg.cpp", FtpOptDialog); USEFORM("..\appcmn\fileoptdlg.cpp", FileOptDialog); +USEFORM("conndlg.cpp", ConnectDialog); USEFORM("pntdlg.cpp", PntDialog); USEFORM("plotopt.cpp", PlotOptDialog); -USEFORM("plotmain.cpp", Plot); +USEFORM("vmapdlg.cpp", VecMapDialog); USEFORM("skydlg.cpp", SkyImgDialog); USEFORM("satdlg.cpp", SatDialog); -USEFORM("gmview.cpp", GoogleMapView); -USEFORM("geview.cpp", GoogleEarthView); -USEFORM("conndlg.cpp", ConnectDialog); +USEFORM("plotmain.cpp", Plot); USEFORM("mapdlg.cpp", MapAreaDialog); +USEFORM("gmview.cpp", GoogleMapView); //--------------------------------------------------------------------------- WINAPI WinMain(HINSTANCE, HINSTANCE, LPSTR, int) { @@ -74,30 +73,29 @@ WINAPI WinMain(HINSTANCE, HINSTANCE, LPSTR, int) Application->Initialize(); Application->Title = "RTKPLOT"; Application->CreateForm(__classid(TPlot), &Plot); - Application->CreateForm(__classid(TPlotOptDialog), &PlotOptDialog); - Application->CreateForm(__classid(TSatDialog), &SatDialog); - Application->CreateForm(__classid(TRefDialog), &RefDialog); - Application->CreateForm(__classid(TAboutDialog), &AboutDialog); - Application->CreateForm(__classid(TSpanDialog), &SpanDialog); - Application->CreateForm(__classid(TTimeDialog), &TimeDialog); - Application->CreateForm(__classid(TConnectDialog), &ConnectDialog); - Application->CreateForm(__classid(TSerialOptDialog), &SerialOptDialog); - Application->CreateForm(__classid(TTcpOptDialog), &TcpOptDialog); - Application->CreateForm(__classid(TCmdOptDialog), &CmdOptDialog); - Application->CreateForm(__classid(TFileOptDialog), &FileOptDialog); - Application->CreateForm(__classid(TKeyDialog), &KeyDialog); - Application->CreateForm(__classid(TTextViewer), &TextViewer); - Application->CreateForm(__classid(TViewerOptDialog), &ViewerOptDialog); - Application->CreateForm(__classid(TPntDialog), &PntDialog); - Application->CreateForm(__classid(TConfDialog), &ConfDialog); - Application->CreateForm(__classid(TGoogleEarthView), &GoogleEarthView); - Application->CreateForm(__classid(TFtpOptDialog), &FtpOptDialog); - Application->CreateForm(__classid(TConsole), &Console); - Application->CreateForm(__classid(TGoogleMapView), &GoogleMapView); - Application->CreateForm(__classid(TMapAreaDialog), &MapAreaDialog); - Application->CreateForm(__classid(TSkyImgDialog), &SkyImgDialog); - Application->CreateForm(__classid(TVecMapDialog), &VecMapDialog); - Application->Run(); + Application->CreateForm(__classid(TPlotOptDialog), &PlotOptDialog); + Application->CreateForm(__classid(TSatDialog), &SatDialog); + Application->CreateForm(__classid(TRefDialog), &RefDialog); + Application->CreateForm(__classid(TAboutDialog), &AboutDialog); + Application->CreateForm(__classid(TSpanDialog), &SpanDialog); + Application->CreateForm(__classid(TTimeDialog), &TimeDialog); + Application->CreateForm(__classid(TConnectDialog), &ConnectDialog); + Application->CreateForm(__classid(TSerialOptDialog), &SerialOptDialog); + Application->CreateForm(__classid(TTcpOptDialog), &TcpOptDialog); + Application->CreateForm(__classid(TCmdOptDialog), &CmdOptDialog); + Application->CreateForm(__classid(TFileOptDialog), &FileOptDialog); + Application->CreateForm(__classid(TKeyDialog), &KeyDialog); + Application->CreateForm(__classid(TTextViewer), &TextViewer); + Application->CreateForm(__classid(TViewerOptDialog), &ViewerOptDialog); + Application->CreateForm(__classid(TPntDialog), &PntDialog); + Application->CreateForm(__classid(TConfDialog), &ConfDialog); + Application->CreateForm(__classid(TFtpOptDialog), &FtpOptDialog); + Application->CreateForm(__classid(TConsole), &Console); + Application->CreateForm(__classid(TGoogleMapView), &GoogleMapView); + Application->CreateForm(__classid(TMapAreaDialog), &MapAreaDialog); + Application->CreateForm(__classid(TSkyImgDialog), &SkyImgDialog); + Application->CreateForm(__classid(TVecMapDialog), &VecMapDialog); + Application->Run(); } catch (Exception &exception) { diff --git a/app/rtkpost/rtkpost.cbproj b/app/rtkpost/rtkpost.cbproj index 061d9796ad62a937bcd732cb93bbd96c68263175..0e344d1ba33a861c2f2ea83ed1b6855a18078623 100644 --- a/app/rtkpost/rtkpost.cbproj +++ b/app/rtkpost/rtkpost.cbproj @@ -6,7 +6,7 @@ <Base>True</Base> <Config Condition="'$(Config)'==''">Release</Config> <FrameworkType>VCL</FrameworkType> - <ProjectVersion>18.4</ProjectVersion> + <ProjectVersion>18.5</ProjectVersion> <Platform Condition="'$(Platform)'==''">Win32</Platform> <TargetedPlatforms>1</TargetedPlatforms> <AppType>Application</AppType> @@ -323,18 +323,18 @@ <CppCompile Include="..\..\src\tides.c"> <BuildOrder>39</BuildOrder> </CppCompile> - <FormResources Include="..\appcmn\viewer.dfm"/> <FormResources Include="..\appcmn\timedlg.dfm"/> + <FormResources Include="..\appcmn\viewer.dfm"/> <FormResources Include="..\appcmn\vieweropt.dfm"/> - <FormResources Include="kmzconv.dfm"/> <FormResources Include="extopt.dfm"/> - <FormResources Include="..\appcmn\confdlg.dfm"/> + <FormResources Include="kmzconv.dfm"/> <FormResources Include="..\appcmn\aboutdlg.dfm"/> + <FormResources Include="..\appcmn\confdlg.dfm"/> <FormResources Include="..\appcmn\keydlg.dfm"/> - <FormResources Include="..\appcmn\refdlg.dfm"/> <FormResources Include="..\appcmn\maskoptdlg.dfm"/> - <FormResources Include="postopt.dfm"/> + <FormResources Include="..\appcmn\refdlg.dfm"/> <FormResources Include="postmain.dfm"/> + <FormResources Include="postopt.dfm"/> <BuildConfiguration Include="Release"> <Key>Cfg_2</Key> <CfgParent>Base</CfgParent> diff --git a/app/rtkpost_mkl/rtkpost_mkl.cbproj b/app/rtkpost_mkl/rtkpost_mkl.cbproj index 4a3ad0f855598e123d53021a1718e355fa5e2046..991bc780a3f7c5128c14f01a09d1486dd7cdab82 100644 --- a/app/rtkpost_mkl/rtkpost_mkl.cbproj +++ b/app/rtkpost_mkl/rtkpost_mkl.cbproj @@ -6,7 +6,7 @@ <Base>True</Base> <Config Condition="'$(Config)'==''">Release</Config> <FrameworkType>VCL</FrameworkType> - <ProjectVersion>18.4</ProjectVersion> + <ProjectVersion>18.5</ProjectVersion> <Platform Condition="'$(Platform)'==''">Win32</Platform> <TargetedPlatforms>1</TargetedPlatforms> <AppType>Application</AppType> @@ -319,18 +319,18 @@ <CppCompile Include="..\..\src\tides.c"> <BuildOrder>38</BuildOrder> </CppCompile> - <FormResources Include="..\appcmn\viewer.dfm"/> <FormResources Include="..\appcmn\timedlg.dfm"/> + <FormResources Include="..\appcmn\viewer.dfm"/> <FormResources Include="..\appcmn\vieweropt.dfm"/> - <FormResources Include="..\rtkpost\kmzconv.dfm"/> <FormResources Include="..\rtkpost\extopt.dfm"/> - <FormResources Include="..\appcmn\confdlg.dfm"/> + <FormResources Include="..\rtkpost\kmzconv.dfm"/> <FormResources Include="..\appcmn\aboutdlg.dfm"/> + <FormResources Include="..\appcmn\confdlg.dfm"/> <FormResources Include="..\appcmn\keydlg.dfm"/> - <FormResources Include="..\appcmn\refdlg.dfm"/> <FormResources Include="..\appcmn\maskoptdlg.dfm"/> - <FormResources Include="..\rtkpost\postopt.dfm"/> + <FormResources Include="..\appcmn\refdlg.dfm"/> <FormResources Include="..\rtkpost\postmain.dfm"/> + <FormResources Include="..\rtkpost\postopt.dfm"/> <BuildConfiguration Include="Release"> <Key>Cfg_2</Key> <CfgParent>Base</CfgParent> diff --git a/app/rtkpost_win64/rtkpost_win64.cbproj b/app/rtkpost_win64/rtkpost_win64.cbproj index 50517c3ba23667526da3f2eb346edbd470824909..240fe33c6a8682029e97365f5028bbf35a0141ad 100644 --- a/app/rtkpost_win64/rtkpost_win64.cbproj +++ b/app/rtkpost_win64/rtkpost_win64.cbproj @@ -6,7 +6,7 @@ <Base>True</Base> <Config Condition="'$(Config)'==''">Release</Config> <FrameworkType>VCL</FrameworkType> - <ProjectVersion>18.4</ProjectVersion> + <ProjectVersion>18.5</ProjectVersion> <Platform Condition="'$(Platform)'==''">Win64</Platform> <TargetedPlatforms>3</TargetedPlatforms> <AppType>Application</AppType> @@ -142,7 +142,7 @@ </PropertyGroup> <PropertyGroup Condition="'$(Cfg_1_Win64)'!=''"> <AppEnableRuntimeThemes>true</AppEnableRuntimeThemes> - <AppEnableHighDPI>true</AppEnableHighDPI> + <AppDPIAwarenessMode>PerMonitor</AppDPIAwarenessMode> </PropertyGroup> <PropertyGroup Condition="'$(Cfg_2)'!=''"> <BCC_OptimizeForSpeed>true</BCC_OptimizeForSpeed> @@ -163,12 +163,12 @@ <PropertyGroup Condition="'$(Cfg_2_Win64)'!=''"> <Icon_MainIcon>rtkpost_win64_Icon.ico</Icon_MainIcon> <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo> - <AppEnableHighDPI>true</AppEnableHighDPI> <AppEnableRuntimeThemes>true</AppEnableRuntimeThemes> <VerInfo_Locale>1033</VerInfo_Locale> <Manifest_File>$(BDS)\bin\default_app.manifest</Manifest_File> <LinkPackageStatics>rtl.lib;vcl.lib;vclx.lib</LinkPackageStatics> <BT_BuildType>Debug</BT_BuildType> + <AppDPIAwarenessMode>PerMonitor</AppDPIAwarenessMode> </PropertyGroup> <ItemGroup> <CppCompile Include="..\appcmn\aboutdlg.cpp"> @@ -341,18 +341,18 @@ <CppCompile Include="..\..\src\tides.c"> <BuildOrder>38</BuildOrder> </CppCompile> - <FormResources Include="..\appcmn\viewer.dfm"/> <FormResources Include="..\appcmn\timedlg.dfm"/> - <FormResources Include="..\rtkpost\extopt.dfm"/> + <FormResources Include="..\appcmn\viewer.dfm"/> <FormResources Include="..\appcmn\vieweropt.dfm"/> + <FormResources Include="..\rtkpost\extopt.dfm"/> <FormResources Include="..\appcmn\refdlg.dfm"/> - <FormResources Include="..\appcmn\confdlg.dfm"/> <FormResources Include="..\appcmn\aboutdlg.dfm"/> - <FormResources Include="..\appcmn\maskoptdlg.dfm"/> + <FormResources Include="..\appcmn\confdlg.dfm"/> <FormResources Include="..\appcmn\keydlg.dfm"/> + <FormResources Include="..\appcmn\maskoptdlg.dfm"/> <FormResources Include="..\rtkpost\kmzconv.dfm"/> - <FormResources Include="..\rtkpost\postopt.dfm"/> <FormResources Include="..\rtkpost\postmain.dfm"/> + <FormResources Include="..\rtkpost\postopt.dfm"/> <BuildConfiguration Include="Release"> <Key>Cfg_2</Key> <CfgParent>Base</CfgParent> @@ -437,6 +437,11 @@ <Platform value="Win64">True</Platform> </Platforms> <Deployment Version="3"> + <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'!='true'" LocalName="$(BDS)\bin\cc32c260.dll" Class="DependencyModule"> + <Platform Name="Win32"> + <Overwrite>true</Overwrite> + </Platform> + </DeployFile> <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'=='true'" LocalName="$(BDS)\bin\cc32c240mt.dll" Class="DependencyModule"> <Platform Name="Win32"> <Overwrite>true</Overwrite> @@ -454,24 +459,30 @@ <Overwrite>true</Overwrite> </Platform> </DeployFile> + <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'!='true'" LocalName="$(BDS)\bin\cc32260.dll" Class="DependencyModule"> + <Platform Name="Win32"> + <Overwrite>true</Overwrite> + </Platform> + </DeployFile> <DeployFile LocalName="rtkpost_win64.res" Configuration="Release" Class="ProjectFile"> <Platform Name="Win64"> <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile LocalName="..\..\src\ephemeris.c" Configuration="Release" Class="ProjectFile"> - <Platform Name="Win32"> + <DeployFile LocalName="..\..\src\pntpos.c" Configuration="Release" Class="ProjectFile"> + <Platform Name="Win64"> <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'=='true'" LocalName="$(BDS)\bin\cc32240mt.dll" Class="DependencyModule"> - <Platform Name="Win32"> + <DeployFile LocalName="..\..\src\ionex.c" Configuration="Release" Class="ProjectFile"> + <Platform Name="Win64"> + <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile LocalName="..\..\src\rtcm2.c" Configuration="Release" Class="ProjectFile"> + <DeployFile LocalName="..\..\src\ephemeris.c" Configuration="Release" Class="ProjectFile"> <Platform Name="Win32"> <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> @@ -488,14 +499,13 @@ <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile LocalName="..\..\src\ionex.c" Configuration="Release" Class="ProjectFile"> - <Platform Name="Win64"> - <RemoteDir>.\</RemoteDir> + <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'=='true'" LocalName="$(BDS)\bin\cc32240mt.dll" Class="DependencyModule"> + <Platform Name="Win32"> <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile LocalName="..\..\src\pntpos.c" Configuration="Release" Class="ProjectFile"> - <Platform Name="Win64"> + <DeployFile LocalName="..\..\src\rtcm2.c" Configuration="Release" Class="ProjectFile"> + <Platform Name="Win32"> <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> </Platform> @@ -632,6 +642,11 @@ <Overwrite>true</Overwrite> </Platform> </DeployFile> + <DeployFile Condition="'$(DynamicRTL)'=='true'" LocalName="$(BDS)\Redist\osx64\libcgcrtl.dylib" Class="DependencyModule"> + <Platform Name="OSX64"> + <Overwrite>true</Overwrite> + </Platform> + </DeployFile> <DeployFile LocalName="..\..\src\rtcm3e.c" Configuration="Release" Class="ProjectFile"> <Platform Name="Win64"> <RemoteDir>.\</RemoteDir> @@ -650,6 +665,11 @@ <Overwrite>true</Overwrite> </Platform> </DeployFile> + <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'=='true'" LocalName="$(BDS)\bin64\cc64260mt.dll" Class="DependencyModule"> + <Platform Name="Win64"> + <Overwrite>true</Overwrite> + </Platform> + </DeployFile> <DeployFile LocalName="..\..\src\rinex.c" Configuration="Release" Class="ProjectFile"> <Platform Name="Win32"> <RemoteDir>.\</RemoteDir> @@ -806,6 +826,16 @@ <Overwrite>true</Overwrite> </Platform> </DeployFile> + <DeployFile Condition="'$(DynamicRTL)'=='true'" LocalName="$(BDS)\Redist\osx64\libcgstl.dylib" Class="DependencyModule"> + <Platform Name="OSX64"> + <Overwrite>true</Overwrite> + </Platform> + </DeployFile> + <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'=='true'" LocalName="$(BDS)\bin\cc32260mt.dll" Class="DependencyModule"> + <Platform Name="Win32"> + <Overwrite>true</Overwrite> + </Platform> + </DeployFile> <DeployFile LocalName="..\..\src\ppp_corr.c" Configuration="Release" Class="ProjectFile"> <Platform Name="Win32"> <RemoteDir>.\</RemoteDir> @@ -823,12 +853,22 @@ <Overwrite>true</Overwrite> </Platform> </DeployFile> + <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'!='true'" LocalName="$(BDS)\bin64\cc64260.dll" Class="DependencyModule"> + <Platform Name="Win64"> + <Overwrite>true</Overwrite> + </Platform> + </DeployFile> <DeployFile LocalName="..\..\src\postpos.c" Configuration="Release" Class="ProjectFile"> <Platform Name="Win64"> <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> </Platform> </DeployFile> + <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'=='true'" LocalName="$(BDS)\bin\cc32c260mt.dll" Class="DependencyModule"> + <Platform Name="Win32"> + <Overwrite>true</Overwrite> + </Platform> + </DeployFile> <DeployFile LocalName="..\..\src\preceph.c" Configuration="Release" Class="ProjectFile"> <Platform Name="Win32"> <RemoteDir>.\</RemoteDir> @@ -850,7 +890,6 @@ <Operation>1</Operation> </Platform> <Platform Name="Win32"> - <RemoteDir>Contents\MacOS</RemoteDir> <Operation>0</Operation> </Platform> </DeployClass> @@ -860,6 +899,12 @@ <Operation>1</Operation> </Platform> </DeployClass> + <DeployClass Name="AndroidFileProvider"> + <Platform Name="Android"> + <RemoteDir>res\xml</RemoteDir> + <Operation>1</Operation> + </Platform> + </DeployClass> <DeployClass Name="AndroidGDBServer"> <Platform Name="Android"> <RemoteDir>library\lib\armeabi-v7a</RemoteDir> @@ -896,6 +941,12 @@ <Operation>1</Operation> </Platform> </DeployClass> + <DeployClass Name="AndroidSplashStylesV21"> + <Platform Name="Android"> + <RemoteDir>res\values-v21</RemoteDir> + <Operation>1</Operation> + </Platform> + </DeployClass> <DeployClass Name="Android_DefaultAppIcon"> <Platform Name="Android"> <RemoteDir>res\drawable</RemoteDir> @@ -974,6 +1025,11 @@ <Operation>1</Operation> <Extensions>.framework</Extensions> </Platform> + <Platform Name="OSX64"> + <RemoteDir>Contents\MacOS</RemoteDir> + <Operation>1</Operation> + <Extensions>.framework</Extensions> + </Platform> <Platform Name="Win32"> <Operation>0</Operation> </Platform> @@ -996,6 +1052,11 @@ <Operation>1</Operation> <Extensions>.dylib</Extensions> </Platform> + <Platform Name="OSX64"> + <RemoteDir>Contents\MacOS</RemoteDir> + <Operation>1</Operation> + <Extensions>.dylib</Extensions> + </Platform> <Platform Name="Win32"> <Operation>0</Operation> <Extensions>.dll;.bpl</Extensions> @@ -1019,6 +1080,11 @@ <Operation>1</Operation> <Extensions>.dylib</Extensions> </Platform> + <Platform Name="OSX64"> + <RemoteDir>Contents\MacOS</RemoteDir> + <Operation>1</Operation> + <Extensions>.dylib</Extensions> + </Platform> <Platform Name="Win32"> <Operation>0</Operation> <Extensions>.bpl</Extensions> @@ -1041,6 +1107,10 @@ <RemoteDir>Contents\Resources\StartUp\</RemoteDir> <Operation>0</Operation> </Platform> + <Platform Name="OSX64"> + <RemoteDir>Contents\Resources\StartUp\</RemoteDir> + <Operation>0</Operation> + </Platform> <Platform Name="Win32"> <Operation>0</Operation> </Platform> @@ -1177,23 +1247,41 @@ <Operation>1</Operation> </Platform> </DeployClass> + <DeployClass Name="ProjectOSXDebug"> + <Platform Name="OSX64"> + <RemoteDir>..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF</RemoteDir> + <Operation>1</Operation> + </Platform> + </DeployClass> <DeployClass Name="ProjectOSXEntitlements"> <Platform Name="OSX32"> <RemoteDir>..\</RemoteDir> <Operation>1</Operation> </Platform> + <Platform Name="OSX64"> + <RemoteDir>..\</RemoteDir> + <Operation>1</Operation> + </Platform> </DeployClass> <DeployClass Name="ProjectOSXInfoPList"> <Platform Name="OSX32"> <RemoteDir>Contents</RemoteDir> <Operation>1</Operation> </Platform> + <Platform Name="OSX64"> + <RemoteDir>Contents</RemoteDir> + <Operation>1</Operation> + </Platform> </DeployClass> <DeployClass Name="ProjectOSXResource"> <Platform Name="OSX32"> <RemoteDir>Contents\Resources</RemoteDir> <Operation>1</Operation> </Platform> + <Platform Name="OSX64"> + <RemoteDir>Contents\Resources</RemoteDir> + <Operation>1</Operation> + </Platform> </DeployClass> <DeployClass Required="true" Name="ProjectOutput"> <Platform Name="Android"> @@ -1216,6 +1304,10 @@ <RemoteDir>Contents\MacOS</RemoteDir> <Operation>1</Operation> </Platform> + <Platform Name="OSX64"> + <RemoteDir>Contents\MacOS</RemoteDir> + <Operation>1</Operation> + </Platform> <Platform Name="Win32"> <Operation>0</Operation> </Platform> @@ -1255,6 +1347,7 @@ <ProjectRoot Platform="Win32" Name="$(PROJECTNAME)"/> <ProjectRoot Platform="OSX32" Name="$(PROJECTNAME).app"/> <ProjectRoot Platform="Android" Name="$(PROJECTNAME)"/> + <ProjectRoot Platform="OSX64" Name="$(PROJECTNAME).app"/> <ProjectRoot Platform="iOSSimulator" Name="$(PROJECTNAME).app"/> </Deployment> </BorlandProject> diff --git a/app/rtkvideo/rtkvideo.cbproj b/app/rtkvideo/rtkvideo.cbproj index 745c469c3224784dde2f411cad061faaff967b4f..6e89d5550200d7600edc2c105605222f683fa6fe 100644 --- a/app/rtkvideo/rtkvideo.cbproj +++ b/app/rtkvideo/rtkvideo.cbproj @@ -1,7 +1,7 @@ <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> <ProjectGuid>{284EF51A-2EC2-4D7F-BEC9-FE9B7CBDD2EF}</ProjectGuid> - <ProjectVersion>18.4</ProjectVersion> + <ProjectVersion>18.5</ProjectVersion> <FrameworkType>FMX</FrameworkType> <MainSource>rtkvideo.cpp</MainSource> <Base>True</Base> @@ -112,10 +112,10 @@ <PropertyGroup Condition="'$(Cfg_1_Win32)'!=''"> <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo> <VerInfo_Locale>1033</VerInfo_Locale> - <AppEnableHighDPI>true</AppEnableHighDPI> <LinkPackageImports>rtl.bpi;fmx.bpi</LinkPackageImports> <AppEnableRuntimeThemes>true</AppEnableRuntimeThemes> <BT_BuildType>Debug</BT_BuildType> + <AppDPIAwarenessMode>PerMonitor</AppDPIAwarenessMode> </PropertyGroup> <PropertyGroup Condition="'$(Cfg_2)'!=''"> <Defines>NDEBUG;$(Defines)</Defines> @@ -211,8 +211,8 @@ <CppCompile Include="..\..\src\stream.c"> <BuildOrder>5</BuildOrder> </CppCompile> - <FormResources Include="videoopt.fmx"/> <FormResources Include="videomain.fmx"/> + <FormResources Include="videoopt.fmx"/> <BuildConfiguration Include="Release"> <Key>Cfg_2</Key> <CfgParent>Base</CfgParent> @@ -256,19 +256,18 @@ <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile LocalName="..\..\src\rcv\cmr.c" Configuration="Debug" Class="ProjectFile"> + <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'!='true'" LocalName="$(BDS)\bin\cc32c260.dll" Class="DependencyModule"> <Platform Name="Win32"> - <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile LocalName="..\..\src\rcv\novatel.c" Configuration="Release" Class="ProjectFile"> + <DeployFile LocalName="..\..\src\rcv\cmr.c" Configuration="Debug" Class="ProjectFile"> <Platform Name="Win32"> <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'=='true'" LocalName="$(BDS)\bin\cc32240mt.dll" Class="DependencyModule"> + <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'!='true'" LocalName="$(BDS)\bin\cc32260.dll" Class="DependencyModule"> <Platform Name="Win32"> <Overwrite>true</Overwrite> </Platform> @@ -279,6 +278,17 @@ <Overwrite>true</Overwrite> </Platform> </DeployFile> + <DeployFile LocalName="..\..\src\rcv\novatel.c" Configuration="Release" Class="ProjectFile"> + <Platform Name="Win32"> + <RemoteDir>.\</RemoteDir> + <Overwrite>true</Overwrite> + </Platform> + </DeployFile> + <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'=='true'" LocalName="$(BDS)\bin\cc32240mt.dll" Class="DependencyModule"> + <Platform Name="Win32"> + <Overwrite>true</Overwrite> + </Platform> + </DeployFile> <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'!='true'" LocalName="$(BDS)\bin64\cc64240.dll" Class="DependencyModule"> <Platform Name="Win64"> <Overwrite>true</Overwrite> @@ -319,13 +329,13 @@ <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile LocalName="..\..\src\rcv\skytraq.c" Configuration="Release" Class="ProjectFile"> + <DeployFile LocalName="..\..\src\rtkcmn.c" Configuration="Release" Class="ProjectFile"> <Platform Name="Win32"> <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile LocalName="..\..\src\rtkcmn.c" Configuration="Release" Class="ProjectFile"> + <DeployFile LocalName="..\..\src\rcv\skytraq.c" Configuration="Release" Class="ProjectFile"> <Platform Name="Win32"> <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> @@ -419,6 +429,11 @@ <Overwrite>true</Overwrite> </Platform> </DeployFile> + <DeployFile Condition="'$(DynamicRTL)'=='true'" LocalName="$(BDS)\Redist\osx64\libcgcrtl.dylib" Class="DependencyModule"> + <Platform Name="OSX64"> + <Overwrite>true</Overwrite> + </Platform> + </DeployFile> <DeployFile LocalName="..\..\src\rcv\rcvlex.c" Configuration="Debug" Class="ProjectFile"> <Platform Name="Win32"> <RemoteDir>.\</RemoteDir> @@ -443,6 +458,11 @@ <Overwrite>true</Overwrite> </Platform> </DeployFile> + <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'=='true'" LocalName="$(BDS)\bin64\cc64260mt.dll" Class="DependencyModule"> + <Platform Name="Win64"> + <Overwrite>true</Overwrite> + </Platform> + </DeployFile> <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'=='true'" LocalName="$(BDS)\bin\cc32250mt.dll" Class="DependencyModule"> <Platform Name="Win32"> <Overwrite>true</Overwrite> @@ -466,6 +486,12 @@ <Overwrite>true</Overwrite> </Platform> </DeployFile> + <DeployFile LocalName="..\..\src\rcv\swiftnav.c" Configuration="Release" Class="ProjectFile"> + <Platform Name="Win32"> + <RemoteDir>.\</RemoteDir> + <Overwrite>true</Overwrite> + </Platform> + </DeployFile> <DeployFile LocalName=".\Win32\Debug\rtkvideo.exe" Configuration="Debug" Class="ProjectOutput"> <Platform Name="Win32"> <RemoteName>rtkvideo.exe</RemoteName> @@ -556,9 +582,13 @@ <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile LocalName="..\..\src\rcv\swiftnav.c" Configuration="Release" Class="ProjectFile"> + <DeployFile Condition="'$(DynamicRTL)'=='true'" LocalName="$(BDS)\Redist\osx64\libcgstl.dylib" Class="DependencyModule"> + <Platform Name="OSX64"> + <Overwrite>true</Overwrite> + </Platform> + </DeployFile> + <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'=='true'" LocalName="$(BDS)\bin\cc32260mt.dll" Class="DependencyModule"> <Platform Name="Win32"> - <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> </Platform> </DeployFile> @@ -568,6 +598,11 @@ <Overwrite>true</Overwrite> </Platform> </DeployFile> + <DeployFile LocalName="$(BDS)\Redist\iossimulator\libpcre.dylib" Class="DependencyModule"> + <Platform Name="iOSSimulator"> + <Overwrite>true</Overwrite> + </Platform> + </DeployFile> <DeployFile LocalName="..\..\src\rcv\rt17.c" Configuration="Release" Class="ProjectFile"> <Platform Name="Win32"> <RemoteDir>.\</RemoteDir> @@ -591,6 +626,21 @@ <Overwrite>true</Overwrite> </Platform> </DeployFile> + <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'!='true'" LocalName="$(BDS)\bin64\cc64260.dll" Class="DependencyModule"> + <Platform Name="Win64"> + <Overwrite>true</Overwrite> + </Platform> + </DeployFile> + <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'=='true'" LocalName="$(BDS)\bin\cc32c260mt.dll" Class="DependencyModule"> + <Platform Name="Win32"> + <Overwrite>true</Overwrite> + </Platform> + </DeployFile> + <DeployFile LocalName="$(BDS)\Redist\osx64\libcgsqlite3.dylib" Class="DependencyModule"> + <Platform Name="OSX64"> + <Overwrite>true</Overwrite> + </Platform> + </DeployFile> <DeployFile LocalName="..\..\src\rcv\crescent.c" Configuration="Debug" Class="ProjectFile"> <Platform Name="Win32"> <RemoteDir>.\</RemoteDir> @@ -606,7 +656,6 @@ <Operation>1</Operation> </Platform> <Platform Name="Win32"> - <RemoteDir>Contents\MacOS</RemoteDir> <Operation>0</Operation> </Platform> </DeployClass> @@ -616,6 +665,12 @@ <Operation>1</Operation> </Platform> </DeployClass> + <DeployClass Name="AndroidFileProvider"> + <Platform Name="Android"> + <RemoteDir>res\xml</RemoteDir> + <Operation>1</Operation> + </Platform> + </DeployClass> <DeployClass Name="AndroidGDBServer"> <Platform Name="Android"> <RemoteDir>library\lib\armeabi-v7a</RemoteDir> @@ -652,6 +707,12 @@ <Operation>1</Operation> </Platform> </DeployClass> + <DeployClass Name="AndroidSplashStylesV21"> + <Platform Name="Android"> + <RemoteDir>res\values-v21</RemoteDir> + <Operation>1</Operation> + </Platform> + </DeployClass> <DeployClass Name="Android_DefaultAppIcon"> <Platform Name="Android"> <RemoteDir>res\drawable</RemoteDir> @@ -730,6 +791,11 @@ <Operation>1</Operation> <Extensions>.framework</Extensions> </Platform> + <Platform Name="OSX64"> + <RemoteDir>Contents\MacOS</RemoteDir> + <Operation>1</Operation> + <Extensions>.framework</Extensions> + </Platform> <Platform Name="Win32"> <Operation>0</Operation> </Platform> @@ -752,6 +818,11 @@ <Operation>1</Operation> <Extensions>.dylib</Extensions> </Platform> + <Platform Name="OSX64"> + <RemoteDir>Contents\MacOS</RemoteDir> + <Operation>1</Operation> + <Extensions>.dylib</Extensions> + </Platform> <Platform Name="Win32"> <Operation>0</Operation> <Extensions>.dll;.bpl</Extensions> @@ -775,6 +846,11 @@ <Operation>1</Operation> <Extensions>.dylib</Extensions> </Platform> + <Platform Name="OSX64"> + <RemoteDir>Contents\MacOS</RemoteDir> + <Operation>1</Operation> + <Extensions>.dylib</Extensions> + </Platform> <Platform Name="Win32"> <Operation>0</Operation> <Extensions>.bpl</Extensions> @@ -797,6 +873,10 @@ <RemoteDir>Contents\Resources\StartUp\</RemoteDir> <Operation>0</Operation> </Platform> + <Platform Name="OSX64"> + <RemoteDir>Contents\Resources\StartUp\</RemoteDir> + <Operation>0</Operation> + </Platform> <Platform Name="Win32"> <Operation>0</Operation> </Platform> @@ -933,23 +1013,41 @@ <Operation>1</Operation> </Platform> </DeployClass> + <DeployClass Name="ProjectOSXDebug"> + <Platform Name="OSX64"> + <RemoteDir>..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF</RemoteDir> + <Operation>1</Operation> + </Platform> + </DeployClass> <DeployClass Name="ProjectOSXEntitlements"> <Platform Name="OSX32"> <RemoteDir>..\</RemoteDir> <Operation>1</Operation> </Platform> + <Platform Name="OSX64"> + <RemoteDir>..\</RemoteDir> + <Operation>1</Operation> + </Platform> </DeployClass> <DeployClass Name="ProjectOSXInfoPList"> <Platform Name="OSX32"> <RemoteDir>Contents</RemoteDir> <Operation>1</Operation> </Platform> + <Platform Name="OSX64"> + <RemoteDir>Contents</RemoteDir> + <Operation>1</Operation> + </Platform> </DeployClass> <DeployClass Name="ProjectOSXResource"> <Platform Name="OSX32"> <RemoteDir>Contents\Resources</RemoteDir> <Operation>1</Operation> </Platform> + <Platform Name="OSX64"> + <RemoteDir>Contents\Resources</RemoteDir> + <Operation>1</Operation> + </Platform> </DeployClass> <DeployClass Required="true" Name="ProjectOutput"> <Platform Name="Android"> @@ -972,6 +1070,10 @@ <RemoteDir>Contents\MacOS</RemoteDir> <Operation>1</Operation> </Platform> + <Platform Name="OSX64"> + <RemoteDir>Contents\MacOS</RemoteDir> + <Operation>1</Operation> + </Platform> <Platform Name="Win32"> <Operation>0</Operation> </Platform> @@ -1011,6 +1113,7 @@ <ProjectRoot Platform="Win32" Name="$(PROJECTNAME)"/> <ProjectRoot Platform="OSX32" Name="$(PROJECTNAME).app"/> <ProjectRoot Platform="Android" Name="$(PROJECTNAME)"/> + <ProjectRoot Platform="OSX64" Name="$(PROJECTNAME).app"/> <ProjectRoot Platform="iOSSimulator" Name="$(PROJECTNAME).app"/> </Deployment> <Platforms> diff --git a/app/rtkvplayer/rtkvplayer.cbproj b/app/rtkvplayer/rtkvplayer.cbproj index e45bb41c391521d8327767aaef9463a59f681129..e79c1a95c263f8d8d71ab778f4c44d7f3612f7d0 100644 --- a/app/rtkvplayer/rtkvplayer.cbproj +++ b/app/rtkvplayer/rtkvplayer.cbproj @@ -1,7 +1,7 @@ <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> <ProjectGuid>{668024AB-0C9C-452E-BAC8-27CF7B85E2F4}</ProjectGuid> - <ProjectVersion>18.4</ProjectVersion> + <ProjectVersion>18.5</ProjectVersion> <FrameworkType>FMX</FrameworkType> <MainSource>rtkvplayer.cpp</MainSource> <Base>True</Base> @@ -143,11 +143,11 @@ <VerInfo_Locale>1033</VerInfo_Locale> <LinkPackageImports>rtl.bpi;fmx.bpi</LinkPackageImports> <AppEnableRuntimeThemes>true</AppEnableRuntimeThemes> - <AppEnableHighDPI>true</AppEnableHighDPI> + <AppDPIAwarenessMode>PerMonitor</AppDPIAwarenessMode> </PropertyGroup> <PropertyGroup Condition="'$(Cfg_1_Win64)'!=''"> <AppEnableRuntimeThemes>true</AppEnableRuntimeThemes> - <AppEnableHighDPI>true</AppEnableHighDPI> + <AppDPIAwarenessMode>PerMonitor</AppDPIAwarenessMode> </PropertyGroup> <PropertyGroup Condition="'$(Cfg_2)'!=''"> <Defines>NDEBUG;$(Defines)</Defines> @@ -167,8 +167,8 @@ </PropertyGroup> <PropertyGroup Condition="'$(Cfg_2_Win64)'!=''"> <AppEnableRuntimeThemes>true</AppEnableRuntimeThemes> - <AppEnableHighDPI>true</AppEnableHighDPI> <BT_BuildType>Debug</BT_BuildType> + <AppDPIAwarenessMode>PerMonitor</AppDPIAwarenessMode> </PropertyGroup> <ItemGroup> <CppCompile Include="mjpgplayer.cpp"> @@ -307,30 +307,40 @@ <Overwrite>true</Overwrite> </Platform> </DeployFile> + <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'!='true'" LocalName="$(BDS)\bin\cc32c260.dll" Class="DependencyModule"> + <Platform Name="Win32"> + <Overwrite>true</Overwrite> + </Platform> + </DeployFile> <DeployFile LocalName="..\..\src\rcv\cmr.c" Configuration="Debug" Class="ProjectFile"> <Platform Name="Win32"> <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile LocalName="..\..\src\rtkcmn.c" Configuration="Debug" Class="ProjectFile"> + <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'!='true'" LocalName="$(BDS)\bin\cc32260.dll" Class="DependencyModule"> <Platform Name="Win32"> - <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'=='true'" LocalName="$(BDS)\bin\cc32240mt.dll" Class="DependencyModule"> + <DeployFile LocalName="..\..\src\rcv\novatel.c" Configuration="Release" Class="ProjectFile"> <Platform Name="Win32"> + <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile LocalName="..\..\src\rtcm2.c" Configuration="Release" Class="ProjectFile"> + <DeployFile LocalName="..\..\src\rtkcmn.c" Configuration="Debug" Class="ProjectFile"> <Platform Name="Win32"> <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile LocalName="..\..\src\rcv\novatel.c" Configuration="Release" Class="ProjectFile"> + <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'=='true'" LocalName="$(BDS)\bin\cc32240mt.dll" Class="DependencyModule"> + <Platform Name="Win32"> + <Overwrite>true</Overwrite> + </Platform> + </DeployFile> + <DeployFile LocalName="..\..\src\rtcm2.c" Configuration="Release" Class="ProjectFile"> <Platform Name="Win32"> <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> @@ -376,13 +386,13 @@ <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile LocalName="..\..\src\rtkcmn.c" Configuration="Release" Class="ProjectFile"> + <DeployFile LocalName="..\..\src\rcv\skytraq.c" Configuration="Release" Class="ProjectFile"> <Platform Name="Win32"> <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile LocalName="..\..\src\rcv\skytraq.c" Configuration="Release" Class="ProjectFile"> + <DeployFile LocalName="..\..\src\rtkcmn.c" Configuration="Release" Class="ProjectFile"> <Platform Name="Win32"> <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> @@ -494,6 +504,11 @@ <Overwrite>true</Overwrite> </Platform> </DeployFile> + <DeployFile Condition="'$(DynamicRTL)'=='true'" LocalName="$(BDS)\Redist\osx64\libcgcrtl.dylib" Class="DependencyModule"> + <Platform Name="OSX64"> + <Overwrite>true</Overwrite> + </Platform> + </DeployFile> <DeployFile LocalName="..\..\src\rcv\rcvlex.c" Configuration="Debug" Class="ProjectFile"> <Platform Name="Win32"> <RemoteDir>.\</RemoteDir> @@ -524,6 +539,11 @@ <Overwrite>true</Overwrite> </Platform> </DeployFile> + <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'=='true'" LocalName="$(BDS)\bin64\cc64260mt.dll" Class="DependencyModule"> + <Platform Name="Win64"> + <Overwrite>true</Overwrite> + </Platform> + </DeployFile> <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'=='true'" LocalName="$(BDS)\bin\cc32250mt.dll" Class="DependencyModule"> <Platform Name="Win32"> <Overwrite>true</Overwrite> @@ -553,6 +573,12 @@ <Overwrite>true</Overwrite> </Platform> </DeployFile> + <DeployFile LocalName="..\..\src\rcv\swiftnav.c" Configuration="Release" Class="ProjectFile"> + <Platform Name="Win32"> + <RemoteDir>.\</RemoteDir> + <Overwrite>true</Overwrite> + </Platform> + </DeployFile> <DeployFile LocalName="..\..\src\rcv\tersus.c" Configuration="Release" Class="ProjectFile"> <Platform Name="Win32"> <RemoteDir>.\</RemoteDir> @@ -649,9 +675,13 @@ <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile LocalName="..\..\src\rcv\swiftnav.c" Configuration="Release" Class="ProjectFile"> + <DeployFile Condition="'$(DynamicRTL)'=='true'" LocalName="$(BDS)\Redist\osx64\libcgstl.dylib" Class="DependencyModule"> + <Platform Name="OSX64"> + <Overwrite>true</Overwrite> + </Platform> + </DeployFile> + <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'=='true'" LocalName="$(BDS)\bin\cc32260mt.dll" Class="DependencyModule"> <Platform Name="Win32"> - <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> </Platform> </DeployFile> @@ -673,6 +703,11 @@ <Overwrite>true</Overwrite> </Platform> </DeployFile> + <DeployFile LocalName="$(BDS)\Redist\iossimulator\libpcre.dylib" Class="DependencyModule"> + <Platform Name="iOSSimulator"> + <Overwrite>true</Overwrite> + </Platform> + </DeployFile> <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'=='true'" LocalName="$(BDS)\bin64\cc64250mt.dll" Class="DependencyModule"> <Platform Name="Win64"> <Overwrite>true</Overwrite> @@ -684,6 +719,21 @@ <Overwrite>true</Overwrite> </Platform> </DeployFile> + <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'!='true'" LocalName="$(BDS)\bin64\cc64260.dll" Class="DependencyModule"> + <Platform Name="Win64"> + <Overwrite>true</Overwrite> + </Platform> + </DeployFile> + <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'=='true'" LocalName="$(BDS)\bin\cc32c260mt.dll" Class="DependencyModule"> + <Platform Name="Win32"> + <Overwrite>true</Overwrite> + </Platform> + </DeployFile> + <DeployFile LocalName="$(BDS)\Redist\osx64\libcgsqlite3.dylib" Class="DependencyModule"> + <Platform Name="OSX64"> + <Overwrite>true</Overwrite> + </Platform> + </DeployFile> <DeployFile LocalName="..\..\src\rcv\crescent.c" Configuration="Debug" Class="ProjectFile"> <Platform Name="Win32"> <RemoteDir>.\</RemoteDir> @@ -699,7 +749,6 @@ <Operation>1</Operation> </Platform> <Platform Name="Win32"> - <RemoteDir>Contents\MacOS</RemoteDir> <Operation>0</Operation> </Platform> </DeployClass> @@ -709,6 +758,12 @@ <Operation>1</Operation> </Platform> </DeployClass> + <DeployClass Name="AndroidFileProvider"> + <Platform Name="Android"> + <RemoteDir>res\xml</RemoteDir> + <Operation>1</Operation> + </Platform> + </DeployClass> <DeployClass Name="AndroidGDBServer"> <Platform Name="Android"> <RemoteDir>library\lib\armeabi-v7a</RemoteDir> @@ -745,6 +800,12 @@ <Operation>1</Operation> </Platform> </DeployClass> + <DeployClass Name="AndroidSplashStylesV21"> + <Platform Name="Android"> + <RemoteDir>res\values-v21</RemoteDir> + <Operation>1</Operation> + </Platform> + </DeployClass> <DeployClass Name="Android_DefaultAppIcon"> <Platform Name="Android"> <RemoteDir>res\drawable</RemoteDir> @@ -823,6 +884,11 @@ <Operation>1</Operation> <Extensions>.framework</Extensions> </Platform> + <Platform Name="OSX64"> + <RemoteDir>Contents\MacOS</RemoteDir> + <Operation>1</Operation> + <Extensions>.framework</Extensions> + </Platform> <Platform Name="Win32"> <Operation>0</Operation> </Platform> @@ -845,6 +911,11 @@ <Operation>1</Operation> <Extensions>.dylib</Extensions> </Platform> + <Platform Name="OSX64"> + <RemoteDir>Contents\MacOS</RemoteDir> + <Operation>1</Operation> + <Extensions>.dylib</Extensions> + </Platform> <Platform Name="Win32"> <Operation>0</Operation> <Extensions>.dll;.bpl</Extensions> @@ -868,6 +939,11 @@ <Operation>1</Operation> <Extensions>.dylib</Extensions> </Platform> + <Platform Name="OSX64"> + <RemoteDir>Contents\MacOS</RemoteDir> + <Operation>1</Operation> + <Extensions>.dylib</Extensions> + </Platform> <Platform Name="Win32"> <Operation>0</Operation> <Extensions>.bpl</Extensions> @@ -890,6 +966,10 @@ <RemoteDir>Contents\Resources\StartUp\</RemoteDir> <Operation>0</Operation> </Platform> + <Platform Name="OSX64"> + <RemoteDir>Contents\Resources\StartUp\</RemoteDir> + <Operation>0</Operation> + </Platform> <Platform Name="Win32"> <Operation>0</Operation> </Platform> @@ -1026,23 +1106,41 @@ <Operation>1</Operation> </Platform> </DeployClass> + <DeployClass Name="ProjectOSXDebug"> + <Platform Name="OSX64"> + <RemoteDir>..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF</RemoteDir> + <Operation>1</Operation> + </Platform> + </DeployClass> <DeployClass Name="ProjectOSXEntitlements"> <Platform Name="OSX32"> <RemoteDir>..\</RemoteDir> <Operation>1</Operation> </Platform> + <Platform Name="OSX64"> + <RemoteDir>..\</RemoteDir> + <Operation>1</Operation> + </Platform> </DeployClass> <DeployClass Name="ProjectOSXInfoPList"> <Platform Name="OSX32"> <RemoteDir>Contents</RemoteDir> <Operation>1</Operation> </Platform> + <Platform Name="OSX64"> + <RemoteDir>Contents</RemoteDir> + <Operation>1</Operation> + </Platform> </DeployClass> <DeployClass Name="ProjectOSXResource"> <Platform Name="OSX32"> <RemoteDir>Contents\Resources</RemoteDir> <Operation>1</Operation> </Platform> + <Platform Name="OSX64"> + <RemoteDir>Contents\Resources</RemoteDir> + <Operation>1</Operation> + </Platform> </DeployClass> <DeployClass Required="true" Name="ProjectOutput"> <Platform Name="Android"> @@ -1065,6 +1163,10 @@ <RemoteDir>Contents\MacOS</RemoteDir> <Operation>1</Operation> </Platform> + <Platform Name="OSX64"> + <RemoteDir>Contents\MacOS</RemoteDir> + <Operation>1</Operation> + </Platform> <Platform Name="Win32"> <Operation>0</Operation> </Platform> @@ -1104,6 +1206,7 @@ <ProjectRoot Platform="Win32" Name="$(PROJECTNAME)"/> <ProjectRoot Platform="OSX32" Name="$(PROJECTNAME).app"/> <ProjectRoot Platform="Android" Name="$(PROJECTNAME)"/> + <ProjectRoot Platform="OSX64" Name="$(PROJECTNAME).app"/> <ProjectRoot Platform="iOSSimulator" Name="$(PROJECTNAME).app"/> </Deployment> <Platforms> diff --git a/app/srctblbrows/srctblbrows.cbproj b/app/srctblbrows/srctblbrows.cbproj index ab0a261e7032156a464acabffc38464b10fc8bf8..e6d159fd9859da422f409a0fa49ce96e6498a976 100644 --- a/app/srctblbrows/srctblbrows.cbproj +++ b/app/srctblbrows/srctblbrows.cbproj @@ -6,7 +6,7 @@ <Base>True</Base> <Config Condition="'$(Config)'==''">Release</Config> <FrameworkType>VCL</FrameworkType> - <ProjectVersion>18.4</ProjectVersion> + <ProjectVersion>18.5</ProjectVersion> <Platform Condition="'$(Platform)'==''">Win32</Platform> <TargetedPlatforms>1</TargetedPlatforms> <AppType>Application</AppType> @@ -214,6 +214,9 @@ <CppCompile Include="..\..\src\rcv\cmr.c"> <BuildOrder>24</BuildOrder> </CppCompile> + <CppCompile Include="..\..\src\rcv\comnav.c"> + <BuildOrder>26</BuildOrder> + </CppCompile> <CppCompile Include="..\..\src\rcv\crescent.c"> <BuildOrder>6</BuildOrder> <BuildOrder>13</BuildOrder> @@ -249,9 +252,6 @@ <CppCompile Include="..\..\src\rcv\tersus.c"> <BuildOrder>25</BuildOrder> </CppCompile> - <CppCompile Include="..\..\src\rcv\comnav.c"> - <BuildOrder>26</BuildOrder> - </CppCompile> <CppCompile Include="..\..\src\rcv\ublox.c"> <BuildOrder>3</BuildOrder> <BuildOrder>10</BuildOrder> @@ -366,6 +366,11 @@ <Overwrite>true</Overwrite> </Platform> </DeployFile> + <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'!='true'" LocalName="$(BDS)\bin\cc32c260.dll" Class="DependencyModule"> + <Platform Name="Win32"> + <Overwrite>true</Overwrite> + </Platform> + </DeployFile> <DeployFile LocalName="Release_Build\srctblbrows.exe" Configuration="Release" Class="ProjectOutput"> <Platform Name="Win32"> <RemoteName>srctblbrows.exe</RemoteName> @@ -378,30 +383,40 @@ <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'=='true'" LocalName="$(BDS)\bin\cc32250mt.dll" Class="DependencyModule"> + <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'!='true'" LocalName="$(BDS)\bin\cc32260.dll" Class="DependencyModule"> <Platform Name="Win32"> <Overwrite>true</Overwrite> </Platform> </DeployFile> + <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'=='true'" LocalName="$(BDS)\bin64\cc64260mt.dll" Class="DependencyModule"> + <Platform Name="Win64"> + <Overwrite>true</Overwrite> + </Platform> + </DeployFile> <DeployFile LocalName="..\..\src\rcv\novatel.c" Configuration="Release" Class="ProjectFile"> <Platform Name="Win32"> <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> </Platform> </DeployFile> + <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'=='true'" LocalName="$(BDS)\bin\cc32250mt.dll" Class="DependencyModule"> + <Platform Name="Win32"> + <Overwrite>true</Overwrite> + </Platform> + </DeployFile> <DeployFile LocalName="..\..\src\rcv\nvs.c" Configuration="Release" Class="ProjectFile"> <Platform Name="Win32"> <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile LocalName="..\..\src\rcv\tersus.c" Configuration="Release" Class="ProjectFile"> + <DeployFile LocalName="..\..\src\rcv\swiftnav.c" Configuration="Release" Class="ProjectFile"> <Platform Name="Win32"> <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile LocalName="..\..\src\rcv\comnav.c" Configuration="Release" Class="ProjectFile"> + <DeployFile LocalName="..\..\src\rcv\tersus.c" Configuration="Release" Class="ProjectFile"> <Platform Name="Win32"> <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> @@ -437,19 +452,19 @@ <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile LocalName="..\..\src\rcv\javad.c" Configuration="Release" Class="ProjectFile"> + <DeployFile LocalName="..\..\src\rtkcmn.c" Configuration="Release" Class="ProjectFile"> <Platform Name="Win32"> <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile LocalName="..\..\src\rtkcmn.c" Configuration="Release" Class="ProjectFile"> + <DeployFile LocalName="..\..\src\rcv\skytraq.c" Configuration="Release" Class="ProjectFile"> <Platform Name="Win32"> <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile LocalName="..\..\src\rcv\skytraq.c" Configuration="Release" Class="ProjectFile"> + <DeployFile LocalName="..\..\src\rcv\javad.c" Configuration="Release" Class="ProjectFile"> <Platform Name="Win32"> <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> @@ -491,13 +506,13 @@ <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile LocalName="..\..\src\rcv\swiftnav.c" Configuration="Release" Class="ProjectFile"> + <DeployFile LocalName="srctblbrows.res" Configuration="Release" Class="ProjectFile"> <Platform Name="Win32"> <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile LocalName="srctblbrows.res" Configuration="Release" Class="ProjectFile"> + <DeployFile LocalName="..\..\src\geoid.c" Configuration="Release" Class="ProjectFile"> <Platform Name="Win32"> <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> @@ -515,9 +530,8 @@ <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile LocalName="..\..\src\geoid.c" Configuration="Release" Class="ProjectFile"> - <Platform Name="Win32"> - <RemoteDir>.\</RemoteDir> + <DeployFile Condition="'$(DynamicRTL)'=='true'" LocalName="$(BDS)\Redist\osx64\libcgstl.dylib" Class="DependencyModule"> + <Platform Name="OSX64"> <Overwrite>true</Overwrite> </Platform> </DeployFile> @@ -526,12 +540,33 @@ <Overwrite>true</Overwrite> </Platform> </DeployFile> + <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'=='true'" LocalName="$(BDS)\bin\cc32260mt.dll" Class="DependencyModule"> + <Platform Name="Win32"> + <Overwrite>true</Overwrite> + </Platform> + </DeployFile> + <DeployFile LocalName="..\..\src\rcv\comnav.c" Configuration="Release" Class="ProjectFile"> + <Platform Name="Win32"> + <RemoteDir>.\</RemoteDir> + <Overwrite>true</Overwrite> + </Platform> + </DeployFile> <DeployFile LocalName="..\..\src\stream.c" Configuration="Release" Class="ProjectFile"> <Platform Name="Win32"> <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> </Platform> </DeployFile> + <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'!='true'" LocalName="$(BDS)\bin64\cc64260.dll" Class="DependencyModule"> + <Platform Name="Win64"> + <Overwrite>true</Overwrite> + </Platform> + </DeployFile> + <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'=='true'" LocalName="$(BDS)\bin\cc32c260mt.dll" Class="DependencyModule"> + <Platform Name="Win32"> + <Overwrite>true</Overwrite> + </Platform> + </DeployFile> <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'!='true'" LocalName="$(BDS)\bin\cc32250.dll" Class="DependencyModule"> <Platform Name="Win32"> <Overwrite>true</Overwrite> @@ -548,6 +583,11 @@ <Overwrite>true</Overwrite> </Platform> </DeployFile> + <DeployFile Condition="'$(DynamicRTL)'=='true'" LocalName="$(BDS)\Redist\osx64\libcgcrtl.dylib" Class="DependencyModule"> + <Platform Name="OSX64"> + <Overwrite>true</Overwrite> + </Platform> + </DeployFile> <DeployClass Name="AdditionalDebugSymbols"> <Platform Name="iOSSimulator"> <Operation>1</Operation> @@ -557,7 +597,6 @@ <Operation>1</Operation> </Platform> <Platform Name="Win32"> - <RemoteDir>Contents\MacOS</RemoteDir> <Operation>0</Operation> </Platform> </DeployClass> @@ -567,6 +606,12 @@ <Operation>1</Operation> </Platform> </DeployClass> + <DeployClass Name="AndroidFileProvider"> + <Platform Name="Android"> + <RemoteDir>res\xml</RemoteDir> + <Operation>1</Operation> + </Platform> + </DeployClass> <DeployClass Name="AndroidGDBServer"> <Platform Name="Android"> <RemoteDir>library\lib\armeabi-v7a</RemoteDir> @@ -603,6 +648,12 @@ <Operation>1</Operation> </Platform> </DeployClass> + <DeployClass Name="AndroidSplashStylesV21"> + <Platform Name="Android"> + <RemoteDir>res\values-v21</RemoteDir> + <Operation>1</Operation> + </Platform> + </DeployClass> <DeployClass Name="Android_DefaultAppIcon"> <Platform Name="Android"> <RemoteDir>res\drawable</RemoteDir> @@ -681,6 +732,11 @@ <Operation>1</Operation> <Extensions>.framework</Extensions> </Platform> + <Platform Name="OSX64"> + <RemoteDir>Contents\MacOS</RemoteDir> + <Operation>1</Operation> + <Extensions>.framework</Extensions> + </Platform> <Platform Name="Win32"> <Operation>0</Operation> </Platform> @@ -703,6 +759,11 @@ <Operation>1</Operation> <Extensions>.dylib</Extensions> </Platform> + <Platform Name="OSX64"> + <RemoteDir>Contents\MacOS</RemoteDir> + <Operation>1</Operation> + <Extensions>.dylib</Extensions> + </Platform> <Platform Name="Win32"> <Operation>0</Operation> <Extensions>.dll;.bpl</Extensions> @@ -726,6 +787,11 @@ <Operation>1</Operation> <Extensions>.dylib</Extensions> </Platform> + <Platform Name="OSX64"> + <RemoteDir>Contents\MacOS</RemoteDir> + <Operation>1</Operation> + <Extensions>.dylib</Extensions> + </Platform> <Platform Name="Win32"> <Operation>0</Operation> <Extensions>.bpl</Extensions> @@ -748,6 +814,10 @@ <RemoteDir>Contents\Resources\StartUp\</RemoteDir> <Operation>0</Operation> </Platform> + <Platform Name="OSX64"> + <RemoteDir>Contents\Resources\StartUp\</RemoteDir> + <Operation>0</Operation> + </Platform> <Platform Name="Win32"> <Operation>0</Operation> </Platform> @@ -884,23 +954,41 @@ <Operation>1</Operation> </Platform> </DeployClass> + <DeployClass Name="ProjectOSXDebug"> + <Platform Name="OSX64"> + <RemoteDir>..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF</RemoteDir> + <Operation>1</Operation> + </Platform> + </DeployClass> <DeployClass Name="ProjectOSXEntitlements"> <Platform Name="OSX32"> <RemoteDir>..\</RemoteDir> <Operation>1</Operation> </Platform> + <Platform Name="OSX64"> + <RemoteDir>..\</RemoteDir> + <Operation>1</Operation> + </Platform> </DeployClass> <DeployClass Name="ProjectOSXInfoPList"> <Platform Name="OSX32"> <RemoteDir>Contents</RemoteDir> <Operation>1</Operation> </Platform> + <Platform Name="OSX64"> + <RemoteDir>Contents</RemoteDir> + <Operation>1</Operation> + </Platform> </DeployClass> <DeployClass Name="ProjectOSXResource"> <Platform Name="OSX32"> <RemoteDir>Contents\Resources</RemoteDir> <Operation>1</Operation> </Platform> + <Platform Name="OSX64"> + <RemoteDir>Contents\Resources</RemoteDir> + <Operation>1</Operation> + </Platform> </DeployClass> <DeployClass Required="true" Name="ProjectOutput"> <Platform Name="Android"> @@ -923,6 +1011,10 @@ <RemoteDir>Contents\MacOS</RemoteDir> <Operation>1</Operation> </Platform> + <Platform Name="OSX64"> + <RemoteDir>Contents\MacOS</RemoteDir> + <Operation>1</Operation> + </Platform> <Platform Name="Win32"> <Operation>0</Operation> </Platform> @@ -962,6 +1054,7 @@ <ProjectRoot Platform="Win32" Name="$(PROJECTNAME)"/> <ProjectRoot Platform="OSX32" Name="$(PROJECTNAME).app"/> <ProjectRoot Platform="Android" Name="$(PROJECTNAME)"/> + <ProjectRoot Platform="OSX64" Name="$(PROJECTNAME).app"/> <ProjectRoot Platform="iOSSimulator" Name="$(PROJECTNAME).app"/> </Deployment> </BorlandProject> diff --git a/app/strsvr/strsvr.cbproj b/app/strsvr/strsvr.cbproj index fa4fe06abfa208d063687d074e103be906aad95d..74425b66907bc019a5bb6356dac07fd5432824d2 100644 --- a/app/strsvr/strsvr.cbproj +++ b/app/strsvr/strsvr.cbproj @@ -6,7 +6,7 @@ <Base>True</Base> <Config Condition="'$(Config)'==''">Release</Config> <FrameworkType>VCL</FrameworkType> - <ProjectVersion>18.4</ProjectVersion> + <ProjectVersion>18.5</ProjectVersion> <Platform Condition="'$(Platform)'==''">Win32</Platform> <TargetedPlatforms>1</TargetedPlatforms> <AppType>Application</AppType> @@ -444,9 +444,8 @@ <Platform value="Win64">False</Platform> </Platforms> <Deployment Version="3"> - <DeployFile LocalName="..\..\src\rcv\binex.c" Configuration="Release" Class="ProjectFile"> + <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'!='true'" LocalName="$(BDS)\bin\cc32c260.dll" Class="DependencyModule"> <Platform Name="Win32"> - <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> </Platform> </DeployFile> @@ -455,243 +454,284 @@ <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile LocalName="..\..\src\rtcm3.c" Configuration="Release" Class="ProjectFile"> + <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'!='true'" LocalName="$(BDS)\bin\cc32260.dll" Class="DependencyModule"> <Platform Name="Win32"> - <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile LocalName="..\..\src\rcv\ublox.c" Configuration="Release" Class="ProjectFile"> + <DeployFile LocalName="..\..\src\rcv\novatel.c" Configuration="Release" Class="ProjectFile"> <Platform Name="Win32"> <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile LocalName="Release_Build\strsvr.exe" Configuration="Release" Class="ProjectOutput"> + <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'=='true'" LocalName="$(BDS)\bin\cc32240mt.dll" Class="DependencyModule"> <Platform Name="Win32"> - <RemoteName>strsvr.exe</RemoteName> <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile LocalName="..\..\src\rcv\novatel.c" Configuration="Release" Class="ProjectFile"> + <DeployFile LocalName="..\..\src\rtcm2.c" Configuration="Release" Class="ProjectFile"> <Platform Name="Win32"> <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile LocalName="..\..\src\rtcm3e.c" Configuration="Release" Class="ProjectFile"> + <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'!='true'" LocalName="$(BDS)\bin64\cc64240.dll" Class="DependencyModule"> + <Platform Name="Win64"> + <Overwrite>true</Overwrite> + </Platform> + </DeployFile> + <DeployFile LocalName="..\..\src\rcv\nvs.c" Configuration="Release" Class="ProjectFile"> <Platform Name="Win32"> <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'=='true'" LocalName="$(BDS)\bin\cc32240mt.dll" Class="DependencyModule"> - <Platform Name="Win32"> + <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'=='true'" LocalName="$(BDS)\bin64\cc64240mt.dll" Class="DependencyModule"> + <Platform Name="Win64"> <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile LocalName="..\..\src\rtcm2.c" Configuration="Release" Class="ProjectFile"> + <DeployFile LocalName="..\..\src\rcv\skytraq.c" Configuration="Release" Class="ProjectFile"> <Platform Name="Win32"> <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'!='true'" LocalName="$(BDS)\bin64\cc64240.dll" Class="DependencyModule"> - <Platform Name="Win64"> + <DeployFile LocalName="..\..\src\rtkcmn.c" Configuration="Release" Class="ProjectFile"> + <Platform Name="Win32"> + <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile LocalName="..\..\src\rcv\nvs.c" Configuration="Release" Class="ProjectFile"> + <DeployFile LocalName="strsvr.res" Configuration="Release" Class="ProjectFile"> <Platform Name="Win32"> <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile LocalName="..\..\src\rtcm.c" Configuration="Release" Class="ProjectFile"> + <DeployFile Condition="'$(UsingDelphiRTL)'=='true'" LocalName="$(BDS)\bin\borlndmm.dll" Class="DependencyModule"> <Platform Name="Win32"> - <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'=='true'" LocalName="$(BDS)\bin\cc32250mt.dll" Class="DependencyModule"> + <DeployFile LocalName="..\..\src\rcv\septentrio.c" Configuration="Release" Class="ProjectFile"> <Platform Name="Win32"> + <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile LocalName="..\..\src\rcv\swiftnav.c" Configuration="Release" Class="ProjectFile"> + <DeployFile Condition="'$(DynamicRTL)'=='true'" LocalName="$(BDS)\Redist\osx32\libcgstl.dylib" Class="DependencyModule"> + <Platform Name="OSX32"> + <Overwrite>true</Overwrite> + </Platform> + </DeployFile> + <DeployFile LocalName="..\..\src\solution.c" Configuration="Release" Class="ProjectFile"> <Platform Name="Win32"> <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'=='true'" LocalName="$(BDS)\bin64\cc64240mt.dll" Class="DependencyModule"> - <Platform Name="Win64"> + <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'!='true'" LocalName="$(BDS)\bin\cc32240.dll" Class="DependencyModule"> + <Platform Name="Win32"> <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile LocalName="..\..\src\rcvraw.c" Configuration="Release" Class="ProjectFile"> + <DeployFile LocalName="..\..\src\stream.c" Configuration="Release" Class="ProjectFile"> <Platform Name="Win32"> <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile LocalName="..\..\src\rcv\crescent.c" Configuration="Release" Class="ProjectFile"> + <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'!='true'" LocalName="$(BDS)\bin\cc32250.dll" Class="DependencyModule"> <Platform Name="Win32"> - <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile LocalName="..\..\src\rcv\cmr.c" Configuration="Release" Class="ProjectFile"> + <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'!='true'" LocalName="$(BDS)\bin64\cc64250.dll" Class="DependencyModule"> + <Platform Name="Win64"> + <Overwrite>true</Overwrite> + </Platform> + </DeployFile> + <DeployFile Condition="'$(DynamicRTL)'=='true'" LocalName="$(BDS)\Redist\osx64\libcgcrtl.dylib" Class="DependencyModule"> + <Platform Name="OSX64"> + <Overwrite>true</Overwrite> + </Platform> + </DeployFile> + <DeployFile LocalName="..\..\src\rcv\binex.c" Configuration="Release" Class="ProjectFile"> <Platform Name="Win32"> <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile LocalName="..\..\src\rcv\gw10.c" Configuration="Release" Class="ProjectFile"> + <DeployFile LocalName="..\..\src\rtcm3.c" Configuration="Release" Class="ProjectFile"> <Platform Name="Win32"> <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile LocalName="..\..\src\sbas.c" Configuration="Release" Class="ProjectFile"> + <DeployFile LocalName="Release_Build\strsvr.exe" Configuration="Release" Class="ProjectOutput"> <Platform Name="Win32"> - <RemoteDir>.\</RemoteDir> + <RemoteName>strsvr.exe</RemoteName> <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile LocalName="..\..\src\streamsvr.c" Configuration="Release" Class="ProjectFile"> + <DeployFile LocalName="..\..\src\rcv\ublox.c" Configuration="Release" Class="ProjectFile"> <Platform Name="Win32"> <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'!='true'" LocalName="$(BDS)\bin\cc32c240.dll" Class="DependencyModule"> + <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'=='true'" LocalName="$(BDS)\bin64\cc64260mt.dll" Class="DependencyModule"> + <Platform Name="Win64"> + <Overwrite>true</Overwrite> + </Platform> + </DeployFile> + <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'=='true'" LocalName="$(BDS)\bin\cc32250mt.dll" Class="DependencyModule"> <Platform Name="Win32"> <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile LocalName="..\..\src\rcv\tersus.c" Configuration="Release" Class="ProjectFile"> + <DeployFile LocalName="..\..\src\rtcm3e.c" Configuration="Release" Class="ProjectFile"> <Platform Name="Win32"> <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile LocalName="..\..\src\rcv\skytraq.c" Configuration="Release" Class="ProjectFile"> + <DeployFile LocalName="..\..\src\rcv\swiftnav.c" Configuration="Release" Class="ProjectFile"> <Platform Name="Win32"> <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile LocalName="..\..\src\geoid.c" Configuration="Release" Class="ProjectFile"> + <DeployFile LocalName="..\..\src\rtcm.c" Configuration="Release" Class="ProjectFile"> <Platform Name="Win32"> <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile LocalName="..\..\src\rcv\javad.c" Configuration="Release" Class="ProjectFile"> + <DeployFile LocalName="..\..\src\rcv\tersus.c" Configuration="Release" Class="ProjectFile"> <Platform Name="Win32"> <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile LocalName="..\..\src\rtkcmn.c" Configuration="Release" Class="ProjectFile"> + <DeployFile LocalName="..\..\src\rcvraw.c" Configuration="Release" Class="ProjectFile"> <Platform Name="Win32"> <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'=='true'" LocalName="$(BDS)\bin\cc32c250mt.dll" Class="DependencyModule"> + <DeployFile LocalName="..\..\src\rcv\crescent.c" Configuration="Release" Class="ProjectFile"> <Platform Name="Win32"> + <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile Condition="'$(DynamicRTL)'=='true'" LocalName="$(BDS)\Redist\osx32\libcgcrtl.dylib" Class="DependencyModule"> - <Platform Name="OSX32"> + <DeployFile LocalName="..\..\src\rcv\cmr.c" Configuration="Release" Class="ProjectFile"> + <Platform Name="Win32"> + <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile Condition="'$(UsingDelphiRTL)'=='true'" LocalName="$(BDS)\bin64\borlndmm.dll" Class="DependencyModule"> - <Platform Name="Win64"> + <DeployFile LocalName="..\..\src\rcv\gw10.c" Configuration="Release" Class="ProjectFile"> + <Platform Name="Win32"> + <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile Condition="'$(UsingDelphiRTL)'=='true'" LocalName="$(BDS)\bin\borlndmm.dll" Class="DependencyModule"> + <DeployFile LocalName="..\..\src\sbas.c" Configuration="Release" Class="ProjectFile"> <Platform Name="Win32"> + <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile LocalName="..\..\src\rcv\septentrio.c" Configuration="Release" Class="ProjectFile"> + <DeployFile LocalName="..\..\src\streamsvr.c" Configuration="Release" Class="ProjectFile"> <Platform Name="Win32"> <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile Condition="'$(DynamicRTL)'=='true'" LocalName="$(BDS)\Redist\osx32\libcgstl.dylib" Class="DependencyModule"> - <Platform Name="OSX32"> + <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'!='true'" LocalName="$(BDS)\bin\cc32c240.dll" Class="DependencyModule"> + <Platform Name="Win32"> <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile LocalName="strsvr.res" Configuration="Release" Class="ProjectFile"> + <DeployFile LocalName="..\..\src\rcv\javad.c" Configuration="Release" Class="ProjectFile"> <Platform Name="Win32"> <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'!='true'" LocalName="$(BDS)\bin\cc32c250.dll" Class="DependencyModule"> + <DeployFile LocalName="..\..\src\geoid.c" Configuration="Release" Class="ProjectFile"> <Platform Name="Win32"> + <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile LocalName="..\..\src\rcv\rt17.c" Configuration="Release" Class="ProjectFile"> + <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'=='true'" LocalName="$(BDS)\bin\cc32c250mt.dll" Class="DependencyModule"> <Platform Name="Win32"> - <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile LocalName="..\..\src\solution.c" Configuration="Release" Class="ProjectFile"> + <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'!='true'" LocalName="$(BDS)\bin\cc32c250.dll" Class="DependencyModule"> <Platform Name="Win32"> - <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'=='true'" LocalName="$(BDS)\bin64\cc64250mt.dll" Class="DependencyModule"> + <DeployFile Condition="'$(DynamicRTL)'=='true'" LocalName="$(BDS)\Redist\osx32\libcgcrtl.dylib" Class="DependencyModule"> + <Platform Name="OSX32"> + <Overwrite>true</Overwrite> + </Platform> + </DeployFile> + <DeployFile Condition="'$(UsingDelphiRTL)'=='true'" LocalName="$(BDS)\bin64\borlndmm.dll" Class="DependencyModule"> <Platform Name="Win64"> <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile LocalName="..\..\src\rcv\comnav.c" Configuration="Release" Class="ProjectFile"> - <Platform Name="Win32"> - <RemoteDir>.\</RemoteDir> + <DeployFile Condition="'$(DynamicRTL)'=='true'" LocalName="$(BDS)\Redist\osx64\libcgstl.dylib" Class="DependencyModule"> + <Platform Name="OSX64"> <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'!='true'" LocalName="$(BDS)\bin\cc32240.dll" Class="DependencyModule"> + <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'=='true'" LocalName="$(BDS)\bin\cc32260mt.dll" Class="DependencyModule"> <Platform Name="Win32"> <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile LocalName="..\..\src\stream.c" Configuration="Release" Class="ProjectFile"> + <DeployFile LocalName="..\..\src\rcv\rt17.c" Configuration="Release" Class="ProjectFile"> <Platform Name="Win32"> <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'!='true'" LocalName="$(BDS)\bin\cc32250.dll" Class="DependencyModule"> - <Platform Name="Win32"> + <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'=='true'" LocalName="$(BDS)\bin64\cc64250mt.dll" Class="DependencyModule"> + <Platform Name="Win64"> <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile LocalName="..\..\src\preceph.c" Configuration="Release" Class="ProjectFile"> + <DeployFile LocalName="..\..\src\rcv\comnav.c" Configuration="Release" Class="ProjectFile"> <Platform Name="Win32"> <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'!='true'" LocalName="$(BDS)\bin64\cc64250.dll" Class="DependencyModule"> + <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'!='true'" LocalName="$(BDS)\bin64\cc64260.dll" Class="DependencyModule"> <Platform Name="Win64"> <Overwrite>true</Overwrite> </Platform> </DeployFile> + <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'=='true'" LocalName="$(BDS)\bin\cc32c260mt.dll" Class="DependencyModule"> + <Platform Name="Win32"> + <Overwrite>true</Overwrite> + </Platform> + </DeployFile> + <DeployFile LocalName="..\..\src\preceph.c" Configuration="Release" Class="ProjectFile"> + <Platform Name="Win32"> + <RemoteDir>.\</RemoteDir> + <Overwrite>true</Overwrite> + </Platform> + </DeployFile> <DeployClass Name="AdditionalDebugSymbols"> <Platform Name="iOSSimulator"> <Operation>1</Operation> @@ -701,7 +741,6 @@ <Operation>1</Operation> </Platform> <Platform Name="Win32"> - <RemoteDir>Contents\MacOS</RemoteDir> <Operation>0</Operation> </Platform> </DeployClass> @@ -711,6 +750,12 @@ <Operation>1</Operation> </Platform> </DeployClass> + <DeployClass Name="AndroidFileProvider"> + <Platform Name="Android"> + <RemoteDir>res\xml</RemoteDir> + <Operation>1</Operation> + </Platform> + </DeployClass> <DeployClass Name="AndroidGDBServer"> <Platform Name="Android"> <RemoteDir>library\lib\armeabi-v7a</RemoteDir> @@ -747,6 +792,12 @@ <Operation>1</Operation> </Platform> </DeployClass> + <DeployClass Name="AndroidSplashStylesV21"> + <Platform Name="Android"> + <RemoteDir>res\values-v21</RemoteDir> + <Operation>1</Operation> + </Platform> + </DeployClass> <DeployClass Name="Android_DefaultAppIcon"> <Platform Name="Android"> <RemoteDir>res\drawable</RemoteDir> @@ -825,6 +876,11 @@ <Operation>1</Operation> <Extensions>.framework</Extensions> </Platform> + <Platform Name="OSX64"> + <RemoteDir>Contents\MacOS</RemoteDir> + <Operation>1</Operation> + <Extensions>.framework</Extensions> + </Platform> <Platform Name="Win32"> <Operation>0</Operation> </Platform> @@ -847,6 +903,11 @@ <Operation>1</Operation> <Extensions>.dylib</Extensions> </Platform> + <Platform Name="OSX64"> + <RemoteDir>Contents\MacOS</RemoteDir> + <Operation>1</Operation> + <Extensions>.dylib</Extensions> + </Platform> <Platform Name="Win32"> <Operation>0</Operation> <Extensions>.dll;.bpl</Extensions> @@ -870,6 +931,11 @@ <Operation>1</Operation> <Extensions>.dylib</Extensions> </Platform> + <Platform Name="OSX64"> + <RemoteDir>Contents\MacOS</RemoteDir> + <Operation>1</Operation> + <Extensions>.dylib</Extensions> + </Platform> <Platform Name="Win32"> <Operation>0</Operation> <Extensions>.bpl</Extensions> @@ -892,6 +958,10 @@ <RemoteDir>Contents\Resources\StartUp\</RemoteDir> <Operation>0</Operation> </Platform> + <Platform Name="OSX64"> + <RemoteDir>Contents\Resources\StartUp\</RemoteDir> + <Operation>0</Operation> + </Platform> <Platform Name="Win32"> <Operation>0</Operation> </Platform> @@ -1028,23 +1098,41 @@ <Operation>1</Operation> </Platform> </DeployClass> + <DeployClass Name="ProjectOSXDebug"> + <Platform Name="OSX64"> + <RemoteDir>..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF</RemoteDir> + <Operation>1</Operation> + </Platform> + </DeployClass> <DeployClass Name="ProjectOSXEntitlements"> <Platform Name="OSX32"> <RemoteDir>..\</RemoteDir> <Operation>1</Operation> </Platform> + <Platform Name="OSX64"> + <RemoteDir>..\</RemoteDir> + <Operation>1</Operation> + </Platform> </DeployClass> <DeployClass Name="ProjectOSXInfoPList"> <Platform Name="OSX32"> <RemoteDir>Contents</RemoteDir> <Operation>1</Operation> </Platform> + <Platform Name="OSX64"> + <RemoteDir>Contents</RemoteDir> + <Operation>1</Operation> + </Platform> </DeployClass> <DeployClass Name="ProjectOSXResource"> <Platform Name="OSX32"> <RemoteDir>Contents\Resources</RemoteDir> <Operation>1</Operation> </Platform> + <Platform Name="OSX64"> + <RemoteDir>Contents\Resources</RemoteDir> + <Operation>1</Operation> + </Platform> </DeployClass> <DeployClass Required="true" Name="ProjectOutput"> <Platform Name="Android"> @@ -1067,6 +1155,10 @@ <RemoteDir>Contents\MacOS</RemoteDir> <Operation>1</Operation> </Platform> + <Platform Name="OSX64"> + <RemoteDir>Contents\MacOS</RemoteDir> + <Operation>1</Operation> + </Platform> <Platform Name="Win32"> <Operation>0</Operation> </Platform> @@ -1106,6 +1198,7 @@ <ProjectRoot Platform="Win32" Name="$(PROJECTNAME)"/> <ProjectRoot Platform="OSX32" Name="$(PROJECTNAME).app"/> <ProjectRoot Platform="Android" Name="$(PROJECTNAME)"/> + <ProjectRoot Platform="OSX64" Name="$(PROJECTNAME).app"/> <ProjectRoot Platform="iOSSimulator" Name="$(PROJECTNAME).app"/> </Deployment> </BorlandProject>