2010-03-28 11:15 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)

* INSTALL * config/rules.mk + config/res.mk * config/bin.mk * config/wce/global.mk * config/wce/mingwarm.mk * config/wce/poccarm.mk * config/wce/msvcarm.mk * config/common/watcom.mk * config/win/xcc.mk * config/win/mingw.mk * config/win/pocc.mk * config/win/bcc.mk * config/win/watcom.mk * config/win/cygwin.mk * config/win/global.mk * config/win/msvc.mk * config/os2/watcom.mk * config/os2/gcc.mk * config/os2/global.mk + Added support to GNU Make system to compile and link resources on win, wce and os2 platforms. * bin/postinst.bat + Deleted requirements from local comment. These are documented in INSTALL.
2010-03-28 09:18:27 +00:00
parent 4f17b8025e
commit 1c4fffba99
22 changed files with 123 additions and 16 deletions
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,34 @@
   past entries belonging to author(s): Viktor Szakats.
 */

+2010-03-28 11:15 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * INSTALL
+  * config/rules.mk
+  + config/res.mk
+  * config/bin.mk
+  * config/wce/global.mk
+  * config/wce/mingwarm.mk
+  * config/wce/poccarm.mk
+  * config/wce/msvcarm.mk
+  * config/common/watcom.mk
+  * config/win/xcc.mk
+  * config/win/mingw.mk
+  * config/win/pocc.mk
+  * config/win/bcc.mk
+  * config/win/watcom.mk
+  * config/win/cygwin.mk
+  * config/win/global.mk
+  * config/win/msvc.mk
+  * config/os2/watcom.mk
+  * config/os2/gcc.mk
+  * config/os2/global.mk
+    + Added support to GNU Make system to compile and link resources
+      on win, wce and os2 platforms.
+
+  * bin/postinst.bat
+    + Deleted requirements from local comment. These are
+      documented in INSTALL.
+
 2010-03-27 10:46 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
  * contrib/hbxbp/xbpgra.prg
    ! GraInitMaterix(...) => GraInitMatrix(...)
--- a/harbour/INSTALL
+++ b/harbour/INSTALL
@@ -563,6 +563,7 @@ HARBOUR

   - HB_USER_PRGFLAGS            User Harbour compiler options
   - HB_USER_CFLAGS              User C compiler options
+   - HB_USER_RESFLAGS            User resource compiler options (on win, wce, os2)
   - HB_USER_LDFLAGS             User linker options for executables
   - HB_USER_AFLAGS              User linker options for libraries
   - HB_USER_DFLAGS              User linker options for dynamic libraries
--- a/harbour/bin/postinst.bat
+++ b/harbour/bin/postinst.bat
@@ -10,18 +10,6 @@ rem See COPYING for licensing terms.
 rem
 rem Script run after Harbour make install to finish install process
 rem (for Windows/DOS)
-rem
-rem Contains: install package creator script, which requires:
-rem
-rem    - Info-ZIP zip.exe in PATH
-rem         or HB_DIR_ZIP envvar set to its dir with an ending backslash.
-rem         https://sourceforge.net/project/showfiles.php?group_id=118012
-rem    - NullSoft Installer installed (NSIS)
-rem         https://sourceforge.net/project/showfiles.php?group_id=22049&package_id=15374
-rem      (only for Windows builds)
-rem    - makensis.exe (part of NSIS) in PATH
-rem         or HB_DIR_NSIS envvar set to its dir with an ending backslash.
-rem      (only for Windows builds)
 rem ---------------------------------------------------------------

 if "%HB_BIN_INSTALL%" == "" echo ! HB_BIN_INSTALL needs to be set.
--- a/harbour/config/bin.mk
+++ b/harbour/config/bin.mk
@@ -121,6 +121,7 @@ LIBS := $(HB_USER_LIBS) $(LIBS)
 include $(TOP)$(ROOT)config/$(HB_PLATFORM)/$(HB_COMPILER).mk
 include $(TOP)$(ROOT)config/c.mk
 include $(TOP)$(ROOT)config/prg.mk
+include $(TOP)$(ROOT)config/res.mk

 BIN_NAME :=

