From 33dee36dc5925bb0395fa794422a3e963519acde Mon Sep 17 00:00:00 2001 From: Perry Werneck Date: Mon, 2 Dec 2019 16:32:05 -0300 Subject: [PATCH] Building with MSVC --- client/src/session/remote/windows/session.cc | 2 +- win/Makefile.msc | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/client/src/session/remote/windows/session.cc b/client/src/session/remote/windows/session.cc index f2b5f37..42fdd9e 100644 --- a/client/src/session/remote/windows/session.cc +++ b/client/src/session/remote/windows/session.cc @@ -50,7 +50,7 @@ IPC::Session::Session(const char *id) : Abstract::Session() { - char *ptr = strchr(id,':'); + const char *ptr = strchr(id,':'); if(!ptr) throw std::system_error(EINVAL, std::system_category()); diff --git a/win/Makefile.msc b/win/Makefile.msc index be8468f..5453b3c 100644 --- a/win/Makefile.msc +++ b/win/Makefile.msc @@ -63,13 +63,13 @@ OBJ_FILES= \ client\src\session\remote\tools.obj \ client\src\session\remote\wait.obj \ client\src\session\remote\windows\request.obj \ - client\src\session\remote\windows\session.obj \ - client\src\testprogram\testprogram.obj + client\src\session\remote\windows\session.obj .cc.obj: @echo Compiling... $(CPP) \ /c \ + /DPACKAGE_NAME=\"pw3270\" \ /I"C:\msys64\project\pw3270\ipc\client\src\include" \ /I"c:\Program Files\pw3270\sdk\include" \ /EHsc \ @@ -77,7 +77,9 @@ OBJ_FILES= \ $< ipc3270.dll: \ - $(OBJ_FILES) + $(OBJ_FILES) \ + client\src\core\windows\dynamic\init.obj link \ + /DLL \ /OUT:"$@" \ - $(OBJ_FILES) + $< -- libgit2 0.21.2