[sword-cvs] sword/lib/bcppmake libsword.bpf,1.21,1.22 libsword6icu.bpr,1.4,1.5

sword@www.crosswire.org sword@www.crosswire.org
Sun, 4 Apr 2004 02:24:00 -0700


Update of /cvs/core/sword/lib/bcppmake
In directory www:/tmp/cvs-serv2239/lib/bcppmake

Modified Files:
	libsword.bpf libsword6icu.bpr 
Log Message:
no message

Index: libsword.bpf
===================================================================
RCS file: /cvs/core/sword/lib/bcppmake/libsword.bpf,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- libsword.bpf	22 Dec 2003 21:33:32 -0000	1.21
+++ libsword.bpf	4 Apr 2004 09:23:54 -0000	1.22
@@ -2,136 +2,6 @@
 
 //#include <vcl.h>
 #pragma hdrstop
-USEUNIT("..\..\src\keys\versekey.cpp");
-USEUNIT("..\..\src\keys\strkey.cpp");
-USEUNIT("..\..\src\keys\swkey.cpp");
-USEUNIT("..\..\src\keys\listkey.cpp");
-USEUNIT("..\..\src\mgr\swmgr.cpp");
-USEUNIT("..\..\src\mgr\localemgr.cpp");
-USEUNIT("..\..\src\mgr\swconfig.cpp");
-USEUNIT("..\..\src\mgr\swlocale.cpp");
-USEUNIT("..\..\src\mgr\filemgr.cpp");
-USEUNIT("..\..\src\utilfuns\utilstr.cpp");
-USEUNIT("..\..\src\utilfuns\utilconf.cpp");
-USEUNIT("..\..\src\utilfuns\Greek2Greek.cpp");
-USEUNIT("..\..\src\frontend\swlog.cpp");
-USEUNIT("..\..\src\frontend\swdisp.cpp");
-USEUNIT("..\..\src\modules\swmodule.cpp");
-USEUNIT("..\..\src\modules\comments\swcom.cpp");
-USEUNIT("..\..\src\modules\comments\hrefcom\hrefcom.cpp");
-USEUNIT("..\..\src\modules\comments\rawcom\rawcom.cpp");
-USEUNIT("..\..\src\modules\comments\rawfiles\rawfiles.cpp");
-USEUNIT("..\..\src\modules\common\lzsscomprs.cpp");
-USEUNIT("..\..\src\modules\common\rawstr.cpp");
-USEUNIT("..\..\src\modules\common\rawverse.cpp");
-USEUNIT("..\..\src\modules\common\sapphire.cpp");
-USEUNIT("..\..\src\modules\common\swcipher.cpp");
-USEUNIT("..\..\src\modules\common\swcomprs.cpp");
-USEUNIT("..\..\src\modules\filters\thmlrtf.cpp");
-USEUNIT("..\..\src\modules\filters\gbffootnotes.cpp");
-USEUNIT("..\..\src\modules\filters\gbfhtml.cpp");
-USEUNIT("..\..\src\modules\filters\gbfplain.cpp");
-USEUNIT("..\..\src\modules\filters\gbfrtf.cpp");
-USEUNIT("..\..\src\modules\filters\gbfstrongs.cpp");
-USEUNIT("..\..\src\modules\filters\gbfthml.cpp");
-USEUNIT("..\..\src\modules\filters\plainfootnotes.cpp");
-USEUNIT("..\..\src\modules\filters\plainhtml.cpp");
-USEUNIT("..\..\src\modules\filters\rtfhtml.cpp");
-USEUNIT("..\..\src\modules\filters\thmlgbf.cpp");
-USEUNIT("..\..\src\modules\filters\thmlhtml.cpp");
-USEUNIT("..\..\src\modules\filters\thmlplain.cpp");
-USEUNIT("..\..\src\modules\filters\cipherfil.cpp");
-USEUNIT("..\..\src\modules\lexdict\swld.cpp");
-USEUNIT("..\..\src\modules\lexdict\rawld\rawld.cpp");
-USEUNIT("..\..\src\modules\texts\swtext.cpp");
-USEUNIT("..\..\src\modules\texts\rawtext\rawtext.cpp");
-USEUNIT("..\..\src\modules\texts\ztext\ztext.cpp");
-USEUNIT("..\..\src\modules\common\zverse.cpp");
-USEUNIT("..\..\src\keys\treekey.cpp");
-USEUNIT("..\..\src\keys\treekeyidx.cpp");
-USEUNIT("..\..\src\modules\common\rawstr4.cpp");
-USEUNIT("..\..\src\modules\common\zstr.cpp");
-USEUNIT("..\..\src\modules\genbook\swgenbook.cpp");
-USEUNIT("..\..\src\modules\genbook\rawgenbook\rawgenbook.cpp");
-USEUNIT("..\..\src\mgr\swfiltermgr.cpp");
-USEUNIT("..\..\src\modules\filters\utf8utf16.cpp");
-USEUNIT("..\..\src\modules\filters\gbfheadings.cpp");
-USEUNIT("..\..\src\modules\filters\gbfhtmlhref.cpp");
-USEUNIT("..\..\src\modules\filters\gbfmorph.cpp");
-USEUNIT("..\..\src\modules\filters\latin1utf16.cpp");
-USEUNIT("..\..\src\modules\filters\latin1utf8.cpp");
-USEUNIT("..\..\src\modules\filters\scsuutf8.cpp");
-USEUNIT("..\..\src\modules\filters\swbasicfilter.cpp");
-USEUNIT("..\..\src\modules\filters\thmlfootnotes.cpp");
-USEUNIT("..\..\src\modules\filters\thmlheadings.cpp");
-USEUNIT("..\..\src\modules\filters\thmlhtmlhref.cpp");
-USEUNIT("..\..\src\modules\filters\thmllemma.cpp");
-USEUNIT("..\..\src\modules\filters\thmlmorph.cpp");
-USEUNIT("..\..\src\modules\filters\thmlscripref.cpp");
-USEUNIT("..\..\src\modules\filters\thmlstrongs.cpp");
-USEUNIT("..\..\src\modules\filters\thmlvariants.cpp");
-USEUNIT("..\..\src\modules\filters\unicodertf.cpp");
-USEUNIT("..\..\src\modules\filters\utf16utf8.cpp");
-USEUNIT("..\..\src\modules\filters\utf8arshaping.cpp");
-USEUNIT("..\..\src\modules\filters\utf8bidireorder.cpp");
-USEUNIT("..\..\src\modules\filters\utf8cantillation.cpp");
-USEUNIT("..\..\src\modules\filters\utf8greekaccents.cpp");
-USEUNIT("..\..\src\modules\filters\utf8hebrewpoints.cpp");
-USEUNIT("..\..\src\modules\filters\utf8html.cpp");
-USEUNIT("..\..\src\modules\filters\utf8latin1.cpp");
-USEUNIT("..\..\src\modules\filters\utf8nfc.cpp");
-USEUNIT("..\..\src\modules\filters\utf8nfkd.cpp");
-USEUNIT("..\..\src\modules\filters\utf8transliterator.cpp");
-USEUNIT("..\..\src\modules\comments\zcom\zcom.cpp");
-USEUNIT("..\..\src\modules\lexdict\rawld4\rawld4.cpp");
-USEUNIT("..\..\src\modules\common\zipcomprs.cpp");
-USEUNIT("..\..\src\modules\lexdict\zld\zld.cpp");
-USEUNIT("..\..\src\modules\common\entriesblk.cpp");
-USEUNIT("..\..\src\utilfuns\zlib\zutil.c");
-USEUNIT("..\..\src\utilfuns\zlib\compress.c");
-USEUNIT("..\..\src\utilfuns\zlib\crc32.c");
-USEUNIT("..\..\src\utilfuns\zlib\deflate.c");
-USEUNIT("..\..\src\utilfuns\zlib\gzio.c");
-USEUNIT("..\..\src\utilfuns\zlib\infblock.c");
-USEUNIT("..\..\src\utilfuns\zlib\infcodes.c");
-USEUNIT("..\..\src\utilfuns\zlib\inffast.c");
-USEUNIT("..\..\src\utilfuns\zlib\inflate.c");
-USEUNIT("..\..\src\utilfuns\zlib\inftrees.c");
-USEUNIT("..\..\src\utilfuns\zlib\infutil.c");
-USEUNIT("..\..\src\utilfuns\zlib\trees.c");
-USEUNIT("..\..\src\utilfuns\zlib\uncompr.c");
-USEUNIT("..\..\src\utilfuns\zlib\untgz.c");
-USEUNIT("..\..\src\utilfuns\zlib\adler32.c");
-USEUNIT("..\..\src\modules\filters\greeklexattribs.cpp");
-USEUNIT("..\..\src\mgr\swcacher.cpp");
-USEUNIT("..\..\src\modules\filters\gbfosis.cpp");
-USEUNIT("..\..\src\modules\filters\thmlosis.cpp");
-USEUNIT("..\..\src\mgr\encfiltmgr.cpp");
-USEUNIT("..\..\src\mgr\markupfiltmgr.cpp");
-USEUNIT("..\..\src\utilfuns\roman.cpp");
-USEUNIT("..\..\src\mgr\swsourcemgr.cpp");
-USEUNIT("..\..\src\mgr\installmgr.cpp");
-USEUNIT("..\..\src\utilfuns\ftpparse.c");
-USEUNIT("..\..\src\modules\filters\osisstrongs.cpp");
-USEUNIT("..\..\src\modules\filters\osismorph.cpp");
-USEUNIT("..\..\src\modules\filters\gbfredletterwords.cpp");
-USEUNIT("..\..\src\utilfuns\swbuf.cpp");
-USEUNIT("..\..\src\utilfuns\utilxml.cpp");
-USEUNIT("..\..\src\modules\filters\osiswebif.cpp");
-USEUNIT("..\..\src\modules\filters\osisheadings.cpp");
-USEUNIT("..\..\src\modules\filters\osishtmlhref.cpp");
-USEUNIT("..\..\src\modules\filters\osislemma.cpp");
-USEUNIT("..\..\src\modules\filters\osisplain.cpp");
-USEUNIT("..\..\src\modules\filters\osisredletterwords.cpp");
-USEUNIT("..\..\src\modules\filters\osisrtf.cpp");
-USEUNIT("..\..\src\modules\filters\osisscripref.cpp");
-USEUNIT("..\..\src\modules\filters\osisfootnotes.cpp");
-USEUNIT("..\..\src\modules\filters\swoptfilter.cpp");
-USEUNIT("..\..\src\mgr\swsearchable.cpp");
-USEUNIT("..\..\src\modules\filters\gbfwebif.cpp");
-USEUNIT("..\..\src\modules\filters\thmlwebif.cpp");
-USEUNIT("..\..\src\utilfuns\utilweb.cpp");
-//---------------------------------------------------------------------------
 #define Library
 
 // To add a file to the library use the Project menu 'Add to Project'.

