stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Michael Wilkerson 2010-05-19 20:16:33 -07:00
commit 11d1a93bb2
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
jdk/make/common/shared/Defs-windows.gmk
View File

@ -287,11 +287,15 @@ ifeq ($(ARCH_DATA_MODEL), 32)
# Assume VS100, then VS90, then VS80, then VS71 # Assume VS100, then VS90, then VS80, then VS71
_redist_sdk :=$(call FullPath,$(_msvc_dir)/redist/x86/Microsoft.VC100.CRT) _redist_sdk :=$(call FullPath,$(_msvc_dir)/redist/x86/Microsoft.VC100.CRT)
ifeq ($(_redist_sdk),) ifeq ($(_redist_sdk),)
_redist_sdk :=$(call FullPath,$(_msvc_dir)/redist/x86/Microsoft.VC90.CRT) ifneq ($(VS100COMNTOOLS),)
ifeq ($(_redist_sdk),) _redist_sdk :=c:/windows/system32
_redist_sdk :=$(call FullPath,$(_msvc_dir)/redist/x86/Microsoft.VC80.CRT) else
_redist_sdk :=$(call FullPath,$(_msvc_dir)/redist/x86/Microsoft.VC90.CRT)
ifeq ($(_redist_sdk),) ifeq ($(_redist_sdk),)
_redist_sdk :=$(call FullPath,$(_msvc_dir)/../SDK/v1.1/Bin) _redist_sdk :=$(call FullPath,$(_msvc_dir)/redist/x86/Microsoft.VC80.CRT)
ifeq ($(_redist_sdk),)
_redist_sdk :=$(call FullPath,$(_msvc_dir)/../SDK/v1.1/Bin)
endif
endif endif
endif endif
endif endif

7
jdk/make/sun/jkernel/Makefile
View File

@ -52,6 +52,11 @@ ifeq ($(ARCH_DATA_MODEL), 32)
ifeq ($(PLATFORM), windows) ifeq ($(PLATFORM), windows)
# If this is the VS Express compiler it will lack vc/atlmfc/
ATL_MFC_DIR :=$(call DirExists,$(COMPILER_PATH)/../atlmfc,,)
ifneq ($(ATL_MFC_DIR),)
include FILES_c_windows.gmk include FILES_c_windows.gmk
vpath %.cpp $(PLATFORM_SRC)/native/sun/jkernel vpath %.cpp $(PLATFORM_SRC)/native/sun/jkernel
@ -67,6 +72,8 @@ endif
endif endif
endif
# #
# Resources # Resources
# #