Changeset 42288 in vbox for trunk/Makefile.kmk
- Timestamp:
- Jul 20, 2012 6:30:53 PM (12 years ago)
- File:
-
- 1 edited
-
trunk/Makefile.kmk (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/Makefile.kmk
r42276 r42288 95 95 # The compiler runtime DLLs. 96 96 ifeq ($(KBUILD_TARGET).$(VBOX_WITHOUT_COMPILER_REDIST),win.) 97 ifdef VBOX_USE_VCC100 98 VBOX_PATH_VCC_REDIST = $(PATH_TOOL_$(VBOX_VCC_TOOL))/redist/ 99 VBOX_PATH_VCC_REDIST_CRT = $(VBOX_PATH_VCC_REDIST)/$(subst amd64,x64,$(KBUILD_TARGET_ARCH))/Microsoft.VC100.CRT 100 VBOX_PATH_VCC_REDIST_CRT_DBG = $(VBOX_PATH_VCC_REDIST)/Debug_NonRedist/$(subst amd64,x64,$(KBUILD_TARGET_ARCH))/Microsoft.VC100.DebugCRT 101 InstallExternalLibs_SOURCES += \ 102 $(VBOX_PATH_VCC_REDIST_CRT)/msvcr100.dll \ 103 $(VBOX_PATH_VCC_REDIST_CRT)/msvcp100.dll \ 104 $(VBOX_PATH_VCC_REDIST_CRT)/msvcr100.dll=>testcase/msvcr100.dll \ 105 $(VBOX_PATH_VCC_REDIST_CRT)/msvcp100.dll=>testcase/msvcp100.dll 106 ifeq ($(VBOX_VCC_CRT_TYPE),d) 107 $(VBOX_PATH_VCC_REDIST_CRT_DBG)/msvcr100.dll \ 108 $(VBOX_PATH_VCC_REDIST_CRT_DBG)/msvcp100.dll \ 109 $(VBOX_PATH_VCC_REDIST_CRT_DBG)/msvcr100.dll=>testcase/msvcr100.dll \ 110 $(VBOX_PATH_VCC_REDIST_CRT_DBG)/msvcp100.dll=>testcase/msvcp100.dll 111 endif 97 VBOX_PATH_VCC_REDIST = $(PATH_TOOL_$(VBOX_VCC_TOOL))/redist/ 98 VBOX_PATH_VCC_REDIST_CRT = $(VBOX_PATH_VCC_REDIST)/$(subst amd64,x64,$(KBUILD_TARGET_ARCH))/Microsoft.VC100.CRT 99 VBOX_PATH_VCC_REDIST_CRT_DBG = $(VBOX_PATH_VCC_REDIST)/Debug_NonRedist/$(subst amd64,x64,$(KBUILD_TARGET_ARCH))/Microsoft.VC100.DebugCRT 100 InstallExternalLibs_SOURCES += \ 101 $(VBOX_PATH_VCC_REDIST_CRT)/msvcr$(substr $(VBOX_VCC_TOOL_STEM),4).dll \ 102 $(VBOX_PATH_VCC_REDIST_CRT)/msvcp$(substr $(VBOX_VCC_TOOL_STEM),4).dll \ 103 $(VBOX_PATH_VCC_REDIST_CRT)/msvcr$(substr $(VBOX_VCC_TOOL_STEM),4).dll=>testcase/msvcr$(substr $(VBOX_VCC_TOOL_STEM),4).dll \ 104 $(VBOX_PATH_VCC_REDIST_CRT)/msvcp$(substr $(VBOX_VCC_TOOL_STEM),4).dll=>testcase/msvcp$(substr $(VBOX_VCC_TOOL_STEM),4).dll 105 ifeq ($(VBOX_VCC_CRT_TYPE),d) 106 $(VBOX_PATH_VCC_REDIST_CRT_DBG)/msvcr$(substr $(VBOX_VCC_TOOL_STEM),4).dll \ 107 $(VBOX_PATH_VCC_REDIST_CRT_DBG)/msvcp$(substr $(VBOX_VCC_TOOL_STEM),4).dll \ 108 $(VBOX_PATH_VCC_REDIST_CRT_DBG)/msvcr$(substr $(VBOX_VCC_TOOL_STEM),4).dll=>testcase/msvcr$(substr $(VBOX_VCC_TOOL_STEM),4).dll \ 109 $(VBOX_PATH_VCC_REDIST_CRT_DBG)/msvcp$(substr $(VBOX_VCC_TOOL_STEM),4).dll=>testcase/msvcp$(substr $(VBOX_VCC_TOOL_STEM),4).dll 112 110 endif 113 ifdef VBOX_USE_VCC80 114 include $(KBUILD_PATH)/tools/VCC80X86.kmk 115 include $(KBUILD_PATH)/tools/VCC80AMD64.kmk 116 InstallExternalLibs_SOURCES.x86 += \ 117 $(PATH_TOOL_VCC80X86)/redist/x86/Microsoft.VC80.CRT/Microsoft.VC80.CRT.manifest=>Microsoft.VC80.CRT/Microsoft.VC80.CRT.manifest \ 118 $(PATH_TOOL_VCC80X86)/redist/x86/Microsoft.VC80.CRT/msvcr80.dll=>Microsoft.VC80.CRT/msvcr80.dll \ 119 $(PATH_TOOL_VCC80X86)/redist/x86/Microsoft.VC80.CRT/msvcp80.dll=>Microsoft.VC80.CRT/msvcp80.dll \ 120 $(PATH_TOOL_VCC80X86)/redist/x86/Microsoft.VC80.CRT/Microsoft.VC80.CRT.manifest=>testcase/Microsoft.VC80.CRT/Microsoft.VC80.CRT.manifest \ 121 $(PATH_TOOL_VCC80X86)/redist/x86/Microsoft.VC80.CRT/msvcr80.dll=>testcase/Microsoft.VC80.CRT/msvcr80.dll \ 122 $(PATH_TOOL_VCC80X86)/redist/x86/Microsoft.VC80.CRT/msvcp80.dll=>testcase/Microsoft.VC80.CRT/msvcp80.dll 123 InstallExternalLibs_SOURCES.amd64 += \ 124 $(PATH_TOOL_VCC80AMD64)/redist/amd64/Microsoft.VC80.CRT/Microsoft.VC80.CRT.manifest=>Microsoft.VC80.CRT/Microsoft.VC80.CRT.manifest \ 125 $(PATH_TOOL_VCC80AMD64)/redist/amd64/Microsoft.VC80.CRT/msvcr80.dll=>Microsoft.VC80.CRT/msvcr80.dll \ 126 $(PATH_TOOL_VCC80AMD64)/redist/amd64/Microsoft.VC80.CRT/msvcp80.dll=>Microsoft.VC80.CRT/msvcp80.dll \ 127 $(PATH_TOOL_VCC80AMD64)/redist/amd64/Microsoft.VC80.CRT/Microsoft.VC80.CRT.manifest=>testcase/Microsoft.VC80.CRT/Microsoft.VC80.CRT.manifest \ 128 $(PATH_TOOL_VCC80AMD64)/redist/amd64/Microsoft.VC80.CRT/msvcr80.dll=>testcase/Microsoft.VC80.CRT/msvcr80.dll \ 129 $(PATH_TOOL_VCC80AMD64)/redist/amd64/Microsoft.VC80.CRT/msvcp80.dll=>testcase/Microsoft.VC80.CRT/msvcp80.dll 130 ifeq ($(VBOX_VCC_CRT_TYPE),d) 131 InstallExternalLibs_SOURCES.x86 += \ 132 $(PATH_TOOL_VCC80X86)/redist/Debug_NonRedist/x86/Microsoft.VC80.DebugCRT/Microsoft.VC80.DebugCRT.manifest=>Microsoft.VC80.DebugCRT/Microsoft.VC80.DebugCRT.manifest \ 133 $(PATH_TOOL_VCC80X86)/redist/Debug_NonRedist/x86/Microsoft.VC80.DebugCRT/msvcr80d.dll=>Microsoft.VC80.DebugCRT/msvcr80d.dll \ 134 $(PATH_TOOL_VCC80X86)/redist/Debug_NonRedist/x86/Microsoft.VC80.DebugCRT/msvcp80d.dll=>Microsoft.VC80.DebugCRT/msvcp80d.dll \ 135 $(PATH_TOOL_VCC80X86)/redist/Debug_NonRedist/x86/Microsoft.VC80.DebugCRT/Microsoft.VC80.DebugCRT.manifest=>testcase/Microsoft.VC80.DebugCRT/Microsoft.VC80.DebugCRT.manifest \ 136 $(PATH_TOOL_VCC80X86)/redist/Debug_NonRedist/x86/Microsoft.VC80.DebugCRT/msvcr80d.dll=>testcase/Microsoft.VC80.DebugCRT/msvcr80d.dll \ 137 $(PATH_TOOL_VCC80X86)/redist/Debug_NonRedist/x86/Microsoft.VC80.DebugCRT/msvcp80d.dll=>testcase/Microsoft.VC80.DebugCRT/msvcp80d.dll 138 InstallExternalLibs_SOURCES.amd64 += \ 139 $(PATH_TOOL_VCC80AMD64)/redist/Debug_NonRedist/amd64/Microsoft.VC80.DebugCRT/Microsoft.VC80.DebugCRT.manifest=>Microsoft.VC80.DebugCRT/Microsoft.VC80.DebugCRT.manifest \ 140 $(PATH_TOOL_VCC80AMD64)/redist/Debug_NonRedist/amd64/Microsoft.VC80.DebugCRT/msvcr80d.dll=>Microsoft.VC80.DebugCRT/msvcr80d.dll \ 141 $(PATH_TOOL_VCC80AMD64)/redist/Debug_NonRedist/amd64/Microsoft.VC80.DebugCRT/msvcp80d.dll=>Microsoft.VC80.DebugCRT/msvcp80d.dll \ 142 $(PATH_TOOL_VCC80AMD64)/redist/Debug_NonRedist/amd64/Microsoft.VC80.DebugCRT/Microsoft.VC80.DebugCRT.manifest=>testcase/Microsoft.VC80.DebugCRT/Microsoft.VC80.DebugCRT.manifest \ 143 $(PATH_TOOL_VCC80AMD64)/redist/Debug_NonRedist/amd64/Microsoft.VC80.DebugCRT/msvcr80d.dll=>testcase/Microsoft.VC80.DebugCRT/msvcr80d.dll \ 144 $(PATH_TOOL_VCC80AMD64)/redist/Debug_NonRedist/amd64/Microsoft.VC80.DebugCRT/msvcp80d.dll=>testcase/Microsoft.VC80.DebugCRT/msvcp80d.dll 145 endif 146 endif 147 ifndef VBOX_USE_VCC100 148 ifndef VBOX_USE_VCC80 149 VBOX_INSTALL_VCC70_RT = 1 150 endif 151 ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),win.x86) 152 VBOX_INSTALL_VCC70_RT = 1 153 endif 154 endif 155 ifdef VBOX_INSTALL_VCC70_RT 156 include $(KBUILD_PATH)/tools/VCC70.kmk 157 158 ## @todo Move these defines to VCC70. 159 DLL_TOOL_VCC70_MSVCR71 ?= $(PATH_TOOL_VCC70)/bin/msvcr71.dll 160 ifneq ($(wildcard $(DLL_TOOL_VCC70_MSVCR71)),) 161 InstallExternalLibs_SOURCES += \ 162 $(DLL_TOOL_VCC70_MSVCR71)=>msvcr71.dll \ 163 $(DLL_TOOL_VCC70_MSVCR71)=>testcase/msvcr71.dll 164 endif 165 ifeq ($(VBOX_VCC_CRT_TYPE),d) 166 DLL_TOOL_VCC70_MSVCR71D ?= $(PATH_TOOL_VCC70)/bin/msvcr71d.dll 167 ifneq ($(wildcard $(DLL_TOOL_VCC70_MSVCR71D)),) 168 InstallExternalLibs_SOURCES += \ 169 $(DLL_TOOL_VCC70_MSVCR71D)=>msvcr71d.dll \ 170 $(DLL_TOOL_VCC70_MSVCR71D)=>testcase/msvcr71d.dll 171 endif 172 endif 173 174 DLL_TOOL_VCC70_MSVCP71 ?= $(PATH_TOOL_VCC70)/bin/msvcp71.dll 175 ifneq ($(wildcard $(DLL_TOOL_VCC70_MSVCP71)),) 176 InstallExternalLibs_SOURCES += \ 177 $(DLL_TOOL_VCC70_MSVCP71)=>msvcp71.dll \ 178 $(DLL_TOOL_VCC70_MSVCP71)=>testcase/msvcp71.dll 179 endif 180 ifeq ($(VBOX_VCC_CRT_TYPE),d) 181 DLL_TOOL_VCC70_MSVCP71D ?= $(PATH_TOOL_VCC70)/bin/msvcp71d.dll 182 ifneq ($(wildcard $(DLL_TOOL_VCC70_MSVCP71D)),) 183 InstallExternalLibs_SOURCES += \ 184 $(DLL_TOOL_VCC70_MSVCP71D)=>msvcp71d.dll \ 185 $(DLL_TOOL_VCC70_MSVCP71D)=>testcase/msvcp71d.dll 186 endif 187 endif 188 189 DLL_TOOL_VCC70_MSVCRT ?= $(PATH_TOOL_VCC70)/bin/msvcrt.dll 190 ifneq ($(wildcard $(DLL_TOOL_VCC70_MSVCRT)),) 191 InstallExternalLibs_SOURCES += \ 192 $(DLL_TOOL_VCC70_MSVCRT)=>msvcrt.dll \ 193 $(DLL_TOOL_VCC70_MSVCRT)=>testcase/msvcrt.dll 194 endif 195 endif 196 endif 197 111 endif 198 112 199 113 #
Note:
See TracChangeset
for help on using the changeset viewer.
