[sword-svn] r520 - in branches/BCB5: . TNGImage TntUnicodeControls.attic/BCB5 apps/InstallMgr
scribe at crosswire.org
scribe at crosswire.org
Mon Nov 2 13:33:44 EST 2020
Author: scribe
Date: 2020-11-02 13:33:44 -0500 (Mon, 02 Nov 2020)
New Revision: 520
Modified:
branches/BCB5/TNGImage/TNGImage.bpk
branches/BCB5/TntUnicodeControls.attic/BCB5/TntLibR.bpk
branches/BCB5/apps/InstallMgr/InstallManager.bpr
branches/BCB5/apps/InstallMgr/libcurl.bpr
branches/BCB5/mainfrm.dfm
branches/BCB5/mainfrm.h
branches/BCB5/sword.bpr
branches/BCB5/sword.res
Log:
Fix building with SWORD 1.9.0RC
Modified: branches/BCB5/TNGImage/TNGImage.bpk
===================================================================
--- branches/BCB5/TNGImage/TNGImage.bpk 2020-07-27 09:03:32 UTC (rev 519)
+++ branches/BCB5/TNGImage/TNGImage.bpk 2020-11-02 18:33:44 UTC (rev 520)
@@ -21,7 +21,7 @@
<DEBUGLIBPATH value="$(BCB)\lib\debug"/>
<RELEASELIBPATH value="$(BCB)\lib\release"/>
<LINKER value="tlink32"/>
- <USERDEFINES value="_DEBUG"/>
+ <USERDEFINES value=""/>
<SYSDEFINES value="_RTLDLL;NO_STRICT;USEPACKAGES"/>
<MAINSOURCE value="TNGImage.cpp"/>
<INCLUDEPATH value="Package;$(BCB)\include;$(BCB)\include\vcl"/>
@@ -30,12 +30,11 @@
</MACROS>
<OPTIONS>
<IDLCFLAGS value="-IPackage -I$(BCB)\include -I$(BCB)\include\vcl -src_suffix cpp -boa"/>
- <CFLAG1 value="-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"/>
+ <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"/>
<RFLAGS value=""/>
- <AFLAGS value="/mx /w2 /zi"/>
- <LFLAGS value="-D"" -aa -Tpp -x -Gn -Gl -Gi -v"/>
+ <AFLAGS value="/mx /w2 /zn"/>
+ <LFLAGS value="-D"" -aa -Tpp -x -Gn -Gl -Gi"/>
</OPTIONS>
<LINKER>
<ALLOBJ value="c0pkg32.obj $(PACKAGES) Memmgr.Lib sysinit.obj $(OBJFILES)"/>
Modified: branches/BCB5/TntUnicodeControls.attic/BCB5/TntLibR.bpk
===================================================================
--- branches/BCB5/TntUnicodeControls.attic/BCB5/TntLibR.bpk 2020-07-27 09:03:32 UTC (rev 519)
+++ branches/BCB5/TntUnicodeControls.attic/BCB5/TntLibR.bpk 2020-11-02 18:33:44 UTC (rev 520)
@@ -28,22 +28,21 @@
<DEBUGLIBPATH value="$(BCB)\lib\debug"/>
<RELEASELIBPATH value="$(BCB)\lib\release"/>
<LINKER value="tlink32"/>
- <USERDEFINES value="_DEBUG"/>
+ <USERDEFINES value=""/>
<SYSDEFINES value="_RTLDLL;NO_STRICT;USEPACKAGES"/>
<MAINSOURCE value="TntLibR.cpp"/>
- <INCLUDEPATH value="..;$(BCB)\include;$(BCB)\include\vcl"/>
- <LIBPATH value="..;..\..\..\lib\release;$(BCB)\lib\obj;$(BCB)\lib"/>
+ <INCLUDEPATH value="..\;..;$(BCB)\include;$(BCB)\include\vcl"/>
+ <LIBPATH value="..\;..;..\..\..\lib\release;$(BCB)\lib\obj;$(BCB)\lib"/>
<WARNINGS value="-w-par"/>
</MACROS>
<OPTIONS>
<IDLCFLAGS value="-I.. -I$(BCB)\include -I$(BCB)\include\vcl -src_suffix cpp -boa"/>
- <CFLAG1 value="-Od -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -X- -r- -a8 -4 -b- -k -y -v -vi-
- -c -tWM"/>
- <PFLAGS value="-$Y+ -$W -$O- -v -JPHNE -M"/>
+ <CFLAG1 value="-O2 -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -X- -a8 -4 -b- -k- -vi -c -tWM"/>
+ <PFLAGS value="-$Y- -$L- -$D- -v -JPHNE -M"/>
<RFLAGS value=""/>
- <AFLAGS value="/mx /w2 /zi"/>
+ <AFLAGS value="/mx /w2 /zn"/>
<LFLAGS value="-D"Tnt Unicode VCL Components for BCB5 (Runtime)" -aa -Tpp -Gpr -x -Gn -Gl
- -Gi -v"/>
+ -Gi"/>
</OPTIONS>
<LINKER>
<ALLOBJ value="c0pkg32.obj $(PACKAGES) Memmgr.Lib sysinit.obj $(OBJFILES)"/>
@@ -80,14 +79,14 @@
[HistoryLists\hlIncludePath]
Count=3
-Item0=..\;..;$(BCB)\include;$(BCB)\include\vcl
-Item1=..;$(BCB)\include;$(BCB)\include\vcl
+Item0=..;$(BCB)\include;$(BCB)\include\vcl
+Item1=..\;..;$(BCB)\include;$(BCB)\include\vcl
Item2=..\;$(BCB)\include;$(BCB)\include\vcl
[HistoryLists\hlLibraryPath]
Count=6
-Item0=..\;..;..\..\..\lib\release;$(BCB)\lib\obj;$(BCB)\lib
-Item1=..;..\..\..\lib\release;$(BCB)\lib\obj;$(BCB)\lib
+Item0=..;..\..\..\lib\release;$(BCB)\lib\obj;$(BCB)\lib
+Item1=..\;..;..\..\..\lib\release;$(BCB)\lib\obj;$(BCB)\lib
Item2=..\;..\..\..\lib\release;..;$(BCB)\lib\obj;$(BCB)\lib
Item3=..;$(BCB)\lib\obj;$(BCB)\lib
Item4=..\;..;$(BCB)\lib\obj;$(BCB)\lib
Modified: branches/BCB5/apps/InstallMgr/InstallManager.bpr
===================================================================
--- branches/BCB5/apps/InstallMgr/InstallManager.bpr 2020-07-27 09:03:32 UTC (rev 519)
+++ branches/BCB5/apps/InstallMgr/InstallManager.bpr 2020-11-02 18:33:44 UTC (rev 520)
@@ -36,7 +36,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;_WIN32"/>
<SYSDEFINES value="NO_STRICT"/>
<MAINSOURCE value="InstallManager.cpp"/>
<INCLUDEPATH value="..\..\..\sword\src\utilfuns;curl\lib;..\..\..\sword\src\mgr;..\..;..\..\..\sword\include;curl\include;$(BCB)\include;$(BCB)\include\vcl;..\..\TntUnicodeControls.attic"/>
@@ -130,19 +130,20 @@
Item0=$(BCB)\source\vcl
[HistoryLists\hlConditionals]
-Count=12
-Item0=VCL;_ICU_;_ICUSWORD_;USBINARY
-Item1=VCL;_ICU_;_ICUSWORD_;USBINARY;_DEBUG
-Item2=VCL;_ICU_;_ICUSWORD_;CURLAVAILABLE;USBINARY;_DEBUG
-Item3=VCL;_ICU_;_ICUSWORD_;CURLAVAILABLE;USBINARY
-Item4=VCL
-Item5=VCL;_DEBUG
-Item6=VCL;__STDC__ true
-Item7=VCL;__STDC__
-Item8=VCL;_MSC_VER
-Item9=VCL __STDC__
-Item10=_DEBUG;VCL
-Item11=_DEBUG
+Count=13
+Item0=VCL;_ICU_;_ICUSWORD_;USBINARY;_WIN32
+Item1=VCL;_ICU_;_ICUSWORD_;USBINARY
+Item2=VCL;_ICU_;_ICUSWORD_;USBINARY;_DEBUG
+Item3=VCL;_ICU_;_ICUSWORD_;CURLAVAILABLE;USBINARY;_DEBUG
+Item4=VCL;_ICU_;_ICUSWORD_;CURLAVAILABLE;USBINARY
+Item5=VCL
+Item6=VCL;_DEBUG
+Item7=VCL;__STDC__ true
+Item8=VCL;__STDC__
+Item9=VCL;_MSC_VER
+Item10=VCL __STDC__
+Item11=_DEBUG;VCL
+Item12=_DEBUG
[HistoryLists\hlRunParameters]
Count=1
Modified: branches/BCB5/apps/InstallMgr/libcurl.bpr
===================================================================
--- branches/BCB5/apps/InstallMgr/libcurl.bpr 2020-07-27 09:03:32 UTC (rev 519)
+++ branches/BCB5/apps/InstallMgr/libcurl.bpr 2020-11-02 18:33:44 UTC (rev 520)
@@ -31,7 +31,7 @@
<PATHRC value=".;"/>
<PATHASM value=".;"/>
<LINKER value="TLib"/>
- <USERDEFINES value=""/>
+ <USERDEFINES value="OLDCURL"/>
<SYSDEFINES value="_RTLDLL;NO_STRICT"/>
<MAINSOURCE value="libcurl.bpf"/>
<INCLUDEPATH value="curl\curlcpp;curl\lib;curl\include;$(BCB)\include;$(BCB)\include\vcl"/>
@@ -97,8 +97,10 @@
Item0=$(BCB)\source\vcl
[HistoryLists\hlConditionals]
-Count=1
-Item0=_DEBUG
+Count=3
+Item0=OLDCURL
+Item1=_WIN32
+Item2=_DEBUG
[HistoryLists\hlTlibPageSize]
Count=3
Modified: branches/BCB5/mainfrm.dfm
===================================================================
(Binary files differ)
Modified: branches/BCB5/mainfrm.h
===================================================================
--- branches/BCB5/mainfrm.h 2020-07-27 09:03:32 UTC (rev 519)
+++ branches/BCB5/mainfrm.h 2020-11-02 18:33:44 UTC (rev 520)
@@ -67,7 +67,7 @@
SWDispRTF *edit;
static SWClass classdef;
public:
- RTFDisp(SWDispRTF *iedit) { myclass = &classdef; edit = iedit; }
+ RTFDisp(SWDispRTF *iedit) { this->myClass = &classdef; edit = iedit; }
virtual SWDispRTF *editControl() { return edit; }
RTFDisp() {}
virtual char display(SWModule &imodule) {
Modified: branches/BCB5/sword.bpr
===================================================================
--- branches/BCB5/sword.bpr 2020-07-27 09:03:32 UTC (rev 519)
+++ branches/BCB5/sword.bpr 2020-11-02 18:33:44 UTC (rev 520)
@@ -79,7 +79,7 @@
MajorVer=1
MinorVer=6
Release=999
-Build=2
+Build=3
Debug=0
PreRelease=0
Special=0
@@ -91,7 +91,7 @@
[Version Info Keys]
CompanyName=CrossWire Bible Society
FileDescription=Windows User Interface to The SWORD Project
-FileVersion=1.6.999.2
+FileVersion=1.6.999.3
InternalName=biblecs
LegalCopyright=(c) 1990-2013 CrossWire Bible Society under the terms of the GNU General Public License
LegalTrademarks=
Modified: branches/BCB5/sword.res
===================================================================
(Binary files differ)
More information about the sword-cvs
mailing list