VirtualBox

Changeset 2735 in kBuild


Ignore:
Timestamp:
Dec 9, 2014 3:35:45 PM (10 years ago)
Author:
bird
Message:

cross build adjustments.

Location:
trunk/kBuild
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/kBuild/sdks/WINPSDK.kmk

    r2602 r2735  
    9292        $(PATH_SDK_WINPSDK_LIB.x86)/Gdi32.Lib \
    9393        $(PATH_SDK_WINPSDK_LIB.x86)/AdvAPI32.Lib \
    94         $(PATH_SDK_WINPSDK_LIB.x86)/Shell32.Lib \
     94        $(PATH_SDK_WINPSDK_LIB.x86)/shell32.lib \
    9595        $(PATH_SDK_WINPSDK_LIB.x86)/ShLwApi.Lib \
    9696        $(PATH_SDK_WINPSDK_LIB.x86)/SetupAPI.Lib \

  • trunk/kBuild/sdks/WINPSDK71.kmk

    r2602 r2735  
    9292        $(PATH_SDK_WINPSDK71_LIB.x86)/Gdi32.Lib \
    9393        $(PATH_SDK_WINPSDK71_LIB.x86)/AdvAPI32.Lib \
    94         $(PATH_SDK_WINPSDK71_LIB.x86)/Shell32.Lib \
     94        $(PATH_SDK_WINPSDK71_LIB.x86)/shell32.lib \
    9595        $(PATH_SDK_WINPSDK71_LIB.x86)/ShLwApi.Lib \
    9696        $(PATH_SDK_WINPSDK71_LIB.x86)/SetupAPI.Lib \

  • trunk/kBuild/tools/VCC100.kmk

    r2726 r2735  
    330330                $(foreach p,$(libpath), /LIBPATH:$(p)) \
    331331                @$(outbase).rsp
     332ifndef TOOL_VCC100_NO_AUTO_MANIFEST
    332333        $(QUIET)$(TEST) -f $(out).manifest -- \
    333334                $(TOOL_VCC100_MT) -manifest $(subst /,\\,$(out)).manifest -outputresource:$(subst /,\\,$(out))
     335endif
    334336endef
    335337
    … …  
    371373                $(foreach p,$(libpath), /LIBPATH:$(p)) \
    372374                @$(outbase).rsp
     375ifndef TOOL_VCC100_NO_AUTO_MANIFEST
    373376        $(QUIET)$(TEST) -f $(out).manifest -- \
    374377                $(TOOL_VCC100_MT) -manifest $(subst /,\\,$(out)).manifest '-outputresource:$(subst /,\\,$(out));#2'
     378endif
    375379        $(QUIET)$(CP) --changed --ignore-non-existing $(outbase).exp $(outbase).lib $(PATH_STAGE_LIB)/
    376380$(eval _DIRS += $(PATH_STAGE_LIB))
    … …  
    412416                $(foreach p,$(libpath), /LIBPATH:$(p)) \
    413417                @$(outbase).rsp
     418ifndef TOOL_VCC100_NO_AUTO_MANIFEST
    414419        $(QUIET)$(TEST) -f $(out).manifest -- \
    415420                $(TOOL_VCC100_MT) -manifest $(subst /,\\,$(out)).manifest '-outputresource:$(subst /,\\,$(out));#2'
    416 endef
    417 
     421endif
     422endef
     423

  • trunk/kBuild/tools/VCC100AMD64.kmk

    r2726 r2735  
    307307                $(foreach p,$(libpath), /LIBPATH:$(p)) \
    308308                @$(outbase).rsp
     309ifndef TOOL_VCC100AMD64_NO_AUTO_MANIFEST
    309310        $(QUIET)$(TEST) -f $(out).manifest -- \
    310311                $(TOOL_VCC100AMD64_MT) -manifest $(subst /,\\,$(out)).manifest -outputresource:$(subst /,\\,$(out))
     312endif
    311313endef
    312314
    … …  
    348350                $(foreach p,$(libpath), /LIBPATH:$(p)) \
    349351                @$(outbase).rsp
     352ifndef TOOL_VCC100AMD64_NO_AUTO_MANIFEST
    350353        $(QUIET)$(TEST) -f $(out).manifest -- \
    351354                $(TOOL_VCC100AMD64_MT) -manifest $(subst /,\\,$(out)).manifest '-outputresource:$(subst /,\\,$(out));#2'
     355endif
    352356        $(QUIET)$(CP) --changed --ignore-non-existing $(outbase).exp $(outbase).lib $(PATH_STAGE_LIB)/
    353357$(eval _DIRS += $(PATH_STAGE_LIB))
    … …  
    389393                $(foreach p,$(libpath), /LIBPATH:$(p)) \
    390394                @$(outbase).rsp
     395ifndef TOOL_VCC100AMD64_NO_AUTO_MANIFEST
    391396        $(QUIET)$(TEST) -f $(out).manifest -- \
    392397                $(TOOL_VCC100AMD64_MT) -manifest $(subst /,\\,$(out)).manifest '-outputresource:$(subst /,\\,$(out));#2'
    393 endef
    394 
     398endif
     399endef
     400

  • trunk/kBuild/tools/VCC100X86.kmk

    r2726 r2735  
    308308                $(foreach p,$(libpath), /LIBPATH:$(p)) \
    309309                @$(outbase).rsp
     310ifndef TOOL_VCC100X86_NO_AUTO_MANIFEST
    310311        $(QUIET)$(TEST) -f $(out).manifest -- \
    311312                $(TOOL_VCC100X86_MT) -manifest $(subst /,\\,$(out)).manifest -outputresource:$(subst /,\\,$(out))
     313endif
    312314endef
    313315
    … …  
    349351                $(foreach p,$(libpath), /LIBPATH:$(p)) \
    350352                @$(outbase).rsp
     353ifndef TOOL_VCC100X86_NO_AUTO_MANIFEST
    351354        $(QUIET)$(TEST) -f $(out).manifest -- \
    352355                $(TOOL_VCC100X86_MT) -manifest $(subst /,\\,$(out)).manifest '-outputresource:$(subst /,\\,$(out));#2'
     356endif
    353357        $(QUIET)$(CP) --changed --ignore-non-existing $(outbase).exp $(outbase).lib $(PATH_STAGE_LIB)/
    354358$(eval _DIRS += $(PATH_STAGE_LIB))
    … …  
    390394                $(foreach p,$(libpath), /LIBPATH:$(p)) \
    391395                @$(outbase).rsp
     396ifndef TOOL_VCC100X86_NO_AUTO_MANIFEST
    392397        $(QUIET)$(TEST) -f $(out).manifest -- \
    393398                $(TOOL_VCC100X86_MT) -manifest $(subst /,\\,$(out)).manifest '-outputresource:$(subst /,\\,$(out));#2'
    394 endef
    395 
     399endif
     400endef
     401
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette