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

2009-02-18 16:35 UTC+0100 Maurilio Longo (maurilio.longo@libero.it)

Browse Source 
* source/vm/cmdarg.c
     * little hack from Przemyslaw to make it work under OS/2 where
       executable name hasen't got extension if extension was not give when
       executable was started.
   * utils/hbmk/hbmk2.prg
     * Changed to work under OS/2 with GCC; other OS/2 compilers not tested.
This commit is contained in:
Maurilio Longo
2009-02-18 15:38:48 +00:00
parent 5c12c3430e
commit 06a6d319c7
3 changed files with 72 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
harbour/ChangeLog
View File

@@ -8,6 +8,14 @@
2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
*/
2009-02-18 16:35 UTC+0100 Maurilio Longo (maurilio.longo@libero.it)
* source/vm/cmdarg.c
* little hack from Przemyslaw to make it work under OS/2 where
executable name hasen't got extension if extension was not give when
executable was started.
* utils/hbmk/hbmk2.prg
* Changed to work under OS/2 with GCC; other OS/2 compilers not tested.
2009-02-18 16:21 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
* utils/hbmk/hbmk2.prg
* '-l-' is now passed to Harbour instead of being considered

6
harbour/source/vm/cmdarg.c
View File

@@ -151,6 +151,12 @@ void hb_cmdargUpdate( void )
HB_PATHNAMES * pSearchPath = NULL, * pNextPath;
hb_fsAddSearchPath( pszPATH, &pSearchPath );
pNextPath = pSearchPath;
#ifdef HB_OS_OS2
if( !pFName->szExtension )
pFName->szExtension = ".exe";
#endif
while( pNextPath )
{
pFName->szPath = pNextPath->szPath;

87
harbour/utils/hbmk/hbmk2.prg
View File

@@ -691,8 +691,7 @@ FUNCTION Main( ... )
CASE ( t_cARCH == "win" .AND. t_cCOMP == "gcc" ) .OR. ;
( t_cARCH == "win" .AND. t_cCOMP == "mingw" ) .OR. ;
( t_cARCH == "win" .AND. t_cCOMP == "rsxnt" ) .OR. ;
( t_cARCH == "os2" .AND. t_cCOMP == "gcc" )
( t_cARCH == "win" .AND. t_cCOMP == "rsxnt" )
cLibPrefix := "-l"
cLibExt := NIL
@@ -772,18 +771,63 @@ FUNCTION Main( ... )
ENDIF
s_aLIBSYS := ArrayJoin( s_aLIBSYS, { "kernel32", "user32", "wsock32" } )
CASE t_cARCH == "os2" .AND. t_cCOMP == "owatcom"
cLibPrefix := "LIB "
cLibExt := ".lib"
cObjPrefix := "FILE "
cObjExt := ".obj"
cBin_CompC := "wpp386"
cOpt_CompC := "-j -w3 -5s -5r -fp5 -oxehtz -zq -zt0 -mf -bt=OS2 {OPTC} {C}"
cBin_Link := "wlink"
cOpt_Link := "OP stack=65536 OP CASEEXACT {OPTL} NAME {E} {O} {L}"
IF s_lDEBUG
cOpt_Link := "DEBUG " + cOpt_Link
ENDIF
/* OS/2 compilers */
CASE t_cARCH == "os2"
DO CASE
CASE t_cCOMP == "gcc"
cLibPrefix := "-l"
cLibExt := NIL
cObjExt := ".o"
cBin_CompC := "gcc"
/* OS/2 needs a space between -o and file name following it */
cOpt_CompC := "{C} {O} -O3 -o {E} {OPTC} -I{I} {A}"
cLibPathPrefix := "-L"
cLibPathSep := " "
IF s_lMAP
cOpt_CompC += " -Wl,-Map " + s_cMAPNAME
ENDIF
IF s_lSHARED
cOpt_CompC += " -L{B}"
ENDIF
cOpt_CompC += " {L}"
aLIB_BASE2 := ArrayAJoin( { aLIB_BASE2, { "hbcommon", "hbrtl" }, s_aLIBVM } )
s_aLIBSYS := ArrayJoin( s_aLIBSYS, { "socket" } )
IF s_lSTRIP
AAdd( s_aOPTC, "-s" )
ENDIF
IF lStopAfterCComp
AAdd( s_aOPTC, "-c" )
ENDIF
CASE t_cCOMP == "owatcom"
cLibPrefix := "LIB "
cLibExt := ".lib"
cObjPrefix := "FILE "
cObjExt := ".obj"
cBin_CompC := "wpp386"
cOpt_CompC := "-j -w3 -5s -5r -fp5 -oxehtz -zq -zt0 -mf -bt=OS2 {OPTC} {C}"
cBin_Link := "wlink"
cOpt_Link := "OP stack=65536 OP CASEEXACT {OPTL} NAME {E} {O} {L}"
IF s_lDEBUG
cOpt_Link := "DEBUG " + cOpt_Link
ENDIF
CASE t_cCOMP == "icc"
cLibPrefix := "{A}\"
cLibExt := ".lib"
cObjExt := ".obj"
cBin_CompC := "icc"
cOpt_CompC := "/Gs+ /W2 /Se /Sd+ /Ti+ /C- /Tp {OPTC} -I{I} {C}"
IF s_lDEBUG
AAdd( s_aOPTC, "-MTd -Zi" )
ENDIF
IF s_lGUI
AAdd( s_aOPTL, "/subsystem:windows" )
ELSE
AAdd( s_aOPTL, "/subsystem:console" )
ENDIF
ENDCASE
CASE t_cARCH == "linux" .AND. t_cCOMP == "owatcom"
cLibPrefix := "LIB "
@@ -856,21 +900,6 @@ FUNCTION Main( ... )
we can only be compatible with one of them. non-GNU is the common choice here. */
s_aLIBSHARED := { iif( s_lMT, "harbourmt-" + cDL_Version + "-vc", "harbour-" + cDL_Version + "-vc" ), "hbmainstd", "hbmainwin", "hbcommon" }
CASE t_cARCH == "os2" .AND. t_cCOMP == "icc"
cLibPrefix := "{A}\"
cLibExt := ".lib"
cObjExt := ".obj"
cBin_CompC := "icc"
cOpt_CompC := "/Gs+ /W2 /Se /Sd+ /Ti+ /C- /Tp {OPTC} -I{I} {C}"
IF s_lDEBUG
AAdd( s_aOPTC, "-MTd -Zi" )
ENDIF
IF s_lGUI
AAdd( s_aOPTL, "/subsystem:windows" )
ELSE
AAdd( s_aOPTL, "/subsystem:console" )
ENDIF
CASE t_cARCH == "win" .AND. t_cCOMP == "pocc"
IF s_lGUI
AAdd( s_aOPTL, "/subsystem:windows" )