equal
deleted
inserted
replaced
32 # Setup the java compilers for the JDK build. |
32 # Setup the java compilers for the JDK build. |
33 include Setup.gmk |
33 include Setup.gmk |
34 |
34 |
35 # Copy files (can now depend on $(COPY_FILES)) |
35 # Copy files (can now depend on $(COPY_FILES)) |
36 include CopyFiles.gmk |
36 include CopyFiles.gmk |
|
37 |
|
38 # Prepare the find cache. Only used if running on windows. |
|
39 $(eval $(call FillCacheFind,$(JDK_TOPDIR)/src)) |
37 |
40 |
38 # Build tools |
41 # Build tools |
39 include Tools.gmk |
42 include Tools.gmk |
40 |
43 |
41 # Include the javah generated headers. |
44 # Include the javah generated headers. |
2605 |
2608 |
2606 $(eval $(call SetupNativeCompilation,BUILD_LIBSUNMSCAPI,\ |
2609 $(eval $(call SetupNativeCompilation,BUILD_LIBSUNMSCAPI,\ |
2607 LIBRARY:=sunmscapi,\ |
2610 LIBRARY:=sunmscapi,\ |
2608 OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\ |
2611 OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\ |
2609 SRC:=$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/mscapi,\ |
2612 SRC:=$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/mscapi,\ |
2610 INCLUDE_FILES:=security.cpp, \ |
|
2611 LANG:=C++,\ |
2613 LANG:=C++,\ |
2612 OPTIMIZATION:=LOW, \ |
2614 OPTIMIZATION:=LOW, \ |
2613 CFLAGS:=$(CFLAGS_JDKLIB) \ |
2615 CFLAGS:=$(CFLAGS_JDKLIB) \ |
2614 -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/mscapi ,\ |
2616 -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/mscapi ,\ |
2615 LDFLAGS:=$(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK) \ |
2617 LDFLAGS:=$(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK) \ |