Bläddra i källkod

Make packages working.

* packages/Makefile.fpc
   fcl-web: don't depend on httpd22 if the platform does not support it
   fcl-db: currently only SQLite as an "external" database is supported
* fv/src/platform.inc
   Add defines for Symobi ( => not a DOS system )

git-svn-id: branches/svenbarth/symobi@18066 -
svenbarth 14 år sedan
förälder
incheckning
f09f8adf12

+ 19 - 0
packages/Makefile.fpc

@@ -65,6 +65,9 @@ dirs_go32v2=fv graph unzip gdbint
 dirs_amiga=amunits
 dirs_amiga=amunits
 dirs_morphos=fv opengl sdl
 dirs_morphos=fv opengl sdl
 dirs_wii=libogcfpc
 dirs_wii=libogcfpc
+dirs_symobi=ncurses unzip zlib sqlite \
+            libpng x11 uuid libcurl cairo gtk2 iconvenc libxml fcl-extra \
+            xforms fv
 
 
 [install]
 [install]
 fpcpackage=y
 fpcpackage=y
@@ -198,11 +201,19 @@ fcl-net_release: fcl-passrc_release fcl-xml_release fcl-async_release
 fcl-net_shared: fcl-passrc_shared fcl-xml_shared fcl-async_shared
 fcl-net_shared: fcl-passrc_shared fcl-xml_shared fcl-async_shared
 endif
 endif
 
 
+ifneq ($(findstring $(OS_TARGET),go32v2, symobi),)
+fcl-web_all: fpmkunit_all fcl-db_all fcl-xml_all fcl-process_all fastcgi_all fcl-net_all fcl-json_all
+fcl-web_debug: fpmkunit_debug fcl-db_debug fcl-xml_debug fcl-process_debug fastcgi_debug fcl-net_debug fcl-json_debug
+fcl-web_smart: fpmkunit_smart fcl-db_smart fcl-xml_smart fcl-process_smart fastcgi_smart fcl-net_smart fcl-json_smart
+fcl-web_release: fpmkunit_release fcl-db_release fcl-xml_release fcl-process_release fastcgi_release fcl-net_release fcl-json_release
+fcl-web_shared: fpmkunit_shared fcl-db_shared fcl-xml_shared fcl-process_shared fastcgi_shared fcl-net_shared fcl-json_shared
+else
 fcl-web_all: fpmkunit_all fcl-db_all fcl-xml_all fcl-process_all httpd22_all fastcgi_all fcl-net_all fcl-json_all
 fcl-web_all: fpmkunit_all fcl-db_all fcl-xml_all fcl-process_all httpd22_all fastcgi_all fcl-net_all fcl-json_all
 fcl-web_debug: fpmkunit_debug fcl-db_debug fcl-xml_debug fcl-process_debug httpd22_debug fastcgi_debug fcl-net_debug fcl-json_debug
 fcl-web_debug: fpmkunit_debug fcl-db_debug fcl-xml_debug fcl-process_debug httpd22_debug fastcgi_debug fcl-net_debug fcl-json_debug
 fcl-web_smart: fpmkunit_smart fcl-db_smart fcl-xml_smart fcl-process_smart httpd22_smart fastcgi_smart fcl-net_smart fcl-json_smart
 fcl-web_smart: fpmkunit_smart fcl-db_smart fcl-xml_smart fcl-process_smart httpd22_smart fastcgi_smart fcl-net_smart fcl-json_smart
 fcl-web_release: fpmkunit_release fcl-db_release fcl-xml_release fcl-process_release httpd22_release fastcgi_release fcl-net_release fcl-json_release
 fcl-web_release: fpmkunit_release fcl-db_release fcl-xml_release fcl-process_release httpd22_release fastcgi_release fcl-net_release fcl-json_release
 fcl-web_shared: fpmkunit_shared fcl-db_shared fcl-xml_shared fcl-process_shared httpd22_shared fastcgi_shared fcl-net_shared fcl-json_shared
 fcl-web_shared: fpmkunit_shared fcl-db_shared fcl-xml_shared fcl-process_shared httpd22_shared fastcgi_shared fcl-net_shared fcl-json_shared
+endif
 
 
 fastcgi_all: fpmkunit_all
 fastcgi_all: fpmkunit_all
 fastcgi_debug: fpmkunit_debug
 fastcgi_debug: fpmkunit_debug
@@ -224,6 +235,13 @@ fcl-db_smart: fcl-xml_smart mysql_smart ibase_smart oracle_smart odbc_smart post
 fcl-db_release: fcl-xml_release mysql_release ibase_release oracle_release odbc_release postgres_release sqlite_release
 fcl-db_release: fcl-xml_release mysql_release ibase_release oracle_release odbc_release postgres_release sqlite_release
 fcl-db_shared: fcl-xml_shared mysql_shared ibase_shared oracle_shared odbc_shared postgres_shared sqlite_shared
 fcl-db_shared: fcl-xml_shared mysql_shared ibase_shared oracle_shared odbc_shared postgres_shared sqlite_shared
 else
 else
