From 9c87cd0297b749df976c57e110bc6df722f849e3 Mon Sep 17 00:00:00 2001 From: cyd01 Date: Wed, 22 Jun 2022 11:21:12 +0200 Subject: [PATCH] fix compilation issue --- 0.76_My_PuTTY/windows/MAKEFILE.MINGW | 14 ++++++++------ 0.76b_My_PuTTY/windows/MAKEFILE.MINGW | 3 ++- docs/pages/HowToCompile.md | 4 ++-- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/0.76_My_PuTTY/windows/MAKEFILE.MINGW b/0.76_My_PuTTY/windows/MAKEFILE.MINGW index 7df5b37..7203fd6 100644 --- a/0.76_My_PuTTY/windows/MAKEFILE.MINGW +++ b/0.76_My_PuTTY/windows/MAKEFILE.MINGW @@ -209,7 +209,7 @@ pageant.exe: aqsync.o be_misc.o callback.o conf.o ecc.o errsock.o marshal.o \ winpgnt.o winpgntc.o winsecur.o winselgui.o winutils.o \ notiming.o \ kitty_commun.o kitty_crypt.o kitty_registry.o - $(CC) -mwindows $(LDFLAGS) -o $@ -Wl,-Map,pageant.map aqsync.o \ + $(CC) $(LDFLAGS) -o $@ -Wl,-Map,pageant.map aqsync.o \ be_misc.o callback.o conf.o ecc.o errsock.o marshal.o \ memory.o misc.o mpint.o pageant.o pageant.res.o sshaes.o \ sshargon2.o sshauxcrypt.o sshblake2.o sshdes.o sshdss.o \ @@ -426,7 +426,7 @@ putty.exe: agentf.o aqsync.o be_all_s.o be_misc.o callback.o cmdline.o \ urlhack.o pageant_integrated.o winpgnt_integrated.o winpgen_integrated.o winpzmodem.o \ import.o sshrsag.o sshdssg.o sshprime.o sshecdsag.o sshbcrypt.o pockle.o primecandidate.o millerrabin.o mpunsafe.o \ void.o $(UTF8MOUSE_OBJS) - $(CC) -mwindows $(LDFLAGS) -o $@ -Wl,-Map,putty.map agentf.o \ + $(CC) $(LDFLAGS) -o $@ -Wl,-Map,putty.map agentf.o \ aqsync.o be_all_s.o be_misc.o callback.o cmdline.o conf.o \ config.o cproxy.o dialog.o ecc.o errsock.o ldisc.o logging.o \ mainchan.o marshal.o memory.o minibidi.o misc.o miscucs.o \ @@ -475,7 +475,7 @@ puttygen.exe: conf.o ecc.o import.o marshal.o memory.o millerrabin.o misc.o \ winmisc.o winmiscs.o winnoise.o winnojmp.o winpgen.o \ winsecur.o winstore.o wintime.o winutils.o \ kitty_commun.o kitty_crypt.o kitty_registry.o kitty_keygen.o kitty_store.o kitty_tools.o - $(CC) -mwindows $(LDFLAGS) -o $@ -Wl,-Map,puttygen.map conf.o ecc.o \ + $(CC) $(LDFLAGS) -o $@ -Wl,-Map,puttygen.map conf.o ecc.o \ import.o marshal.o memory.o millerrabin.o misc.o mpint.o \ mpunsafe.o notiming.o pockle.o primecandidate.o \ puttygen.res.o smallprimes.o sshaes.o sshargon2.o \ @@ -501,7 +501,7 @@ puttytel.exe: be_misc.o be_nos_s.o callback.o cmdline.o conf.o config.o \ winhelp.o winhsock.o winjump.o winmisc.o winmiscs.o winnet.o \ winprint.o winproxy.o winsecur.o winselgui.o winser.o \ winstore.o wintime.o winucs.o winutils.o - $(CC) -mwindows $(LDFLAGS) -o $@ -Wl,-Map,puttytel.map be_misc.o \ + $(CC) $(LDFLAGS) -o $@ -Wl,-Map,puttytel.map be_misc.o \ be_nos_s.o callback.o cmdline.o conf.o config.o dialog.o \ errsock.o ldisc.o logging.o marshal.o memory.o minibidi.o \ misc.o miscucs.o nocproxy.o nogss.o norand.o pinger.o \ @@ -2218,7 +2218,7 @@ putty_notrans.exe: agentf.o aqsync.o be_all_s.o be_misc.o callback.o cmdline.o \ urlhack.o pageant_integrated.o winpgnt_integrated.o winpgen_integrated.o \ import.o sshrsag.o sshdssg.o sshprime.o sshecdsag.o sshbcrypt.o \ void.o $(UTF8MOUSE_OBJS) - $(CC) -mwindows $(LDFLAGS) -o $@ -Wl,-Map,putty.map agentf.o \ + $(CC) $(LDFLAGS) -o $@ -Wl,-Map,putty.map agentf.o \ aqsync.o be_all_s.o be_misc.o callback.o cmdline.o conf.o \ config.o cproxy.o dialog.o ecc.o errsock.o ldisc.o \ ldiscucs.o logging.o mainchan.o marshal.o memory.o \ @@ -2276,12 +2276,13 @@ putty_portable.exe: agentf.o aqsync.o be_all_s.o be_misc.o callback.o cmdline.o winselgui.o winser.o winshare.o winstore.o wintime.o \ winucs.o winutils.o winx11.o x11fwd.o \ adb.o \ + cencode.o cdecode.o \ kitty_portable.o kitty_commun_portable.o kitty_crypt.o kitty_image.o kitty_proxy.o kitty_registry.o kitty_ssh.o \ kitty_store.o kitty_tools.o kitty_win.o \ urlhack.o pageant_integrated.o winpgnt_integrated.o winpgen_integrated.o winpzmodem.o \ import.o sshrsag.o sshdssg.o sshprime.o sshecdsag.o sshbcrypt.o pockle.o primecandidate.o millerrabin.o mpunsafe.o \ void.o $(UTF8MOUSE_OBJS) - $(CC) -mwindows $(LDFLAGS) -o $@ -Wl,-Map,putty.map agentf.o \ + $(CC) $(LDFLAGS) -o $@ -Wl,-Map,putty.map agentf.o \ aqsync.o be_all_s.o be_misc.o callback.o cmdline.o conf.o \ config.o cproxy.o dialog.o ecc.o errsock.o ldisc.o logging.o \ mainchan.o marshal.o memory.o minibidi.o misc.o miscucs.o \ @@ -2307,6 +2308,7 @@ putty_portable.exe: agentf.o aqsync.o be_all_s.o be_misc.o callback.o cmdline.o winselgui.o winser.o winshare.o winstore.o wintime.o \ winucs.o winutils.o winx11.o x11fwd.o \ adb.o \ + cencode.o cdecode.o \ kitty_portable.o kitty_commun_portable.o kitty_crypt.o kitty_image.o kitty_proxy.o kitty_registry.o kitty_ssh.o \ kitty_store.o kitty_tools.o kitty_win.o \ urlhack.o pageant_integrated.o winpgnt_integrated.o winpgen_integrated.o winpzmodem.o \ diff --git a/0.76b_My_PuTTY/windows/MAKEFILE.MINGW b/0.76b_My_PuTTY/windows/MAKEFILE.MINGW index 9ee073e..82f5275 100644 --- a/0.76b_My_PuTTY/windows/MAKEFILE.MINGW +++ b/0.76b_My_PuTTY/windows/MAKEFILE.MINGW @@ -426,7 +426,7 @@ putty.exe: agentf.o aqsync.o be_all_s.o be_misc.o callback.o cmdline.o \ urlhack.o pageant_integrated.o winpgnt_integrated.o winpgen_integrated.o winpzmodem.o \ import.o sshrsag.o sshdssg.o sshprime.o sshecdsag.o bcrypt.o pockle.o primecandidate.o millerrabin.o mpunsafe.o \ void.o $(UTF8MOUSE_OBJS) - $(CC) -mwindows $(LDFLAGS) -o $@ -Wl,-Map,putty.map agentf.o \ + $(CC) $(LDFLAGS) -o $@ -Wl,-Map,putty.map agentf.o \ aqsync.o be_all_s.o be_misc.o callback.o cmdline.o conf.o \ config.o cproxy.o dialog.o ecc.o errsock.o ldisc.o logging.o \ mainchan.o marshal.o memory.o minibidi.o misc.o dup_mb_to_wc.o \ @@ -2276,6 +2276,7 @@ putty_portable.exe: agentf.o aqsync.o be_all_s.o be_misc.o callback.o cmdline.o winselgui.o winser.o winshare.o winstore.o wintime.o \ winucs.o winutils.o winx11.o x11fwd.o \ adb.o \ + cencode.o cdecode.o \ kitty_portable.o kitty_commun_portable.o kitty_crypt.o kitty_image.o kitty_proxy.o kitty_registry.o kitty_ssh.o \ kitty_store.o kitty_tools.o kitty_win.o \ urlhack.o pageant_integrated.o winpgnt_integrated.o winpgen_integrated.o winpzmodem.o \ diff --git a/docs/pages/HowToCompile.md b/docs/pages/HowToCompile.md index c71970a..1aecb9f 100644 --- a/docs/pages/HowToCompile.md +++ b/docs/pages/HowToCompile.md @@ -15,13 +15,13 @@ On **Linux** machine it is also possible to cross compile. Example with our cros **For 32 bits compilation** ```bash mkdir builds 2> /dev/null || rm -f builds/*.exe -docker run --rm -it -v $(pwd)/builds:/builds cyd01/cross-gcc "git clone https://github.com/cyd01/KiTTY.git ; cd KiTTY/0.74_My_PuTTY/windows ; make -f MAKEFILE.MINGW cross ; cd /builds ; ls -l" +docker run --rm -it -v $(pwd)/builds:/builds cyd01/cross-gcc "git clone https://github.com/cyd01/KiTTY.git ; cd KiTTY/0.76_My_PuTTY/windows ; make -f MAKEFILE.MINGW cross ; cd /builds ; ls -l" ``` **For 64 bits compilation** ```bash mkdir builds 2> /dev/null || rm -f builds/*.exe -docker run --rm -it -v $(pwd)/builds:/builds cyd01/cross-gcc "git clone https://github.com/cyd01/KiTTY.git ; cd KiTTY/0.74_My_PuTTY/windows ; make -f MAKEFILE.MINGW cross64 ; cd /builds ; ls -l" +docker run --rm -it -v $(pwd)/builds:/builds cyd01/cross-gcc "git clone https://github.com/cyd01/KiTTY.git ; cd KiTTY/0.76_My_PuTTY/windows ; make -f MAKEFILE.MINGW cross64 ; cd /builds ; ls -l" ``` The **kitty.exe** and other stuff will be available into **/builds** directory.