@@ -139,6 +140,9 @@ endif
 BIN_FILE := $(BIN_DIR)/$(BIN_NAME)

 ALL_OBJS := $(ALL_C_OBJS) $(ALL_PRG_OBJS)
+ifneq ($(RC),)
+   ALL_OBJS += $(ALL_RC_OBJS)
+endif

 first:: dirbase descend

--- a/harbour/config/common/watcom.mk
+++ b/harbour/config/common/watcom.mk
@@ -24,9 +24,15 @@ AR := wlib
 ARFLAGS += -q -p=72 -c -n

 comma := ,
-LDFILES_COMMA = $(subst $(subst x,x, ),$(comma) ,$(^F))
+ifneq ($(RES_EXT),)
+   LDFILES_COMMA = $(subst $(subst x,x, ),$(comma) ,$(filter-out %$(RES_EXT),$(^F)))
+   LDRES_LIST = $(foreach file,$(filter %$(RES_EXT),$(^F)),OPT res=$(file))
+else
+   LDFILES_COMMA = $(subst $(subst x,x, ),$(comma) ,$(^F))
+   LDRES_LIST :=
+endif
 LDLIBS_COMMA := $(subst $(subst x,x, ),$(comma) ,$(strip $(LDLIBS)))
-LD_RULE = $(LD) $(LDFLAGS) $(HB_LDFLAGS) $(HB_USER_LDFLAGS) NAME $(BIN_DIR)/$@ FILE $(LDFILES_COMMA) $(if $(LDLIBS_COMMA), LIB $(LDLIBS_COMMA),)
+LD_RULE = $(LD) $(LDFLAGS) $(HB_LDFLAGS) $(HB_USER_LDFLAGS) NAME $(BIN_DIR)/$@ FILE $(LDFILES_COMMA) $(LDRES_LIST) $(if $(LDLIBS_COMMA), LIB $(LDLIBS_COMMA),)
 AR_RULE = $(AR) $(ARFLAGS) $(HB_AFLAGS) $(HB_USER_AFLAGS) $(LIB_DIR)/$@ $(foreach file,$(^F),-+$(file))

 ifeq ($(HB_SHELL),dos)
--- a/harbour/config/os2/gcc.mk
+++ b/harbour/config/os2/gcc.mk
@@ -39,6 +39,14 @@ ifeq ($(HB_BUILD_DEBUG),yes)
   CFLAGS += -g
 endif

+RC := windres
+RC_OUT := -o$(subst x,x, )
+ifeq ($(HB_COMPILER),gccomf)
+   RCFLAGS := -O omf
+else
+   RCFLAGS := -O coff
+endif
+
 ifneq ($(filter $(HB_BUILD_STRIP),all lib),)
   ifeq ($(HB_COMPILER),gccomf)
      ARSTRIP = & ${HB_CCPATH}${HB_CCPREFIX}stripomf -S $(LIB_DIR)/$@
--- a/harbour/config/os2/global.mk
+++ b/harbour/config/os2/global.mk
@@ -4,6 +4,7 @@

 all : first

+RES_EXT := .res
 BIN_EXT := .exe
 DYN_EXT := .dll

--- a/harbour/config/os2/watcom.mk
+++ b/harbour/config/os2/watcom.mk
@@ -57,6 +57,10 @@ ifeq ($(HB_BUILD_DEBUG),yes)
   CFLAGS += -d2
 endif

+RC := wrc
+RC_OUT := -fo=
+RCFLAGS := -q -r -zm -bt=os2
+
 LD := wlink
 ifeq ($(HB_BUILD_DEBUG),yes)
   LDFLAGS += DEBUG ALL
--- a/harbour/config/res.mk
+++ b/harbour/config/res.mk
@@ -0,0 +1,5 @@
+#
+# $Id$
+#
+
+ALL_RC_OBJS := $(RC_SOURCES:.rc=$(RES_EXT))
--- a/harbour/config/rules.mk
+++ b/harbour/config/rules.mk
@@ -62,6 +62,13 @@ ifeq ($(CPP_RULE),)
   CPP_RULE = $(CXX) $(CC_FLAGS) $(HB_USER_CFLAGS) $(CC_OUT)$(<F:.cpp=$(OBJ_EXT)) $(CC_IN) $<
 endif