+ifneq ($(findstring $(OS_TARGET),symobi),)
+fcl-db_all: fcl-xml_all sqlite_all
+fcl-db_debug: fcl-xml_debug sqlite_debug
+fcl-db_smart: fcl-xml_smart sqlite_smart
+fcl-db_release: fcl-xml_release sqlite_release
+fcl-db_shared: fcl-xml_shared sqlite_shared
+else
 fcl-db_all: fcl-xml_all
 fcl-db_all: fcl-xml_all
 fcl-db_debug: fcl-xml_debug
 fcl-db_debug: fcl-xml_debug
 fcl-db_smart: fcl-xml_smart
 fcl-db_smart: fcl-xml_smart
@@ -231,6 +249,7 @@ fcl-db_release: fcl-xml_release
 fcl-db_shared: fcl-xml_shared
 fcl-db_shared: fcl-xml_shared
 endif
 endif
 endif
 endif
+endif
 
 
 fcl_all: fcl-base_all fcl-xml_all fcl-fpcunit_all fcl-db_all fcl-web_all fcl-registry_all fcl-passrc_all fcl-image_all fcl-net_all fcl-json_all fcl-res_all
 fcl_all: fcl-base_all fcl-xml_all fcl-fpcunit_all fcl-db_all fcl-web_all fcl-registry_all fcl-passrc_all fcl-image_all fcl-net_all fcl-json_all fcl-res_all
 fcl_debug: fcl-base_debug fcl-xml_debug fcl-fpcunit_debug fcl-db_debug fcl-web_debug fcl-registry_debug fcl-passrc_debug fcl-image_debug fcl-net_debug fcl-json_debug fcl-res_debug
 fcl_debug: fcl-base_debug fcl-xml_debug fcl-fpcunit_debug fcl-db_debug fcl-web_debug fcl-registry_debug fcl-passrc_debug fcl-image_debug fcl-net_debug fcl-json_debug fcl-res_debug

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

@@ -33,6 +33,7 @@ includedir_iphonesim=src/unix
 includedir_solaris=src/unix
 includedir_solaris=src/unix
 includedir_netbsd=src/unix
 includedir_netbsd=src/unix
 includedir_openbsd=src/unix
 includedir_openbsd=src/unix
+includedir_symobi=src/unix
 
 
 [default]
 [default]
 fpcdir=../..
 fpcdir=../..

+ 2 - 0
packages/fcl-base/Makefile.fpc

@@ -31,6 +31,7 @@ units_wince=fileinfo syncobjs fptimer
 # syncobjs requires GetLastOSError function
 # syncobjs requires GetLastOSError function
 units_netware=syncobjs
 units_netware=syncobjs
 units_netwlibc=syncobjs
 units_netwlibc=syncobjs
+units_symobi=syncobjs
 rsts=cachecls custapp cgiapp eventlog registry streamcoll inicol
 rsts=cachecls custapp cgiapp eventlog registry streamcoll inicol
 
 
 [compiler]
 [compiler]
@@ -51,6 +52,7 @@ includedir_go32v2=src/go32v2 src/dummy
 includedir_win32=src/win
 includedir_win32=src/win
 includedir_win64=src/win
 includedir_win64=src/win
 includedir_wince=src/dummy
 includedir_wince=src/dummy
+includedir_symobi=src/unix
 sourcedir=src/$(OS_TARGET) src
 sourcedir=src/$(OS_TARGET) src
 
 
 [prerules]
 [prerules]

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

@@ -20,6 +20,7 @@ dirs_openbsd=src/dbase src/sqlite src/paradox
 dirs_win32=src/dbase src/paradox src/sqlite src/export src/datadict src/codegen 
 dirs_win32=src/dbase src/paradox src/sqlite src/export src/datadict src/codegen 
 dirs_win64=src/dbase src/export src/datadict src/codegen 
 dirs_win64=src/dbase src/export src/datadict src/codegen 
 dirs_wince=src/dbase src/sqlite src/export src/datadict src/codegen
 dirs_wince=src/dbase src/sqlite src/export src/datadict src/codegen
+dirs_symobi=src/dbase src/sqlite src/export src/datadict src/codegen
 
 
 [require]
 [require]
 packages=fcl-base fcl-xml
 packages=fcl-base fcl-xml

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

@@ -43,6 +43,7 @@ includedir_emx=src/os2
 includedir_win32=src/win
 includedir_win32=src/win
 includedir_win64=src/win
 includedir_win64=src/win
 includedir_wince=src/win
 includedir_wince=src/win
