From e97a7501d054c1b98585d4ca7f7dde8e829f339d Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sun, 14 Mar 2010 20:32:31 +0000 Subject: [PATCH] 2010-03-14 21:29 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * src/vm/fm.c * src/common/hbwince.c * include/hbwince.h * include/hbthread.h * contrib/hbct/ctnet.c * contrib/hbodbc/Makefile * contrib/xhb/hbserv.c * contrib/hbtpathy/tpwin.c * contrib/hbnf/getenvrn.c * contrib/rddsql/sddodbc/Makefile * contrib/hbwin/olecore.c * contrib/hbwin/win_prn1.c * contrib/hbwin/win_dlg.c * config/wce/msvcarm.mk + Added support for msvcarm 2008. * utils/hbmk2/hbmk2.prg ! Synced msvcarm dynlib creatino options with Harbour build. --- harbour/ChangeLog | 20 ++++++++++++++++++++ harbour/config/wce/msvcarm.mk | 2 +- harbour/contrib/hbct/ctnet.c | 16 ++++++++-------- harbour/contrib/hbnf/getenvrn.c | 2 +- harbour/contrib/hbodbc/Makefile | 4 +--- harbour/contrib/hbtpathy/tpwin.c | 2 +- harbour/contrib/hbwin/olecore.c | 4 ++-- harbour/contrib/hbwin/win_dlg.c | 2 +- harbour/contrib/hbwin/win_prn1.c | 6 ++++-- harbour/contrib/rddsql/sddodbc/Makefile | 4 +--- harbour/contrib/xhb/hbserv.c | 2 +- harbour/include/hbthread.h | 4 ++-- harbour/include/hbwince.h | 2 +- harbour/src/common/hbwince.c | 2 +- harbour/src/vm/fm.c | 7 +++++-- harbour/utils/hbmk2/hbmk2.prg | 2 ++ 16 files changed, 52 insertions(+), 29 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 8811f96f12..f4d2e0168c 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,26 @@ past entries belonging to author(s): Viktor Szakats. */ +2010-03-14 21:29 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) + * src/vm/fm.c + * src/common/hbwince.c + * include/hbwince.h + * include/hbthread.h + * contrib/hbct/ctnet.c + * contrib/hbodbc/Makefile + * contrib/xhb/hbserv.c + * contrib/hbtpathy/tpwin.c + * contrib/hbnf/getenvrn.c + * contrib/rddsql/sddodbc/Makefile + * contrib/hbwin/olecore.c + * contrib/hbwin/win_prn1.c + * contrib/hbwin/win_dlg.c + * config/wce/msvcarm.mk + + Added support for msvcarm 2008. + + * utils/hbmk2/hbmk2.prg + ! Synced msvcarm dynlib creatino options with Harbour build. + 2010-03-14 12:21 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * config/wce/msvcarm.mk * utils/hbmk2/hbmk2.prg diff --git a/harbour/config/wce/msvcarm.mk b/harbour/config/wce/msvcarm.mk index 4c461c5d22..fe4771afa9 100644 --- a/harbour/config/wce/msvcarm.mk +++ b/harbour/config/wce/msvcarm.mk @@ -90,7 +90,7 @@ AR := lib.exe AR_RULE = $(AR) $(ARFLAGS) $(HB_AFLAGS) $(HB_USER_AFLAGS) -nologo -out:$(LIB_DIR)/$@ $(^F) || $(RM) $(LIB_DIR)/$@ DY := $(LD) -DFLAGS += -nologo -dll -subsystem:windowsce $(LIBPATHS) +DFLAGS += -nologo -dll -subsystem:windowsce -nodefaultlib:oldnames.lib $(LIBPATHS) DY_OUT := $(LD_OUT) DLIBS := $(foreach lib,$(HB_USER_LIBS) $(LIBS) $(SYSLIBS),$(lib)$(LIB_EXT)) diff --git a/harbour/contrib/hbct/ctnet.c b/harbour/contrib/hbct/ctnet.c index 7ac35885f9..336a08180f 100644 --- a/harbour/contrib/hbct/ctnet.c +++ b/harbour/contrib/hbct/ctnet.c @@ -94,7 +94,7 @@ #include #endif -#if defined( HB_OS_WIN ) && !( defined( HB_OS_WIN_CE ) && ( defined( _MSC_VER ) && ( _MSC_VER <= 1310 ) ) ) +#if defined( HB_OS_WIN ) && !( defined( HB_OS_WIN_CE ) && ( defined( _MSC_VER ) && ( _MSC_VER <= 1500 ) ) ) static HB_BOOL hb_IsNetShared( const char * szLocalDevice ) { TCHAR lpRemoteDevice[ 128 ]; @@ -113,7 +113,7 @@ static HB_BOOL hb_IsNetShared( const char * szLocalDevice ) HB_FUNC( NETCANCEL ) { -#if defined( HB_OS_WIN ) && !( defined( HB_OS_WIN_CE ) && ( defined( _MSC_VER ) && ( _MSC_VER <= 1310 ) ) ) +#if defined( HB_OS_WIN ) && !( defined( HB_OS_WIN_CE ) && ( defined( _MSC_VER ) && ( _MSC_VER <= 1500 ) ) ) DWORD dwResult; LPTSTR lpDevice = HB_TCHAR_CONVTO( hb_parcx( 1 ) ); @@ -132,7 +132,7 @@ HB_FUNC( NETCANCEL ) HB_FUNC( NETPRINTER ) { -#if defined( HB_OS_WIN ) && !( defined( HB_OS_WIN_CE ) && ( defined( _MSC_VER ) && ( _MSC_VER <= 1310 ) ) ) +#if defined( HB_OS_WIN ) && !( defined( HB_OS_WIN_CE ) && ( defined( _MSC_VER ) && ( _MSC_VER <= 1500 ) ) ) const char * cPrn = hb_setGetCPtr( HB_SET_PRINTFILE ); /* query default local printer port. */ if( !cPrn || !*cPrn || hb_stricmp( cPrn, "PRN" ) == 0 ) @@ -146,7 +146,7 @@ HB_FUNC( NETPRINTER ) HB_FUNC( NETDISK ) { -#if defined( HB_OS_WIN ) && !( defined( HB_OS_WIN_CE ) && ( defined( _MSC_VER ) && ( _MSC_VER <= 1310 ) ) ) +#if defined( HB_OS_WIN ) && !( defined( HB_OS_WIN_CE ) && ( defined( _MSC_VER ) && ( _MSC_VER <= 1500 ) ) ) char cDrive[ 3 ]; cDrive[ 0 ] = hb_parcx( 1 )[ 0 ]; @@ -161,7 +161,7 @@ HB_FUNC( NETDISK ) HB_FUNC( NETREDIR ) { -#if defined( HB_OS_WIN ) && !( defined( HB_OS_WIN_CE ) && ( defined( _MSC_VER ) && ( _MSC_VER <= 1310 ) ) ) +#if defined( HB_OS_WIN ) && !( defined( HB_OS_WIN_CE ) && ( defined( _MSC_VER ) && ( _MSC_VER <= 1500 ) ) ) void * hLocalDev; void * hSharedRes; void * hPassword; @@ -247,7 +247,7 @@ HB_FUNC( NETREDIR ) HB_FUNC( NETRMTNAME ) { -#if defined( HB_OS_WIN ) && !( defined( HB_OS_WIN_CE ) && ( defined( _MSC_VER ) && ( _MSC_VER <= 1310 ) ) ) +#if defined( HB_OS_WIN ) && !( defined( HB_OS_WIN_CE ) && ( defined( _MSC_VER ) && ( _MSC_VER <= 1500 ) ) ) void * hLocalDev; TCHAR lpRemoteDevice[ 128 ]; @@ -268,7 +268,7 @@ HB_FUNC( NETRMTNAME ) HB_FUNC( NETWORK ) { -#if defined( HB_OS_WIN ) && !( defined( HB_OS_WIN_CE ) && ( defined( _MSC_VER ) && ( _MSC_VER <= 1310 ) ) ) +#if defined( HB_OS_WIN ) && !( defined( HB_OS_WIN_CE ) && ( defined( _MSC_VER ) && ( _MSC_VER <= 1500 ) ) ) DWORD dwResult; TCHAR lpProviderName[ 128 ]; DWORD dwLen = HB_SIZEOFARRAY( lpProviderName ); @@ -292,7 +292,7 @@ HB_FUNC( NETWORK ) HB_FUNC( NNETWORK ) { -#if defined( HB_OS_WIN ) && !( defined( HB_OS_WIN_CE ) && ( defined( _MSC_VER ) && ( _MSC_VER <= 1310 ) ) ) +#if defined( HB_OS_WIN ) && !( defined( HB_OS_WIN_CE ) && ( defined( _MSC_VER ) && ( _MSC_VER <= 1500 ) ) ) TCHAR lpProviderName[ 128 ]; DWORD dwLen = HB_SIZEOFARRAY( lpProviderName ); diff --git a/harbour/contrib/hbnf/getenvrn.c b/harbour/contrib/hbnf/getenvrn.c index 45a1947bef..8ea7679dab 100644 --- a/harbour/contrib/hbnf/getenvrn.c +++ b/harbour/contrib/hbnf/getenvrn.c @@ -170,7 +170,7 @@ HB_FUNC( FT_GETE ) /* return number of strings found */ hb_retni( x ); } -#elif defined( HB_OS_WIN ) && ! ( defined( HB_OS_WIN_CE ) && ( defined( __POCC__ ) || ( defined( _MSC_VER ) && ( _MSC_VER <= 1310 ) ) ) ) +#elif defined( HB_OS_WIN ) && ! ( defined( HB_OS_WIN_CE ) && ( defined( __POCC__ ) || ( defined( _MSC_VER ) && ( _MSC_VER <= 1500 ) ) ) ) { char *buffer = NULL; LPTCH lpEnviron = GetEnvironmentStrings(); diff --git a/harbour/contrib/hbodbc/Makefile b/harbour/contrib/hbodbc/Makefile index 262e576e23..48a7542f78 100644 --- a/harbour/contrib/hbodbc/Makefile +++ b/harbour/contrib/hbodbc/Makefile @@ -22,9 +22,7 @@ PRG_HEADERS := \ ifneq ($(filter $(HB_PLATFORM),win wce),) HB_INC_ODBC := force ifeq ($(HB_COMPILER),msvcarm) - ifneq ($(filter $(HB_COMPILER_VER),600 700 710),) - HB_INC_ODBC := - endif + HB_INC_ODBC := endif endif diff --git a/harbour/contrib/hbtpathy/tpwin.c b/harbour/contrib/hbtpathy/tpwin.c index 288eb3c565..ae6ba4e8e9 100644 --- a/harbour/contrib/hbtpathy/tpwin.c +++ b/harbour/contrib/hbtpathy/tpwin.c @@ -64,7 +64,7 @@ HB_FUNC( __TP_INITPORTSPEED ) { -#if !( defined( HB_OS_WIN_CE ) && ( defined( _MSC_VER ) && ( _MSC_VER <= 1310 ) ) ) +#if !( defined( HB_OS_WIN_CE ) && ( defined( _MSC_VER ) && ( _MSC_VER <= 1500 ) ) ) DCB dcb; char values[ 20 ]; LPTSTR lpValues; diff --git a/harbour/contrib/hbwin/olecore.c b/harbour/contrib/hbwin/olecore.c index 7cdb265881..bed196c7a5 100644 --- a/harbour/contrib/hbwin/olecore.c +++ b/harbour/contrib/hbwin/olecore.c @@ -57,7 +57,7 @@ /* enable workaround for wrong OLE variant structure definition */ #if ( defined( __POCC__ ) && defined( HB_OS_WIN_CE ) ) || \ defined( __DMC__ ) || \ - ( defined( _MSC_VER ) && ( _MSC_VER <= 1310 ) ) + ( defined( _MSC_VER ) && ( _MSC_VER <= 1500 ) ) # define HB_OLE_NO_LL #endif @@ -65,7 +65,7 @@ ( defined( __WATCOMC__ ) && ( __WATCOMC__ < 1280 ) ) || \ defined( __MINGW32__ ) || \ defined( __DMC__ ) || \ - ( defined( _MSC_VER ) && ( _MSC_VER <= 1310 ) ) + ( defined( _MSC_VER ) && ( _MSC_VER <= 1500 ) ) # define HB_OLE_NO_LLREF #endif diff --git a/harbour/contrib/hbwin/win_dlg.c b/harbour/contrib/hbwin/win_dlg.c index 82df799c96..af6af8472c 100644 --- a/harbour/contrib/hbwin/win_dlg.c +++ b/harbour/contrib/hbwin/win_dlg.c @@ -97,7 +97,7 @@ HB_FUNC( WIN_PRINTDLGDC ) #endif -#if !( defined( HB_OS_WIN_CE ) && ( defined( _MSC_VER ) && ( _MSC_VER <= 1310 ) ) ) +#if !( defined( HB_OS_WIN_CE ) && ( defined( _MSC_VER ) && ( _MSC_VER <= 1500 ) ) ) static LPTSTR s_dialogPairs( int iParam, DWORD * pdwIndex ) { diff --git a/harbour/contrib/hbwin/win_prn1.c b/harbour/contrib/hbwin/win_prn1.c index e264382d14..aac617a7f5 100644 --- a/harbour/contrib/hbwin/win_prn1.c +++ b/harbour/contrib/hbwin/win_prn1.c @@ -76,8 +76,10 @@ #include "hbwince.h" /* Pelles C requires this */ - #ifndef FONTENUMPROC - #define FONTENUMPROC FONTENUMPROCW + #if defined( __POCC__ ) + #ifndef FONTENUMPROC + #define FONTENUMPROC FONTENUMPROCW + #endif #endif #endif diff --git a/harbour/contrib/rddsql/sddodbc/Makefile b/harbour/contrib/rddsql/sddodbc/Makefile index b21284f1c6..9a245cf2e3 100644 --- a/harbour/contrib/rddsql/sddodbc/Makefile +++ b/harbour/contrib/rddsql/sddodbc/Makefile @@ -14,9 +14,7 @@ C_SOURCES := \ ifneq ($(filter $(HB_PLATFORM),win wce),) HB_INC_ODBC := force ifeq ($(HB_COMPILER),msvcarm) - ifneq ($(filter $(HB_COMPILER_VER),600 700 710),) - HB_INC_ODBC := - endif + HB_INC_ODBC := endif endif diff --git a/harbour/contrib/xhb/hbserv.c b/harbour/contrib/xhb/hbserv.c index c3dccd4f7c..50212070a7 100644 --- a/harbour/contrib/xhb/hbserv.c +++ b/harbour/contrib/xhb/hbserv.c @@ -71,7 +71,7 @@ /* These targets can't compile this module */ #if !defined( HB_OS_DOS ) && \ !defined( HB_OS_DARWIN_5 ) && \ - ! ( defined( HB_OS_WIN_CE ) && ( defined( __POCC__ ) || ( defined( _MSC_VER ) && ( _MSC_VER <= 1310 ) ) ) ) && \ + ! ( defined( HB_OS_WIN_CE ) && ( defined( __POCC__ ) || ( defined( _MSC_VER ) && ( _MSC_VER <= 1500 ) ) ) ) && \ !defined( HB_OS_WIN_64 ) && \ ( !defined( HB_OS_OS2 ) || defined( HB_OS_OS2_GCC ) ) && \ !defined( __HAIKU__ ) diff --git a/harbour/include/hbthread.h b/harbour/include/hbthread.h index 35a7c4733b..fb54413449 100644 --- a/harbour/include/hbthread.h +++ b/harbour/include/hbthread.h @@ -182,7 +182,7 @@ HB_EXTERN_BEGIN # if defined( HB_OS_WIN_CE ) && \ ( ( defined( __MINGW32CE__ ) && !defined( __MSVCRT__ ) ) || \ defined( __POCC__ ) ) || \ - ( defined( _MSC_VER ) && ( _MSC_VER <= 1310 ) ) + ( defined( _MSC_VER ) && ( _MSC_VER <= 1500 ) ) # define HB_THREAD_RAWWINAPI # endif @@ -435,7 +435,7 @@ extern HB_BOOL hb_threadMutexSyncWait( PHB_ITEM pItemMtx, HB_ULONG ulMilliSec, P /* enable native compiler TLS support by default for this compilers * which are known that it will work correctly */ -# if ( defined( _MSC_VER ) && ( _MSC_VER > 1310 ) ) && !defined( __POCC__ ) && !defined( __XCC__ ) +# if ( defined( _MSC_VER ) && ( _MSC_VER > 1500 ) ) && !defined( __POCC__ ) && !defined( __XCC__ ) # define HB_USE_TLS # elif defined( __GNUC__ ) && __GNUC__ >= 3 && \ defined( __GLIBC__ ) && defined( __GLIBC_MINOR__ ) && \ diff --git a/harbour/include/hbwince.h b/harbour/include/hbwince.h index a0b54d4d68..3b95531d19 100644 --- a/harbour/include/hbwince.h +++ b/harbour/include/hbwince.h @@ -122,7 +122,7 @@ HB_EXTERN_BEGIN int WINAPI MulDiv( int nNumber, int nNumerator, int nDenominator ); #endif -#if defined( __POCC__ ) || ( defined( _MSC_VER ) && ( _MSC_VER <= 1310 ) ) +#if defined( __POCC__ ) || ( defined( _MSC_VER ) && ( _MSC_VER <= 1500 ) ) void abort( void ); #endif diff --git a/harbour/src/common/hbwince.c b/harbour/src/common/hbwince.c index b8e14a0bc4..42389e510f 100644 --- a/harbour/src/common/hbwince.c +++ b/harbour/src/common/hbwince.c @@ -272,7 +272,7 @@ int WINAPI MulDiv( int nNumber, int nNumerator, int nDenominator ) } #endif /* __MINGW32CE__ */ -#if defined( __POCC__ ) || ( defined( _MSC_VER ) && ( _MSC_VER <= 1310 ) ) +#if defined( __POCC__ ) || ( defined( _MSC_VER ) && ( _MSC_VER <= 1500 ) ) void abort( void ) { TerminateProcess( GetCurrentProcess(), 0 ); diff --git a/harbour/src/vm/fm.c b/harbour/src/vm/fm.c index 0e6bb294ef..492549fc7b 100644 --- a/harbour/src/vm/fm.c +++ b/harbour/src/vm/fm.c @@ -139,7 +139,7 @@ #if defined( HB_FM_DL_ALLOC ) # if !defined( HB_FM_DLMT_ALLOC ) && !defined( HB_FM_DLMT_ALLOC_OFF ) && \ defined( HB_MT_VM ) -# if !( defined( HB_OS_WIN_CE ) && ( defined( _MSC_VER ) && ( _MSC_VER <= 1310 ) ) ) +# if !( defined( HB_OS_WIN_CE ) && ( defined( _MSC_VER ) && ( _MSC_VER <= 1500 ) ) ) # define HB_FM_DLMT_ALLOC # endif # endif @@ -163,7 +163,7 @@ # pragma warn -ngu # pragma warn -prc # pragma warn -rch -# elif defined( HB_OS_WIN_CE ) && ( defined( __POCC__ ) || ( defined( _MSC_VER ) && ( _MSC_VER <= 1310 ) ) ) +# elif defined( HB_OS_WIN_CE ) && defined( __POCC__ ) # define ABORT TerminateProcess( GetCurrentProcess(), 0 ) # elif defined( __POCC__ ) && !defined( InterlockedCompareExchangePointer ) # define InterlockedCompareExchangePointer @@ -180,6 +180,9 @@ # if !defined( USE_DL_PREFIX ) && !defined( HB_FM_DLMT_ALLOC ) # define USE_DL_PREFIX # endif +# if defined( HB_OS_WIN_CE ) && ( _MSC_VER <= 1500 ) +# define ABORT TerminateProcess( GetCurrentProcess(), 0 ) +# endif # if defined( HB_OS_WIN_CE ) # define LACKS_FCNTL_H # endif diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg index 8490e4ce00..0808cad6ee 100644 --- a/harbour/utils/hbmk2/hbmk2.prg +++ b/harbour/utils/hbmk2/hbmk2.prg @@ -3254,7 +3254,9 @@ FUNCTION hbmk2( aArgs, /* @ */ lPause ) /* TODO */ ENDCASE AAdd( hbmk[ _HBMK_aOPTL ], "-subsystem:windowsce" ) + AAdd( hbmk[ _HBMK_aOPTD ], "-subsystem:windowsce" ) AAdd( hbmk[ _HBMK_aOPTL ], "-nodefaultlib:oldnames.lib" ) + AAdd( hbmk[ _HBMK_aOPTD ], "-nodefaultlib:oldnames.lib" ) AAdd( hbmk[ _HBMK_aOPTL ], "-nodefaultlib:kernel32.lib" ) IF nCCompVer >= 800 AAdd( hbmk[ _HBMK_aOPTL ], "-manifest:no" )