[sword-svn] r420 - in trunk: . TntUnicodeControls/BCB5 clucene stage stage/bookmarks

scribe at crosswire.org scribe at crosswire.org
Mon Nov 7 13:35:14 MST 2005 

Author: scribe
Date: 2005-11-07 13:35:13 -0700 (Mon, 07 Nov 2005)
New Revision: 420

Added:
   trunk/mods.d/
Removed:
   trunk/stage/mods.d/
Modified:
   trunk/TntUnicodeControls/BCB5/TntLibR.bpk
   trunk/clucene/clucene.bpr
   trunk/stage/bookmarks/personal.conf
   trunk/stage/layout.conf
   trunk/sword.bpr
   trunk/sword.res
Log:


Modified: trunk/TntUnicodeControls/BCB5/TntLibR.bpk
===================================================================
--- trunk/TntUnicodeControls/BCB5/TntLibR.bpk	2005-10-17 18:52:41 UTC (rev 419)
+++ trunk/TntUnicodeControls/BCB5/TntLibR.bpk	2005-11-07 20:35:13 UTC (rev 420)
@@ -24,7 +24,7 @@
     <DEBUGLIBPATH value="$(BCB)\lib\debug"/>
     <RELEASELIBPATH value="$(BCB)\lib\release"/>
     <LINKER value="tlink32"/>
-    <USERDEFINES value=""/>
+    <USERDEFINES value="_DEBUG"/>
     <SYSDEFINES value="_RTLDLL;NO_STRICT;USEPACKAGES"/>
     <MAINSOURCE value="TntLibR.cpp"/>
     <INCLUDEPATH value="..\;..;$(BCB)\include;$(BCB)\include\vcl"/>
@@ -34,17 +34,18 @@
   <OPTIONS>
     <IDLCFLAGS value="-I..\. -I.. -I$(BCB)\include -I$(BCB)\include\vcl -src_suffix cpp -D_DEBUG 
       -boa"/>
-    <CFLAG1 value="-O2 -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -X- -a8 -b- -k- -vi -c -tWM"/>
-    <PFLAGS value="-$Y- -$L- -$D- -v -JPHNE -M"/>
+    <CFLAG1 value="-vGc -vGt -vGd -Od -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -X- -r- -a8 -b- -k 
+      -y -v -vi- -c -tWM"/>
+    <PFLAGS value="-$Y+ -$W -$O- -v -JPHNE -M"/>
     <RFLAGS value=""/>
-    <AFLAGS value="/mx /w2 /zn"/>
+    <AFLAGS value="/mx /w2 /zi"/>
     <LFLAGS value="-l. -D&quot;Tnt Unicode VCL Components for BCB5 (Runtime)&quot; -aa -Tpp -Gpr -x -Gn 
-      -Gl -Gi"/>
+      -Gl -Gi -v"/>
   </OPTIONS>
   <LINKER>
     <ALLOBJ value="c0pkg32.obj $(PACKAGES) Memmgr.Lib sysinit.obj $(OBJFILES)"/>
     <ALLRES value="$(RESFILES)"/>
-    <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cp32mti.lib"/>
+    <ALLLIB value="cg32.lib $(LIBFILES) $(LIBRARIES) import32.lib cp32mti.lib"/>
   </LINKER>
   <IDEOPTIONS>
 [Version Info]
@@ -111,7 +112,7 @@
 [Compiler]
 ShowInfoMsgs=0
 LinkDebugVcl=0
-LinkCGLIB=0
+LinkCGLIB=1
 
 [Language]
 ActiveLang=

Modified: trunk/clucene/clucene.bpr
===================================================================
--- trunk/clucene/clucene.bpr	2005-10-17 18:52:41 UTC (rev 419)
+++ trunk/clucene/clucene.bpr	2005-11-07 20:35:13 UTC (rev 420)
@@ -57,7 +57,7 @@
     <PATHRC value=".;"/>
     <PATHASM value=".;"/>
     <LINKER value="TLib"/>
-    <USERDEFINES value="LUCENE_DISABLE_MULTITHREADING;_WIN32;HAVE_DIRENT"/>
+    <USERDEFINES value="LUCENE_DISABLE_MULTITHREADING;_WIN32;HAVE_DIRENT;_DEBUG"/>
     <SYSDEFINES value="_RTLDLL;NO_STRICT"/>
     <MAINSOURCE value="clucene.bpf"/>
     <INCLUDEPATH value="src\CLucene\util;src\CLucene\store;src\CLucene\search;src\CLucene\queryParser;src\CLucene\index;src\CLucene\document;src\CLucene\debug;src\CLucene\analysis\standard;src\CLucene\analysis;src\CLucene;$(BCB)\include;$(BCB)\include\vcl;src"/>
@@ -66,9 +66,10 @@
     <LISTFILE value=""/>
   </MACROS>
   <OPTIONS>
-    <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="/P256"/>
   </OPTIONS>
   <LINKER>
