6816311: Changes to allow builds with latest Windows SDK 6.1 on 64bit Windows 2003
These changes create a preference for the newer 6.1 SDK on Windows. Reviewed-by: tbell
This commit is contained in:
Kelly O'Hair
parent
fbcb7f3c1d
commit
20f06ceb09
@ -70,7 +70,6 @@ PLATFORM_INCLUDE = $(INCLUDEDIR)/$(PLATFORM_INCLUDE_NAME)
|
||||
# not to be REBASEd, see deploy/make/common/Release.gmk.
|
||||
# msvcrt.dll, msvcrnn.dll [msvcr71 or msvcr80 or msvcr90] : Microsoft runtimes
|
||||
MS_RUNTIME_LIBRARIES = msvcrt.dll
|
||||
MSVCRNN_DLL =
|
||||
ifeq ($(ARCH_DATA_MODEL), 32)
|
||||
ifeq ($(COMPILER_VERSION), VS2003)
|
||||
MSVCRNN_DLL = msvcr71.dll
|
||||
@ -89,6 +88,13 @@ ifeq ($(ARCH_DATA_MODEL), 32)
|
||||
endif
|
||||
endif
|
||||
|
||||
ifeq ($(ARCH_DATA_MODEL), 64)
|
||||
ifeq ($(COMPILER_VERSION), VS2008)
|
||||
MSVCRNN_DLL = msvcr90.dll
|
||||
MSVCPNN_DLL = msvcp90.dll
|
||||
MS_RUNTIME_LIBRARIES += $(MSVCRNN_DLL)
|
||||
endif
|
||||
endif
|
||||
|
||||
EXTRA_LFLAGS += /LIBPATH:$(DXSDK_LIB_PATH)
|
||||
|
||||
@ -344,17 +350,12 @@ CFLAGS_COMMON += -Fd$(OBJDIR)/$(basename $(@F)).pdb -Fm$(OBJDIR)/$(basename $(@F
|
||||
COMPILER_WARNINGS_TO_IGNORE = 4800
|
||||
CFLAGS_COMMON += $(COMPILER_WARNINGS_TO_IGNORE:%=-wd%)
|
||||
|
||||
#
|
||||
# Add warnings and extra on 64bit issues
|
||||
#
|
||||
ifeq ($(ARCH_DATA_MODEL), 64)
|
||||
CFLAGS_COMMON += -Wp64
|
||||
endif
|
||||
|
||||
#
|
||||
# Treat compiler warnings as errors, if requested
|
||||
#
|
||||
CFLAGS_COMMON += -W$(COMPILER_WARNING_LEVEL)
|
||||
# Turn off security warnings about using the standard C library function strcpy
|
||||
CFLAGS_COMMON += -D _CRT_SECURE_NO_DEPRECATE
|
||||
ifeq ($(COMPILER_WARNINGS_FATAL),true)
|
||||
CFLAGS_COMMON += -WX
|
||||
endif
|
||||
|
||||
@ -27,8 +27,6 @@
|
||||
# GCC Compiler settings
|
||||
#
|
||||
|
||||
COMPILER_NAME=GCC
|
||||
|
||||
ifeq ($(PLATFORM), windows)
|
||||
|
||||
# Settings specific to Windows, pretty stale, hasn't been used
|
||||
@ -90,3 +88,7 @@ endif
|
||||
_CC_VER :=$(shell $(CC) -dumpversion 2>&1 )
|
||||
CC_VER :=$(call GetVersion,"$(_CC_VER)")
|
||||
|
||||
# Name of compiler
|
||||
COMPILER_NAME = GCC$(call MajorVersion,$(CC_VER))
|
||||
COMPILER_VERSION = $(COMPILER_NAME)
|
||||
|
||||
|
||||
@ -112,6 +112,12 @@ ifeq ($(PLATFORM), windows)
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
ifeq ($(CC_MAJORVER), 15)
|
||||
COMPILER_NAME=Microsoft Windows SDK with Visual Studio 9 (6001.18000.367)
|
||||
COMPILER_VERSION=VS2008
|
||||
RC = $(MSSDK61)/Bin/X64/rc.exe
|
||||
MT = $(MSSDK61)/Bin/X64/mt.exe
|
||||
endif
|
||||
# This will cause problems if ALT_COMPILER_PATH is defined to ""
|
||||
# which is a directive to use the PATH.
|
||||
REBASE = $(COMPILER_PATH)../REBASE
|
||||
|
||||
@ -27,11 +27,8 @@
|
||||
# Sun Studio Compiler settings
|
||||
#
|
||||
|
||||
COMPILER_NAME=Sun Studio
|
||||
|
||||
# Sun Studio Compiler settings specific to Solaris
|
||||
ifeq ($(PLATFORM), solaris)
|
||||
COMPILER_VERSION=SS12
|
||||
CC = $(COMPILER_PATH)cc
|
||||
CPP = $(COMPILER_PATH)cc -E
|
||||
CXX = $(COMPILER_PATH)CC
|
||||
@ -44,7 +41,6 @@ endif
|
||||
# Sun Studio Compiler settings specific to Linux
|
||||
ifeq ($(PLATFORM), linux)
|
||||
# This has not been tested
|
||||
COMPILER_VERSION=SS12
|
||||
CC = $(COMPILER_PATH)cc
|
||||
CPP = $(COMPILER_PATH)cc -E
|
||||
CXX = $(COMPILER_PATH)CC
|
||||
@ -65,7 +61,19 @@ endif
|
||||
# Get compiler version
|
||||
_CC_VER :=$(shell $(CC) -V 2>&1 | $(HEAD) -n 1)
|
||||
CC_VER :=$(call GetVersion,"$(_CC_VER)")
|
||||
|
||||
|
||||
# Name of compilers being used
|
||||
COMPILER_VERSION-5.7 = SS10
|
||||
COMPILER_NAME-5.7 = Sun Studio 10
|
||||
COMPILER_VERSION-5.8 = SS11
|
||||
COMPILER_NAME-5.8 = Sun Studio 11
|
||||
COMPILER_VERSION-5.9 = SS12
|
||||
COMPILER_NAME-5.9 = Sun Studio 12
|
||||
COMPILER_VERSION-5.10 = SS13
|
||||
COMPILER_NAME-5.10 = Sun Studio 13
|
||||
COMPILER_VERSION = $(COMPILER_VERSION-$(CC_VER))
|
||||
COMPILER_NAME = $(COMPILER_NAME-$(CC_VER))
|
||||
|
||||
# Arch specific settings (determines type of .o files and instruction set)
|
||||
# Starting in SS12 (5.9), the arch options changed.
|
||||
# The assembler /usr/ccs/bin/as wants older SS11 (5.8) style options.
|
||||
|
||||
@ -45,6 +45,12 @@
|
||||
# REQUIRED_CC_VER
|
||||
# The primary C compiler version expected.
|
||||
#
|
||||
# REQUIRED_COMPILER_NAME
|
||||
# The long descriptive name of the compiler we should use
|
||||
#
|
||||
# REQUIRED_COMPILER_VERSION
|
||||
# The one word name that identifies the compilers being used.
|
||||
#
|
||||
# REQUIRED_CYGWIN_VER
|
||||
# Windows only: If CYGWIN is used, the minimum CYGWIN version.
|
||||
#
|
||||
@ -114,6 +120,8 @@ ifeq ($(PLATFORM), solaris)
|
||||
else
|
||||
REQUIRED_FREE_SPACE = 1040000
|
||||
endif
|
||||
REQUIRED_COMPILER_NAME = Sun Studio 12
|
||||
REQUIRED_COMPILER_VERSION = SS12
|
||||
ifeq ($(CC_VERSION),sun)
|
||||
REQUIRED_CC_VER = 5.9
|
||||
endif
|
||||
@ -130,6 +138,8 @@ ifeq ($(PLATFORM), linux)
|
||||
REQUIRED_OS_VARIANT_VERSION = 9
|
||||
REQUIRED_FREE_SPACE = 1460000
|
||||
REQUIRED_ALSA_VERSION = 0.9.1
|
||||
REQUIRED_COMPILER_NAME = GCC4
|
||||
REQUIRED_COMPILER_VERSION = GCC4
|
||||
REQUIRED_GCC_VER = 2.95
|
||||
ifeq ($(CC_VERSION),gcc)
|
||||
REQUIRED_CC_VER = 4.3.0
|
||||
@ -155,16 +165,22 @@ ifeq ($(PLATFORM), windows)
|
||||
REQUIRED_DXSDK_VER = 0x0900
|
||||
ifeq ($(CC_VERSION),msvc)
|
||||
ifeq ($(ARCH_DATA_MODEL), 32)
|
||||
REQUIRED_CC_VER = 15.00.21022.08
|
||||
REQUIRED_LINK_VER = 9.00.21022.08
|
||||
REQUIRED_COMPILER_NAME = Visual Studio 9
|
||||
REQUIRED_COMPILER_VERSION = VS2008
|
||||
REQUIRED_CC_VER = 15.00.21022.08
|
||||
REQUIRED_LINK_VER = 9.00.21022.08
|
||||
else
|
||||
ifeq ($(ARCH), ia64)
|
||||
REQUIRED_CC_VER = 13.00.9337.7
|
||||
REQUIRED_LINK_VER = 7.00.9337.7
|
||||
REQUIRED_COMPILER_NAME = Microsoft Platform SDK - November 2001 Edition
|
||||
REQUIRED_COMPILER_VERSION = VS2003
|
||||
REQUIRED_CC_VER = 13.00.9337.7
|
||||
REQUIRED_LINK_VER = 7.00.9337.7
|
||||
endif
|
||||
ifeq ($(ARCH), amd64)
|
||||
REQUIRED_CC_VER = 14.00.40310.41
|
||||
REQUIRED_LINK_VER = 8.00.40310.39
|
||||
REQUIRED_COMPILER_NAME = Microsoft Windows SDK with Visual Studio 9 (6001.18000.367)
|
||||
REQUIRED_COMPILER_VERSION = VS2008
|
||||
REQUIRED_CC_VER = 15.00.21022.08
|
||||
REQUIRED_LINK_VER = 9.00.21022.08
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
|
||||
@ -199,6 +199,7 @@ else
|
||||
endif
|
||||
ifeq ($(ARCH_DATA_MODEL), 32)
|
||||
_program_files :=$(call FullPath,$(xPROGRAMFILES))
|
||||
_program_files32 :=$(_program_files)
|
||||
else
|
||||
ifdef PROGRAMW6432
|
||||
xPROGRAMW6432 :="$(subst \,/,$(PROGRAMW6432))"
|
||||
@ -252,39 +253,51 @@ ifeq ($(ARCH_DATA_MODEL), 32)
|
||||
_vs90tools :=$(call FullPath,$(xVS90COMNTOOLS))
|
||||
endif
|
||||
ifneq ($(_vs90tools),)
|
||||
_msvc_dir :=$(_vs90tools)/../../Vc
|
||||
_redist_sdk :=$(_msvc_dir)/../SDK/v3.5/Bin
|
||||
endif
|
||||
ifdef VS80COMNTOOLS # /Common/Tools directory, use ../../Vc
|
||||
xVS80COMNTOOLS :="$(subst \,/,$(VS80COMNTOOLS))"
|
||||
_vs80tools :=$(call FullPath,$(xVS80COMNTOOLS))
|
||||
endif
|
||||
ifneq ($(_vs80tools),)
|
||||
_msvc_dir :=$(_vs80tools)/../../Vc
|
||||
_redist_sdk :=$(_msvc_dir)/../SDK/v2.0/Bin
|
||||
endif
|
||||
ifdef VS71COMNTOOLS # /Common/Tools directory, use ../../Vc7
|
||||
xVS71COMNTOOLS :="$(subst \,/,$(VS71COMNTOOLS))"
|
||||
_vs71tools :=$(call FullPath,$(xVS71COMNTOOLS))
|
||||
endif
|
||||
ifneq ($(_vs71tools),)
|
||||
_msvc_dir :=$(_vs71tools)/../../Vc7
|
||||
_redist_sdk :=$(_vs71tools)/../..
|
||||
_msvc_dir :=$(_vs90tools)/../../Vc
|
||||
else
|
||||
ifdef VS80COMNTOOLS # /Common/Tools directory, use ../../Vc
|
||||
xVS80COMNTOOLS :="$(subst \,/,$(VS80COMNTOOLS))"
|
||||
_vs80tools :=$(call FullPath,$(xVS80COMNTOOLS))
|
||||
endif
|
||||
ifneq ($(_vs80tools),)
|
||||
_msvc_dir :=$(_vs80tools)/../../Vc
|
||||
else
|
||||
ifdef VS71COMNTOOLS # /Common/Tools directory, use ../../Vc7
|
||||
xVS71COMNTOOLS :="$(subst \,/,$(VS71COMNTOOLS))"
|
||||
_vs71tools :=$(call FullPath,$(xVS71COMNTOOLS))
|
||||
endif
|
||||
ifneq ($(_vs71tools),)
|
||||
_msvc_dir :=$(_vs71tools)/../../Vc7
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
ifneq ($(_msvc_dir),)
|
||||
_compiler_bin :=$(_msvc_dir)/Bin
|
||||
_ms_sdk :=$(_msvc_dir)/PlatformSDK
|
||||
# Assume PlatformSDK is in VS71 (will be empty if VS90)
|
||||
_ms_sdk :=$(call FullPath,$(_msvc_dir)/PlatformSDK)
|
||||
# Assume VS90, then VS80, then VS71
|
||||
_redist_sdk :=$(call FullPath,$(_msvc_dir)/../SDK/v3.5/Bin)
|
||||
ifeq ($(_redist_sdk),)
|
||||
_redist_sdk :=$(call FullPath,$(_msvc_dir)/../SDK/v2.0/Bin)
|
||||
ifeq ($(_redist_sdk),)
|
||||
_redist_sdk :=$(call FullPath,$(_msvc_dir)/../SDK/v1.1/Bin)
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
|
||||
# The Microsoft Platform SDK installed by itself
|
||||
ifneq ($(_program_files),)
|
||||
xPSDK :="$(_program_files)/Microsoft Platform SDK"
|
||||
_psdk :=$(call FullPath,$(xPSDK))
|
||||
_PSDK :="$(_program_files)/Microsoft SDKs/Windows/v6.1/"
|
||||
_psdk :=$(call FullPath,$(xMSSDK61))
|
||||
ifeq ($(_psdk),)
|
||||
xPSDK :="$(_program_files)/Microsoft SDK"
|
||||
_psdk :=$(call FullPath,$(xMSSDK))
|
||||
xPSDK :="$(_program_files)/Microsoft Platform SDK"
|
||||
_psdk :=$(call FullPath,$(xPSDK))
|
||||
ifeq ($(_psdk),)
|
||||
xPSDK :="$(_program_files)/Microsoft SDK"
|
||||
_psdk :=$(call FullPath,$(xMSSDK))
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
|
||||
@ -305,13 +318,22 @@ endif
|
||||
|
||||
# Compilers for 64bit are from SDK
|
||||
ifeq ($(ARCH_DATA_MODEL), 64)
|
||||
ifneq ($(_ms_sdk),)
|
||||
ifeq ($(ARCH), ia64)
|
||||
_compiler_bin :=$(_ms_sdk)/Bin/Win64
|
||||
endif
|
||||
ifeq ($(ARCH), amd64)
|
||||
_compiler_bin :=$(_ms_sdk)/Bin/Win64/x86/$(ARCH)
|
||||
_redist_sdk :=$(_ms_sdk)/redist/win64/AMD64
|
||||
xVS2008 :="$(_program_files32)/Microsoft Visual Studio 9.0/"
|
||||
VS2008 :=$(call FullPath,$(xVS2008))
|
||||
ifneq ($(VS2008),)
|
||||
_compiler_bin :=$(VS2008)/VC/Bin/$(ARCH)
|
||||
xMSSDK61 :="$(_program_files)/Microsoft SDKs/Windows/v6.1/"
|
||||
MSSDK61 :=$(call FullPath,$(xMSSDK61))
|
||||
_redist_sdk :=$(VS2008)/VC/redist/x86/Microsoft.VC90.CRT
|
||||
else
|
||||
ifneq ($(_ms_sdk),)
|
||||
ifeq ($(ARCH), ia64)
|
||||
_compiler_bin :=$(_ms_sdk)/Bin/Win64
|
||||
endif
|
||||
ifeq ($(ARCH), amd64)
|
||||
_compiler_bin :=$(_ms_sdk)/Bin/Win64/x86/$(ARCH)
|
||||
_redist_sdk :=$(_ms_sdk)/redist/win64/AMD64
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
@ -414,70 +436,39 @@ ifndef ALT_BOOTDIR
|
||||
_BOOTDIR2 =$(USRJDKINSTANCES_PATH)/jdk$(PREVIOUS_JDK_VERSION)
|
||||
endif
|
||||
|
||||
# See if SDK area has a msvcrt.dll file, directory may exist w/o msvcr* files
|
||||
_REDIST_SDK_EXISTS := $(shell \
|
||||
if [ -f "$(_redist_sdk)/msvcrt.dll" ]; then \
|
||||
echo "true"; \
|
||||
else \
|
||||
echo "false"; \
|
||||
fi)
|
||||
_REDISTNN_SDK_EXISTS := $(shell \
|
||||
if [ -f "$(_redist_sdk)/$(MSVCRNN_DLL)" ]; then \
|
||||
echo "true"; \
|
||||
else \
|
||||
echo "false"; \
|
||||
fi)
|
||||
# 32 bit always needs 2 runtimes, 64 bit usually does too
|
||||
|
||||
# 32 bit needs 2 runtimes
|
||||
# MSVCRT_DLL_PATH: location of msvcrt.dll that will be re-distributed
|
||||
ifdef ALT_MSVCRT_DLL_PATH
|
||||
xALT_MSVCRT_DLL_PATH :="$(subst \,/,$(ALT_MSVCRT_DLL_PATH))"
|
||||
MSVCRT_DLL_PATH :=$(call FullPath,$(xALT_MSVCRT_DLL_PATH))
|
||||
else
|
||||
MSVCRT_DLL_PATH :=$(call FullPath,$(_system_root)/system32/)
|
||||
endif
|
||||
MSVCRT_DLL_PATH:=$(call AltCheckSpaces,MSVCRT_DLL_PATH)
|
||||
MSVCRT_DLL_PATH:=$(call AltCheckValue,MSVCRT_DLL_PATH)
|
||||
|
||||
# 32bit always needs the MSVCRNN runtime, 64bit does when using VS2008
|
||||
ifeq ($(ARCH_DATA_MODEL), 32)
|
||||
|
||||
# MSVCRT_DLL_PATH: location of msvcrt.dll that will be re-distributed
|
||||
ifdef ALT_MSVCRT_DLL_PATH
|
||||
xALT_MSVCRT_DLL_PATH :="$(subst \,/,$(ALT_MSVCRT_DLL_PATH))"
|
||||
MSVCRT_DLL_PATH :=$(call FullPath,$(xALT_MSVCRT_DLL_PATH))
|
||||
_NEEDS_MSVCRNN = true
|
||||
else
|
||||
ifeq ($(VS2008),)
|
||||
_NEEDS_MSVCRNN = false
|
||||
else
|
||||
ifeq ($(_REDIST_SDK_EXISTS), true)
|
||||
xREDIST_DIR :=$(_redist_sdk)
|
||||
else
|
||||
xREDIST_DIR :=$(_system_root)/system32
|
||||
endif
|
||||
MSVCRT_DLL_PATH :=$(call FullPath,$(xREDIST_DIR))
|
||||
_NEEDS_MSVCRNN = true
|
||||
endif
|
||||
MSVCRT_DLL_PATH:=$(call AltCheckSpaces,MSVCRT_DLL_PATH)
|
||||
MSVCRT_DLL_PATH:=$(call AltCheckValue,MSVCRT_DLL_PATH)
|
||||
|
||||
endif
|
||||
|
||||
ifeq ($(_NEEDS_MSVCRNN), true)
|
||||
# MSVCRNN_DLL_PATH: location of msvcrnn.dll that will be re-distributed
|
||||
ifdef ALT_MSVCRNN_DLL_PATH
|
||||
xALT_MSVCRNN_DLL_PATH :="$(subst \,/,$(ALT_MSVCRNN_DLL_PATH))"
|
||||
MSVCRNN_DLL_PATH :=$(call FullPath,$(xALT_MSVCRNN_DLL_PATH))
|
||||
else
|
||||
ifeq ($(_REDISTNN_SDK_EXISTS), true)
|
||||
xREDISTNN_DIR :=$(_redist_sdk)
|
||||
else
|
||||
xREDISTNN_DIR :=$(_system_root)/system32
|
||||
endif
|
||||
MSVCRNN_DLL_PATH :=$(call FullPath,$(xREDISTNN_DIR))
|
||||
MSVCRNN_DLL_PATH :=$(_redist_sdk)
|
||||
endif
|
||||
MSVCRNN_DLL_PATH :=$(call AltCheckSpaces,MSVCRNN_DLL_PATH)
|
||||
MSVCRNN_DLL_PATH:=$(call AltCheckValue,MSVCRNN_DLL_PATH)
|
||||
|
||||
else
|
||||
|
||||
# MSVCRT_DLL_PATH: location of msvcrt.dll that will be re-distributed
|
||||
ifdef ALT_MSVCRT_DLL_PATH
|
||||
xALT_MSVCRT_DLL_PATH :="$(subst \,/,$(ALT_MSVCRT_DLL_PATH))"
|
||||
MSVCRT_DLL_PATH :=$(call FullPath,$(xALT_MSVCRT_DLL_PATH))
|
||||
else
|
||||
ifeq ($(_REDIST_SDK_EXISTS), true)
|
||||
xREDIST_DIR :=$(_redist_sdk)
|
||||
else
|
||||
xREDIST_DIR :=$(_system_root)/SysWOW64
|
||||
endif
|
||||
MSVCRT_DLL_PATH :=$(call FullPath,$(xREDIST_DIR))
|
||||
endif
|
||||
MSVCRT_DLL_PATH:=$(call AltCheckSpaces,MSVCRT_DLL_PATH)
|
||||
MSVCRT_DLL_PATH:=$(call AltCheckValue,MSVCRT_DLL_PATH)
|
||||
|
||||
endif
|
||||
|
||||
# DXSDK_PATH: path to Microsoft DirectX SDK Include and Lib
|
||||
@ -536,7 +527,7 @@ ifdef ALT_INSTALL_MSIVAL2
|
||||
xALT_INSTALL_MSIVAL2 :="$(subst \,/,$(ALT_INSTALL_MSIVAL2))"
|
||||
INSTALL_MSIVAL2 :=$(call FullPath,$(xALT_INSTALL_MSIVAL2))
|
||||
else
|
||||
INSTALL_MSIVAL2 :=$(_program_files)/MsiVal2
|
||||
INSTALL_MSIVAL2 :=$(_program_files32)/MsiVal2
|
||||
endif
|
||||
INSTALL_MSIVAL2:=$(call AltCheckSpaces,INSTALL_MSIVAL2)
|
||||
|
||||
|
||||
@ -97,7 +97,7 @@ ifeq ($(PLATFORM),solaris)
|
||||
endif
|
||||
ifeq ($(PLATFORM),windows)
|
||||
ALL_SETTINGS+=$(call addAltSetting,MSVCRT_DLL_PATH)
|
||||
ifeq ($(ARCH_DATA_MODEL), 32)
|
||||
ifneq ($(MSVCRNN_DLL),)
|
||||
ALL_SETTINGS+=$(call addAltSetting,MSVCRNN_DLL_PATH)
|
||||
endif
|
||||
ALL_SETTINGS+=$(call addAltSetting,MSDEVTOOLS_PATH)
|
||||
|
||||
@ -129,7 +129,7 @@ ifeq ($(PLATFORM), windows)
|
||||
ifeq ($(_OS_VERSION),)
|
||||
OS_VERSION = 5.0
|
||||
else
|
||||
OS_VERSION = $(_OS_VERSION)
|
||||
OS_VERSION = $(call MajorVersion,$(_OS_VERSION)).$(call MinorVersion,$(_OS_VERSION))
|
||||
endif
|
||||
OS_VARIANT_NAME := $(WINDOWS_MAPPING-$(OS_VERSION))
|
||||
OS_VARIANT_VERSION := $(OS_VERSION)
|
||||
@ -864,7 +864,7 @@ ifeq ($(PLATFORM), windows)
|
||||
" and/or check your value of ALT_MSVCRT_DLL_PATH. \n" \
|
||||
"" >> $(ERROR_FILE) ; \
|
||||
fi
|
||||
ifeq ($(ARCH_DATA_MODEL), 32)
|
||||
ifneq ($(MSVCRNN_DLL),)
|
||||
@if [ ! -r "$(MSVCRNN_DLL_PATH)/$(MSVCRNN_DLL)" ]; then \
|
||||
$(ECHO) "ERROR: You do not have access to $(MSVCRNN_DLL). \n" \
|
||||
" Please check your access to \n" \
|
||||
@ -1314,8 +1314,8 @@ ifdef LINK_VER
|
||||
fi
|
||||
@if [ "$(LINK_CHECK)" != "same" ]; then \
|
||||
$(ECHO) "WARNING: To build Java 2 SDK $(JDK_VERSION) you need : \n" \
|
||||
" $(COMPILER_VERSION) - link.exe version \"$(REQUIRED_LINK_VER)\" \n" \
|
||||
" Specifically the $(COMPILER_NAME) link.exe. \n " \
|
||||
" $(REQUIRED_COMPILER_VERSION) - link.exe version \"$(REQUIRED_LINK_VER)\" \n" \
|
||||
" Specifically the $(REQUIRED_COMPILER_NAME) link.exe. \n " \
|
||||
" $(YOU_ARE_USING) Linker version \"$(LINK_VER)\" \n" \
|
||||
"" >> $(WARNING_FILE) ; \
|
||||
fi
|
||||
@ -1332,21 +1332,13 @@ sane-compiler: sane-link
|
||||
fi
|
||||
ifndef OPENJDK
|
||||
@if [ "$(CC_CHECK)" != "same" ]; then \
|
||||
$(ECHO) "WARNING: The $(PLATFORM) compiler is not version $(COMPILER_VERSION) $(REQUIRED_CC_VER) \n" \
|
||||
" Specifically the $(COMPILER_NAME) compiler. \n " \
|
||||
" $(YOU_ARE_USING) compiler version: $(CC_VER) \n" \
|
||||
$(ECHO) "WARNING: The $(PLATFORM) compiler is not version $(REQUIRED_COMPILER_VERSION) $(REQUIRED_CC_VER) \n" \
|
||||
" Specifically the $(REQUIRED_COMPILER_NAME) compiler. \n " \
|
||||
" $(YOU_ARE_USING) $(COMPILER_VERSION): $(CC_VER) \n" \
|
||||
" The compiler was obtained from the following location: \n" \
|
||||
" $(COMPILER_PATH) \n" \
|
||||
"" >> $(WARNING_FILE) ; \
|
||||
fi
|
||||
ifeq ($(PLATFORM), windows)
|
||||
ifeq ($(ARCH_DATA_MODEL), 64)
|
||||
ifneq ($(COMPILER_VERSION), VS2005)
|
||||
@$(ECHO) "WARNING: Should be using VS2005 compiler on 64bit platform. \n" \
|
||||
"" >> $(WARNING_FILE)
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
|
||||
######################################################
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
// have any questions.
|
||||
//
|
||||
|
||||
#include "afxres.h"
|
||||
#include "windows.h"
|
||||
|
||||
// Need 2 defines so macro argument to XSTR will get expanded before quoting.
|
||||
#define XSTR(x) STR(x)
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
// have any questions.
|
||||
//
|
||||
|
||||
#include "afxres.h"
|
||||
#include "windows.h"
|
||||
|
||||
// Need 2 defines so macro argument to XSTR will get expanded before quoting.
|
||||
#define XSTR(x) STR(x)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user