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

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

Browse Source 
* config/global.mk
    ! Fixed to handle spaces in PATH elements.
      Now '#' is used as intermediate char. Please change it to something
      else if you feel this might clash with some real-world scenarios.

  * utils/hbmk2/hbmk2.prg
  * config/wce/msvcarm.mk
    ! Readded -DUNDER_CE.
      Does anyone know of any documentation about required macros
      for WinCE compilation?
This commit is contained in:
Viktor Szakats
2009-08-20 06:13:12 +00:00
parent bea2aecb93
commit 8da389c5b0
4 changed files with 19 additions and 4 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 08:10 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* config/global.mk
! Fixed to handle spaces in PATH elements.
Now '#' is used as intermediate char. Please change it to something
else if you feel this might clash with some real-world scenarios.
* utils/hbmk2/hbmk2.prg
* config/wce/msvcarm.mk
! Readded -DUNDER_CE.
Does anyone know of any documentation about required macros
for WinCE compilation?
2009-08-19 17:02 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
* contrib/hbxbp/xbpbrowse.prg
! Horizontal scrolling made more perfect and Clipper like.

8
harbour/config/global.mk
View File

@@ -49,15 +49,17 @@ MAKE_381 := $(filter $(need),$(firstword $(sort $(MAKE_VERSION) $(need))))
# Don't indent this subroutine
define find_in_path
$(strip $(foreach dir,$(subst $(PTHSEP), ,$(PATH)),$(wildcard $(dir)/$(1)$(HB_HOST_BIN_EXT))))
$(strip $(foreach dir, $(subst $(PTHSEP), ,$(subst $(subst x, ,x),#,$(PATH))), $(wildcard $(subst #,\ ,$(subst \,/,$(dir)))/$(1)$(HB_HOST_BIN_EXT))))
endef
# Don't indent this subroutine
define find_in_path_par
$(strip $(foreach dir,$(subst $(PTHSEP), ,$(2)),$(wildcard $(dir)/$(1)$(HB_HOST_BIN_EXT))))
$(strip $(foreach dir, $(subst $(PTHSEP), ,$(subst $(subst x, ,x),#,$(2))), $(wildcard $(subst #,\ ,$(subst \,/,$(dir)))/$(1)$(HB_HOST_BIN_EXT))))
endef
# Don't indent this subroutine
define find_in_path_raw
$(strip $(foreach dir,$(subst $(PTHSEP), ,$(2)),$(wildcard $(dir)/$(1))))
$(strip $(foreach dir, $(subst $(PTHSEP), ,$(subst $(subst x, ,x),#,$(2))), $(wildcard $(subst #,\ ,$(subst \,/,$(dir)))/$(1))))
endef
define check_host

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

@@ -19,7 +19,7 @@ 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
CFLAGS := -nologo -DWINCE -D_WINCE -D_WINDOWS -DARM -D_ARM_ -DARMV4 -D_M_ARM -D_UNICODE -D_UWIN -DUNDER_CE
LDFLAGS :=
ifeq ($(HB_BUILD_MODE),c)

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

@@ -2642,6 +2642,7 @@ FUNCTION hbmk( aArgs, /* @ */ lPause, /* @ */ lUTF8 )
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_aOPTL ], "/subsystem:windowsce" )
AAdd( hbmk[ _HBMK_aOPTL ], "/nodefaultlib:oldnames.lib" )
AAdd( hbmk[ _HBMK_aOPTL ], "/nodefaultlib:kernel32.lib" )