20 files changed, 77 insertions, 68 deletions
diff --git a/utilities/bcppmake/cipherraw.bpf b/utilities/bcppmake/cipherraw.bpf
index 3df5169..03a9c8a 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\win32\borland\icui18n.lib");
-USELIB("..\..\..\icu-sword\as_is\win32\borland\icudatab.lib");
-USELIB("..\..\..\icu-sword\as_is\win32\borland\icucommon.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");
 //---------------------------------------------------------------------------
 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 096e325..b2e0df9 100644
--- a/utilities/bcppmake/cipherraw.bpr
+++ b/utilities/bcppmake/cipherraw.bpr
@@ -10,9 +10,9 @@
     <IDLGENFILES value=""/>
     <DEFFILE value=""/>
     <RESDEPEN value="$(RESFILES)"/>
-    <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"/>
+    <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"/>
     <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 8a4a029..cde3c39 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\win32\borland\icui18n.lib");
-USELIB("..\..\..\icu-sword\as_is\win32\borland\icudatab.lib");
-USELIB("..\..\..\icu-sword\as_is\win32\borland\icucommon.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");
 //---------------------------------------------------------------------------
 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 3323a1e..b5cc554 100644
--- a/utilities/bcppmake/imp2gbs.bpr
+++ b/utilities/bcppmake/imp2gbs.bpr
@@ -10,9 +10,9 @@
     <IDLGENFILES value=""/>
     <DEFFILE value=""/>
     <RESDEPEN value="$(RESFILES)"/>
-    <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"/>
+    <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"/>
     <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 cbaf592..82171c2 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\win32\borland\icui18n.lib");
-USELIB("..\..\..\icu-sword\as_is\win32\borland\icudatab.lib");
-USELIB("..\..\..\icu-sword\as_is\win32\borland\icucommon.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");
 //---------------------------------------------------------------------------
 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 55cc403..06b7040 100644
--- a/utilities/bcppmake/imp2ld.bpr
+++ b/utilities/bcppmake/imp2ld.bpr
@@ -10,9 +10,9 @@
     <IDLGENFILES value=""/>
     <DEFFILE value=""/>
     <RESDEPEN value="$(RESFILES)"/>
-    <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"/>
+    <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"/>
     <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 f96f64d..44fd7a4 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\win32\borland\icui18n.lib");
-USELIB("..\..\..\icu-sword\as_is\win32\borland\icudatab.lib");
-USELIB("..\..\..\icu-sword\as_is\win32\borland\icucommon.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");
 //---------------------------------------------------------------------------
 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 b08909c..f86bba0 100644
--- a/utilities/bcppmake/imp2vs.bpr
+++ b/utilities/bcppmake/imp2vs.bpr
@@ -10,9 +10,9 @@
     <IDLGENFILES value=""/>
     <DEFFILE value=""/>
     <RESDEPEN value="$(RESFILES)"/>
-    <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"/>
+    <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"/>
     <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 79f59ae..9874ba2 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\win32\borland\icui18n.lib");
-USELIB("..\..\..\icu-sword\as_is\win32\borland\icudatab.lib");
-USELIB("..\..\..\icu-sword\as_is\win32\borland\icucommon.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");
 //---------------------------------------------------------------------------
 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 4eaacd9..2bfe89f 100644
--- a/utilities/bcppmake/mkfastmod.bpr
+++ b/utilities/bcppmake/mkfastmod.bpr
@@ -10,9 +10,9 @@
     <IDLGENFILES value=""/>
     <DEFFILE value=""/>
     <RESDEPEN value="$(RESFILES)"/>
-    <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"/>
+    <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"/>
     <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 c21a13d..62aa5e1 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\win32\borland\icui18n.lib");
-USELIB("..\..\..\icu-sword\as_is\win32\borland\icudatab.lib");
-USELIB("..\..\..\icu-sword\as_is\win32\borland\icucommon.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");
 //---------------------------------------------------------------------------
 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 fdbadf7..491b281 100644
--- a/utilities/bcppmake/mod2imp.bpr
+++ b/utilities/bcppmake/mod2imp.bpr
@@ -10,9 +10,9 @@
     <IDLGENFILES value=""/>
     <DEFFILE value=""/>
     <RESDEPEN value="$(RESFILES)"/>
-    <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"/>
+    <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"/>
     <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 a0f2da4..3f10bb0 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\win32\borland\icui18n.lib");
-USELIB("..\..\..\icu-sword\as_is\win32\borland\icudatab.lib");
-USELIB("..\..\..\icu-sword\as_is\win32\borland\icucommon.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");
 //---------------------------------------------------------------------------
 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 287d6c8..fe6c102 100644
--- a/utilities/bcppmake/mod2vpl.bpr
+++ b/utilities/bcppmake/mod2vpl.bpr
@@ -10,9 +10,9 @@
     <IDLGENFILES value=""/>
     <DEFFILE value=""/>
     <RESDEPEN value="$(RESFILES)"/>
-    <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"/>
+    <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"/>
     <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 ae870d7..a5ab3aa 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\win32\borland\icui18n.lib");
-USELIB("..\..\..\icu-sword\as_is\win32\borland\icudatab.lib");
-USELIB("..\..\..\icu-sword\as_is\win32\borland\icucommon.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");
 //---------------------------------------------------------------------------
 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 0aef015..f388f91 100644
