Update multi platform support for Win64

taoliult · Oct 24, 2023 · 277e61f · 277e61f
1 parent 320aa95
commit 277e61f
Showing 1 changed file with 17 additions and 4 deletions.
diff --git a/closed/custom/Main.gmk b/closed/custom/Main.gmk
@@ -124,6 +124,11 @@ ifeq (true,$(BUILD_JGSKIT))
 
 # Identify the desired JGSKIT target platform.
 JGSKIT_TARGET :=
+JGSKIT_MAKE := jgskit.mak
+JGSKIT_MAKE_PATH := $(OPENJCEPLUS_TOPDIR)/src/main/native/
+JCE_CLASSPATH := $(OPENJCEPLUS_TOPDIR)/src/main/java:$(TOPDIR)/src/java.base/share/classes
+JCE_CLASSPATH_WIN64 := "$(call MixedPath,$(OPENJCEPLUS_TOPDIR)/src/main/java);$(call MixedPath,$(TOPDIR)/src/java.base/share/classes)"
+
 ifeq ($(OPENJDK_TARGET_OS), aix)
   JGSKIT_TARGET := ppc-aix64
 else ifeq ($(OPENJDK_TARGET_OS), linux)
@@ -132,6 +137,14 @@ else ifeq ($(OPENJDK_TARGET_OS), linux)
   else ifeq ($(OPENJDK_TARGET_CPU), ppc64le)
     JGSKIT_TARGET := ppcle-linux64
   endif
+else ifeq ($(OPENJDK_TARGET_OS), windows)
+  ifeq ($(OPENJDK_TARGET_CPU), x86_64)
+    JGSKIT_TARGET := win64
+    JGSKIT_MAKE := jgskit.win64.mak
+    # JCE_CLASSPATH := $(subst :,\;,$(subst /,\\,$(JCE_CLASSPATH)))
+    # JCE_CLASSPATH := $(subst /,\\,$(JCE_CLASSPATH))
+    JCE_CLASSPATH := $(JCE_CLASSPATH_WIN64)
+  endif
 endif # OPENJDK_TARGET_OS
 
 ifeq (,$(JGSKIT_TARGET))
@@ -144,15 +157,15 @@ clean : clean-openjceplus
 
 clean-openjceplus :
 	@$(ECHO) Cleaning OpenJCEPlus native
-	@$(RM) -f $(addprefix $(OPENJCEPLUS_TOPDIR)/src/main/native/, com_ibm_crypto_plus_provider_icc_NativeInterface.h com_ibm_crypto_plus_provider_icc_FastJNIBuffer.h libjgskit.x)
-	$(MAKE) -C $(OPENJCEPLUS_TOPDIR)/src/main/native/ -f jgskit.mak cleanAll
+	@$(RM) -f $(addprefix $(JGSKIT_MAKE_PATH), com_ibm_crypto_plus_provider_icc_NativeInterface.h com_ibm_crypto_plus_provider_icc_FastJNIBuffer.h libjgskit.x)
+	$(MAKE) -C $(JGSKIT_MAKE_PATH) -f $(JGSKIT_MAKE) cleanAll
 
 openjceplus-copy : openjceplus-libs
 
 openjceplus-libs :
 	@$(ECHO) Compiling OpenJCEPlus native
-	export PLATFORM=$(JGSKIT_TARGET) JAVA_HOME=$(BOOT_JDK) GSKIT_HOME=$(GSKIT_HOME) JCE_CLASSPATH=$(OPENJCEPLUS_TOPDIR)/src/main/java/:$(TOPDIR)/src/java.base/share/classes/ \
-		&& $(MAKE) -j1 -C $(OPENJCEPLUS_TOPDIR)/src/main/native/ -f jgskit.mak all
+	export PLATFORM=$(JGSKIT_TARGET) JAVA_HOME=$(BOOT_JDK) GSKIT_HOME=$(GSKIT_HOME) JCE_CLASSPATH=$(JCE_CLASSPATH) \
+		&& $(MAKE) -j1 -C $(JGSKIT_MAKE_PATH) -f $(JGSKIT_MAKE) all
 	@$(ECHO) OpenJCEplus compile complete
 
 endif # BUILD_JGSKIT