diff options
Diffstat (limited to 'apps/windoze')
-rw-r--r-- | apps/windoze/CBuilder5/InstallMgr/InstallMgr.bpr | 37 | ||||
-rw-r--r-- | apps/windoze/CBuilder5/InstallMgr/MainFrm.h | 2 | ||||
-rw-r--r-- | apps/windoze/CBuilder5/InstallMgr/RemoteMntFrm.cpp | 3 | ||||
-rw-r--r-- | apps/windoze/CBuilder5/InstallMgr/RemoteMntFrm.h | 6 | ||||
-rw-r--r-- | apps/windoze/CBuilder5/InstallMgr/cipherfrm.cpp | 4 | ||||
-rw-r--r-- | apps/windoze/CBuilder5/InstallMgr/zlib.bpr | 13 |
6 files changed, 39 insertions, 26 deletions
diff --git a/apps/windoze/CBuilder5/InstallMgr/InstallMgr.bpr b/apps/windoze/CBuilder5/InstallMgr/InstallMgr.bpr index 79d6226..5ac73fc 100644 --- a/apps/windoze/CBuilder5/InstallMgr/InstallMgr.bpr +++ b/apps/windoze/CBuilder5/InstallMgr/InstallMgr.bpr @@ -28,7 +28,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;_DEBUG"/> <SYSDEFINES value="NO_STRICT"/> <MAINSOURCE value="InstallMgr.cpp"/> <INCLUDEPATH value="curl\include;..\BibleCS;..\..\..\..\usr\src\sword\apps\windoze\CBuilder4\InstallMgr;$(BCB)\include;$(BCB)\include\vcl;..\..\..\..\include"/> @@ -40,17 +40,17 @@ <IDLCFLAGS value="-I..\BibleCS -I..\..\..\..\usr\src\sword\apps\windoze\CBuilder4\InstallMgr -I$(BCB)\include -I$(BCB)\include\vcl -I..\..\..\..\include -src_suffix cpp -DVCL -boa"/> - <CFLAG1 value="-O2 -H=c:\PROGRA~1\borland\CBUILD~2\lib\vcl50.csm -Hc -Vx -Ve -RT- -X- -a8 - -b- -k- -vi -c -tW -tWM"/> - <PFLAGS value="-$Y- -$L- -$D- -v -JPHNE -M"/> + <CFLAG1 value="-vGc -vGt -vGd -Od -H=c:\PROGRA~1\borland\CBUILD~2\lib\vcl50.csm -Hc -Vx + -Ve -RT- -X- -r- -a8 -b- -k -y -v -vi- -c -tW -tWM"/> + <PFLAGS value="-$Y+ -$W -$O- -v -JPHNE -M"/> <RFLAGS value=""/> - <AFLAGS value="/mx /w2 /zn"/> - <LFLAGS value="-D"" -aa -Tpe -x -Gn"/> + <AFLAGS value="/mx /w2 /zi"/> + <LFLAGS value="-D"" -aa -Tpe -x -Gn -v"/> </OPTIONS> <LINKER> <ALLOBJ value="c0w32.obj sysinit.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] @@ -102,16 +102,17 @@ Count=1 Item0=$(BCB)\source\vcl [HistoryLists\hlConditionals] -Count=9 -Item0=VCL;_ICU_;_ICUSWORD_;USBINARY -Item1=VCL -Item2=VCL;_DEBUG -Item3=VCL;__STDC__ true -Item4=VCL;__STDC__ -Item5=VCL;_MSC_VER -Item6=VCL __STDC__ -Item7=_DEBUG;VCL -Item8=_DEBUG +Count=10 +Item0=VCL;_ICU_;_ICUSWORD_;USBINARY;_DEBUG +Item1=VCL;_ICU_;_ICUSWORD_;USBINARY +Item2=VCL +Item3=VCL;_DEBUG +Item4=VCL;__STDC__ true +Item5=VCL;__STDC__ +Item6=VCL;_MSC_VER +Item7=VCL __STDC__ +Item8=_DEBUG;VCL +Item9=_DEBUG [HistoryLists\hlRunParameters] Count=1 @@ -130,7 +131,7 @@ RemoteDebug=0 [Compiler] ShowInfoMsgs=0 LinkDebugVcl=0 -LinkCGLIB=0 +LinkCGLIB=1 [Language] ActiveLang= diff --git a/apps/windoze/CBuilder5/InstallMgr/MainFrm.h b/apps/windoze/CBuilder5/InstallMgr/MainFrm.h index 47fe65c..afb7d84 100644 --- a/apps/windoze/CBuilder5/InstallMgr/MainFrm.h +++ b/apps/windoze/CBuilder5/InstallMgr/MainFrm.h @@ -19,6 +19,8 @@ #include <NMHttp.hpp> #include <Psock.hpp> +using namespace std; +using namespace sword; class VersionInfo { public: diff --git a/apps/windoze/CBuilder5/InstallMgr/RemoteMntFrm.cpp b/apps/windoze/CBuilder5/InstallMgr/RemoteMntFrm.cpp index 148a7fd..075e05a 100644 --- a/apps/windoze/CBuilder5/InstallMgr/RemoteMntFrm.cpp +++ b/apps/windoze/CBuilder5/InstallMgr/RemoteMntFrm.cpp @@ -3,6 +3,9 @@ #pragma hdrstop #include "RemoteMntFrm.h" + +using namespace std; + //--------------------------------------------------------------------------- #pragma package(smart_init) #pragma resource "*.dfm" diff --git a/apps/windoze/CBuilder5/InstallMgr/RemoteMntFrm.h b/apps/windoze/CBuilder5/InstallMgr/RemoteMntFrm.h index 67c825d..fecd1ee 100644 --- a/apps/windoze/CBuilder5/InstallMgr/RemoteMntFrm.h +++ b/apps/windoze/CBuilder5/InstallMgr/RemoteMntFrm.h @@ -10,8 +10,10 @@ #include <ExtCtrls.hpp> #include <swconfig.h> //--------------------------------------------------------------------------- -class TRemoteMntForm : public TForm -{ + +using namespace sword; + +class TRemoteMntForm : public TForm { __published: // IDE-managed Components TPanel *Panel1; TPanel *Panel2; diff --git a/apps/windoze/CBuilder5/InstallMgr/cipherfrm.cpp b/apps/windoze/CBuilder5/InstallMgr/cipherfrm.cpp index 1e6dd90..203f203 100644 --- a/apps/windoze/CBuilder5/InstallMgr/cipherfrm.cpp +++ b/apps/windoze/CBuilder5/InstallMgr/cipherfrm.cpp @@ -5,6 +5,10 @@ #include "cipherfrm.h" #include <swmgr.h> #include <swconfig.h> + +using namespace std; +using namespace sword; + //--------------------------------------------------------------------------- #pragma package(smart_init) #pragma resource "*.dfm" diff --git a/apps/windoze/CBuilder5/InstallMgr/zlib.bpr b/apps/windoze/CBuilder5/InstallMgr/zlib.bpr index b23ce01..04abf33 100644 --- a/apps/windoze/CBuilder5/InstallMgr/zlib.bpr +++ b/apps/windoze/CBuilder5/InstallMgr/zlib.bpr @@ -33,7 +33,7 @@ <PATHRC value=".;"/> <PATHASM value=".;"/> <LINKER value="TLib"/> - <USERDEFINES value=""/> + <USERDEFINES value="_DEBUG"/> <SYSDEFINES value="_RTLDLL;NO_STRICT"/> <MAINSOURCE value="zlib.bpf"/> <INCLUDEPATH value="..\..\..\..\src\utilfuns\zlib;$(BCB)\include;$(BCB)\include\vcl;..\..\..\..\include"/> @@ -44,14 +44,15 @@ <OPTIONS> <IDLCFLAGS value="-I..\..\..\..\src\utilfuns\zlib -I$(BCB)\include -I$(BCB)\include\vcl -I..\..\..\..\include -src_suffix cpp -boa"/> - <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=""/> </OPTIONS> <LINKER> <ALLOBJ value="$(OBJFILES)"/> - <ALLLIB value=""/> + <ALLLIB value="cg32.lib "/> </LINKER> <IDEOPTIONS> [Version Info] @@ -111,7 +112,7 @@ RemoteDebug=0 [Compiler] ShowInfoMsgs=0 LinkDebugVcl=0 -LinkCGLIB=0 +LinkCGLIB=1 [Language] ActiveLang= |