8008022: Upgrade Direct X SDK used to build JDK
Reviewed-by: erikj, prr, ihse
This commit is contained in:
parent
98bbb2a9fc
commit
10fa6ae01e
@ -99,7 +99,6 @@ COMPILER_PATH.desc = Compiler install directory
|
|||||||
CACERTS_FILE.desc = Location of certificates file
|
CACERTS_FILE.desc = Location of certificates file
|
||||||
DEVTOOLS_PATH.desc = Directory containing zip and unzip
|
DEVTOOLS_PATH.desc = Directory containing zip and unzip
|
||||||
CUPS_HEADERS_PATH.desc = Include directory location for CUPS header files
|
CUPS_HEADERS_PATH.desc = Include directory location for CUPS header files
|
||||||
DXSDK_PATH.desc = Root directory of DirectX SDK
|
|
||||||
|
|
||||||
# Make variables to print out (description and value)
|
# Make variables to print out (description and value)
|
||||||
VARIABLE_PRINTVAL_LIST += \
|
VARIABLE_PRINTVAL_LIST += \
|
||||||
@ -128,17 +127,6 @@ VARIABLE_CHECKDIR_LIST += \
|
|||||||
VARIABLE_CHECKFIL_LIST += \
|
VARIABLE_CHECKFIL_LIST += \
|
||||||
CACERTS_FILE
|
CACERTS_FILE
|
||||||
|
|
||||||
# Some are windows specific
|
|
||||||
ifeq ($(PLATFORM), windows)
|
|
||||||
|
|
||||||
VARIABLE_PRINTVAL_LIST += \
|
|
||||||
DXSDK_PATH
|
|
||||||
|
|
||||||
VARIABLE_CHECKDIR_LIST += \
|
|
||||||
DXSDK_PATH
|
|
||||||
|
|
||||||
endif
|
|
||||||
|
|
||||||
# For pattern rules below, so all are treated the same
|
# For pattern rules below, so all are treated the same
|
||||||
DO_PRINTVAL_LIST=$(VARIABLE_PRINTVAL_LIST:%=%.printval)
|
DO_PRINTVAL_LIST=$(VARIABLE_PRINTVAL_LIST:%=%.printval)
|
||||||
DO_CHECKDIR_LIST=$(VARIABLE_CHECKDIR_LIST:%=%.checkdir)
|
DO_CHECKDIR_LIST=$(VARIABLE_CHECKDIR_LIST:%=%.checkdir)
|
||||||
|
@ -78,8 +78,6 @@ ifeq ($(COMPILER_VERSION), VS2010)
|
|||||||
MS_RUNTIME_LIBRARIES = $(MSVCRNN_DLL)
|
MS_RUNTIME_LIBRARIES = $(MSVCRNN_DLL)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
EXTRA_LFLAGS += -LIBPATH:$(DXSDK_LIB_PATH)
|
|
||||||
|
|
||||||
# Full Debug Symbols has been enabled on Windows since JDK1.4.1.
|
# Full Debug Symbols has been enabled on Windows since JDK1.4.1.
|
||||||
# The Full Debug Symbols (FDS) default for VARIANT == OPT builds is
|
# The Full Debug Symbols (FDS) default for VARIANT == OPT builds is
|
||||||
# enabled with debug info files ZIP'ed to save space. For VARIANT !=
|
# enabled with debug info files ZIP'ed to save space. For VARIANT !=
|
||||||
|
@ -65,7 +65,6 @@ sanity-base: pre-sanity \
|
|||||||
sane-libCrun \
|
sane-libCrun \
|
||||||
sane-unixccs_path \
|
sane-unixccs_path \
|
||||||
sane-msdevtools_path \
|
sane-msdevtools_path \
|
||||||
sane-dxsdk \
|
|
||||||
sane-compiler \
|
sane-compiler \
|
||||||
sane-cacerts \
|
sane-cacerts \
|
||||||
sane-ant_version \
|
sane-ant_version \
|
||||||
|
@ -74,9 +74,6 @@ endif
|
|||||||
# REQUIRED_CYGWIN_VER
|
# REQUIRED_CYGWIN_VER
|
||||||
# Windows only: If CYGWIN is used, the minimum CYGWIN version.
|
# Windows only: If CYGWIN is used, the minimum CYGWIN version.
|
||||||
#
|
#
|
||||||
# REQUIRED_DXSDK_VER
|
|
||||||
# Windows only: The version of DirectX SDK expected.
|
|
||||||
#
|
|
||||||
# REQUIRED_FREETYPE_VERSION
|
# REQUIRED_FREETYPE_VERSION
|
||||||
# If we are using freetype, the freetype version expected.
|
# If we are using freetype, the freetype version expected.
|
||||||
#
|
#
|
||||||
@ -193,7 +190,6 @@ ifeq ($(PLATFORM), windows)
|
|||||||
REQUIRED_OS_VARIANT_VERSION = $(REQUIRED_OS_VERSION)
|
REQUIRED_OS_VARIANT_VERSION = $(REQUIRED_OS_VERSION)
|
||||||
REQUIRED_CYGWIN_VER = 4.0
|
REQUIRED_CYGWIN_VER = 4.0
|
||||||
REQUIRED_MKS_VER = 6.1
|
REQUIRED_MKS_VER = 6.1
|
||||||
REQUIRED_DXSDK_VER = 0x0900
|
|
||||||
ifeq ($(CC_VERSION),msvc)
|
ifeq ($(CC_VERSION),msvc)
|
||||||
REQUIRED_COMPILER_NAME = Visual Studio 10
|
REQUIRED_COMPILER_NAME = Visual Studio 10
|
||||||
REQUIRED_COMPILER_VERSION = VS2010
|
REQUIRED_COMPILER_VERSION = VS2010
|
||||||
|
@ -79,7 +79,7 @@ override INCREMENTAL_BUILD = false
|
|||||||
# The ALT values should never really have spaces or use \.
|
# The ALT values should never really have spaces or use \.
|
||||||
# Suspect these environment variables to have spaces and/or \ characters:
|
# Suspect these environment variables to have spaces and/or \ characters:
|
||||||
# SYSTEMROOT, SystemRoot, WINDIR, windir, PROGRAMFILES, ProgramFiles,
|
# SYSTEMROOT, SystemRoot, WINDIR, windir, PROGRAMFILES, ProgramFiles,
|
||||||
# DXSDK_DIR, MSTOOLS, Mstools, MSSDK, MSSdk, VCnnCOMNTOOLS,
|
# MSTOOLS, Mstools, MSSDK, MSSdk, VCnnCOMNTOOLS,
|
||||||
# MSVCDIR, MSVCDir.
|
# MSVCDIR, MSVCDir.
|
||||||
# So use $(subst \,/,) on them first adding quotes and placing them in
|
# So use $(subst \,/,) on them first adding quotes and placing them in
|
||||||
# their own variable assigned with :=, then use FullPath.
|
# their own variable assigned with :=, then use FullPath.
|
||||||
@ -255,18 +255,6 @@ ifneq ($(word 1,$(_program_files)),$(_program_files))
|
|||||||
_program_files:=
|
_program_files:=
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# DirectX SDK
|
|
||||||
ifdef ALT_DXSDK_DRIVE
|
|
||||||
_dx_sdk_dir =$(ALT_DXSDK_DRIVE):/DXSDK
|
|
||||||
else
|
|
||||||
ifdef DXSDK_DIR
|
|
||||||
xDXSDK_DIR :="$(subst \,/,$(DXSDK_DIR))"
|
|
||||||
else
|
|
||||||
xDXSDK_DIR :="$(_system_drive)/DXSDK"
|
|
||||||
endif
|
|
||||||
_dx_sdk_dir :=$(call FullPath,$(xDXSDK_DIR))
|
|
||||||
endif
|
|
||||||
|
|
||||||
# Use of the Visual Studio compilers requires certain env variables be set:
|
# Use of the Visual Studio compilers requires certain env variables be set:
|
||||||
# PATH should include the path to cl.exe
|
# PATH should include the path to cl.exe
|
||||||
# INCLUDE should be defined
|
# INCLUDE should be defined
|
||||||
@ -489,39 +477,6 @@ ifeq ($(_NEEDS_MSVCRNN), true)
|
|||||||
MSVCRNN_DLL_PATH:=$(call AltCheckValue,MSVCRNN_DLL_PATH)
|
MSVCRNN_DLL_PATH:=$(call AltCheckValue,MSVCRNN_DLL_PATH)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# DXSDK_PATH: path to Microsoft DirectX SDK Include and Lib
|
|
||||||
ifdef ALT_DXSDK_PATH
|
|
||||||
xALT_DXSDK_PATH :="$(subst \,/,$(ALT_DXSDK_PATH))"
|
|
||||||
DXSDK_PATH :=$(call FullPath,$(xALT_DXSDK_PATH))
|
|
||||||
else
|
|
||||||
_DXSDK_PATH1 :=$(_dx_sdk_dir)
|
|
||||||
_DXSDK_PATH2 :=$(JDK_DEVTOOLS_DIR)/windows/dxsdk
|
|
||||||
DXSDK_PATH :=$(call DirExists,$(_DXSDK_PATH1),$(_DXSDK_PATH2),$(_dx_sdk_dir))
|
|
||||||
endif
|
|
||||||
DXSDK_PATH :=$(call AltCheckSpaces,DXSDK_PATH)
|
|
||||||
DXSDK_PATH:=$(call AltCheckValue,DXSDK_PATH)
|
|
||||||
|
|
||||||
# DXSDK_INCLUDE_PATH: path to Microsoft DirectX SDK Include
|
|
||||||
ifdef ALT_DXSDK_INCLUDE_PATH
|
|
||||||
xALT_DXSDK_INCLUDE_PATH :="$(subst \,/,$(ALT_DXSDK_INCLUDE_PATH))"
|
|
||||||
DXSDK_INCLUDE_PATH :=$(call FullPath,$(xALT_DXSDK_INCLUDE_PATH))
|
|
||||||
else
|
|
||||||
DXSDK_INCLUDE_PATH =$(subst //,/,$(DXSDK_PATH)/Include)
|
|
||||||
endif
|
|
||||||
|
|
||||||
# DXSDK_LIB_PATH: path to Microsoft DirectX SDK Lib
|
|
||||||
ifdef ALT_DXSDK_LIB_PATH
|
|
||||||
xALT_DXSDK_LIB_PATH :="$(subst \,/,$(ALT_DXSDK_LIB_PATH))"
|
|
||||||
DXSDK_LIB_PATH :=$(call FullPath,$(xALT_DXSDK_LIB_PATH))
|
|
||||||
else
|
|
||||||
ifeq ($(ARCH_DATA_MODEL), 64)
|
|
||||||
# 64bit libs are located in "Lib/x64" subdir
|
|
||||||
DXSDK_LIB_PATH =$(subst //,/,$(DXSDK_PATH)/Lib/x64)
|
|
||||||
else
|
|
||||||
DXSDK_LIB_PATH =$(subst //,/,$(DXSDK_PATH)/Lib)
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
|
|
||||||
# DEPLOY_MSSDK: Microsoft SDK for this platform (for deploy)
|
# DEPLOY_MSSDK: Microsoft SDK for this platform (for deploy)
|
||||||
ifdef ALT_DEPLOY_MSSDK
|
ifdef ALT_DEPLOY_MSSDK
|
||||||
xALT_DEPLOY_MSSDK :="$(subst \,/,$(ALT_DEPLOY_MSSDK))"
|
xALT_DEPLOY_MSSDK :="$(subst \,/,$(ALT_DEPLOY_MSSDK))"
|
||||||
|
@ -234,10 +234,6 @@ endif
|
|||||||
ALL_SETTINGS+=$(call addAltSetting,HOTSPOT_SERVER_PATH)
|
ALL_SETTINGS+=$(call addAltSetting,HOTSPOT_SERVER_PATH)
|
||||||
ifeq ($(PLATFORM),windows)
|
ifeq ($(PLATFORM),windows)
|
||||||
ALL_SETTINGS+=$(call addAltSetting,HOTSPOT_LIB_PATH)
|
ALL_SETTINGS+=$(call addAltSetting,HOTSPOT_LIB_PATH)
|
||||||
ALL_SETTINGS+=$(call addRequiredSetting,DXSDK_VER)
|
|
||||||
ALL_SETTINGS+=$(call addAltSetting,DXSDK_PATH)
|
|
||||||
ALL_SETTINGS+=$(call addAltSetting,DXSDK_INCLUDE_PATH)
|
|
||||||
ALL_SETTINGS+=$(call addAltSetting,DXSDK_LIB_PATH)
|
|
||||||
ALL_SETTINGS+=$(call addAltSetting,WINDOWSSDKDIR)
|
ALL_SETTINGS+=$(call addAltSetting,WINDOWSSDKDIR)
|
||||||
ALL_SETTINGS+=$(call addRequiredSetting,RC)
|
ALL_SETTINGS+=$(call addRequiredSetting,RC)
|
||||||
ALL_SETTINGS+=$(call addRequiredSetting,REBASE)
|
ALL_SETTINGS+=$(call addRequiredSetting,REBASE)
|
||||||
|
@ -143,8 +143,6 @@ ifeq ($(PLATFORM), windows)
|
|||||||
_CYGWIN_VER := $(SYSTEM_UNAME)
|
_CYGWIN_VER := $(SYSTEM_UNAME)
|
||||||
CYGWIN_VER :=$(call GetVersion,$(_CYGWIN_VER))
|
CYGWIN_VER :=$(call GetVersion,$(_CYGWIN_VER))
|
||||||
endif
|
endif
|
||||||
DXSDK_VER := $(shell $(EGREP) DIRECT3D_VERSION $(DXSDK_INCLUDE_PATH)/d3d9.h 2>&1 | \
|
|
||||||
$(EGREP) "\#define" | $(NAWK) '{print $$3}')
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# Get the version numbers of what we are using
|
# Get the version numbers of what we are using
|
||||||
@ -1300,51 +1298,6 @@ sane-unzip_version:
|
|||||||
"" >> $(WARNING_FILE) ; \
|
"" >> $(WARNING_FILE) ; \
|
||||||
fi
|
fi
|
||||||
|
|
||||||
######################################################
|
|
||||||
# Check for windows DirectX sdk directory
|
|
||||||
######################################################
|
|
||||||
sane-dxsdk:
|
|
||||||
ifeq ($(PLATFORM), windows)
|
|
||||||
@if [ ! -r $(DXSDK_INCLUDE_PATH)/d3d9.h ]; then \
|
|
||||||
$(ECHO) "ERROR: You do not have access to a valid DirectX SDK Include dir.\n" \
|
|
||||||
" The value of DXSDK_INCLUDE_PATH must point a valid DX SDK dir.\n" \
|
|
||||||
" Please check your access to \n" \
|
|
||||||
" $(DXSDK_INCLUDE_PATH) \n" \
|
|
||||||
" and/or check your value of ALT_DXSDK_PATH or ALT_DXSDK_INCLUDE_PATH.\n" \
|
|
||||||
" Microsoft DirectX 9 SDK (Summer 2004 Update or newer) can be downloaded from the following location:\n" \
|
|
||||||
" http://msdn.microsoft.com/library/default.asp?url=/downloads/list/directx.asp\n" \
|
|
||||||
" Or http://www.microsoft.com/directx\n" \
|
|
||||||
"" >> $(ERROR_FILE) ; \
|
|
||||||
else \
|
|
||||||
if [ ! "$(DXSDK_VER)" = "$(REQUIRED_DXSDK_VER)" ]; then \
|
|
||||||
$(ECHO) "ERROR: The DirectX SDK must be version $(REQUIRED_DXSDK_VER).\n" \
|
|
||||||
" $(YOU_ARE_USING) DirectX SDK version: $(DXSDK_VER)\n" \
|
|
||||||
" The DirectX SDK was obtained from the following location: \n" \
|
|
||||||
" $(DXSDK_PATH) \n" \
|
|
||||||
" Please change your DirectX SDK. \n" \
|
|
||||||
" Microsoft DirectX 9 SDK (Summer 2004 Update or newer) can be downloaded from the following location:\n" \
|
|
||||||
" http://msdn.microsoft.com/library/default.asp?url=/downloads/list/directx.asp\n" \
|
|
||||||
" Or http://www.microsoft.com/directx\n" \
|
|
||||||
"" >> $(ERROR_FILE) ; \
|
|
||||||
else \
|
|
||||||
if [ -r $(DXSDK_INCLUDE_PATH)/basetsd.h ]; then \
|
|
||||||
if [ `$(EGREP) -c __int3264 $(DXSDK_INCLUDE_PATH)/basetsd.h` -ne 0 ]; then \
|
|
||||||
$(ECHO) "WARNING: The DirectX SDK Include directory contains a newer basetsd.h,\n" \
|
|
||||||
" which may indicate that you're using an incorrect version of DirectX SDK.\n" \
|
|
||||||
" This may result in a build failure.\n" \
|
|
||||||
" The DirectX SDK Include dir was obtained from the following location:\n" \
|
|
||||||
" $(DXSDK_INCLUDE_PATH) \n" \
|
|
||||||
" Please change your DirectX SDK to version 9 (Summer 2004 Update or newer).\n" \
|
|
||||||
" Microsoft DirectX 9 SDK can be downloaded from the following location:\n" \
|
|
||||||
" http://msdn.microsoft.com/library/default.asp?url=/downloads/list/directx.asp\n" \
|
|
||||||
" Or http://www.microsoft.com/directx\n" \
|
|
||||||
"" >> $(WARNING_FILE) ; \
|
|
||||||
fi \
|
|
||||||
fi \
|
|
||||||
fi \
|
|
||||||
fi
|
|
||||||
endif
|
|
||||||
|
|
||||||
######################################################
|
######################################################
|
||||||
# Check the linker version(s)
|
# Check the linker version(s)
|
||||||
######################################################
|
######################################################
|
||||||
|
@ -55,8 +55,7 @@ FILES_export = \
|
|||||||
LDLIBS += dsound.lib winmm.lib user32.lib ole32.lib
|
LDLIBS += dsound.lib winmm.lib user32.lib ole32.lib
|
||||||
CPPFLAGS += \
|
CPPFLAGS += \
|
||||||
-DUSE_DAUDIO=TRUE \
|
-DUSE_DAUDIO=TRUE \
|
||||||
-I$(SHARE_SRC)/native/com/sun/media/sound \
|
-I$(SHARE_SRC)/native/com/sun/media/sound
|
||||||
-I$(DXSDK_INCLUDE_PATH)
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# Add to the ambient VPATH.
|
# Add to the ambient VPATH.
|
||||||
|
@ -80,7 +80,6 @@
|
|||||||
# ALT_BOOTDIR
|
# ALT_BOOTDIR
|
||||||
# Windows Only:
|
# Windows Only:
|
||||||
# ALT_UNIXCOMMAND_PATH
|
# ALT_UNIXCOMMAND_PATH
|
||||||
# ALT_DXSDK_PATH
|
|
||||||
# ALT_MSVCRNN_DLL_PATH
|
# ALT_MSVCRNN_DLL_PATH
|
||||||
#
|
#
|
||||||
#############################################################################
|
#############################################################################
|
||||||
|
@ -39,7 +39,6 @@ Here are the steps:
|
|||||||
(on Windows):
|
(on Windows):
|
||||||
#>env | grep ALT
|
#>env | grep ALT
|
||||||
ALT_JDK_IMPORT_PATH=c:/devtools/java/jdk1.7.0
|
ALT_JDK_IMPORT_PATH=c:/devtools/java/jdk1.7.0
|
||||||
ALT_DXSDK_PATH=c:/devtools/DirectX/DXSDK_Dec06
|
|
||||||
ALT_BOOTDIR=c:/DevTools/java/jdk1.6.0
|
ALT_BOOTDIR=c:/DevTools/java/jdk1.6.0
|
||||||
|
|
||||||
If your build is a FASTDEBUG build, don't forget
|
If your build is a FASTDEBUG build, don't forget
|
||||||
@ -50,7 +49,6 @@ Here are the steps:
|
|||||||
accordingly:
|
accordingly:
|
||||||
make.options=\
|
make.options=\
|
||||||
ALT_JDK_IMPORT_PATH=c:/devtools/java/jdk1.7.0 \
|
ALT_JDK_IMPORT_PATH=c:/devtools/java/jdk1.7.0 \
|
||||||
ALT_DXSDK_PATH=c:/devtools/DirectX/DXSDK_Dec06 \
|
|
||||||
ALT_BOOTDIR=c:/DevTools/java/jdk1.6.0 \
|
ALT_BOOTDIR=c:/DevTools/java/jdk1.6.0 \
|
||||||
FASTDEBUG=true
|
FASTDEBUG=true
|
||||||
make=c:/devtools/cygwin/bin/make
|
make=c:/devtools/cygwin/bin/make
|
||||||
@ -175,7 +173,6 @@ Notes on using CND (C/C++ pack) with this project and NetBeans.
|
|||||||
../../build/windows-i586/tmp/sun/sun.awt/splashscreen/CClassHeaders;
|
../../build/windows-i586/tmp/sun/sun.awt/splashscreen/CClassHeaders;
|
||||||
../../build/windows-i586/tmp/sun/sun.font/fontmanager/CClassHeaders;
|
../../build/windows-i586/tmp/sun/sun.font/fontmanager/CClassHeaders;
|
||||||
../../build/windows-i586/tmp/sun/sun.font/t2k/CClassHeaders;
|
../../build/windows-i586/tmp/sun/sun.font/t2k/CClassHeaders;
|
||||||
C:/DevTools/DirectX/DXSDK_Dec06/Include;
|
|
||||||
C:/devtools/VS2003/SDK/v1.1/include;
|
C:/devtools/VS2003/SDK/v1.1/include;
|
||||||
C:/devtools/VS2003/VC7/ATLMFC/INCLUDE;
|
C:/devtools/VS2003/VC7/ATLMFC/INCLUDE;
|
||||||
C:/devtools/VS2003/VC7/INCLUDE;
|
C:/devtools/VS2003/VC7/INCLUDE;
|
||||||
@ -188,7 +185,7 @@ Notes on using CND (C/C++ pack) with this project and NetBeans.
|
|||||||
Note that most paths are relative to the native project directory -
|
Note that most paths are relative to the native project directory -
|
||||||
this helps if you decide to relocate the workspace later. The ones that
|
this helps if you decide to relocate the workspace later. The ones that
|
||||||
aren't relative are paths to external include directories, like those
|
aren't relative are paths to external include directories, like those
|
||||||
of the Platform SDK, DirectX SDK.
|
of the Platform SDK.
|
||||||
On Unix platforms these may be directories like /usr/include.
|
On Unix platforms these may be directories like /usr/include.
|
||||||
|
|
||||||
The parser must know some defines to correctly parse the source files,
|
The parser must know some defines to correctly parse the source files,
|
||||||
|
@ -564,7 +564,6 @@ OTHER_INCLUDES += -I$(CLASSHDRDIR)/../../java/jvm \
|
|||||||
-I$(OBJDIR) \
|
-I$(OBJDIR) \
|
||||||
-I$(SHARE_SRC)/native/common \
|
-I$(SHARE_SRC)/native/common \
|
||||||
-I$(WINAWT_native) \
|
-I$(WINAWT_native) \
|
||||||
-I$(DXSDK_INCLUDE_PATH) \
|
|
||||||
-I$(SHARE_SRC)/native/sun/awt/image/cvutils \
|
-I$(SHARE_SRC)/native/sun/awt/image/cvutils \
|
||||||
-I$(SHARE_SRC)/native/sun/awt/image \
|
-I$(SHARE_SRC)/native/sun/awt/image \
|
||||||
-I$(SHARE_SRC)/native/sun/java2d/loops \
|
-I$(SHARE_SRC)/native/sun/java2d/loops \
|
||||||
|
@ -69,7 +69,6 @@ OTHER_CXXFLAGS += $(GX_OPTION) -DUNICODE -D_UNICODE
|
|||||||
# Other extra flags needed for compiling.
|
# Other extra flags needed for compiling.
|
||||||
#
|
#
|
||||||
CPPFLAGS += -I$(SHARE_SRC)/native/common \
|
CPPFLAGS += -I$(SHARE_SRC)/native/common \
|
||||||
-I$(DXSDK_INCLUDE_PATH) \
|
|
||||||
-I$(PLATFORM_SRC)/native/sun/windows \
|
-I$(PLATFORM_SRC)/native/sun/windows \
|
||||||
-I$(CLASSHDRDIR)/../../awt/CClassHeaders \
|
-I$(CLASSHDRDIR)/../../awt/CClassHeaders \
|
||||||
-I$(SHARE_SRC)/native/sun/awt/debug \
|
-I$(SHARE_SRC)/native/sun/awt/debug \
|
||||||
|
@ -472,7 +472,6 @@ ifeq ($(OPENJDK_TARGET_OS),windows)
|
|||||||
$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/windows \
|
$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/windows \
|
||||||
$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d/windows \
|
$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d/windows \
|
||||||
$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d/d3d
|
$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d/d3d
|
||||||
LIBAWT_CFLAGS+=-I$(DXSDK_INCLUDE_PATH)
|
|
||||||
else
|
else
|
||||||
LIBAWT_DIRS+=\
|
LIBAWT_DIRS+=\
|
||||||
$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d/x11
|
$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d/x11
|
||||||
@ -1482,8 +1481,7 @@ ifeq ($(OPENJDK_TARGET_OS), windows)
|
|||||||
-I$(JDK_TOPDIR)/src/share/native/sun/awt/debug \
|
-I$(JDK_TOPDIR)/src/share/native/sun/awt/debug \
|
||||||
-I$(JDK_TOPDIR)/src/share/native/sun/java2d \
|
-I$(JDK_TOPDIR)/src/share/native/sun/java2d \
|
||||||
-I$(JDK_TOPDIR)/src/share/native/sun/awt/image/cvutils \
|
-I$(JDK_TOPDIR)/src/share/native/sun/awt/image/cvutils \
|
||||||
-I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d/windows \
|
-I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d/windows, \
|
||||||
-I$(DXSDK_INCLUDE_PATH), \
|
|
||||||
LDFLAGS:=$(LDFLAGS_JDKLIB) $(KERNEL32_LIB) $(LDFLAGS_CXX_JDK) \
|
LDFLAGS:=$(LDFLAGS_JDKLIB) $(KERNEL32_LIB) $(LDFLAGS_CXX_JDK) \
|
||||||
advapi32.lib $(WIN_AWT_LIB),\
|
advapi32.lib $(WIN_AWT_LIB),\
|
||||||
LDFLAGS_SUFFIX:=$(LDFLAGS_JDKLIB_SUFFIX),\
|
LDFLAGS_SUFFIX:=$(LDFLAGS_JDKLIB_SUFFIX),\
|
||||||
@ -2961,8 +2959,7 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBJSOUNDDS,\
|
|||||||
OPTIMIZATION:=LOW, \
|
OPTIMIZATION:=LOW, \
|
||||||
CFLAGS:=$(CFLAGS_JDKLIB) \
|
CFLAGS:=$(CFLAGS_JDKLIB) \
|
||||||
$(LIBJSOUND_CFLAGS) \
|
$(LIBJSOUND_CFLAGS) \
|
||||||
-DUSE_DAUDIO=TRUE \
|
-DUSE_DAUDIO=TRUE, \
|
||||||
-I$(DXSDK_INCLUDE_PATH), \
|
|
||||||
LDFLAGS:=$(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK) \
|
LDFLAGS:=$(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK) \
|
||||||
$(call SET_SHARED_LIBRARY_ORIGIN),\
|
$(call SET_SHARED_LIBRARY_ORIGIN),\
|
||||||
LDFLAGS_SUFFIX:=$(LDFLAGS_JDKLIB_SUFFIX) dsound.lib winmm.lib user32.lib ole32.lib,\
|
LDFLAGS_SUFFIX:=$(LDFLAGS_JDKLIB_SUFFIX) dsound.lib winmm.lib user32.lib ole32.lib,\
|
||||||
|
Loading…
Reference in New Issue
Block a user