Commit 237f930feea2de03c8de26c6efc1ccf9df8229e4

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

Removing debug message; adjusting install script.

client/src/session/remote/wait.cc
@@ -58,7 +58,6 @@ @@ -58,7 +58,6 @@
58 rc = worker(); 58 rc = worker();
59 59
60 debug("rc=",rc," (",strerror(rc),")"); 60 debug("rc=",rc," (",strerror(rc),")");
61 - printf("rc=%d\n",rc);  
62 61
63 if(rc == 0) 62 if(rc == 0)
64 return; 63 return;
win/Makefile.msc
@@ -92,28 +92,31 @@ testprogram.exe: \ @@ -92,28 +92,31 @@ testprogram.exe: \
92 client\src\testprogram\testprogram.obj 92 client\src\testprogram\testprogram.obj
93 93
94 install: \ 94 install: \
95 - $(OBJ_FILES) \  
96 - ipc3270.dll 95 + ipc3270.dll \
  96 + ipc3270.lib
97 @echo Building library... 97 @echo Building library...
98 @-mkdir "$(PW3270_SDK_PATH)\lib" 98 @-mkdir "$(PW3270_SDK_PATH)\lib"
  99 + copy "ipc3270.lib" "$(PW3270_SDK_PATH)\lib\ipc3270.lib"
  100 + copy "ipc3270.dll" "$(PW3270_SDK_PATH)\..\ipc3270.dll"
  101 + copy "ipc3270.dll.lib" "$(PW3270_SDK_PATH)\lib\ipc3270.dll.lib"
  102 + @-mkdir "$(PW3270_SDK_PATH)\include\lib3270\ipc"
  103 + copy "client\src\include\lib3270\ipc\*.h" "$(PW3270_SDK_PATH)\include\lib3270\ipc"
  104 + copy "client\src\include\lib3270\*.h" "$(PW3270_SDK_PATH)\include\lib3270"
  105 +
  106 +ipc3270.lib: \
  107 + $(OBJ_FILES)
  108 + @echo Build dll file....
99 @lib \ 109 @lib \
100 /NOLOGO \ 110 /NOLOGO \
101 - /OUT:"$(PW3270_SDK_PATH)\lib\ipc3270.lib" \ 111 + /OUT:"ipc3270.lib" \
102 $(OBJ_FILES) 112 $(OBJ_FILES)
103 113
104 - @copy "ipc3270.dll" "$(PW3270_SDK_PATH)\..\ipc3270.dll"  
105 - @copy "ipc3270.dll.lib" "$(PW3270_SDK_PATH)\lib\ipc3270.dll.lib"  
106 -  
107 - @-mkdir "$(PW3270_SDK_PATH)\include\lib3270\ipc"  
108 - @copy "client\src\include\lib3270\ipc\*.h" "$(PW3270_SDK_PATH)\include\lib3270\ipc"  
109 - @copy "client\src\include\lib3270\*.h" "$(PW3270_SDK_PATH)\include\lib3270"  
110 -  
111 ipc3270.dll: \ 114 ipc3270.dll: \
112 $(OBJ_FILES) \ 115 $(OBJ_FILES) \
113 client\src\core\windows\dynamic\init.obj \ 116 client\src\core\windows\dynamic\init.obj \
114 $(LIB3270_NAME).lib 117 $(LIB3270_NAME).lib
115 @echo Build dll file.... 118 @echo Build dll file....
116 - link \ 119 + @link \
117 /NOLOGO \ 120 /NOLOGO \
118 /DLL \ 121 /DLL \
119 /OUT:"$@" \ 122 /OUT:"$@" \
@@ -129,8 +132,6 @@ $(LIB3270_NAME).lib: @@ -129,8 +132,6 @@ $(LIB3270_NAME).lib:
129 132
130 clean: 133 clean:
131 del \ 134 del \
132 - $(LIB3270_NAME).lib \  
133 - $(LIB3270_NAME).dll \  
134 *.lib \ 135 *.lib \
135 *.dll \ 136 *.dll \
136 $(OBJ_FILES) \ 137 $(OBJ_FILES) \