From 0e98696981da651b9b4eb6b5ab444b5c395413a1 Mon Sep 17 00:00:00 2001
From: Perry Werneck <perry.werneck@gmail.com>
Date: Tue, 3 Dec 2019 11:28:53 -0300
Subject: [PATCH] Working on MSVC build.

---
 .gitignore                              |  4 ++++
 client/src/core/windows/dynamic/init.cc |  1 +
 client/src/include/lib3270/ipc.h        |  2 +-
 client/src/testprogram/testprogram.cc   |  7 +++++++
 lib3270.dll                             | Bin 4938865 -> 0 bytes
 lib3270.exp                             | Bin 43846 -> 0 bytes
 lib3270.lib                             | Bin 72664 -> 0 bytes
 win/Makefile.msc                        | 19 ++++++++++++++++++-
 8 files changed, 31 insertions(+), 2 deletions(-)
 delete mode 100644 lib3270.dll
 delete mode 100644 lib3270.exp
 delete mode 100644 lib3270.lib

diff --git a/.gitignore b/.gitignore
index 00591e4..3a29553 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,5 +25,9 @@ doxygen/doxyfile
 doxygen/html
 *.obj
 *.bat
+*.exe
+*.dll
+*.lib
+*.exp
 
 
diff --git a/client/src/core/windows/dynamic/init.cc b/client/src/core/windows/dynamic/init.cc
index c2c60d9..375f0ee 100644
--- a/client/src/core/windows/dynamic/init.cc
+++ b/client/src/core/windows/dynamic/init.cc
@@ -42,6 +42,7 @@
 
 #if defined(_MSC_VER)
 	#pragma comment(lib,"lib3270.lib")
+	#pragma comment(lib,"DelayImp.lib")
 #endif // _MSC_VER
 
  extern "C" {
diff --git a/client/src/include/lib3270/ipc.h b/client/src/include/lib3270/ipc.h
index a8c16f2..7b66dc3 100644
--- a/client/src/include/lib3270/ipc.h
+++ b/client/src/include/lib3270/ipc.h
@@ -39,7 +39,7 @@
 	#include <lib3270/keyboard.h>
 	#include <lib3270/actions.h>
 
-	#if defined(_WIN32)
+	#if defined(_WIN32) || defined(_MSC_VER)
 
 		#define TN3270_PUBLIC	__declspec (dllexport)
 		#define TN3270_PRIVATE
diff --git a/client/src/testprogram/testprogram.cc b/client/src/testprogram/testprogram.cc
index a242171..84ecfd6 100644
--- a/client/src/testprogram/testprogram.cc
+++ b/client/src/testprogram/testprogram.cc
@@ -41,6 +41,10 @@
  #pragma GCC diagnostic ignored "-Wunused-function"
 #endif // _WIN32
 
+#if defined(_MSC_VER)
+	#pragma comment(lib,"ipc3270.lib")
+#endif // _MSC_VER
+
  #include <cstdlib>
  #include <lib3270.h>
  #include <lib3270/ipc.h>
@@ -117,6 +121,9 @@
  // test host object
  static void testHost(const char *session) {
 
+	cout
+	 	<< "Creating host" << endl;
+
 	TN3270::Host host{session,nullptr,10};
 
 	try {
diff --git a/lib3270.dll b/lib3270.dll
deleted file mode 100644
index d97701b..0000000
Binary files a/lib3270.dll and /dev/null differ
diff --git a/lib3270.exp b/lib3270.exp
deleted file mode 100644
index 78045dd..0000000
Binary files a/lib3270.exp and /dev/null differ
diff --git a/lib3270.lib b/lib3270.lib
deleted file mode 100644
index 472c97f..0000000
Binary files a/lib3270.lib and /dev/null differ
diff --git a/win/Makefile.msc b/win/Makefile.msc
index aaeac6f..f87782c 100644
--- a/win/Makefile.msc
+++ b/win/Makefile.msc
@@ -75,17 +75,29 @@ OBJ_FILES= \
 		/DPACKAGE_NAME=\"ipc3270\" \
 		/DPRODUCT_NAME=\"$(PRODUCT_NAME)" \
 		/DLIB3270_NAME=\"$(LIB3270_NAME)" \
+		/DDEBUG=1 \
 		/I"C:\msys64\project\pw3270\ipc\client\src\include" \
 		/I"c:\Program Files\pw3270\sdk\include" \
 		/EHsc \
 		/Fo"$@" \
 		$<
 
+testprogram.exe: \
+	client\src\testprogram\testprogram.obj \
+	ipc3270.dll
+	@echo Build exe file....
+	link \
+		/nologo \
+		/OUT:"$@" \
+		client\src\testprogram\testprogram.obj
+
 ipc3270.dll: \
 	$(OBJ_FILES) \
 	client\src\core\windows\dynamic\init.obj \
 	lib3270.lib
+	@echo Build dll file....
 	link \
+		/NOLOGO \
 		/DLL \
 		/OUT:"$@" \
 		$(OBJ_FILES) \
@@ -98,4 +110,9 @@ $(LIB3270_NAME).lib:
 		/out:$(LIB3270_NAME).lib
 
 clean:
-	del $(LIB3270_NAME).lib
\ No newline at end of file
+	del \
+		$(LIB3270_NAME).lib \
+		$(LIB3270_NAME).dll \
+		ipc3270.lib \
+		ipc3270.dll \
+		$(OBJ_FILES)
--
libgit2 0.21.2