Skip to content

Commit 282d729

Browse files
author
vadim
committed
8008022: Upgrade Direct X SDK used to build JDK
Reviewed-by: erikj, prr, ihse
1 parent cae8c4a commit 282d729

File tree

6 files changed

+1
-548
lines changed

6 files changed

+1
-548
lines changed

Diff for: Makefile

-12
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,6 @@ COMPILER_PATH.desc = Compiler install directory
404404
CACERTS_FILE.desc = Location of certificates file
405405
DEVTOOLS_PATH.desc = Directory containing zip and gnumake
406406
CUPS_HEADERS_PATH.desc = Include directory location for CUPS header files
407-
DXSDK_PATH.desc = Root directory of DirectX SDK
408407

409408
# Make variables to print out (description and value)
410409
VARIABLE_PRINTVAL_LIST += \
@@ -429,17 +428,6 @@ VARIABLE_CHECKDIR_LIST += \
429428
VARIABLE_CHECKFIL_LIST += \
430429
CACERTS_FILE
431430

432-
# Some are windows specific
433-
ifeq ($(PLATFORM), windows)
434-
435-
VARIABLE_PRINTVAL_LIST += \
436-
DXSDK_PATH
437-
438-
VARIABLE_CHECKDIR_LIST += \
439-
DXSDK_PATH
440-
441-
endif
442-
443431
# For pattern rules below, so all are treated the same
444432
DO_PRINTVAL_LIST=$(VARIABLE_PRINTVAL_LIST:%=%.printval)
445433
DO_CHECKDIR_LIST=$(VARIABLE_CHECKDIR_LIST:%=%.checkdir)

Diff for: README-builds.html

-23
Original file line numberDiff line numberDiff line change
@@ -444,10 +444,6 @@ <h3><a name="setup">System Setup</a></h3>
444444
Install
445445
<a href="#vs2010">Visual Studio 2010</a>
446446
</li>
447-
<li>
448-
Install the
449-
<a href="#dxsdk">Microsoft DirectX SDK</a>
450-
</li>
451447
</ul>
452448
</td>
453449
<td>
@@ -971,25 +967,6 @@ <h4><a name="configureoptions">Configure Options</a></h4>
971967
developer install location
972968
</td>
973969
</tr>
974-
<tr>
975-
<td><b><code>--with-dxsdk=</code></b><i>path</i></td>
976-
<td>
977-
select location of the Windows Direct X SDK install
978-
<br>
979-
The <a name="dxsdk">Microsoft DirectX 9.0 SDK</a>
980-
header files and libraries
981-
from the Summer 2004 edition
982-
are required for building OpenJDK.
983-
This SDK can be downloaded from
984-
<a href="http://www.microsoft.com/downloads/details.aspx?FamilyId=FD044A42-9912-42A3-9A9E-D857199F888E&amp;displaylang=en" target="_blank">
985-
Microsoft DirectX 9.0 SDK (Summer 2004)</a>.
986-
If the link above becomes obsolete, the SDK can be found from
987-
<a href="http://download.microsoft.com" target="_blank">the Microsoft Download Site</a>
988-
(search with "DirectX 9.0 SDK Update Summer 2004").
989-
Installation usually will set the environment variable
990-
<code>DXSDK_DIR</code> to it's install location.
991-
</td>
992-
</tr>
993970
<tr>
994971
<td><b><code>--with-freetype=</code></b><i>path</i></td>
995972
<td>

0 commit comments

Comments
 (0)