462 ifeq ($(OPENJDK_TARGET_OS),windows) |
462 ifeq ($(OPENJDK_TARGET_OS),windows) |
463 LIBAWT_DIRS+=\ |
463 LIBAWT_DIRS+=\ |
464 $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/windows \ |
464 $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/windows \ |
465 $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d/windows \ |
465 $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d/windows \ |
466 $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d/d3d |
466 $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d/d3d |
|
467 LIBAWT_CFLAGS+=-I$(DXSDK_INCLUDE_PATH) |
467 else |
468 else |
468 LIBAWT_DIRS+=\ |
469 LIBAWT_DIRS+=\ |
469 $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d/x11 |
470 $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d/x11 |
470 endif |
471 endif |
471 |
472 |
472 LIBAWT_CFLAGS:=-D__MEDIALIB_OLD_NAMES -D__USE_J2D_NAMES \ |
473 LIBAWT_CFLAGS+=-D__MEDIALIB_OLD_NAMES -D__USE_J2D_NAMES \ |
473 $(X_CFLAGS) \ |
474 $(X_CFLAGS) \ |
474 $(foreach dir,$(LIBAWT_DIRS),-I$(dir)) |
475 $(foreach dir,$(LIBAWT_DIRS),-I$(dir)) |
475 |
476 |
476 LIBAWT_FILES:=\ |
477 LIBAWT_FILES:=\ |
477 gifdecoder.c \ |
478 gifdecoder.c \ |
1216 $(eval $(call SetupNativeCompilation,BUILD_LIBLCMS,\ |
1217 $(eval $(call SetupNativeCompilation,BUILD_LIBLCMS,\ |
1217 LIBRARY:=lcms,\ |
1218 LIBRARY:=lcms,\ |
1218 OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\ |
1219 OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\ |
1219 SRC:=$(JDK_TOPDIR)/src/share/native/sun/java2d/cmm/lcms,\ |
1220 SRC:=$(JDK_TOPDIR)/src/share/native/sun/java2d/cmm/lcms,\ |
1220 LANG:=C,\ |
1221 LANG:=C,\ |
1221 OPTIMIZATION:=LOW, \ |
1222 OPTIMIZATION:=HIGHEST, \ |
1222 CFLAGS:=$(filter-out -xc99=%none,$(CFLAGS_JDKLIB)) \ |
1223 CFLAGS:=$(filter-out -xc99=%none,$(CFLAGS_JDKLIB)) \ |
1223 $(SHARED_LIBRARY_FLAGS) \ |
1224 $(SHARED_LIBRARY_FLAGS) \ |
1224 -I$(JDK_TOPDIR)/src/share/native/sun/java2d \ |
1225 -I$(JDK_TOPDIR)/src/share/native/sun/java2d \ |
1225 -I$(JDK_TOPDIR)/src/share/native/sun/awt/debug,\ |
1226 -I$(JDK_TOPDIR)/src/share/native/sun/awt/debug,\ |
1226 CFLAGS_solaris:=-xc99=no_lib,\ |
1227 CFLAGS_solaris:=-xc99=no_lib,\ |
1459 -EHsc -DUNICODE -D_UNICODE \ |
1460 -EHsc -DUNICODE -D_UNICODE \ |
1460 -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/windows \ |
1461 -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/windows \ |
1461 -I$(JDK_TOPDIR)/src/share/native/sun/awt/debug \ |
1462 -I$(JDK_TOPDIR)/src/share/native/sun/awt/debug \ |
1462 -I$(JDK_TOPDIR)/src/share/native/sun/java2d \ |
1463 -I$(JDK_TOPDIR)/src/share/native/sun/java2d \ |
1463 -I$(JDK_TOPDIR)/src/share/native/sun/awt/image/cvutils \ |
1464 -I$(JDK_TOPDIR)/src/share/native/sun/awt/image/cvutils \ |
1464 -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d/windows, \ |
1465 -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d/windows \ |
|
1466 -I$(DXSDK_INCLUDE_PATH), \ |
1465 LDFLAGS:=$(LDFLAGS_JDKLIB) $(KERNEL32_LIB) $(LDFLAGS_CXX_JDK) \ |
1467 LDFLAGS:=$(LDFLAGS_JDKLIB) $(KERNEL32_LIB) $(LDFLAGS_CXX_JDK) \ |
1466 advapi32.lib $(WIN_AWT_LIB),\ |
1468 advapi32.lib $(WIN_AWT_LIB),\ |
1467 LDFLAGS_SUFFIX:=$(LDFLAGS_JDKLIB_SUFFIX),\ |
1469 LDFLAGS_SUFFIX:=$(LDFLAGS_JDKLIB_SUFFIX),\ |
1468 VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\ |
1470 VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\ |
1469 RC_FLAGS:=$(RC_FLAGS)\ |
1471 RC_FLAGS:=$(RC_FLAGS)\ |
2903 PLATFORM_API_WinOS_DirectSound.cpp, \ |
2905 PLATFORM_API_WinOS_DirectSound.cpp, \ |
2904 LANG:=C++,\ |
2906 LANG:=C++,\ |
2905 OPTIMIZATION:=LOW, \ |
2907 OPTIMIZATION:=LOW, \ |
2906 CFLAGS:=$(CFLAGS_JDKLIB) \ |
2908 CFLAGS:=$(CFLAGS_JDKLIB) \ |
2907 $(LIBJSOUND_CFLAGS) \ |
2909 $(LIBJSOUND_CFLAGS) \ |
2908 -DUSE_DAUDIO=TRUE, \ |
2910 -DUSE_DAUDIO=TRUE \ |
|
2911 -I$(DXSDK_INCLUDE_PATH), \ |
2909 LDFLAGS:=$(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK) \ |
2912 LDFLAGS:=$(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK) \ |
2910 $(call SET_SHARED_LIBRARY_ORIGIN),\ |
2913 $(call SET_SHARED_LIBRARY_ORIGIN),\ |
2911 LDFLAGS_SUFFIX:=$(LDFLAGS_JDKLIB_SUFFIX) dsound.lib winmm.lib user32.lib ole32.lib,\ |
2914 LDFLAGS_SUFFIX:=$(LDFLAGS_JDKLIB_SUFFIX) dsound.lib winmm.lib user32.lib ole32.lib,\ |
2912 VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\ |
2915 VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\ |
2913 RC_FLAGS:=$(RC_FLAGS)\ |
2916 RC_FLAGS:=$(RC_FLAGS)\ |