+# The rule to compile resources.
+ifneq ($(RC),)
+   ifeq ($(RC_RULE),)
+      RC_RULE = $(RC) $(RCFLAGS) $(HB_RCFLAGS) $(HB_USER_RESFLAGS) $(RC_OUT)$(<F:.rc=$(RES_EXT)) $<
+   endif
+endif
+
 # The rule to link an executable.
 ifeq ($(LD_RULE),)
   LD_RULE = $(LD) $(LDFLAGS) $(HB_LDFLAGS) $(HB_USER_LDFLAGS) $(LD_OUT)$(subst /,$(DIRSEP),$(BIN_DIR)/$@) $(^F) $(LDLIBS) $(LDSTRIP)
@@ -85,8 +92,15 @@ endif
 %$(OBJ_EXT) : %.cpp
 	$(CPP_RULE)

+# Rules for resource files
+%$(RES_EXT) : $(GRANDP)%.rc
+	$(RC_RULE)
+
+%$(RES_EXT) : %.rc
+	$(RC_RULE)
+
 # Rule to generate an executable file from an object file.
-%$(BIN_EXT) : %$(OBJ_EXT)
+%$(BIN_EXT) : %$(OBJ_EXT) %$(RES_EXT)
 	$(LD_RULE)

 # Rule to generate a C file from a PRG file.
--- a/harbour/config/wce/global.mk
+++ b/harbour/config/wce/global.mk
@@ -4,6 +4,7 @@

 all : first

+RES_EXT := .res
 BIN_EXT := .exe
 DYN_EXT := .dll

--- a/harbour/config/wce/mingwarm.mk
+++ b/harbour/config/wce/mingwarm.mk
@@ -34,6 +34,10 @@ ifeq ($(HB_BUILD_DEBUG),yes)
   CFLAGS += -g
 endif

+RC := windres
+RC_OUT := -o$(subst x,x, )
+RCFLAGS := -O coff
+
 ifneq ($(filter $(HB_BUILD_STRIP),all lib),)
   ARSTRIP = && ${HB_CCPATH}${HB_CCPREFIX}strip -S $(LIB_DIR)/$@
 endif
--- a/harbour/config/wce/msvcarm.mk
+++ b/harbour/config/wce/msvcarm.mk
@@ -72,6 +72,13 @@ ifeq ($(HB_BUILD_DEBUG),yes)
   DFLAGS += -debug
 endif

+RC := rc.exe
+RC_OUT := -fo$(subst x,x, )
+RCFLAGS :=
+ifeq ($(filter $(HB_COMPILER_VER),600 700 710 800 900),)
+   RCFLAGS += -nologo
+endif
+
 LD := link.exe
 LD_OUT := -out:

--- a/harbour/config/wce/poccarm.mk
+++ b/harbour/config/wce/poccarm.mk
@@ -38,6 +38,10 @@ ifeq ($(HB_BUILD_DEBUG),yes)
   CFLAGS += -Zi
 endif

+RC := porc.exe
+RC_OUT := -fo$(subst x,x, )
+RCFLAGS :=
+
 LD := polink.exe
 LD_OUT := -out:

--- a/harbour/config/win/bcc.mk
+++ b/harbour/config/win/bcc.mk
@@ -46,10 +46,14 @@ ifneq ($(HB_COMP_PATH_PUB),)
   DFLAGS    += $(subst /,\,-L"$(HB_COMP_PATH_PUB)../Lib" -L"$(HB_COMP_PATH_PUB)../Lib/PSDK")
 endif

+RC := brcc32.exe
+RC_OUT := -fo
+RCFLAGS :=
+
 LD := ilink32.exe
 LIBPATHS := $(subst /,\,-L"$(LIB_DIR)")
 LDFLAGS += $(LIBPATHS) -Gn -Tpe
