소스 검색

* couple of small haiku fixes by Olivier Coursiere

git-svn-id: trunk@12739 -
florian 16 년 전
부모
커밋
475cd9926d
5개의 변경된 파일12개의 추가작업 그리고 3개의 파일을 삭제
  1. 1 0
      packages/fcl-db/Makefile.fpc
  2. 2 0
      packages/pxlib/Makefile.fpc
  3. 2 1
      rtl/haiku/Makefile.fpc
  4. 5 1
      rtl/unix/dl.pp
  5. 2 1
      rtl/unix/sysutils.pp

+ 1 - 0
packages/fcl-db/Makefile.fpc

@@ -9,6 +9,7 @@ version=2.2.2
 [target]
 dirs=src/sdf src/memds src/sqldb src/base 
 dirs_beos=src/dbase src/sqlite src/paradox src/export src/datadict src/codegen
+dirs_haiku=src/dbase src/sqlite src/paradox src/export src/datadict src/codegen
 dirs_linux=src/dbase src/sqlite src/paradox src/export src/datadict src/codegen 
 dirs_freebsd=src/dbase src/sqlite src/paradox src/export src/datadict src/codegen
 dirs_darwin=src/dbase src/sqlite

+ 2 - 0
packages/pxlib/Makefile.fpc

@@ -8,6 +8,7 @@ version=2.2.2
 
 [target]
 units_beos=pxlib
+units_haiku=pxlib
 units_linux=pxlib
 units_win32=pxlib
 units_darwin=pxlib
@@ -15,6 +16,7 @@ units_freebsd=pxlib
 units_openbsd=pxlib
 units_netbsd=pxlib
 exampledirs_beos=examples
+exampledirs_haiku=examples
 exampledirs_linux=examples
 exampledirs_win32=examples
 exampledirs_darwin=examples

+ 2 - 1
rtl/haiku/Makefile.fpc

@@ -15,7 +15,8 @@ units=system baseunix unixtype ctypes objpas macpas strings \
       cpu mmx getopts heaptrc lineinfo lnfodwrf variants \
       rtlconsts syscall unix unixutil strutils termio initc \
       cmem crt video mouse keyboard \
-      dateutils fmtbcd sockets dynlibs cwstring cthreads
+      dateutils fmtbcd sockets dynlibs cwstring cthreads \
+      fpintres clocale
 rsts=math varutils typinfo variants sysconst rtlconsts dateutils
 implicitunits=exeinfo
 

+ 5 - 1
rtl/unix/dl.pp

@@ -20,7 +20,11 @@ const
 {$ifdef BSD}   // dlopen is in libc on FreeBSD.
   LibDL = 'c';
 {$else}
-  LibDL = 'dl';
+  {$ifdef HAIKU}
+    LibDL = 'root';
+  {$else}
+    LibDL = 'dl';
+  {$endif}
 {$endif}
 
 {$if defined(linux) and defined(cpuarm)}

+ 2 - 1
rtl/unix/sysutils.pp

@@ -182,7 +182,8 @@ var
   lockres: cint;
 begin
   DoFileLocking:=Handle;
-{$ifndef beos}
+{$ifdef beos}
+{$else}
   if (Handle>=0) then
     begin
 {$ifdef solaris}