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

2008-10-16 13:21 UTC+0200 Viktor Szakats (harbour.01 syenar hu)

Browse Source 
* make_b32.mak
  * make_vc.mak
  * make_gcc.mak
    + Readded -b when HB_BUILD_STATIC=yes.
      Now it should work.

  * make_b32.mak
  * make_vc.mak
  * make_gcc.mak
  * contrib/mtpl_b32.mak
  * contrib/mtpl_gcc.mak
  * contrib/mtpl_vc.mak
    % Deleted -l- switch when HB_BUILD_STATIC=yes.
      Line numbers are automatically enabled when 
      -b switch is used.

  * source/debug/debugger.prg
    * Renamed getdbginput() -> __dbgInput()

  ; NOTE to TOFIX: Do we need "Mono display" these days? :)
This commit is contained in:
Viktor Szakats
2008-10-16 11:22:07 +00:00
parent 7c8bc37bdd
commit 296b308154
8 changed files with 32 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
harbour/ChangeLog
View File

@@ -8,6 +8,28 @@
2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
*/
2008-10-16 13:21 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
* make_b32.mak
* make_vc.mak
* make_gcc.mak
+ Readded -b when HB_BUILD_STATIC=yes.
Now it should work.
* make_b32.mak
* make_vc.mak
* make_gcc.mak
* contrib/mtpl_b32.mak
* contrib/mtpl_gcc.mak
* contrib/mtpl_vc.mak
% Deleted -l- switch when HB_BUILD_STATIC=yes.
Line numbers are automatically enabled when
-b switch is used.
* source/debug/debugger.prg
* Renamed getdbginput() -> __dbgInput()
; NOTE to TOFIX: Do we need "Mono display" these days? :)
2008-10-16 13:08 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
* harbour/source/debug/debugger.prg
+ added __dbgAChoice() - simple AChoice() replacement which uses

2
harbour/contrib/mtpl_b32.mak
View File

@@ -122,7 +122,7 @@ CFLAGS = -I$(INCLUDE_DIR) $(C_USR) $(CFLAGS)
CLIBFLAGS = -c -q -d -Q -w -w-sig- $(CFLAGS) $(CLIBFLAGS)
HARBOURFLAGS = -i$(INCLUDE_DIR) -n -q0 -w3 -es2 -km -l $(PRG_USR) $(HARBOURFLAGS)
!if "$(HB_BUILD_DEBUG)" == "yes"
HARBOURFLAGS = $(HARBOURFLAGS) -b -l-
HARBOURFLAGS = $(HARBOURFLAGS) -b
!endif
LDFLAGS = $(LDFLAGS) $(L_USR)

2
harbour/contrib/mtpl_gcc.mak
View File

@@ -122,7 +122,7 @@ CFLAGS := -W -Wall -I$(INCLUDE_DIR) $(C_USR) $(CFLAGS)
CLIBFLAGS := -c $(CFLAGS) $(CLIBFLAGS)
HARBOURFLAGS := -i$(INCLUDE_DIR) -n -q0 -w3 -es2 -km -l $(PRG_USR) $(HARBOURFLAGS)
ifeq ($(HB_BUILD_DEBUG),yes)
HARBOURFLAGS := $(HARBOURFLAGS) -b -l-
HARBOURFLAGS := $(HARBOURFLAGS) -b
endif
LDFLAGS := $(LDFLAGS)

2
harbour/contrib/mtpl_vc.mak
View File

@@ -129,7 +129,7 @@ CFLAGS = -Zi $(CFLAGS)
CLIBFLAGS = -c $(CFLAGS) $(CLIBFLAGS)
HARBOURFLAGS = -i$(INCLUDE_DIR) -n -q0 -w3 -es2 -km -l $(PRG_USR) $(HARBOURFLAGS)
!if "$(HB_BUILD_DEBUG)" == "yes"
HARBOURFLAGS = $(HARBOURFLAGS) -b -l-
HARBOURFLAGS = $(HARBOURFLAGS) -b
!endif
LDFLAGS = $(LDFLAGS) $(L_USR)

2
harbour/make_b32.mak
View File

