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

2010-10-03 17:45 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* utils/hbmk2/hbmk2.prg
    + Added MS-DOS compiler (djgpp) detection when used on *nix platform
      in cross-compile scenario.
      BTW I've also found that I had already implemented win and wce
      autodetection based on global.mk, so it' supposed to work. Please
      test it.

  * config/global.mk
    - Deleted a variable not used anymore.
This commit is contained in:
Viktor Szakats
2010-10-03 15:46:50 +00:00
parent 50512a96f4
commit f4aa2359de
3 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
harbour/ChangeLog
View File

@@ -16,6 +16,17 @@
The license applies to all entries newer than 2009-04-28.
*/
2010-10-03 17:45 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* utils/hbmk2/hbmk2.prg
+ Added MS-DOS compiler (djgpp) detection when used on *nix platform
in cross-compile scenario.
BTW I've also found that I had already implemented win and wce
autodetection based on global.mk, so it' supposed to work. Please
test it.
* config/global.mk
- Deleted a variable not used anymore.
2010-10-03 11:16 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* contrib/gtwvg/wvgwing.c
! Fixed after prev.

9
harbour/config/global.mk
View File

@@ -631,9 +631,6 @@ ifeq ($(HB_COMPILER),)
HB_COMP_PATH := $(dir $(HB_CCPATH))
HB_COMPILER := mingw
HB_PLATFORM := win
ifeq ($(HB_HBPREFIX),)
export HB_HBPREFIX := win-
endif
export HB_BUILD_EXTDEF := no
ifneq ($(HB_BUILD_PARTS),all)
HB_BUILD_PARTS := lib
@@ -696,9 +693,6 @@ ifeq ($(HB_COMPILER),)
ifneq ($(HB_CCPATH)$(HB_CCPREFIX),)
HB_COMP_PATH := $(dir $(HB_CCPATH))
HB_PLATFORM := wce
ifeq ($(HB_HBPREFIX),)
export HB_HBPREFIX := wce-
endif
export HB_BUILD_EXTDEF := no
ifneq ($(HB_BUILD_PARTS),all)
HB_BUILD_PARTS := lib
@@ -738,9 +732,6 @@ ifeq ($(HB_COMPILER),)
ifneq ($(HB_CCPATH)$(HB_CCPREFIX),)
HB_COMP_PATH := $(dir $(HB_CCPATH))
HB_PLATFORM := dos
ifeq ($(HB_HBPREFIX),)
export HB_HBPREFIX := dos-
endif
export HB_BUILD_EXTDEF := no
ifneq ($(HB_BUILD_PARTS),all)
HB_BUILD_PARTS := lib

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

@@ -1513,8 +1513,7 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel )
IF Empty( hbmk[ _HBMK_cCCPATH ] ) .AND. ;
Empty( hbmk[ _HBMK_cCCPREFIX ] ) .AND. ;
Empty( hbmk[ _HBMK_cCCPOSTFIX ] ) .AND. ;
!( hbmk[ _HBMK_cPLAT ] == "dos" )
Empty( hbmk[ _HBMK_cCCPOSTFIX ] )
DO CASE
CASE hbmk[ _HBMK_cPLAT ] == "win"
@@ -1530,6 +1529,9 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel )
AAdd( aCOMPDET_EMBED, { {| cPrefix, tmp1 | iif( hb_FileExists( tmp1 + hb_ps() + cPrefix + "gcc" + hbmk[ _HBMK_cCCEXT ] ), tmp1, NIL ) }, "wce", "mingwarm", "arm-mingw32ce-" , "/opt/mingw32ce/bin" , NIL } )
AAdd( aCOMPDET_EMBED, { {| cPrefix, tmp1 | iif( hb_FileExists( tmp1 + hb_ps() + cPrefix + "gcc" + hbmk[ _HBMK_cCCEXT ] ), tmp1, NIL ) }, "wce", "mingwarm", "arm-wince-mingw32ce-", "/opt/mingw32ce/bin" , NIL } )
AAdd( aCOMPDET_EMBED, { {| cPrefix, tmp1 | iif( hb_FileExists( tmp1 + hb_ps() + cPrefix + "gcc" + hbmk[ _HBMK_cCCEXT ] ), tmp1, NIL ) }, "wce", "mingw" , "i386-mingw32ce-" , "/opt/x86mingw32ce/bin", NIL } )
CASE hbmk[ _HBMK_cPLAT ] == "dos"
AAdd( aCOMPDET_EMBED, { {| cPrefix, tmp1 | iif( hb_FileExists( tmp1 + hb_ps() + cPrefix + "gcc" + hbmk[ _HBMK_cCCEXT ] ), tmp1, NIL ) }, "dos", "djgpp" , "i586-pc-msdosdjgpp-" , NIL , NIL } )
AAdd( aCOMPDET_EMBED, { {| cPrefix, tmp1 | iif( hb_FileExists( tmp1 + hb_ps() + cPrefix + "gcc" + hbmk[ _HBMK_cCCEXT ] ), tmp1, NIL ) }, "dos", "djgpp" , "i586-pc-msdosdjgpp-" , "/usr/local" , NIL } )
ENDCASE
ENDIF