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

2010-01-19 10:24 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* src/vm/maindllp.c
  * utils/hbmk2/hbmk2.prg
  * config/global.mk
    + Added more (untested) support for WinCE x86 targets.
This commit is contained in:
Viktor Szakats
2010-01-19 09:35:50 +00:00
parent 3c898d9d79
commit 547e66cecb
4 changed files with 25 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
harbour/ChangeLog
View File

@@ -17,6 +17,12 @@
past entries belonging to author(s): Viktor Szakats.
*/
2010-01-19 10:24 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* src/vm/maindllp.c
* utils/hbmk2/hbmk2.prg
* config/global.mk
+ Added more (untested) support for WinCE x86 targets.
2010-01-19 10:20 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
* harbour/contrib/hbwin/win_prn1.c
! fixed missing dmFields assignment - please test if this fix does
@@ -59,7 +65,7 @@
Presently the behavior is as such:
Horizontal Split - Top row is columns are splitted
Vertical Split - More row is added at the bottom.
Delete Splitted Window - Focus is always shifted to
Delete Splitted Window - Focus is always shifted to
main edit window. i.e., parent of all.
Please comment.

2
harbour/config/global.mk
View File

@@ -1361,6 +1361,8 @@ ifeq ($(HB_INIT_DONE),)
DYNNAME_POST := $(DYNNAME_POST)-wce
ifeq ($(HB_CPU),arm)
DYNNAME_POST := $(DYNNAME_POST)-arm
else ifeq ($(HB_CPU),x86)
DYNNAME_POST := $(DYNNAME_POST)-x86
else ifeq ($(HB_CPU),mips)
DYNNAME_POST := $(DYNNAME_POST)-mips
else ifeq ($(HB_CPU),sh)

3
harbour/src/vm/maindllp.c
View File

@@ -79,6 +79,9 @@
#elif defined( HB_OS_WIN_CE ) && defined( HB_CPU_SH )
#define HB_DLL_NAME2 HB_DLL_PREF HB_DLL_VER TEXT( "-wce-sh" ) HB_DLL_EXT
#define HB_DLL_NAMEMT2 HB_DLL_PREF_MT HB_DLL_VER TEXT( "-wce-sh" ) HB_DLL_EXT
#elif defined( HB_OS_WIN_CE ) && defined( HB_CPU_X86 )
#define HB_DLL_NAME2 HB_DLL_PREF HB_DLL_VER TEXT( "-wce-x86" ) HB_DLL_EXT
#define HB_DLL_NAMEMT2 HB_DLL_PREF_MT HB_DLL_VER TEXT( "-wce-x86" ) HB_DLL_EXT
#elif defined( HB_OS_WIN_CE )
#define HB_DLL_NAME2 HB_DLL_PREF HB_DLL_VER TEXT( "-wce" ) HB_DLL_EXT
#define HB_DLL_NAMEMT2 HB_DLL_PREF_MT HB_DLL_VER TEXT( "-wce" ) HB_DLL_EXT

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

