Changeset 1295 in kBuild
- Timestamp:
- Dec 1, 2007 3:44:33 AM (17 years ago)
- Location:
- trunk/kBuild/tools
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/kBuild/tools/VCC80.kmk
r1288 r1295 264 264 $(subst /,\\,$(objs)) \ 265 265 $(subst /,\\,$(libs)) 266 ifdef KMK_USE_TEST 267 $(QUIET)$(TEST) -f $(out).manifest -- \ 268 $(TOOL_VCC80_MT) -manifest $(subst /,\\,$(out)).manifest -outputresource:$(subst /,\\,$(out)) 269 else 266 270 $(QUIET)if test -f $(out).manifest; then \ 267 271 $(TOOL_VCC80_MT) -manifest $(subst /,\\,$(out)).manifest -outputresource:$(subst /,\\,$(out)); \ 268 272 fi 273 endif 269 274 endef 270 275 … … 300 305 $(subst /,\\,$(objs)) \ 301 306 $(subst /,\\,$(libs)) 307 ifdef KMK_USE_TEST 308 $(QUIET)$(TEST) -f $(out).manifest -- \ 309 $(TOOL_VCC80_MT) -manifest $(subst /,\\,$(out)).manifest "-outputresource:$(subst /,\\,$(out));#2" 310 else 302 311 $(QUIET)if test -f $(out).manifest; then \ 303 312 $(TOOL_VCC80_MT) -manifest $(subst /,\\,$(out)).manifest "-outputresource:$(subst /,\\,$(out));#2"; \ 304 313 fi 314 endif 305 315 ifeq ($(filter %.exp .def,$(othersrc)),) 306 316 ifdef KMK_NEW_CP … … 343 353 $(subst /,\\,$(objs)) \ 344 354 $(subst /,\\,$(libs)) 355 ifdef KMK_USE_TEST 356 $(QUIET)$(TEST) -f $(out).manifest -- \ 357 $(TOOL_VCC80_MT) -manifest $(subst /,\\,$(out)).manifest "-outputresource:$(subst /,\\,$(out));#2"; 358 else 345 359 $(QUIET)if test -f $(out).manifest; then \ 346 360 $(TOOL_VCC80_MT) -manifest $(subst /,\\,$(out)).manifest "-outputresource:$(subst /,\\,$(out));#2"; \ 347 361 fi 348 endef 349 362 endif 363 endef 364 -
trunk/kBuild/tools/VCC80AMD64.kmk
r1288 r1295 241 241 $(subst /,\\,$(objs)) \ 242 242 $(subst /,\\,$(libs)) 243 ifdef KMK_USE_TEST 244 $(QUIET)$(TEST) -f $(out).manifest -- \ 245 $(TOOL_VCC80AMD64_MT) -manifest $(subst /,\\,$(out)).manifest -outputresource:$(subst /,\\,$(out)) 246 else 243 247 $(QUIET)if test -f $(out).manifest; then \ 244 248 $(TOOL_VCC80AMD64_MT) -manifest $(subst /,\\,$(out)).manifest -outputresource:$(subst /,\\,$(out)); \ 245 249 fi 250 endif 246 251 endef 247 252 … … 277 282 $(subst /,\\,$(objs)) \ 278 283 $(subst /,\\,$(libs)) 284 ifdef KMK_USE_TEST 285 $(QUIET)$(TEST) -f $(out).manifest -- \ 286 $(TOOL_VCC80AMD64_MT) -manifest $(subst /,\\,$(out)).manifest "-outputresource:$(subst /,\\,$(out));#2" 287 else 279 288 $(QUIET)if test -f $(out).manifest; then \ 280 289 $(TOOL_VCC80AMD64_MT) -manifest $(subst /,\\,$(out)).manifest "-outputresource:$(subst /,\\,$(out));#2"; \ 281 290 fi 291 endif 282 292 ifeq ($(filter %.exp .def,$(othersrc)),) 283 293 ifdef KMK_NEW_CP … … 320 330 $(subst /,\\,$(objs)) \ 321 331 $(subst /,\\,$(libs)) 332 ifdef KMK_USE_TEST 333 $(QUIET)$(TEST) -f $(out).manifest -- \ 334 $(TOOL_VCC80AMD64_MT) -manifest $(subst /,\\,$(out)).manifest "-outputresource:$(subst /,\\,$(out));#2" 335 else 322 336 $(QUIET)if test -f $(out).manifest; then \ 323 337 $(TOOL_VCC80AMD64_MT) -manifest $(subst /,\\,$(out)).manifest "-outputresource:$(subst /,\\,$(out));#2"; \ 324 338 fi 325 endef 326 339 endif 340 endef 341 -
trunk/kBuild/tools/VCC80X86.kmk
r1288 r1295 243 243 $(subst /,\\,$(objs)) \ 244 244 $(subst /,\\,$(libs)) 245 ifdef KMK_USE_TEST 246 $(QUIET)$(TEST) -f $(out).manifest -- \ 247 $(TOOL_VCC80X86_MT) -manifest $(subst /,\\,$(out)).manifest -outputresource:$(subst /,\\,$(out)) 248 else 245 249 $(QUIET)if test -f $(out).manifest; then \ 246 250 $(TOOL_VCC80X86_MT) -manifest $(subst /,\\,$(out)).manifest -outputresource:$(subst /,\\,$(out)); \ 247 251 fi 252 endif 248 253 endef 249 254 … … 279 284 $(subst /,\\,$(objs)) \ 280 285 $(subst /,\\,$(libs)) 286 ifdef KMK_USE_TEST 287 $(QUIET)$(TEST) -f $(out).manifest -- \ 288 $(TOOL_VCC80X86_MT) -manifest $(subst /,\\,$(out)).manifest "-outputresource:$(subst /,\\,$(out));#2" 289 else 281 290 $(QUIET)if test -f $(out).manifest; then \ 282 291 $(TOOL_VCC80X86_MT) -manifest $(subst /,\\,$(out)).manifest "-outputresource:$(subst /,\\,$(out));#2"; \ 283 292 fi 293 endif 284 294 ifeq ($(filter %.exp .def,$(othersrc)),) 285 295 ifdef KMK_NEW_CP … … 322 332 $(subst /,\\,$(objs)) \ 323 333 $(subst /,\\,$(libs)) 334 ifdef KMK_USE_TEST 335 $(QUIET)$(TEST) -f $(out).manifest -- \ 336 $(TOOL_VCC80X86_MT) -manifest $(subst /,\\,$(out)).manifest "-outputresource:$(subst /,\\,$(out));#2" 337 else 324 338 $(QUIET)if test -f $(out).manifest; then \ 325 339 $(TOOL_VCC80X86_MT) -manifest $(subst /,\\,$(out)).manifest "-outputresource:$(subst /,\\,$(out));#2"; \ 326 340 fi 327 endef 328 341 endif 342 endef 343
Note:
See TracChangeset
for help on using the changeset viewer.