Quellcode durchsuchen

Improved Symbian RTL. Separated os include files from SDK include files and added more bindings

git-svn-id: trunk@7349 -
sekelsenmat vor 18 Jahren
Ursprung
Commit
a3703321f3

+ 7 - 2
.gitattributes

@@ -5261,9 +5261,10 @@ rtl/symbian/Makefile svneol=native#text/plain
 rtl/symbian/Makefile.fpc svneol=native#text/plain
 rtl/symbian/bindings/pbeexe.cpp -text
 rtl/symbian/buildrtl.pp -text
-rtl/symbian/e32def.inc -text
-rtl/symbian/e32err.inc -text
 rtl/symbian/symbian.pas -text
+rtl/symbian/symbianinc/e32def.inc -text
+rtl/symbian/symbianinc/e32err.inc -text
+rtl/symbian/symbianinc/e32std.inc -text
 rtl/symbian/sysdir.inc svneol=native#text/plain
 rtl/symbian/sysfile.inc svneol=native#text/plain
 rtl/symbian/sysheap.inc svneol=native#text/plain
@@ -5271,6 +5272,10 @@ rtl/symbian/sysos.inc svneol=native#text/plain
 rtl/symbian/sysosh.inc svneol=native#text/plain
 rtl/symbian/system.pp svneol=native#text/plain
 rtl/symbian/systhrd.inc svneol=native#text/plain
+rtl/symbian/uiq.pas -text
+rtl/symbian/uiqclasses.pas -text
+rtl/symbian/uiqinc/qikapplication.inc -text
+rtl/symbian/uiqinc/qikapplicationoo.inc -text
 rtl/ucmaps/8859-1.txt svneol=native#text/plain
 rtl/ucmaps/8859-10.txt svneol=native#text/plain
 rtl/ucmaps/8859-13.txt svneol=native#text/plain

+ 3 - 1
rtl/symbian/Makefile

@@ -237,6 +237,8 @@ RTL=..
 INC=$(RTL)/inc
 COMMON=$(RTL)/common
 PROCINC=$(RTL)/$(CPU_TARGET)
+SYMBIANINC=./symbianinc
+UIQINC=./uiqinc
 UNITPREFIX=rtl
 OBJPASDIR=$(RTL)/objpas
 ifeq ($(FULL_TARGET),i386-symbian)
@@ -1529,4 +1531,4 @@ objpas$(PPUEXT): $(OBJPASDIR)/objpas.pp $(INC)/except.inc system$(PPUEXT)
 macpas$(PPUEXT) : $(INC)/macpas.pp system$(PPUEXT)
 	$(COMPILER) $(INC)/macpas.pp $(REDIR)
 buildrtl$(PPUEXT): buildrtl.pp system$(PPUEXT) objpas$(PPUEXT) macpas$(PPUEXT)
-	$(COMPILER) -Fi$(OBJPASDIR)/sysutils -Fi$(OBJPASDIR)/classes -Fu$(PROCINC) -I$(OBJPASDIR) -I$(INC) -Fu$(INC) -Fu$(OBJPASDIR) buildrtl
+	$(COMPILER) -Fi$(OBJPASDIR)/sysutils -Fi$(OBJPASDIR)/classes -Fu$(PROCINC) -I$(OBJPASDIR) -I$(INC) -I$(SYMBIANINC) -I$(UIQINC) -Fu$(INC) -Fu$(OBJPASDIR) buildrtl

+ 3 - 1
rtl/symbian/Makefile.fpc

@@ -30,6 +30,8 @@ RTL=..
 INC=$(RTL)/inc
 COMMON=$(RTL)/common
 PROCINC=$(RTL)/$(CPU_TARGET)
+SYMBIANINC=./symbianinc
+UIQINC=./uiqinc
 
 UNITPREFIX=rtl
 
@@ -75,4 +77,4 @@ macpas$(PPUEXT) : $(INC)/macpas.pp system$(PPUEXT)
         $(COMPILER) $(INC)/macpas.pp $(REDIR)
 
 buildrtl$(PPUEXT): buildrtl.pp system$(PPUEXT) objpas$(PPUEXT) macpas$(PPUEXT)
-        $(COMPILER) -Fi$(OBJPASDIR)/sysutils -Fi$(OBJPASDIR)/classes -Fu$(PROCINC) -I$(OBJPASDIR) -I$(INC) -Fu$(INC) -Fu$(OBJPASDIR) buildrtl
+        $(COMPILER) -Fi$(OBJPASDIR)/sysutils -Fi$(OBJPASDIR)/classes -Fu$(PROCINC) -I$(OBJPASDIR) -I$(INC) -I$(SYMBIANINC) -I$(UIQINC) -Fu$(INC) -Fu$(OBJPASDIR) buildrtl

