2010-03-13 17:20 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)

* utils/hbmk2/hbmk2.prg
    + hbmainstd/hbmainwin lib is now added for mingw family
      to lib list also for static executables. It fixes the GPF
      at startup with Equation Solution mingw64 build. I hope
      it doesn't create any harm for other builds, it remains
      to be tested.
    % Disabled -fomit-frame-pointer for mingw64.

  * utils/hbformat/Makefile
  * utils/hbmk2/Makefile
  * utils/hbi18n/Makefile
  * utils/hbtest/Makefile
  * utils/hbrun/Makefile
  * config/win/mingw.mk
    % "HB_MAIN" logic eliminated from local make files and moved
      to mingw.mk only.

harbour/ChangeLog

@@ -17,6 +17,24 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2010-03-13 17:20 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * utils/hbmk2/hbmk2.prg
+    + hbmainstd/hbmainwin lib is now added for mingw family
+      to lib list also for static executables. It fixes the GPF
+      at startup with Equation Solution mingw64 build. I hope
+      it doesn't create any harm for other builds, it remains
+      to be tested.
+    % Disabled -fomit-frame-pointer for mingw64.
+
+  * utils/hbformat/Makefile
+  * utils/hbmk2/Makefile
+  * utils/hbi18n/Makefile
+  * utils/hbtest/Makefile
+  * utils/hbrun/Makefile
+  * config/win/mingw.mk
+    % "HB_MAIN" logic eliminated from local make files and moved
+      to mingw.mk only.
+
 2010-03-13 15:01 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
   * config/global.mk
   * utils/hbmk2/hbmk2.prg

harbour/config/win/mingw.mk

@@ -64,9 +64,9 @@ LD_OUT := -o$(subst x,x, )
 LIBPATHS := -L$(LIB_DIR)
 LDLIBS := $(foreach lib,$(HB_USER_LIBS) $(LIBS) $(SYSLIBS),-l$(lib))
 
-# Add the standard C main() entry
-ifeq ($(HB_MAIN),std)
-   ifneq ($(HB_LINKING_RTL),)
+# Add the standard C entry
+ifneq ($(HB_LINKING_RTL),)
+   ifeq ($(HB_MAIN),)
       LDLIBS += -lhbmainstd
    endif
 endif

harbour/utils/hbformat/Makefile

@@ -2,10 +2,6 @@
 # $Id$
 #
 
-ifeq ($(HB_MAIN),)
-   HB_MAIN := std
-endif
-
 ROOT := ../../
 
 PRG_SOURCES := \

harbour/utils/hbi18n/Makefile

@@ -2,10 +2,6 @@
 # $Id$
 #
 
-ifeq ($(HB_MAIN),)
-   HB_MAIN := std
-endif
-
 ROOT := ../../
 
 PRG_SOURCES := \

harbour/utils/hbmk2/Makefile

@@ -2,10 +2,6 @@
 # $Id$
 #
 
-ifeq ($(HB_MAIN),)
-   HB_MAIN := std
-endif
-
 ROOT := ../../
 
 PRG_SOURCES := \

harbour/utils/hbmk2/hbmk2.prg

@@ -600,6 +600,7 @@ FUNCTION hbmk2( aArgs, /* @ */ lPause )
    LOCAL l_aLIBSYS
    LOCAL l_aLIBSYSCORE := {}
    LOCAL l_aLIBSYSMISC := {}
+   LOCAL l_aLIBSTATICPOST := {}
    LOCAL l_aOPTRUN
    LOCAL l_cPROGDIR
    LOCAL l_cPROGNAME
@@ -2581,7 +2582,7 @@ FUNCTION hbmk2( aArgs, /* @ */ lPause )
             IF hbmk[ _HBMK_cCOMP ] $ "gcc|mingw"
                cOpt_CompC += " -march=i586 -mtune=pentiumpro"
             ENDIF
-            IF ! hbmk[ _HBMK_lDEBUG ]
+            IF ! hbmk[ _HBMK_lDEBUG ] .AND. !( hbmk[ _HBMK_cCOMP ] == "mingw64" )
                cOpt_CompC += " -fomit-frame-pointer"
             ENDIF
          ENDIF
@@ -2690,6 +2691,9 @@ FUNCTION hbmk2( aArgs, /* @ */ lPause )
             ELSE
                l_aLIBSHAREDPOST := { "hbmainstd" }
             ENDIF
+            IF ! l_lNOHBLIB .AND. ! hbmk[ _HBMK_lCreateDyn ]
+               l_aLIBSTATICPOST := l_aLIBSHAREDPOST
+            ENDIF
          ENDIF
 
          IF hbmk[ _HBMK_cCOMP ] $ "mingw|mingw64|mingwarm"
@@ -4140,7 +4144,8 @@ FUNCTION hbmk2( aArgs, /* @ */ lPause )
                                       hbmk[ _HBMK_aLIBCOREGT ],;
                                       iif( hbmk[ _HBMK_lNULRDD ], aLIB_BASE_NULRDD, iif( hbmk[ _HBMK_lMT ], aLIB_BASE_RDD_MT, aLIB_BASE_RDD ) ),;
                                       l_aLIBHBBASE_2,;
-                                      iif( hbmk[ _HBMK_lMT ], aLIB_BASE_3_MT, aLIB_BASE_3 ) } )
+                                      iif( hbmk[ _HBMK_lMT ], aLIB_BASE_3_MT, aLIB_BASE_3 ),;
+                                      l_aLIBSTATICPOST } )
          ENDIF
       ELSE
          l_aLIBHB := {}

harbour/utils/hbrun/Makefile

@@ -2,10 +2,6 @@
 # $Id$
 #
 
-ifeq ($(HB_MAIN),)
-   HB_MAIN := std
-endif
-
 ROOT := ../../
 
 include $(TOP)$(ROOT)config/global.mk

harbour/utils/hbtest/Makefile

@@ -2,10 +2,6 @@
 # $Id$
 #
 
-ifeq ($(HB_MAIN),)
-   HB_MAIN := std
-endif
-
 ROOT := ../../
 
 PRG_SOURCES := \