- Update version to b33b

- Add a couple more Embarcadero project file updates
dayjaby · Nov 9, 2019 · c9308b0 · c9308b0
1 parent b0b6b2e
commit c9308b0
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 61 deletions.
diff --git a/app/rtklib_winapp.groupproj b/app/rtklib_winapp.groupproj
@@ -21,12 +21,6 @@
         <Projects Include="strsvr\strsvr.cbproj">
             <Dependencies/>
         </Projects>
-        <Projects Include="rtkpost_mkl\rtkpost_mkl.cbproj">
-            <Dependencies/>
-        </Projects>
-        <Projects Include="rtknavi_mkl\rtknavi_mkl.cbproj">
-            <Dependencies/>
-        </Projects>
         <Projects Include="rtkget\rtkget.cbproj">
             <Dependencies/>
         </Projects>
@@ -39,12 +33,6 @@
         <Projects Include="rtkpost_win64\rtkpost_win64.cbproj">
             <Dependencies/>
         </Projects>
-        <Projects Include="rtkvideo\rtkvideo.cbproj">
-            <Dependencies/>
-        </Projects>
-        <Projects Include="rtkvplayer\rtkvplayer.cbproj">
-            <Dependencies/>
-        </Projects>
     </ItemGroup>
     <ProjectExtensions>
         <Borland.Personality>Default.Personality.12</Borland.Personality>
@@ -107,24 +95,6 @@
     <Target Name="strsvr:Make">
         <MSBuild Projects="strsvr\strsvr.cbproj" Targets="Make"/>
     </Target>
-    <Target Name="rtkpost_mkl">
-        <MSBuild Projects="rtkpost_mkl\rtkpost_mkl.cbproj"/>
-    </Target>
-    <Target Name="rtkpost_mkl:Clean">
-        <MSBuild Projects="rtkpost_mkl\rtkpost_mkl.cbproj" Targets="Clean"/>
-    </Target>
-    <Target Name="rtkpost_mkl:Make">
-        <MSBuild Projects="rtkpost_mkl\rtkpost_mkl.cbproj" Targets="Make"/>
-    </Target>
-    <Target Name="rtknavi_mkl">
-        <MSBuild Projects="rtknavi_mkl\rtknavi_mkl.cbproj"/>
-    </Target>
-    <Target Name="rtknavi_mkl:Clean">
-        <MSBuild Projects="rtknavi_mkl\rtknavi_mkl.cbproj" Targets="Clean"/>
-    </Target>
-    <Target Name="rtknavi_mkl:Make">
-        <MSBuild Projects="rtknavi_mkl\rtknavi_mkl.cbproj" Targets="Make"/>
-    </Target>
     <Target Name="rtkget">
         <MSBuild Projects="rtkget\rtkget.cbproj"/>
     </Target>
@@ -161,32 +131,14 @@
     <Target Name="rtkpost_win64:Make">
         <MSBuild Projects="rtkpost_win64\rtkpost_win64.cbproj" Targets="Make"/>
     </Target>
-    <Target Name="rtkvideo">
-        <MSBuild Projects="rtkvideo\rtkvideo.cbproj"/>
-    </Target>
-    <Target Name="rtkvideo:Clean">
-        <MSBuild Projects="rtkvideo\rtkvideo.cbproj" Targets="Clean"/>
-    </Target>
-    <Target Name="rtkvideo:Make">
-        <MSBuild Projects="rtkvideo\rtkvideo.cbproj" Targets="Make"/>
-    </Target>
-    <Target Name="rtkvplayer">
-        <MSBuild Projects="rtkvplayer\rtkvplayer.cbproj"/>
-    </Target>
-    <Target Name="rtkvplayer:Clean">
-        <MSBuild Projects="rtkvplayer\rtkvplayer.cbproj" Targets="Clean"/>
-    </Target>
-    <Target Name="rtkvplayer:Make">
-        <MSBuild Projects="rtkvplayer\rtkvplayer.cbproj" Targets="Make"/>
-    </Target>
     <Target Name="Build">
-        <CallTarget Targets="rtkconv;rtknavi;rtkplot;rtkpost;srctblbrows;strsvr;rtkpost_mkl;rtknavi_mkl;rtkget;rtklaunch;rtknavi_win64;rtkpost_win64;rtkvideo;rtkvplayer"/>
+        <CallTarget Targets="rtkconv;rtknavi;rtkplot;rtkpost;srctblbrows;strsvr;rtkget;rtklaunch;rtknavi_win64;rtkpost_win64"/>
     </Target>
     <Target Name="Clean">
