115 endif |
115 endif |
116 ALL_SETTINGS+=$(call addRequiredVersionSetting,ZIP_VER) |
116 ALL_SETTINGS+=$(call addRequiredVersionSetting,ZIP_VER) |
117 ALL_SETTINGS+=$(call addRequiredVersionSetting,UNZIP_VER) |
117 ALL_SETTINGS+=$(call addRequiredVersionSetting,UNZIP_VER) |
118 ifeq ($(PLATFORM),windows) |
118 ifeq ($(PLATFORM),windows) |
119 ALL_SETTINGS+=$(call addRequiredVersionSetting,LINK_VER) |
119 ALL_SETTINGS+=$(call addRequiredVersionSetting,LINK_VER) |
|
120 ALL_SETTINGS+=$(call addRequiredSetting,CC) |
|
121 ALL_SETTINGS+=$(call addRequiredSetting,LINK) |
|
122 ALL_SETTINGS+=$(call addRequiredSetting,DUMPBIN) |
120 endif |
123 endif |
121 ALL_SETTINGS+=$(call addRequiredVersionSetting,ANT_VER) |
124 ALL_SETTINGS+=$(call addRequiredVersionSetting,ANT_VER) |
122 ALL_SETTINGS+=$(call addRequiredSetting,TEMPDIR) |
125 ALL_SETTINGS+=$(call addRequiredSetting,TEMPDIR) |
123 |
126 |
124 |
127 |
224 ALL_SETTINGS+=$(call addRequiredSetting,DXSDK_VER) |
227 ALL_SETTINGS+=$(call addRequiredSetting,DXSDK_VER) |
225 ALL_SETTINGS+=$(call addAltSetting,DXSDK_PATH) |
228 ALL_SETTINGS+=$(call addAltSetting,DXSDK_PATH) |
226 ALL_SETTINGS+=$(call addAltSetting,DXSDK_INCLUDE_PATH) |
229 ALL_SETTINGS+=$(call addAltSetting,DXSDK_INCLUDE_PATH) |
227 ALL_SETTINGS+=$(call addAltSetting,DXSDK_LIB_PATH) |
230 ALL_SETTINGS+=$(call addAltSetting,DXSDK_LIB_PATH) |
228 ALL_SETTINGS+=$(call addAltSetting,WINDOWSSDKDIR) |
231 ALL_SETTINGS+=$(call addAltSetting,WINDOWSSDKDIR) |
|
232 ALL_SETTINGS+=$(call addRequiredSetting,RC) |
|
233 ALL_SETTINGS+=$(call addRequiredSetting,REBASE) |
229 ifndef OPENJDK |
234 ifndef OPENJDK |
230 ALL_SETTINGS+=$(call addAltSetting,DEPLOY_MSSDK) |
235 ALL_SETTINGS+=$(call addAltSetting,DEPLOY_MSSDK) |
231 ALL_SETTINGS+=$(call addAltSetting,INSTALL_MSSDK) |
236 ALL_SETTINGS+=$(call addAltSetting,INSTALL_MSSDK) |
232 ALL_SETTINGS+=$(call addAltSetting,WSCRIPT) |
237 ALL_SETTINGS+=$(call addAltSetting,WSCRIPT) |
233 ALL_SETTINGS+=$(call addAltSetting,MSICERT) |
238 ALL_SETTINGS+=$(call addAltSetting,MSICERT) |