diff --git a/app/convbin/convbin.c b/app/convbin/convbin.c
index ec78e0782a877d17279a503e46dddb026f8aaf5c..d3c7e704f3c19a506809e7c4877e5d1a9b274172 100644
--- a/app/convbin/convbin.c
+++ b/app/convbin/convbin.c
@@ -326,7 +326,7 @@ static void setmask(const char *argv, rnxopt_t *opt, int mask)
else if (p[0]=='C') i=5;
else if (p[0]=='I') i=6;
else continue;
- if ((code=obs2code(0,p+2,NULL))) {
+ if ((code=obs2code(p+2,NULL))) {
opt->mask[i][code-1]=mask?'1':'0';
}
}
diff --git a/app/rtkconv/rtkconv.cbproj b/app/rtkconv/rtkconv.cbproj
index add20ff00fa5fcccb81f0faaab5e1f7b6fa1c2d8..d00841c38b6eafb71355695b95a0aa34ebff6829 100644
--- a/app/rtkconv/rtkconv.cbproj
+++ b/app/rtkconv/rtkconv.cbproj
@@ -6,7 +6,7 @@
<Base>True</Base>
<Config Condition="'$(Config)'==''">Release</Config>
<FrameworkType>VCL</FrameworkType>
- <ProjectVersion>18.6</ProjectVersion>
+ <ProjectVersion>18.7</ProjectVersion>
<Platform Condition="'$(Platform)'==''">Win32</Platform>
<TargetedPlatforms>1</TargetedPlatforms>
<AppType>Application</AppType>
@@ -89,9 +89,9 @@
<VerInfo_Locale>1033</VerInfo_Locale>
<Manifest_File>$(BDS)\bin\default_app.manifest</Manifest_File>
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
- <BCC_Defines>_RTLDLL;WIN32;TRACE;ENAGLO;ENAGAL;ENAQZS;ENACMP;NEXOBS=3;NFREQ=4;$(BCC_Defines)</BCC_Defines>
- <BRCC_Defines>_RTLDLL;WIN32;TRACE;ENAGLO;ENAGAL;ENAQZS;NEXOBS=3;NFREQ=4;$(BRCC_Defines)</BRCC_Defines>
- <TASM_Defines>_RTLDLL;WIN32;TRACE;ENAGLO;ENAGAL;ENAQZS;NEXOBS=3;NFREQ=4;$(TASM_Defines)</TASM_Defines>
+ <BCC_Defines>_RTLDLL;WIN32;TRACE;ENAGLO;ENAGAL;ENAQZS;ENACMP;NEXOBS=3;NFREQ=3;$(BCC_Defines)</BCC_Defines>
+ <BRCC_Defines>_RTLDLL;WIN32;TRACE;ENAGLO;ENAGAL;ENAQZS;NEXOBS=3;NFREQ=3;$(BRCC_Defines)</BRCC_Defines>
+ <TASM_Defines>_RTLDLL;WIN32;TRACE;ENAGLO;ENAGAL;ENAQZS;NEXOBS=3;NFREQ=3;$(TASM_Defines)</TASM_Defines>
<BCC_UserSuppliedOptions> -tWM</BCC_UserSuppliedOptions>
<OutputExt>exe</OutputExt>
<AppEnableRuntimeThemes>true</AppEnableRuntimeThemes>
@@ -430,33 +430,33 @@
<Overwrite>true</Overwrite>
</Platform>
</DeployFile>
- <DeployFile LocalName="Debug_Build\rtkconv.exe" Configuration="Debug" Class="ProjectOutput">
+ <DeployFile LocalName="..\..\src\rtkcmn.c" Configuration="Debug" Class="ProjectFile">
<Platform Name="Win32">
- <RemoteName>rtkconv.exe</RemoteName>
+ <RemoteDir>.\</RemoteDir>
<Overwrite>true</Overwrite>
</Platform>
</DeployFile>
- <DeployFile LocalName="..\..\src\ephemeris.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="..\..\src\rtcm2.c" Configuration="Release" Class="ProjectFile">
+ <DeployFile LocalName="..\..\src\pntpos.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 LocalName="..\..\src\ephemeris.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 LocalName="Debug_Build\rtkconv.exe" Configuration="Debug" Class="ProjectOutput">
<Platform Name="Win32">
- <RemoteDir>.\</RemoteDir>
+ <RemoteName>rtkconv.exe</RemoteName>
<Overwrite>true</Overwrite>
</Platform>
</DeployFile>
@@ -466,7 +466,7 @@
<Overwrite>true</Overwrite>
</Platform>
</DeployFile>
- <DeployFile LocalName="..\..\src\pntpos.c" Configuration="Debug" Class="ProjectFile">
+ <DeployFile LocalName="..\..\src\rtcm2.c" Configuration="Release" Class="ProjectFile">
<Platform Name="Win32">
<RemoteDir>.\</RemoteDir>
<Overwrite>true</Overwrite>
@@ -496,13 +496,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>
@@ -924,6 +924,12 @@
<Operation>1</Operation>
</Platform>
</DeployClass>
+ <DeployClass Name="Android_Colors">
+ <Platform Name="Android">
+ <RemoteDir>res\values</RemoteDir>
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
<DeployClass Name="Android_DefaultAppIcon">
<Platform Name="Android">
<RemoteDir>res\drawable</RemoteDir>
@@ -960,6 +966,36 @@
<Operation>1</Operation>
</Platform>
</DeployClass>
+ <DeployClass Name="Android_NotificationIcon24">
+ <Platform Name="Android">
+ <RemoteDir>res\drawable-mdpi</RemoteDir>
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="Android_NotificationIcon36">
+ <Platform Name="Android">
+ <RemoteDir>res\drawable-hdpi</RemoteDir>
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="Android_NotificationIcon48">
+ <Platform Name="Android">
+ <RemoteDir>res\drawable-xhdpi</RemoteDir>
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="Android_NotificationIcon72">
+ <Platform Name="Android">
+ <RemoteDir>res\drawable-xxhdpi</RemoteDir>
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="Android_NotificationIcon96">
+ <Platform Name="Android">
+ <RemoteDir>res\drawable-xxxhdpi</RemoteDir>
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
<DeployClass Name="Android_SplashImage426">
<Platform Name="Android">
<RemoteDir>res\drawable-small</RemoteDir>
@@ -984,6 +1020,12 @@
<Operation>1</Operation>
</Platform>
</DeployClass>
+ <DeployClass Name="Android_Strings">
+ <Platform Name="Android">
+ <RemoteDir>res\values</RemoteDir>
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
<DeployClass Name="DebugSymbols">
<Platform Name="iOSSimulator">
<Operation>1</Operation>
@@ -1103,6 +1145,17 @@
<Operation>1</Operation>
</Platform>
</DeployClass>
+ <DeployClass Name="iPad_Launch1024x768">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
<DeployClass Name="iPad_Launch1536">
<Platform Name="iOSDevice32">
<Operation>1</Operation>
@@ -1114,6 +1167,39 @@
<Operation>1</Operation>
</Platform>
</DeployClass>
+ <DeployClass Name="iPad_Launch1536x2048">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPad_Launch1668">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPad_Launch1668x2388">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
<DeployClass Name="iPad_Launch2048">
<Platform Name="iOSDevice32">
<Operation>1</Operation>
@@ -1125,6 +1211,61 @@
<Operation>1</Operation>
</Platform>
</DeployClass>
+ <DeployClass Name="iPad_Launch2048x1536">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPad_Launch2048x2732">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPad_Launch2224">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPad_Launch2388x1668">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPad_Launch2732x2048">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
<DeployClass Name="iPad_Launch768">
<Platform Name="iOSDevice32">
<Operation>1</Operation>
@@ -1136,6 +1277,116 @@
<Operation>1</Operation>
</Platform>
</DeployClass>
+ <DeployClass Name="iPad_Launch768x1024">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPhone_Launch1125">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPhone_Launch1136x640">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPhone_Launch1242">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPhone_Launch1242x2688">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPhone_Launch1334">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPhone_Launch1792">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPhone_Launch2208">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPhone_Launch2436">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPhone_Launch2688x1242">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
<DeployClass Name="iPhone_Launch320">
<Platform Name="iOSDevice32">
<Operation>1</Operation>
@@ -1169,6 +1420,28 @@
<Operation>1</Operation>
</Platform>
</DeployClass>
+ <DeployClass Name="iPhone_Launch750">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPhone_Launch828">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
<DeployClass Name="ProjectAndroidManifest">
<Platform Name="Android">
<Operation>1</Operation>
diff --git a/app/rtkget/rtkget.cbproj b/app/rtkget/rtkget.cbproj
index e3cae01cb130ad36a40ff81f7181d645103627a1..dc4d07f15756b72ac727db017172baccd0f2ad4a 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.5</ProjectVersion>
+ <ProjectVersion>18.7</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 886d959738859413a493fdbf3d8a261b5c2e30e2..0b5253e4c424d23868bb3fcc081e87c4a0c2d966 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.5</ProjectVersion>
+ <ProjectVersion>18.7</ProjectVersion>
<FrameworkType>VCL</FrameworkType>
<MainSource>rtklaunch.cpp</MainSource>
<Base>True</Base>
diff --git a/app/rtknavi/mondlg.cpp b/app/rtknavi/mondlg.cpp
index 6b42488318efb1b97aa5056f8585a0ac8f8a6f34..1c28a5065e1034ba749d6a3fa23d690e042c96c1 100644
--- a/app/rtknavi/mondlg.cpp
+++ b/app/rtknavi/mondlg.cpp
@@ -367,7 +367,7 @@ void __fastcall TMonitorDialog::ShowRtk(void)
AnsiString sol[]={"-","Fix","Float","SBAS","DGPS","Single","PPP",""};
AnsiString mode[]={"Single","DGPS","Kinematic","Static","Static-Start","Moving-Base",
"Fixed","PPP-Kinematic","PPP-Static",""};
- AnsiString freq[]={"-","L1","L1+L2/E5b","L1+L2/E5b+L5","L1+L2/E5b+L5+E6"};
+ AnsiString freq[]={"-","L1","L1+L2","L1+L2+L5","L1+L2+L5+L6","L1+L2+L5+L6+L7","L1+L2+L5+L6+L7+L8",""};
double *del,*off1,*off2,runtime,rt[3]={0},dop[4]={0};
double azel[MAXSAT*2],pos[3],vel[3];
int i,j,k,thread,cycle,state,rtkstat,nsat0,nsat1,prcout,nave;
@@ -1017,7 +1017,7 @@ void __fastcall TMonitorDialog::ShowObs(void)
Tbl->Cells[j++][i+1]=s.sprintf("%d",obs[i].LLI[k]);
}
for (k=0;k<NFREQ+nex;k++) {
- code=code2obs(0,obs[i].code[k],NULL);
+ code=code2obs(obs[i].code[k],NULL);
if (*code) Tbl->Cells[j++][i+1]=s.sprintf("L%s",code);
else Tbl->Cells[j++][i+1]="";
}
@@ -1917,13 +1917,13 @@ void __fastcall TMonitorDialog::ShowRtcmSsr(void)
buff[0]='\0';
for (p=buff,k=0;k<MAXCODE;k++) {
if (ssr[i].cbias[k]==0.0) continue;
- p+=sprintf(p,"%s:%.3f ",code2obs(0,k+1,NULL),ssr[i].cbias[k]);
+ p+=sprintf(p,"%s:%.3f ",code2obs(k+1,NULL),ssr[i].cbias[k]);
}
Tbl->Cells[j++][i+1]=buff;
buff[0]='\0';
for (p=buff,k=0;k<MAXCODE;k++) {
if (ssr[i].pbias[k]==0.0) continue;
- p+=sprintf(p,"%s:%.3f ",code2obs(0,k+1,NULL),ssr[i].pbias[k]);
+ p+=sprintf(p,"%s:%.3f ",code2obs(k+1,NULL),ssr[i].pbias[k]);
}
Tbl->Cells[j++][i+1]=buff;
}
diff --git a/app/rtknavi/naviopt.cpp b/app/rtknavi/naviopt.cpp
index 5d39c2baaf3c81947df22effce408f916e0a9886..7ddefcff932509acbaba6a9475b8c2252da93629 100644
--- a/app/rtknavi/naviopt.cpp
+++ b/app/rtknavi/naviopt.cpp
@@ -93,8 +93,7 @@ __fastcall TOptDialog::TOptDialog(TComponent* Owner)
: TForm(Owner)
{
AnsiString label,s;
- const char *freqs[]={"L1","L2/E5b","L5","E6","E5ab"};
- int nglo=MAXPRNGLO,ngal=MAXPRNGAL,nqzs=MAXPRNQZS;
+ int freq[]={1,2,5,6,7,8,9},nglo=MAXPRNGLO,ngal=MAXPRNGAL,nqzs=MAXPRNQZS;
int ncmp=MAXPRNCMP,nirn=MAXPRNIRN;
PrcOpt=prcopt_default;
SolOpt=solopt_default;
@@ -103,7 +102,7 @@ __fastcall TOptDialog::TOptDialog(TComponent* Owner)
Freq->Items->Clear();
for (int i=0;i<NFREQ;i++) {
- label=label+(i>0?"+":"")+s.sprintf("%s",freqs[i]);
+ label=label+(i>0?"+":"")+s.sprintf("L%d",freq[i]);
Freq->Items->Add(label);
}
if (nglo<=0) NavSys2->Enabled=false;
diff --git a/app/rtknavi/naviopt.dfm b/app/rtknavi/naviopt.dfm
index 4bcb1ac494cbf0d0c6aadd20774ab46a74bd09e9..a493c73cb9dd83daa27a00d3c1c3d6f086f894cf 100644
--- a/app/rtknavi/naviopt.dfm
+++ b/app/rtknavi/naviopt.dfm
@@ -216,12 +216,12 @@ object OptDialog: TOptDialog
Style = csDropDownList
ItemIndex = 1
TabOrder = 1
- Text = 'L1+L2/E5b'
+ Text = 'L1+L2'
OnChange = FreqChange
Items.Strings = (
'L1'
- 'L1+L2/E5b'
- 'L1+L2/E5b+L5')
+ 'L1+L2'
+ 'L1+L2+L5')
end
object SatEphem: TComboBox
Left = 248
diff --git a/app/rtknavi/rtknavi.cbproj b/app/rtknavi/rtknavi.cbproj
index 401245aca9008410a0f8394ec616caddd23a2537..d9ba7e3fee348dbe6ec055b87d0fbfb775240b0b 100644
--- a/app/rtknavi/rtknavi.cbproj
+++ b/app/rtknavi/rtknavi.cbproj
@@ -65,10 +65,10 @@
<TASM_IncludePath>..\..\..\rtklib_extlex;..\..\extlex;..\..\src\rcv;..\appcmn;..\..\src;$(BDS)\include;$(BDS)\include\dinkumware;$(BDS)\include\vcl;$(TASM_IncludePath)</TASM_IncludePath>
<DCC_ObjPath>..\..\..\rtklib_extlex;..\..\extlex;..\..\qzslex;..\..\src\rcv;..\..\src;..\appcmn;G:\rtklib_2.2\app\rtknavi;$(DCC_ObjPath)</DCC_ObjPath>
<PackageImports>vclx.bpi;vcl.bpi;$(PackageImports)</PackageImports>
- <TASM_Defines>_RTLDLL;NO_STRICT;WIN32;TRACE;ENAGLO;ENAQZS;ENAGAL;NFREQ=4;NEXOBS=3;$(TASM_Defines)</TASM_Defines>
- <BRCC_Defines>_RTLDLL;NO_STRICT;WIN32;TRACE;ENAGLO;ENAQZS;ENAGAL;NFREQ=4;NEXOBS=3;$(BRCC_Defines)</BRCC_Defines>
+ <TASM_Defines>_RTLDLL;NO_STRICT;WIN32;TRACE;ENAGLO;ENAQZS;ENAGAL;NFREQ=3;NEXOBS=3;$(TASM_Defines)</TASM_Defines>
+ <BRCC_Defines>_RTLDLL;NO_STRICT;WIN32;TRACE;ENAGLO;ENAQZS;ENAGAL;NFREQ=3;NEXOBS=3;$(BRCC_Defines)</BRCC_Defines>
<ILINK_AppType>Windows</ILINK_AppType>
- <BCC_Defines>_RTLDLL;WIN32;TRACE;ENAGLO;ENAQZS;ENAGAL;ENAIRN;ENACMP;NFREQ=4;NEXOBS=3;ENALEX;$(BCC_Defines)</BCC_Defines>
+ <BCC_Defines>_RTLDLL;WIN32;TRACE;ENAGLO;ENAQZS;ENAGAL;ENAIRN;ENACMP;NFREQ=3;NEXOBS=3;ENALEX;$(BCC_Defines)</BCC_Defines>
<BRCC_IncludePath>..\..\..\rtklib_extlex;..\..\extlex;..\..\src\rcv;..\appcmn;..\..\src;$(BDS)\include;$(BDS)\include\dinkumware;$(BDS)\include\vcl;$(BRCC_IncludePath)</BRCC_IncludePath>
<BCC_PCHWithExternalTypeFiles>false</BCC_PCHWithExternalTypeFiles>
<BCC_UserSuppliedOptions> -tWM</BCC_UserSuppliedOptions>
diff --git a/app/rtknavi_mkl/rtknavi_mkl.cbproj b/app/rtknavi_mkl/rtknavi_mkl.cbproj
index 48c76cac6a65ee758ce31e1ee2861c667e2d1c3e..7dff1fb6d2f6c8df0f8baeb9a99684ca8e2a8c07 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.5</ProjectVersion>
+ <ProjectVersion>18.7</ProjectVersion>
<Platform Condition="'$(Platform)'==''">Win32</Platform>
<TargetedPlatforms>1</TargetedPlatforms>
<AppType>Application</AppType>
@@ -586,13 +586,13 @@
<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\rtcm2.c" Configuration="Release" Class="ProjectFile">
+ <DeployFile LocalName="..\..\src\rcv\novatel.c" Configuration="Release" Class="ProjectFile">
<Platform Name="Win32">
<RemoteDir>.\</RemoteDir>
<Overwrite>true</Overwrite>
@@ -632,13 +632,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>
@@ -1014,6 +1014,12 @@
<Operation>1</Operation>
</Platform>
</DeployClass>
+ <DeployClass Name="Android_Colors">
+ <Platform Name="Android">
+ <RemoteDir>res\values</RemoteDir>
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
<DeployClass Name="Android_DefaultAppIcon">
<Platform Name="Android">
<RemoteDir>res\drawable</RemoteDir>
@@ -1050,6 +1056,36 @@
<Operation>1</Operation>
</Platform>
</DeployClass>
+ <DeployClass Name="Android_NotificationIcon24">
+ <Platform Name="Android">
+ <RemoteDir>res\drawable-mdpi</RemoteDir>
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="Android_NotificationIcon36">
+ <Platform Name="Android">
+ <RemoteDir>res\drawable-hdpi</RemoteDir>
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="Android_NotificationIcon48">
+ <Platform Name="Android">
+ <RemoteDir>res\drawable-xhdpi</RemoteDir>
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="Android_NotificationIcon72">
+ <Platform Name="Android">
+ <RemoteDir>res\drawable-xxhdpi</RemoteDir>
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="Android_NotificationIcon96">
+ <Platform Name="Android">
+ <RemoteDir>res\drawable-xxxhdpi</RemoteDir>
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
<DeployClass Name="Android_SplashImage426">
<Platform Name="Android">
<RemoteDir>res\drawable-small</RemoteDir>
@@ -1074,6 +1110,12 @@
<Operation>1</Operation>
</Platform>
</DeployClass>
+ <DeployClass Name="Android_Strings">
+ <Platform Name="Android">
+ <RemoteDir>res\values</RemoteDir>
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
<DeployClass Name="DebugSymbols">
<Platform Name="iOSSimulator">
<Operation>1</Operation>
@@ -1193,6 +1235,17 @@
<Operation>1</Operation>
</Platform>
</DeployClass>
+ <DeployClass Name="iPad_Launch1024x768">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
<DeployClass Name="iPad_Launch1536">
<Platform Name="iOSDevice32">
<Operation>1</Operation>
@@ -1204,6 +1257,39 @@
<Operation>1</Operation>
</Platform>
</DeployClass>
+ <DeployClass Name="iPad_Launch1536x2048">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPad_Launch1668">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPad_Launch1668x2388">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
<DeployClass Name="iPad_Launch2048">
<Platform Name="iOSDevice32">
<Operation>1</Operation>
@@ -1215,6 +1301,61 @@
<Operation>1</Operation>
</Platform>
</DeployClass>
+ <DeployClass Name="iPad_Launch2048x1536">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPad_Launch2048x2732">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPad_Launch2224">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPad_Launch2388x1668">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPad_Launch2732x2048">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
<DeployClass Name="iPad_Launch768">
<Platform Name="iOSDevice32">
<Operation>1</Operation>
@@ -1226,6 +1367,116 @@
<Operation>1</Operation>
</Platform>
</DeployClass>
+ <DeployClass Name="iPad_Launch768x1024">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPhone_Launch1125">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPhone_Launch1136x640">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPhone_Launch1242">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPhone_Launch1242x2688">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPhone_Launch1334">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPhone_Launch1792">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPhone_Launch2208">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPhone_Launch2436">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPhone_Launch2688x1242">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
<DeployClass Name="iPhone_Launch320">
<Platform Name="iOSDevice32">
<Operation>1</Operation>
@@ -1259,6 +1510,28 @@
<Operation>1</Operation>
</Platform>
</DeployClass>
+ <DeployClass Name="iPhone_Launch750">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPhone_Launch828">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
<DeployClass Name="ProjectAndroidManifest">
<Platform Name="Android">
<Operation>1</Operation>
diff --git a/app/rtknavi_win64/rtknavi_win64.cbproj b/app/rtknavi_win64/rtknavi_win64.cbproj
index 9636df1a1fafe66e3cc27d344e1b2d0d8b7b9781..fe65e985ed2609882b1eb0d74690f538d6138404 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.5</ProjectVersion>
+ <ProjectVersion>18.7</ProjectVersion>
<Platform Condition="'$(Platform)'==''">Win32</Platform>
<TargetedPlatforms>3</TargetedPlatforms>
<AppType>Application</AppType>
@@ -598,13 +598,13 @@
</Platform>
</DeployFile>
<DeployFile LocalName="..\..\src\rtcm2.c" Configuration="Release" Class="ProjectFile">
- <Platform Name="Win64">
+ <Platform Name="Win32">
<RemoteDir>.\</RemoteDir>
<Overwrite>true</Overwrite>
</Platform>
</DeployFile>
<DeployFile LocalName="..\..\src\rtcm2.c" Configuration="Release" Class="ProjectFile">
- <Platform Name="Win32">
+ <Platform Name="Win64">
<RemoteDir>.\</RemoteDir>
<Overwrite>true</Overwrite>
</Platform>
@@ -1259,6 +1259,12 @@
<Operation>1</Operation>
</Platform>
</DeployClass>
+ <DeployClass Name="Android_Colors">
+ <Platform Name="Android">
+ <RemoteDir>res\values</RemoteDir>
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
<DeployClass Name="Android_DefaultAppIcon">
<Platform Name="Android">
<RemoteDir>res\drawable</RemoteDir>
@@ -1295,6 +1301,36 @@
<Operation>1</Operation>
</Platform>
</DeployClass>
+ <DeployClass Name="Android_NotificationIcon24">
+ <Platform Name="Android">
+ <RemoteDir>res\drawable-mdpi</RemoteDir>
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="Android_NotificationIcon36">
+ <Platform Name="Android">
+ <RemoteDir>res\drawable-hdpi</RemoteDir>
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="Android_NotificationIcon48">
+ <Platform Name="Android">
+ <RemoteDir>res\drawable-xhdpi</RemoteDir>
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="Android_NotificationIcon72">
+ <Platform Name="Android">
+ <RemoteDir>res\drawable-xxhdpi</RemoteDir>
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="Android_NotificationIcon96">
+ <Platform Name="Android">
+ <RemoteDir>res\drawable-xxxhdpi</RemoteDir>
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
<DeployClass Name="Android_SplashImage426">
<Platform Name="Android">
<RemoteDir>res\drawable-small</RemoteDir>
@@ -1319,6 +1355,12 @@
<Operation>1</Operation>
</Platform>
</DeployClass>
+ <DeployClass Name="Android_Strings">
+ <Platform Name="Android">
+ <RemoteDir>res\values</RemoteDir>
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
<DeployClass Name="DebugSymbols">
<Platform Name="iOSSimulator">
<Operation>1</Operation>
@@ -1438,6 +1480,17 @@
<Operation>1</Operation>
</Platform>
</DeployClass>
+ <DeployClass Name="iPad_Launch1024x768">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
<DeployClass Name="iPad_Launch1536">
<Platform Name="iOSDevice32">
<Operation>1</Operation>
@@ -1449,6 +1502,39 @@
<Operation>1</Operation>
</Platform>
</DeployClass>
+ <DeployClass Name="iPad_Launch1536x2048">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPad_Launch1668">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPad_Launch1668x2388">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
<DeployClass Name="iPad_Launch2048">
<Platform Name="iOSDevice32">
<Operation>1</Operation>
@@ -1460,6 +1546,61 @@
<Operation>1</Operation>
</Platform>
</DeployClass>
+ <DeployClass Name="iPad_Launch2048x1536">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPad_Launch2048x2732">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPad_Launch2224">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPad_Launch2388x1668">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPad_Launch2732x2048">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
<DeployClass Name="iPad_Launch768">
<Platform Name="iOSDevice32">
<Operation>1</Operation>
@@ -1471,6 +1612,116 @@
<Operation>1</Operation>
</Platform>
</DeployClass>
+ <DeployClass Name="iPad_Launch768x1024">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPhone_Launch1125">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPhone_Launch1136x640">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPhone_Launch1242">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPhone_Launch1242x2688">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPhone_Launch1334">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPhone_Launch1792">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPhone_Launch2208">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPhone_Launch2436">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPhone_Launch2688x1242">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
<DeployClass Name="iPhone_Launch320">
<Platform Name="iOSDevice32">
<Operation>1</Operation>
@@ -1504,6 +1755,28 @@
<Operation>1</Operation>
</Platform>
</DeployClass>
+ <DeployClass Name="iPhone_Launch750">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPhone_Launch828">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
<DeployClass Name="ProjectAndroidManifest">
<Platform Name="Android">
<Operation>1</Operation>
diff --git a/app/rtkpost/rtkpost.cbproj b/app/rtkpost/rtkpost.cbproj
index 0e344d1ba33a861c2f2ea83ed1b6855a18078623..01d50b88b3808a69baadff8e5e5f618c7e83745e 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.5</ProjectVersion>
+ <ProjectVersion>18.7</ProjectVersion>
<Platform Condition="'$(Platform)'==''">Win32</Platform>
<TargetedPlatforms>1</TargetedPlatforms>
<AppType>Application</AppType>
diff --git a/app/rtkpost_mkl/rtkpost_mkl.cbproj b/app/rtkpost_mkl/rtkpost_mkl.cbproj
index 991bc780a3f7c5128c14f01a09d1486dd7cdab82..8fd5c8e2ff30597f3648d2c0688f262a9be84437 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.5</ProjectVersion>
+ <ProjectVersion>18.7</ProjectVersion>
<Platform Condition="'$(Platform)'==''">Win32</Platform>
<TargetedPlatforms>1</TargetedPlatforms>
<AppType>Application</AppType>
diff --git a/app/rtkpost_win64/rtkpost_win64.cbproj b/app/rtkpost_win64/rtkpost_win64.cbproj
index 240fe33c6a8682029e97365f5028bbf35a0141ad..4b1cabce5f0cbb6410c5e323e507348104d5cdfd 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.5</ProjectVersion>
+ <ProjectVersion>18.7</ProjectVersion>
<Platform Condition="'$(Platform)'==''">Win64</Platform>
<TargetedPlatforms>3</TargetedPlatforms>
<AppType>Application</AppType>
@@ -476,14 +476,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\ephemeris.c" Configuration="Release" Class="ProjectFile">
- <Platform Name="Win32">
+ <DeployFile LocalName="..\..\src\ionex.c" Configuration="Release" Class="ProjectFile">
+ <Platform Name="Win64">
<RemoteDir>.\</RemoteDir>
<Overwrite>true</Overwrite>
</Platform>
@@ -499,8 +498,9 @@
<Overwrite>true</Overwrite>
</Platform>
</DeployFile>
- <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'=='true'" LocalName="$(BDS)\bin\cc32240mt.dll" Class="DependencyModule">
+ <DeployFile LocalName="..\..\src\ephemeris.c" Configuration="Release" Class="ProjectFile">
<Platform Name="Win32">
+ <RemoteDir>.\</RemoteDir>
<Overwrite>true</Overwrite>
</Platform>
</DeployFile>
@@ -947,6 +947,12 @@
<Operation>1</Operation>
</Platform>
</DeployClass>
+ <DeployClass Name="Android_Colors">
+ <Platform Name="Android">
+ <RemoteDir>res\values</RemoteDir>
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
<DeployClass Name="Android_DefaultAppIcon">
<Platform Name="Android">
<RemoteDir>res\drawable</RemoteDir>
@@ -983,6 +989,36 @@
<Operation>1</Operation>
</Platform>
</DeployClass>
+ <DeployClass Name="Android_NotificationIcon24">
+ <Platform Name="Android">
+ <RemoteDir>res\drawable-mdpi</RemoteDir>
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="Android_NotificationIcon36">
+ <Platform Name="Android">
+ <RemoteDir>res\drawable-hdpi</RemoteDir>
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="Android_NotificationIcon48">
+ <Platform Name="Android">
+ <RemoteDir>res\drawable-xhdpi</RemoteDir>
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="Android_NotificationIcon72">
+ <Platform Name="Android">
+ <RemoteDir>res\drawable-xxhdpi</RemoteDir>
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="Android_NotificationIcon96">
+ <Platform Name="Android">
+ <RemoteDir>res\drawable-xxxhdpi</RemoteDir>
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
<DeployClass Name="Android_SplashImage426">
<Platform Name="Android">
<RemoteDir>res\drawable-small</RemoteDir>
@@ -1007,6 +1043,12 @@
<Operation>1</Operation>
</Platform>
</DeployClass>
+ <DeployClass Name="Android_Strings">
+ <Platform Name="Android">
+ <RemoteDir>res\values</RemoteDir>
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
<DeployClass Name="DebugSymbols">
<Platform Name="iOSSimulator">
<Operation>1</Operation>
@@ -1126,6 +1168,17 @@
<Operation>1</Operation>
</Platform>
</DeployClass>
+ <DeployClass Name="iPad_Launch1024x768">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
<DeployClass Name="iPad_Launch1536">
<Platform Name="iOSDevice32">
<Operation>1</Operation>
@@ -1137,6 +1190,39 @@
<Operation>1</Operation>
</Platform>
</DeployClass>
+ <DeployClass Name="iPad_Launch1536x2048">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPad_Launch1668">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPad_Launch1668x2388">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
<DeployClass Name="iPad_Launch2048">
<Platform Name="iOSDevice32">
<Operation>1</Operation>
@@ -1148,6 +1234,61 @@
<Operation>1</Operation>
</Platform>
</DeployClass>
+ <DeployClass Name="iPad_Launch2048x1536">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPad_Launch2048x2732">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPad_Launch2224">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPad_Launch2388x1668">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPad_Launch2732x2048">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
<DeployClass Name="iPad_Launch768">
<Platform Name="iOSDevice32">
<Operation>1</Operation>
@@ -1159,6 +1300,116 @@
<Operation>1</Operation>
</Platform>
</DeployClass>
+ <DeployClass Name="iPad_Launch768x1024">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPhone_Launch1125">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPhone_Launch1136x640">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPhone_Launch1242">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPhone_Launch1242x2688">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPhone_Launch1334">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPhone_Launch1792">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPhone_Launch2208">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPhone_Launch2436">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPhone_Launch2688x1242">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
<DeployClass Name="iPhone_Launch320">
<Platform Name="iOSDevice32">
<Operation>1</Operation>
@@ -1192,6 +1443,28 @@
<Operation>1</Operation>
</Platform>
</DeployClass>
+ <DeployClass Name="iPhone_Launch750">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPhone_Launch828">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
<DeployClass Name="ProjectAndroidManifest">
<Platform Name="Android">
<Operation>1</Operation>
diff --git a/app/rtkvideo/rtkvideo.cbproj b/app/rtkvideo/rtkvideo.cbproj
index 6e89d5550200d7600edc2c105605222f683fa6fe..8016f0ddcd1ea54f75324db1718d8d334ee1e82a 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.5</ProjectVersion>
+ <ProjectVersion>18.7</ProjectVersion>
<FrameworkType>FMX</FrameworkType>
<MainSource>rtkvideo.cpp</MainSource>
<Base>True</Base>
@@ -329,13 +329,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>
@@ -713,6 +713,12 @@
<Operation>1</Operation>
</Platform>
</DeployClass>
+ <DeployClass Name="Android_Colors">
+ <Platform Name="Android">
+ <RemoteDir>res\values</RemoteDir>
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
<DeployClass Name="Android_DefaultAppIcon">
<Platform Name="Android">
<RemoteDir>res\drawable</RemoteDir>
@@ -749,6 +755,36 @@
<Operation>1</Operation>
</Platform>
</DeployClass>
+ <DeployClass Name="Android_NotificationIcon24">
+ <Platform Name="Android">
+ <RemoteDir>res\drawable-mdpi</RemoteDir>
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="Android_NotificationIcon36">
+ <Platform Name="Android">
+ <RemoteDir>res\drawable-hdpi</RemoteDir>
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="Android_NotificationIcon48">
+ <Platform Name="Android">
+ <RemoteDir>res\drawable-xhdpi</RemoteDir>
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="Android_NotificationIcon72">
+ <Platform Name="Android">
+ <RemoteDir>res\drawable-xxhdpi</RemoteDir>
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="Android_NotificationIcon96">
+ <Platform Name="Android">
+ <RemoteDir>res\drawable-xxxhdpi</RemoteDir>
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
<DeployClass Name="Android_SplashImage426">
<Platform Name="Android">
<RemoteDir>res\drawable-small</RemoteDir>
@@ -773,6 +809,12 @@
<Operation>1</Operation>
</Platform>
</DeployClass>
+ <DeployClass Name="Android_Strings">
+ <Platform Name="Android">
+ <RemoteDir>res\values</RemoteDir>
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
<DeployClass Name="DebugSymbols">
<Platform Name="iOSSimulator">
<Operation>1</Operation>
@@ -892,6 +934,17 @@
<Operation>1</Operation>
</Platform>
</DeployClass>
+ <DeployClass Name="iPad_Launch1024x768">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
<DeployClass Name="iPad_Launch1536">
<Platform Name="iOSDevice32">
<Operation>1</Operation>
@@ -903,6 +956,39 @@
<Operation>1</Operation>
</Platform>
</DeployClass>
+ <DeployClass Name="iPad_Launch1536x2048">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPad_Launch1668">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPad_Launch1668x2388">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
<DeployClass Name="iPad_Launch2048">
<Platform Name="iOSDevice32">
<Operation>1</Operation>
@@ -914,6 +1000,61 @@
<Operation>1</Operation>
</Platform>
</DeployClass>
+ <DeployClass Name="iPad_Launch2048x1536">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPad_Launch2048x2732">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPad_Launch2224">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPad_Launch2388x1668">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPad_Launch2732x2048">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
<DeployClass Name="iPad_Launch768">
<Platform Name="iOSDevice32">
<Operation>1</Operation>
@@ -925,6 +1066,116 @@
<Operation>1</Operation>
</Platform>
</DeployClass>
+ <DeployClass Name="iPad_Launch768x1024">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPhone_Launch1125">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPhone_Launch1136x640">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPhone_Launch1242">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPhone_Launch1242x2688">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPhone_Launch1334">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPhone_Launch1792">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPhone_Launch2208">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPhone_Launch2436">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPhone_Launch2688x1242">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
<DeployClass Name="iPhone_Launch320">
<Platform Name="iOSDevice32">
<Operation>1</Operation>
@@ -958,6 +1209,28 @@
<Operation>1</Operation>
</Platform>
</DeployClass>
+ <DeployClass Name="iPhone_Launch750">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPhone_Launch828">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
<DeployClass Name="ProjectAndroidManifest">
<Platform Name="Android">
<Operation>1</Operation>
diff --git a/app/rtkvplayer/rtkvplayer.cbproj b/app/rtkvplayer/rtkvplayer.cbproj
index e79c1a95c263f8d8d71ab778f4c44d7f3612f7d0..9276e0ebcb88bd2adbec1f5b354c2875ca3950e4 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.5</ProjectVersion>
+ <ProjectVersion>18.7</ProjectVersion>
<FrameworkType>FMX</FrameworkType>
<MainSource>rtkvplayer.cpp</MainSource>
<Base>True</Base>
@@ -335,14 +335,14 @@
<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>
- <DeployFile LocalName="..\..\src\rtcm2.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>
@@ -386,13 +386,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>
@@ -806,6 +806,12 @@
<Operation>1</Operation>
</Platform>
</DeployClass>
+ <DeployClass Name="Android_Colors">
+ <Platform Name="Android">
+ <RemoteDir>res\values</RemoteDir>
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
<DeployClass Name="Android_DefaultAppIcon">
<Platform Name="Android">
<RemoteDir>res\drawable</RemoteDir>
@@ -842,6 +848,36 @@
<Operation>1</Operation>
</Platform>
</DeployClass>
+ <DeployClass Name="Android_NotificationIcon24">
+ <Platform Name="Android">
+ <RemoteDir>res\drawable-mdpi</RemoteDir>
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="Android_NotificationIcon36">
+ <Platform Name="Android">
+ <RemoteDir>res\drawable-hdpi</RemoteDir>
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="Android_NotificationIcon48">
+ <Platform Name="Android">
+ <RemoteDir>res\drawable-xhdpi</RemoteDir>
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="Android_NotificationIcon72">
+ <Platform Name="Android">
+ <RemoteDir>res\drawable-xxhdpi</RemoteDir>
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="Android_NotificationIcon96">
+ <Platform Name="Android">
+ <RemoteDir>res\drawable-xxxhdpi</RemoteDir>
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
<DeployClass Name="Android_SplashImage426">
<Platform Name="Android">
<RemoteDir>res\drawable-small</RemoteDir>
@@ -866,6 +902,12 @@
<Operation>1</Operation>
</Platform>
</DeployClass>
+ <DeployClass Name="Android_Strings">
+ <Platform Name="Android">
+ <RemoteDir>res\values</RemoteDir>
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
<DeployClass Name="DebugSymbols">
<Platform Name="iOSSimulator">
<Operation>1</Operation>
@@ -985,6 +1027,17 @@
<Operation>1</Operation>
</Platform>
</DeployClass>
+ <DeployClass Name="iPad_Launch1024x768">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
<DeployClass Name="iPad_Launch1536">
<Platform Name="iOSDevice32">
<Operation>1</Operation>
@@ -996,6 +1049,39 @@
<Operation>1</Operation>
</Platform>
</DeployClass>
+ <DeployClass Name="iPad_Launch1536x2048">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPad_Launch1668">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPad_Launch1668x2388">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
<DeployClass Name="iPad_Launch2048">
<Platform Name="iOSDevice32">
<Operation>1</Operation>
@@ -1007,6 +1093,61 @@
<Operation>1</Operation>
</Platform>
</DeployClass>
+ <DeployClass Name="iPad_Launch2048x1536">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPad_Launch2048x2732">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPad_Launch2224">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPad_Launch2388x1668">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPad_Launch2732x2048">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
<DeployClass Name="iPad_Launch768">
<Platform Name="iOSDevice32">
<Operation>1</Operation>
@@ -1018,6 +1159,116 @@
<Operation>1</Operation>
</Platform>
</DeployClass>
+ <DeployClass Name="iPad_Launch768x1024">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPhone_Launch1125">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPhone_Launch1136x640">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPhone_Launch1242">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPhone_Launch1242x2688">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPhone_Launch1334">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPhone_Launch1792">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPhone_Launch2208">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPhone_Launch2436">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPhone_Launch2688x1242">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
<DeployClass Name="iPhone_Launch320">
<Platform Name="iOSDevice32">
<Operation>1</Operation>
@@ -1051,6 +1302,28 @@
<Operation>1</Operation>
</Platform>
</DeployClass>
+ <DeployClass Name="iPhone_Launch750">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPhone_Launch828">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
<DeployClass Name="ProjectAndroidManifest">
<Platform Name="Android">
<Operation>1</Operation>
diff --git a/app/srctblbrows/srctblbrows.cbproj b/app/srctblbrows/srctblbrows.cbproj
index e6d159fd9859da422f409a0fa49ce96e6498a976..3164e104cd2a5af5374859aecf4d50982195fb87 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.5</ProjectVersion>
+ <ProjectVersion>18.7</ProjectVersion>
<Platform Condition="'$(Platform)'==''">Win32</Platform>
<TargetedPlatforms>1</TargetedPlatforms>
<AppType>Application</AppType>
@@ -371,25 +371,25 @@
<Overwrite>true</Overwrite>
</Platform>
</DeployFile>
- <DeployFile LocalName="Release_Build\srctblbrows.exe" Configuration="Release" Class="ProjectOutput">
+ <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'!='true'" LocalName="$(BDS)\bin\cc32260.dll" Class="DependencyModule">
<Platform Name="Win32">
- <RemoteName>srctblbrows.exe</RemoteName>
<Overwrite>true</Overwrite>
</Platform>
</DeployFile>
- <DeployFile LocalName="..\..\src\rcv\ublox.c" Configuration="Release" Class="ProjectFile">
- <Platform Name="Win32">
- <RemoteDir>.\</RemoteDir>
+ <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\cc32260.dll" Class="DependencyModule">
+ <DeployFile LocalName="Release_Build\srctblbrows.exe" Configuration="Release" Class="ProjectOutput">
<Platform Name="Win32">
+ <RemoteName>srctblbrows.exe</RemoteName>
<Overwrite>true</Overwrite>
</Platform>
</DeployFile>
- <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'=='true'" LocalName="$(BDS)\bin64\cc64260mt.dll" Class="DependencyModule">
- <Platform Name="Win64">
+ <DeployFile LocalName="..\..\src\rcv\ublox.c" Configuration="Release" Class="ProjectFile">
+ <Platform Name="Win32">
+ <RemoteDir>.\</RemoteDir>
<Overwrite>true</Overwrite>
</Platform>
</DeployFile>
@@ -452,19 +452,19 @@
<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>
</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>
@@ -654,6 +654,12 @@
<Operation>1</Operation>
</Platform>
</DeployClass>
+ <DeployClass Name="Android_Colors">
+ <Platform Name="Android">
+ <RemoteDir>res\values</RemoteDir>
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
<DeployClass Name="Android_DefaultAppIcon">
<Platform Name="Android">
<RemoteDir>res\drawable</RemoteDir>
@@ -690,6 +696,36 @@
<Operation>1</Operation>
</Platform>
</DeployClass>
+ <DeployClass Name="Android_NotificationIcon24">
+ <Platform Name="Android">
+ <RemoteDir>res\drawable-mdpi</RemoteDir>
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="Android_NotificationIcon36">
+ <Platform Name="Android">
+ <RemoteDir>res\drawable-hdpi</RemoteDir>
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="Android_NotificationIcon48">
+ <Platform Name="Android">
+ <RemoteDir>res\drawable-xhdpi</RemoteDir>
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="Android_NotificationIcon72">
+ <Platform Name="Android">
+ <RemoteDir>res\drawable-xxhdpi</RemoteDir>
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="Android_NotificationIcon96">
+ <Platform Name="Android">
+ <RemoteDir>res\drawable-xxxhdpi</RemoteDir>
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
<DeployClass Name="Android_SplashImage426">
<Platform Name="Android">
<RemoteDir>res\drawable-small</RemoteDir>
@@ -714,6 +750,12 @@
<Operation>1</Operation>
</Platform>
</DeployClass>
+ <DeployClass Name="Android_Strings">
+ <Platform Name="Android">
+ <RemoteDir>res\values</RemoteDir>
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
<DeployClass Name="DebugSymbols">
<Platform Name="iOSSimulator">
<Operation>1</Operation>
@@ -833,6 +875,17 @@
<Operation>1</Operation>
</Platform>
</DeployClass>
+ <DeployClass Name="iPad_Launch1024x768">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
<DeployClass Name="iPad_Launch1536">
<Platform Name="iOSDevice32">
<Operation>1</Operation>
@@ -844,6 +897,39 @@
<Operation>1</Operation>
</Platform>
</DeployClass>
+ <DeployClass Name="iPad_Launch1536x2048">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPad_Launch1668">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPad_Launch1668x2388">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
<DeployClass Name="iPad_Launch2048">
<Platform Name="iOSDevice32">
<Operation>1</Operation>
@@ -855,6 +941,61 @@
<Operation>1</Operation>
</Platform>
</DeployClass>
+ <DeployClass Name="iPad_Launch2048x1536">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPad_Launch2048x2732">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPad_Launch2224">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPad_Launch2388x1668">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPad_Launch2732x2048">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
<DeployClass Name="iPad_Launch768">
<Platform Name="iOSDevice32">
<Operation>1</Operation>
@@ -866,6 +1007,116 @@
<Operation>1</Operation>
</Platform>
</DeployClass>
+ <DeployClass Name="iPad_Launch768x1024">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPhone_Launch1125">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPhone_Launch1136x640">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPhone_Launch1242">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPhone_Launch1242x2688">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPhone_Launch1334">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPhone_Launch1792">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPhone_Launch2208">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPhone_Launch2436">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPhone_Launch2688x1242">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
<DeployClass Name="iPhone_Launch320">
<Platform Name="iOSDevice32">
<Operation>1</Operation>
@@ -899,6 +1150,28 @@
<Operation>1</Operation>
</Platform>
</DeployClass>
+ <DeployClass Name="iPhone_Launch750">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPhone_Launch828">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
<DeployClass Name="ProjectAndroidManifest">
<Platform Name="Android">
<Operation>1</Operation>
diff --git a/app/strsvr/strsvr.cbproj b/app/strsvr/strsvr.cbproj
index 74425b66907bc019a5bb6356dac07fd5432824d2..ed18aa0acc5ef026474ab7bf2be9e5341c33e756 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.5</ProjectVersion>
+ <ProjectVersion>18.7</ProjectVersion>
<Platform Condition="'$(Platform)'==''">Win32</Platform>
<TargetedPlatforms>1</TargetedPlatforms>
<AppType>Application</AppType>
@@ -492,13 +492,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>
@@ -798,6 +798,12 @@
<Operation>1</Operation>
</Platform>
</DeployClass>
+ <DeployClass Name="Android_Colors">
+ <Platform Name="Android">
+ <RemoteDir>res\values</RemoteDir>
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
<DeployClass Name="Android_DefaultAppIcon">
<Platform Name="Android">
<RemoteDir>res\drawable</RemoteDir>
@@ -834,6 +840,36 @@
<Operation>1</Operation>
</Platform>
</DeployClass>
+ <DeployClass Name="Android_NotificationIcon24">
+ <Platform Name="Android">
+ <RemoteDir>res\drawable-mdpi</RemoteDir>
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="Android_NotificationIcon36">
+ <Platform Name="Android">
+ <RemoteDir>res\drawable-hdpi</RemoteDir>
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="Android_NotificationIcon48">
+ <Platform Name="Android">
+ <RemoteDir>res\drawable-xhdpi</RemoteDir>
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="Android_NotificationIcon72">
+ <Platform Name="Android">
+ <RemoteDir>res\drawable-xxhdpi</RemoteDir>
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="Android_NotificationIcon96">
+ <Platform Name="Android">
+ <RemoteDir>res\drawable-xxxhdpi</RemoteDir>
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
<DeployClass Name="Android_SplashImage426">
<Platform Name="Android">
<RemoteDir>res\drawable-small</RemoteDir>
@@ -858,6 +894,12 @@
<Operation>1</Operation>
</Platform>
</DeployClass>
+ <DeployClass Name="Android_Strings">
+ <Platform Name="Android">
+ <RemoteDir>res\values</RemoteDir>
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
<DeployClass Name="DebugSymbols">
<Platform Name="iOSSimulator">
<Operation>1</Operation>
@@ -977,6 +1019,17 @@
<Operation>1</Operation>
</Platform>
</DeployClass>
+ <DeployClass Name="iPad_Launch1024x768">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
<DeployClass Name="iPad_Launch1536">
<Platform Name="iOSDevice32">
<Operation>1</Operation>
@@ -988,6 +1041,39 @@
<Operation>1</Operation>
</Platform>
</DeployClass>
+ <DeployClass Name="iPad_Launch1536x2048">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPad_Launch1668">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPad_Launch1668x2388">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
<DeployClass Name="iPad_Launch2048">
<Platform Name="iOSDevice32">
<Operation>1</Operation>
@@ -999,6 +1085,61 @@
<Operation>1</Operation>
</Platform>
</DeployClass>
+ <DeployClass Name="iPad_Launch2048x1536">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPad_Launch2048x2732">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPad_Launch2224">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPad_Launch2388x1668">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPad_Launch2732x2048">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
<DeployClass Name="iPad_Launch768">
<Platform Name="iOSDevice32">
<Operation>1</Operation>
@@ -1010,6 +1151,116 @@
<Operation>1</Operation>
</Platform>
</DeployClass>
+ <DeployClass Name="iPad_Launch768x1024">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPhone_Launch1125">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPhone_Launch1136x640">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPhone_Launch1242">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPhone_Launch1242x2688">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPhone_Launch1334">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPhone_Launch1792">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPhone_Launch2208">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPhone_Launch2436">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPhone_Launch2688x1242">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
<DeployClass Name="iPhone_Launch320">
<Platform Name="iOSDevice32">
<Operation>1</Operation>
@@ -1043,6 +1294,28 @@
<Operation>1</Operation>
</Platform>
</DeployClass>
+ <DeployClass Name="iPhone_Launch750">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPhone_Launch828">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
<DeployClass Name="ProjectAndroidManifest">
<Platform Name="Android">
<Operation>1</Operation>
diff --git a/src/convrnx.c b/src/convrnx.c
index f744973f856e50d5130e0425a8ec5b07603b1f44..215277217e9c87923ff2c2591892c487547cce95 100644
--- a/src/convrnx.c
+++ b/src/convrnx.c
@@ -432,8 +432,8 @@ static void sort_codes(unsigned char *codes, unsigned char *types, int n)
int i,j;
for (i=0;i<n-1;i++) for (j=i+1;j<n;j++) {
- obs1=code2obs(0,codes[i],NULL);
- obs2=code2obs(0,codes[j],NULL);
+ obs1=code2obs(codes[i],NULL);
+ obs2=code2obs(codes[j],NULL);
if (strcmp(obs1,obs2)<=0) continue;
tmp=codes[i]; codes[i]=codes[j]; codes[j]=tmp;
tmp=types[i]; types[i]=types[j]; types[j]=tmp;
@@ -455,7 +455,7 @@ static void setopt_obstype(const unsigned char *codes,
for (i=0;codes[i];i++) {
- if (!(id=code2obs(sys,codes[i],&freq))) continue;
+ if (!(id=code2obs(codes[i],&freq))) continue;
if (!(opt->freqtype&(1<<(freq-1)))||opt->mask[sys][codes[i]-1]=='0') {
continue;
@@ -662,7 +662,7 @@ static int scan_obstype(int format, char **files, int nf, rnxopt_t *opt,
return 0;
}
for (i=0;i<NSATSYS;i++) for (j=0;j<n[i];j++) {
- trace(2,"scan_obstype: sys=%d code=%s type=%d\n",i,code2obs(0,codes[i][j],NULL),types[i][j]);
+ trace(2,"scan_obstype: sys=%d code=%s type=%d\n",i,code2obs(codes[i][j],NULL),types[i][j]);
}
for (i=0;i<NSATSYS;i++) {
@@ -673,7 +673,7 @@ static int scan_obstype(int format, char **files, int nf, rnxopt_t *opt,
setopt_obstype(codes[i],types[i],i,opt);
for (j=0;j<n[i];j++) {
- trace(3,"scan_obstype: sys=%d code=%s\n",i,code2obs(0,codes[i][j],NULL));
+ trace(3,"scan_obstype: sys=%d code=%s\n",i,code2obs(codes[i][j],NULL));
}
}
return 1;