From de621e88e70050947a8a87ef9943953b60fa8785 Mon Sep 17 00:00:00 2001
From: Perry Werneck <perry.werneck@gmail.com>
Date: Fri, 3 Jul 2020 16:35:39 -0300
Subject: [PATCH] Fixing windows build.

---
 win/pack.sh       |  4 ++--
 win/pw3270.nsi.in | 37 ++++++++++++++++++++++++++++++++++++-
 2 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/win/pack.sh b/win/pack.sh
index 94f8c62..918437d 100755
--- a/win/pack.sh
+++ b/win/pack.sh
@@ -87,16 +87,16 @@ clone()
 		BRANCH=${!TEMPVAR}
 	fi
 
+	echo "Cloning ${1} ${BRANCH}"
 	if [ -z ${BRANCH} ]; then
 		git clone --quiet ${GIT_URL}/${1}.git ${WORKDIR}/sources/${1}
 	else
 		echo -e "\e]2;Cloning ${1} ${BRANCH}\a"
-		echo "Cloning ${1} ${BRANCH}"
 		git clone --quiet --branch "${BRANCH}" ${GIT_URL}/${1}.git ${WORKDIR}/sources/${1}
 	fi
 
 	if [ "$?" != "0" ]; then
-		failed "Can't get sources for ${1}"
+		failed "Can't get ${BRANCH} sources for ${1}"
 	fi
 
 }
diff --git a/win/pw3270.nsi.in b/win/pw3270.nsi.in
index 208bc23..1072903 100644
--- a/win/pw3270.nsi.in
+++ b/win/pw3270.nsi.in
@@ -118,6 +118,7 @@ SubSection "@PRODUCT_NAME@" SecMain
 		# Misc folders
 		CreateDirectory "$INSTDIR\certs"
 		CreateDirectory "$INSTDIR\plugins"
+		CreateDirectory "$INSTDIR\keypad"
 
 		# UI definition files
 		CreateDirectory "$INSTDIR\ui"
@@ -211,6 +212,13 @@ SubSection "@PRODUCT_NAME@" SecMain
 		SectionEnd
 !endif
 
+		Section "KEYPADS" Keypads
+
+			file "/oname=$INSTDIR\keypad\00-right.xml" 	"@PRODUCT_NAME@\keypad\00-right.xml"
+			file "/oname=$INSTDIR\keypad\10-bottom.xml" 	"@PRODUCT_NAME@\keypad\10-bottom.xml"
+
+		SectionEnd
+
 !ifdef WITHMONO-TN3270
 		Section /o ".NET" DOTNET
 
@@ -331,7 +339,34 @@ SectionEnd
 
 Function .onInit
 
-	#---[ Check DOTNET Command line option ]0-------------------------------------------------------------
+	#---[ Check SDK Command line option ]-----------------------------------------------------------------
+
+!ifdef WITHSDK
+
+	Push $0
+
+	${GetParameters} $R0
+	ClearErrors
+	${GetOptions} $R0 /SDK= $0
+
+	${if} $0 == "NO"
+
+		SectionGetFlags ${SDK} $0
+		IntOp $0 $0 & ${SECTION_OFF}
+		SectionSetFlags ${SDK} $0
+
+	${else}
+
+		SectionGetFlags ${SDK} $0
+		IntOp $0 $0 | ${SF_SELECTED}
+		SectionSetFlags ${SDK} $0
+
+	${EndIf}
+
+	Pop $0
+!endif
+
+	#---[ Check DOTNET Command line option ]--------------------------------------------------------------
 
 !ifdef WITHMONO-TN3270
 	Push $0
--
libgit2 0.21.2