Changeset 353 for trunk/kBuild/tools
- Timestamp:
- Dec 12, 2005, 4:36:07 AM (20 years ago)
- Location:
- trunk/kBuild/tools
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/kBuild/tools/ALP.kmk
r301 r353 57 57 define TOOL_ALP_COMPILE_AS 58 58 #$ (warning dbg: TOOL_ALP_COMPILE_AS: target=$(target) source=$(source) obj=$(obj) dep=$(dep) flags=$(flags) defs=$(defs) incs=$(incs) dirdep=$(dirdep) outbase=$(outbase) objsuff=$(objsuff) deps=$(deps)) 59 $(obj) : $(deps) $(source) | $(dirdep)59 $(obj) $(outbase).lst: $(deps) $(source) | $(dirdep) 60 60 $(call MSG_L2,Compiling $$@ using ALP) 61 61 $(TOOL_ALP_AS) \ … … 69 69 endef 70 70 71 -
trunk/kBuild/tools/GCC.kmk
r300 r353 4 4 # kBuild Tool Config - Generic GCC. 5 5 # 6 # Copyright (c) 2004 knut st. osmundsen <bird-srcspam@anduin.net>6 # Copyright (c) 2004-2005 knut st. osmundsen <bird-srcspam@anduin.net> 7 7 # 8 8 # … … 139 139 ## Link program 140 140 # @param $(target) Normalized main target name. 141 # @param $( exe) Program name.141 # @param $(out) Program name. 142 142 # @param $(objs) Object files to link together. 143 143 # @param $(libs) Libraries to search. … … 152 152 # @param $(outbase) Output basename (full). Use this for list files and such. 153 153 define TOOL_GCC_LINK_PROGRAM 154 #$ (warning dbg: TOOL_GCC_LINK_PROGRAM: target=$(target) exe=$(exe) objs=$(objs) libs=$(libs) deps=$(deps) flags=$(flags) dirdep=$(dirdep) deffile=$(deffile) outbase=$(outbase))155 $( exe): $(deps) $(objs) $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) | $(dirdep)154 #$ (warning dbg: TOOL_GCC_LINK_PROGRAM: target=$(target) out=$(out) objs=$(objs) libs=$(libs) deps=$(deps) flags=$(flags) dirdep=$(dirdep) deffile=$(deffile) outbase=$(outbase)) 155 $(out): $(deps) $(objs) $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) | $(dirdep) 156 156 $(call MSG_L1,Creating Program $$@) 157 157 ifneq ($(custom_pre),) … … 167 167 168 168 169 ## Link program169 ## Link DLL 170 170 # @param $(target) Normalized main target name. 171 # @param $( exe) Program name.171 # @param $(out) Program name. 172 172 # @param $(objs) Object files to link together. 173 173 # @param $(libs) Libraries to search. … … 182 182 # @param $(outbase) Output basename (full). Use this for list files and such. 183 183 define TOOL_GCC_LINK_DLL 184 #$ (warning dbg: TOOL_GCC_LINK_DLL: target=$(target) exe=$(exe) objs=$(objs) libs=$(libs) deps=$(deps) flags=$(flags) dirdep=$(dirdep) deffile=$(deffile) outbase=$(outbase))185 $( exe): $(deps) $(objs) $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) | $(dirdep)184 #$ (warning dbg: TOOL_GCC_LINK_DLL: target=$(target) out=$(out) objs=$(objs) libs=$(libs) deps=$(deps) flags=$(flags) dirdep=$(dirdep) deffile=$(deffile) outbase=$(outbase)) 185 $(out): $(deps) $(objs) $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) | $(dirdep) 186 186 $(call MSG_L1,Creating Program $$@) 187 187 ifneq ($(custom_pre),) … … 189 189 endif 190 190 $(TOOL_GCC_LD) $(TOOL_GCC_LDFLAGS.dll) $(flags) -o $$@ $(objs) \ 191 $(foreach lib,$(libs), $(if $(findstring $(lib),$(subst /,x,$(lib))), -l$(patsubst lib%,%,$(basename $(lib))), $(lib)))191 $(foreach lib,$(libs), $(if $(findstring $(lib),$(subst /,x,$(lib))), -l$(patsubst lib%,%,$(basename $(lib))), $(lib))) 192 192 ifneq ($(custom_post),) 193 193 $(eval $(custom_post)) -
trunk/kBuild/tools/GCC3.kmk
r337 r353 4 4 # kBuild Tool Config - Generic GCC. 5 5 # 6 # Copyright (c) 2004 knut st. osmundsen <bird-srcspam@anduin.net>6 # Copyright (c) 2004-2005 knut st. osmundsen <bird-srcspam@anduin.net> 7 7 # 8 8 # … … 146 146 define TOOL_GCC3_LINK_LIBRARY_ADDMOD 147 147 148 echo "ADDMOD $(o)" >> $ $@.ar-script148 echo "ADDMOD $(o)" >> $(lib).ar-script 149 149 endef 150 150 … … 153 153 $(MKDIR) -p $(dir $(outbase))ar.extract/$(notdir $(srclib)) 154 154 cd $(dir $(outbase))ar.extract/$(notdir $(srclib)) && $(TOOL_GCC3_AR) x $(srclib) 155 for o in `$(TOOL_GCC3_AR) t $(srclib)`; do echo "ADDMOD $(dir $(outbase))ar.extract/$(notdir $(srclib))/$$$${o}" >> $ $@.ar-script; done155 for o in `$(TOOL_GCC3_AR) t $(srclib)`; do echo "ADDMOD $(dir $(outbase))ar.extract/$(notdir $(srclib))/$$$${o}" >> $(lib).ar-script; done 156 156 endef 157 157 … … 162 162 $(RM) -f $$@ 163 163 ifneq ($(strip $(filter %.a %.lib,$(othersrc))),) 164 echo "CREATE $$@" > $ $@.ar-script164 echo "CREATE $$@" > $(lib).ar-script 165 165 $(foreach o, $(objs),$(TOOL_GCC3_LINK_LIBRARY_ADDMOD)) 166 166 $(foreach srclib, $(filter %.a %.lib,$(othersrc)),$(TOOL_GCC3_LINK_LIBRARY_EXPAND_LIB)) 167 echo "SAVE" >> $ $@.ar-script168 echo "END" >> $ $@.ar-script169 $(TOOL_GCC3_AR) -M < $ $@.ar-script167 echo "SAVE" >> $(lib).ar-script 168 echo "END" >> $(lib).ar-script 169 $(TOOL_GCC3_AR) -M < $(lib).ar-script 170 170 $(RM) -Rf "$(dir $(outbase))ar.extract/" 171 172 _OUT_FILES += $(lib).ar-script 171 173 else 172 174 $(TOOL_GCC3_AR) $(flags) $$@ $(objs) … … 178 180 ## Link program 179 181 # @param $(target) Normalized main target name. 180 # @param $( exe) Program name.182 # @param $(out) Program name. 181 183 # @param $(objs) Object files to link together. 182 184 # @param $(libs) Libraries to search. … … 191 193 # @param $(outbase) Output basename (full). Use this for list files and such. 192 194 define TOOL_GCC3_LINK_PROGRAM 193 #$ (warning dbg: TOOL_GCC3_LINK_PROGRAM: target=$(target) exe=$(exe) objs=$(objs) libs=$(libs) deps=$(deps) flags=$(flags) dirdep=$(dirdep) deffile=$(deffile) outbase=$(outbase))194 $( exe): $(deps) $(objs) $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) | $(dirdep)195 #$ (warning dbg: TOOL_GCC3_LINK_PROGRAM: target=$(target) out=$(out) objs=$(objs) libs=$(libs) deps=$(deps) flags=$(flags) dirdep=$(dirdep) deffile=$(deffile) outbase=$(outbase)) 196 $(out) $(outbase).map: $(deps) $(objs) $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) | $(dirdep) 195 197 $(call MSG_L1,Creating Program $$@) 196 198 ifneq ($(custom_pre),) … … 212 214 ## Link DLL 213 215 # @param $(target) Normalized main target name. 214 # @param $( dll) Program name.216 # @param $(out) Program name. 215 217 # @param $(objs) Object files to link together. 216 218 # @param $(libs) Libraries to search. … … 225 227 # @param $(outbase) Output basename (full). Use this for list files and such. 226 228 define TOOL_GCC3_LINK_DLL 227 #$ (warning dbg: TOOL_GCC3_LINK_PROGRAM: target=$(target) dll=$(dll) objs=$(objs) libs=$(libs) deps=$(deps) flags=$(flags) dirdep=$(dirdep) deffile=$(deffile) outbase=$(outbase))228 $( dll): $(deps) $(objs) $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) | $(dirdep)229 #$ (warning dbg: TOOL_GCC3_LINK_PROGRAM: target=$(target) out=$(out) objs=$(objs) libs=$(libs) deps=$(deps) flags=$(flags) dirdep=$(dirdep) deffile=$(deffile) outbase=$(outbase)) 230 $(out) $(outbase).map: $(deps) $(objs) $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) | $(dirdep) 229 231 $(call MSG_L1,Creating Program $$@) 230 232 ifneq ($(custom_pre),) … … 233 235 $(RM) -f $$@ 234 236 $(TOOL_GCC3_LD) $(TOOL_GCC3_LDFLAGS.dll) $(flags) -o $$@ \ 235 $(if $(filter-out win32 os2, $(BUILD_TARGET)),$(call TOOL_GCC3_LD_SONAME,$(target),$( dll))) \237 $(if $(filter-out win32 os2, $(BUILD_TARGET)),$(call TOOL_GCC3_LD_SONAME,$(target),$(out))) \ 236 238 $(objs) \ 237 239 $(foreach p,$(libpath), -L$(p)) \ … … 247 249 ## Link system module (windows aka driver, linux aka kernel module) 248 250 # @param $(target) Normalized main target name. 249 # @param $( sys) System module name.251 # @param $(out) System module name. 250 252 # @param $(objs) Object files to link together. 251 253 # @param $(libs) Libraries to search. … … 260 262 # @param $(outbase) Output basename (full). Use this for list files and such. 261 263 define TOOL_GCC3_LINK_SYSMOD 262 #$ (warning dbg: TOOL_GCC3_LINK_SYSMOD: target=$(target) sys=$(sys) objs=$(objs) libs=$(libs) deps=$(deps) flags=$(flags) dirdep=$(dirdep) othersrc=$(othersrc) outbase=$(outbase))263 $( sys): $(deps) $(objs) $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) | $(dirdep)264 #$ (warning dbg: TOOL_GCC3_LINK_SYSMOD: target=$(target) out=$(out) objs=$(objs) libs=$(libs) deps=$(deps) flags=$(flags) dirdep=$(dirdep) othersrc=$(othersrc) outbase=$(outbase)) 265 $(out) $(outbase).map: $(deps) $(objs) $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) | $(dirdep) 264 266 $(call MSG_L1,Creating Program $$@) 265 267 ifneq ($(custom_pre),) -
trunk/kBuild/tools/GCC3OMF.kmk
r337 r353 4 4 # kBuild Tool Config - OS/2 GCC v3 OMF. 5 5 # 6 # Copyright (c) 2004 knut st. osmundsen <bird-srcspam@anduin.net>6 # Copyright (c) 2004-2005 knut st. osmundsen <bird-srcspam@anduin.net> 7 7 # 8 8 # … … 149 149 ## Link program 150 150 # @param $(target) Normalized main target name. 151 # @param $( exe) Program name.151 # @param $(out) Program name. 152 152 # @param $(objs) Object files to link together. 153 153 # @param $(libs) Libraries to search. … … 162 162 # @param $(outbase) Output basename (full). Use this for list files and such. 163 163 define TOOL_GCC3OMF_LINK_PROGRAM 164 #$ (warning dbg: TOOL_GCC3OMF_LINK_PROGRAM: target=$(target) exe=$(exe) objs=$(objs) libs=$(libs) deps=$(deps) flags=$(flags) dirdep=$(dirdep) deffile=$(deffile) outbase=$(outbase))165 $( exe): $(deps) $(objs) $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(filter %.def, $(othersrc)) | $(dirdep)164 #$ (warning dbg: TOOL_GCC3OMF_LINK_PROGRAM: target=$(target) out=$(out) objs=$(objs) libs=$(libs) deps=$(deps) flags=$(flags) dirdep=$(dirdep) deffile=$(deffile) outbase=$(outbase)) 165 $(out) $(outbase).map: $(deps) $(objs) $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(filter %.def, $(othersrc)) | $(dirdep) 166 166 $(call MSG_L1,Creating Program $$@) 167 167 ifneq ($(custom_pre),) … … 183 183 ## Link DLL 184 184 # @param $(target) Normalized main target name. 185 # @param $( dll) Program name.185 # @param $(out) Program name. 186 186 # @param $(objs) Object files to link together. 187 187 # @param $(libs) Libraries to search. … … 196 196 # @param $(outbase) Output basename (full). Use this for list files and such. 197 197 define TOOL_GCC3OMF_LINK_DLL 198 #$ (warning dbg: TOOL_GCC3OMF_LINK_PROGRAM: target=$(target) dll=$(dll) objs=$(objs) libs=$(libs) deps=$(deps) flags=$(flags) dirdep=$(dirdep) deffile=$(deffile) outbase=$(outbase))199 $( dll): $(deps) $(objs) $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(filter %.def, $(othersrc)) | $(dirdep)198 #$ (warning dbg: TOOL_GCC3OMF_LINK_PROGRAM: target=$(target) out=$(out) objs=$(objs) libs=$(libs) deps=$(deps) flags=$(flags) dirdep=$(dirdep) deffile=$(deffile) outbase=$(outbase)) 199 $(out) $(outbase).map: $(deps) $(objs) $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(filter %.def, $(othersrc)) | $(dirdep) 200 200 $(call MSG_L1,Creating Program $$@) 201 201 ifneq ($(custom_pre),) … … 216 216 ## Link system module (windows aka driver, linux aka kernel module) 217 217 # @param $(target) Normalized main target name. 218 # @param $( sys) System module name.218 # @param $(out) System module name. 219 219 # @param $(objs) Object files to link together. 220 220 # @param $(libs) Libraries to search. … … 229 229 # @param $(outbase) Output basename (full). Use this for list files and such. 230 230 define TOOL_GCC3OMF_LINK_SYSMOD 231 #$ (warning dbg: TOOL_GCC3OMF_LINK_SYSMOD: target=$(target) sys=$(sys) objs=$(objs) libs=$(libs) deps=$(deps) flags=$(flags) dirdep=$(dirdep) othersrc=$(othersrc) outbase=$(outbase))232 $( sys): $(deps) $(objs) $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(filter %.def, $(othersrc)) | $(dirdep)231 #$ (warning dbg: TOOL_GCC3OMF_LINK_SYSMOD: target=$(target) out=$(out) objs=$(objs) libs=$(libs) deps=$(deps) flags=$(flags) dirdep=$(dirdep) othersrc=$(othersrc) outbase=$(outbase)) 232 $(out) $(outbase).map: $(deps) $(objs) $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(filter %.def, $(othersrc)) | $(dirdep) 233 233 $(call MSG_L1,Creating Program $$@) 234 234 ifneq ($(custom_pre),) -
trunk/kBuild/tools/MINGW32.kmk
r300 r353 4 4 # kBuild Tool Config - MINGW32 GCC. 5 5 # 6 # Copyright (c) 2004 knut st. osmundsen <bird-srcspam@anduin.net>6 # Copyright (c) 2004-2005 knut st. osmundsen <bird-srcspam@anduin.net> 7 7 # 8 8 # … … 150 150 ## Link library 151 151 # @param $(target) Normalized main target name. 152 # @param $(lib) 152 # @param $(lib) Library name. 153 153 # @param $(objs) Object files to put in the library. 154 154 # @param $(flags) Flags. 155 155 # @param $(dirdep) Directory creation dependency. 156 # @param $(deps) 156 # @param $(deps) Other dependencies. 157 157 # 158 158 # @param $(outbase) Output basename (full). Use this for list files and such. … … 169 169 ## Link program 170 170 # @param $(target) Normalized main target name. 171 # @param $( exe)Program name.171 # @param $(out) Program name. 172 172 # @param $(objs) Object files to link together. 173 173 # @param $(libs) Libraries to search. … … 175 175 # @param $(flags) Flags. 176 176 # @param $(dirdep) Directory creation dependency. 177 # @param $(deps) 178 # @param $(othersrc) Unhandled sources.177 # @param $(deps) Other dependencies. 178 # @param $(othersrc) Unhandled sources. 179 179 # @param $(custom_pre) Custom step invoked before linking. 180 180 # @param $(custom_post) Custom step invoked after linking. … … 182 182 # @param $(outbase) Output basename (full). Use this for list files and such. 183 183 define TOOL_MINGW32_LINK_PROGRAM 184 #$ (warning dbg: TOOL_MINGW32_LINK_PROGRAM: target=$(target) exe=$(exe) objs=$(objs) libs=$(libs) deps=$(deps) flags=$(flags) dirdep=$(dirdep) deffile=$(deffile) outbase=$(outbase))185 $( exe): $(deps) $(objs) $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) | $(dirdep)184 #$ (warning dbg: TOOL_MINGW32_LINK_PROGRAM: target=$(target) out=$(out) objs=$(objs) libs=$(libs) deps=$(deps) flags=$(flags) dirdep=$(dirdep) deffile=$(deffile) outbase=$(outbase)) 185 $(out): $(deps) $(objs) $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) | $(dirdep) 186 186 $(call MSG_L1,Creating Program $$@) 187 187 ifneq ($(custom_pre),) … … 198 198 199 199 200 ## Link system module (windows aka driver, linux aka kernel module)201 # @param $(target) Normalized main target name. 202 # @param $( dll) System modulename.200 ## Link DLL. 201 # @param $(target) Normalized main target name. 202 # @param $(out) DLL name. 203 203 # @param $(objs) Object files to link together. 204 204 # @param $(libs) Libraries to search. … … 206 206 # @param $(flags) Flags. 207 207 # @param $(dirdep) Directory creation dependency. 208 # @param $(deps) 209 # @param $(othersrc) Unhandled sources.208 # @param $(deps) Other dependencies. 209 # @param $(othersrc) Unhandled sources. 210 210 # @param $(custom_pre) Custom step invoked before linking. 211 211 # @param $(custom_post) Custom step invoked after linking. … … 213 213 # @param $(outbase) Output basename (full). Use this for list files and such. 214 214 define TOOL_MINGW32_LINK_DLL 215 #$ (warning dbg: TOOL_MINGW32_LINK_DLL: target=$(target) dll=$(dll) objs=$(objs) libs=$(libs) deps=$(deps) flags=$(flags) dirdep=$(dirdep) othersrc=$(othersrc) outbase=$(outbase)) 216 $(dll): $(deps) $(call DIRDEP,$(PATH_LIB)) $(objs) $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) | $(dirdep) 215 #$ (warning dbg: TOOL_MINGW32_LINK_DLL: target=$(target) out=$(out) objs=$(objs) libs=$(libs) deps=$(deps) flags=$(flags) dirdep=$(dirdep) othersrc=$(othersrc) outbase=$(outbase)) 216 $(out) $(outbase).a $(outbase).exp: \ 217 $(deps) $(call DIRDEP,$(PATH_LIB)) $(objs) $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) | $(dirdep) 217 218 $(call MSG_L1,Creating Program $$@) 218 219 ifneq ($(custom_pre),) … … 220 221 endif 221 222 $(TOOL_MINGW32_DLLWRAP) $(flags) \ 222 --dllname=$( dll) \223 --dllname=$(out) \ 223 224 --output-exp=$(outbase).exp \ 224 225 --output-lib=$(outbase).a \ … … 234 235 $(eval $(custom_post)) 235 236 endif 236 _OUT_FILES += $(outbase). map $(outbase).a $(outbase).exp237 238 endef 239 237 _OUT_FILES += $(outbase).a $(outbase).exp 238 239 endef 240 -
trunk/kBuild/tools/NASM.kmk
r300 r353 4 4 # kBuild Tool Config - NASM 0.98 or later. 5 5 # 6 # Copyright (c) 2004 knut st. osmundsen <bird-srcspam@anduin.net>6 # Copyright (c) 2004-2005 knut st. osmundsen <bird-srcspam@anduin.net> 7 7 # 8 8 # … … 57 57 define TOOL_NASM_COMPILE_AS 58 58 #$ (warning dbg: TOOL_NASM_COMPILE_AS: target=$(target) source=$(source) obj=$(obj) dep=$(dep) flags=$(flags) defs=$(defs) incs=$(incs) dirdep=$(dirdep) outbase=$(outbase) objsuff=$(objsuff) deps=$(deps)) 59 $(obj) : $(deps) $(source) | $(dirdep)59 $(obj) $(outbase).lst: $(deps) $(source) | $(dirdep) 60 60 $(call MSG_L2,Compiling $$@ using NASM) 61 61 $(TOOL_NASM_AS) \ … … 68 68 endef 69 69 70 -
trunk/kBuild/tools/VCC70.kmk
r339 r353 4 4 # kBuild Tool Config - Visual C++ 7.0 (aka Visual .NET) 5 5 # 6 # Copyright (c) 2004 knut st. osmundsen <bird-srcspam@anduin.net>6 # Copyright (c) 2004-2005 knut st. osmundsen <bird-srcspam@anduin.net> 7 7 # 8 8 # … … 84 84 define TOOL_VCC70_COMPILE_C 85 85 #$ (warning dbg: TOOL_VCC70_COMPILE_C: target=$(target) source=$(source) obj=$(obj) dep=$(dep) flags=$(flags) defs=$(defs) incs=$(incs) dirdep=$(dirdep) outbase=$(outbase) objsuff=$(objsuff)) 86 $(obj) : $(deps) $(source) | $(dirdep)86 $(obj) $(call TOOL_VCC70_PDB, $(outbase)-obj): $(deps) $(source) | $(dirdep) 87 87 $(call MSG_L2,Compiling $$@ using VCC70) 88 88 $(TOOL_VCC70_CC) -c\ 89 89 $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ 90 -Fd$(outbase) .pdb \90 -Fd$(outbase)-obj.pdb \ 91 91 -Fo$(obj)\ 92 92 $(subst /,\\,$(call ABSPATH,$(source))) … … 95 95 $(subst /,\\,$(call ABSPATH,$(source)))\ 96 96 | $(DEP_PRE) -f -s -o $(dep) -t $(obj) - 97 _OUT_FILES += $(call TOOL_VCC70_PDB, $(outbase) )97 _OUT_FILES += $(call TOOL_VCC70_PDB, $(outbase)-obj) 98 98 99 99 endef … … 115 115 define TOOL_VCC70_COMPILE_CXX 116 116 #$ (warning dbg: TOOL_VCC70_COMPILE_CXX: target=$(target) source=$(source) obj=$(obj) dep=$(dep) flags=$(flags) defs=$(defs) incs=$(incs) dirdep=$(dirdep) outbase=$(outbase) objsuff=$(objsuff)) 117 $(obj) : $(deps) $(source) | $(dirdep)117 $(obj) $(call TOOL_VCC70_PDB, $(outbase)-obj): $(deps) $(source) | $(dirdep) 118 118 $(call MSG_L2,Compiling $$@ using VCC70) 119 119 $(TOOL_VCC70_CXX) -c\ 120 120 $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ 121 -Fd$(outbase) .pdb \121 -Fd$(outbase)-obj.pdb \ 122 122 -Fo$(obj)\ 123 123 $(subst /,\\,$(call ABSPATH,$(source))) … … 126 126 $(subst /,\\,$(call ABSPATH,$(source)))\ 127 127 | $(DEP_PRE) -f -s -o $(dep) -t $(obj) - 128 _OUT_FILES += $(call TOOL_VCC70_PDB, $(outbase) )128 _OUT_FILES += $(call TOOL_VCC70_PDB, $(outbase)-obj) 129 129 130 130 endef … … 143 143 define TOOL_VCC70_LINK_LIBRARY 144 144 #$ (warning dbg: TOOL_VCC70_LINK_LIBRARY: target=$(target) lib=$(lib) objs=$(objs) deps=$(deps) flags=$(flags) dirdep=$(dirdep) outbase=$(outbase)) 145 $(lib) : $(deps) $(objs) $(othersrc) | $(dirdep)145 $(lib) $(outbase).lst $(outbase).exp $(call TOOL_VCC70_PDB, $(outbase)): $(deps) $(objs) $(othersrc) | $(dirdep) 146 146 $(call MSG_L1,Creating Library $$@) 147 147 $(RM) -f $$@ … … 155 155 ## Link program 156 156 # @param $(target) Normalized main target name. 157 # @param $( exe) Program name.157 # @param $(out) Program name. 158 158 # @param $(objs) Object files to link together. 159 159 # @param $(libs) Libraries to search. … … 168 168 # @param $(outbase) Output basename (full). Use this for list files and such. 169 169 define TOOL_VCC70_LINK_PROGRAM 170 #$ (warning dbg: TOOL_VCC70_LINK_PROGRAM: target=$(target) exe=$(exe) objs=$(objs) libs=$(libs) deps=$(deps) flags=$(flags) dirdep=$(dirdep) othersrc=$(othersrc) outbase=$(outbase)) 171 $(exe): $(deps) $(objs) $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc) | $(dirdep) 170 #$ (warning dbg: TOOL_VCC70_LINK_PROGRAM: target=$(target) out=$(out) objs=$(objs) libs=$(libs) deps=$(deps) flags=$(flags) dirdep=$(dirdep) othersrc=$(othersrc) outbase=$(outbase)) 171 $(out) $(outbase).map $(outbase).lib $(outbase).exp $(call TOOL_VCC70_PDB, $(outbase)) $(outbase).ilk: \ 172 $(deps) $(objs) $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc) | $(dirdep) 172 173 $(call MSG_L1,Creating Program $$@) 173 174 ifneq ($(custom_pre),) … … 175 176 endif 176 177 $(TOOL_VCC70_LD) $(flags) \ 177 /OUT:$( exe) \178 /OUT:$(out) \ 178 179 /MAPINFO:EXPORTS /MAPINFO:LINES \ 179 180 /MAP:$(outbase).map \ … … 193 194 ## Link system module (windows aka driver, linux aka kernel module) 194 195 # @param $(target) Normalized main target name. 195 # @param $( sys) System module name.196 # @param $(out) System module name. 196 197 # @param $(objs) Object files to link together. 197 198 # @param $(libs) Libraries to search. … … 206 207 # @param $(outbase) Output basename (full). Use this for list files and such. 207 208 define TOOL_VCC70_LINK_SYSMOD 208 #$ (warning dbg: TOOL_VCC70_LINK_SYSMOD: target=$(target) sys=$(sys) objs=$(objs) libs=$(libs) deps=$(deps) flags=$(flags) dirdep=$(dirdep) othersrc=$(othersrc) outbase=$(outbase)) 209 $(sys): $(deps) $(objs) $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc) | $(dirdep) 209 #$ (warning dbg: TOOL_VCC70_LINK_SYSMOD: target=$(target) out=$(out) objs=$(objs) libs=$(libs) deps=$(deps) flags=$(flags) dirdep=$(dirdep) othersrc=$(othersrc) outbase=$(outbase)) 210 $(out) $(outbase).map $(outbase).lib $(outbase).exp $(call TOOL_VCC70_PDB, $(outbase)) $(outbase).ilk: \ 211 $(deps) $(objs) $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc) | $(dirdep) 210 212 $(call MSG_L1,Creating Program $$@) 211 213 ifneq ($(custom_pre),) … … 213 215 endif 214 216 $(TOOL_VCC70_LD) $(flags) \ 215 /OUT:$( sys) \217 /OUT:$(out) \ 216 218 /MAPINFO:EXPORTS /MAPINFO:LINES \ 217 219 /MAP:$(outbase).map \ … … 229 231 230 232 231 ## Link system module (windows aka driver, linux aka kernel module)232 # @param $(target) Normalized main target name. 233 # @param $( dll) System modulename.233 ## Link DLL. 234 # @param $(target) Normalized main target name. 235 # @param $(out) DLL name. 234 236 # @param $(objs) Object files to link together. 235 237 # @param $(libs) Libraries to search. … … 237 239 # @param $(flags) Flags. 238 240 # @param $(dirdep) Directory creation dependency. 239 # @param $(deps) 240 # @param $(othersrc) Unhandled sources.241 # @param $(deps) Other dependencies. 242 # @param $(othersrc) Unhandled sources. 241 243 # @param $(custom_pre) Custom step invoked before linking. 242 244 # @param $(custom_post) Custom step invoked after linking. … … 244 246 # @param $(outbase) Output basename (full). Use this for list files and such. 245 247 define TOOL_VCC70_LINK_DLL 246 #$ (warning dbg: TOOL_VCC70_LINK_DLL: target=$(target) dll=$(dll) objs=$(objs) libs=$(libs) deps=$(deps) flags=$(flags) dirdep=$(dirdep) othersrc=$(othersrc) outbase=$(outbase)) 247 $(dll): $(deps) $(call DIRDEP,$(PATH_LIB)) $(objs) $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc) | $(dirdep) 248 #$ (warning dbg: TOOL_VCC70_LINK_DLL: target=$(target) out=$(out) objs=$(objs) libs=$(libs) deps=$(deps) flags=$(flags) dirdep=$(dirdep) othersrc=$(othersrc) outbase=$(outbase)) 249 $(out) $(outbase).map $(outbase).lib $(outbase).exp $(call TOOL_VCC70_PDB, $(outbase)) $(outbase).ilk: \ 250 $(deps) $(call DIRDEP,$(PATH_LIB)) $(objs) $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc) | $(dirdep) 248 251 $(call MSG_L1,Creating Program $$@) 249 252 ifneq ($(custom_pre),) … … 251 254 endif 252 255 $(TOOL_VCC70_LD) $(flags) \ 253 /OUT:$( dll) \256 /OUT:$(out) \ 254 257 /IMPLIB:$(outbase).lib \ 255 258 /MAPINFO:EXPORTS /MAPINFO:LINES \
Note:
See TracChangeset
for help on using the changeset viewer.