diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 8da88862d5..10b2371e18 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,23 @@ past entries belonging to these authors: Viktor Szakats. */ +2009-05-22 15:32 UTC+0200 Viktor Szakats (harbour.01 syenar hu) + * utils/hbmk2/hbmk2.prg + + Added autodetection of xmingw and mingw32ce tools on Linux. + (untested) + + * contrib/hbwin/legacy.prg + + Added win32prn and win32bmp compatibility classes. + + * contrib/hbwin/hbwin.ch + * contrib/hbwin/tests/testprn.prg + * Moved macros to hbwin.ch. + * Minor opt in test. + + * external/sqlite3/Makefile + - Disabled for mingwarm due to compile errors. + Error reported on sqlite3 site. + 2009-05-22 13:04 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * utils/hbmk2/hbmk2.prg ! Fixed extra GT for WinCE builds. diff --git a/harbour/contrib/hbwin/hbwin.ch b/harbour/contrib/hbwin/hbwin.ch index 68e1b46475..d0b0537406 100644 --- a/harbour/contrib/hbwin/hbwin.ch +++ b/harbour/contrib/hbwin/hbwin.ch @@ -112,6 +112,21 @@ /* win_Prn() related values */ +#define FORM_A4 9 + +#define PS_SOLID 0 + +#define RGB( nR, nG, nB ) ( nR + ( nG * 256 ) + ( nB * 256 * 256 ) ) + +#define RGB_BLACK RGB( 0x00, 0x00, 0x00 ) +#define RGB_BLUE RGB( 0x00, 0x00, 0x85 ) +#define RGB_GREEN RGB( 0x00, 0x85, 0x00 ) +#define RGB_CYAN RGB( 0x00, 0x85, 0x85 ) +#define RGB_RED RGB( 0x85, 0x00, 0x00 ) +#define RGB_MAGENTA RGB( 0x85, 0x00, 0x85 ) +#define RGB_BROWN RGB( 0x85, 0x85, 0x00 ) +#define RGB_WHITE RGB( 0xC6, 0xC6, 0xC6 ) + /* Cut from wingdi.h */ #define MM_TEXT 1 diff --git a/harbour/contrib/hbwin/legacy.prg b/harbour/contrib/hbwin/legacy.prg index 15ca7f4fd9..16803582b4 100644 --- a/harbour/contrib/hbwin/legacy.prg +++ b/harbour/contrib/hbwin/legacy.prg @@ -57,3 +57,9 @@ CREATE CLASS TOLEAUTO FROM WIN_OLEAUTO /* TODO: Implement compatibility to the required extent */ ENDCLASS + +CREATE CLASS Win32Prn FROM WIN_PRN +ENDCLASS + +CREATE CLASS Win32Bmp FROM WIN_BMP +ENDCLASS diff --git a/harbour/contrib/hbwin/tests/testprn.prg b/harbour/contrib/hbwin/tests/testprn.prg index cf85246a53..2b0a32df6d 100644 --- a/harbour/contrib/hbwin/tests/testprn.prg +++ b/harbour/contrib/hbwin/tests/testprn.prg @@ -2,20 +2,7 @@ * $Id$ */ -#define FORM_A4 9 - -#define PS_SOLID 0 - -#define RGB( nR,nG,nB ) ( nR + ( nG * 256 ) + ( nB * 256 * 256 ) ) - -#define BLACK RGB( 0x0 ,0x0 ,0x0 ) -#define BLUE RGB( 0x0 ,0x0 ,0x85 ) -#define GREEN RGB( 0x0 ,0x85,0x0 ) -#define CYAN RGB( 0x0 ,0x85,0x85 ) -#define RED RGB( 0x85,0x0 ,0x0 ) -#define MAGENTA RGB( 0x85,0x0 ,0x85 ) -#define BROWN RGB( 0x85,0x85,0x0 ) -#define WHITE RGB( 0xC6,0xC6,0xC6 ) +#include "hbwin.ch" PROCEDURE Main() LOCAL nPrn := 1 @@ -62,7 +49,7 @@ STATIC PROCEDURE PrnTest( cPrinter, cBMPFile ) IF !oPrinter:startDoc( "Win_Prn(Doc name in Printer Properties)" ) Alert( "StartDoc() failed" ) ELSE - oPrinter:SetPen(PS_SOLID, 1, RED) + oPrinter:SetPen(PS_SOLID, 1, RGB_RED) oPrinter:Bold(800) oPrinter:TextOut(oPrinter:PrinterName+": MaxRow() = "+STR(oPrinter:MaxRow(),4)+" MaxCol() = "+STR(oPrinter:MaxCol(),4)) oPrinter:Bold(0) // Normal @@ -147,7 +134,7 @@ STATIC PROCEDURE PrintBitMap( oPrn, cBitFile ) IF Empty( cBitFile ) * - ELSEIF !File( cBitFile ) + ELSEIF ! hb_FileExists( cBitFile ) Alert( cBitFile + " not found " ) ELSE oBMP := Win_BMP():New() diff --git a/harbour/external/sqlite3/Makefile b/harbour/external/sqlite3/Makefile index 04fbb89b93..892eb81b2c 100644 --- a/harbour/external/sqlite3/Makefile +++ b/harbour/external/sqlite3/Makefile @@ -23,6 +23,9 @@ endif ifeq ($(HB_ARCHITECTURE),os2) HB_WITH_SQLITE3=yes endif +ifeq ($(HB_COMPILER),mingwarm) +HB_WITH_SQLITE3=no +endif ifeq ($(HB_COMPILER),poccarm) HB_WITH_SQLITE3=no endif diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg index 3e2e5241f5..6226b906ef 100644 --- a/harbour/utils/hbmk2/hbmk2.prg +++ b/harbour/utils/hbmk2/hbmk2.prg @@ -915,11 +915,30 @@ FUNCTION hbmk( aArgs, /* @ */ lPause, /* @ */ lUTF8 ) RETURN 3 ENDIF + aCOMPDET_LOCAL := {} + IF hbmk[ _HBMK_cARCH ] $ "win|wce" - aCOMPDET_LOCAL := {; - { {| cPrefix | tmp1 := PathNormalize( s_cHB_INSTALL_PREFIX ) + "mingw" + hb_osPathSeparator() + "bin", iif( hb_FileExists( tmp1 + hb_osPathSeparator() + cPrefix + "gcc.exe" ), tmp1, NIL ) }, "win", "mingw" , "" } ,; - { {| cPrefix | tmp1 := PathNormalize( s_cHB_INSTALL_PREFIX ) + "mingw64" + hb_osPathSeparator() + "bin", iif( hb_FileExists( tmp1 + hb_osPathSeparator() + cPrefix + "gcc.exe" ), tmp1, NIL ) }, "win", "mingw64" , "x86_64-pc-mingw32-" } ,; - { {| cPrefix | tmp1 := PathNormalize( s_cHB_INSTALL_PREFIX ) + "mingwce" + hb_osPathSeparator() + "bin", iif( hb_FileExists( tmp1 + hb_osPathSeparator() + cPrefix + "gcc.exe" ), tmp1, NIL ) }, "wce", "mingwarm", "arm-wince-mingw32ce-" } } + + #if defined( __PLATFORM__WINDOWS ) + + AAdd( aCOMPDET_LOCAL, { {| cPrefix | tmp1 := PathNormalize( s_cHB_INSTALL_PREFIX ) + "mingw" + hb_osPathSeparator() + "bin", iif( hb_FileExists( tmp1 + hb_osPathSeparator() + cPrefix + "gcc.exe" ), tmp1, NIL ) }, "win", "mingw" , "" } ) + AAdd( aCOMPDET_LOCAL, { {| cPrefix | tmp1 := PathNormalize( s_cHB_INSTALL_PREFIX ) + "mingw64" + hb_osPathSeparator() + "bin", iif( hb_FileExists( tmp1 + hb_osPathSeparator() + cPrefix + "gcc.exe" ), tmp1, NIL ) }, "win", "mingw64" , "x86_64-pc-mingw32-" } ) + AAdd( aCOMPDET_LOCAL, { {| cPrefix | tmp1 := PathNormalize( s_cHB_INSTALL_PREFIX ) + "mingwce" + hb_osPathSeparator() + "bin", iif( hb_FileExists( tmp1 + hb_osPathSeparator() + cPrefix + "gcc.exe" ), tmp1, NIL ) }, "wce", "mingwarm", "arm-wince-mingw32ce-" } ) + + #elif defined( __PLATFORM__LINUX ) + + IF Empty( hbmk[ _HBMK_cCCPATH ] ) .AND. ; + Empty( hbmk[ _HBMK_cCCPREFIX ] ) + + DO CASE + CASE hbmk[ _HBMK_cCOMP ] $ "mingw" + AAdd( aCOMPDET_LOCAL, { {| cPrefix | tmp1 := "/opt/xmingw/bin" , iif( hb_FileExists( tmp1 + hb_osPathSeparator() + cPrefix + "gcc" ), tmp1, NIL ) }, "win", "mingw" , "i386-mingw-" } ) + CASE hbmk[ _HBMK_cCOMP ] $ "mingwarm" + AAdd( aCOMPDET_LOCAL, { {| cPrefix | tmp1 := "/opt/mingw32ce/bin", iif( hb_FileExists( tmp1 + hb_osPathSeparator() + cPrefix + "gcc" ), tmp1, NIL ) }, "wce", "mingwarm", "arm-wince-mingw32ce-" } ) + ENDCASE + ENDIF + + #endif ENDIF /* Autodetect compiler */