Index: libsword6icu.bpr
===================================================================
RCS file: /cvs/core/sword/lib/bcppmake/libsword6icu.bpr,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- libsword6icu.bpr	21 Nov 2003 22:30:30 -0000	1.4
+++ libsword6icu.bpr	4 Apr 2004 09:23:55 -0000	1.5
@@ -51,7 +51,7 @@
       ..\..\obj\osisscripref.obj ..\..\obj\swoptfilter.obj 
       ..\..\obj\osislemma.obj ..\..\obj\osisredletterwords.obj 
       ..\..\obj\osishtmlhref.obj ..\..\obj\swsearchable.obj 
-      ..\..\obj\osiswebif.obj"/>
+      ..\..\obj\osiswebif.obj ..\..\obj\osisosis.obj"/>
     <RESFILES value=""/>
     <IDLFILES value=""/>
     <IDLGENFILES value=""/>
@@ -66,7 +66,7 @@
     <PATHRC value=".;"/>
     <PATHASM value=".;"/>
     <LINKER value="TLib"/>
-    <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;_USE_OLD_RW_STL;U_HAVE_PLACEMENT_NEW=0"/>
+    <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;_USE_OLD_RW_STL;U_HAVE_PLACEMENT_NEW=0;_DEBUG"/>
     <SYSDEFINES value="NO_STRICT"/>
     <MAINSOURCE value="libsword.bpf"/>
     <INCLUDEPATH value="..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\apps\windoze\CBuilder5\InstallMgr\curl\include;..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\icu-sword\source\common;..\..\..\icu-sword\source\i18n"/>
