Bonjour,
Quelques petites modifications sont nécessaires:
le fichier "rr.inc" devient:
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160
| {
rr.inc: Include file, defines conditional compilation symbols
for Borland Delphi / C++Builder RAD tools
Author: Robert Roßmair, Robert.Rossmair@t-online.de
Version: 1.3, 28-Feb-2000
Predefinded compiler version symbols are:
(VERxyz means compiler version xy.z)
VER80 Delphi 1.0
VER90 Delphi 2.0
VER93 C++Builder 1.0
VER100 Delphi 3.0
VER110 C++Builder 3.0
VER120 Delphi 4.0
VER125 C++Builder 4.0
VER130 Delphi 5.0
VER135 C++Builder 5.0
VER140 Delphi 6.0
VER150 Delphi 7.0
VER160 Delphi 7.0
VER170 Delphi 2005
}
{$B-} { Complete Boolean Evaluation }
{$R-} { Range-Checking }
{$V-} { Var-String Checking }
{$T-} { Typed @ operator }
{$X+} { Extended syntax }
{$P+} { Open string params }
{$IFDEF WIN32}
{$J+} { Writeable structured consts }
{$H+} { Use long strings by default }
{$ENDIF}
{$DEFINE VER90_up}
{$DEFINE VER93_up}
{$DEFINE VER100_up}
{$DEFINE VER110_up}
{$DEFINE VER120_up}
{$DEFINE VER125_up}
{$DEFINE VER130_up}
{$DEFINE VER135_up}
{$DEFINE VER140_up}
{$DEFINE VER150_up}
{$DEFINE VER160_up}
{$DEFINE VER170_up}
{$IFNDEF VER170}
{$UNDEF VER170_up}
{$IFNDEF VER160}
{$UNDEF VER160_up}
{$IFNDEF VER150}
{$UNDEF VER150_up}
{$IFNDEF VER140}
{$UNDEF VER140_up}
{$IFNDEF VER135}
{$UNDEF VER135_up}
{$IFNDEF VER130}
{$UNDEF VER130_up}
{$IFNDEF VER125}
{$UNDEF VER125_up}
{$IFNDEF VER120}
{$UNDEF VER120_up}
{$IFNDEF VER110}
{$UNDEF VER110_up}
{$IFNDEF VER100}
{$UNDEF VER100_up}
{$IFNDEF VER93}
{$UNDEF VER93_up}
{$IFNDEF VER90}
{$UNDEF VER90_up}
{$ENDIF}
{$ENDIF}
{$ENDIF}
{$ENDIF}
{$ENDIF}
{$ENDIF}
{$ENDIF}
{$ENDIF}
{$ENDIF}
{$ENDIF}
{$ENDIF}
{$ENDIF}
//******************************************************************************
// Ajouté par Cirec
//******************************************************************************
{$if compilerversion > 17.0}
{$DEFINE VER100_up}
{$DEFINE VER110_up}
{$DEFINE VER120_up}
{$DEFINE VER125_up}
{$DEFINE VER130_up}
{$DEFINE VER135_up}
{$DEFINE VER140_up}
{$DEFINE VER150_up}
{$DEFINE VER160_up}
{$DEFINE VER170_up}
{$ENDIF}
//******************************************************************************
//******************************************************************************
{$IFDEF VER93} { Borland C++Builder 1.0 }
{$DEFINE CBUILDER}
{$ENDIF}
{$IFDEF VER110} { Borland C++Builder 3.0 }
{$DEFINE CBUILDER}
{$ENDIF}
{$IFDEF VER125} { Borland C++Builder 4.0 }
{$DEFINE CBUILDER}
{$ENDIF}
{$IFDEF VER135} { Borland C++Builder 5.0 }
{$DEFINE CBUILDER}
{$ENDIF}
{$IFDEF CBUILDER}
{$IFNDEF VER93}
{$ObjExportAll On}
{$ENDIF}
{$ENDIF}
{$IFDEF VER100_up} { Delphi 3 and above }
{$DEFINE RR_PackageSupport}
{$DEFINE RR_Interfaces}
{$DEFINE RR_Resourcestring}
{$DEFINE RR_EnhancedTBitmap}
{$DEFINE RR_JPEG}
{$IFDEF VER110_up} { C++Builder 3 and above }
{$DEFINE RR_DefaultParams}
{$IFDEF VER120_up} { Delphi 4 and above }
{$DEFINE RR_Overloading}
{$ENDIF}
{$ENDIF}
{$ENDIF}
{$DEFINE RR_PicEditBroken} { PicEdit unit broken (missing LibConst) }
{$IFNDEF VER100 (not Delphi 3) }
{$IFNDEF VER110 (not C++Builder 3) }
{$IFNDEF VER120 (not Delphi 4) }
{$UNDEF RR_PicEditBroken}
{$ENDIF}
{$ENDIF}
{$ENDIF}
{$IFDEF VER100}
{ Graphics.CopyBitmap bug: invalid parameters are passed to
CreateDIBSection when HandleType = bmDIB and the value of the
boolean expression (Width*Height=0) changes.
This will cause an EOutOfResources exception. }
{$DEFINE RR_CopyBitmapBug}
{$ENDIF} |
le fichier SRDefine.inc devient:
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334
| { Include File für Simons Komponenten. Enthält Compiler-Direktiven für die
verschiedenen Delphi-Versionen und Zielplattformen.
Letzte unterstützte Delphiversion: 2006
Include File for Simons components. Provides some compiler directives for
the different Delphi versions and target platforms
Latest supported Delphi version: 2006
p.i.c.s.
http://www.picsoft.de
Simon Reinhardt
reinhardt@picsoft.de }
{ A brief explanation of the defines in this unit
SRDefines : Always defined when this unit is included
SR_Linux : Compilation target is Linux
SR_Windows : Compilation target is Windows
SR_Win16 : Compilation target is 16-bit Windows
SR_Win32 : Compilation target is 32-bit Windows
SR_Delphi : To be compiled with Delphi
SR_Delphi32 : To be compiled with 32-Bit-Delphi
SR_Delphi1 : To be compiled with Delphi 1.0
SR_Delphi2 : To be compiled with Delphi 2.0
SR_Delphi3 : To be compiled with Delphi 3.0
SR_Delphi4 : To be compiled with Delphi 4.0
SR_Delphi5 : To be compiled with Delphi 5.0
SR_Delphi6 : To be compiled with Delphi 6.0
SR_Delphi7 : To be compiled with Delphi 7.0
SR_Delphi8 : To be compiled with Delphi 8.0
SR_Delphi9 : To be compiled with Delphi 2005
SR_Delphi10 : To be compiled with Delphi 2006
SR_Delphi11 : To be compiled with Delphi 2007
SR_Delphi12 : To be compiled with Delphi 2009
SR_Delphi2_Up : To be compiled with Delphi 2.0 or higher
SR_Delphi3_Up : To be compiled with Delphi 3.0 or higher
SR_Delphi4_Up : To be compiled with Delphi 4.0 or higher
SR_Delphi5_Up : To be compiled with Delphi 5.0 or higher
SR_Delphi6_Up : To be compiled with Delphi 6.0 or higher
SR_Delphi7_Up : To be compiled with Delphi 7.0 or higher
SR_Delphi8_Up : To be compiled with Delphi 8.0 or higher
SR_Delphi9_Up : To be compiled with Delphi 2005 or higher
SR_Delphi10_Up : To be compiled with Delphi 2006 or higher
SR_Delphi11_Up : To be compiled with Delphi 2007 or higher
SR_Delphi12_Up : To be compiled with Delphi 2009 or higher
SR_CBuilder : To be compiled with C++Builder
SR_CBuilder1 : To be compiled with C++Builder 1.0
SR_CBuilder2 : To be compiled with C++Builder 2.0
SR_CBuilder3 : To be compiled with C++Builder 3.0
SR_CBuilder4 : To be compiled with C++Builder 4.0
SR_CBuilder2_Up : To be compiled with C++Builder 2.0 or higher
SR_CBuilder3_Up : To be compiled with C++Builder 3.0 or higher
SR_CBuilder4_Up : To be compiled with C++Builder 4.0 or higher
SR_Kylix : To be compiled with Kylix }
{$B-}
{$DEFINE SRDefines}
{$IFDEF WINDOWS}
{$DEFINE SR_Win16}
{$DEFINE SR_Windows}
{$ENDIF}
{$IFDEF WIN32}
{$DEFINE SR_Win32}
{$DEFINE SR_Windows}
{$ENDIF}
{$IFDEF LINUX}
{$DEFINE SR_Linux}
{$ENDIF}
//******************************************************************************
// Ajouté par Cirec
//******************************************************************************
{$if compilerversion > 20.0}
{$IFDEF SR_Linux}
{$DEFINE SR_Kylix}
{$ENDIF}
{$IFDEF SR_Windows}
{$DEFINE SR_Delphi12}
{$ENDIF}
{$ENDIF}
//******************************************************************************
//******************************************************************************
{$IFDEF VER200}
{$IFDEF SR_Linux}
{$DEFINE SR_Kylix}
{$ENDIF}
{$IFDEF SR_Windows}
{$DEFINE SR_Delphi12}
{$ENDIF}
{$ENDIF}
{$IFDEF VER185}
{$IFDEF SR_Linux}
{$DEFINE SR_Kylix}
{$ENDIF}
{$IFDEF SR_Windows}
{$DEFINE SR_Delphi11}
{$ENDIF}
{$ENDIF}
{$IFDEF VER180}
{$IFDEF SR_Linux}
{$DEFINE SR_Kylix}
{$ENDIF}
{$IFDEF SR_Windows}
{$DEFINE SR_Delphi10}
{$ENDIF}
{$ENDIF}
{$IFDEF VER170}
{$IFDEF SR_Linux}
{$DEFINE SR_Kylix}
{$ENDIF}
{$IFDEF SR_Windows}
{$DEFINE SR_Delphi9}
{$ENDIF}
{$ENDIF}
{$IFDEF VER160}
{$IFDEF SR_Linux}
{$DEFINE SR_Kylix}
{$ENDIF}
{$IFDEF SR_Windows}
{$DEFINE SR_Delphi8}
{$ENDIF}
{$ENDIF}
{$IFDEF VER150}
{$IFDEF SR_Linux}
{$DEFINE SR_Kylix}
{$ENDIF}
{$IFDEF SR_Windows}
{$DEFINE SR_Delphi7}
{$ENDIF}
{$ENDIF}
{$IFDEF VER140}
{$IFDEF SR_Linux}
{$DEFINE SR_Kylix}
{$ENDIF}
{$IFDEF SR_Windows}
{$DEFINE SR_Delphi6}
{$ENDIF}
{$ENDIF}
{$IFDEF VER135}
{$DEFINE SR_CBuilder5}
{$ENDIF}
{$IFDEF VER130}
{$DEFINE SR_Delphi5}
{$ENDIF}
{$IFDEF VER125}
{$DEFINE SR_CBuilder4}
{$ENDIF}
{$IFDEF VER120}
{$DEFINE SR_Delphi4}
{$ENDIF}
{$IFDEF VER110}
{$DEFINE SR_CBuilder3}
{$ENDIF}
{$IFDEF VER100}
{$DEFINE SR_Delphi3}
{$ENDIF}
{$IFDEF VER90}
{$DEFINE SR_Delphi2}
{$ENDIF}
{$IFDEF VER93}
{$DEFINE SR_CBuilder1}
{$ENDIF}
{$IFDEF VER80}
{$DEFINE SR_Delphi1}
{$ENDIF}
{$IFDEF SR_Delphi1}
{$DEFINE SR_Delphi}
{$ENDIF}
{$IFDEF SR_Delphi2}
{$DEFINE SR_Delphi}
{$DEFINE SR_Delphi32}
{$DEFINE SR_Delphi2_Up}
{$ENDIF}
{$IFDEF SR_Delphi3}
{$DEFINE SR_Delphi}
{$DEFINE SR_Delphi32}
{$DEFINE SR_Delphi2_Up}
{$DEFINE SR_Delphi3_Up}
{$ENDIF}
{$IFDEF SR_Delphi4}
{$DEFINE SR_Delphi}
{$DEFINE SR_Delphi32}
{$DEFINE SR_Delphi2_Up}
{$DEFINE SR_Delphi3_Up}
{$DEFINE SR_Delphi4_Up}
{$ENDIF}
{$IFDEF SR_Delphi5}
{$DEFINE SR_Delphi}
{$DEFINE SR_Delphi32}
{$DEFINE SR_Delphi2_Up}
{$DEFINE SR_Delphi3_Up}
{$DEFINE SR_Delphi4_Up}
{$DEFINE SR_Delphi5_Up}
{$ENDIF}
{$IFDEF SR_Delphi6}
{$DEFINE SR_Delphi}
{$DEFINE SR_Delphi32}
{$DEFINE SR_Delphi2_Up}
{$DEFINE SR_Delphi3_Up}
{$DEFINE SR_Delphi4_Up}
{$DEFINE SR_Delphi5_Up}
{$DEFINE SR_Delphi6_Up}
{$ENDIF}
{$IFDEF SR_Delphi7}
{$DEFINE SR_Delphi}
{$DEFINE SR_Delphi32}
{$DEFINE SR_Delphi2_Up}
{$DEFINE SR_Delphi3_Up}
{$DEFINE SR_Delphi4_Up}
{$DEFINE SR_Delphi5_Up}
{$DEFINE SR_Delphi6_Up}
{$DEFINE SR_Delphi7_Up}
{$ENDIF}
{$IFDEF SR_Delphi8}
{$DEFINE SR_Delphi}
{$DEFINE SR_Delphi32}
{$DEFINE SR_Delphi2_Up}
{$DEFINE SR_Delphi3_Up}
{$DEFINE SR_Delphi4_Up}
{$DEFINE SR_Delphi5_Up}
{$DEFINE SR_Delphi6_Up}
{$DEFINE SR_Delphi7_Up}
{$DEFINE SR_Delphi8_Up}
{$ENDIF}
{$IFDEF SR_Delphi9}
{$DEFINE SR_Delphi}
{$DEFINE SR_Delphi32}
{$DEFINE SR_Delphi2_Up}
{$DEFINE SR_Delphi3_Up}
{$DEFINE SR_Delphi4_Up}
{$DEFINE SR_Delphi5_Up}
{$DEFINE SR_Delphi6_Up}
{$DEFINE SR_Delphi7_Up}
{$DEFINE SR_Delphi8_Up}
{$DEFINE SR_Delphi9_Up}
{$ENDIF}
{$IFDEF SR_Delphi10}
{$DEFINE SR_Delphi}
{$DEFINE SR_Delphi32}
{$DEFINE SR_Delphi2_Up}
{$DEFINE SR_Delphi3_Up}
{$DEFINE SR_Delphi4_Up}
{$DEFINE SR_Delphi5_Up}
{$DEFINE SR_Delphi6_Up}
{$DEFINE SR_Delphi7_Up}
{$DEFINE SR_Delphi8_Up}
{$DEFINE SR_Delphi9_Up}
{$DEFINE SR_Delphi10_Up}
{$ENDIF}
{$IFDEF SR_Delphi11}
{$DEFINE SR_Delphi}
{$DEFINE SR_Delphi32}
{$DEFINE SR_Delphi2_Up}
{$DEFINE SR_Delphi3_Up}
{$DEFINE SR_Delphi4_Up}
{$DEFINE SR_Delphi5_Up}
{$DEFINE SR_Delphi6_Up}
{$DEFINE SR_Delphi7_Up}
{$DEFINE SR_Delphi8_Up}
{$DEFINE SR_Delphi9_Up}
{$DEFINE SR_Delphi10_Up}
{$DEFINE SR_Delphi11_Up}
{$ENDIF}
{$IFDEF SR_Delphi12}
{$DEFINE SR_Delphi}
{$DEFINE SR_Delphi32}
{$DEFINE SR_Delphi2_Up}
{$DEFINE SR_Delphi3_Up}
{$DEFINE SR_Delphi4_Up}
{$DEFINE SR_Delphi5_Up}
{$DEFINE SR_Delphi6_Up}
{$DEFINE SR_Delphi7_Up}
{$DEFINE SR_Delphi8_Up}
{$DEFINE SR_Delphi9_Up}
{$DEFINE SR_Delphi10_Up}
{$DEFINE SR_Delphi12_Up}
{$ENDIF}
{$IFDEF SR_CBuilder1}
{$DEFINE SR_CBuilder}
{$ENDIF}
{$IFDEF SR_CBuilder2}
{$DEFINE SR_CBuilder}
{$DEFINE SR_CBuilder2_Up}
{$ENDIF}
{$IFDEF SR_CBuilder3}
{$DEFINE SR_CBuilder}
{$DEFINE SR_CBuilder2_Up}
{$DEFINE SR_CBuilder3_Up}
{$ENDIF}
{$IFDEF SR_CBuilder4}
{$DEFINE SR_CBuilder}
{$DEFINE SR_CBuilder2_Up}
{$DEFINE SR_CBuilder3_Up}
{$DEFINE SR_CBuilder4_Up}
{$ENDIF} |
et pour finir dans "RackCtls.pas"
la ligne 488 devient:
uses rrColors, Types {$IFNDEF SR_Delphi5_Up}, SRUtils{$ENDIF};
et la ligne 1856 devient:
SepPosition:=Pos({$IF CompilerVersion > 21.0} FormatSettings.{$IFEND}DecimalSeparator,outText);
j'ai fait au plus simple ... le code compile sans messages d'erreur et sans conseils et avertissements
J'ai donc pas installé les composants et j'ai juste testé sur un "TLEDMeter" avec succès sous Tokyo 10.2
mais le code devrait fonctionner comme avant sur toutes les autres versions
à toi de tester et de donner ton avis
Cordialement,
@+
Partager