sync with crosswire 20021005-1300

8 files changed, 42 insertions, 29 deletions

diff --git a/apps/windoze/CBuilder5/InstallMgr/InstallMgr.bpr b/apps/windoze/CBuilder5/InstallMgr/InstallMgr.bpr
index 79d6226..5ac73fc 100644
--- a/apps/windoze/CBuilder5/InstallMgr/InstallMgr.bpr
+++ b/apps/windoze/CBuilder5/InstallMgr/InstallMgr.bpr
@@ -28,7 +28,7 @@
     <DEBUGLIBPATH value="$(BCB)\lib\debug"/>
     <RELEASELIBPATH value="$(BCB)\lib\release"/>
     <LINKER value="ilink32"/>
-    <USERDEFINES value="VCL;_ICU_;_ICUSWORD_;USBINARY"/>
+    <USERDEFINES value="VCL;_ICU_;_ICUSWORD_;USBINARY;_DEBUG"/>
     <SYSDEFINES value="NO_STRICT"/>
     <MAINSOURCE value="InstallMgr.cpp"/>
     <INCLUDEPATH value="curl\include;..\BibleCS;..\..\..\..\usr\src\sword\apps\windoze\CBuilder4\InstallMgr;$(BCB)\include;$(BCB)\include\vcl;..\..\..\..\include"/>
@@ -40,17 +40,17 @@
     <IDLCFLAGS value="-I..\BibleCS -I..\..\..\..\usr\src\sword\apps\windoze\CBuilder4\InstallMgr 
       -I$(BCB)\include -I$(BCB)\include\vcl -I..\..\..\..\include -src_suffix 
       cpp -DVCL -boa"/>
-    <CFLAG1 value="-O2 -H=c:\PROGRA~1\borland\CBUILD~2\lib\vcl50.csm -Hc -Vx -Ve -RT- -X- -a8 
-      -b- -k- -vi -c -tW -tWM"/>
-    <PFLAGS value="-$Y- -$L- -$D- -v -JPHNE -M"/>
+    <CFLAG1 value="-vGc -vGt -vGd -Od -H=c:\PROGRA~1\borland\CBUILD~2\lib\vcl50.csm -Hc -Vx 
+      -Ve -RT- -X- -r- -a8 -b- -k -y -v -vi- -c -tW -tWM"/>
+    <PFLAGS value="-$Y+ -$W -$O- -v -JPHNE -M"/>
     <RFLAGS value=""/>
-    <AFLAGS value="/mx /w2 /zn"/>
-    <LFLAGS value="-D&quot;&quot; -aa -Tpe -x -Gn"/>
+    <AFLAGS value="/mx /w2 /zi"/>
+    <LFLAGS value="-D&quot;&quot; -aa -Tpe -x -Gn -v"/>
   </OPTIONS>
   <LINKER>
     <ALLOBJ value="c0w32.obj sysinit.obj $(OBJFILES)"/>
     <ALLRES value="$(RESFILES)"/>
-    <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cp32mt.lib"/>
+    <ALLLIB value="cg32.lib $(LIBFILES) $(LIBRARIES) import32.lib cp32mt.lib"/>
   </LINKER>
   <IDEOPTIONS>
 [Version Info]
@@ -102,16 +102,17 @@ Count=1
 Item0=$(BCB)\source\vcl
 
 [HistoryLists\hlConditionals]
-Count=9
-Item0=VCL;_ICU_;_ICUSWORD_;USBINARY
-Item1=VCL
-Item2=VCL;_DEBUG
-Item3=VCL;__STDC__ true
-Item4=VCL;__STDC__
-Item5=VCL;_MSC_VER
-Item6=VCL __STDC__
-Item7=_DEBUG;VCL
-Item8=_DEBUG
+Count=10
+Item0=VCL;_ICU_;_ICUSWORD_;USBINARY;_DEBUG
+Item1=VCL;_ICU_;_ICUSWORD_;USBINARY
+Item2=VCL
+Item3=VCL;_DEBUG
+Item4=VCL;__STDC__ true
+Item5=VCL;__STDC__
+Item6=VCL;_MSC_VER
+Item7=VCL __STDC__
+Item8=_DEBUG;VCL
+Item9=_DEBUG
 
 [HistoryLists\hlRunParameters]
 Count=1
