2008-11-12 12:13 UTC+0100 Viktor Szakats (harbour.01 syenar hu)

* make_b32.mak * make_vc.mak * common.mak * utils/hbdoc/Makefile * utils/hbmake/Makefile * utils/hbtest/Makefile * utils/hbrun/Makefile % Setup to build shipped Harbour executables with -gc0. ; TODO: Please update make_gcc.mak. * ChangeLog + Marked one change as [TOMERGE 1.0]
2008-11-12 11:34:50 +00:00
parent e36ede247e
commit bc980240ea
8 changed files with 44 additions and 18 deletions
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,11 +8,26 @@
   2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
 */

+2008-11-12 12:13 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
+  * make_b32.mak
+  * make_vc.mak
+  * common.mak
+  * utils/hbdoc/Makefile
+  * utils/hbmake/Makefile
+  * utils/hbtest/Makefile
+  * utils/hbrun/Makefile
+    % Setup to build shipped Harbour executables with -gc0.
+    ; TODO: Please update make_gcc.mak.
+
+  * ChangeLog
+    + Marked one change as [TOMERGE 1.0]
+
 2008-11-12 01:48 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
  * harbour/source/rdd/dbfcdx/dbfcdx1.c
    ! fixed bug in joined leaf pages size calculation which activated
      error massage enabled by HB_CDX_DBGCODE_EXT macro.
      Thanks to Saulius for reporting the problem.
+      [TOMERGE 1.0]

 2008-11-11 21:57 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
  * source/common/hbverdsp.c
--- a/harbour/common.mak
+++ b/harbour/common.mak
@@ -89,15 +89,18 @@ INCLUDE_DIR = include
 # Harbour Compiler Flags
 #**********************************************************

-HBFLAGSCMN     = -i$(INCLUDE_DIR) -q0 -w3 -es2 -gc3 -km -l $(PRG_USR)
+HBFLAGSCMN     = -i$(INCLUDE_DIR) -q0 -w3 -es2 -km -l
 !if "$(HB_BUILD_DEBUG)" == "yes"
 HBFLAGSCMN     = $(HBFLAGSCMN) -l-
 !endif
 !if "$(HB_BUILD_WINCE)" == "yes"
 HBFLAGSCMN     = $(HBFLAGSCMN) -D__PLATFORM__WINCE
+!else
+HBFLAGSCMN     = $(HBFLAGSCMN) -gc3
 !endif
-HARBOURFLAGS   = -n $(HBFLAGSCMN)
-HARBOURFLAGSDLL= -n1 $(HBFLAGSCMN)
+HARBOURFLAGS   = -n $(HBFLAGSCMN) $(PRG_USR)
+HARBOURFLAGSDLL= -n1 $(HBFLAGSCMN) $(PRG_USR)
+HARBOURFLAGSEXE= -n $(HBFLAGSCMN) -gc0 $(PRG_USR)

 #**********************************************************
 # Directory macros. These should never have to change.
--- a/harbour/make_b32.mak
+++ b/harbour/make_b32.mak
@@ -140,6 +140,11 @@ ARFLAGS = /P64 $(A_USR)
    $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $**
    $(CC) $(CLIBFLAGS) -o$@ $(OBJ_DIR)\$&.c
 #**********************************************************
+# General *.prg --> *.obj COMPILE rule for STATIC exe
+{$(ALL_EXE_SRC_DIRS)}.prg{$(OBJ_DIR)}$(OBJEXT):
+    $(HB) $(HARBOURFLAGSEXE) -o$(OBJ_DIR)\ $**
+    $(CC) $(CLIBFLAGS) -o$@ $(OBJ_DIR)\$&.c
+#**********************************************************

 #**********************************************************
 # General *.c --> *.obj COMPILE rule for STATIC MT Libraries
@@ -183,7 +188,7 @@ ARFLAGS = /P64 $(A_USR)
 # General *.prg --> *.obj COMPILE rules for EXECUTABLES,
 # which use Harbour SHARED Library compiled as DLL
 {$(ALL_EXE_SRC_DIRS)}.prg{$(DLL_OBJ_DIR)}$(OBJEXT):
-    $(HB) $(HARBOURFLAGS) -o$(DLL_OBJ_DIR)\ $**
+    $(HB) $(HARBOURFLAGSEXE) -o$(DLL_OBJ_DIR)\ $**
    $(CC) $(CEXEFLAGSDLL) -o$@ $(DLL_OBJ_DIR)\$&.c
 #**********************************************************

--- a/harbour/make_vc.mak
+++ b/harbour/make_vc.mak
@@ -93,11 +93,6 @@ VMMT_LIB_OBJS = $(VM_LIB_OBJS:obj\vc=obj\vc\mt)
 DLL_OBJS = $(TMP_DLL_OBJS:obj\vc=obj\vc\dll) $(VM_DLL_OBJS:obj\vc=obj\vc\dll)
 MTDLL_OBJS = $(TMP_DLL_OBJS:obj\vc=obj\vc\dll) $(VMMTDLL_LIB_OBJS)

