Debug windows build

bjasspa · Jul 29, 2024 · e19159f · e19159f
1 parent e76acbd
commit e19159f
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 16 deletions.
diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml
@@ -19,19 +19,18 @@ jobs:
         Write-Output "VSDEVCMD=${installationPath}\Common7\Tools\VsDevCmd.bat" `
           | Out-File -FilePath "${Env:GITHUB_ENV}" -Append
         cat "${Env:GITHUB_ENV}"
-        choco install openssl
-        c:
-        cd "C:\Program Files"
-        dir
-        cd OpenSSL
-        dir
-        cd ..
-        cd OpenSSL-Win64
-        dir
-                
+        
     - name: Checkout code
       uses: actions/checkout@v4
 
+    - name: Download pre-built OpenSSL
+      shell: pwsh
+      run: |
+        cd .\microemacs\3rdparty
+        Invoke-WebRequest https://download.firedaemon.com/FireDaemon-OpenSSL/openssl-3.0.14.zip -OutFile openssl.zip
+        Expand-Archive -Path .\openssl.zip -DestinationPath .
+        dir .
+        
     - name: Compile windows100 mec
       shell: pwsh
       run: |

diff --git a/microemacs/src/winmingw.mak b/microemacs/src/winmingw.mak
@@ -130,11 +130,17 @@ OSSL_LIB = -x64
 else
 OSSL_DIR = x86
 endif
-ifneq "$(wildcard $(TRDPARTY)/openssl-3.1/$(OSSL_DIR)/include/openssl/ssl.h)" ""
+ifneq "$(wildcard $(TRDPARTY)/openssl-3.3/$(OSSL_DIR)/include/openssl/ssl.h)" ""
+OPENSSLP = $(TRDPARTY)/openssl-3.3/$(OSSL_DIR)
+OPENSSLV = -3_3$(OSSL_LIB)
+else ifneq "$(wildcard $(TRDPARTY)/openssl-3.2/$(OSSL_DIR)/include/openssl/ssl.h)" ""
+OPENSSLP = $(TRDPARTY)/openssl-3.2/$(OSSL_DIR)
+OPENSSLV = -3_2$(OSSL_LIB)
+else ifneq "$(wildcard $(TRDPARTY)/openssl-3.1/$(OSSL_DIR)/include/openssl/ssl.h)" ""
 OPENSSLP = $(TRDPARTY)/openssl-3.1/$(OSSL_DIR)
 OPENSSLV = -3_1$(OSSL_LIB)
-else ifneq "$(wildcard $(TRDPARTY)/openssl-3/$(OSSL_DIR)/include/openssl/ssl.h)" ""
-OPENSSLP = $(TRDPARTY)/openssl-3/$(OSSL_DIR)
+else ifneq "$(wildcard $(TRDPARTY)/openssl-3.0/$(OSSL_DIR)/include/openssl/ssl.h)" ""
+OPENSSLP = $(TRDPARTY)/openssl-3.0/$(OSSL_DIR)
 OPENSSLV = -3$(OSSL_LIB)
 else ifneq "$(wildcard $(TRDPARTY)/openssl-1.1/$(OSSL_DIR)/include/openssl/ssl.h)" ""
 OPENSSLP = $(TRDPARTY)/openssl-1.1/$(OSSL_DIR)

diff --git a/microemacs/src/winmsvc.mak b/microemacs/src/winmsvc.mak
@@ -157,11 +157,17 @@ OSSL_LIB = -x64
 !ELSE
 OSSL_DIR = x86
 !ENDIF
-!IF EXISTS($(TRDPARTY)\openssl-3.1\$(OSSL_DIR)\include\openssl\ssl.h)
+!IF EXISTS($(TRDPARTY)\openssl-3.3\$(OSSL_DIR)\include\openssl\ssl.h)
+OPENSSLP = $(TRDPARTY)\openssl-3.3\$(OSSL_DIR)
+OPENSSLV = -3_3$(OSSL_LIB)
+!ELSEIF EXISTS($(TRDPARTY)\openssl-3.2\$(OSSL_DIR)\include\openssl\ssl.h)
+OPENSSLP = $(TRDPARTY)\openssl-3.2\$(OSSL_DIR)
+OPENSSLV = -3_2$(OSSL_LIB)
+!ELSEIF EXISTS($(TRDPARTY)\openssl-3.1\$(OSSL_DIR)\include\openssl\ssl.h)
 OPENSSLP = $(TRDPARTY)\openssl-3.1\$(OSSL_DIR)
 OPENSSLV = -3_1$(OSSL_LIB)
-!ELSEIF EXISTS($(TRDPARTY)\openssl-3\$(OSSL_DIR)\include\openssl\ssl.h)
-OPENSSLP = $(TRDPARTY)\openssl-3\$(OSSL_DIR)
+!ELSEIF EXISTS($(TRDPARTY)\openssl-3.0\$(OSSL_DIR)\include\openssl\ssl.h)
+OPENSSLP = $(TRDPARTY)\openssl-3.0\$(OSSL_DIR)
 OPENSSLV = -3$(OSSL_LIB)
 !ELSEIF EXISTS($(TRDPARTY)\openssl-1.1\$(OSSL_DIR)\include\openssl\ssl.h)
 OPENSSLP = $(TRDPARTY)\openssl-1.1\$(OSSL_DIR)