Fixed libsuffix D11.1 packages

andrea-magni · Mar 23, 2022 · 90a7e94 · 90a7e94
1 parent 8fa531c
commit 90a7e94
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 13 deletions.
diff --git a/lib/cpp/FrameStandPackage_11_1.hpp b/lib/cpp/FrameStandPackage_11_1.hpp
@@ -109,7 +109,7 @@
 #include <FMX.Clipboard.Win.hpp>	// (fmx)
 #include <FMX.Platform.hpp>	// (fmx)
 #include <FMX.Controls.hpp>	// (fmx)
-// SO_SFX: _290
+// SO_SFX: 280
 // PRG_EXT: .bpl
 // BPI_DIR: ..\lib\cpp
 // OBJ_DIR: ..\lib\cpp

diff --git a/packages/FrameStandPackage_11_1.dpk b/packages/FrameStandPackage_11_1.dpk
@@ -9,24 +9,24 @@ package FrameStandPackage_11_1;
 {$EXTENDEDSYNTAX ON}
 {$IMPORTEDDATA ON}
 {$IOCHECKS ON}
-{$LOCALSYMBOLS ON}
+{$LOCALSYMBOLS OFF}
 {$LONGSTRINGS ON}
 {$OPENSTRINGS ON}
-{$OPTIMIZATION OFF}
+{$OPTIMIZATION ON}
 {$OVERFLOWCHECKS OFF}
 {$RANGECHECKS OFF}
-{$REFERENCEINFO ON}
+{$REFERENCEINFO OFF}
 {$SAFEDIVIDE OFF}
-{$STACKFRAMES ON}
+{$STACKFRAMES OFF}
 {$TYPEDADDRESS OFF}
 {$VARSTRINGCHECKS ON}
 {$WRITEABLECONST OFF}
 {$MINENUMSIZE 1}
 {$IMAGEBASE $400000}
-{$DEFINE DEBUG}
+{$DEFINE RELEASE}
 {$ENDIF IMPLICITBUILDING}
 {$DESCRIPTION 'TFrameStand and TFormStand Runtime Package'}
-{$LIBSUFFIX '_290'}
+{$LIBSUFFIX AUTO}
 {$RUNONLY}
 {$IMPLICITBUILD ON}
 

diff --git a/packages/FrameStandPackage_11_1.dproj b/packages/FrameStandPackage_11_1.dproj
@@ -71,7 +71,7 @@
         <Base>true</Base>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Base)'!=''">
-        <DllSuffix>_290</DllSuffix>
+        <DllSuffix>$(Auto)</DllSuffix>
         <DCC_ObjOutput>..\lib\cpp</DCC_ObjOutput>
         <DCC_BpiOutput>..\lib\cpp</DCC_BpiOutput>
         <DCC_HppOutputARM>true</DCC_HppOutputARM>
@@ -178,7 +178,6 @@
     <PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
         <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
         <VerInfo_Locale>1033</VerInfo_Locale>
-        <DllSuffix>_290</DllSuffix>
     </PropertyGroup>
     <ItemGroup>
         <DelphiCompile Include="$(MainSource)">
@@ -227,12 +226,12 @@
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
-                <DeployFile LocalName="$(BDS)\Redist\iossimulator\libpcre.dylib" Class="DependencyModule">
+                <DeployFile LocalName="$(BDS)\Redist\iossimulator\libPCRE.dylib" Class="DependencyModule">
                     <Platform Name="iOSSimulator">
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
-                <DeployFile LocalName="$(BDS)\Redist\iossimulator\libPCRE.dylib" Class="DependencyModule">
+                <DeployFile LocalName="$(BDS)\Redist\iossimulator\libpcre.dylib" Class="DependencyModule">
                     <Platform Name="iOSSimulator">
                         <Overwrite>true</Overwrite>
                     </Platform>

diff --git a/packages/dclFrameStandPackage_11_1.dpk b/packages/dclFrameStandPackage_11_1.dpk
@@ -27,7 +27,7 @@ package dclFrameStandPackage_11_1;
 {$DEFINE RELEASE}
 {$ENDIF IMPLICITBUILDING}
 {$DESCRIPTION 'TFrameStand and TFormStand Designtime Package'}
-{$LIBSUFFIX '_290'}
+{$LIBSUFFIX AUTO}
 {$DESIGNONLY}
 {$IMPLICITBUILD ON}
 

diff --git a/packages/dclFrameStandPackage_11_1.dproj b/packages/dclFrameStandPackage_11_1.dproj
@@ -92,7 +92,7 @@
         <VerInfo_Locale>1040</VerInfo_Locale>
         <VerInfo_Keys>CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
         <DCC_Description>TFrameStand and TFormStand Designtime Package</DCC_Description>
-        <DllSuffix>_290</DllSuffix>
+        <DllSuffix>$(Auto)</DllSuffix>
         <DCC_AdditionalSwitches>-LUDesignIDE</DCC_AdditionalSwitches>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Base_Android)'!=''">