From b16692e11154eff4ecbc1e23df43449ddb2a1657 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Fri, 5 Jun 2009 23:21:16 +0000 Subject: [PATCH] 2009-06-06 01:19 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * bin/hb-mkdyn.bat ! Applied version number change to this file, too. * contrib/xpp/xpp.ch + Added minor tweak to not confuse non-Harbour compilers if included. * contrib/rddsql/sddfb/fbirddd.c * contrib/rddsql/sddpg/pgsqldd.c ! Warnings fixed. * contrib/hbmysql/mysql.c ! Fixed wrong type for file handle, causing problems for x64 builds. * contrib/hbnf/descendn.c ! Removed 'auto' keyword which is no longer recognized by MSVC 2010. * bin/postinst.bat + Creating implibs for msvc64/mingw64 platforms where 3rd parties support it. (libcurl, firebird, mysql) * contrib/gtwvg/wvggui.h ! Fixed to compile with MSVS 2010. Thanks Pritpal. * contrib/gtwvg/wvggui.c * Reenabled for MSVS 2010 after applying fix. --- harbour/ChangeLog | 30 ++++++++++++++++++++++++++ harbour/bin/hb-mkdyn.bat | 2 +- harbour/bin/postinst.bat | 20 +++++++++++++++++ harbour/contrib/gtwvg/wvggui.c | 5 ----- harbour/contrib/gtwvg/wvggui.h | 12 +++++------ harbour/contrib/hbmysql/mysql.c | 2 +- harbour/contrib/hbnf/descendn.c | 11 +++++----- harbour/contrib/rddsql/sddfb/fbirddd.c | 2 +- harbour/contrib/rddsql/sddpg/pgsqldd.c | 2 +- harbour/contrib/xpp/xpp.ch | 2 ++ 10 files changed, 67 insertions(+), 21 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 6fbbb29e06..3c8723effb 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,35 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-06-06 01:19 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * bin/hb-mkdyn.bat + ! Applied version number change to this file, too. + + * contrib/xpp/xpp.ch + + Added minor tweak to not confuse non-Harbour compilers + if included. + + * contrib/rddsql/sddfb/fbirddd.c + * contrib/rddsql/sddpg/pgsqldd.c + ! Warnings fixed. + + * contrib/hbmysql/mysql.c + ! Fixed wrong type for file handle, causing problems for x64 builds. + + * contrib/hbnf/descendn.c + ! Removed 'auto' keyword which is no longer recognized by + MSVC 2010. + + * bin/postinst.bat + + Creating implibs for msvc64/mingw64 platforms where 3rd + parties support it. (libcurl, firebird, mysql) + + * contrib/gtwvg/wvggui.h + ! Fixed to compile with MSVS 2010. Thanks Pritpal. + + * contrib/gtwvg/wvggui.c + * Reenabled for MSVS 2010 after applying fix. + 2009-06-05 23:05 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + config/mingw32-make.exe + Added GNU Make (Windows, 32-bit) executable (size: 173KB), @@ -161,6 +190,7 @@ * include/hbver.h * doc/whatsnew.txt * source/vm/maindllp.c + * bin/hb-mkdyn.bat [MISSED FILE ADDED HERE LATER] * 1.1.0dev -> 2.0.0dev ; Preparation for next rc1. diff --git a/harbour/bin/hb-mkdyn.bat b/harbour/bin/hb-mkdyn.bat index 36956abe3f..4be39cefd3 100644 --- a/harbour/bin/hb-mkdyn.bat +++ b/harbour/bin/hb-mkdyn.bat @@ -19,7 +19,7 @@ setlocal if "%HB_ARCHITECTURE%" == "" ( echo HB_ARCHITECTURE needs to be set. && goto END ) if "%HB_COMPILER%" == "" ( echo HB_COMPILER needs to be set. && goto END ) -set HB_DLL_VERSION=11 +set HB_DLL_VERSION=20 set HB_DLL_LIBS=hbcommon hbpp hbrtl hbmacro hblang hbcpage hbpcre hbzlib hbextern hbrdd rddntx rddnsx rddcdx rddfpt hbsix hbhsx hbusrrdd gtcgi gtpca gtstd gtwvt gtgui set HB_DLL_LIBS_WIN=gtwin set HB_DLL_LIBS_ST=hbvm diff --git a/harbour/bin/postinst.bat b/harbour/bin/postinst.bat index 215875a89d..906a946ab8 100644 --- a/harbour/bin/postinst.bat +++ b/harbour/bin/postinst.bat @@ -113,6 +113,16 @@ if "%HB_BUILD_IMPLIB%" == "yes" ( goto END ) + if "%HB_COMPILER%" == "msvc64" ( + + if exist "%HB_DIR_CURL%\libcurl.dll" call :P_MSVC_IMPLIB "%HB_DIR_CURL%\libcurl.dll" "%HB_LIB_INSTALL%\libcurl.lib" + if exist "%HB_DIR_CURL%\bin\libcurl.dll" call :P_MSVC_IMPLIB "%HB_DIR_CURL%\bin\libcurl.dll" "%HB_LIB_INSTALL%\libcurl.lib" + if exist "%HB_DIR_FIREBIRD%\lib\fbclient_ms.lib" copy /b /y "%HB_DIR_FIREBIRD%\lib\fbclient_ms.lib" "%HB_LIB_INSTALL%\fbclient.lib" + if exist "%HB_DIR_MYSQL%\lib\opt\libmySQL.lib" copy /b /y "%HB_DIR_MYSQL%\lib\opt\libmySQL.lib" "%HB_LIB_INSTALL%\libmySQL.lib" + + goto END + ) + if "%HB_COMPILER%" == "mingw" ( if exist "%HB_DIR_ADS%\Redistribute\ace32.lib" copy /b /y "%HB_DIR_ADS%\Redistribute\ace32.lib" "%HB_LIB_INSTALL%\libace32.a" @@ -143,6 +153,16 @@ if "%HB_BUILD_IMPLIB%" == "yes" ( goto END ) + if "%HB_COMPILER%" == "mingw64" ( + + if exist "%HB_DIR_CURL%\lib\libcurl.a" copy /b /y "%HB_DIR_CURL%\lib\libcurl.a" "%HB_LIB_INSTALL%\libcurl.a" + if exist "%HB_DIR_CURL%\lib\libcurldll.a" copy /b /y "%HB_DIR_CURL%\lib\libcurldll.a" "%HB_LIB_INSTALL%\libcurldll.a" + if exist "%HB_DIR_FIREBIRD%\lib\fbclient_ms.lib" copy /b /y "%HB_DIR_FIREBIRD%\lib\fbclient_ms.lib" "%HB_LIB_INSTALL%\libfbclient.a" + if exist "%HB_DIR_MYSQL%\lib\opt\libmySQL.lib" copy /b /y "%HB_DIR_MYSQL%\lib\opt\libmySQL.lib" "%HB_LIB_INSTALL%\liblibmysql.a" + + goto END + ) + if "%HB_COMPILER%" == "pocc" ( if exist "%HB_DIR_ADS%\Redistribute\ace32.lib" copy /b /y "%HB_DIR_ADS%\Redistribute\ace32.lib" "%HB_LIB_INSTALL%\ace32.lib" diff --git a/harbour/contrib/gtwvg/wvggui.c b/harbour/contrib/gtwvg/wvggui.c index f4738feb25..512a2d8083 100644 --- a/harbour/contrib/gtwvg/wvggui.c +++ b/harbour/contrib/gtwvg/wvggui.c @@ -82,9 +82,6 @@ * */ -/* TOFIX: ? Several errors when using MSVS 2010 Beta 1 */ -#if ! defined(_MSC_VER) || _MSC_VER < 1600 - #define HB_OS_WIN_USED #include "wvggui.h" @@ -2279,5 +2276,3 @@ HB_CALL_ON_STARTUP_END( _hb_startup_gt_Init_ ) static HB_$INITSYM hb_vm_auto__hb_startup_gt_Init_ = _hb_startup_gt_Init_; #pragma data_seg() #endif - -#endif diff --git a/harbour/contrib/gtwvg/wvggui.h b/harbour/contrib/gtwvg/wvggui.h index 4ebf1bbcb8..4c3b3c8bdd 100644 --- a/harbour/contrib/gtwvg/wvggui.h +++ b/harbour/contrib/gtwvg/wvggui.h @@ -62,6 +62,12 @@ #define CINTERFACE 1 #endif +#ifndef _WIN32_IE + #ifndef __MINGW64__ + #define _WIN32_IE 0x0400 + #endif +#endif + /*----------------------------------------------------------------------*/ #include @@ -91,12 +97,6 @@ #include "hbgtwvg.ch" -#ifndef _WIN32_IE - #ifndef __MINGW64__ - #define _WIN32_IE 0x0400 - #endif -#endif - HB_EXTERN_BEGIN /*----------------------------------------------------------------------*/ diff --git a/harbour/contrib/hbmysql/mysql.c b/harbour/contrib/hbmysql/mysql.c index 4ccf12bd80..dd13d233a0 100644 --- a/harbour/contrib/hbmysql/mysql.c +++ b/harbour/contrib/hbmysql/mysql.c @@ -320,7 +320,7 @@ HB_FUNC( MYSQL_ESCAPE_STRING ) static char * filetoBuff( char * fname, int * size ) { char * buffer = NULL; - int handle = hb_fsOpen( ( BYTE * ) fname, FO_READWRITE ); + HB_FHANDLE handle = hb_fsOpen( ( BYTE * ) fname, FO_READWRITE ); if( handle != FS_ERROR ) { diff --git a/harbour/contrib/hbnf/descendn.c b/harbour/contrib/hbnf/descendn.c index 5e5f68c046..5292439fdf 100644 --- a/harbour/contrib/hbnf/descendn.c +++ b/harbour/contrib/hbnf/descendn.c @@ -52,13 +52,12 @@ HB_FUNC( FT_DESCEND ) { #if defined(HB_OS_DOS) || defined(HB_OS_WIN) { + PHB_ITEM iP = hb_itemParam( 1 ); + HB_TYPE uiType = hb_itemType( iP ); - auto PHB_ITEM iP = hb_itemParam( 1 ); - auto HB_TYPE uiType = hb_itemType( iP ); - - auto PHB_ITEM iR = NULL; - auto USHORT uiLen, n; - auto char * pDescend; + PHB_ITEM iR = NULL; + USHORT uiLen, n; + char * pDescend; if ( ( uiType & HB_IT_NUMERIC ) && ( uiType & HB_IT_DOUBLE ) ) iR = hb_itemPutND( 0, 0 - hb_itemGetND( iP ) ); diff --git a/harbour/contrib/rddsql/sddfb/fbirddd.c b/harbour/contrib/rddsql/sddfb/fbirddd.c index 8943d75ce9..0d13b6bdf8 100644 --- a/harbour/contrib/rddsql/sddfb/fbirddd.c +++ b/harbour/contrib/rddsql/sddfb/fbirddd.c @@ -466,7 +466,7 @@ static HB_ERRCODE fbGoTo( SQLBASEAREAP pArea, ULONG ulRecNo ) XSQLVAR* pVar; PHB_ITEM pItem, pArray; USHORT ui; - long lErr; + ISC_STATUS lErr; short iType; while ( ulRecNo > pArea->ulRecCount && ! pArea->fFetched ) diff --git a/harbour/contrib/rddsql/sddpg/pgsqldd.c b/harbour/contrib/rddsql/sddpg/pgsqldd.c index ab80b4ec5d..9a25948f5f 100644 --- a/harbour/contrib/rddsql/sddpg/pgsqldd.c +++ b/harbour/contrib/rddsql/sddpg/pgsqldd.c @@ -261,7 +261,7 @@ static HB_ERRCODE pgsqlOpen( SQLBASEAREAP pArea ) status = PQresultStatus( pResult ); if ( status != PGRES_TUPLES_OK && status != PGRES_COMMAND_OK ) { - hb_errRT_PostgreSQLDD( EG_OPEN, ESQLDD_INVALIDQUERY, PQresultErrorMessage( pResult ), pArea->szQuery, status ); + hb_errRT_PostgreSQLDD( EG_OPEN, ESQLDD_INVALIDQUERY, PQresultErrorMessage( pResult ), pArea->szQuery, ( USHORT ) status ); return HB_FAILURE; } diff --git a/harbour/contrib/xpp/xpp.ch b/harbour/contrib/xpp/xpp.ch index 0ca072dcf5..8ddeb75e77 100644 --- a/harbour/contrib/xpp/xpp.ch +++ b/harbour/contrib/xpp/xpp.ch @@ -55,6 +55,7 @@ /* Translations for Harbour programs compiled with Xbase++ compiler */ #else +#ifdef __HARBOUR__ /* Translations for Xbase++ programs compiled with Harbour compiler */ @@ -71,3 +72,4 @@ original Xbase++ names. */ #endif +#endif