sync with crosswire 20020830-1300

27 files changed, 96 insertions, 81 deletions

diff --git a/apps/windoze/CBuilder5/BibleCS/RxRichEditX.cpp b/apps/windoze/CBuilder5/BibleCS/RxRichEditX.cpp
index 5e53439..6907cc4 100644
--- a/apps/windoze/CBuilder5/BibleCS/RxRichEditX.cpp
+++ b/apps/windoze/CBuilder5/BibleCS/RxRichEditX.cpp
@@ -470,8 +470,10 @@ void TRxRichEditX::fillWithVerses(SWModule *module, ListKey *verses, bool headin
 			else	{
 				char *buf2 = 0;
 				stdstr(&buf2, (const char *)*verses);
+				toupperstr_utf8(buf2);
 				module->getRawEntry();
 				strcpy(buf, module->KeyText());
+				toupperstr_utf8(buf);
 				int i;
 				for (i = 0; i < strlen(buf); i++) {
 					if ((buf[i] == buf2[i]) || (buf[i] != '0'))
@@ -479,7 +481,8 @@ void TRxRichEditX::fillWithVerses(SWModule *module, ListKey *verses, bool headin
 				}
 				char *buf3 = buf+i;
 				for (i = 0; i < strlen(buf2) && (i < strlen(buf3)); i++) {
-					if (buf3[i] != buf2[i])
+					if ((buf3[i] != buf2[i]) &&
+							(SW_toupper(buf3[i]) != SW_toupper(buf2[i])))
 						break;
 				}
 				if (!i || i < (strlen(buf2)/2)) {
diff --git a/apps/windoze/CBuilder5/BibleCS/mainfrm.cpp b/apps/windoze/CBuilder5/BibleCS/mainfrm.cpp
index 8d79c1d..511d501 100644
--- a/apps/windoze/CBuilder5/BibleCS/mainfrm.cpp
+++ b/apps/windoze/CBuilder5/BibleCS/mainfrm.cpp
@@ -787,7 +787,7 @@ void TForm1::i12ize(const char *lang) {
 	Optionsfrm->AutoLayout->Caption = _tr("Autosave Screen Layout");
 	Optionsfrm->HintStrongs->Caption = _tr("Show Lexicon Lookup Over Strongs Numbers");
 	Optionsfrm->HintVLists->Caption = _tr("Show Preview Over Verse Lists");
-	Optionsfrm->HintWords->Caption = _tr("Show Glossary Lookup Over Words (ALT-W)");
+	Optionsfrm->HintWords->Caption = _tr("Show Glossary Lookup Over Words (CTRL-W)");
 	Optionsfrm->OkBtn->Caption = _tr("OK");
 	Optionsfrm->CancelBtn->Caption = _tr("Cancel");
 	Optionsfrm->gbDefModules->Caption = _tr("Original Language Support - Default Modules");
diff --git a/apps/windoze/CBuilder5/BibleCS/sword.bpr b/apps/windoze/CBuilder5/BibleCS/sword.bpr
index 25de7c2..cab9be4 100644
--- a/apps/windoze/CBuilder5/BibleCS/sword.bpr
+++ b/apps/windoze/CBuilder5/BibleCS/sword.bpr
@@ -25,9 +25,9 @@
       versesel.dfm RangeMaintFrm.dfm ModVisFrm.dfm DevOfTheDay.dfm 
       SplashPage.dfm FontSel.dfm StudyProfessor.dfm rtfhintfrm.dfm 
       PreviewForm.dfm PrintFrm.dfm"/>
-    <LIBFILES value="swordlib.lib ..\..\..\..\..\icu-sword\as_is\borland\icudatab.lib 
-      ..\..\..\..\..\icu-sword\as_is\borland\icucommon.lib 
-      ..\..\..\..\..\icu-sword\as_is\borland\icui18n.lib"/>
+    <LIBFILES value="swordlib.lib ..\..\..\..\..\icu-sword\as_is\win32\borland\icudatab.lib 
+      ..\..\..\..\..\icu-sword\as_is\win32\borland\icucommon.lib 
+      ..\..\..\..\..\icu-sword\as_is\win32\borland\icui18n.lib"/>
     <LIBRARIES value="bcbie50.lib vcljpg50.lib nmfast50.lib vclbde50.lib vcldb50.lib vclx50.lib 
       vcl50.lib"/>
     <SPARELIBS value="vcl50.lib vclx50.lib vcldb50.lib vclbde50.lib nmfast50.lib vcljpg50.lib 
diff --git a/apps/windoze/CBuilder5/BibleCS/sword.cpp b/apps/windoze/CBuilder5/BibleCS/sword.cpp
index a36edd1..a79b38b 100644
--- a/apps/windoze/CBuilder5/BibleCS/sword.cpp
+++ b/apps/windoze/CBuilder5/BibleCS/sword.cpp
@@ -31,7 +31,7 @@ USEOBJ("rxlib\Vclutils.obj");
 USEOBJ("rxlib\Rxcconst.obj");
 USEOBJ("rxlib\Rxconst.obj");
 USEFORM("StudyProfessor.cpp", Form3);
-USELIB("..\..\..\..\..\icu-sword\as_is\borland\icudatab.lib");
+USELIB("..\..\..\..\..\icu-sword\as_is\win32\borland\icudatab.lib");
 USEOBJ("rxlib\RxRichEd.obj");
 USEOBJ("rxlib\Maxmin.obj");
 USEUNIT("TModuleFonts.cpp");
@@ -44,8 +44,8 @@ USEOBJ("TntUnicodeControls\TntControls.obj");
 USEOBJ("TntUnicodeControls\TntForms.obj");
 USEOBJ("TntUnicodeControls\TntStdCtrls.obj");
 USEOBJ("TntUnicodeControls\TntClasses.obj");
-USELIB("..\..\..\..\..\icu-sword\as_is\borland\icucommon.lib");
-USELIB("..\..\..\..\..\icu-sword\as_is\borland\icui18n.lib");
+USELIB("..\..\..\..\..\icu-sword\as_is\win32\borland\icucommon.lib");
+USELIB("..\..\..\..\..\icu-sword\as_is\win32\borland\icui18n.lib");
 //---------------------------------------------------------------------------
 WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow) {
 
diff --git a/apps/windoze/CBuilder5/BibleCS/sword.res b/apps/windoze/CBuilder5/BibleCS/sword.res
index cc86a9a..b5c659e 100644
--- a/apps/windoze/CBuilder5/BibleCS/sword.res
+++ b/apps/windoze/CBuilder5/BibleCS/sword.res
diff --git a/apps/windoze/CBuilder5/BibleCS/swordprj.bpg b/apps/windoze/CBuilder5/BibleCS/swordprj.bpg
index c5e4dab..87cc874 100644
--- a/apps/windoze/CBuilder5/BibleCS/swordprj.bpg
+++ b/apps/windoze/CBuilder5/BibleCS/swordprj.bpg
@@ -21,11 +21,11 @@ swordlib.lib: swordlib.bpr
 sword.exe: sword.bpr
   $(MAKE)
 
-icui18n.lib: ..\..\..\..\..\icu-sword\as_is\borland\i18n.bpr
+icui18n.lib: ..\..\..\..\..\icu-sword\as_is\win32\borland\i18n.bpr
   $(ROOT)\bin\bpr2mak -t$(ROOT)\bin\deflib.bmk $**
   $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
 
-icucommon.lib: ..\..\..\..\..\icu-sword\as_is\borland\common.bpr
+icucommon.lib: ..\..\..\..\..\icu-sword\as_is\win32\borland\common.bpr
   $(ROOT)\bin\bpr2mak -t$(ROOT)\bin\deflib.bmk $**
   $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
 
diff --git a/utilities/bcppmake/cipherraw.bpf b/utilities/bcppmake/cipherraw.bpf
index 03a9c8a..3df5169 100644
--- a/utilities/bcppmake/cipherraw.bpf
+++ b/utilities/bcppmake/cipherraw.bpf
@@ -1,8 +1,8 @@
 USEUNIT("..\cipherraw.cpp");
 USELIB("libsword.lib");
-USELIB("..\..\..\icu-sword\as_is\borland\icui18n.lib");
-USELIB("..\..\..\icu-sword\as_is\borland\icudatab.lib");
-USELIB("..\..\..\icu-sword\as_is\borland\icucommon.lib");
+USELIB("..\..\..\icu-sword\as_is\win32\borland\icui18n.lib");
+USELIB("..\..\..\icu-sword\as_is\win32\borland\icudatab.lib");
+USELIB("..\..\..\icu-sword\as_is\win32\borland\icucommon.lib");
 //---------------------------------------------------------------------------
 This file is used by the project manager only and should be treated like the project file
 
diff --git a/utilities/bcppmake/cipherraw.bpr b/utilities/bcppmake/cipherraw.bpr
index 3034dcf..096e325 100644
--- a/utilities/bcppmake/cipherraw.bpr
+++ b/utilities/bcppmake/cipherraw.bpr
@@ -6,11 +6,13 @@
     <PROJECT value="cipherraw.exe"/>
     <OBJFILES value="..\cipherraw.obj"/>
     <RESFILES value=""/>
+    <IDLFILES value=""/>
+    <IDLGENFILES value=""/>
     <DEFFILE value=""/>
     <RESDEPEN value="$(RESFILES)"/>
-    <LIBFILES value="libsword.lib ..\..\..\icu-sword\as_is\borland\icui18n.lib 
-      ..\..\..\icu-sword\as_is\borland\icudatab.lib 
-      ..\..\..\icu-sword\as_is\borland\icucommon.lib"/>
+    <LIBFILES value="libsword.lib ..\..\..\icu-sword\as_is\win32\borland\icui18n.lib 
+      ..\..\..\icu-sword\as_is\win32\borland\icudatab.lib 
+      ..\..\..\icu-sword\as_is\win32\borland\icucommon.lib"/>
     <LIBRARIES value=""/>
     <SPARELIBS value=""/>
     <PACKAGES value="VCL50.bpi VCLX50.bpi bcbsmp50.bpi QRPT50.bpi VCLDB50.bpi VCLBDE50.bpi 
diff --git a/utilities/bcppmake/imp2gbs.bpf b/utilities/bcppmake/imp2gbs.bpf
index cde3c39..8a4a029 100644
--- a/utilities/bcppmake/imp2gbs.bpf
+++ b/utilities/bcppmake/imp2gbs.bpf
@@ -1,8 +1,8 @@
 USEUNIT("..\imp2gbs.cpp");
 USELIB("libsword.lib");
-USELIB("..\..\..\icu-sword\as_is\borland\icui18n.lib");
-USELIB("..\..\..\icu-sword\as_is\borland\icudatab.lib");
-USELIB("..\..\..\icu-sword\as_is\borland\icucommon.lib");
+USELIB("..\..\..\icu-sword\as_is\win32\borland\icui18n.lib");
+USELIB("..\..\..\icu-sword\as_is\win32\borland\icudatab.lib");
+USELIB("..\..\..\icu-sword\as_is\win32\borland\icucommon.lib");
 //---------------------------------------------------------------------------
 This file is used by the project manager only and should be treated like the project file
 
diff --git a/utilities/bcppmake/imp2gbs.bpr b/utilities/bcppmake/imp2gbs.bpr
index 667bcfe..3323a1e 100644
--- a/utilities/bcppmake/imp2gbs.bpr
+++ b/utilities/bcppmake/imp2gbs.bpr
@@ -6,11 +6,13 @@
     <PROJECT value="imp2gbs.exe"/>
     <OBJFILES value="..\imp2gbs.obj"/>
     <RESFILES value=""/>
+    <IDLFILES value=""/>
+    <IDLGENFILES value=""/>
     <DEFFILE value=""/>
     <RESDEPEN value="$(RESFILES)"/>
-    <LIBFILES value="libsword.lib ..\..\..\icu-sword\as_is\borland\icui18n.lib 
-      ..\..\..\icu-sword\as_is\borland\icudatab.lib 
-      ..\..\..\icu-sword\as_is\borland\icucommon.lib"/>
+    <LIBFILES value="libsword.lib ..\..\..\icu-sword\as_is\win32\borland\icui18n.lib 
+      ..\..\..\icu-sword\as_is\win32\borland\icudatab.lib 
+      ..\..\..\icu-sword\as_is\win32\borland\icucommon.lib"/>
     <LIBRARIES value=""/>
     <SPARELIBS value=""/>
     <PACKAGES value="VCL50.bpi VCLX50.bpi bcbsmp50.bpi QRPT50.bpi VCLDB50.bpi VCLBDE50.bpi 
diff --git a/utilities/bcppmake/imp2ld.bpf b/utilities/bcppmake/imp2ld.bpf
index 82171c2..cbaf592 100644
--- a/utilities/bcppmake/imp2ld.bpf
+++ b/utilities/bcppmake/imp2ld.bpf
@@ -1,8 +1,8 @@
 USEUNIT("..\imp2ld.cpp");
 USELIB("libsword.lib");
-USELIB("..\..\..\icu-sword\as_is\borland\icui18n.lib");
-USELIB("..\..\..\icu-sword\as_is\borland\icudatab.lib");
-USELIB("..\..\..\icu-sword\as_is\borland\icucommon.lib");
+USELIB("..\..\..\icu-sword\as_is\win32\borland\icui18n.lib");
+USELIB("..\..\..\icu-sword\as_is\win32\borland\icudatab.lib");
+USELIB("..\..\..\icu-sword\as_is\win32\borland\icucommon.lib");
 //---------------------------------------------------------------------------
 This file is used by the project manager only and should be treated like the project file
 
diff --git a/utilities/bcppmake/imp2ld.bpr b/utilities/bcppmake/imp2ld.bpr
index 8148309..55cc403 100644
--- a/utilities/bcppmake/imp2ld.bpr
+++ b/utilities/bcppmake/imp2ld.bpr
@@ -6,11 +6,13 @@
     <PROJECT value="imp2ld.exe"/>
     <OBJFILES value="..\imp2ld.obj"/>
     <RESFILES value=""/>
+    <IDLFILES value=""/>
+    <IDLGENFILES value=""/>
     <DEFFILE value=""/>
     <RESDEPEN value="$(RESFILES)"/>
-    <LIBFILES value="libsword.lib ..\..\..\icu-sword\as_is\borland\icui18n.lib 
-      ..\..\..\icu-sword\as_is\borland\icudatab.lib 
-      ..\..\..\icu-sword\as_is\borland\icucommon.lib"/>
+    <LIBFILES value="libsword.lib ..\..\..\icu-sword\as_is\win32\borland\icui18n.lib 
+      ..\..\..\icu-sword\as_is\win32\borland\icudatab.lib 
+      ..\..\..\icu-sword\as_is\win32\borland\icucommon.lib"/>
     <LIBRARIES value=""/>
     <SPARELIBS value=""/>
     <PACKAGES value="VCL50.bpi VCLX50.bpi bcbsmp50.bpi QRPT50.bpi VCLDB50.bpi VCLBDE50.bpi 
diff --git a/utilities/bcppmake/imp2vs.bpf b/utilities/bcppmake/imp2vs.bpf
index 44fd7a4..f96f64d 100644
--- a/utilities/bcppmake/imp2vs.bpf
+++ b/utilities/bcppmake/imp2vs.bpf
@@ -1,8 +1,8 @@
 USEUNIT("..\imp2vs.cpp");
 USELIB("libsword.lib");
-USELIB("..\..\..\icu-sword\as_is\borland\icui18n.lib");
-USELIB("..\..\..\icu-sword\as_is\borland\icudatab.lib");
-USELIB("..\..\..\icu-sword\as_is\borland\icucommon.lib");
+USELIB("..\..\..\icu-sword\as_is\win32\borland\icui18n.lib");
+USELIB("..\..\..\icu-sword\as_is\win32\borland\icudatab.lib");
+USELIB("..\..\..\icu-sword\as_is\win32\borland\icucommon.lib");
 //---------------------------------------------------------------------------
 This file is used by the project manager only and should be treated like the project file
 
diff --git a/utilities/bcppmake/imp2vs.bpr b/utilities/bcppmake/imp2vs.bpr
index 4b69626..b08909c 100644
--- a/utilities/bcppmake/imp2vs.bpr
+++ b/utilities/bcppmake/imp2vs.bpr
@@ -6,11 +6,13 @@
     <PROJECT value="imp2vs.exe"/>
     <OBJFILES value="..\imp2vs.obj"/>
     <RESFILES value=""/>
+    <IDLFILES value=""/>
+    <IDLGENFILES value=""/>
     <DEFFILE value=""/>
     <RESDEPEN value="$(RESFILES)"/>
-    <LIBFILES value="libsword.lib ..\..\..\icu-sword\as_is\borland\icui18n.lib 
-      ..\..\..\icu-sword\as_is\borland\icudatab.lib 
-      ..\..\..\icu-sword\as_is\borland\icucommon.lib"/>
+    <LIBFILES value="libsword.lib ..\..\..\icu-sword\as_is\win32\borland\icui18n.lib 
+      ..\..\..\icu-sword\as_is\win32\borland\icudatab.lib 
+      ..\..\..\icu-sword\as_is\win32\borland\icucommon.lib"/>
     <LIBRARIES value=""/>
     <SPARELIBS value=""/>
     <PACKAGES value="VCL50.bpi VCLX50.bpi bcbsmp50.bpi QRPT50.bpi VCLDB50.bpi VCLBDE50.bpi 
diff --git a/utilities/bcppmake/mkfastmod.bpf b/utilities/bcppmake/mkfastmod.bpf
index 9874ba2..79f59ae 100644
--- a/utilities/bcppmake/mkfastmod.bpf
+++ b/utilities/bcppmake/mkfastmod.bpf
@@ -1,8 +1,8 @@
 USEUNIT("..\mkfastmod.cpp");
 USELIB("libsword.lib");
-USELIB("..\..\..\icu-sword\as_is\borland\icui18n.lib");
-USELIB("..\..\..\icu-sword\as_is\borland\icudatab.lib");
-USELIB("..\..\..\icu-sword\as_is\borland\icucommon.lib");
+USELIB("..\..\..\icu-sword\as_is\win32\borland\icui18n.lib");
+USELIB("..\..\..\icu-sword\as_is\win32\borland\icudatab.lib");
+USELIB("..\..\..\icu-sword\as_is\win32\borland\icucommon.lib");
 //---------------------------------------------------------------------------
 This file is used by the project manager only and should be treated like the project file
 
diff --git a/utilities/bcppmake/mkfastmod.bpr b/utilities/bcppmake/mkfastmod.bpr
index 556cf35..4eaacd9 100644
--- a/utilities/bcppmake/mkfastmod.bpr
+++ b/utilities/bcppmake/mkfastmod.bpr
@@ -6,11 +6,13 @@
     <PROJECT value="mkfastmod.exe"/>
     <OBJFILES value="..\mkfastmod.obj"/>
     <RESFILES value=""/>
+    <IDLFILES value=""/>
+    <IDLGENFILES value=""/>
     <DEFFILE value=""/>
     <RESDEPEN value="$(RESFILES)"/>
-    <LIBFILES value="libsword.lib ..\..\..\icu-sword\as_is\borland\icui18n.lib 
-      ..\..\..\icu-sword\as_is\borland\icudatab.lib 
-      ..\..\..\icu-sword\as_is\borland\icucommon.lib"/>
+    <LIBFILES value="libsword.lib ..\..\..\icu-sword\as_is\win32\borland\icui18n.lib 
+      ..\..\..\icu-sword\as_is\win32\borland\icudatab.lib 
+      ..\..\..\icu-sword\as_is\win32\borland\icucommon.lib"/>
     <LIBRARIES value=""/>
     <SPARELIBS value=""/>
     <PACKAGES value="VCL50.bpi VCLX50.bpi bcbsmp50.bpi QRPT50.bpi VCLDB50.bpi VCLBDE50.bpi 
diff --git a/utilities/bcppmake/mod2imp.bpf b/utilities/bcppmake/mod2imp.bpf
index 62aa5e1..c21a13d 100644
--- a/utilities/bcppmake/mod2imp.bpf
+++ b/utilities/bcppmake/mod2imp.bpf
@@ -1,8 +1,8 @@
 USEUNIT("..\mod2imp.cpp");
 USELIB("libsword.lib");
-USELIB("..\..\..\icu-sword\as_is\borland\icui18n.lib");
-USELIB("..\..\..\icu-sword\as_is\borland\icudatab.lib");
-USELIB("..\..\..\icu-sword\as_is\borland\icucommon.lib");
+USELIB("..\..\..\icu-sword\as_is\win32\borland\icui18n.lib");
+USELIB("..\..\..\icu-sword\as_is\win32\borland\icudatab.lib");
+USELIB("..\..\..\icu-sword\as_is\win32\borland\icucommon.lib");
 //---------------------------------------------------------------------------
 This file is used by the project manager only and should be treated like the project file
 
diff --git a/utilities/bcppmake/mod2imp.bpr b/utilities/bcppmake/mod2imp.bpr
index 428b4e2..fdbadf7 100644
--- a/utilities/bcppmake/mod2imp.bpr
+++ b/utilities/bcppmake/mod2imp.bpr
@@ -6,11 +6,13 @@
     <PROJECT value="mod2imp.exe"/>
     <OBJFILES value="..\mod2imp.obj"/>
     <RESFILES value=""/>
+    <IDLFILES value=""/>
+    <IDLGENFILES value=""/>
     <DEFFILE value=""/>
     <RESDEPEN value="$(RESFILES)"/>
-    <LIBFILES value="libsword.lib ..\..\..\icu-sword\as_is\borland\icui18n.lib 
-      ..\..\..\icu-sword\as_is\borland\icudatab.lib 
-      ..\..\..\icu-sword\as_is\borland\icucommon.lib"/>
+    <LIBFILES value="libsword.lib ..\..\..\icu-sword\as_is\win32\borland\icui18n.lib 
+      ..\..\..\icu-sword\as_is\win32\borland\icudatab.lib 
+      ..\..\..\icu-sword\as_is\win32\borland\icucommon.lib"/>
     <LIBRARIES value=""/>
     <SPARELIBS value=""/>
     <PACKAGES value="VCL50.bpi VCLX50.bpi bcbsmp50.bpi QRPT50.bpi VCLDB50.bpi VCLBDE50.bpi 
diff --git a/utilities/bcppmake/mod2vpl.bpf b/utilities/bcppmake/mod2vpl.bpf
index ad1e02c..a0f2da4 100644
--- a/utilities/bcppmake/mod2vpl.bpf
+++ b/utilities/bcppmake/mod2vpl.bpf
@@ -1,8 +1,8 @@
 USEUNIT("..\mod2vpl.cpp");
 USELIB("libsword.lib");
-USELIB("..\..\..\icu-sword\as_is\borland\icui18n.lib");
-USELIB("..\..\..\icu-sword\as_is\borland\icucommon.lib");
-USELIB("..\..\..\icu-sword\as_is\borland\icudatab.lib");
+USELIB("..\..\..\icu-sword\as_is\win32\borland\icui18n.lib");
+USELIB("..\..\..\icu-sword\as_is\win32\borland\icudatab.lib");
+USELIB("..\..\..\icu-sword\as_is\win32\borland\icucommon.lib");
 //---------------------------------------------------------------------------
 This file is used by the project manager only and should be treated like the project file
 
diff --git a/utilities/bcppmake/mod2vpl.bpr b/utilities/bcppmake/mod2vpl.bpr
index 364b642..287d6c8 100644
--- a/utilities/bcppmake/mod2vpl.bpr
+++ b/utilities/bcppmake/mod2vpl.bpr
@@ -6,11 +6,13 @@
     <PROJECT value="mod2vpl.exe"/>
     <OBJFILES value="..\mod2vpl.obj"/>
     <RESFILES value=""/>
+    <IDLFILES value=""/>
+    <IDLGENFILES value=""/>
     <DEFFILE value=""/>
     <RESDEPEN value="$(RESFILES)"/>
-    <LIBFILES value="libsword.lib ..\..\..\icu-sword\as_is\borland\icui18n.lib 
-      ..\..\..\icu-sword\as_is\borland\icucommon.lib 
-      ..\..\..\icu-sword\as_is\borland\icudatab.lib"/>
+    <LIBFILES value="libsword.lib ..\..\..\icu-sword\as_is\win32\borland\icui18n.lib 
+      ..\..\..\icu-sword\as_is\win32\borland\icudatab.lib 
+      ..\..\..\icu-sword\as_is\win32\borland\icucommon.lib"/>
     <LIBRARIES value=""/>
     <SPARELIBS value=""/>
     <PACKAGES value="VCL50.bpi VCLX50.bpi bcbsmp50.bpi QRPT50.bpi VCLDB50.bpi VCLBDE50.bpi 
diff --git a/utilities/bcppmake/mod2zmod.bpf b/utilities/bcppmake/mod2zmod.bpf
index a5ab3aa..ae870d7 100644
--- a/utilities/bcppmake/mod2zmod.bpf
+++ b/utilities/bcppmake/mod2zmod.bpf
@@ -1,8 +1,8 @@
 USEUNIT("..\mod2zmod.cpp");
 USELIB("libsword.lib");
-USELIB("..\..\..\icu-sword\as_is\borland\icui18n.lib");
-USELIB("..\..\..\icu-sword\as_is\borland\icudatab.lib");
-USELIB("..\..\..\icu-sword\as_is\borland\icucommon.lib");
+USELIB("..\..\..\icu-sword\as_is\win32\borland\icui18n.lib");
+USELIB("..\..\..\icu-sword\as_is\win32\borland\icudatab.lib");
+USELIB("..\..\..\icu-sword\as_is\win32\borland\icucommon.lib");
 //---------------------------------------------------------------------------
 This file is used by the project manager only and should be treated like the project file
 
diff --git a/utilities/bcppmake/mod2zmod.bpr b/utilities/bcppmake/mod2zmod.bpr
index 00e8a76..0aef015 100644
--- a/utilities/bcppmake/mod2zmod.bpr
+++ b/utilities/bcppmake/mod2zmod.bpr
@@ -6,11 +6,13 @@
     <PROJECT value="mod2zmod.exe"/>
     <OBJFILES value="..\mod2zmod.obj"/>
     <RESFILES value=""/>
+    <IDLFILES value=""/>
+    <IDLGENFILES value=""/>
     <DEFFILE value=""/>
     <RESDEPEN value="$(RESFILES)"/>
-    <LIBFILES value="libsword.lib ..\..\..\icu-sword\as_is\borland\icui18n.lib 
-      ..\..\..\icu-sword\as_is\borland\icudatab.lib 
-      ..\..\..\icu-sword\as_is\borland\icucommon.lib"/>
+    <LIBFILES value="libsword.lib ..\..\..\icu-sword\as_is\win32\borland\icui18n.lib 
+      ..\..\..\icu-sword\as_is\win32\borland\icudatab.lib 
+      ..\..\..\icu-sword\as_is\win32\borland\icucommon.lib"/>
     <LIBRARIES value=""/>
     <SPARELIBS value=""/>
     <PACKAGES value="VCL50.bpi VCLX50.bpi bcbsmp50.bpi QRPT50.bpi VCLDB50.bpi VCLBDE50.bpi 
diff --git a/utilities/bcppmake/thml2gbs.bpf b/utilities/bcppmake/thml2gbs.bpf
index d3b7342..d153611 100644
--- a/utilities/bcppmake/thml2gbs.bpf
+++ b/utilities/bcppmake/thml2gbs.bpf
@@ -1,8 +1,8 @@
 USEUNIT("..\thml2gbs.cpp");
 USELIB("libsword.lib");
-USELIB("..\..\..\icu-sword\as_is\borland\icui18n.lib");
-USELIB("..\..\..\icu-sword\as_is\borland\icudatab.lib");
-USELIB("..\..\..\icu-sword\as_is\borland\icucommon.lib");
+USELIB("..\..\..\icu-sword\as_is\win32\borland\icui18n.lib");
+USELIB("..\..\..\icu-sword\as_is\win32\borland\icudatab.lib");
+USELIB("..\..\..\icu-sword\as_is\win32\borland\icucommon.lib");
 //---------------------------------------------------------------------------
 This file is used by the project manager only and should be treated like the project file
 
diff --git a/utilities/bcppmake/thml2gbs.bpr b/utilities/bcppmake/thml2gbs.bpr
index d745a17..a6ff506 100644
--- a/utilities/bcppmake/thml2gbs.bpr
+++ b/utilities/bcppmake/thml2gbs.bpr
@@ -6,11 +6,13 @@
     <PROJECT value="thml2gbs.exe"/>
     <OBJFILES value="..\thml2gbs.obj"/>
     <RESFILES value=""/>
+    <IDLFILES value=""/>
+    <IDLGENFILES value=""/>
     <DEFFILE value=""/>
     <RESDEPEN value="$(RESFILES)"/>
-    <LIBFILES value="libsword.lib ..\..\..\icu-sword\as_is\borland\icui18n.lib 
-      ..\..\..\icu-sword\as_is\borland\icudatab.lib 
-      ..\..\..\icu-sword\as_is\borland\icucommon.lib"/>
+    <LIBFILES value="libsword.lib ..\..\..\icu-sword\as_is\win32\borland\icui18n.lib 
+      ..\..\..\icu-sword\as_is\win32\borland\icudatab.lib 
+      ..\..\..\icu-sword\as_is\win32\borland\icucommon.lib"/>
     <LIBRARIES value=""/>
     <SPARELIBS value=""/>
     <PACKAGES value="Vcl50.bpi Vclx50.bpi bcbsmp50.bpi Qrpt50.bpi Vcldb50.bpi Vclbde50.bpi 
diff --git a/utilities/bcppmake/utilities.bpg b/utilities/bcppmake/utilities.bpg
index 10027c5..9e36582 100644
--- a/utilities/bcppmake/utilities.bpg
+++ b/utilities/bcppmake/utilities.bpg
@@ -9,9 +9,9 @@ MAKE = $(ROOT)\bin\make.exe -$(MAKEFLAGS) -f$**
 DCC = $(ROOT)\bin\dcc32.exe $**
 BRCC = $(ROOT)\bin\brcc32.exe $**
 #------------------------------------------------------------------------------
-PROJECTS = icucommon.lib icui18n.lib libsword.lib mod2vpl.exe vpl2mod.exe \
-  mkfastmod.exe imp2gbs.exe imp2ld.exe imp2vs.exe thml2gbs.exe mod2zmod.exe \
-  mod2imp.exe cipherraw.exe stepdump.exe step2vpl.exe
+PROJECTS = libsword.lib mod2vpl.exe vpl2mod.exe mkfastmod.exe imp2gbs.exe \
+  imp2ld.exe imp2vs.exe thml2gbs.exe mod2zmod.exe mod2imp.exe cipherraw.exe \
+  stepdump.exe step2vpl.exe
 #------------------------------------------------------------------------------
 default: $(PROJECTS)
 #------------------------------------------------------------------------------
@@ -60,14 +60,6 @@ mod2imp.exe: mod2imp.bpr
   $(ROOT)\bin\bpr2mak $**
   $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
 
-icucommon.lib: ..\..\..\icu-sword\as_is\borland\common.bpr
-  $(ROOT)\bin\bpr2mak -t$(ROOT)\bin\deflib.bmk $**
-  $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
-
-icui18n.lib: ..\..\..\icu-sword\as_is\borland\i18n.bpr
-  $(ROOT)\bin\bpr2mak -t$(ROOT)\bin\deflib.bmk $**
-  $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
-
 stepdump.exe: stepdump.bpr
   $(ROOT)\bin\bpr2mak $**
   $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
diff --git a/utilities/bcppmake/vpl2mod.bpf b/utilities/bcppmake/vpl2mod.bpf
index 5172b1c..eb4b2c6 100644
--- a/utilities/bcppmake/vpl2mod.bpf
+++ b/utilities/bcppmake/vpl2mod.bpf
@@ -1,8 +1,8 @@
 USEUNIT("..\vpl2mod.cpp");
 USELIB("libsword.lib");
-USELIB("..\..\..\icu-sword\as_is\borland\icui18n.lib");
-USELIB("..\..\..\icu-sword\as_is\borland\icucommon.lib");
-USELIB("..\..\..\icu-sword\as_is\borland\icudatab.lib");
+USELIB("..\..\..\icu-sword\as_is\win32\borland\icui18n.lib");
+USELIB("..\..\..\icu-sword\as_is\win32\borland\icudatab.lib");
+USELIB("..\..\..\icu-sword\as_is\win32\borland\icucommon.lib");
 //---------------------------------------------------------------------------
 This file is used by the project manager only and should be treated like the project file
 
diff --git a/utilities/bcppmake/vpl2mod.bpr b/utilities/bcppmake/vpl2mod.bpr
index 8aaca9e..9eeb06d 100644
--- a/utilities/bcppmake/vpl2mod.bpr
+++ b/utilities/bcppmake/vpl2mod.bpr
@@ -6,11 +6,13 @@
     <PROJECT value="vpl2mod.exe"/>
     <OBJFILES value="..\vpl2mod.obj"/>
     <RESFILES value=""/>
+    <IDLFILES value=""/>
+    <IDLGENFILES value=""/>
     <DEFFILE value=""/>
     <RESDEPEN value="$(RESFILES)"/>
-    <LIBFILES value="libsword.lib ..\..\..\icu-sword\as_is\borland\icui18n.lib 
-      ..\..\..\icu-sword\as_is\borland\icucommon.lib 
-      ..\..\..\icu-sword\as_is\borland\icudatab.lib"/>
+    <LIBFILES value="libsword.lib ..\..\..\icu-sword\as_is\win32\borland\icui18n.lib 
+      ..\..\..\icu-sword\as_is\win32\borland\icudatab.lib 
+      ..\..\..\icu-sword\as_is\win32\borland\icucommon.lib"/>
     <LIBRARIES value=""/>
     <SPARELIBS value=""/>
     <PACKAGES value="VCL50.bpi VCLX50.bpi bcbsmp50.bpi QRPT50.bpi VCLDB50.bpi VCLBDE50.bpi