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

2012-09-11 21:22 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)

Browse Source 
* harbour/utils/hbmk2/hbmk2.prg
  * harbour/config/win/bcc.mk
    + added support for BCC6.5 - please verify me.
    ; unicows library does not support BCC 6.5. BCC users who want
      to compile Harbour should delete harbour/lib/3rd/win/bcc directory.
      TODO: add build time option to disable unicows in windows harbour
            builds
This commit is contained in:
Przemyslaw Czerpak
2012-09-11 19:22:15 +00:00
parent 5fb118b26c
commit 2ae8ffd909
3 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
harbour/ChangeLog
View File

@@ -16,6 +16,15 @@
The license applies to all entries newer than 2009-04-28.
*/
2012-09-11 21:22 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
* harbour/utils/hbmk2/hbmk2.prg
* harbour/config/win/bcc.mk
+ added support for BCC6.5 - please verify me.
; unicows library does not support BCC 6.5. BCC users who want
to compile Harbour should delete harbour/lib/3rd/win/bcc directory.
TODO: add build time option to disable unicows in windows harbour
builds
2012-09-10 09:34 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
* contrib/hbide/main.prg
! Fixed: crash when IdeDBU or PRG mode was invoked.

8
harbour/config/win/bcc.mk
View File

@@ -55,6 +55,14 @@ endif
ifneq ($(HB_COMP_PATH_PUB),)
HB_CFLAGS += $(subst /,$(BACKSLASH),-I"$(HB_COMP_PATH_PUB)../Include")
RCFLAGS += $(subst /,$(BACKSLASH),-I"$(HB_COMP_PATH_PUB)../Include")
ifneq ($(wildcard $(HB_COMP_PATH_PUB)../Include/windows/crtl),)
HB_CFLAGS += $(subst /,$(BACKSLASH),-I"$(HB_COMP_PATH_PUB)../Include/windows/crtl")
RCFLAGS += $(subst /,$(BACKSLASH),-I"$(HB_COMP_PATH_PUB)../Include/windows/crtl")
endif
ifneq ($(wildcard $(HB_COMP_PATH_PUB)../Include/windows/sdk),)
HB_CFLAGS += $(subst /,$(BACKSLASH),-I"$(HB_COMP_PATH_PUB)../Include/windows/sdk")
RCFLAGS += $(subst /,$(BACKSLASH),-I"$(HB_COMP_PATH_PUB)../Include/windows/sdk")
endif
LDFLAGS += $(subst /,$(BACKSLASH),-L"$(HB_COMP_PATH_PUB)../Lib" -L"$(HB_COMP_PATH_PUB)../Lib/PSDK")
DFLAGS += $(subst /,$(BACKSLASH),-L"$(HB_COMP_PATH_PUB)../Lib" -L"$(HB_COMP_PATH_PUB)../Lib/PSDK")
endif

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

@@ -2008,6 +2008,13 @@ FUNCTION hbmk( aArgs, nArgTarget, /* @ */ lPause, nLevel )
IF hb_DirExists( tmp )
AAdd( hbmk[ _HBMK_aINCPATH ], tmp )
ENDIF
/* NOTE: BCC 6.5 (and upper ?) thing */
FOR EACH tmp IN { "crtl", "rtl", "sdk" }
tmp := hb_PathNormalize( hb_FNameDir( cPath_CompC ) + ".." + hb_ps() + "Include" + hb_ps() + "windows" + hb_ps() + tmp )
IF hb_DirExists( tmp )
AAdd( hbmk[ _HBMK_aINCPATH ], tmp )
ENDIF
NEXT
ENDIF
AAdd( hbmk[ _HBMK_aLIBPATH ], hb_PathNormalize( hb_FNameDir( cPath_CompC ) + ".." + hb_ps() + "Lib" + hb_ps() + "PSDK" ) )
ENDIF