Mercurial > hg > truffle
diff make/windows/makefiles/compile.make @ 3429:5def270bc147
7016797: Hotspot: securely/restrictive load dlls and new API for loading system dlls
Summary: Created Windows Dll wrapped to handle jdk6 and jdk7 platform requirements, also provided more restictive Dll search orders for Windows system Dlls.
Reviewed-by: acorn, dcubed, ohair, alanb
author | zgu |
---|---|
date | Fri, 15 Apr 2011 09:34:43 -0400 |
parents | 99bd05619fa4 |
children | 719f7007c8e8 |
line wrap: on
line diff
--- a/make/windows/makefiles/compile.make Thu Apr 21 22:07:32 2011 -0700 +++ b/make/windows/makefiles/compile.make Fri Apr 15 09:34:43 2011 -0400 @@ -81,7 +81,6 @@ !endif CPP_FLAGS=$(CPP_FLAGS) /D "WIN32" /D "_WINDOWS" - # Must specify this for sharedRuntimeTrig.cpp CPP_FLAGS=$(CPP_FLAGS) /D "VM_LITTLE_ENDIAN" @@ -232,6 +231,11 @@ uuid.lib Wsock32.lib winmm.lib /nologo /machine:$(MACHINE) /opt:REF \ /opt:ICF,8 /map /debug + +!if $(MSC_VER) >= 1600 +LINK_FLAGS= $(LINK_FLAGS) psapi.lib +!endif + # Resource compiler settings RC=rc.exe RC_FLAGS=/D "HS_VER=$(HS_VER)" \