-        <CallTarget Targets="rtkconv:Clean;rtknavi:Clean;rtkplot:Clean;rtkpost:Clean;srctblbrows:Clean;strsvr:Clean;rtkpost_mkl:Clean;rtknavi_mkl:Clean;rtkget:Clean;rtklaunch:Clean;rtknavi_win64:Clean;rtkpost_win64:Clean;rtkvideo:Clean;rtkvplayer:Clean"/>
+        <CallTarget Targets="rtkconv:Clean;rtknavi:Clean;rtkplot:Clean;rtkpost:Clean;srctblbrows:Clean;strsvr:Clean;rtkget:Clean;rtklaunch:Clean;rtknavi_win64:Clean;rtkpost_win64:Clean"/>
     </Target>
     <Target Name="Make">
-        <CallTarget Targets="rtkconv:Make;rtknavi:Make;rtkplot:Make;rtkpost:Make;srctblbrows:Make;strsvr:Make;rtkpost_mkl:Make;rtknavi_mkl:Make;rtkget:Make;rtklaunch:Make;rtknavi_win64:Make;rtkpost_win64:Make;rtkvideo:Make;rtkvplayer:Make"/>
+        <CallTarget Targets="rtkconv:Make;rtknavi:Make;rtkplot:Make;rtkpost:Make;srctblbrows:Make;strsvr:Make;rtkget:Make;rtklaunch:Make;rtknavi_win64:Make;rtkpost_win64:Make"/>
     </Target>
     <Import Project="$(BDS)\Bin\CodeGear.Group.Targets" Condition="Exists('$(BDS)\Bin\CodeGear.Group.Targets')"/>
 </Project>
diff --git a/app/rtkpost_win64/rtkpost_win64.cbproj b/app/rtkpost_win64/rtkpost_win64.cbproj
@@ -59,7 +59,7 @@
         <Base>true</Base>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Base)'!=''">
-        <BCC_Defines>TRACE;ENAGLO;ENAGAL;ENAQZS;ENACMP;ENAIRN;NFREQ=4;NEXOBS=3;$(BCC_Defines)</BCC_Defines>
+        <BCC_Defines>WIN32;TRACE;ENAGLO;ENAGAL;ENAQZS;ENACMP;ENAIRN;NFREQ=4;NEXOBS=3;$(BCC_Defines)</BCC_Defines>
         <ILINK_LinkwithRegEx>false</ILINK_LinkwithRegEx>
         <ILINK_LinkwithMidas>false</ILINK_LinkwithMidas>
         <ILINK_LinkwithZLib>false</ILINK_LinkwithZLib>
@@ -107,7 +107,6 @@
         <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
         <UWP_CppLogo44>$(BDS)\bin\Artwork\Windows\UWP\cppreg_UwpDefault_44.png</UWP_CppLogo44>
         <UWP_CppLogo150>$(BDS)\bin\Artwork\Windows\UWP\cppreg_UwpDefault_150.png</UWP_CppLogo150>
-        <BCC_Defines>WIN32;$(BCC_Defines)</BCC_Defines>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Base_Win64)'!=''">
         <Manifest_File>$(BDS)\bin\default_app.manifest</Manifest_File>
@@ -118,7 +117,6 @@
         <BRCC_Defines>_RTLDLL;WIN32;TRACE;MKL;ENAGLO;ENAQZS;ENAGAL;ENACMP;NFREQ=4;NEXOBS=3;$(BRCC_Defines)</BRCC_Defines>
         <UWP_CppLogo44>$(BDS)\bin\Artwork\Windows\UWP\cppreg_UwpDefault_44.png</UWP_CppLogo44>
         <UWP_CppLogo150>$(BDS)\bin\Artwork\Windows\UWP\cppreg_UwpDefault_150.png</UWP_CppLogo150>
-        <BCC_Defines>WIN64;$(BCC_Defines)</BCC_Defines>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_1)'!=''">
         <ILINK_FullDebugInfo>true</ILINK_FullDebugInfo>
@@ -481,14 +479,15 @@
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
-                <DeployFile LocalName="..\..\src\pntpos.c" Configuration="Release" Class="ProjectFile">
+                <DeployFile LocalName="..\..\src\ionex.c" Configuration="Release" Class="ProjectFile">
                     <Platform Name="Win64">
                         <RemoteDir>.\</RemoteDir>
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
-                <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'=='true'" LocalName="$(BDS)\bin\cc32240mt.dll" Class="DependencyModule">
-                    <Platform Name="Win32">
+                <DeployFile LocalName="..\..\src\pntpos.c" Configuration="Release" Class="ProjectFile">
+                    <Platform Name="Win64">
+                        <RemoteDir>.\</RemoteDir>
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
@@ -503,9 +502,8 @@
                         <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>

diff --git a/src/rtklib.h b/src/rtklib.h
@@ -58,7 +58,7 @@ extern "C" {
 
 #define VER_RTKLIB  "demo5"             /* library version */
 
-#define PATCH_LEVEL "b33a"               /* patch level */
+#define PATCH_LEVEL "b33b"               /* patch level */
 
 #define COPYRIGHT_RTKLIB \
             "Copyright (C) 2007-2019 T.Takasu\nAll rights reserved."