Download as
Browse Code »

Commit 85f3b35d708600aa7a4f302d606166f3c50ed0ef

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

Fixing MSVC build.

Showing 2 changed files with 6 additions and 6 deletions   Show diff stats
client/src/session/local/init.cc
  Diff comments   View file @85f3b35
... ... @@ -43,7 +43,7 @@
43 43 #endif // _WIN32
44 44  
45 45 #if defined(_MSC_VER)
46   - #pragma comment(lib,"lib3270.lib")
  46 + #pragma comment(lib,LIB3270_STRINGIZE_VALUE_OF(LIB3270_NAME)".lib")
47 47 #endif // _MSC_VER
48 48  
49 49 extern "C" {
... ...
win/Makefile.msc
  Diff comments   View file @85f3b35
... ... @@ -71,9 +71,9 @@ OBJ_FILES= \
71 71 @echo Compiling...
72 72 $(CPP) \
73 73 /c \
74   - /DPACKAGE_NAME=\"ipc3270\" \
75   - /DPRODUCT_NAME=\"$(PRODUCT_NAME)" \
76   - /DLIB3270_NAME=\"$(LIB3270_NAME)" \
  74 + /DPACKAGE_NAME=ipc3270 \
  75 + /DPRODUCT_NAME=$(PRODUCT_NAME) \
  76 + /DLIB3270_NAME=$(LIB3270_NAME) \
77 77 /DDEBUG=1 \
78 78 /I"C:\msys64\project\pw3270\ipc\client\src\include" \
79 79 /I"$(PW3270_SDK_PATH)\include" \
... ... @@ -105,7 +105,7 @@ install: \
105 105 ipc3270.dll: \
106 106 $(OBJ_FILES) \
107 107 client\src\core\windows\dynamic\init.obj \
108   - lib3270.lib
  108 + $(LIB3270_NAME).lib
109 109 @echo Build dll file....
110 110 link \
111 111 /NOLOGO \
... ... @@ -117,7 +117,7 @@ ipc3270.dll: \
117 117  
118 118 $(LIB3270_NAME).lib:
119 119 lib \
120   - /def:"$(PW3270_SDK_PATH)\def\lib3270.def" \
  120 + /def:"$(PW3270_SDK_PATH)\def\$(LIB3270_NAME).def" \
121 121 /out:$(LIB3270_NAME).lib
122 122  
123 123 clean:
... ...