+includedir_symobi=src/unix
 sourcedir=src/$(OS_TARGET) src
 sourcedir=src/$(OS_TARGET) src
 
 
 [install]
 [install]

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

@@ -22,6 +22,7 @@ units_freebsd=freetypeh freetype ftfont
 units_darwin=freetypeh freetype ftfont
 units_darwin=freetypeh freetype ftfont
 units_iphonesim=freetypeh freetype ftfont
 units_iphonesim=freetypeh freetype ftfont
 units_solaris=freetypeh freetype ftfont
 units_solaris=freetypeh freetype ftfont
+units_symobi=freetypeh freetype ftfont
 rsts=pscanvas
 rsts=pscanvas
 exampledirs=examples
 exampledirs=examples
 
 

+ 2 - 0
packages/fcl-net/Makefile.fpc

@@ -22,6 +22,7 @@ units_os2=resolve ssockets
 units_win32=resolve ssockets 
 units_win32=resolve ssockets 
 units_win64=resolve ssockets 
 units_win64=resolve ssockets 
 units_wince=resolve ssockets 
 units_wince=resolve ssockets 
+units_symobi=netdb resolve ssockets cnetdb
 
 
 [require]
 [require]
 packages=fcl-base fcl-xml fcl-passrc fcl-async
 packages=fcl-base fcl-xml fcl-passrc fcl-async
@@ -43,6 +44,7 @@ includedir_emx=src/os2
 includedir_win32=src/win
 includedir_win32=src/win
 includedir_win64=src/win
 includedir_win64=src/win
 includedir_wince=src/win
 includedir_wince=src/win
+includedir_symobi=src/unix
 sourcedir=src/$(OS_TARGET) src
 sourcedir=src/$(OS_TARGET) src
 
 
 [install]
 [install]

+ 2 - 0
packages/fcl-process/Makefile.fpc

@@ -23,6 +23,7 @@ units_wince=simpleipc dbugmsg dbugintf
 units_qnx=simpleipc dbugmsg dbugintf pipesipc
 units_qnx=simpleipc dbugmsg dbugintf pipesipc
 units_os2=simpleipc dbugmsg dbugintf
 units_os2=simpleipc dbugmsg dbugintf
 units_emx=simpleipc dbugmsg dbugintf
 units_emx=simpleipc dbugmsg dbugintf
+units_symobi=simpleipc dbugmsg dbugintf
 rsts=process simpleipc
 rsts=process simpleipc
 
 
 [compiler]
 [compiler]
@@ -48,6 +49,7 @@ includedir_morphos=src/dummy
 includedir_amiga=src/dummy
 includedir_amiga=src/dummy
 includedir_netware=src/dummy
 includedir_netware=src/dummy
 includedir_netwlibc=src/dummy
 includedir_netwlibc=src/dummy
+includedir_symobi=src/unix src/dummy
 sourcedir=src/$(OS_TARGET) src
 sourcedir=src/$(OS_TARGET) src
 
 
 [install]
 [install]

+ 6 - 0
packages/fv/src/platform.inc

@@ -226,6 +226,12 @@ FOR FPC THESE ARE THE TRANSLATIONS
   {$DEFINE OS_UNIX}
   {$DEFINE OS_UNIX}
 {$ENDIF}
 {$ENDIF}
 
 
+{$IFDEF SYMOBI}
+  {$UNDEF OS_DOS}
+  {$DEFINE OS_SYMOBI}
+  {$DEFINE OS_UNIX}
+{$ENDIF}
+
 {------------------------------------------------}
 {------------------------------------------------}
 {  FPC Netware COMPILER changes operating system }
 {  FPC Netware COMPILER changes operating system }
 {------------------------------------------------}
 {------------------------------------------------}

+ 2 - 1
packages/gtk2/Makefile.fpc

@@ -18,6 +18,7 @@ packages_openbsd=x11
 packages_netbsd=x11
 packages_netbsd=x11
 packages_darwin=x11
 packages_darwin=x11
 packages_iphonesim=x11
 packages_iphonesim=x11
+packages_symobi=x11
 
 
 [target]
 [target]
 units=src/buildgtk2 
 units=src/buildgtk2 
@@ -39,7 +40,7 @@ build=n
 fpcdir=../..
 fpcdir=../..
 
 
 [prerules]
 [prerules]
-ifneq ($(findstring $(OS_TARGET),linux freebsd netbsd openbsd solaris darwin iphonesim beos haiku ),)
+ifneq ($(findstring $(OS_TARGET),linux freebsd netbsd openbsd solaris darwin iphonesim beos haiku symobi),)
 GDK2X=gdk2x
 GDK2X=gdk2x
 GTK2X11=gtk2x11
 GTK2X11=gtk2x11
 GTK2X11INCLUDE=src/gtk2x11/include
 GTK2X11INCLUDE=src/gtk2x11/include