- Fixed compilation with recent Lazarus versions
This commit is contained in:
		
							parent
							
								
									6edee941ee
								
							
						
					
					
						commit
						0d84ac4b5d
					
				| @ -11,21 +11,16 @@ | ||||
|       <MainUnit Value="0"/> | ||||
|       <TargetFileExt Value=".exe"/> | ||||
|       <Title Value="CentrED"/> | ||||
|       <ResourceType Value="res"/> | ||||
|       <Icon Value="0"/> | ||||
|     </General> | ||||
|     <LazDoc Paths="../doc"/> | ||||
|     <VersionInfo> | ||||
|       <UseVersionInfo Value="True"/> | ||||
|       <CurrentMajorRevNr Value="6"/> | ||||
|       <CurrentMinorRevNr Value="1"/> | ||||
|       <CurrentBuildNr Value="209"/> | ||||
|       <ProjectVersion Value="0.6.1.209"/> | ||||
|       <CompanyName Value="AKS DataBasis"/> | ||||
|       <FileDescription Value="UO CentrED"/> | ||||
|       <InternalName Value="CentrED"/> | ||||
|       <LegalCopyright Value="Andreas Schneider"/> | ||||
|       <OriginalFilename Value="CentrED.exe"/> | ||||
|       <ProductName Value="CentrED"/> | ||||
|       <MinorVersionNr Value="6"/> | ||||
|       <RevisionNr Value="1"/> | ||||
|       <BuildNr Value="209"/> | ||||
|       <StringTable Comments="" CompanyName="AKS DataBasis" FileDescription="UO CentrED" FileVersion="0.6.1.209" InternalName="CentrED" LegalCopyright="Andreas Schneider" LegalTrademarks="" OriginalFilename="CentrED.exe" ProductName="CentrED" ProductVersion="0.6.1.209"/> | ||||
|     </VersionInfo> | ||||
|     <PublishOptions> | ||||
|       <Version Value="2"/> | ||||
| @ -369,6 +364,7 @@ | ||||
|     <Other> | ||||
|       <CompilerMessages> | ||||
|         <IgnoredMessages idx4079="True" idx4080="True" idx4081="True" idx5024="True" idx5028="True"/> | ||||
|         <UseMsgFile Value="True"/> | ||||
|       </CompilerMessages> | ||||
|       <CustomOptions Value="-FE../bin/ | ||||
| -dNoLogging"/> | ||||
|  | ||||
| @ -1,52 +1,51 @@ | ||||
| (* | ||||
|  * CDDL HEADER START | ||||
|  * | ||||
|  * The contents of this file are subject to the terms of the | ||||
|  * Common Development and Distribution License, Version 1.0 only | ||||
|  * (the "License").  You may not use this file except in compliance | ||||
|  * with the License. | ||||
|  * | ||||
|  * You can obtain a copy of the license at | ||||
|  * http://www.opensource.org/licenses/cddl1.php. | ||||
|  * See the License for the specific language governing permissions | ||||
|  * and limitations under the License. | ||||
|  * | ||||
|  * When distributing Covered Code, include this CDDL HEADER in each | ||||
|  * file and include the License file at | ||||
|  * http://www.opensource.org/licenses/cddl1.php.  If applicable, | ||||
|  * add the following below this CDDL HEADER, with the fields enclosed | ||||
|  * by brackets "[]" replaced with your own identifying * information: | ||||
|  *      Portions Copyright [yyyy] [name of copyright owner] | ||||
|  * | ||||
|  * CDDL HEADER END | ||||
|  * | ||||
|  * | ||||
|  *      Portions Copyright 2009 Andreas Schneider | ||||
|  *) | ||||
| program CentrED; | ||||
| 
 | ||||
| {$mode objfpc}{$H+} | ||||
| 
 | ||||
| uses | ||||
|   {$IFDEF UNIX}{$IFDEF UseCThreads} | ||||
|   cthreads, | ||||
|   {$ENDIF}{$ENDIF} | ||||
|   SysUtils, | ||||
|   Interfaces, // this includes the LCL widgetset | ||||
|   Forms, LResources, UdmNetwork; | ||||
| 
 | ||||
| {$IFDEF WINDOWS}{$R CentrED.rc}{$ENDIF} | ||||
| 
 | ||||
| function GetApplicationName: String; | ||||
| begin | ||||
|   Result := 'CentrED'; | ||||
| end; | ||||
| 
 | ||||
| begin | ||||
|   {$I CentrED.lrs} | ||||
|   OnGetApplicationName := @GetApplicationName; | ||||
|   Application.Initialize; | ||||
|   Application.CreateForm(TdmNetwork, dmNetwork); | ||||
|   Application.Run; | ||||
| end. | ||||
| 
 | ||||
| (* | ||||
|  * CDDL HEADER START | ||||
|  * | ||||
|  * The contents of this file are subject to the terms of the | ||||
|  * Common Development and Distribution License, Version 1.0 only | ||||
|  * (the "License").  You may not use this file except in compliance | ||||
|  * with the License. | ||||
|  * | ||||
|  * You can obtain a copy of the license at | ||||
|  * http://www.opensource.org/licenses/cddl1.php. | ||||
|  * See the License for the specific language governing permissions | ||||
|  * and limitations under the License. | ||||
|  * | ||||
|  * When distributing Covered Code, include this CDDL HEADER in each | ||||
|  * file and include the License file at | ||||
|  * http://www.opensource.org/licenses/cddl1.php.  If applicable, | ||||
|  * add the following below this CDDL HEADER, with the fields enclosed | ||||
|  * by brackets "[]" replaced with your own identifying * information: | ||||
|  *      Portions Copyright [yyyy] [name of copyright owner] | ||||
|  * | ||||
|  * CDDL HEADER END | ||||
|  * | ||||
|  * | ||||
|  *      Portions Copyright 2010 Andreas Schneider | ||||
|  *) | ||||
| program CentrED; | ||||
| 
 | ||||
