fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

See Changelog 2002-02-18 23:41 UTC-0300

Browse Source
This commit is contained in:
Luiz Rafael Culik
2002-02-19 02:41:55 +00:00
parent ef4da17646
commit a9294d6e29
2 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
harbour/utils/hbmake/hbmake.prg
View File

@@ -150,7 +150,7 @@ else
cFile := ""
endif
If empty(cFile) .and. !lEditMode
If (empty(cFile) .and. !lEditMode) .or. !file(cfile)
? "File not Found"
Return Nil
Endif
@@ -171,9 +171,6 @@ Endif
If Pcount() >= 1
ProcessParameters(AllParam)
Endif
//if !file(cfile)
// return nil
//endif
if lEditMode
if lLibrary
crtlibmakfile( cFile )
@@ -1024,10 +1021,10 @@ cDefHarOpts+=" -v "
endif
if ldebug
cDefHarOpts+=" -b "
cDefBccLibs += "debug.lib"
cDefGccLibs += "-ldebug"
cgcclibsos2 += "-ldebug"
cDeflibGccLibs += "-ldebug"
cDefBccLibs += " debug.lib"
cDefGccLibs += " -ldebug"
cgcclibsos2 += " -ldebug"
cDeflibGccLibs += " -ldebug"
endif
if lSupressline
cDefHarOpts+=" -l "

18
harbour/utils/hbmake/hbmutils.prg
View File

@@ -354,15 +354,15 @@ Return aReturnLibs
Function Getlibs( lgcc ,cDir)
Local lLinux:=at('linux',lower(os()))>0
Local ainstaledlibs := Getinstaledlibs( If( !llinux, if(!lgcc, cDir+"\*.lib",cDir+"\*.a") , '/usr/lib/harbour/*.a' ),lGcc )
Local aLibsDesc := { { "Harbour Ct3 library - Libct", 'ct' + If( lgcc, '', '.lib' ) }, ;
{ "Harbour Misc library - Libmisc", 'misc' + If( lgcc, '', '.lib' ) }, ;
{ "Harbour html library - Htmllib", 'html' + If( lgcc, '', '.lib' ) }, ;
{ "Harbour Nanfor library - Libnf", 'nf' + If( lgcc, '', '.lib' ) }, ;
{ "Harbour Gt library - Libgt", 'nf' + If( lgcc, '', '.lib' ) }, ;
{ "Harbour Zip library Zlib1", 'zlib1.lib ziparchive' + If( lgcc, '', '.lib' ) }, ;
{ "Harbour Hbole library Hbole", 'hbole' + If( lgcc, '', '.lib' ) + ' ole2' + If( lgcc, '', '.lib' ) }, ;
{ "Harbour Mysql library - MySql", 'mysql' + If( lgcc, '', '.lib' ) + ' libmysql' + If( lgcc, '', '.lib' ) + ' mysqlclient' + If( lgcc, '.a', '.lib' ) }, ;
{ "Harbour Samples library - Samples", 'samples' + If( lgcc, '', '.lib' ) } }
Local aLibsDesc := { { "Harbour Ct3 library - Libct", 'ct' + If( lgcc, '.a', '.lib' ) }, ;
{ "Harbour Misc library - Libmisc", 'misc' + If( lgcc, '.a', '.lib' ) }, ;
{ "Harbour html library - Htmllib", 'html' + If( lgcc, '.a', '.lib' ) }, ;
{ "Harbour Nanfor library - Libnf", 'nf' + If( lgcc, '.a', '.lib' ) }, ;
{ "Harbour Gt library - Libgt", 'nf' + If( lgcc, '.a', '.lib' ) }, ;
{ "Harbour Zip library Zlib1", 'zlib1.lib ziparchive' + If( lgcc, '.a', '.lib' ) }, ;
{ "Harbour Hbole library Hbole", 'hbole' + If( lgcc, '.a', '.lib' ) + ' ole2' + If( lgcc, '.a', '.lib' ) }, ;
{ "Harbour Mysql library - MySql", 'mysql' + If( lgcc, '.a', '.lib' ) + ' libmysql' + If( lgcc, '.a', '.lib' ) + ' mysqlclient' + If( lgcc, '.a', '.lib' ) }, ;
{ "Harbour Samples library - Samples", 'samples' + If( lgcc, '.a', '.lib' ) } }
Aeval( ainstaledlibs, { | x | Aadd( aLibsDesc, { "User - " + x +" Library", x } ) } )
Return aLibsDesc