o BeOS fixes from Olivier Coursière:

* compilation fix for tthread.inc
   * fix BeOS dependencies for fcl-db

git-svn-id: trunk@10638 -
This commit is contained in:
Jonas Maebe 2008-04-12 19:28:47 +00:00
parent 6650d151f6
commit af44dfc40b
5 changed files with 42 additions and 8 deletions

View File

@ -1,5 +1,5 @@
#
# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/04/12]
# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/04/10]
#
default: all
MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
@ -7596,7 +7596,7 @@ fcl-web_debug: fcl-db_debug fcl-xml_debug fcl-process_debug
fcl-web_smart: fcl-db_smart fcl-xml_smart fcl-process_smart
fcl-web_release: fcl-db_release fcl-xml_release fcl-process_release
fcl-web_shared: fcl-db_shared fcl-xml_shared fcl-process_shared
ifneq ($(findstring $(OS_TARGET),linux freebsd openbsd netbsd win32),)
ifneq ($(findstring $(OS_TARGET),linux freebsd openbsd netbsd win32 beos),)
fcl-db_all: fcl-base_all mysql_all ibase_all oracle_all odbc_all postgres_all sqlite_all pxlib_all
fcl-db_debug: fcl-base_debug mysql_debug ibase_debug oracle_debug odbc_debug postgres_debug sqlite_debug pxlib_debug
fcl-db_smart: fcl-base_smart mysql_smart ibase_smart oracle_smart odbc_smart postgres_smart sqlite_smart pxlib_smart

View File

@ -128,7 +128,7 @@ fcl-web_smart: fcl-db_smart fcl-xml_smart fcl-process_smart
fcl-web_release: fcl-db_release fcl-xml_release fcl-process_release
fcl-web_shared: fcl-db_shared fcl-xml_shared fcl-process_shared
ifneq ($(findstring $(OS_TARGET),linux freebsd openbsd netbsd win32),)
ifneq ($(findstring $(OS_TARGET),linux freebsd openbsd netbsd win32 beos),)
fcl-db_all: fcl-base_all mysql_all ibase_all oracle_all odbc_all postgres_all sqlite_all pxlib_all
fcl-db_debug: fcl-base_debug mysql_debug ibase_debug oracle_debug odbc_debug postgres_debug sqlite_debug pxlib_debug
fcl-db_smart: fcl-base_smart mysql_smart ibase_smart oracle_smart odbc_smart postgres_smart sqlite_smart pxlib_smart

View File

