Changeset 2776

Timestamp:

Feb 3, 2015, 9:38:12 PM (10 years ago)

Author:

bird

Message:

GCC3OMF,GXX3OMF: Added RC compiler (most OS/2 systems have rc.exe installed).

Location:

trunk/kBuild/tools

Files:

• GCC3OMF.kmk (modified) (3 diffs)
• GXX3OMF.kmk (modified) (3 diffs)

trunk/kBuild/tools/GCC3OMF.kmk

@@ -50 +50 @@
 TOOL_GCC3OMF_LD_MAP ?= -Zmap=$(1)
 TOOL_GCC3OMF_LD_SYSMOD_MAP ?= -Zmap=$(1)
+TOOL_GCC3OMF_RC = rc$(HOSTSUFF_EXE)
 
 ifdef SLKRUNS
@@ -78 +79 @@
 TOOL_GCC3OMF_ASFLAGS.profile  ?= -g
 TOOL_GCC3OMF_ASOBJSUFF        ?= .obj
+
+TOOL_GCC3OMF_RCOBJSUFF        ?= .res
+TOOL_GCC3OMF_RCFLAGS          ?= -n
+TOOL_GCC3OMF_RCINCS           ?= $(shell $(TOOL_GCC3OMF_CXX) -E -x c++ - 2>&1 < /dev/null \
+        | $(SED_EXT) -e "/search starts here/,/[Ee]nd of search list/!d" -e "/^ /!d")
 
 TOOL_GCC3OMF_ARFLAGS          ?= cr
@@ -203 +209 @@
 
 
+## Compile resource source.
+# @param    $(target)   Normalized main target name.
+# @param    $(source)   Source filename (relative).
+# @param    $(obj)      Object file name. This shall be (re)created by the compilation.
+# @param    $(dep)      Dependcy file. This shall be (re)created by the compilation.
+# @param    $(flags)    Flags.
+# @param    $(defs)     Definitions. No -D or something.
+# @param    $(incs)     Includes. No -I or something.
+# @param    $(dirdep)   Directory creation dependency.
+# @param    $(deps)     Other dependencies.
+#
+# @param    $(outbase)  Output basename (full). Use this for list files and such.
+# @param    $(objsuff)  Object suffix.
+TOOL_GCC3OMF_COMPILE_RC_OUTPUT =
+TOOL_GCC3OMF_COMPILE_RC_DEPEND =
+TOOL_GCC3OMF_COMPILE_RC_DEPORD =
+define TOOL_GCC3OMF_COMPILE_RC_CMDS
+        $(QUIET)$(REDIRECT) -E 'INCLUDE=' -- $(TOOL_GCC3OMF_RC) -r \
+                $(flags) $(addprefix -i, $(subst /,\\,$(subst /@unixroot,$(UNIXROOT),$(incs)))) $(addprefix -d, $(defs))\
+                $(subst /,\\,$(abspath $(source))) \
+                $(obj)
+endef
 ## Link library
 # @param    $(target)   Normalized main target name.

trunk/kBuild/tools/GXX3OMF.kmk

@@ -50 +50 @@
 TOOL_GXX3OMF_LD_MAP ?= -Zmap=$(1)
 TOOL_GXX3OMF_LD_SYSMOD_MAP ?= -Zmap=$(1)
+TOOL_GXX3OMF_RC = rc$(HOSTSUFF_EXE)
 
 ifdef SLKRUNS
@@ -78 +79 @@
 TOOL_GXX3OMF_ASFLAGS.profile  ?= -g
 TOOL_GXX3OMF_ASOBJSUFF        ?= .obj
+
+TOOL_GXX3OMF_RCOBJSUFF        ?= .res
+TOOL_GXX3OMF_RCFLAGS          ?= -n
+TOOL_GXX3OMF_RCINCS           ?= $(shell $(TOOL_GXX3OMF_CXX) -E -x c++ - 2>&1 < /dev/null \
+        | $(SED_EXT) -e "/search starts here/,/[Ee]nd of search list/!d" -e "/^ /!d")
 
 TOOL_GXX3OMF_ARFLAGS          ?= cr
@@ -200 +206 @@
                 $(abspath $(source))
         $(QUIET)$(APPEND) -n "$(dep)" "" "$(source):" ""
+endef
+
+
+## Compile resource source.
+# @param    $(target)   Normalized main target name.
+# @param    $(source)   Source filename (relative).
+# @param    $(obj)      Object file name. This shall be (re)created by the compilation.
+# @param    $(dep)      Dependcy file. This shall be (re)created by the compilation.
+# @param    $(flags)    Flags.
+# @param    $(defs)     Definitions. No -D or something.
+# @param    $(incs)     Includes. No -I or something.
+# @param    $(dirdep)   Directory creation dependency.
+# @param    $(deps)     Other dependencies.
+#
+# @param    $(outbase)  Output basename (full). Use this for list files and such.
+# @param    $(objsuff)  Object suffix.
+TOOL_GXX3OMF_COMPILE_RC_OUTPUT =
+TOOL_GXX3OMF_COMPILE_RC_DEPEND =
+TOOL_GXX3OMF_COMPILE_RC_DEPORD =
+define TOOL_GXX3OMF_COMPILE_RC_CMDS
+        $(QUIET)$(REDIRECT) -E 'INCLUDE=' -- $(TOOL_GXX3OMF_RC) -r \
+                $(flags) $(addprefix -i, $(subst /,\\,$(subst /@unixroot,$(UNIXROOT),$(incs)))) $(addprefix -d, $(defs))\
+                $(subst /,\\,$(abspath $(source))) \
+                $(obj)
 endef