fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2010-03-14 21:29 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* 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.
This commit is contained in:
Viktor Szakats
2010-03-14 20:32:31 +00:00
parent 16eeac6fba
commit e97a7501d0
16 changed files with 52 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
harbour/ChangeLog
View File

@@ -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

2
harbour/config/wce/msvcarm.mk
View File

@@ -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))

16
harbour/contrib/hbct/ctnet.c
View File

@@ -94,7 +94,7 @@
#include <winnetwk.h>
#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 );

2
harbour/contrib/hbnf/getenvrn.c
View File

@@ -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();

4
harbour/contrib/hbodbc/Makefile
View File

@@ -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

2
harbour/contrib/hbtpathy/tpwin.c
View File

@@ -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;

4
harbour/contrib/hbwin/olecore.c
View File

@@ -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

2
harbour/contrib/hbwin/win_dlg.c
View File

@@ -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 )
{

6
harbour/contrib/hbwin/win_prn1.c
View File

@@ -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

4
harbour/contrib/rddsql/sddodbc/Makefile
View File

@@ -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

2
harbour/contrib/xhb/hbserv.c
View File

@@ -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__ )

4
harbour/include/hbthread.h
View File

@@ -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__ ) && \

2
harbour/include/hbwince.h
View File

@@ -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

2
harbour/src/common/hbwince.c
View File

@@ -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 );

7
harbour/src/vm/fm.c
View File

@@ -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

2
harbour/utils/hbmk2/hbmk2.prg
View File

@@ -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" )