1 # |
1 # |
2 # Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved. |
2 # Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. |
3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 # |
4 # |
5 # This code is free software; you can redistribute it and/or modify it |
5 # This code is free software; you can redistribute it and/or modify it |
6 # under the terms of the GNU General Public License version 2 only, as |
6 # under the terms of the GNU General Public License version 2 only, as |
7 # published by the Free Software Foundation. Oracle designates this |
7 # published by the Free Software Foundation. Oracle designates this |
98 ifeq ($(PLATFORM),windows) |
98 ifeq ($(PLATFORM),windows) |
99 ALL_SETTINGS+=$(call addAltSetting,MSVCRT_DLL_PATH) |
99 ALL_SETTINGS+=$(call addAltSetting,MSVCRT_DLL_PATH) |
100 ifneq ($(MSVCRNN_DLL),) |
100 ifneq ($(MSVCRNN_DLL),) |
101 ALL_SETTINGS+=$(call addAltSetting,MSVCRNN_DLL_PATH) |
101 ALL_SETTINGS+=$(call addAltSetting,MSVCRNN_DLL_PATH) |
102 endif |
102 endif |
103 ALL_SETTINGS+=$(call addAltSetting,MSDEVTOOLS_PATH) |
103 ALL_SETTINGS+=$(call addRequiredSetting,INCLUDE) |
|
104 ALL_SETTINGS+=$(call addRequiredSetting,LIB) |
104 endif |
105 endif |
105 ALL_SETTINGS+=$(call addOptionalSetting,COMPILER_NAME) |
106 ALL_SETTINGS+=$(call addOptionalSetting,COMPILER_NAME) |
106 ALL_SETTINGS+=$(call addOptionalSetting,COMPILER_VERSION) |
107 ALL_SETTINGS+=$(call addOptionalSetting,COMPILER_VERSION) |
107 ALL_SETTINGS+=$(call addRequiredVersionSetting,CC_VER) |
108 ALL_SETTINGS+=$(call addRequiredVersionSetting,CC_VER) |
108 ifeq ($(PLATFORM),solaris) |
109 ifeq ($(PLATFORM),solaris) |
221 ALL_SETTINGS+=$(call addAltSetting,HOTSPOT_LIB_PATH) |
222 ALL_SETTINGS+=$(call addAltSetting,HOTSPOT_LIB_PATH) |
222 ALL_SETTINGS+=$(call addRequiredSetting,DXSDK_VER) |
223 ALL_SETTINGS+=$(call addRequiredSetting,DXSDK_VER) |
223 ALL_SETTINGS+=$(call addAltSetting,DXSDK_PATH) |
224 ALL_SETTINGS+=$(call addAltSetting,DXSDK_PATH) |
224 ALL_SETTINGS+=$(call addAltSetting,DXSDK_INCLUDE_PATH) |
225 ALL_SETTINGS+=$(call addAltSetting,DXSDK_INCLUDE_PATH) |
225 ALL_SETTINGS+=$(call addAltSetting,DXSDK_LIB_PATH) |
226 ALL_SETTINGS+=$(call addAltSetting,DXSDK_LIB_PATH) |
|
227 ALL_SETTINGS+=$(call addAltSetting,WINDOWSSDKDIR) |
226 ifndef OPENJDK |
228 ifndef OPENJDK |
227 ALL_SETTINGS+=$(call addAltSetting,DEPLOY_MSSDK) |
229 ALL_SETTINGS+=$(call addAltSetting,DEPLOY_MSSDK) |
228 ALL_SETTINGS+=$(call addAltSetting,INSTALL_MSSDK) |
230 ALL_SETTINGS+=$(call addAltSetting,INSTALL_MSSDK) |
229 ALL_SETTINGS+=$(call addAltSetting,WSCRIPT) |
231 ALL_SETTINGS+=$(call addAltSetting,WSCRIPT) |
230 ALL_SETTINGS+=$(call addAltSetting,MSICERT) |
232 ALL_SETTINGS+=$(call addAltSetting,MSICERT) |