[sword-cvs] sword/apps/windoze/CBuilder5/InstallMgr InstallMgr.bpg,1.7,1.8 InstallMgr.bpr,1.27,1.28 InstallMgr.cpp,1.7,1.8
sword@www.crosswire.org
sword@www.crosswire.org
Sun, 26 Jan 2003 02:53:32 -0700
Update of /usr/local/cvsroot/sword/apps/windoze/CBuilder5/InstallMgr
In directory www:/tmp/cvs-serv20517
Modified Files:
InstallMgr.bpg InstallMgr.bpr InstallMgr.cpp
Log Message:
changed to use common libsword project in /lib/bcppmake
Index: InstallMgr.bpg
===================================================================
RCS file: /usr/local/cvsroot/sword/apps/windoze/CBuilder5/InstallMgr/InstallMgr.bpg,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** InstallMgr.bpg 8 Oct 2002 00:36:00 -0000 1.7
--- InstallMgr.bpg 26 Jan 2003 09:53:29 -0000 1.8
***************
*** 10,14 ****
BRCC = $(ROOT)\bin\brcc32.exe $**
#------------------------------------------------------------------------------
! PROJECTS = swordlib.lib libcurl.lib InstallMgr.exe
#------------------------------------------------------------------------------
default: $(PROJECTS)
--- 10,14 ----
BRCC = $(ROOT)\bin\brcc32.exe $**
#------------------------------------------------------------------------------
! PROJECTS = libsword.lib libcurl.lib InstallMgr.exe
#------------------------------------------------------------------------------
default: $(PROJECTS)
***************
*** 18,25 ****
$(MAKE)
- swordlib.lib: ..\BibleCS\swordlib.bpr
- $(MAKE)
-
libcurl.lib: libcurl.bpr
$(ROOT)\bin\bpr2mak -t$(ROOT)\bin\deflib.bmk $**
$(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
--- 18,26 ----
$(MAKE)
libcurl.lib: libcurl.bpr
+ $(ROOT)\bin\bpr2mak -t$(ROOT)\bin\deflib.bmk $**
+ $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
+
+ libsword.lib: ..\..\..\..\lib\bcppmake\libsword.bpr
$(ROOT)\bin\bpr2mak -t$(ROOT)\bin\deflib.bmk $**
$(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
Index: InstallMgr.bpr
===================================================================
RCS file: /usr/local/cvsroot/sword/apps/windoze/CBuilder5/InstallMgr/InstallMgr.bpr,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** InstallMgr.bpr 8 Oct 2002 00:36:00 -0000 1.27
--- InstallMgr.bpr 26 Jan 2003 09:53:29 -0000 1.28
***************
*** 6,10 ****
<PROJECT value="InstallMgr.exe"/>
<OBJFILES value="InstallMgr.obj MainFrm.obj StatusFrm.obj RemoteMntFrm.obj InfoFrm.obj
! cipherfrm.obj UninstallFrm.obj"/>
<RESFILES value="InstallMgr.res"/>
<IDLFILES value=""/>
--- 6,10 ----
<PROJECT value="InstallMgr.exe"/>
<OBJFILES value="InstallMgr.obj MainFrm.obj StatusFrm.obj RemoteMntFrm.obj InfoFrm.obj
! cipherfrm.obj UninstallFrm.obj ..\..\swwinlog.obj"/>
<RESFILES value="InstallMgr.res"/>
<IDLFILES value=""/>
***************
*** 13,20 ****
<RESDEPEN value="$(RESFILES) MainFrm.dfm StatusFrm.dfm RemoteMntFrm.dfm InfoFrm.dfm
cipherfrm.dfm UninstallFrm.dfm"/>
! <LIBFILES value="..\..\..\..\lib\swordlib.lib libcurl.lib curl\lib\ws2_32.lib
..\..\..\..\..\icu-sword\as_is\borland\icui18n.lib
..\..\..\..\..\icu-sword\as_is\borland\icudatab.lib
! ..\..\..\..\..\icu-sword\as_is\borland\icucommon.lib"/>
<LIBRARIES value="NMFast50.lib vclx50.lib vcl50.lib"/>
<SPARELIBS value="vcl50.lib vclx50.lib NMFast50.lib"/>
--- 13,21 ----
<RESDEPEN value="$(RESFILES) MainFrm.dfm StatusFrm.dfm RemoteMntFrm.dfm InfoFrm.dfm
cipherfrm.dfm UninstallFrm.dfm"/>
! <LIBFILES value="libcurl.lib curl\lib\ws2_32.lib
..\..\..\..\..\icu-sword\as_is\borland\icui18n.lib
..\..\..\..\..\icu-sword\as_is\borland\icudatab.lib
! ..\..\..\..\..\icu-sword\as_is\borland\icucommon.lib
! ..\..\..\..\lib\libsword.lib"/>
<LIBRARIES value="NMFast50.lib vclx50.lib vcl50.lib"/>
<SPARELIBS value="vcl50.lib vclx50.lib NMFast50.lib"/>
***************
*** 22,26 ****
vclbde50.bpi ibsmp50.bpi vcldbx50.bpi teeui50.bpi teedb50.bpi tee50.bpi
nmfast50.bpi dclocx50.bpi"/>
! <PATHCPP value=".;"/>
<PATHPAS value=".;"/>
<PATHRC value=".;"/>
--- 23,27 ----
vclbde50.bpi ibsmp50.bpi vcldbx50.bpi teeui50.bpi teedb50.bpi tee50.bpi
nmfast50.bpi dclocx50.bpi"/>
! <PATHCPP value=".;..\.."/>
<PATHPAS value=".;"/>
<PATHRC value=".;"/>
***************
*** 32,42 ****
<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"/>
! <LIBPATH value="..\BibleCS;..\..\..\..\usr\src\sword\apps\windoze\CBuilder4\InstallMgr;$(BCB)\lib\obj;$(BCB)\lib"/>
<WARNINGS value="-w-par -w-8027 -w-8026"/>
<WARNOPTSTR value=""/>
</MACROS>
<OPTIONS>
! <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"/>
--- 33,44 ----
<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"/>
! <LIBPATH value="..\..;..\BibleCS;..\..\..\..\usr\src\sword\apps\windoze\CBuilder4\InstallMgr;$(BCB)\lib\obj;$(BCB)\lib"/>
<WARNINGS value="-w-par -w-8027 -w-8026"/>
<WARNOPTSTR value=""/>
</MACROS>
<OPTIONS>
! <IDLCFLAGS value="-I..\.. -Icurl\include -I..\BibleCS
! -I..\..\..\..\usr\src\sword\apps\windoze\CBuilder4\InstallMgr
-I$(BCB)\include -I$(BCB)\include\vcl -I..\..\..\..\include -src_suffix
cpp -DVCL -boa"/>
Index: InstallMgr.cpp
===================================================================
RCS file: /usr/local/cvsroot/sword/apps/windoze/CBuilder5/InstallMgr/InstallMgr.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** InstallMgr.cpp 8 Oct 2002 00:36:00 -0000 1.7
--- InstallMgr.cpp 26 Jan 2003 09:53:29 -0000 1.8
***************
*** 9,13 ****
USEFORM("cipherfrm.cpp", CipherForm);
USEFORM("UninstallFrm.cpp", UninstallForm);
- USELIB("..\..\..\..\lib\swordlib.lib");
USELIB("libcurl.lib");
USELIB("curl\lib\ws2_32.lib");
--- 9,12 ----
***************
*** 15,18 ****
--- 14,19 ----
USELIB("..\..\..\..\..\icu-sword\as_is\borland\icudatab.lib");
USELIB("..\..\..\..\..\icu-sword\as_is\borland\icucommon.lib");
+ USELIB("..\..\..\..\lib\libsword.lib");
+ USEUNIT("..\..\swwinlog.cpp");
//---------------------------------------------------------------------------
WINAPI WinMain(HINSTANCE, HINSTANCE, LPSTR, int)