| {$mode objfpc}{$H+} | ||||
| 
 | ||||
| uses | ||||
|   {$IFDEF UNIX}{$IFDEF UseCThreads} | ||||
|   cthreads, | ||||
|   {$ENDIF}{$ENDIF} | ||||
|   SysUtils, | ||||
|   Interfaces, // this includes the LCL widgetset | ||||
|   Forms, UdmNetwork; | ||||
| 
 | ||||
| {$R CentrED.res} | ||||
| 
 | ||||
| function GetApplicationName: String; | ||||
| begin | ||||
|   Result := 'CentrED'; | ||||
| end; | ||||
| 
 | ||||
| begin | ||||
|   OnGetApplicationName := @GetApplicationName; | ||||
|   Application.Initialize; | ||||
|   Application.CreateForm(TdmNetwork, dmNetwork); | ||||
|   Application.Run; | ||||
| end. | ||||
| 
 | ||||
|  | ||||
| @ -1,41 +1,42 @@ | ||||
| (* | ||||
|  * CDDL HEADER START | ||||
|  * | ||||
|  * The contents of this file are subject to the terms of the | ||||
|  * Common Development and Distribution License, Version 1.0 only | ||||
|  * (the "License").  You may not use this file except in compliance | ||||
|  * with the License. | ||||
|  * | ||||
|  * You can obtain a copy of the license at | ||||
|  * http://www.opensource.org/licenses/cddl1.php. | ||||
|  * See the License for the specific language governing permissions | ||||
|  * and limitations under the License. | ||||
|  * | ||||
|  * When distributing Covered Code, include this CDDL HEADER in each | ||||
|  * file and include the License file at | ||||
|  * http://www.opensource.org/licenses/cddl1.php.  If applicable, | ||||
|  * add the following below this CDDL HEADER, with the fields enclosed | ||||
|  * by brackets "[]" replaced with your own identifying * information: | ||||
|  *      Portions Copyright [yyyy] [name of copyright owner] | ||||
|  * | ||||
|  * CDDL HEADER END | ||||
|  * | ||||
|  * | ||||
|  *      Portions Copyright 2007 Andreas Schneider | ||||
|  *) | ||||
| unit UPlatformTypes; | ||||
| 
 | ||||
| {$mode objfpc}{$H+} | ||||
| 
 | ||||
| interface | ||||
| 
 | ||||
| uses | ||||
|   Classes, SysUtils, ActiveX; | ||||
|    | ||||
| type | ||||
|   IDataObject = ActiveX.IDataObject; | ||||
| 
 | ||||
| implementation | ||||
| 
 | ||||
| end. | ||||
| 
 | ||||
| (* | ||||
|  * CDDL HEADER START | ||||
|  * | ||||
|  * The contents of this file are subject to the terms of the | ||||
|  * Common Development and Distribution License, Version 1.0 only | ||||
|  * (the "License").  You may not use this file except in compliance | ||||
|  * with the License. | ||||
|  * | ||||
|  * You can obtain a copy of the license at | ||||
|  * http://www.opensource.org/licenses/cddl1.php. | ||||
|  * See the License for the specific language governing permissions | ||||
|  * and limitations under the License. | ||||
|  * | ||||
|  * When distributing Covered Code, include this CDDL HEADER in each | ||||
|  * file and include the License file at | ||||
|  * http://www.opensource.org/licenses/cddl1.php.  If applicable, | ||||
|  * add the following below this CDDL HEADER, with the fields enclosed | ||||
|  * by brackets "[]" replaced with your own identifying * information: | ||||
|  *      Portions Copyright [yyyy] [name of copyright owner] | ||||
|  * | ||||
|  * CDDL HEADER END | ||||
|  * | ||||
|  * | ||||
|  *      Portions Copyright 2007 Andreas Schneider | ||||
|  *) | ||||
| unit UPlatformTypes; | ||||
| 
 | ||||
| {$mode objfpc}{$H+} | ||||
| 
 | ||||
| interface | ||||
| 
 | ||||
| uses | ||||
|   Classes, SysUtils, | ||||
|   {$IFDEF WINDOWS}ActiveX{$ELSE}fakeactivex{$ENDIF}; | ||||
|    | ||||
| type | ||||
|   IDataObject = {$IFDEF WINDOWS}ActiveX{$ELSE}fakeactivex{$ENDIF}.IDataObject; | ||||
| 
 | ||||
| implementation | ||||
| 
 | ||||
| end. | ||||
| 
 | ||||
|  | ||||
| @ -336,7 +336,7 @@ implementation | ||||
| uses | ||||
| {$IF Defined(LCL)} | ||||
|   {$IF Defined(LCLGTK2)} | ||||
|     GLib2, GDK2, GTK2, GTKDef, GTKProc, | ||||
|     GLib2, GDK2, GTK2, GTK2Def, GTK2Proc, | ||||
|   {$ELSEIF Defined(LCLGTK)} | ||||
|     GDK, GTK, GTKDef, GTKProc, | ||||
|   {$IFEND} | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user