[sword-cvs] sword/apps/windoze/CBuilder5/BibleCS swordprj.bpg,1.9,1.10 sword.bpr,1.126,1.127

[sword@www.crosswire.org]

Update of /usr/local/cvsroot/sword/apps/windoze/CBuilder5/BibleCS
In directory www:/tmp/cvs-serv6700

Modified Files:
	swordprj.bpg sword.bpr 
Log Message:
readying for ICU 2.6

Index: swordprj.bpg
===================================================================
RCS file: /usr/local/cvsroot/sword/apps/windoze/CBuilder5/BibleCS/swordprj.bpg,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- swordprj.bpg	26 Jan 2003 09:00:04 -0000	1.9
+++ swordprj.bpg	7 Sep 2003 09:47:54 -0000	1.10
@@ -18,11 +18,11 @@
 sword.exe: sword.bpr
   $(MAKE)
 
-icucommon.lib: ..\..\..\..\..\icu-sword\as_is\borland\common.bpr
+icucommon.lib: ..\..\..\..\..\icu-sword\as_is\borland\icucommon.bpr
   $(ROOT)\bin\bpr2mak -t$(ROOT)\bin\deflib.bmk $**
   $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
 
-icui18n.lib: ..\..\..\..\..\icu-sword\as_is\borland\i18n.bpr
+icui18n.lib: ..\..\..\..\..\icu-sword\as_is\borland\icui18n.bpr
   $(ROOT)\bin\bpr2mak -t$(ROOT)\bin\deflib.bmk $**
   $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
 

Index: sword.bpr
===================================================================
RCS file: /usr/local/cvsroot/sword/apps/windoze/CBuilder5/BibleCS/sword.bpr,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -d -r1.126 -r1.127
--- sword.bpr	17 Aug 2003 09:26:27 -0000	1.126
+++ sword.bpr	7 Sep 2003 09:47:54 -0000	1.127
@@ -45,7 +45,7 @@
     <DEBUGLIBPATH value="$(BCB)\lib\debug"/>
     <RELEASELIBPATH value="$(BCB)\lib\release"/>
     <LINKER value="ilink32"/>
-    <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY"/>
+    <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;_DEBUG;U_HAVE_PLACEMENT_NEW=0"/>
     <SYSDEFINES value="NO_STRICT"/>
     <MAINSOURCE value="sword.cpp"/>
     <INCLUDEPATH value="..\..;TntUnicodeControls;..\..\..\..\..\icu-sword\source\common;..\..\..\..\..\icu-sword\source\i18n;..\..\..\..\include;$(BCB)\include;$(BCB)\include\vcl;rxlib"/>
@@ -54,14 +54,15 @@
     <WARNOPTSTR value=""/>
   </MACROS>
   <OPTIONS>
-    <IDLCFLAGS value="-I..\.. -I..\..\..\..\..\icu-sword\source\common 
+    <IDLCFLAGS value="-I..\.. -ITntUnicodeControls -I..\..\..\..\..\icu-sword\source\common 
       -I..\..\..\..\..\icu-sword\source\i18n -I..\..\..\..\include 
-      -I$(BCB)\include -I$(BCB)\include\vcl -Irxlib -src_suffix cpp -D_ICU_"/>
-    <CFLAG1 value="-O2 -Vx -Ve -RT- -X- -a8 -4 -b- -k- -vi -c -tW -tWM"/>
-    <PFLAGS value="-N2obj -N0obj -$Y- -$L- -$D- -v -M -JPHNE"/>
+      -I$(BCB)\include -I$(BCB)\include\vcl -Irxlib -src_suffix cpp -D_ICU_ 
+      -D_ICUSWORD_ -DUSBINARY -D_DEBUG -DU_HAVE_PLACEMENT_NEW=0"/>
+    <CFLAG1 value="-Od -Vx -X- -r- -a8 -4 -b- -k -y -v -vi- -c -tW -tWM"/>
+    <PFLAGS value="-N2obj -N0obj -$Y+ -$W -$O- -v -M -JPHNE"/>
     <RFLAGS value=""/>
-    <AFLAGS value="/mx /w2 /zn"/>
-    <LFLAGS value="-Iobj -D&quot;&quot; -aa -Tpe -GD -s -Gn"/>
+    <AFLAGS value="/mx /w2 /zi"/>
+    <LFLAGS value="-Iobj -D&quot;&quot; -aa -Tpe -GD -s -Gn -v"/>
   </OPTIONS>
   <LINKER>
     <ALLOBJ value="c0w32.obj $(OBJFILES)"/>
@@ -75,7 +76,7 @@
 MajorVer=1
 MinorVer=5
 Release=6
-Build=0
+Build=1
 Debug=0
 PreRelease=0
 Special=0
@@ -87,7 +88,7 @@
 [Version Info Keys]
 CompanyName=CrossWire Software &amp; Bible Society
 FileDescription=Windows 32bit User Interface to The SWORD Project
-FileVersion=1.5.6.0
+FileVersion=1.5.6.1
 InternalName=biblecs
 LegalCopyright=(c) 1990-2003 CrossWire Bible Society under the terms of the GNU General Public License
 LegalTrademarks=
@@ -131,15 +132,16 @@
 Item1=$(BCB)\source\vcl
 
 [HistoryLists\hlConditionals]
-Count=8
-Item0=_ICU_;_ICUSWORD_;USBINARY
+Count=9
+Item0=_ICU_;_ICUSWORD_;USBINARY;_DEBUG;U_HAVE_PLACEMENT_NEW=0
 Item1=_ICU_;_ICUSWORD_;USBINARY;_DEBUG
-Item2=_ICU_;_ICUSWORD_;_DEBUG;USBINARY
-Item3=_ICU_;_ICUSWORD_;_DEBUG
-Item4=_ICU_;_ICUSWORD_
-Item5=_ICU_
-Item6=_ICU_;_DEBUG
-Item7=_DEBUG
+Item2=_ICU_;_ICUSWORD_;USBINARY
+Item3=_ICU_;_ICUSWORD_;_DEBUG;USBINARY
+Item4=_ICU_;_ICUSWORD_;_DEBUG
+Item5=_ICU_;_ICUSWORD_
+Item6=_ICU_
+Item7=_ICU_;_DEBUG
+Item8=_DEBUG
 
 [HistoryLists\hlIntOutputDir]
 Count=2
@@ -167,6 +169,11 @@
 ShowInfoMsgs=0
 LinkDebugVcl=0
 LinkCGLIB=0
+
+[CORBA]
+AddServerUnit=1
+AddClientUnit=1
+PrecompiledHeaders=1
 
 [Language]
 ActiveLang=