@@ -112,7 +112,7 @@ CEXEFLAGSDLL = $(HB_BCCDLL_DYNRT) $(CLIBFLAGS)
# Harbour Compiler Flags
HBFLAGSCMN = -i$(INCLUDE_DIR) -q0 -w3 -es2 -km -l $(PRG_USR)
!if "$(HB_BUILD_DEBUG)" == "yes"
HBFLAGSCMN = $(HBFLAGSCMN) -l-
HBFLAGSCMN = $(HBFLAGSCMN) -b
!endif
HARBOURFLAGS = -n $(HBFLAGSCMN)
HARBOURFLAGSDLL= -n1 $(HBFLAGSCMN)

2
harbour/make_gcc.mak
View File

@@ -178,7 +178,7 @@ endif
HBFLAGSCMN := -i$(INCLUDE_DIR) -q0 -w3 -es2 -km -l $(PRG_USR)
ifeq ($(HB_BUILD_DEBUG),yes)
HBFLAGSCMN := $(HBFLAGSCMN) -l-
HBFLAGSCMN := $(HBFLAGSCMN) -b
endif
HARBOURFLAGS := -n $(HBFLAGSCMN)
HARBOURFLAGSDLL:= -n1 $(HBFLAGSCMN)

2
harbour/make_vc.mak
View File

@@ -165,7 +165,7 @@ CEXEFLAGSDLL = -MT$(DBGMARKER) $(CLIBFLAGS)
# Harbour Compiler Flags
HBFLAGSCMN = -i$(INCLUDE_DIR) -q0 -w3 -es2 -km -l $(PRG_USR)
!if "$(HB_BUILD_DEBUG)" == "yes"
HBFLAGSCMN = $(HBFLAGSCMN) -l-
HBFLAGSCMN = $(HBFLAGSCMN) -b
!endif
!if "$(HB_BUILD_WINCE)" == "yes"
HBFLAGSCMN = $(HBFLAGSCMN) -D__PLATFORM__WINCE

12
harbour/source/debug/debugger.prg
View File

@@ -1133,7 +1133,7 @@ METHOD EditColor( nColor, oBrwColors ) CLASS HBDebugger
READ
SetCursor( SC_NONE )
#else
cColor := getdbginput( Row(), Col() + 15, cColor, ;
cColor := __dbgInput( Row(), Col() + 15, cColor, ;
{ | cColor | iif( Type( cColor ) != "C", ;
( __dbgAlert( "Must be string" ), .F. ), .T. ) }, ;
SubStr( ::ClrModal(), 5 ) )
@@ -1170,7 +1170,7 @@ METHOD EditSet( nSet, oBrwSets ) CLASS HBDebugger
READ
SetCursor( SC_NONE )
#else
cSet := getdbginput( Row(), Col() + 13, cSet, ;
cSet := __dbgInput( Row(), Col() + 13, cSet, ;
{ | cSet | iif( Type( cSet ) != cType, ;
( __dbgAlert( "Must be of type '" + cType + "'" ), .F. ), .T. ) }, ;
SubStr( ::ClrModal(), 5 ) )
@@ -1597,7 +1597,7 @@ METHOD InputBox( cMsg, uValue, bValid, lEditable ) CLASS HBDebugger
SetKey( K_LBUTTONDOWN, bMouseSave)
SetCursor( nOldCursor )
#else
uTemp := getdbginput( nTop + 1, nLeft + 1, uTemp, bValid, __DbgColors()[ 5 ] )
uTemp := __dbgInput( nTop + 1, nLeft + 1, uTemp, bValid, __DbgColors()[ 5 ] )
#endif
ELSE
hb_dispOutAt( nTop + 1, nLeft + 1, __dbgValToStr( uValue ), "," + __DbgColors()[ 5 ] )
@@ -3393,9 +3393,7 @@ STATIC FUNCTION strip_path( cFileName )
RETURN cName + cExt
#ifdef HB_NO_READDBG
STATIC FUNCTION getdbginput( nTop, nLeft, uValue, bValid, cColor )
STATIC FUNCTION __dbgInput( nTop, nLeft, uValue, bValid, cColor )
LOCAL nOldCursor := SetCursor( SC_NORMAL )
LOCAL uTemp := uValue
@@ -3421,8 +3419,6 @@ STATIC FUNCTION getdbginput( nTop, nLeft, uValue, bValid, cColor )
RETURN uTemp
#endif
FUNCTION __dbgAchoice( nTop, nLeft, nBottom, nRight, aItems, cColors )
LOCAL oBrw