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

See changelog 2001-10-30 21:15 GMT -3

Browse Source
This commit is contained in:
Luiz Rafael Culik
2001-10-30 23:01:52 +00:00
parent d9cde52bd0
commit 613cf1af23
6 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
harbour/ChangeLog
View File

@@ -1,3 +1,13 @@
2001-10-30 21:15 GMT -3 Luiz Rafael Culik<culik@sl.conex.net>
* bin/bld.bat
* Added Required winspool.lib for msvc builds
* source/vm/pvalue.c
include/hbextern.ch
* Renamed __pvalue to hb_pvalue
* utils/hbmake/hbmake.prg
utils/hbmake/hbmake.prg
* Fix some small problem with hbmake under linux
2001-10-30 20:05 GMT+3 Alexander Kresin <alex@belacy.belgorod.su>
* contrib/rdd_ads/ads1.c
* Added support for creating custom indexes

2
harbour/bin/bld.bat
View File

@@ -169,7 +169,7 @@ if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=..\include\
if "%HB_COMPILER%" == "gcc" gcc %1.c -o%1.exe %CFLAGS% -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% -ldebug -lvm -lrtl -l%_HB_GT_LIB% -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon
if "%HB_COMPILER%" == "mingw32" gcc %1.c -o%1.exe %CFLAGS% -mno-cygwin -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% -ldebug -lvm -lrtl -l%_HB_GT_LIB% -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon
if "%HB_COMPILER%" == "rsxnt" gcc %1.c -Zwin32 %CFLAGS% -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% -ldebug -lvm -lrtl -l%_HB_GT_LIB% -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon
if "%HB_COMPILER%" == "msvc" cl -TP -W3 %CFLAGS% -I%HB_INC_INSTALL% %1.c /link /subsystem:CONSOLE %HB_LIB_INSTALL%\debug.lib %HB_LIB_INSTALL%\vm.lib %HB_LIB_INSTALL%\rtl.lib %HB_LIB_INSTALL%\%_HB_GT_LIB%.lib %HB_LIB_INSTALL%\lang.lib %HB_LIB_INSTALL%\rdd.lib %HB_LIB_INSTALL%\macro.lib %HB_LIB_INSTALL%\pp.lib %HB_LIB_INSTALL%\dbfntx.lib %HB_LIB_INSTALL%\dbfcdx.lib %HB_LIB_INSTALL%\common.lib user32.lib %HB_LIB_INSTALL%\libmisc.lib
if "%HB_COMPILER%" == "msvc" cl -TP -W3 %CFLAGS% -I%HB_INC_INSTALL% %1.c /link /subsystem:CONSOLE %HB_LIB_INSTALL%\debug.lib %HB_LIB_INSTALL%\vm.lib %HB_LIB_INSTALL%\rtl.lib %HB_LIB_INSTALL%\%_HB_GT_LIB%.lib %HB_LIB_INSTALL%\lang.lib %HB_LIB_INSTALL%\rdd.lib %HB_LIB_INSTALL%\macro.lib %HB_LIB_INSTALL%\pp.lib %HB_LIB_INSTALL%\dbfntx.lib %HB_LIB_INSTALL%\dbfcdx.lib %HB_LIB_INSTALL%\common.lib user32.lib %HB_LIB_INSTALL%\libmisc.lib winspoll.lib
if "%HB_COMPILER%" == "msvc" echo Ignore LNK4033 warning
goto END

2
harbour/include/hbextern.ch
View File

@@ -176,7 +176,7 @@ EXTERNAL PROCFILE
//
//symbols from file: vm\pvalue.c
//
EXTERNAL __PVALUE
EXTERNAL HB_PVALUE
//
//symbols from file: vm\harbinit.prg
//

2
harbour/source/vm/pvalue.c
View File

@@ -54,7 +54,7 @@
#include "hbapiitm.h"
#include "hbstack.h"
HB_FUNC( __PVALUE )
HB_FUNC( HB_PVALUE )
{
USHORT uiParam = hb_parni( 1 );
PHB_ITEM *pBase = hb_stack.pItems + ( hb_stackBaseItem() )->item.asSymbol.stackbase; /* Skip function + self */

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

@@ -1208,6 +1208,10 @@ ATTENTION( "Harbour Options", 5 )
@ 8, 1 Get lGenppo checkbox "Generate pre-processed output"
@ 8, 43 Get lCompMod checkbox "compile module only"
Read
lBcc := If( At( "BCC", cCompiler ) > 0, .t., .f. )
lVcc := If( At( "MSVC", cCompiler ) > 0, .t., .f. )
lGcc := If( At( "GCC", cCompiler ) > 0, .t., .f. )
cObjDir:=alltrim(cObjDir)
if !empty(cobjDir)
if dirchange(cobjDir)!=0
makedir(cobjDir)
@@ -1233,9 +1237,6 @@ endif
aeval(amacros,{|x,y|cItem:=substr(x[2],1,len(x[2])),if(at(citem,cTest)>0,(amacros[y,1]:='OBJ',amacros[y,2]:=cObjDir),)})
lBcc := If( At( "BCC", cCompiler ) > 0, .t., .f. )
lVcc := If( At( "MSVC", cCompiler ) > 0, .t., .f. )
lGcc := If( At( "GCC", cCompiler ) > 0, .t., .f. )
if lAutomemvar
cDefHarOpts+=" -a "
endif
@@ -1893,6 +1894,10 @@ ATTENTION( "Harbour Options", 5 )
@ 8, 1 Get lGenppo checkbox "Generate pre-processed output"
@ 8, 43 Get lCompMod checkbox "compile module only"
Read
lBcc := If( At( "BCC", cCompiler ) > 0, .t., .f. )
lVcc := If( At( "MSVC", cCompiler ) > 0, .t., .f. )
lGcc := If( At( "GCC", cCompiler ) > 0, .t., .f. )
cObjDir:=Alltrim(cObjDir)
if !empty(cobjDir)
if dirchange(cobjDir)!=0
makedir(cobjDir)
@@ -1900,6 +1905,7 @@ if !empty(cobjDir)
dirchange('..')
endif
endif
amacros:=GetSourceDirMacros()
if lGcc
cObjDir:=alltrim(cObjDir)
@@ -1917,9 +1923,6 @@ endif
aeval(amacros,{|x,y|cItem:=substr(x[2],1,len(x[2])),if(at(citem,cTest)>0,(amacros[y,1]:='OBJ',amacros[y,2]:=cObjDir),)})
lBcc := If( At( "BCC", cCompiler ) > 0, .t., .f. )
lVcc := If( At( "MSVC", cCompiler ) > 0, .t., .f. )
lGcc := If( At( "GCC", cCompiler ) > 0, .t., .f. )
if lAutomemvar
cDefHarOpts+=" -a "
endif

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

@@ -116,9 +116,8 @@ Static Function GetDirs( cPattern )
Local aDir := {}
Local lLinux := At( 'linux', Os() ) > 0
Aeval( Directory( cPattern + "*.", "D" ), ;
{ | xItem | If( xItem[ 5 ] = "D" .and. ;
( xItem[ 1 ] != "." .and. xItem[ 1 ] != ".." ), ;
( Aadd( aDir, cPattern + xItem[ 1 ] + If( llinux, "/", '\' ) ), ;
{ | xItem | If( xItem[ 5 ] = "D" .and. if(!llinux , xItem[ 1 ] != "." .and. xItem[ 1 ] != ".." ,), ;
( Aadd( aDir, cPattern + xItem[ 1 ] + If( !llinux, "\", '/' ) ), ;
Outstd( "." ) ), "" ) } )
Return ( aDir )