diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 0cf2836a0f..52b667e67c 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,21 @@ 2008-12-31 13:59 UTC+0100 Foo Bar */ +2008-05-12 13:56 UTC+0100 Viktor Szakats (harbour.01 syenar hu) + * bin/bld.bat + + Added %HB_USER_LIB% for w32/msvc. + + + contrib/hbapollo/tests/bld_vc.bat + + contrib/gtwvg/tests/bld_vc.bat + + Added VC make files. + + * contrib/gtwvg/tests/demowvg.prg + - Removed (unused) embedded C code. + ; It still doesn't run though. + + * contrib/gtwvg/tests/bld_b32.bat + ! Fixed eol-style. + 2008-05-12 11:58 UTC+0100 Viktor Szakats (harbour.01 syenar hu) * contrib/rddads/adsfunc.c ! Readded one mistakenly removed cast. diff --git a/harbour/bin/bld.bat b/harbour/bin/bld.bat index 44c19af4ce..e4eeabbf5d 100644 --- a/harbour/bin/bld.bat +++ b/harbour/bin/bld.bat @@ -214,7 +214,7 @@ if not "%HB_ARCHITECTURE%" == "w32" goto A_OS2 if "%HB_COMPILER%" == "mingw32" gcc %1.c -o%1.exe %CFLAGS% -mno-cygwin -I%HB_INC_INSTALL% %HB_INC_TEMP% -L%HB_LIB_INSTALL% -lhbcpage -lhbdebug -lhbvm -lhbrtl -l%_HB_GT_LIB% -lhblang -lhbrdd -lhbrtl -lhbvm -lhbmacro -lhbpp -lrddfpt -lrddntx -lrddcdx -lhbsix -lhbcommon if "%HB_COMPILER%" == "rsxnt" gcc %1.c -Zwin32 %CFLAGS% -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% -lhbcpage -lhbdebug -lhbvm -lhbrtl -l%_HB_GT_LIB% -lhblang -lhbrdd -lhbrtl -lhbvm -lhbmacro -lhbpp -lrddfpt -lrddntx -lrddcdx -lhbsix -lhbcommon - if "%HB_COMPILER%" == "msvc" cl -TP -W3 %CFLAGS% -I%HB_INC_INSTALL% %1.c /link /subsystem:CONSOLE %HB_LIB_INSTALL%\hbcpage.lib %HB_LIB_INSTALL%\hbdebug.lib %HB_LIB_INSTALL%\hbvm.lib %HB_LIB_INSTALL%\hbrtl.lib %HB_LIB_INSTALL%\%_HB_GT_LIB%.lib %HB_LIB_INSTALL%\hblang.lib %HB_LIB_INSTALL%\hbrdd.lib %HB_LIB_INSTALL%\hbmacro.lib %HB_LIB_INSTALL%\hbpp.lib %HB_LIB_INSTALL%\rddntx.lib %HB_LIB_INSTALL%\rddcdx.lib %HB_LIB_INSTALL%\rddfpt.lib %HB_LIB_INSTALL%\hbsix.lib %HB_LIB_INSTALL%\hbcommon.lib user32.lib winspool.lib + if "%HB_COMPILER%" == "msvc" cl -TP -W3 %CFLAGS% -I%HB_INC_INSTALL% %1.c /link /subsystem:CONSOLE %HB_USER_LIBS% %HB_LIB_INSTALL%\hbcpage.lib %HB_LIB_INSTALL%\hbdebug.lib %HB_LIB_INSTALL%\hbvm.lib %HB_LIB_INSTALL%\hbrtl.lib %HB_LIB_INSTALL%\%_HB_GT_LIB%.lib %HB_LIB_INSTALL%\hblang.lib %HB_LIB_INSTALL%\hbrdd.lib %HB_LIB_INSTALL%\hbmacro.lib %HB_LIB_INSTALL%\hbpp.lib %HB_LIB_INSTALL%\rddntx.lib %HB_LIB_INSTALL%\rddcdx.lib %HB_LIB_INSTALL%\rddfpt.lib %HB_LIB_INSTALL%\hbsix.lib %HB_LIB_INSTALL%\hbcommon.lib user32.lib winspool.lib if "%HB_COMPILER%" == "msvc" echo Ignore LNK4033 warning :C_WATCOM diff --git a/harbour/contrib/gtwvg/tests/bld_b32.bat b/harbour/contrib/gtwvg/tests/bld_b32.bat index ff31d7dc42..f5be83ab68 100644 --- a/harbour/contrib/gtwvg/tests/bld_b32.bat +++ b/harbour/contrib/gtwvg/tests/bld_b32.bat @@ -1,18 +1,18 @@ -@echo off -rem -rem $Id$ -rem - -rem --------------------------------------------------------------- -rem This is a generic template file, if it doesn't fit your own needs -rem please DON'T MODIFY IT. -rem -rem Instead, make a local copy and modify that one, or make a call to -rem this batch file from your customized one. [vszakats] -rem --------------------------------------------------------------- - -set HB_ARCHITECTURE=w32 -set HB_COMPILER=bcc32 -set HB_USER_LIBS=gtwvg.lib - -call ..\..\..\bin\bld.bat %1 %2 %3 %4 %5 %6 %7 %8 %9 +@echo off +rem +rem $Id$ +rem + +rem --------------------------------------------------------------- +rem This is a generic template file, if it doesn't fit your own needs +rem please DON'T MODIFY IT. +rem +rem Instead, make a local copy and modify that one, or make a call to +rem this batch file from your customized one. [vszakats] +rem --------------------------------------------------------------- + +set HB_ARCHITECTURE=w32 +set HB_COMPILER=bcc32 +set HB_USER_LIBS=gtwvg.lib + +call ..\..\..\bin\bld.bat %1 %2 %3 %4 %5 %6 %7 %8 %9 diff --git a/harbour/contrib/gtwvg/tests/bld_vc.bat b/harbour/contrib/gtwvg/tests/bld_vc.bat new file mode 100644 index 0000000000..8c69a65e98 --- /dev/null +++ b/harbour/contrib/gtwvg/tests/bld_vc.bat @@ -0,0 +1,18 @@ +@echo off +rem +rem $Id$ +rem + +rem --------------------------------------------------------------- +rem This is a generic template file, if it doesn't fit your own needs +rem please DON'T MODIFY IT. +rem +rem Instead, make a local copy and modify that one, or make a call to +rem this batch file from your customized one. [vszakats] +rem --------------------------------------------------------------- + +set HB_ARCHITECTURE=w32 +set HB_COMPILER=msvc +set HB_USER_LIBS=gtwvg.lib + +call ..\..\..\bin\bld.bat %1 %2 %3 %4 %5 %6 %7 %8 %9 diff --git a/harbour/contrib/gtwvg/tests/demowvg.prg b/harbour/contrib/gtwvg/tests/demowvg.prg index 1a76e88116..f2bdf79403 100644 --- a/harbour/contrib/gtwvg/tests/demowvg.prg +++ b/harbour/contrib/gtwvg/tests/demowvg.prg @@ -2093,18 +2093,3 @@ FUNCTION DrawSlide( hDlg, nSlide ) Win_ReleaseDC( hDlg,hDC ) Return nil - -//-------------------------------------------------------------------// - -#pragma BEGINDUMP - -#include "hbapi.h" -#include "hbapiitm.h" -#include - -HB_FUNC( UIDEBUG ) -{ - OutputDebugString( hb_parc( 1 ) ); -} - -#pragma ENDDUMP diff --git a/harbour/contrib/hbapollo/tests/bld_vc.bat b/harbour/contrib/hbapollo/tests/bld_vc.bat new file mode 100644 index 0000000000..a1b3ebf145 --- /dev/null +++ b/harbour/contrib/hbapollo/tests/bld_vc.bat @@ -0,0 +1,18 @@ +@echo off +rem +rem $Id$ +rem + +rem --------------------------------------------------------------- +rem This is a generic template file, if it doesn't fit your own needs +rem please DON'T MODIFY IT. +rem +rem Instead, make a local copy and modify that one, or make a call to +rem this batch file from your customized one. [vszakats] +rem --------------------------------------------------------------- + +set HB_ARCHITECTURE=w32 +set HB_COMPILER=msvc +set HB_USER_LIBS=hbapollo.lib sde60.lib + +call ..\..\..\bin\bld.bat %1 %2 %3 %4 %5 %6 %7 %8 %9