From 733e0bdaa8e93a7dbcc7a4c9ae8ca7da1efd4b54 Mon Sep 17 00:00:00 2001
From: Perry Werneck <perry.werneck@gmail.com>
Date: Fri, 9 Nov 2018 18:15:21 -0200
Subject: [PATCH] Ajustes para empacotamento windows

---
 Makefile.in                         | 6 +++---
 configure.ac                        | 8 +++++++-
 src/lib3270/util.c                  | 2 +-
 src/lib3270/windows/resources.rc.in | 2 +-
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 6064e73..491fd06 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -90,7 +90,9 @@ CFLAGS= \
 
 LIBS= \
 	@LIBS@ \
-	@LIBSSL_LIBS@
+	@LIBSSL_LIBS@ \
+	@LIBICONV@ \
+	@INTL_LIBS@
 
 #---[ Debug Rules ]----------------------------------------------------------------------
 
@@ -104,7 +106,6 @@ $(OBJDBG)/%.o: \
 		$(CFLAGS) \
 		-Wall -Wextra -fstack-check \
 		-DDEBUG=1 \
-		-DDATADIR=$(BASEDIR) \
 		-o $@ -c $<
 
 #---[ Release Rules ]--------------------------------------------------------------------
@@ -118,7 +119,6 @@ $(OBJRLS)/%.o: \
 	@$(CC) \
 		$(CFLAGS) \
 		-DNDEBUG=1 \
-		-DDATADIR=$(datarootdir)/pw3270 \
 		-o $@ -c $<
 
 #---[ Misc Rules ]-----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index 963950e..911ce04 100644
--- a/configure.ac
+++ b/configure.ac
@@ -76,8 +76,14 @@ case "$host" in
 	*-mingw32)
 		app_cv_osname="windows"
 		CFLAGS="$CFLAGS -pthread -D_WIN32_WINNT=0x0600"
+		LIBS="$LIBS -lws2_32 -lwtsapi32 -lcomdlg32"
 		LDFLAGS="$LDFLAGS -pthread -static-libgcc -static-libstdc++"
 		DLLEXT=".dll"
+
+		app_win32_revision=$(date +%y.%m.%d.%H)
+		AC_SUBST(WIN32_VERSION,$app_win32_revision)
+
+		AC_CONFIG_FILES(src/lib3270/windows/resources.rc)
 		;;
 
  	s390x-*)
@@ -103,7 +109,7 @@ esac
 
 AC_SUBST(DATADIR,$app_cv_datadir)
 AC_SUBST(CONFDIR,$app_cv_confdir)
-AC_SUBST(OSNAME,$app_cv_confdir)
+AC_SUBST(OSNAME,$app_cv_osname)
 AC_SUBST(LIBS)
 AC_SUBST(LOGDIR)
 AC_SUBST(DLLEXT)
diff --git a/src/lib3270/util.c b/src/lib3270/util.c
index 106d0e4..5ec2bdd 100644
--- a/src/lib3270/util.c
+++ b/src/lib3270/util.c
@@ -208,7 +208,7 @@ LIB3270_EXPORT const char * lib3270_win32_local_charset(void)
 	// Reference:
 	// http://msdn.microsoft.com/en-us/library/windows/desktop/dd318070(v=vs.85).aspx
 
-	#warning TODO: Use GetACP() to identify the correct code page
+	/// TODO: Use GetACP() to identify the correct code page
 
 	trace("Windows CHARSET is %u",GetACP());
 
diff --git a/src/lib3270/windows/resources.rc.in b/src/lib3270/windows/resources.rc.in
index 6bfe54d..2ca7c88 100644
--- a/src/lib3270/windows/resources.rc.in
+++ b/src/lib3270/windows/resources.rc.in
@@ -14,7 +14,7 @@ BEGIN
 			VALUE "CompanyName",		"Banco do Brasil S/A.\0"
 			VALUE "FileVersion",		"@WIN32_VERSION@\0"
             		VALUE "LegalCopyright",		"(C) 2017 Banco do Brasil S/A. All Rights Reserved\0"
-			VALUE "OriginalFilename",	"@PACKAGE_TARNAME@.exe\0"
+			VALUE "OriginalFilename",	"@PACKAGE_TARNAME@@DLLEXT@\0"
 			VALUE "ProductName",		"@PACKAGE_NAME@\0"
 			VALUE "ProductVersion",		"@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@.@PACKAGE_MAJOR_RELEASE@.0\0"
 		END
--
libgit2 0.21.2