@@ -2458,6 +2458,7 @@ FUNCTION hbmk( aArgs, /* @ */ lPause )
CASE ( hbmk[ _HBMK_cPLAT ] == "win" .AND. hbmk[ _HBMK_cCOMP ] == "gcc" ) .OR. ;
( hbmk[ _HBMK_cPLAT ] == "win" .AND. hbmk[ _HBMK_cCOMP ] == "mingw" ) .OR. ;
( hbmk[ _HBMK_cPLAT ] == "win" .AND. hbmk[ _HBMK_cCOMP ] == "mingw64" ) .OR. ;
( hbmk[ _HBMK_cPLAT ] == "wce" .AND. hbmk[ _HBMK_cCOMP ] == "mingw" ) .OR. ;
( hbmk[ _HBMK_cPLAT ] == "wce" .AND. hbmk[ _HBMK_cCOMP ] == "mingwarm" ) .OR. ;
( hbmk[ _HBMK_cPLAT ] == "win" .AND. hbmk[ _HBMK_cCOMP ] == "cygwin" )
@@ -2556,6 +2557,10 @@ FUNCTION hbmk( aArgs, /* @ */ lPause )
AAdd( hbmk[ _HBMK_aOPTC ], "-DUNICODE" )
l_aLIBSHARED := { iif( hbmk[ _HBMK_lMT ], "harbourmt" + cDL_Version_Alter + "-wce-arm",;
"harbour" + cDL_Version_Alter + "-wce-arm" ) }
CASE hbmk[ _HBMK_cCOMP ] == "mingw" .AND. hbmk[ _HBMK_cPLAT ] = "wce"
AAdd( hbmk[ _HBMK_aOPTC ], "-DUNICODE" )
l_aLIBSHARED := { iif( hbmk[ _HBMK_lMT ], "harbourmt" + cDL_Version_Alter + "-wce-x86",;
"harbour" + cDL_Version_Alter + "-wce-x86" ) }
OTHERWISE
l_aLIBSHARED := { iif( hbmk[ _HBMK_lMT ], "harbourmt" + cDL_Version_Alter,;
"harbour" + cDL_Version_Alter ) }
@@ -3109,6 +3114,8 @@ FUNCTION hbmk( aArgs, /* @ */ lPause )
DO CASE
CASE hbmk[ _HBMK_cCOMP ] == "msvcarm"
AAdd( hbmk[ _HBMK_aOPTC ], "-DARM -D_ARM_ -DARMV4 -D_M_ARM -D_ARMV4I_ -Darmv4i -D__arm__" )
CASE hbmk[ _HBMK_cCOMP ] == "msvc"
/* TODO */
ENDCASE
AAdd( hbmk[ _HBMK_aOPTL ], "-subsystem:windowsce" )
AAdd( hbmk[ _HBMK_aOPTL ], "-nodefaultlib:oldnames.lib" )
@@ -3132,6 +3139,12 @@ FUNCTION hbmk( aArgs, /* @ */ lPause )
ENDIF
l_aLIBSYS := ArrayAJoin( { l_aLIBSYS, l_aLIBSYSCORE, l_aLIBSYSMISC } )
DO CASE
CASE hbmk[ _HBMK_cCOMP ] == "msvc" .AND. hbmk[ _HBMK_cPLAT ] = "wce"
l_aLIBSHARED := { iif( hbmk[ _HBMK_lMT ], "harbourmt" + cDL_Version_Alter + "-wce-x86" + cLibExt,;
"harbour" + cDL_Version_Alter + "-wce-x86" + cLibExt ) }
CASE hbmk[ _HBMK_cCOMP ] == "msvcarm"
l_aLIBSHARED := { iif( hbmk[ _HBMK_lMT ], "harbourmt" + cDL_Version_Alter + "-wce-arm" + cLibExt,;
"harbour" + cDL_Version_Alter + "-wce-arm" + cLibExt ) }
CASE hbmk[ _HBMK_cCOMP ] $ "msvc|icc"
l_aLIBSHARED := { iif( hbmk[ _HBMK_lMT ], "harbourmt" + cDL_Version_Alter + cLibExt,;
"harbour" + cDL_Version_Alter + cLibExt ) }
@@ -3141,9 +3154,6 @@ FUNCTION hbmk( aArgs, /* @ */ lPause )
CASE hbmk[ _HBMK_cCOMP ] $ "msvcia64|iccia64"
l_aLIBSHARED := { iif( hbmk[ _HBMK_lMT ], "harbourmt" + cDL_Version_Alter + "-ia64" + cLibExt,;
"harbour" + cDL_Version_Alter + "-ia64" + cLibExt ) }
CASE hbmk[ _HBMK_cCOMP ] == "msvcarm"
l_aLIBSHARED := { iif( hbmk[ _HBMK_lMT ], "harbourmt" + cDL_Version_Alter + "-wce-arm" + cLibExt,;
"harbour" + cDL_Version_Alter + "-wce-arm" + cLibExt ) }
ENDCASE
l_aLIBSHAREDPOST := { "hbmainstd", "hbmainwin" }