Browse Source

* adjust the dependencies of fcl-web for Symobi
* add Symobi to fpmkunit.pp

git-svn-id: branches/svenbarth/symobi@18145 -

svenbarth 14 years ago
parent
commit
223506416b
2 changed files with 7 additions and 13 deletions
  1. 1 9
      packages/Makefile.fpc
  2. 6 4
      packages/fpmkunit/src/fpmkunit.pp

+ 1 - 9
packages/Makefile.fpc

@@ -65,7 +65,7 @@ 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 \
+dirs_symobi=ncurses unzip zlib sqlite httpd22 fcl-web fastcgi \
             libpng x11 uuid libcurl cairo gtk2 iconvenc libxml fcl-extra \
             libpng x11 uuid libcurl cairo gtk2 iconvenc libxml fcl-extra \
             xforms fv
             xforms fv
 
 
@@ -201,19 +201,11 @@ 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

+ 6 - 4
packages/fpmkunit/src/fpmkunit.pp

@@ -69,7 +69,8 @@ Type
     linux,go32v2,win32,os2,freebsd,beos,netbsd,
     linux,go32v2,win32,os2,freebsd,beos,netbsd,
     amiga,atari, solaris, qnx, netware, openbsd,wdosx,
     amiga,atari, solaris, qnx, netware, openbsd,wdosx,
     palmos,macos,darwin,emx,watcom,morphos,netwlibc,
     palmos,macos,darwin,emx,watcom,morphos,netwlibc,
-    win64,wince,gba,nds,embedded,symbian,haiku,iphonesim
+    win64,wince,gba,nds,embedded,symbian,haiku,iphonesim,
+	symobi
   );
   );
   TOSes = Set of TOS;
   TOSes = Set of TOS;
 
 
@@ -115,8 +116,8 @@ Const
 
 
   AllOSes = [Low(TOS)..High(TOS)];
   AllOSes = [Low(TOS)..High(TOS)];
   AllCPUs = [Low(TCPU)..High(TCPU)];
   AllCPUs = [Low(TCPU)..High(TCPU)];
-  AllUnixOSes  = [Linux,FreeBSD,NetBSD,OpenBSD,Darwin,QNX,BeOS,Solaris,Haiku,iphonesim];
-  AllBSDOSes      = [FreeBSD,NetBSD,OpenBSD,Darwin,iphonesim];
+  AllUnixOSes  = [Linux,FreeBSD,NetBSD,OpenBSD,Darwin,QNX,BeOS,Solaris,Haiku,iphonesim,Symobi];
+  AllBSDOSes      = [FreeBSD,NetBSD,OpenBSD,Darwin,iphonesim,Symobi];
   AllWindowsOSes  = [Win32,Win64,WinCE];
   AllWindowsOSes  = [Win32,Win64,WinCE];
 
 
   AllSmartLinkLibraryOSes = [Linux]; // OSes that use .a library files for smart-linking
   AllSmartLinkLibraryOSes = [Linux]; // OSes that use .a library files for smart-linking
@@ -153,7 +154,8 @@ Const
     { embedded }( false, true,  true,  true,  true,  true,  true,  true,  true,  true ),
     { embedded }( false, true,  true,  true,  true,  true,  true,  true,  true,  true ),
     { symbian } ( false, true,  false, false, false, false, true,  false, false, false),
     { symbian } ( false, true,  false, false, false, false, true,  false, false, false),
     { haiku }   ( false, true,  false, false, false, false, false, false, false, false),
     { haiku }   ( false, true,  false, false, false, false, false, false, false, false),
-    { iphonesim}( false, true,  false, false, false, false, false, false, false, false)
+    { iphonesim}( false, true,  false, false, false, false, false, false, false, false),
+    { symobi }  ( false, true,  false, false, false, false, false, false, false, false)
   );
   );
 
 
   // Useful
   // Useful