Commit dd030714b36c5928805de376ec06d5be02f76ba9

Authored by Werneck
1 parent 19e2abad
Exists in master and in 1 other branch develop

Updating .gitignore

@@ -23,4 +23,6 @@ resources.rc @@ -23,4 +23,6 @@ resources.rc
23 vgcore.* 23 vgcore.*
24 doxygen/doxyfile 24 doxygen/doxyfile
25 doxygen/html 25 doxygen/html
  26 +*.obj
  27 +
26 28
.vscode/c_cpp_properties.json
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 "name": "Win32", 4 "name": "Win32",
5 "includePath": [ 5 "includePath": [
6 "${workspaceFolder}/**", 6 "${workspaceFolder}/**",
7 - "${vcpkgRoot}/x64-windows/include", 7 + "C:/Program Files/pw3270/sdk/include",
8 "${vcpkgRoot}/x64-windows-static/include" 8 "${vcpkgRoot}/x64-windows-static/include"
9 ], 9 ],
10 "defines": [ 10 "defines": [
.vscode/tasks.json
@@ -10,8 +10,10 @@ @@ -10,8 +10,10 @@
10 "args": [ 10 "args": [
11 "/favor:AMD64", 11 "/favor:AMD64",
12 "/c", 12 "/c",
13 - "/I","${workspaceFolder}/src/include",  
14 - "/I","${env:VCPKG_ROOT}/x64-windows/include", 13 + "/EHsc",
  14 + "/I","${workspaceFolder}/client/src/include",
  15 + "/I","${workspaceFolder}/common/src/include",
  16 + "/I","C:/Program Files/pw3270/sdk/include",
15 "/I","${env:VCPKG_ROOT}/x64-windows-static/include", 17 "/I","${env:VCPKG_ROOT}/x64-windows-static/include",
16 "${file}" 18 "${file}"
17 ], 19 ],
client/src/include/ipc-client-internals.h
@@ -79,7 +79,7 @@ @@ -79,7 +79,7 @@
79 #define GNUC_UNUSED \ 79 #define GNUC_UNUSED \
80 __attribute__((__unused__)) 80 __attribute__((__unused__))
81 #else 81 #else
82 - #define unused 82 + #define GNUC_UNUSED
83 #endif 83 #endif
84 84
85 #ifdef HAVE_ICONV 85 #ifdef HAVE_ICONV