diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 2d5da3abaa..7a45a2761b 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,3 +1,13 @@ +2001-10-30 21:15 GMT -3 Luiz Rafael Culik + * 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 * contrib/rdd_ads/ads1.c * Added support for creating custom indexes diff --git a/harbour/bin/bld.bat b/harbour/bin/bld.bat index 91e87202b6..e44a55bd99 100644 --- a/harbour/bin/bld.bat +++ b/harbour/bin/bld.bat @@ -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 diff --git a/harbour/include/hbextern.ch b/harbour/include/hbextern.ch index 6fd3f303ae..b3bd29c20f 100644 --- a/harbour/include/hbextern.ch +++ b/harbour/include/hbextern.ch @@ -176,7 +176,7 @@ EXTERNAL PROCFILE // //symbols from file: vm\pvalue.c // -EXTERNAL __PVALUE +EXTERNAL HB_PVALUE // //symbols from file: vm\harbinit.prg // diff --git a/harbour/source/vm/pvalue.c b/harbour/source/vm/pvalue.c index 8132f44ac5..5e955e4464 100644 --- a/harbour/source/vm/pvalue.c +++ b/harbour/source/vm/pvalue.c @@ -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 */ diff --git a/harbour/utils/hbmake/hbmake.prg b/harbour/utils/hbmake/hbmake.prg index 345f649e06..a06d91d006 100644 --- a/harbour/utils/hbmake/hbmake.prg +++ b/harbour/utils/hbmake/hbmake.prg @@ -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 diff --git a/harbour/utils/hbmake/hbmutils.prg b/harbour/utils/hbmake/hbmutils.prg index b60f9310d6..2179bb0045 100644 --- a/harbour/utils/hbmake/hbmutils.prg +++ b/harbour/utils/hbmake/hbmutils.prg @@ -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 )