-LD_RULE = $(LD) $(LDFLAGS) $(HB_LDFLAGS) $(HB_USER_LDFLAGS) c0x32.obj $(^F), "$(subst /,\,$(BIN_DIR)/$@)", nul, $(LDLIBS) cw32mt import32 $(LDSTRIP)
+LD_RULE = $(LD) $(LDFLAGS) $(HB_LDFLAGS) $(HB_USER_LDFLAGS) c0x32.obj $(filter-out %$(RES_EXT),$(^F)), "$(subst /,\,$(BIN_DIR)/$@)", nul, $(LDLIBS) cw32mt import32,, $(filter %$(RES_EXT),$(^F)) $(LDSTRIP)

 LDLIBS := $(strip $(HB_USER_LIBS) $(LIBS) $(SYSLIBS))

--- a/harbour/config/win/cygwin.mk
+++ b/harbour/config/win/cygwin.mk
@@ -31,6 +31,10 @@ ifeq ($(HB_BUILD_DEBUG),yes)
   CFLAGS += -g
 endif

+RC := windres
+RC_OUT := -o$(subst x,x, )
+RCFLAGS := -O coff
+
 ifneq ($(filter $(HB_BUILD_STRIP),all lib),)
   ARSTRIP = && ${HB_CCPATH}${HB_CCPREFIX}strip -S $(LIB_DIR)/$@
 endif
--- a/harbour/config/win/global.mk
+++ b/harbour/config/win/global.mk
@@ -4,6 +4,7 @@

 all : first

+RES_EXT := .res
 BIN_EXT := .exe
 DYN_EXT := .dll

--- a/harbour/config/win/mingw.mk
+++ b/harbour/config/win/mingw.mk
@@ -50,6 +50,10 @@ ifeq ($(HB_BUILD_DEBUG),yes)
   CFLAGS += -g
 endif

+RC := windres
+RC_OUT := -o$(subst x,x, )
+RCFLAGS := -O coff
+
 ifneq ($(filter $(HB_BUILD_STRIP),all lib),)
   ARSTRIP = && ${HB_CCPATH}${HB_CCPREFIX}strip -S $(LIB_DIR)/$@
 endif
--- a/harbour/config/win/msvc.mk
+++ b/harbour/config/win/msvc.mk
@@ -59,6 +59,13 @@ ifneq ($(filter $(HB_COMPILER_VER),600 700 710),)
   endif
 endif

+RC := rc.exe
+RC_OUT := -fo$(subst x,x, )
+RCFLAGS :=
+ifeq ($(filter $(HB_COMPILER_VER),600 700 710 800 900),)
+   RCFLAGS += -nologo
+endif
+
 # # NOTE: -GA flag should be disabled when building MT _.dlls_,
 # #       as it creates bad code according to MS docs [vszakats].
 # ifneq ($(filter $(HB_COMPILER_VER),600),)
--- a/harbour/config/win/pocc.mk
+++ b/harbour/config/win/pocc.mk
@@ -33,6 +33,10 @@ ifeq ($(HB_BUILD_DEBUG),yes)
   CFLAGS += -Zi
 endif

+RC := porc.exe
+RC_OUT := -fo$(subst x,x, )
+RCFLAGS :=
+
 LD := polink.exe
 LD_OUT := -out:

--- a/harbour/config/win/watcom.mk
+++ b/harbour/config/win/watcom.mk
@@ -51,6 +51,10 @@ ifeq ($(HB_BUILD_DEBUG),yes)
   CFLAGS += -d2
 endif

+RC := wrc
+RC_OUT := -fo=
+RCFLAGS := -q -r -zm -bt=nt
+
 LD := wlink
 ifeq ($(HB_BUILD_DEBUG),yes)
   LDFLAGS += DEBUG ALL
--- a/harbour/config/win/xcc.mk
+++ b/harbour/config/win/xcc.mk
@@ -41,6 +41,10 @@ ifeq ($(HB_BUILD_DEBUG),yes)
   CFLAGS += -Zi
 endif

+RC := xRC.exe
+RC_OUT := -fo$(subst x,x, )
+RCFLAGS :=
+
 LD := xLink.exe
 LD_OUT := -out: