diff --git a/harbour/ChangeLog b/harbour/ChangeLog index bd696b6171..9801f7386d 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,3 +1,26 @@ +20000214-03:21 GMT+1 Victor Szakats + * *.bat + + Added CLEAN command to batch files. + Use: MAKE_VC.BAT CLEAN to cleanup all the generated files + (EXE,LIB,OBJ,...) + + Added optional parameter forwarding to the make process. + * source/rtl/mainwin.c + source/rtl/maindll.c + ! Fixed to compile only for 32bit Windows platform. + * makefile.bc + % INCLUDE_DIR simplified. + % Merge duplicate strings option added as a default. + ! main -> mainstd + + dbgmenu.prg added. + + source/debug/dbgmenu.prg (added) + source/debug/debugger.prg + source/debug/Makefile + makefile.vc + * BuildMenu() function moved to a separate source file, so that it + now compiles fine with Harbour Borland 16bit. + * source/vm/cmdarg.c + ! Too small buffer fixed. (GPF-ed with B16) + 20000213-23:59 GMT+1 Victor Szakats ! makefile.bc ! Fixed again. diff --git a/harbour/make_b16.bat b/harbour/make_b16.bat index 9d5e38614a..22271d662a 100644 --- a/harbour/make_b16.bat +++ b/harbour/make_b16.bat @@ -3,5 +3,21 @@ rem rem $Id$ rem -make -DB16 -fmakefile.bc > make_b16.log -edit make_b16.log +if "%1" == "clean" goto CLEAN +if "%1" == "CLEAN" goto CLEAN + +:BUILD + + make -fmakefile.bc -DB16 %1 %2 %3 > make_b16.log + edit make_b16.log + goto EXIT + +:CLEAN + + echo Y | del bin\*.exe > NUL + echo Y | del obj\b16\*.* > NUL + echo Y | del lib\b16\*.* > NUL + goto EXIT + +:EXIT + diff --git a/harbour/make_b32.bat b/harbour/make_b32.bat index ebe396a3c7..7991e0e576 100644 --- a/harbour/make_b32.bat +++ b/harbour/make_b32.bat @@ -3,5 +3,21 @@ rem rem $Id$ rem -make -fmakefile.bc > make_b32.log -notepad make_b32.log +if "%1" == "clean" goto CLEAN +if "%1" == "CLEAN" goto CLEAN + +:BUILD + + make -fmakefile.bc %1 %2 %3 > make_b32.log + notepad make_b32.log + goto EXIT + +:CLEAN + + echo Y | del bin\*.exe > NUL + echo Y | del bin\*.tds > NUL + echo Y | del obj\b32\*.* > NUL + echo Y | del lib\b32\*.* > NUL + goto EXIT + +:EXIT diff --git a/harbour/make_b40.bat b/harbour/make_b40.bat index f5d859142e..016f11fee8 100644 --- a/harbour/make_b40.bat +++ b/harbour/make_b40.bat @@ -3,5 +3,22 @@ rem rem $Id$ rem -make -DB40 -fmakefile.bc > make_b40.log -notepad make_b40.log +if "%1" == "clean" goto CLEAN +if "%1" == "CLEAN" goto CLEAN + +:BUILD + + make -fmakefile.bc -DB40 %1 %2 %3 > make_b40.log + notepad make_b40.log + goto EXIT + +:CLEAN + + echo Y | del bin\*.exe > NUL + echo Y | del bin\*.tds > NUL + echo Y | del obj\b32\*.* > NUL + echo Y | del lib\b32\*.* > NUL + goto EXIT + +:EXIT + diff --git a/harbour/make_vc.bat b/harbour/make_vc.bat index aff8381db5..a47886dfb5 100644 --- a/harbour/make_vc.bat +++ b/harbour/make_vc.bat @@ -3,5 +3,21 @@ rem rem $Id$ rem -nmake /f makefile.vc %1 > make_vc.log -notepad make_vc.log +if "%1" == "clean" goto CLEAN +if "%1" == "CLEAN" goto CLEAN + +:BUILD + + nmake /f makefile.vc %1 %2 %3 > make_vc.log + notepad make_vc.log + goto EXIT + +:CLEAN + + echo Y | del bin\*.exe > NUL + echo Y | del obj\vc\*.* > NUL + echo Y | del lib\vc\*.* > NUL + goto EXIT + +:EXIT + diff --git a/harbour/makefile.bc b/harbour/makefile.bc index 346906f7d8..c86ee31cfa 100644 --- a/harbour/makefile.bc +++ b/harbour/makefile.bc @@ -4,37 +4,37 @@ # makefile for Borland C/C++ compilers +# Merge duplicate strings +BCC_OPT = $(BCC_OPT) -d + +HARBOUR_OPT = $(HARBOUR_OPT) -q + !if $d(B16) # Borland C/C++ (DOS 16 bits) -# Don't indent these. -BCC_OPT = -mh -DHARBOUR_USE_DOS_GTAPI BCC_EXE = bcc +BCC_OPT = $(BCC_OPT) -DHARBOUR_USE_DOS_GTAPI -mh TASM_EXE = tasm OBJ_DIR = obj\b16 LIB_DIR = lib\b16 +BCC_OPT = $(BCC_OPT) -O2 !else # Borland C/C++ (Windows 32 bits) BCC_EXE = bcc32 +BCC_OPT = $(BCC_OPT) -DHARBOUR_USE_WIN_GTAPI TASM_EXE = tasm32 OBJ_DIR = obj\b32 LIB_DIR = lib\b32 -!if $d(B40) -# Borland C/C++ 4.x (Avoid optimizer bug) -BCC_OPT = -DHARBOUR_USE_WIN_GTAPI -!else -# Borland C/C++ 5.x -BCC_OPT = -O2 -DHARBOUR_USE_WIN_GTAPI +!if !$d(B40) +BCC_OPT = $(BCC_OPT) -O2 !endif !endif -HARBOUR_OPT = -q - -INCLUDE_DIR = include;source\compiler;source\vm +INCLUDE_DIR = include COMPILER_DIR = source\compiler COMMON_DIR = source\common PP_DIR = source\pp @@ -144,8 +144,8 @@ HARBOUR_LIB_OBJS = $(OBJ_DIR)\achoice.obj \ $(OBJ_DIR)\itemapi.obj \ $(OBJ_DIR)\langapi.obj \ $(OBJ_DIR)\len.obj \ - $(OBJ_DIR)\main.obj \ $(OBJ_DIR)\maindll.obj \ + $(OBJ_DIR)\mainstd.obj \ $(OBJ_DIR)\mainwin.obj \ $(OBJ_DIR)\math.obj \ $(OBJ_DIR)\memofile.obj \ @@ -253,7 +253,8 @@ RUNNER_LIB_OBJS = $(OBJ_DIR)\runlib.obj RUNNER_EXE = $(BIN_DIR)\hbrun.exe DEBUG_LIB = $(LIB_DIR)\debug.lib -DEBUG_LIB_OBJS = $(OBJ_DIR)\debugger.obj \ +DEBUG_LIB_OBJS = $(OBJ_DIR)\dbgmenu.obj \ + $(OBJ_DIR)\debugger.obj \ $(OBJ_DIR)\tbrwtext.obj REGRESS_EXE = $(BIN_DIR)\rt_main.exe @@ -656,11 +657,11 @@ $(OBJ_DIR)\len.obj : $(RTL_DIR)\len.c $(BCC_EXE) $(BCC_OPT) -c -I$(INCLUDE_DIR) -o$@ $** tlib $(HARBOUR_LIB) -+$@,, -$(OBJ_DIR)\main.obj : $(VM_DIR)\main.c +$(OBJ_DIR)\maindll.obj : $(VM_DIR)\maindll.c $(BCC_EXE) $(BCC_OPT) -c -I$(INCLUDE_DIR) -o$@ $** tlib $(HARBOUR_LIB) -+$@,, -$(OBJ_DIR)\maindll.obj : $(VM_DIR)\maindll.c +$(OBJ_DIR)\mainstd.obj : $(VM_DIR)\mainstd.c $(BCC_EXE) $(BCC_OPT) -c -I$(INCLUDE_DIR) -o$@ $** tlib $(HARBOUR_LIB) -+$@,, @@ -1268,6 +1269,13 @@ $(RUNNER_EXE) : $(RUNNER_DIR)\stdalone\external.prg \ # $(DEBUG_LIB) : $(DEBUG_LIB_OBJS) +$(OBJ_DIR)\dbgmenu.c : $(DEBUG_DIR)\dbgmenu.prg + $(HARBOUR_EXE) $** -i$(INCLUDE_DIR) -n $(HARBOUR_OPT) -o$@ + +$(OBJ_DIR)\dbgmenu.obj : $(OBJ_DIR)\dbgmenu.c + $(BCC_EXE) $(BCC_OPT) -c -I$(INCLUDE_DIR) -o$@ $** + tlib $(DEBUG_LIB) -+$@,, + $(OBJ_DIR)\debugger.c : $(DEBUG_DIR)\debugger.prg $(HARBOUR_EXE) $** -i$(INCLUDE_DIR) -n $(HARBOUR_OPT) -o$@ @@ -1438,3 +1446,4 @@ $(OBJ_DIR)\gentrf.c : $(HBDOC_DIR)\gentrf.prg $(OBJ_DIR)\gentrf.obj : $(OBJ_DIR)\gentrf.c $(BCC_EXE) $(BCC_OPT) -c -I$(INCLUDE_DIR) -o$@ $** + diff --git a/harbour/makefile.vc b/harbour/makefile.vc index 0f3eec42b0..1566ed1951 100644 --- a/harbour/makefile.vc +++ b/harbour/makefile.vc @@ -285,6 +285,7 @@ PP_LIB_OBJS = \ # DEBUG_LIB_OBJS = \ + $(OBJ_DIR)\dbgmenu.obj \ $(OBJ_DIR)\debugger.obj \ $(OBJ_DIR)\tbrwtext.obj @@ -892,6 +893,12 @@ $(OBJ_DIR)\xsavescr.obj : $(OBJ_DIR)\xsavescr.c # Debugger source dependencies below. Add as needed # +$(OBJ_DIR)\dbgmenu.c : $(DEBUG_DIR)\dbgmenu.prg + $(HARBOUR_EXE) $** $(HARBOURFLAGS) -o$@ + +$(OBJ_DIR)\dbgmenu.obj : $(OBJ_DIR)\dbgmenu.c + $(CC) $(CLIBFLAGS) -Fo$@ $** + $(OBJ_DIR)\debugger.c : $(DEBUG_DIR)\debugger.prg $(HARBOUR_EXE) $** $(HARBOURFLAGS) -o$@ diff --git a/harbour/source/debug/Makefile b/harbour/source/debug/Makefile index 9b7acfd90a..e2161fb3dd 100644 --- a/harbour/source/debug/Makefile +++ b/harbour/source/debug/Makefile @@ -5,6 +5,7 @@ ROOT = ../../ PRG_SOURCES=\ + dbgmenu.prg \ debugger.prg \ tbrwtext.prg diff --git a/harbour/source/debug/dbgmenu.prg b/harbour/source/debug/dbgmenu.prg new file mode 100644 index 0000000000..c3f60fd86c --- /dev/null +++ b/harbour/source/debug/dbgmenu.prg @@ -0,0 +1,150 @@ +/* + * $Id$ + */ + +/* + * Harbour Project source code: + * The Debugger Menu + * + * Copyright 1999 Antonio Linares + * www - http://www.harbour-project.org + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version, with one exception: + * + * The exception is that if you link the Harbour Runtime Library (HRL) + * and/or the Harbour Virtual Machine (HVM) with other files to produce + * an executable, this does not by itself cause the resulting executable + * to be covered by the GNU General Public License. Your use of that + * executable is in no way restricted on account of linking the HRL + * and/or HVM code into it. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA (or visit + * their web site at http://www.gnu.org/). + * + */ + +#include "hbclass.ch" + +#xcommand MENU [] => [ := ] TDbMenu():New() +#xcommand MENUITEM [ ACTION ] => ; + TDbMenu():AddItem( TDbMenuItem():New( [,{|Self|}] ) ) +#xcommand SEPARATOR => TDbMenu():AddItem( TDbMenuItem():New( "-" ) ) +#xcommand ENDMENU => ATail( TDbMenu():aMenus ):Build() + +function BuildMenu( oDebugger ) // Builds the debugger pulldown menu + + local oMenu + + MENU oMenu + MENUITEM " ~File " + MENU + MENUITEM " ~Open..." ACTION oDebugger:Open() + MENUITEM " ~Resume" ACTION Alert( "Not implemented yet!" ) + MENUITEM " ~OS Shell" ACTION Alert( "Not implemented yet!" ) + SEPARATOR + MENUITEM " e~Xit Alt-X " ACTION oDebugger:Exit(), oDebugger:Hide() + ENDMENU + + MENUITEM " ~Locate " + MENU + MENUITEM " ~Find" ACTION Alert( "Not implemented yet!" ) + MENUITEM " ~Next" ACTION Alert( "Not implemented yet!" ) + MENUITEM " ~Previous" ACTION Alert( "Not implemented yet!" ) + MENUITEM " ~Goto line..." ACTION Alert( "Not implemented yet!" ) + SEPARATOR + MENUITEM " ~Case sensitive " ACTION Alert( "Not implemented yet!" ) + ENDMENU + + MENUITEM " ~View " + MENU + MENUITEM " ~Sets" ACTION oDebugger:ViewSets() + MENUITEM " ~WorkAreas F6" ACTION Alert( "Not implemented yet!" ) + MENUITEM " ~App Screen F4 " ACTION oDebugger:ShowAppScreen() + SEPARATOR + MENUITEM " ~CallStack" ACTION oDebugger:ShowCallStack() + ENDMENU + + MENUITEM " ~Run " + MENU + MENUITEM " ~Restart" ACTION Alert( "Not implemented yet!" ) + MENUITEM " ~Animate" ACTION Alert( "Not implemented yet!" ) + MENUITEM " ~Step F8 " ACTION Alert( "Not implemented yet!" ) + MENUITEM " ~Trace F10" ACTION Alert( "Not implemented yet!" ) + MENUITEM " ~Go F5" ACTION oDebugger:Go() + MENUITEM " to ~Cursor F7" ACTION Alert( "Not implemented yet!" ) + MENUITEM " ~Next routine Ctrl-F5" ACTION Alert( "Not implemented yet!" ) + SEPARATOR + MENUITEM " s~Peed..." ACTION Alert( "Not implemented yet!" ) + ENDMENU + + MENUITEM " ~Point " + MENU + MENUITEM " ~Watchpoint..." ACTION Alert( "Not implemented yet!" ) + MENUITEM " ~Tracepoint..." ACTION Alert( "Not implemented yet!" ) + MENUITEM " ~Breakpoint F9 " ACTION oDebugger:ToggleBreakPoint() + MENUITEM " ~Delete..." ACTION Alert( "Not implemented yet!" ) + ENDMENU + + MENUITEM " ~Monitor " + MENU + MENUITEM " ~Public" ACTION oDebugger:ShowVars() + MENUITEM " pri~Vate " ACTION oDebugger:ShowVars() + MENUITEM " ~Static" ACTION oDebugger:ShowVars() + MENUITEM " ~Local" ACTION oDebugger:ShowVars() + SEPARATOR + MENUITEM " ~All" ACTION Alert( "Not implemented yet!" ) + MENUITEM " s~Ort" ACTION Alert( "Not implemented yet!" ) + ENDMENU + + MENUITEM " ~Options " + MENU + MENUITEM " ~Preprocessed Code" ACTION Alert( "Not implemented yet!" ) + MENUITEM " ~Line Numbers" ACTION Alert( "Not implemented yet!" ) + MENUITEM " ~Exchange Screens" ACTION Alert( "Not implemented yet!" ) + MENUITEM " swap on ~Input" ACTION Alert( "Not implemented yet!" ) + MENUITEM " code~Block Trace" ACTION Alert( "Not implemented yet!" ) + MENUITEM " ~Menu Bar" ACTION Alert( "Not implemented yet!" ) + MENUITEM " mono ~Display" ACTION Alert( "Not implemented yet!" ) + MENUITEM " ~Colors..." ACTION Alert( "Not implemented yet!" ) + MENUITEM " ~Tab Width..." ACTION Alert( "Not implemented yet!" ) + MENUITEM " path for ~Files..." ACTION Alert( "Not implemented yet!" ) + SEPARATOR + MENUITEM " ~Save Settings..." ACTION Alert( "Not implemented yet!" ) + MENUITEM " ~Restore Settings... " ACTION Alert( "Not implemented yet!" ) + ENDMENU + + MENUITEM " ~Window " + MENU + MENUITEM " ~Next Tab " ACTION oDebugger:NextWindow() + MENUITEM " ~Prev Sh-Tab" ACTION oDebugger:PrevWindow() + MENUITEM " ~Move" ACTION Alert( "Not implemented yet!" ) + MENUITEM " ~Size" ACTION Alert( "Not implemented yet!" ) + MENUITEM " ~Zoom F2" ACTION Alert( "Not implemented yet!" ) + MENUITEM " ~Iconize" ACTION Alert( "Not implemented yet!" ) + SEPARATOR + MENUITEM " ~Tile" ACTION Alert( "Not implemented yet!" ) + ENDMENU + + MENUITEM " ~Help " + MENU + MENUITEM " ~About Help " ACTION Alert( "Not implemented yet!" ) + SEPARATOR + MENUITEM " ~Keys" ACTION Alert( "Not implemented yet!" ) + MENUITEM " ~Windows" ACTION Alert( "Not implemented yet!" ) + MENUITEM " ~Menus" ACTION Alert( "Not implemented yet!" ) + MENUITEM " ~Commands" ACTION Alert( "Not implemented yet!" ) + ENDMENU + + ENDMENU + +return oMenu diff --git a/harbour/source/debug/debugger.prg b/harbour/source/debug/debugger.prg index dc7c81e56b..af844ad65e 100644 --- a/harbour/source/debug/debugger.prg +++ b/harbour/source/debug/debugger.prg @@ -44,12 +44,6 @@ #include "common.ch" #include "setcurs.ch" -#xcommand MENU [] => [ := ] TDbMenu():New() -#xcommand MENUITEM [ ACTION ] => ; - TDbMenu():AddItem( TDbMenuItem():New( [,{|Self|}] ) ) -#xcommand SEPARATOR => TDbMenu():AddItem( TDbMenuItem():New( "-" ) ) -#xcommand ENDMENU => ATail( TDbMenu():aMenus ):Build() - #define ALTD_DISABLE 0 #define ALTD_ENABLE 1 @@ -1474,114 +1468,6 @@ static function AltToKey( nKey ) return cKey -function BuildMenu( oDebugger ) // Builds the debugger pulldown menu - - local oMenu - - MENU oMenu - MENUITEM " ~File " - MENU - MENUITEM " ~Open..." ACTION oDebugger:Open() - MENUITEM " ~Resume" ACTION Alert( "Not implemented yet!" ) - MENUITEM " ~OS Shell" ACTION Alert( "Not implemented yet!" ) - SEPARATOR - MENUITEM " e~Xit Alt-X " ACTION oDebugger:Exit(), oDebugger:Hide() - ENDMENU - - MENUITEM " ~Locate " - MENU - MENUITEM " ~Find" ACTION Alert( "Not implemented yet!" ) - MENUITEM " ~Next" ACTION Alert( "Not implemented yet!" ) - MENUITEM " ~Previous" ACTION Alert( "Not implemented yet!" ) - MENUITEM " ~Goto line..." ACTION Alert( "Not implemented yet!" ) - SEPARATOR - MENUITEM " ~Case sensitive " ACTION Alert( "Not implemented yet!" ) - ENDMENU - - MENUITEM " ~View " - MENU - MENUITEM " ~Sets" ACTION oDebugger:ViewSets() - MENUITEM " ~WorkAreas F6" ACTION Alert( "Not implemented yet!" ) - MENUITEM " ~App Screen F4 " ACTION oDebugger:ShowAppScreen() - SEPARATOR - MENUITEM " ~CallStack" ACTION oDebugger:ShowCallStack() - ENDMENU - - MENUITEM " ~Run " - MENU - MENUITEM " ~Restart" ACTION Alert( "Not implemented yet!" ) - MENUITEM " ~Animate" ACTION Alert( "Not implemented yet!" ) - MENUITEM " ~Step F8 " ACTION Alert( "Not implemented yet!" ) - MENUITEM " ~Trace F10" ACTION Alert( "Not implemented yet!" ) - MENUITEM " ~Go F5" ACTION oDebugger:Go() - MENUITEM " to ~Cursor F7" ACTION Alert( "Not implemented yet!" ) - MENUITEM " ~Next routine Ctrl-F5" ACTION Alert( "Not implemented yet!" ) - SEPARATOR - MENUITEM " s~Peed..." ACTION Alert( "Not implemented yet!" ) - ENDMENU - - MENUITEM " ~Point " - MENU - MENUITEM " ~Watchpoint..." ACTION Alert( "Not implemented yet!" ) - MENUITEM " ~Tracepoint..." ACTION Alert( "Not implemented yet!" ) - MENUITEM " ~Breakpoint F9 " ACTION oDebugger:ToggleBreakPoint() - MENUITEM " ~Delete..." ACTION Alert( "Not implemented yet!" ) - ENDMENU - - MENUITEM " ~Monitor " - MENU - MENUITEM " ~Public" ACTION oDebugger:ShowVars() - MENUITEM " pri~Vate " ACTION oDebugger:ShowVars() - MENUITEM " ~Static" ACTION oDebugger:ShowVars() - MENUITEM " ~Local" ACTION oDebugger:ShowVars() - SEPARATOR - MENUITEM " ~All" ACTION Alert( "Not implemented yet!" ) - MENUITEM " s~Ort" ACTION Alert( "Not implemented yet!" ) - ENDMENU - - MENUITEM " ~Options " - MENU - MENUITEM " ~Preprocessed Code" ACTION Alert( "Not implemented yet!" ) - MENUITEM " ~Line Numbers" ACTION Alert( "Not implemented yet!" ) - MENUITEM " ~Exchange Screens" ACTION Alert( "Not implemented yet!" ) - MENUITEM " swap on ~Input" ACTION Alert( "Not implemented yet!" ) - MENUITEM " code~Block Trace" ACTION Alert( "Not implemented yet!" ) - MENUITEM " ~Menu Bar" ACTION Alert( "Not implemented yet!" ) - MENUITEM " mono ~Display" ACTION Alert( "Not implemented yet!" ) - MENUITEM " ~Colors..." ACTION Alert( "Not implemented yet!" ) - MENUITEM " ~Tab Width..." ACTION Alert( "Not implemented yet!" ) - MENUITEM " path for ~Files..." ACTION Alert( "Not implemented yet!" ) - SEPARATOR - MENUITEM " ~Save Settings..." ACTION Alert( "Not implemented yet!" ) - MENUITEM " ~Restore Settings... " ACTION Alert( "Not implemented yet!" ) - ENDMENU - - MENUITEM " ~Window " - MENU - MENUITEM " ~Next Tab " ACTION oDebugger:NextWindow() - MENUITEM " ~Prev Sh-Tab" ACTION oDebugger:PrevWindow() - MENUITEM " ~Move" ACTION Alert( "Not implemented yet!" ) - MENUITEM " ~Size" ACTION Alert( "Not implemented yet!" ) - MENUITEM " ~Zoom F2" ACTION Alert( "Not implemented yet!" ) - MENUITEM " ~Iconize" ACTION Alert( "Not implemented yet!" ) - SEPARATOR - MENUITEM " ~Tile" ACTION Alert( "Not implemented yet!" ) - ENDMENU - - MENUITEM " ~Help " - MENU - MENUITEM " ~About Help " ACTION Alert( "Not implemented yet!" ) - SEPARATOR - MENUITEM " ~Keys" ACTION Alert( "Not implemented yet!" ) - MENUITEM " ~Windows" ACTION Alert( "Not implemented yet!" ) - MENUITEM " ~Menus" ACTION Alert( "Not implemented yet!" ) - MENUITEM " ~Commands" ACTION Alert( "Not implemented yet!" ) - ENDMENU - - ENDMENU - -return oMenu - static function ValToStr( uVal ) local cType := ValType( uVal ) @@ -1610,4 +1496,5 @@ static function ValToStr( uVal ) cResult = "Class " + uVal:ClassName() + " object" endcase -return cResult \ No newline at end of file +return cResult + diff --git a/harbour/source/vm/cmdarg.c b/harbour/source/vm/cmdarg.c index 0b3ebe7ccc..2e91675c90 100644 --- a/harbour/source/vm/cmdarg.c +++ b/harbour/source/vm/cmdarg.c @@ -371,11 +371,12 @@ void hb_cmdargProcessVM( void ) hb_outerr( hb_consoleGetNewLine(), 0 ); { - char buffer[ 20 ]; - + char buffer[ 64 ]; + sprintf( buffer, "Maximum symbol name length: %i", HB_SYMBOL_NAME_LEN ); hb_outerr( buffer, 0 ); hb_outerr( hb_consoleGetNewLine(), 0 ); } } } + diff --git a/harbour/source/vm/maindll.c b/harbour/source/vm/maindll.c index 2b352a66d0..f23be883b6 100644 --- a/harbour/source/vm/maindll.c +++ b/harbour/source/vm/maindll.c @@ -33,6 +33,8 @@ * */ +#ifdef _Windows + #include #include "ctoharb.h" @@ -51,3 +53,5 @@ BOOL WINAPI _export DllEntryPoint( HINSTANCE hInstance, DWORD fdwReason, return TRUE; } +#endif + diff --git a/harbour/source/vm/mainwin.c b/harbour/source/vm/mainwin.c index a5c0d5af3b..44ad1615bb 100644 --- a/harbour/source/vm/mainwin.c +++ b/harbour/source/vm/mainwin.c @@ -33,6 +33,8 @@ * */ +#ifdef _Windows + #include #include "extend.h" #include "ctoharb.h" @@ -65,3 +67,6 @@ int WINAPI WinMain( HINSTANCE hInstance, /* handle to current instance */ return 0; } + +#endif +