+ 1 - 1
rtl/symbian/buildrtl.pp

@@ -4,7 +4,7 @@ unit buildrtl;
 
     uses
       ctypes, strings,
-      symbian;
+      symbian, uiq, uiqclasses;
 
   implementation
 

+ 1 - 1
rtl/symbian/e32def.inc → rtl/symbian/symbianinc/e32def.inc

@@ -1,4 +1,4 @@
-{%MainUnit symbian.pas}
+{%MainUnit ../symbian.pas}
 
 {
     This file is part of the Free Pascal run time library.

+ 1 - 1
rtl/symbian/e32err.inc → rtl/symbian/symbianinc/e32err.inc

@@ -1,4 +1,4 @@
-{%MainUnit symbian.pas}
+{%MainUnit ../symbian.pas}
 
 {
     This file is part of the Free Pascal run time library.

+ 8 - 0
rtl/symbian/symbianinc/e32std.inc

@@ -0,0 +1,8 @@
+{%MainUnit ../symbian.pas}
+
+{ e32std.h header file }
+
+{ User class }
+
+function User_InfoPrint(aString: PChar): TInt; cdecl; external;
+

+ 34 - 0
rtl/symbian/uiq.pas

@@ -0,0 +1,34 @@
+{
+    This file is part of the Free Pascal run time library.
+    Copyright (c) 2007 by contributors of the Free Pascal Compiler
+
+    Symbian OS unit that adds common types, constants and functions
+    for the UIQ API
+
+    See the file COPYING.FPC, included in this distribution,
+    for details about the copyright.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+ **********************************************************************}
+unit uiq;
+
+{$mode objfpc}{$H+}
+
+interface
+
+uses ctypes;
+
+{$include e32def.inc}
+{$include e32err.inc}
+{.$include e32const.inc}
+{.$include e32cmn.inc}
+{$include e32std.inc}
+
+
+implementation
+
+end.
+

+ 39 - 0
rtl/symbian/uiqclasses.pas

@@ -0,0 +1,39 @@
+{
+    This file is part of the Free Pascal run time library.
+    Copyright (c) 2007 by contributors of the Free Pascal Compiler
+
+    Symbian OS unit that adds common types, constants and functions
+    for the Symbian API
+
+    See the file COPYING.FPC, included in this distribution,
+    for details about the copyright.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+ **********************************************************************}
+unit uiqclasses;
+
+{$mode objfpc}{$H+}
+
+interface
+
+uses ctypes;
+
+{$include e32def.inc}
+{$include e32err.inc}
+{.$include e32const.inc}
+{.$include e32cmn.inc}
+{.$include e32std.inc}
+
+{ e32std.h header file }
+
+{ User class }
+
+function User_InfoPrint(aString: PChar): TInt; cdecl; external;
+
+implementation
+
+end.
+

+ 39 - 0
rtl/symbian/uiqinc/qikapplication.inc

@@ -0,0 +1,39 @@
+{
+    This file is part of the Free Pascal run time library.
+    Copyright (c) 2007 by contributors of the Free Pascal Compiler
+
+    Symbian OS unit that adds common types, constants and functions
+    for the Symbian API
+
+    See the file COPYING.FPC, included in this distribution,
+    for details about the copyright.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+ **********************************************************************}
+unit symbian;
+
+{$mode objfpc}{$H+}
+
+interface
+
+uses ctypes;
+
+{$include e32def.inc}
+{$include e32err.inc}
+{.$include e32const.inc}
+{.$include e32cmn.inc}
+{.$include e32std.inc}
+
+{ e32std.h header file }
+
+{ User class }
+
+function User_InfoPrint(aString: PChar): TInt; cdecl; external;
+
+implementation
+
+end.
+

+ 39 - 0
rtl/symbian/uiqinc/qikapplicationoo.inc

@@ -0,0 +1,39 @@
+{
+    This file is part of the Free Pascal run time library.
+    Copyright (c) 2007 by contributors of the Free Pascal Compiler
+
+    Symbian OS unit that adds common types, constants and functions
+    for the Symbian API
+
+    See the file COPYING.FPC, included in this distribution,
+    for details about the copyright.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+ **********************************************************************}
+unit symbian;
+
+{$mode objfpc}{$H+}
+
+interface
+
+uses ctypes;
+
+{$include e32def.inc}
+{$include e32err.inc}
+{.$include e32const.inc}
+{.$include e32cmn.inc}
+{.$include e32std.inc}
+
+{ e32std.h header file }
+
+{ User class }
+
+function User_InfoPrint(aString: PChar): TInt; cdecl; external;
+
+implementation
+
+end.
+