Working on MSVC build.

Perry Werneck
1 parent 98f358fb
Showing 8 changed files with 24 additions and 6 deletions Show diff stats
client/src/core/windows/dynamic/init.cc
client/src/core/windows/tools.cc
ipc3270.exp
ipc3270.lib
lib3270.dll
lib3270.exp
lib3270.lib
win/Makefile.msc
@@ -40,10 +40,14 @@
  #include <delayimp.h>
  #include <fcntl.h>
  
+#if defined(_MSC_VER)
+	#pragma comment(lib,"lib3270.lib")
+#endif // _MSC_VER
+
  extern "C" {
  
-	extern __declspec (dllexport) PfnDliHook __pfnDliNotifyHook2;
-	extern __declspec (dllexport) PfnDliHook __pfnDliFailureHook2;
+//	extern __declspec (dllexport) PfnDliHook __pfnDliNotifyHook2;
+//	extern __declspec (dllexport) PfnDliHook __pfnDliFailureHook2;
  
 	FARPROC WINAPI IPC3270_DelayLoadHook(unsigned reason, DelayLoadInfo * info);
  
@@ -55,8 +59,8 @@
  
  // https://docs.microsoft.com/en-us/cpp/build/reference/loading-all-imports-for-a-delay-loaded-dll?view=vs-2019
  
- PfnDliHook __pfnDliNotifyHook2 = IPC3270_DelayLoadHook;
- PfnDliHook __pfnDliFailureHook2 = IPC3270_DelayLoadHook;
+ const PfnDliHook __pfnDliNotifyHook2 = IPC3270_DelayLoadHook;
+ const PfnDliHook __pfnDliFailureHook2 = IPC3270_DelayLoadHook;
  
  static HANDLE hModule = 0;
  static HANDLE hEventLog = 0;
@@ -40,6 +40,10 @@
  #include <lmcons.h>
  #include <fcntl.h>
  
+#if defined(_MSC_VER)
+	#pragma comment(lib,"Advapi32.lib")
+#endif // _MSC_VER
+
  using std::string;
  
 /*---[ Implement ]----------------------------------------------------------------------------------*/
@@ -78,8 +78,18 @@ OBJ_FILES= \
  
 ipc3270.dll: \
 	$(OBJ_FILES) \
-	client\src\core\windows\dynamic\init.obj
+	client\src\core\windows\dynamic\init.obj \
+	lib3270.lib
 	link \
 		/DLL \
 		/OUT:"$@" \
-		$<
+		$(OBJ_FILES) \
+		client\src\core\windows\dynamic\init.obj \
+		/DELAYLOAD:lib3270.dll
+
+
+lib3270.lib:
+	lib \
+		/def:"c:\Program Files\pw3270\sdk\def\lib3270.def" \
+		/out:lib3270.lib
+
...	...	@@ -40,10 +40,14 @@
40	40	#include <delayimp.h>
41	41	#include <fcntl.h>
42	42
	43	+#if defined(_MSC_VER)
	44	+ #pragma comment(lib,"lib3270.lib")
	45	+#endif // _MSC_VER
	46	+
43	47	extern "C" {
44	48
45		- extern __declspec (dllexport) PfnDliHook __pfnDliNotifyHook2;
46		- extern __declspec (dllexport) PfnDliHook __pfnDliFailureHook2;
	49	+// extern __declspec (dllexport) PfnDliHook __pfnDliNotifyHook2;
	50	+// extern __declspec (dllexport) PfnDliHook __pfnDliFailureHook2;
47	51
48	52	FARPROC WINAPI IPC3270_DelayLoadHook(unsigned reason, DelayLoadInfo * info);
49	53
...	...	@@ -55,8 +59,8 @@
55	59
56	60	// https://docs.microsoft.com/en-us/cpp/build/reference/loading-all-imports-for-a-delay-loaded-dll?view=vs-2019
57	61
58		- PfnDliHook __pfnDliNotifyHook2 = IPC3270_DelayLoadHook;
59		- PfnDliHook __pfnDliFailureHook2 = IPC3270_DelayLoadHook;
	62	+ const PfnDliHook __pfnDliNotifyHook2 = IPC3270_DelayLoadHook;
	63	+ const PfnDliHook __pfnDliFailureHook2 = IPC3270_DelayLoadHook;
60	64
61	65	static HANDLE hModule = 0;
62	66	static HANDLE hEventLog = 0;
...	...
...	...	@@ -40,6 +40,10 @@
40	40	#include <lmcons.h>
41	41	#include <fcntl.h>
42	42
	43	+#if defined(_MSC_VER)
	44	+ #pragma comment(lib,"Advapi32.lib")
	45	+#endif // _MSC_VER
	46	+
43	47	using std::string;
44	48
45	49	/---[ Implement ]----------------------------------------------------------------------------------/
...	...
...	...	@@ -78,8 +78,18 @@ OBJ_FILES= \
78	78
79	79	ipc3270.dll: \
80	80	$(OBJ_FILES) \
81		- client\src\core\windows\dynamic\init.obj
	81	+ client\src\core\windows\dynamic\init.obj \
	82	+ lib3270.lib
82	83	link \
83	84	/DLL \
84	85	/OUT:"$@" \
85		- $<
	86	+ $(OBJ_FILES) \
	87	+ client\src\core\windows\dynamic\init.obj \
	88	+ /DELAYLOAD:lib3270.dll
	89	+
	90	+
	91	+lib3270.lib:
	92	+ lib \
	93	+ /def:"c:\Program Files\pw3270\sdk\def\lib3270.def" \
	94	+ /out:lib3270.lib
	95	+
...	...