--- a/utilities/bcppmake/mod2zmod.bpr
+++ b/utilities/bcppmake/mod2zmod.bpr
@@ -10,9 +10,9 @@
     <IDLGENFILES value=""/>
     <DEFFILE value=""/>
     <RESDEPEN value="$(RESFILES)"/>
-    <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"/>
+    <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"/>
     <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 d153611..d3b7342 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\win32\borland\icui18n.lib");
-USELIB("..\..\..\icu-sword\as_is\win32\borland\icudatab.lib");
-USELIB("..\..\..\icu-sword\as_is\win32\borland\icucommon.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");
 //---------------------------------------------------------------------------
 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 a6ff506..0447081 100644
--- a/utilities/bcppmake/thml2gbs.bpr
+++ b/utilities/bcppmake/thml2gbs.bpr
@@ -10,9 +10,9 @@
     <IDLGENFILES value=""/>
     <DEFFILE value=""/>
     <RESDEPEN value="$(RESFILES)"/>
-    <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"/>
+    <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"/>
     <LIBRARIES value=""/>
     <SPARELIBS value=""/>
     <PACKAGES value="Vcl50.bpi Vclx50.bpi bcbsmp50.bpi Qrpt50.bpi Vcldb50.bpi Vclbde50.bpi 
@@ -26,7 +26,7 @@
     <DEBUGLIBPATH value="$(BCB)\lib\debug"/>
     <RELEASELIBPATH value="$(BCB)\lib\release"/>
     <LINKER value="tlink32"/>
-    <USERDEFINES value="_ICU_;_ICUSWORD_"/>
+    <USERDEFINES value="_ICU_;_ICUSWORD_;_DEBUG"/>
     <SYSDEFINES value="NO_STRICT;_NO_VCL"/>
     <MAINSOURCE value="thml2gbs.bpf"/>
     <INCLUDEPATH value="..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl"/>
@@ -34,11 +34,14 @@
     <WARNINGS value="-w-par"/>
   </MACROS>
   <OPTIONS>
-    <CFLAG1 value="-O2 -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -X- -a8 -b- -k- -vi -tWC -tWM- -c"/>
-    <PFLAGS value="-$Y- -$L- -$D- -v -JPHNE -M"/>
+    <IDLCFLAGS value="-I..\. -I.. -I..\..\include -I$(BCB)\include -I$(BCB)\include\vcl 
+      -src_suffix cpp -D_ICU_ -D_ICUSWORD_ -D_DEBUG -boa"/>
+    <CFLAG1 value="-Od -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -X- -r- -a8 -b- -k -y -v -vi- -tWC 
+      -tWM- -c"/>
+    <PFLAGS value="-$Y+ -$W -$O- -v -JPHNE -M"/>
     <RFLAGS value=""/>
-    <AFLAGS value="/mx /w2 /zn"/>
-    <LFLAGS value="-D&quot;&quot; -S:0x200000 -Sc:0x20000 -ap -Tpe -x -Gn"/>
+    <AFLAGS value="/mx /w2 /zi"/>
+    <LFLAGS value="-D&quot;&quot; -S:0x200000 -Sc:0x20000 -ap -Tpe -x -Gn -v"/>
   </OPTIONS>
   <LINKER>
     <ALLOBJ value="c0x32.obj $(OBJFILES)"/>
@@ -92,9 +95,10 @@ Count=1
 Item0=$(BCB)\source\vcl
 
 [HistoryLists\hlConditionals]
-Count=2
-Item0=_ICU_;_ICUSWORD_
-Item1=_DEBUG
+Count=3
+Item0=_ICU_;_ICUSWORD_;_DEBUG
+Item1=_ICU_;_ICUSWORD_
+Item2=_DEBUG
 
 [Debugging]
 DebugSourceDirs=$(BCB)\source\vcl
@@ -111,6 +115,11 @@ ShowInfoMsgs=0
 LinkDebugVcl=0
 LinkCGLIB=0
 
+[CORBA]
+AddServerUnit=1
+AddClientUnit=1
+PrecompiledHeaders=1
+
 [Language]
 ActiveLang=
 ProjectLang=
diff --git a/utilities/bcppmake/vpl2mod.bpf b/utilities/bcppmake/vpl2mod.bpf
index eb4b2c6..a31520b 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\win32\borland\icui18n.lib");
-USELIB("..\..\..\icu-sword\as_is\win32\borland\icudatab.lib");
-USELIB("..\..\..\icu-sword\as_is\win32\borland\icucommon.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");
 //---------------------------------------------------------------------------
 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 9eeb06d..54810be 100644
--- a/utilities/bcppmake/vpl2mod.bpr
+++ b/utilities/bcppmake/vpl2mod.bpr
@@ -10,9 +10,9 @@
     <IDLGENFILES value=""/>
     <DEFFILE value=""/>
     <RESDEPEN value="$(RESFILES)"/>
-    <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"/>
+    <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"/>
     <LIBRARIES value=""/>
     <SPARELIBS value=""/>
     <PACKAGES value="VCL50.bpi VCLX50.bpi bcbsmp50.bpi QRPT50.bpi VCLDB50.bpi VCLBDE50.bpi