Download as
Browse Code »

Commit 0e98696981da651b9b4eb6b5ab444b5c395413a1

Authored by Perry Werneck
1 parent 4cb4d2e2
Exists in master and in 1 other branch develop

Working on MSVC build.

Showing 8 changed files with 31 additions and 2 deletions   Show diff stats
@@ -25,5 +25,9 @@ doxygen/doxyfile @@ -25,5 +25,9 @@ doxygen/doxyfile
25 doxygen/html 25 doxygen/html
26 *.obj 26 *.obj
27 *.bat 27 *.bat
  28 +*.exe
  29 +*.dll
  30 +*.lib
  31 +*.exp
28 32
29 33
client/src/core/windows/dynamic/init.cc
  Diff comments   View file @0e98696
@@ -42,6 +42,7 @@ @@ -42,6 +42,7 @@
42 42
43 #if defined(_MSC_VER) 43 #if defined(_MSC_VER)
44 #pragma comment(lib,"lib3270.lib") 44 #pragma comment(lib,"lib3270.lib")
  45 + #pragma comment(lib,"DelayImp.lib")
45 #endif // _MSC_VER 46 #endif // _MSC_VER
46 47
47 extern "C" { 48 extern "C" {
client/src/include/lib3270/ipc.h
  Diff comments   View file @0e98696
@@ -39,7 +39,7 @@ @@ -39,7 +39,7 @@
39 #include <lib3270/keyboard.h> 39 #include <lib3270/keyboard.h>
40 #include <lib3270/actions.h> 40 #include <lib3270/actions.h>
41 41
42 - #if defined(_WIN32) 42 + #if defined(_WIN32) || defined(_MSC_VER)
43 43
44 #define TN3270_PUBLIC __declspec (dllexport) 44 #define TN3270_PUBLIC __declspec (dllexport)
45 #define TN3270_PRIVATE 45 #define TN3270_PRIVATE
client/src/testprogram/testprogram.cc
  Diff comments   View file @0e98696
@@ -41,6 +41,10 @@ @@ -41,6 +41,10 @@
41 #pragma GCC diagnostic ignored "-Wunused-function" 41 #pragma GCC diagnostic ignored "-Wunused-function"
42 #endif // _WIN32 42 #endif // _WIN32
43 43
  44 +#if defined(_MSC_VER)
  45 + #pragma comment(lib,"ipc3270.lib")
  46 +#endif // _MSC_VER
  47 +
44 #include <cstdlib> 48 #include <cstdlib>
45 #include <lib3270.h> 49 #include <lib3270.h>
46 #include <lib3270/ipc.h> 50 #include <lib3270/ipc.h>
@@ -117,6 +121,9 @@ @@ -117,6 +121,9 @@
117 // test host object 121 // test host object
118 static void testHost(const char *session) { 122 static void testHost(const char *session) {
119 123
  124 + cout
  125 + << "Creating host" << endl;
  126 +
120 TN3270::Host host{session,nullptr,10}; 127 TN3270::Host host{session,nullptr,10};
121 128
122 try { 129 try {
lib3270.dll
View file @4cb4d2e
No preview for this file type
lib3270.exp
View file @4cb4d2e
No preview for this file type
lib3270.lib
View file @4cb4d2e
No preview for this file type
win/Makefile.msc
  Diff comments   View file @0e98696
@@ -75,17 +75,29 @@ OBJ_FILES= \ @@ -75,17 +75,29 @@ OBJ_FILES= \
75 /DPACKAGE_NAME=\"ipc3270\" \ 75 /DPACKAGE_NAME=\"ipc3270\" \
76 /DPRODUCT_NAME=\"$(PRODUCT_NAME)" \ 76 /DPRODUCT_NAME=\"$(PRODUCT_NAME)" \
77 /DLIB3270_NAME=\"$(LIB3270_NAME)" \ 77 /DLIB3270_NAME=\"$(LIB3270_NAME)" \
  78 + /DDEBUG=1 \
78 /I"C:\msys64\project\pw3270\ipc\client\src\include" \ 79 /I"C:\msys64\project\pw3270\ipc\client\src\include" \
79 /I"c:\Program Files\pw3270\sdk\include" \ 80 /I"c:\Program Files\pw3270\sdk\include" \
80 /EHsc \ 81 /EHsc \
81 /Fo"$@" \ 82 /Fo"$@" \
82 $< 83 $<
83 84
  85 +testprogram.exe: \
  86 + client\src\testprogram\testprogram.obj \
  87 + ipc3270.dll
  88 + @echo Build exe file....
  89 + link \
  90 + /nologo \
  91 + /OUT:"$@" \
  92 + client\src\testprogram\testprogram.obj
  93 +
84 ipc3270.dll: \ 94 ipc3270.dll: \
85 $(OBJ_FILES) \ 95 $(OBJ_FILES) \
86 client\src\core\windows\dynamic\init.obj \ 96 client\src\core\windows\dynamic\init.obj \
87 lib3270.lib 97 lib3270.lib
  98 + @echo Build dll file....
88 link \ 99 link \
  100 + /NOLOGO \
89 /DLL \ 101 /DLL \
90 /OUT:"$@" \ 102 /OUT:"$@" \
91 $(OBJ_FILES) \ 103 $(OBJ_FILES) \
@@ -98,4 +110,9 @@ $(LIB3270_NAME).lib: @@ -98,4 +110,9 @@ $(LIB3270_NAME).lib:
98 /out:$(LIB3270_NAME).lib 110 /out:$(LIB3270_NAME).lib
99 111
100 clean: 112 clean:
101 - del $(LIB3270_NAME).lib  
102 \ No newline at end of file 113 \ No newline at end of file
  114 + del \
  115 + $(LIB3270_NAME).lib \
  116 + $(LIB3270_NAME).dll \
  117 + ipc3270.lib \
  118 + ipc3270.dll \
  119 + $(OBJ_FILES)