@@ -120,8 +121,8 @@
 
 [HistoryLists\hlConditionals]
 Count=10
-Item0=LUCENE_DISABLE_MULTITHREADING;_WIN32;HAVE_DIRENT
-Item1=LUCENE_DISABLE_MULTITHREADING;_WIN32;HAVE_DIRENT;_DEBUG
+Item0=LUCENE_DISABLE_MULTITHREADING;_WIN32;HAVE_DIRENT;_DEBUG
+Item1=LUCENE_DISABLE_MULTITHREADING;_WIN32;HAVE_DIRENT
 Item2=_DEBUG;LUCENE_DISABLE_MULTITHREADING;_WIN32;HAVE_DIRENT
 Item3=_DEBUG;LUCENE_DISABLE_MULTITHREADING;_WIN32
 Item4=_DEBUG;LUCENE_DISABLE_MULTITHREADING;HAVE_DIRENT;_WIN32
@@ -155,7 +156,7 @@
 [Compiler]
 ShowInfoMsgs=0
 LinkDebugVcl=0
-LinkCGLIB=0
+LinkCGLIB=1
 
 [Language]
 ActiveLang=

Copied: trunk/mods.d (from rev 419, trunk/stage/mods.d)

Modified: trunk/stage/bookmarks/personal.conf
===================================================================
--- trunk/stage/bookmarks/personal.conf	2005-10-17 18:52:41 UTC (rev 419)
+++ trunk/stage/bookmarks/personal.conf	2005-11-07 20:35:13 UTC (rev 420)
@@ -1,4 +1,4 @@
-
-[ROOT]
-branch0=Personal Bookmarks
-
+
+[ROOT]
+branch0=Personal Bookmarks
+

Modified: trunk/stage/layout.conf
===================================================================
--- trunk/stage/layout.conf	2005-10-17 18:52:41 UTC (rev 419)
+++ trunk/stage/layout.conf	2005-11-07 20:35:13 UTC (rev 420)
@@ -1,7 +1,39 @@
 
+[CommentView]
+
 [History]
-LastComModule=Personal
+LastComModule=
 LastLDKey=5485
-LastLDModule=StrongsGreek
-LastTextModule=KJV
+LastLDModule=
+LastParaMod01=
+LastParaMod02=
+LastParaMod03=
+LastTextModule=PARALLEL
 LastVerse=John 1:1
+LookupSaveCount=5
+LookupText=John 1:1
+SearchSaveCount=5
+
+[LDView]
+
+[ModuleOptions]
+Transliteration=Off
+
+[Screen]
+MainHeight=749
+MainLeft=22
+MainTop=22
+MainWidth=1050
+Maximized=false
+SearchHeight=566
+SearchLeft=675
+SearchMaximized=false
+SearchResCol0Width=175
+SearchTop=312
+SearchWidth=545
+TextComHeight=195
+TextWidth=368
+
+[TextView]
+PARALLEL=
+

Modified: trunk/sword.bpr
===================================================================
--- trunk/sword.bpr	2005-10-17 18:52:41 UTC (rev 419)
+++ trunk/sword.bpr	2005-11-07 20:35:13 UTC (rev 420)
@@ -43,7 +43,7 @@
     <DEBUGLIBPATH value="$(BCB)\lib\debug"/>
     <RELEASELIBPATH value="$(BCB)\lib\release"/>
     <LINKER value="ilink32"/>
-    <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE"/>
+    <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_DEBUG"/>
     <SYSDEFINES value="NO_STRICT"/>
     <MAINSOURCE value="sword.cpp"/>
     <INCLUDEPATH value="D:\;TntUnicodeControls;..\icu-sword\source\common;..\icu-sword\source\i18n;..\sword\include;$(BCB)\include;$(BCB)\include\vcl;rxlib"/>
@@ -56,16 +56,16 @@
       -I..\..\..\..\..\icu-sword\source\i18n -I..\..\..\..\include 
       -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="-O2 -Vx -X- -a8 -4 -b- -k- -vi -c -tW -tWM"/>
-    <PFLAGS value="-N2obj -N0obj -$Y- -$L- -$D- -v -M -JPHNE"/>
+    <CFLAG1 value="-vGc -vGt -vGd -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)"/>
     <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]
@@ -138,8 +138,8 @@
 
 [HistoryLists\hlConditionals]
 Count=14
-Item0=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE
-Item1=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_DEBUG
+Item0=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_DEBUG
+Item1=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE
 Item2=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;_DEBUG;USELUCENE
 Item3=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;_DEBUG
 Item4=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0
@@ -178,7 +178,7 @@
 [Compiler]
 ShowInfoMsgs=0
 LinkDebugVcl=0
-LinkCGLIB=0
+LinkCGLIB=1
 
 [Language]
 ActiveLang=

Modified: trunk/sword.res
===================================================================
(Binary files differ)

More information about the sword-cvs mailing list