@@ -90,8 +90,8 @@
       -I..\..\apps\windoze\CBuilder5\InstallMgr\curl\include -I..\..\include 
       -I$(BCB)\include -I$(BCB)\include\vcl -src_suffix cpp -D_ICU_ -D_ICUSWORD_ 
       -DUSBINARY -boa"/>
-    <CFLAG1 value="-O2 -Vx -Ve -X- -a8 -b- -k- -vi -c -tW -tWM"/>
-    <PFLAGS value="-N2..\..\obj -N0..\..\obj -$Y- -$L- -$D- -$A8 -v -JPHNE -M"/>
+    <CFLAG1 value="-Od -Vx -Ve -X- -r- -a8 -b- -k -y -v -vi- -c -tW -tWM"/>
+    <PFLAGS value="-N2..\..\obj -N0..\..\obj -$Y+ -$W -$O- -$A8 -v -JPHNE -M"/>
     <AFLAGS value="/mx /w2 /zn"/>
     <LFLAGS value="/P512"/>
     <OTHERFILES value=""/>
@@ -232,6 +232,7 @@
       <FILE FILENAME="..\..\src\modules\filters\osishtmlhref.cpp" FORMNAME="" UNITNAME="osishtmlhref" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
       <FILE FILENAME="..\..\src\mgr\swsearchable.cpp" FORMNAME="" UNITNAME="swsearchable" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
       <FILE FILENAME="..\..\src\modules\filters\osiswebif.cpp" FORMNAME="" UNITNAME="osiswebif" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\modules\filters\osisosis.cpp" FORMNAME="" UNITNAME="osisosis" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
   </FILELIST>
   <BUILDTOOLS>
   </BUILDTOOLS>