@ -1,8 +1,8 @@
#
# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/03/24]
# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/04/10]
#
default: all
MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
BSDs = freebsd netbsd openbsd darwin
UNIXs = linux $(BSDs) solaris qnx
LIMIT83fs = go32v2 os2 emx watcom
@ -269,7 +269,7 @@ ifeq ($(FULL_TARGET),i386-freebsd)
override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base src/dbase src/sqlite src/paradox src/export src/datadict src/codegen
endif
ifeq ($(FULL_TARGET),i386-beos)
override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base src/dbase src/sqlite src/export src/datadict src/codegen
override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base src/dbase src/sqlite src/paradox src/export src/datadict src/codegen
endif
ifeq ($(FULL_TARGET),i386-netbsd)
override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base src/dbase src/sqlite src/paradox
@ -388,6 +388,9 @@ endif
ifeq ($(FULL_TARGET),arm-palmos)
override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base
endif
ifeq ($(FULL_TARGET),arm-darwin)
override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base src/dbase src/sqlite
endif
ifeq ($(FULL_TARGET),arm-wince)
override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base src/dbase src/sqlite src/export src/datadict src/codegen
endif
@ -557,6 +560,9 @@ endif
ifeq ($(FULL_TARGET),arm-palmos)
override COMPILER_OPTIONS+=-S2h
endif
ifeq ($(FULL_TARGET),arm-darwin)
override COMPILER_OPTIONS+=-S2h
endif
ifeq ($(FULL_TARGET),arm-wince)
override COMPILER_OPTIONS+=-S2h
endif
@ -1415,6 +1421,7 @@ REQUIRE_PACKAGES_MYSQL=1
REQUIRE_PACKAGES_ODBC=1
REQUIRE_PACKAGES_ORACLE=1
REQUIRE_PACKAGES_SQLITE=1
REQUIRE_PACKAGES_PXLIB=1
endif
ifeq ($(FULL_TARGET),i386-netbsd)
REQUIRE_PACKAGES_FCL-BASE=1
@ -1471,6 +1478,9 @@ ifeq ($(FULL_TARGET),i386-wince)
REQUIRE_PACKAGES_FCL-BASE=1
REQUIRE_PACKAGES_IBASE=1
REQUIRE_PACKAGES_POSTGRES=1
REQUIRE_PACKAGES_MYSQL=1
REQUIRE_PACKAGES_ODBC=1
REQUIRE_PACKAGES_ORACLE=1
REQUIRE_PACKAGES_SQLITE=1
endif
ifeq ($(FULL_TARGET),i386-embedded)
@ -1653,10 +1663,22 @@ endif
ifeq ($(FULL_TARGET),arm-palmos)
REQUIRE_PACKAGES_FCL-BASE=1
endif
ifeq ($(FULL_TARGET),arm-darwin)
REQUIRE_PACKAGES_FCL-BASE=1
REQUIRE_PACKAGES_IBASE=1
REQUIRE_PACKAGES_POSTGRES=1
REQUIRE_PACKAGES_MYSQL=1
REQUIRE_PACKAGES_ODBC=1
REQUIRE_PACKAGES_ORACLE=1
REQUIRE_PACKAGES_SQLITE=1
endif
ifeq ($(FULL_TARGET),arm-wince)
REQUIRE_PACKAGES_FCL-BASE=1
REQUIRE_PACKAGES_IBASE=1
REQUIRE_PACKAGES_POSTGRES=1
REQUIRE_PACKAGES_MYSQL=1
REQUIRE_PACKAGES_ODBC=1
REQUIRE_PACKAGES_ORACLE=1
REQUIRE_PACKAGES_SQLITE=1
endif
ifeq ($(FULL_TARGET),arm-gba)
@ -2516,6 +2538,7 @@ TARGET_DIRS_SRC/SQLDB=1
TARGET_DIRS_SRC/BASE=1
TARGET_DIRS_SRC/DBASE=1
TARGET_DIRS_SRC/SQLITE=1
TARGET_DIRS_SRC/PARADOX=1
TARGET_DIRS_SRC/EXPORT=1
TARGET_DIRS_SRC/DATADICT=1
TARGET_DIRS_SRC/CODEGEN=1
@ -2833,6 +2856,14 @@ TARGET_DIRS_SRC/MEMDS=1
TARGET_DIRS_SRC/SQLDB=1
TARGET_DIRS_SRC/BASE=1
endif
ifeq ($(FULL_TARGET),arm-darwin)
TARGET_DIRS_SRC/SDF=1
TARGET_DIRS_SRC/MEMDS=1
TARGET_DIRS_SRC/SQLDB=1
TARGET_DIRS_SRC/BASE=1
TARGET_DIRS_SRC/DBASE=1
TARGET_DIRS_SRC/SQLITE=1
endif
ifeq ($(FULL_TARGET),arm-wince)
TARGET_DIRS_SRC/SDF=1
TARGET_DIRS_SRC/MEMDS=1

View File

@ -8,7 +8,7 @@ version=2.0.0
[target]
dirs=src/sdf src/memds src/sqldb src/base
dirs_beos=src/dbase src/sqlite src/export src/datadict src/codegen
dirs_beos=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

View File

@ -361,8 +361,11 @@ begin
end;
procedure SemaphorePost(const FSem: Pointer);
var
b : byte;
begin
fpwrite(PFilDes(FSem)^[1], #0, 1);
b := 0;
fpwrite(PFilDes(FSem)^[1], b, 1);
end;
procedure SemaphoreDestroy(const FSem: Pointer);