-!if "$(HB_BUILD_WINCE)" == "yes"
-HARBOURFLAGS    = $(HARBOURFLAGS) -gc0
-HARBOURFLAGSDLL = $(HARBOURFLAGSDLL) -gc0
-!endif
-
 #**********************************************************
 # C compiler, Harbour compiler and Linker flags.
 #**********************************************************
@@ -186,7 +181,7 @@ STANDARD_SYSLIBS = coredll.lib corelibc.lib winsock.lib ws2.lib
 LDFLAGS        = /nologo /libpath:$(LIB_DIR) $(L_USR)
 LDFLAGSDLL     = /dll $(LDFLAGS)
 !if $(HB_VISUALC_VER) >= 80
-LDFLAGS        = $(LDFLAGS) /nxcompat /dynamicbase /fixed:no
+LDFLAGS        = $(LDFLAGS) /nxcompat
 !endif
 # user32.lib: *Clipboard*(), CharToOemBuff(), OemToCharBuff(), GetKeyState(), GetKeyboardState(), SetKeyboardState()
 # wsock32.lib: hbinet
@@ -419,19 +414,19 @@ LDFLAGSDLL     = /debug $(LDFLAGSDLL)
    $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c
 #*******************************************************
 {$(HBRUN_DIR)}.prg{$(OBJ_DIR)}$(OBJEXT):
-    $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $<
+    $(HB) $(HARBOURFLAGSEXE) -o$(OBJ_DIR)\ $<
    $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c
 #*******************************************************
 {$(HBTEST_DIR)}.prg{$(OBJ_DIR)}$(OBJEXT):
-    $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $<
+    $(HB) $(HARBOURFLAGSEXE) -o$(OBJ_DIR)\ $<
    $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c
 #*******************************************************
 {$(HBDOC_DIR)}.prg{$(OBJ_DIR)}$(OBJEXT):
-    $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $<
+    $(HB) $(HARBOURFLAGSEXE) -o$(OBJ_DIR)\ $<
    $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c
 #*******************************************************
 {$(HBMAKE_DIR)}.prg{$(OBJ_DIR)}$(OBJEXT):
-    $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $<
+    $(HB) $(HARBOURFLAGSEXE) -o$(OBJ_DIR)\ $<
    $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c
 #*******************************************************

@@ -690,19 +685,19 @@ LDFLAGSDLL     = /debug $(LDFLAGSDLL)
 #    $(CC) $(CEXEFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c
 #*******************************************************
 {$(HBRUN_DIR)}.prg{$(DLL_OBJ_DIR)}$(OBJEXT):
-    $(HB) $(HARBOURFLAGS) -o$(DLL_OBJ_DIR)\ $<
+    $(HB) $(HARBOURFLAGSEXE) -o$(DLL_OBJ_DIR)\ $<
    $(CC) $(CEXEFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c
 #*******************************************************
 {$(HBTEST_DIR)}.prg{$(DLL_OBJ_DIR)}$(OBJEXT):
-    $(HB) $(HARBOURFLAGS) -o$(DLL_OBJ_DIR)\ $<
+    $(HB) $(HARBOURFLAGSEXE) -o$(DLL_OBJ_DIR)\ $<
    $(CC) $(CEXEFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c
 #*******************************************************
 {$(HBDOC_DIR)}.prg{$(DLL_OBJ_DIR)}$(OBJEXT):
-    $(HB) $(HARBOURFLAGS) -o$(DLL_OBJ_DIR)\ $<
+    $(HB) $(HARBOURFLAGSEXE) -o$(DLL_OBJ_DIR)\ $<
    $(CC) $(CEXEFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c
 #*******************************************************
 {$(HBMAKE_DIR)}.prg{$(DLL_OBJ_DIR)}$(OBJEXT):
-    $(HB) $(HARBOURFLAGS) -o$(DLL_OBJ_DIR)\ $<
+    $(HB) $(HARBOURFLAGSEXE) -o$(DLL_OBJ_DIR)\ $<
    $(CC) $(CEXEFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c
 #**********************************************************

--- a/harbour/utils/hbdoc/Makefile
+++ b/harbour/utils/hbdoc/Makefile
@@ -36,4 +36,6 @@ LIBS=\
 	hbmacro \
 	hbcommon \

+PRG_USR += -gc0
+
 include $(TOP)$(ROOT)config/bin.cf
--- a/harbour/utils/hbmake/Makefile
+++ b/harbour/utils/hbmake/Makefile
@@ -28,4 +28,6 @@ LIBS=\
 	hbmacro \
 	hbcommon \

+PRG_USR += -gc0
+
 include $(TOP)$(ROOT)config/bin.cf
--- a/harbour/utils/hbrun/Makefile
+++ b/harbour/utils/hbrun/Makefile
@@ -38,4 +38,6 @@ ifeq ($(findstring -DHB_EXT_ZLIB, $(C_USR)),)
 LIBS += hbzlib
 endif

+PRG_USR += -gc0
+
 include $(TOP)$(ROOT)config/bin.cf
--- a/harbour/utils/hbtest/Makefile
+++ b/harbour/utils/hbtest/Makefile
@@ -40,4 +40,6 @@ LIBS=\
 	hbpp \
 	hbcommon \

+PRG_USR += -gc0
+
 include $(TOP)$(ROOT)config/bin.cf