@@ -130,7 +131,7 @@ RemoteDebug=0
 [Compiler]
 ShowInfoMsgs=0
 LinkDebugVcl=0
-LinkCGLIB=0
+LinkCGLIB=1
 
 [Language]
 ActiveLang=
diff --git a/apps/windoze/CBuilder5/InstallMgr/MainFrm.h b/apps/windoze/CBuilder5/InstallMgr/MainFrm.h
index 47fe65c..afb7d84 100644
--- a/apps/windoze/CBuilder5/InstallMgr/MainFrm.h
+++ b/apps/windoze/CBuilder5/InstallMgr/MainFrm.h
@@ -19,6 +19,8 @@
 #include <NMHttp.hpp>
 #include <Psock.hpp>
 
+using namespace std;
+using namespace sword;
 
 class VersionInfo {
 	public:
diff --git a/apps/windoze/CBuilder5/InstallMgr/RemoteMntFrm.cpp b/apps/windoze/CBuilder5/InstallMgr/RemoteMntFrm.cpp
index 148a7fd..075e05a 100644
--- a/apps/windoze/CBuilder5/InstallMgr/RemoteMntFrm.cpp
+++ b/apps/windoze/CBuilder5/InstallMgr/RemoteMntFrm.cpp
@@ -3,6 +3,9 @@
 #pragma hdrstop
 
 #include "RemoteMntFrm.h"
+
+using namespace std;
+
 //---------------------------------------------------------------------------
 #pragma package(smart_init)
 #pragma resource "*.dfm"
diff --git a/apps/windoze/CBuilder5/InstallMgr/RemoteMntFrm.h b/apps/windoze/CBuilder5/InstallMgr/RemoteMntFrm.h
index 67c825d..fecd1ee 100644
--- a/apps/windoze/CBuilder5/InstallMgr/RemoteMntFrm.h
+++ b/apps/windoze/CBuilder5/InstallMgr/RemoteMntFrm.h
@@ -10,8 +10,10 @@
 #include <ExtCtrls.hpp>
 #include <swconfig.h>
 //---------------------------------------------------------------------------
-class TRemoteMntForm : public TForm
-{
+
+using namespace sword;
+
+class TRemoteMntForm : public TForm {
 __published:	// IDE-managed Components
 	TPanel *Panel1;
 	TPanel *Panel2;
diff --git a/apps/windoze/CBuilder5/InstallMgr/cipherfrm.cpp b/apps/windoze/CBuilder5/InstallMgr/cipherfrm.cpp
index 1e6dd90..203f203 100644
--- a/apps/windoze/CBuilder5/InstallMgr/cipherfrm.cpp
+++ b/apps/windoze/CBuilder5/InstallMgr/cipherfrm.cpp
@@ -5,6 +5,10 @@
 #include "cipherfrm.h"
 #include <swmgr.h>
 #include <swconfig.h>
+
+using namespace std;
+using namespace sword;
+
 //---------------------------------------------------------------------------
 #pragma package(smart_init)
 #pragma resource "*.dfm"
diff --git a/apps/windoze/CBuilder5/InstallMgr/zlib.bpr b/apps/windoze/CBuilder5/InstallMgr/zlib.bpr
index b23ce01..04abf33 100644
--- a/apps/windoze/CBuilder5/InstallMgr/zlib.bpr
+++ b/apps/windoze/CBuilder5/InstallMgr/zlib.bpr
@@ -33,7 +33,7 @@
     <PATHRC value=".;"/>
     <PATHASM value=".;"/>
     <LINKER value="TLib"/>
-    <USERDEFINES value=""/>
+    <USERDEFINES value="_DEBUG"/>
     <SYSDEFINES value="_RTLDLL;NO_STRICT"/>
     <MAINSOURCE value="zlib.bpf"/>
     <INCLUDEPATH value="..\..\..\..\src\utilfuns\zlib;$(BCB)\include;$(BCB)\include\vcl;..\..\..\..\include"/>
@@ -44,14 +44,15 @@
   <OPTIONS>
     <IDLCFLAGS value="-I..\..\..\..\src\utilfuns\zlib -I$(BCB)\include -I$(BCB)\include\vcl 
       -I..\..\..\..\include -src_suffix cpp -boa"/>
-    <CFLAG1 value="-O2 -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -X- -a8 -b- -k- -vi -c -tW -tWM"/>
-    <PFLAGS value="-$Y- -$L- -$D- -v -JPHNE -M"/>
-    <AFLAGS value="/mx /w2 /zn"/>
+    <CFLAG1 value="-vGc -vGt -vGd -Od -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -X- -r- -a8 -b- -k 
+      -y -v -vi- -c -tW -tWM"/>
+    <PFLAGS value="-$Y+ -$W -$O- -v -JPHNE -M"/>
+    <AFLAGS value="/mx /w2 /zi"/>
     <LFLAGS value=""/>
   </OPTIONS>
   <LINKER>
     <ALLOBJ value="$(OBJFILES)"/>
-    <ALLLIB value=""/>
+    <ALLLIB value="cg32.lib "/>
   </LINKER>
   <IDEOPTIONS>
 [Version Info]
@@ -111,7 +112,7 @@ RemoteDebug=0
 [Compiler]
 ShowInfoMsgs=0
 LinkDebugVcl=0
-LinkCGLIB=0
+LinkCGLIB=1
 
 [Language]
 ActiveLang=
diff --git a/utilities/bcppmake/libsword.bpf b/utilities/bcppmake/libsword.bpf
index 62bc2d7..515f676 100644
--- a/utilities/bcppmake/libsword.bpf
+++ b/utilities/bcppmake/libsword.bpf
@@ -85,7 +85,6 @@ 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\utilfuns\roman.c");
 USEUNIT("..\..\src\modules\comments\zcom\zcom.cpp");
 USEUNIT("..\..\src\modules\lexdict\rawld4\rawld4.cpp");
 USEUNIT("..\..\src\modules\common\zipcomprs.cpp");
@@ -112,6 +111,7 @@ 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");
 //---------------------------------------------------------------------------
 #define Library
 
diff --git a/utilities/bcppmake/libsword.bpr b/utilities/bcppmake/libsword.bpr
index 22a1d97..39b35a8 100644
--- a/utilities/bcppmake/libsword.bpr
+++ b/utilities/bcppmake/libsword.bpr
@@ -70,7 +70,7 @@
       ..\..\src\modules\filters\utf8nfc.obj 
       ..\..\src\modules\filters\utf8nfkd.obj 
       ..\..\src\modules\filters\utf8transliterator.obj 
-      ..\..\src\utilfuns\roman.obj ..\..\src\modules\comments\zcom\zcom.obj 
+      ..\..\src\modules\comments\zcom\zcom.obj 
       ..\..\src\modules\lexdict\rawld4\rawld4.obj 
       ..\..\src\modules\common\zipcomprs.obj 
       ..\..\src\modules\lexdict\zld\zld.obj 
@@ -85,7 +85,7 @@
       ..\..\src\modules\filters\greeklexattribs.obj ..\..\src\mgr\swcacher.obj 
       ..\..\src\modules\filters\gbfosis.obj 
       ..\..\src\modules\filters\thmlosis.obj ..\..\src\mgr\encfiltmgr.obj 
-      ..\..\src\mgr\markupfiltmgr.obj"/>
+      ..\..\src\mgr\markupfiltmgr.obj ..\..\src\utilfuns\roman.obj"/>
     <RESFILES value=""/>
     <IDLFILES value=""/>
     <IDLGENFILES value=""/>