From 18067214b840423d939023dc676ae3c730649c02 Mon Sep 17 00:00:00 2001
From: Perry Werneck <perry.werneck@gmail.com>
Date: Mon, 27 Jan 2020 11:51:17 -0300
Subject: [PATCH] Fixing windows builds.

---
 configure.ac      | 3 +++
 win/hllapi.nsi.in | 7 ++++---
 win/pack.sh       | 6 +++++-
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index d5b8718..4cafdf3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -117,14 +117,17 @@ case "$host" in
 		if test "$host_cpu" = "x86_64"; then
 			app_cv_programfiles="PROGRAMFILES64"
 			app_cv_winarch="64"
+			app_cv_nsisredir="DisableX64FSRedirection"
 		else
 			app_cv_programfiles="PROGRAMFILES"
 			app_cv_winarch="32"
+			app_cv_nsisredir="EnableX64FSRedirection"
 		fi
 
 		AC_SUBST(PROGRAMFILES,$app_cv_programfiles)
 		AC_SUBST(WINARCH,$app_cv_winarch)
                 AC_SUBST(SONAME,hllapi.dll)
+		AC_SUBST(NSISREDIR,$app_cv_nsisredir)
 
 		;;
 
diff --git a/win/hllapi.nsi.in b/win/hllapi.nsi.in
index 40e9020..0d34802 100644
--- a/win/hllapi.nsi.in
+++ b/win/hllapi.nsi.in
@@ -51,13 +51,13 @@ SubSection "@PACKAGE@" SecMain
 
 	Section "Core" SecCore
 
-		SetRegView @WINARCH@
-		${DisableX64FSRedirection}
-
 		# define the output path for this file
 		setOutPath $SYSDIR
 		SetShellVarContext all
 
+		SetRegView @WINARCH@
+		${@NSISREDIR@}
+
 		file "/oname=$SYSDIR\hllapi.dll" "libhllapi.dll"
 
 		# For compatibility with old scripts.
@@ -99,6 +99,7 @@ Section "Uninstall"
 	delete $INSTDIR\uninstaller.exe
 
 	# delete installed files
+	${@NSISREDIR@}
 	delete $SYSDIR\hllapi.dll
 	delete $SYSDIR\libhllapi.dll
 
diff --git a/win/pack.sh b/win/pack.sh
index 1713df6..9927427 100755
--- a/win/pack.sh
+++ b/win/pack.sh
@@ -104,6 +104,10 @@ do
 			PUBLISH=0
 			;;
 
+		NO-PUBLISH)
+			PUBLISH=0
+			;;
+
 		PUBLISH)
 			PUBLISH=1
 			;;
@@ -118,7 +122,7 @@ do
 			echo ""
 
 			if [ ! -z ${WIN_PACKAGE_SERVER} ]; then
-				echo "  --nopublish	Don't publish in ${WIN_PACKAGE_SERVER}"
+				echo "  --no-publish	Don't publish in ${WIN_PACKAGE_SERVER}"
 				echo "  --publish	Publish in ${WIN_PACKAGE_SERVER}"
 			fi
 
--
libgit2 0.21.2