From 261532a1e211999cd83671df3cb23c8e2237ddde Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Tue, 25 Aug 2009 07:44:14 +0000 Subject: [PATCH] 2009-08-25 09:43 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * utils/hbmk2/hbmk2.prg ! Fixed silly regression in 2009-08-23 15:56 which cause RTE on startup if no comp/plat were specced. * utils/hbmk2/hbmk2.prg * config/wce/poccarm.mk * config/wce/msvcarm.mk * config/win/xcc.mk * config/win/pocc.mk * config/win/icc.mk * config/win/pocc64.mk * config/win/msvc.mk ! Changed to use '-' option prefix instead of '/' to make them work under sh (msys) shells. --- harbour/ChangeLog | 16 ++++++++ harbour/config/wce/msvcarm.mk | 12 +++--- harbour/config/wce/poccarm.mk | 12 +++--- harbour/config/win/icc.mk | 12 +++--- harbour/config/win/msvc.mk | 12 +++--- harbour/config/win/pocc.mk | 12 +++--- harbour/config/win/pocc64.mk | 2 +- harbour/config/win/xcc.mk | 10 ++--- harbour/utils/hbmk2/hbmk2.prg | 76 ++++++++++++++++++----------------- 9 files changed, 92 insertions(+), 72 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 4253d8bf8d..69097045ef 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,22 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-08-25 09:43 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * utils/hbmk2/hbmk2.prg + ! Fixed silly regression in 2009-08-23 15:56 which cause RTE on + startup if no comp/plat were specced. + + * utils/hbmk2/hbmk2.prg + * config/wce/poccarm.mk + * config/wce/msvcarm.mk + * config/win/xcc.mk + * config/win/pocc.mk + * config/win/icc.mk + * config/win/pocc64.mk + * config/win/msvc.mk + ! Changed to use '-' option prefix instead of '/' to make them + work under sh (msys) shells. + 2009-08-25 09:18 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * INSTALL + Mentioning dosemu. diff --git a/harbour/config/wce/msvcarm.mk b/harbour/config/wce/msvcarm.mk index 38a4a2ea5f..fd904b01cf 100644 --- a/harbour/config/wce/msvcarm.mk +++ b/harbour/config/wce/msvcarm.mk @@ -66,21 +66,21 @@ LD_OUT := -Fe SYSLIBS += corelibc -LIBPATHS := /libpath:$(LIB_DIR) +LIBPATHS := -libpath:$(LIB_DIR) LDLIBS := $(foreach lib,$(LIBS) $(SYSLIBS),$(lib)$(LIB_EXT)) -LDFLAGS += /nologo /link /subsystem:windowsce /nodefaultlib:oldnames.lib /nodefaultlib:kernel32.lib +LDFLAGS += -nologo -link -subsystem:windowsce -nodefaultlib:oldnames.lib -nodefaultlib:kernel32.lib ifeq ($(HB_VISUALC_VER_PRE80),) - LDFLAGS += /manifest:no + LDFLAGS += -manifest:no endif LDFLAGS += $(LIBPATHS) AR := lib.exe ARFLAGS := -AR_RULE = $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) /nologo /out:$(LIB_DIR)/$@ $(^F) || $(RM) $(LIB_DIR)/$@ +AR_RULE = $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) -nologo -out:$(LIB_DIR)/$@ $(^F) || $(RM) $(LIB_DIR)/$@ DY := $(LD) -DFLAGS := /nologo /dll /subsystem:windowsce +DFLAGS := -nologo -dll -subsystem:windowsce DY_OUT := $(LD_OUT) DLIBS := $(foreach lib,$(SYSLIBS),$(lib)$(LIB_EXT)) @@ -92,7 +92,7 @@ endef define create_dynlib $(if $(wildcard __dyn__.tmp),@$(RM) __dyn__.tmp,) $(foreach file,$^,$(dyn_object)) - $(DY) $(DFLAGS) $(HB_USER_DFLAGS) $(DY_OUT)"$(subst /,$(DIRSEP),$(DYN_DIR)/$@)" /implib:"$(IMP_FILE)" @__dyn__.tmp $(DLIBS) + $(DY) $(DFLAGS) $(HB_USER_DFLAGS) $(DY_OUT)"$(subst /,$(DIRSEP),$(DYN_DIR)/$@)" -implib:"$(IMP_FILE)" @__dyn__.tmp $(DLIBS) endef DY_RULE = $(create_dynlib) diff --git a/harbour/config/wce/poccarm.mk b/harbour/config/wce/poccarm.mk index 5a2773f562..6cb6ad5b5c 100644 --- a/harbour/config/wce/poccarm.mk +++ b/harbour/config/wce/poccarm.mk @@ -40,22 +40,22 @@ ifeq ($(HB_BUILD_DEBUG),yes) endif LD := polink.exe -LD_OUT := /out: +LD_OUT := -out: SYSLIBS += corelibc -LIBPATHS := /libpath:$(LIB_DIR) +LIBPATHS := -libpath:$(LIB_DIR) LDLIBS := $(foreach lib,$(LIBS) $(SYSLIBS),$(lib)$(LIB_EXT)) -LDFLAGS += /subsystem:windows +LDFLAGS += -subsystem:windows LDFLAGS += $(LIBPATHS) AR := polib.exe ARFLAGS := -AR_RULE = $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) /out:$(LIB_DIR)/$@ $(^F) +AR_RULE = $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) -out:$(LIB_DIR)/$@ $(^F) DY := $(LD) -DFLAGS := /nologo /dll +DFLAGS := -nologo -dll DY_OUT := $(LD_OUT) DLIBS := $(foreach lib,$(SYSLIBS),$(lib)$(LIB_EXT)) @@ -67,7 +67,7 @@ endef define create_dynlib $(if $(wildcard __dyn__.tmp),@$(RM) __dyn__.tmp,) $(foreach file,$^,$(dyn_object)) - $(DY) $(DFLAGS) $(HB_USER_DFLAGS) $(DY_OUT)"$(subst /,$(DIRSEP),$(DYN_DIR)/$@)" /implib:"$(IMP_FILE)" @__dyn__.tmp $(DLIBS) + $(DY) $(DFLAGS) $(HB_USER_DFLAGS) $(DY_OUT)"$(subst /,$(DIRSEP),$(DYN_DIR)/$@)" -implib:"$(IMP_FILE)" @__dyn__.tmp $(DLIBS) endef DY_RULE = $(create_dynlib) diff --git a/harbour/config/win/icc.mk b/harbour/config/win/icc.mk index e641916ac7..c4a3bb2e36 100644 --- a/harbour/config/win/icc.mk +++ b/harbour/config/win/icc.mk @@ -41,19 +41,19 @@ ifeq ($(HB_BUILD_DEBUG),yes) endif LD := xilink.exe -LD_OUT := /out: +LD_OUT := -out: -LIBPATHS := /libpath:$(LIB_DIR) +LIBPATHS := -libpath:$(LIB_DIR) LDLIBS := $(foreach lib,$(LIBS) $(SYSLIBS),$(lib)$(LIB_EXT)) -LDFLAGS += /nologo $(LIBPATHS) +LDFLAGS += -nologo $(LIBPATHS) AR := xilib.exe ARFLAGS := -AR_RULE = $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) /nologo /out:$(LIB_DIR)/$@ $(^F) || $(RM) $(LIB_DIR)/$@ +AR_RULE = $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) -nologo -out:$(LIB_DIR)/$@ $(^F) || $(RM) $(LIB_DIR)/$@ DY := $(LD) -DFLAGS := /nologo /dll /subsystem:console +DFLAGS := -nologo -dll -subsystem:console DY_OUT := $(LD_OUT) DLIBS := $(foreach lib,$(SYSLIBS),$(lib)$(LIB_EXT)) @@ -65,7 +65,7 @@ endef define create_dynlib $(if $(wildcard __dyn__.tmp),@$(RM) __dyn__.tmp,) $(foreach file,$^,$(dyn_object)) - $(DY) $(DFLAGS) $(HB_USER_DFLAGS) $(DY_OUT)"$(subst /,$(DIRSEP),$(DYN_DIR)/$@)" /implib:"$(IMP_FILE)" @__dyn__.tmp $(DLIBS) + $(DY) $(DFLAGS) $(HB_USER_DFLAGS) $(DY_OUT)"$(subst /,$(DIRSEP),$(DYN_DIR)/$@)" -implib:"$(IMP_FILE)" @__dyn__.tmp $(DLIBS) endef DY_RULE = $(create_dynlib) diff --git a/harbour/config/win/msvc.mk b/harbour/config/win/msvc.mk index d8ba797524..2b20527078 100644 --- a/harbour/config/win/msvc.mk +++ b/harbour/config/win/msvc.mk @@ -52,19 +52,19 @@ endif # endif LD := link.exe -LD_OUT := /out: +LD_OUT := -out: -LIBPATHS := /libpath:$(LIB_DIR) +LIBPATHS := -libpath:$(LIB_DIR) LDLIBS := $(foreach lib,$(LIBS) $(SYSLIBS),$(lib)$(LIB_EXT)) -LDFLAGS += /nologo $(LIBPATHS) +LDFLAGS += -nologo $(LIBPATHS) AR := lib.exe ARFLAGS := -AR_RULE = $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) /nologo /out:$(LIB_DIR)/$@ $(^F) || $(RM) $(LIB_DIR)/$@ +AR_RULE = $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) -nologo -out:$(LIB_DIR)/$@ $(^F) || $(RM) $(LIB_DIR)/$@ DY := $(LD) -DFLAGS := /nologo /dll /subsystem:console +DFLAGS := -nologo -dll -subsystem:console DY_OUT := $(LD_OUT) DLIBS := $(foreach lib,$(SYSLIBS),$(lib)$(LIB_EXT)) @@ -76,7 +76,7 @@ endef define create_dynlib $(if $(wildcard __dyn__.tmp),@$(RM) __dyn__.tmp,) $(foreach file,$^,$(dyn_object)) - $(DY) $(DFLAGS) $(HB_USER_DFLAGS) $(DY_OUT)"$(subst /,$(DIRSEP),$(DYN_DIR)/$@)" /implib:"$(IMP_FILE)" @__dyn__.tmp $(DLIBS) + $(DY) $(DFLAGS) $(HB_USER_DFLAGS) $(DY_OUT)"$(subst /,$(DIRSEP),$(DYN_DIR)/$@)" -implib:"$(IMP_FILE)" @__dyn__.tmp $(DLIBS) endef DY_RULE = $(create_dynlib) diff --git a/harbour/config/win/pocc.mk b/harbour/config/win/pocc.mk index 4c6918c386..8f00e5540d 100644 --- a/harbour/config/win/pocc.mk +++ b/harbour/config/win/pocc.mk @@ -37,20 +37,20 @@ ifeq ($(HB_BUILD_DEBUG),yes) endif LD := polink.exe -LD_OUT := /out: +LD_OUT := -out: -LIBPATHS := /libpath:$(LIB_DIR) +LIBPATHS := -libpath:$(LIB_DIR) LDLIBS := $(foreach lib,$(LIBS) $(SYSLIBS),$(lib)$(LIB_EXT)) -LDFLAGS += /subsystem:console +LDFLAGS += -subsystem:console LDFLAGS += $(LIBPATHS) AR := polib.exe ARFLAGS := -AR_RULE = $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) /out:$(LIB_DIR)/$@ $(^F) +AR_RULE = $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) -out:$(LIB_DIR)/$@ $(^F) DY := $(LD) -DFLAGS := /nologo /dll +DFLAGS := -nologo -dll DY_OUT := $(LD_OUT) DLIBS := $(foreach lib,$(SYSLIBS),$(lib)$(LIB_EXT)) @@ -62,7 +62,7 @@ endef define create_dynlib $(if $(wildcard __dyn__.tmp),@$(RM) __dyn__.tmp,) $(foreach file,$^,$(dyn_object)) - $(DY) $(DFLAGS) $(HB_USER_DFLAGS) $(DY_OUT)"$(subst /,$(DIRSEP),$(DYN_DIR)/$@)" /implib:"$(IMP_FILE)" @__dyn__.tmp $(DLIBS) + $(DY) $(DFLAGS) $(HB_USER_DFLAGS) $(DY_OUT)"$(subst /,$(DIRSEP),$(DYN_DIR)/$@)" -implib:"$(IMP_FILE)" @__dyn__.tmp $(DLIBS) endef DY_RULE = $(create_dynlib) diff --git a/harbour/config/win/pocc64.mk b/harbour/config/win/pocc64.mk index ea147e4dc9..2047509246 100644 --- a/harbour/config/win/pocc64.mk +++ b/harbour/config/win/pocc64.mk @@ -4,4 +4,4 @@ include $(TOP)$(ROOT)config/$(HB_PLATFORM)/pocc.mk -CPPFLAGS += /Tamd64-coff +CPPFLAGS += -Tamd64-coff diff --git a/harbour/config/win/xcc.mk b/harbour/config/win/xcc.mk index 7958a52fa0..7bab0bf5c5 100644 --- a/harbour/config/win/xcc.mk +++ b/harbour/config/win/xcc.mk @@ -30,26 +30,26 @@ ifneq ($(HB_BUILD_OPTIM),no) endif # For Pocket PC and ARM processors (including XScale) -#CPPFLAGS += /Tarm-coff +#CPPFLAGS += -Tarm-coff ifeq ($(HB_BUILD_DEBUG),yes) CFLAGS += -Zi endif LD := xlink.exe -LD_OUT := /out: +LD_OUT := -out: -LIBPATHS := /libpath:$(LIB_DIR) +LIBPATHS := -libpath:$(LIB_DIR) LDLIBS := $(foreach lib,$(LIBS) $(SYSLIBS),$(lib)$(LIB_EXT)) LDFLAGS += $(LIBPATHS) AR := xlib.exe ARFLAGS := -AR_RULE = $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) /out:$(LIB_DIR)/$@ $(^F) +AR_RULE = $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) -out:$(LIB_DIR)/$@ $(^F) DY := $(LD) -DFLAGS := /nologo /dll +DFLAGS := -nologo -dll DY_OUT := $(LD_OUT) DLIBS := $(foreach lib,$(SYSLIBS),$(lib)$(LIB_EXT)) diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg index 3596ac9ed3..b0d5da176d 100644 --- a/harbour/utils/hbmk2/hbmk2.prg +++ b/harbour/utils/hbmk2/hbmk2.prg @@ -646,6 +646,9 @@ FUNCTION hbmk( aArgs, /* @ */ lPause, /* @ */ lUTF8 ) hbmk[ _HBMK_lInfo ] := .F. hbmk[ _HBMK_lUTF8 ] := .F. + hbmk[ _HBMK_cPLAT ] := "" + hbmk[ _HBMK_cCOMP ] := "" + hbmk[ _HBMK_lCPP ] := NIL hbmk[ _HBMK_lGUI ] := .F. hbmk[ _HBMK_lMT ] := .F. @@ -2551,6 +2554,7 @@ FUNCTION hbmk( aArgs, /* @ */ lPause, /* @ */ lUTF8 ) cLibExt := ".lib" cObjExt := ".obj" cBin_Lib := "tlib.exe" + /* Only forward slash is accepted here as option prefix. */ cOpt_Lib := "/P128 {FA} {OL} {LO}{SCRIPT}" cLibLibExt := cLibExt cLibObjPrefix := "-+ " @@ -2617,12 +2621,12 @@ FUNCTION hbmk( aArgs, /* @ */ lPause, /* @ */ lUTF8 ) IF hbmk[ _HBMK_lDEBUG ] AAdd( hbmk[ _HBMK_aOPTC ], "-Zi" ) - AAdd( hbmk[ _HBMK_aOPTL ], "/debug" ) + AAdd( hbmk[ _HBMK_aOPTL ], "-debug" ) ENDIF IF hbmk[ _HBMK_lGUI ] - AAdd( hbmk[ _HBMK_aOPTL ], "/subsystem:windows" ) + AAdd( hbmk[ _HBMK_aOPTL ], "-subsystem:windows" ) ELSE - AAdd( hbmk[ _HBMK_aOPTL ], "/subsystem:console" ) + AAdd( hbmk[ _HBMK_aOPTL ], "-subsystem:console" ) ENDIF IF hbmk[ _HBMK_lCPP ] != NIL IF hbmk[ _HBMK_lCPP ] @@ -2651,8 +2655,8 @@ FUNCTION hbmk( aArgs, /* @ */ lPause, /* @ */ lUTF8 ) cBin_Dyn := cBin_Link ENDIF nCmd_Esc := _ESC_DBLQUOTE - cOpt_Lib := "/nologo {FA} /out:{OL} {LO}" - cOpt_Dyn := "{FD} /dll /out:{OD} {DL} {LO} {LL} {LB} {LS}" + cOpt_Lib := "-nologo {FA} -out:{OL} {LO}" + cOpt_Dyn := "{FD} -dll -out:{OD} {DL} {LO} {LL} {LB} {LS}" cOpt_CompC := "-nologo -c -Gs" IF hbmk[ _HBMK_lOPTIM ] IF hbmk[ _HBMK_cPLAT ] == "wce" @@ -2671,15 +2675,15 @@ FUNCTION hbmk( aArgs, /* @ */ lPause, /* @ */ lUTF8 ) ENDIF cOpt_CompC += " {FC} {LC}" cOptIncMask := "-I{DI}" - cOpt_Link := "/nologo /out:{OE} {LO} {DL} {FL} {LL} {LB} {LS}" - cLibPathPrefix := "/libpath:" + cOpt_Link := "-nologo -out:{OE} {LO} {DL} {FL} {LL} {LB} {LS}" + cLibPathPrefix := "-libpath:" cLibPathSep := " " IF hbmk[ _HBMK_lMAP ] - AAdd( hbmk[ _HBMK_aOPTL ], "/map" ) - AAdd( hbmk[ _HBMK_aOPTD ], "/map" ) + AAdd( hbmk[ _HBMK_aOPTL ], "-map" ) + AAdd( hbmk[ _HBMK_aOPTD ], "-map" ) ENDIF IF hbmk[ _HBMK_lIMPLIB ] - AAdd( hbmk[ _HBMK_aOPTD ], "/implib:{OI}" ) + AAdd( hbmk[ _HBMK_aOPTD ], "-implib:{OI}" ) ENDIF IF hbmk[ _HBMK_cPLAT ] == "wce" AAdd( hbmk[ _HBMK_aOPTC ], "-D_WIN32_WCE=0x501 -DCE_ARCH -DWINCE -D_WINCE -D_WINDOWS -D_UNICODE -D_UWIN -DUNDER_CE" ) @@ -2687,11 +2691,11 @@ FUNCTION hbmk( aArgs, /* @ */ lPause, /* @ */ lUTF8 ) CASE hbmk[ _HBMK_cCOMP ] == "msvcarm" AAdd( hbmk[ _HBMK_aOPTC ], "-DARM -D_ARM_ -DARMV4 -D_M_ARM -D_ARMV4I_ -Darmv4i -D__arm__" ) ENDCASE - AAdd( hbmk[ _HBMK_aOPTL ], "/subsystem:windowsce" ) - AAdd( hbmk[ _HBMK_aOPTL ], "/nodefaultlib:oldnames.lib" ) - AAdd( hbmk[ _HBMK_aOPTL ], "/nodefaultlib:kernel32.lib" ) + AAdd( hbmk[ _HBMK_aOPTL ], "-subsystem:windowsce" ) + AAdd( hbmk[ _HBMK_aOPTL ], "-nodefaultlib:oldnames.lib" ) + AAdd( hbmk[ _HBMK_aOPTL ], "-nodefaultlib:kernel32.lib" ) IF nCCompVer >= 800 - AAdd( hbmk[ _HBMK_aOPTL ], "/manifest:no" ) + AAdd( hbmk[ _HBMK_aOPTL ], "-manifest:no" ) ENDIF ENDIF IF hbmk[ _HBMK_lINC ] @@ -2730,9 +2734,9 @@ FUNCTION hbmk( aArgs, /* @ */ lPause, /* @ */ lUTF8 ) IF !( hbmk[ _HBMK_cCOMP ] $ "icc|iccia64" ) cBin_Res := "rc.exe" - cOpt_Res := "{FR} /fo {OS} {IR}" + cOpt_Res := "{FR} -fo {OS} {IR}" IF nCCompVer >= 1000 - cOpt_Res := "/nologo " + cOpt_Res /* NOTE: Only in MSVC 2010 and upper. [vszakats] */ + cOpt_Res := "-nologo " + cOpt_Res /* NOTE: Only in MSVC 2010 and upper. [vszakats] */ ENDIF cResExt := ".res" ENDIF @@ -2743,9 +2747,9 @@ FUNCTION hbmk( aArgs, /* @ */ lPause, /* @ */ lUTF8 ) ( hbmk[ _HBMK_cPLAT ] == "win" .AND. hbmk[ _HBMK_cCOMP ] == "xcc" ) IF hbmk[ _HBMK_lGUI ] - AAdd( hbmk[ _HBMK_aOPTL ], "/subsystem:windows" ) + AAdd( hbmk[ _HBMK_aOPTL ], "-subsystem:windows" ) ELSE - AAdd( hbmk[ _HBMK_aOPTL ], "/subsystem:console" ) + AAdd( hbmk[ _HBMK_aOPTL ], "-subsystem:console" ) ENDIF IF hbmk[ _HBMK_lDEBUG ] AAdd( hbmk[ _HBMK_aOPTC ], "-Zi" ) @@ -2767,54 +2771,54 @@ FUNCTION hbmk( aArgs, /* @ */ lPause, /* @ */ lUTF8 ) cBin_Res := "porc.exe" ENDIF cBin_Dyn := cBin_Link - cOpt_CompC := "/c /Ze" + cOpt_CompC := "-c -Ze" IF !( hbmk[ _HBMK_cCOMP ] == "poccarm" ) .AND. ; !( hbmk[ _HBMK_cCOMP ] == "xcc" ) /* xcc doesn't have this enabled in default Harbour builds. */ - cOpt_CompC += " /MT" + cOpt_CompC += " -MT" ENDIF IF !( hbmk[ _HBMK_cCOMP ] == "xcc" ) - cOpt_CompC += " /Go" + cOpt_CompC += " -Go" ENDIF - cOpt_CompC += " {FC} {IC} /Fo{OO}" + cOpt_CompC += " {FC} {IC} -Fo{OO}" IF Empty( cWorkDir ) cWorkDir := "." ENDIF - cOptIncMask := "/I{DI}" - cOpt_Dyn := "{FD} /dll /out:{OD} {DL} {LO} {LL} {LB} {LS}" + cOptIncMask := "-I{DI}" + cOpt_Dyn := "{FD} -dll -out:{OD} {DL} {LO} {LL} {LB} {LS}" DO CASE CASE hbmk[ _HBMK_cCOMP ] == "pocc" IF hbmk[ _HBMK_lOPTIM ] - AAdd( hbmk[ _HBMK_aOPTC ], "/Ot" ) + AAdd( hbmk[ _HBMK_aOPTC ], "-Ot" ) ENDIF - AAdd( hbmk[ _HBMK_aOPTC ], "/Tx86-coff" ) + AAdd( hbmk[ _HBMK_aOPTC ], "-Tx86-coff" ) CASE hbmk[ _HBMK_cCOMP ] == "pocc64" - AAdd( hbmk[ _HBMK_aOPTC ], "/Tamd64-coff" ) + AAdd( hbmk[ _HBMK_aOPTC ], "-Tamd64-coff" ) CASE hbmk[ _HBMK_cCOMP ] == "poccarm" - AAdd( hbmk[ _HBMK_aOPTC ], "/Tarm-coff" ) + AAdd( hbmk[ _HBMK_aOPTC ], "-Tarm-coff" ) AAdd( hbmk[ _HBMK_aOPTC ], "-D_M_ARM" ) AAdd( hbmk[ _HBMK_aOPTC ], "-D_WINCE" ) AAdd( hbmk[ _HBMK_aOPTC ], "-DUNICODE" ) ENDCASE - cOpt_Res := "{FR} /Fo{OS} {IR}" + cOpt_Res := "{FR} -Fo{OS} {IR}" cResExt := ".res" - cOpt_Lib := "{FA} /out:{OL} {LO}" + cOpt_Lib := "{FA} -out:{OL} {LO}" IF hbmk[ _HBMK_lMT ] - AAdd( hbmk[ _HBMK_aOPTC ], "/MT" ) + AAdd( hbmk[ _HBMK_aOPTC ], "-MT" ) ENDIF - cOpt_Link := "/out:{OE} {LO} {DL} {FL} {LL} {LB} {LS}" - cLibPathPrefix := "/libpath:" + cOpt_Link := "-out:{OE} {LO} {DL} {FL} {LL} {LB} {LS}" + cLibPathPrefix := "-libpath:" cLibPathSep := " " IF hbmk[ _HBMK_lSHARED ] AAdd( hbmk[ _HBMK_aLIBPATH ], l_cHB_BIN_INSTALL ) ENDIF IF hbmk[ _HBMK_lMAP ] - AAdd( hbmk[ _HBMK_aOPTL ], "/map" ) + AAdd( hbmk[ _HBMK_aOPTL ], "-map" ) ENDIF IF hbmk[ _HBMK_lIMPLIB ] - AAdd( hbmk[ _HBMK_aOPTD ], "/implib:{OI}" ) + AAdd( hbmk[ _HBMK_aOPTD ], "-implib:{OI}" ) ENDIF IF hbmk[ _HBMK_lDEBUG ] - AAdd( hbmk[ _HBMK_aOPTL ], "/debug" ) + AAdd( hbmk[ _HBMK_aOPTL ], "-debug" ) ENDIF l_aLIBSYS := ArrayAJoin( { l_aLIBSYS, l_aLIBSYSCORE, l_aLIBSYSMISC } ) DO CASE