diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index 5ff018e..de4d5e0 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -32,7 +32,6 @@ jobs: mkdir ../builds docker run --rm -i -v $(pwd)/../builds:/builds -v $(pwd):/sources cyd01/cross-gcc "cd ${VERSION}_My_PuTTY/windows ; make -f MAKEFILE.MINGW cross ; cd /builds ; ls -l" mv -f $(pwd)/../builds ./ - cd builds ; zip kitty.zip *.exe # Upload runner package tar.gz/zip as artifact - name: Publish Artifact @@ -40,7 +39,7 @@ jobs: uses: actions/upload-artifact@v1 with: name: kitty.zip - path: builds/kitty.zip + path: builds/ # Build for Win 64bits build64: @@ -57,7 +56,6 @@ jobs: mkdir ../builds docker run --rm -i -v $(pwd)/../builds:/builds -v $(pwd):/sources cyd01/cross-gcc "cd ${VERSION}_My_PuTTY/windows ; make -f MAKEFILE.MINGW cross64 ; cd /builds ; ls -l" mv -f $(pwd)/../builds ./ - cd builds ; zip kitty.zip *.exe # Upload runner package tar.gz/zip as artifact - name: Publish Artifact @@ -65,4 +63,4 @@ jobs: uses: actions/upload-artifact@v1 with: name: kitty64.zip - path: builds/kitty.zip + path: builds/ diff --git a/0.74_My_PuTTY/windows/MAKEFILE.MINGW b/0.74_My_PuTTY/windows/MAKEFILE.MINGW index 22efabb..ac5a3d3 100644 --- a/0.74_My_PuTTY/windows/MAKEFILE.MINGW +++ b/0.74_My_PuTTY/windows/MAKEFILE.MINGW @@ -2135,7 +2135,6 @@ clean: cross: sed -i 's#^typedef enum _WTS_VIRTUAL_CLASS #// typedef enum _WTS_VIRTUAL_CLASS #' window.c - cat version.txt|sed 's/\.//g'|sed 's/^/0.0.0./' make -e TOOLPATH=/usr/bin/i686-w64-mingw32- -f MAKEFILE.MINGW putty.exe plink.exe pscp.exe psftp.exe pageant.exe puttygen.exe make -e TOOLPATH=/usr/bin/i686-w64-mingw32- -f MAKEFILE.MINGW portable cp putty.exe putty_nocompress.exe @@ -2152,7 +2151,6 @@ cross: cross64: sed -i 's#^typedef enum _WTS_VIRTUAL_CLASS #// typedef enum _WTS_VIRTUAL_CLASS #' window.c - cat version.txt|sed 's/\.//g'|sed 's/^/0.0.0./' make -e TOOLPATH=/usr/bin/x86_64-w64-mingw32- -f MAKEFILE.MINGW putty.exe || /usr/bin/x86_64-w64-mingw32-gcc -o kitty64.exe *.o ../../base64/base64_64.a ../../bcrypt/bcrypt_64.a ../../blocnote/notepad_64.a ../../jpeg/libjpeg_64.a ../../md5/MD5check_64.a ../../mini/mini_64.a ../../regex/libregex_64.a -ladvapi32 -lcomdlg32 -lgdi32 -limm32 -lpsapi -lole32 -lshell32 -luser32 -lwsock32 -lwtsapi32 -mwindows upx --best --compress-icons=2 --compress-exports=0 kitty64.exe mv kitty64.exe /builds/kitty64.exe