From 099a21d0ebef79128bf44b1ed2bc6352714c4606 Mon Sep 17 00:00:00 2001 From: Damon Oehlman Date: Fri, 27 Mar 2015 20:10:50 +1100 Subject: [PATCH 1/6] pandering to my OCD - sorry :/ --- binding.gyp | 64 ++++++++++++++++++++++++++++++----------------------- 1 file changed, 36 insertions(+), 28 deletions(-) diff --git a/binding.gyp b/binding.gyp index 70c73a88..1ffb8269 100644 --- a/binding.gyp +++ b/binding.gyp @@ -1,30 +1,38 @@ { - "targets": [ - { - "target_name": "robotjs", - "include_dirs" : [ - " Date: Fri, 27 Mar 2015 20:28:18 +1100 Subject: [PATCH 2/6] Added linux link settings --- binding.gyp | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/binding.gyp b/binding.gyp index 1ffb8269..6fdd7f8b 100644 --- a/binding.gyp +++ b/binding.gyp @@ -22,6 +22,17 @@ ] } }], + + ["OS == \"linux\"", { + "link_settings": { + "libraries": [ + "-lpng", + "-lz", + "-lX11", + "-lXtst" + ] + } + }] ], "sources": [ From b04a3bfdfbffbd4786a0a32cb70568b57940be84 Mon Sep 17 00:00:00 2001 From: Damon Oehlman Date: Fri, 27 Mar 2015 20:28:34 +1100 Subject: [PATCH 3/6] Added compiler warnings as per autopy --- binding.gyp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/binding.gyp b/binding.gyp index 6fdd7f8b..a850287d 100644 --- a/binding.gyp +++ b/binding.gyp @@ -5,6 +5,15 @@ " Date: Fri, 27 Mar 2015 20:32:26 +1100 Subject: [PATCH 4/6] Reformat to use single quotes as that seems to be the standard for gyp --- binding.gyp | 80 ++++++++++++++++++++++++++--------------------------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/binding.gyp b/binding.gyp index a850287d..6a5c6e17 100644 --- a/binding.gyp +++ b/binding.gyp @@ -1,58 +1,58 @@ { - "targets": [{ - "target_name": "robotjs", - "include_dirs": [ - " Date: Fri, 27 Mar 2015 20:32:42 +1100 Subject: [PATCH 5/6] shadow too noisy when working with V8 --- binding.gyp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/binding.gyp b/binding.gyp index 6a5c6e17..df374653 100644 --- a/binding.gyp +++ b/binding.gyp @@ -10,8 +10,7 @@ '-Wparentheses', '-Winline', '-Wbad-function-cast', - '-Wdisabled-optimization', - '-Wshadow' + '-Wdisabled-optimization' ], 'conditions': [ From 36d1951127d4aaae4480aeb6f37f8f1368603f9f Mon Sep 17 00:00:00 2001 From: Damon Oehlman Date: Fri, 27 Mar 2015 20:41:35 +1100 Subject: [PATCH 6/6] Add xdisplay to the compilation list for linux --- binding.gyp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/binding.gyp b/binding.gyp index df374653..34b495bb 100644 --- a/binding.gyp +++ b/binding.gyp @@ -39,7 +39,11 @@ '-lX11', '-lXtst' ] - } + }, + + 'sources': [ + 'src/xdisplay.c' + ] }] ],