Merge
This commit is contained in:
commit
a5b76975f0
@ -464,12 +464,13 @@ 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
|
||||||
endif
|
endif
|
||||||
|
|
||||||
LIBAWT_CFLAGS:=-D__MEDIALIB_OLD_NAMES -D__USE_J2D_NAMES \
|
LIBAWT_CFLAGS+=-D__MEDIALIB_OLD_NAMES -D__USE_J2D_NAMES \
|
||||||
$(X_CFLAGS) \
|
$(X_CFLAGS) \
|
||||||
$(foreach dir,$(LIBAWT_DIRS),-I$(dir))
|
$(foreach dir,$(LIBAWT_DIRS),-I$(dir))
|
||||||
|
|
||||||
@ -1461,7 +1462,8 @@ 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),\
|
||||||
@ -2907,7 +2909,8 @@ $(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…
x
Reference in New Issue
Block a user