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

2009-03-16 13:25 UTC+0100 Viktor Szakats (harbour.01 syenar hu)

Browse Source 
* utils/hbmk2/hbmk2.prg
    + Added support for win/mingwce.
    + Honoring HB_CCPATH for ar in gcc *nix.
    + Honoring HB_CCPATH for gcc win.
This commit is contained in:
Viktor Szakats
2009-03-16 12:25:17 +00:00
parent 2cad8acaeb
commit a17a6cdaef
2 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
harbour/ChangeLog
View File

@@ -8,6 +8,12 @@
2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
*/
2009-03-16 13:25 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
* utils/hbmk2/hbmk2.prg
+ Added support for win/mingwce.
+ Honoring HB_CCPATH for ar in gcc *nix.
+ Honoring HB_CCPATH for gcc win.
2009-03-16 12:40 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
* include/hbdefs.h
+ Enabled new Harbour types. Still incomplete, and relying

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

@@ -1130,6 +1130,7 @@ FUNCTION Main( ... )
cOpt_Lib := "{FA} cr {OL} {LO}"
cBin_CompC := t_cCCPREFIX + iif( t_cCOMP == "gpp", "g++", "gcc" )
IF ! Empty( t_cCCPATH )
cBin_Lib := t_cCCPATH + "/" + cBin_Lib
cBin_CompC := t_cCCPATH + "/" + cBin_CompC
ENDIF
cOpt_CompC := "{LC} {LO} {LA} -O3 {FC} -I{DI} {DL}"
@@ -1254,6 +1255,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 == "mingwce" ) .OR. ;
( t_cARCH == "win" .AND. t_cCOMP == "cygwin" )
cLibPrefix := "-l"
@@ -1267,10 +1269,16 @@ FUNCTION Main( ... )
cBin_Lib := t_cCCPREFIX + "ar.exe"
cOpt_Lib := "{FA} cr {OL} {LO}"
cLibObjPrefix := NIL
IF s_lGUI
cOpt_CompC += " -mwindows"
ELSE
cOpt_CompC += " -mconsole"
IF ! Empty( t_cCCPATH )
cBin_Lib := t_cCCPATH + "\" + cBin_Lib
cBin_CompC := t_cCCPATH + "\" + cBin_CompC
ENDIF
IF !( t_cCOMP == "mingwce" )
IF s_lGUI
cOpt_CompC += " -mwindows"
ELSE
cOpt_CompC += " -mconsole"
ENDIF
ENDIF
IF s_lMAP
cOpt_CompC += " -Wl,-Map {OM}"
@@ -1298,7 +1306,11 @@ FUNCTION Main( ... )
AAdd( s_aOPTC, "-o{OE}" )
ENDIF
IF ! s_lSHARED
s_aLIBSYS := ArrayJoin( s_aLIBSYS, { "user32", "winspool", "gdi32", "comctl32", "comdlg32", "ole32", "oleaut32", "uuid", "wsock32", "ws2_32" } )
IF t_cCOMP == "mingwce"
s_aLIBSYS := ArrayJoin( s_aLIBSYS, { "wininet", "ws2", "commdlg", "commctrl", "uuid", "ole32" } )
ELSE
s_aLIBSYS := ArrayJoin( s_aLIBSYS, { "user32", "winspool", "gdi32", "comctl32", "comdlg32", "ole32", "oleaut32", "uuid", "wsock32", "ws2_32" } )
ENDIF
ENDIF
s_aLIBSHARED := { iif( s_lMT, "harbourmt", "harbour" ) }
@@ -1690,7 +1702,7 @@ FUNCTION Main( ... )
CASE t_cARCH == "linux" .AND. t_cCOMP == "icc"
CASE t_cARCH == "win" .AND. t_cCOMP == "pocc64" /* NOTE: Cross-platform: win/amd64 on win/x86 */
CASE t_cARCH == "win" .AND. t_cCOMP == "poccce" /* NOTE: Cross-platform: wince/ARM on win/x86 */
CASE t_cARCH $ "win|linux" .AND. t_cCOMP == "mingwce" /* NOTE: Cross-platform: wince/ARM on win/x86 */
CASE t_cARCH == "linux" .AND. t_cCOMP == "mingwce" /* NOTE: Cross-platform: wince/ARM on win/x86 */
IF ! s_lSHARED
s_aLIBSYS := ArrayJoin( s_aLIBSYS, { "wininet", "ws2", "commdlg", "commctrl", "uuid", "ole32" } )
ENDIF