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

2009-08-20 11:09 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* utils/hbmk2/hbmk2.prg
  * config/wce/msvcarm.mk
    ! Fixes to cmdline macros, now many warnings are gone.

  * utils/hbmk2/hbmk2.prg
    + Added ceshell, oleaut32 syslibs to default wce liblist.
      (to be more in sync with win)

  * contrib/hbwin/hbwin.hbc
    ! Added sms syslib for wce.
This commit is contained in:
Viktor Szakats
2009-08-20 09:09:57 +00:00
parent 31e4251528
commit a1a747b798
4 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
harbour/ChangeLog
View File

@@ -17,6 +17,18 @@
past entries belonging to author(s): Viktor Szakats.
*/
2009-08-20 11:09 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* utils/hbmk2/hbmk2.prg
* config/wce/msvcarm.mk
! Fixes to cmdline macros, now many warnings are gone.
* utils/hbmk2/hbmk2.prg
+ Added ceshell, oleaut32 syslibs to default wce liblist.
(to be more in sync with win)
* contrib/hbwin/hbwin.hbc
! Added sms syslib for wce.
2009-08-20 10:44 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* config/global.mk
+ Don't attempt to install includes and docs if HB_INSTALL_PREFIX

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

@@ -19,7 +19,8 @@ CC_IN := -c
CC_OUT := -Fo
CPPFLAGS := -I. -I$(HB_INC_COMPILE)
CFLAGS := -nologo -DWINCE -D_WINCE -D_WINDOWS -DARM -D_ARM_ -DARMV4 -D_M_ARM -D_UNICODE -D_UWIN -DUNDER_CE
CFLAGS := -nologo -D_WIN32_WCE=0x501 -DCE_ARCH -DWINCE -D_WINCE -D_WINDOWS -DARM -D_ARM_ -DARMV4 -D_M_ARM -D_ARMV4I_ -Darmv4i -D__arm__ -D_UNICODE -D_UWIN -DUNDER_CE
LDFLAGS :=
ifeq ($(HB_BUILD_MODE),c)

1
harbour/contrib/hbwin/hbwin.hbc
View File

@@ -7,3 +7,4 @@
incpaths=.
libs=hbwin
{wce}libs=sms

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

@@ -938,7 +938,8 @@ FUNCTION hbmk( aArgs, /* @ */ lPause, /* @ */ lUTF8 )
cBinExt := ".exe"
cOptPrefix := "-/"
l_aLIBSYSCORE := { "coredll", "ws2" }
l_aLIBSYSMISC := { "uuid", "ole32", "wininet", "commdlg", "commctrl" }
l_aLIBSYSMISC := { "ceshell", "uuid", "ole32", "oleaut32", "wininet", "commdlg", "commctrl" }
OTHERWISE
hbmk_OutErr( hbmk, hb_StrFormat( I_( "Error: Architecture value unknown: %1$s" ), hbmk[ _HBMK_cARCH ] ) )
RETURN 1
@@ -2633,18 +2634,7 @@ FUNCTION hbmk( aArgs, /* @ */ lPause, /* @ */ lUTF8 )
AAdd( hbmk[ _HBMK_aOPTD ], "/map" )
ENDIF
IF hbmk[ _HBMK_cCOMP ] == "msvcarm"
/* NOTE: Copied from .mk. Probably needs cleaning. */
AAdd( hbmk[ _HBMK_aOPTC ], "-DWINCE" )
AAdd( hbmk[ _HBMK_aOPTC ], "-D_WINCE" )
AAdd( hbmk[ _HBMK_aOPTC ], "-D_WINDOWS" )
AAdd( hbmk[ _HBMK_aOPTC ], "-DARM" )
AAdd( hbmk[ _HBMK_aOPTC ], "-D_ARM_" )
AAdd( hbmk[ _HBMK_aOPTC ], "-DARMV4" )
AAdd( hbmk[ _HBMK_aOPTC ], "-D_M_ARM" )
AAdd( hbmk[ _HBMK_aOPTC ], "-DUNICODE" )
AAdd( hbmk[ _HBMK_aOPTC ], "-D_UNICODE" )
AAdd( hbmk[ _HBMK_aOPTC ], "-D_UWIN" )
AAdd( hbmk[ _HBMK_aOPTC ], "-DUNDER_CE" )
AAdd( hbmk[ _HBMK_aOPTC ], "-D_WIN32_WCE=0x501 -DCE_ARCH -DWINCE -D_WINCE -D_WINDOWS -DARM -D_ARM_ -DARMV4 -D_M_ARM -D_ARMV4I_ -Darmv4i -D__arm__ -D_UNICODE -D_UWIN -DUNDER_CE" )
AAdd( hbmk[ _HBMK_aOPTL ], "/subsystem:windowsce" )
AAdd( hbmk[ _HBMK_aOPTL ], "/nodefaultlib:oldnames.lib" )
AAdd( hbmk[ _HBMK_aOPTL ], "/nodefaultlib:kernel32.lib" )