@@ -296,15 +297,16 @@
 Item0=$(BCB)\source\vcl
 
 [HistoryLists\hlConditionals]
-Count=8
-Item0=_ICU_;_ICUSWORD_;USBINARY;_USE_OLD_RW_STL;U_HAVE_PLACEMENT_NEW=0
-Item1=_ICU_;_ICUSWORD_;USBINARY;_USE_OLD_RW_STL
-Item2=_ICU_;_ICUSWORD_;USBINARY
-Item3=_ICU_;_ICUSWORD_;USBINARY;_DEBUG
-Item4=;USBINARY;_DEBUG
-Item5=_ICU_;_ICUSWORD_
-Item6=_ICU_;_ICUSWORD_;_DEBUG
-Item7=_DEBUG
+Count=9
+Item0=_ICU_;_ICUSWORD_;USBINARY;_USE_OLD_RW_STL;U_HAVE_PLACEMENT_NEW=0;_DEBUG
+Item1=_ICU_;_ICUSWORD_;USBINARY;_USE_OLD_RW_STL;U_HAVE_PLACEMENT_NEW=0
+Item2=_ICU_;_ICUSWORD_;USBINARY;_USE_OLD_RW_STL
+Item3=_ICU_;_ICUSWORD_;USBINARY
+Item4=_ICU_;_ICUSWORD_;USBINARY;_DEBUG
+Item5=;USBINARY;_DEBUG
+Item6=_ICU_;_ICUSWORD_
+Item7=_ICU_;_ICUSWORD_;_DEBUG
+Item8=_DEBUG
 
 [HistoryLists\hlIntOutputDir]
 Count=2