Ticket #109: 004-gcc3omf_add_rc_support.patch
File 004-gcc3omf_add_rc_support.patch, 4.8 KB (added by , 12 years ago) |
---|
-
kBuild/tools/GCC3OMF.kmk
36 36 # Tool Specific Properties 37 37 TOOL_GCC3OMF_CC ?= gcc$(HOSTSUFF_EXE) 38 38 TOOL_GCC3OMF_CXX ?= g++$(HOSTSUFF_EXE) 39 TOOL_GCC3OMF_RC ?= rc$(HOSTSUFF_EXE) 39 40 TOOL_GCC3OMF_AS ?= gcc$(HOSTSUFF_EXE) 40 41 TOOL_GCC3OMF_AR ?= emxomfar$(HOSTSUFF_EXE) 41 42 TOOL_GCC3OMF_AR_IMP ?= emximp$(HOSTSUFF_EXE) … … 73 74 TOOL_GCC3OMF_CXXINCS ?= 74 75 TOOL_GCC3OMF_CXXDEFS ?= 75 76 77 TOOL_GCC3OMF_RCOBJSUFF ?= .res 78 TOOL_GCC3OMF_RCFLAGS ?= -n 79 TOOL_GCC3OMF_RCINCS ?= 80 TOOL_GCC3OMF_RCDEFS ?= 81 76 82 TOOL_GCC3OMF_ASFLAGS ?= -x assembler-with-cpp -Zomf 77 83 TOOL_GCC3OMF_ASFLAGS.debug ?= -g 78 84 TOOL_GCC3OMF_ASFLAGS.profile ?= -g … … 176 182 endif # !KBUILD_USE_KOBJCACHE 177 183 178 184 185 ## Compile resource file. 186 TOOL_GCC3OMF_COMPILE_RC_DEPEND = 187 TOOL_GCC3OMF_COMPILE_RC_DEPORD = 188 TOOL_GCC3OMF_COMPILE_RC_OUTPUT = 189 define TOOL_GCC3OMF_COMPILE_RC_CMDS 190 $(QUIET)cd $(subst /,\\,$(patsubst %/,%,$(dir $(source)))) &&\ 191 $(TOOL_GCC3OMF_RC) -r $(flags)\ 192 $(subst /@unixroot,$(UNIXROOT),$(addprefix -i ,$(incs) $(subst ;, ,$(C_INCLUDE_PATH))))\ 193 $(addprefix -D ,$(defs))\ 194 $(source) $(obj) 195 endef 196 197 179 198 ## Compile Assembly source. 180 199 # @param $(target) Normalized main target name. 181 200 # @param $(source) Source filename (relative). … … 252 271 $(foreach lib,$(libs), $(if $(findstring $(lib),$(subst /,x,$(lib))), -l$(patsubst lib%,%,$(lib)), $(lib)))\ 253 272 -Zmap=$(outbase).map 254 273 $(QUIET)$(TOOL_GCC3OMF_LD) @$(outbase).rsp 274 $(if $(filter %.res,$(objs)), \ 275 $(QUIET)$(TOOL_GCC3OMF_RC) $(filter %.res,$(objs)) $(out)) 255 276 endef 256 277 257 278 … … 283 304 $(foreach lib,$(libs), $(if $(findstring $(lib),$(subst /,x,$(lib))), -l$(patsubst lib%,%,$(lib)), $(lib)))\ 284 305 -Zmap=$(outbase).map 285 306 $(QUIET)$(TOOL_GCC3OMF_LD) @$(outbase).rsp 307 $(if $(filter %.res,$(objs)), \ 308 $(QUIET)$(TOOL_GCC3OMF_RC) $(filter %.res,$(objs)) $(out)) 286 309 endef 287 310 288 311 … … 314 337 $(foreach lib,$(libs), $(if $(findstring $(lib),$(subst /,x,$(lib))), -l$(patsubst lib%,%,$(lib)), $(lib)))\ 315 338 -Zmap=$(outbase).map 316 339 $(QUIET)$(TOOL_GCC3OMF_LD_SYSMOD) @$(outbase).rsp 340 $(if $(filter %.res,$(objs)), \ 341 $(QUIET)$(TOOL_GCC3OMF_RC) $(filter %.res,$(objs)) $(out)) 317 342 endef 318 343 -
kBuild/tools/GXX3OMF.kmk
36 36 # Tool Specific Properties 37 37 TOOL_GXX3OMF_CC ?= gcc$(HOSTSUFF_EXE) 38 38 TOOL_GXX3OMF_CXX ?= g++$(HOSTSUFF_EXE) 39 TOOL_GXX3OMF_RC ?= rc$(HOSTSUFF_EXE) 39 40 TOOL_GXX3OMF_AS ?= gcc$(HOSTSUFF_EXE) 40 41 TOOL_GXX3OMF_AR ?= emxomfar$(HOSTSUFF_EXE) 41 42 TOOL_GXX3OMF_AR_IMP ?= emximp$(HOSTSUFF_EXE) … … 73 74 TOOL_GXX3OMF_CXXINCS ?= 74 75 TOOL_GXX3OMF_CXXDEFS ?= 75 76 77 TOOL_GXX3OMF_RCOBJSUFF ?= .res 78 TOOL_GXX3OMF_RCFLAGS ?= -n 79 TOOL_GXX3OMF_RCINCS ?= 80 TOOL_GXX3OMF_RCDEFS ?= 81 76 82 TOOL_GXX3OMF_ASFLAGS ?= -x assembler-with-cpp -Zomf 77 83 TOOL_GXX3OMF_ASFLAGS.debug ?= -g 78 84 TOOL_GXX3OMF_ASFLAGS.profile ?= -g … … 176 182 endif # !KBUILD_USE_KOBJCACHE 177 183 178 184 185 ## Compile resource file. 186 TOOL_GXX3OMF_COMPILE_RC_DEPEND = 187 TOOL_GXX3OMF_COMPILE_RC_DEPORD = 188 TOOL_GXX3OMF_COMPILE_RC_OUTPUT = 189 define TOOL_GXX3OMF_COMPILE_RC_CMDS 190 $(QUIET)cd $(subst /,\\,$(patsubst %/,%,$(dir $(source)))) &&\ 191 $(TOOL_GXX3OMF_RC) -r $(flags)\ 192 $(subst /@unixroot,$(UNIXROOT),$(addprefix -i ,$(incs) $(subst ;, ,$(C_INCLUDE_PATH))))\ 193 $(addprefix -D ,$(defs))\ 194 $(source) $(obj) 195 endef 196 197 179 198 ## Compile Assembly source. 180 199 # @param $(target) Normalized main target name. 181 200 # @param $(source) Source filename (relative). … … 252 271 $(foreach lib,$(libs), $(if $(findstring $(lib),$(subst /,x,$(lib))), -l$(patsubst lib%,%,$(lib)), $(lib)))\ 253 272 -Zmap=$(outbase).map 254 273 $(QUIET)$(TOOL_GXX3OMF_LD) @$(outbase).rsp 274 $(if $(filter %.res,$(objs)), \ 275 $(QUIET)$(TOOL_GXX3OMF_RC) $(filter %.res,$(objs)) $(out)) 255 276 endef 256 277 257 278 … … 283 304 $(foreach lib,$(libs), $(if $(findstring $(lib),$(subst /,x,$(lib))), -l$(patsubst lib%,%,$(lib)), $(lib)))\ 284 305 -Zmap=$(outbase).map 285 306 $(QUIET)$(TOOL_GXX3OMF_LD) @$(outbase).rsp 307 $(if $(filter %.res,$(objs)), \ 308 $(QUIET)$(TOOL_GXX3OMF_RC) $(filter %.res,$(objs)) $(out)) 286 309 endef 287 310 288 311 … … 314 337 $(foreach lib,$(libs), $(if $(findstring $(lib),$(subst /,x,$(lib))), -l$(patsubst lib%,%,$(lib)), $(lib)))\ 315 338 -Zmap=$(outbase).map 316 339 $(QUIET)$(TOOL_GXX3OMF_LD_SYSMOD) @$(outbase).rsp 340 $(if $(filter %.res,$(objs)), \ 341 $(QUIET)$(TOOL_GXX3OMF_RC) $(filter %.res,$(objs)) $(out)) 317 342 endef 318 343