diff options
Diffstat (limited to 'Examples/javascript/variables')
-rw-r--r--[-rwxr-xr-x] | Examples/javascript/variables/Makefile | 2 | ||||
-rw-r--r-- | Examples/javascript/variables/binding.gyp | 8 | ||||
-rw-r--r-- | Examples/javascript/variables/binding.gyp.in | 9 | ||||
-rw-r--r--[-rwxr-xr-x] | Examples/javascript/variables/example.cxx | 4 | ||||
-rw-r--r--[-rwxr-xr-x] | Examples/javascript/variables/example.h | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | Examples/javascript/variables/example.i | 0 | ||||
-rw-r--r-- | Examples/javascript/variables/example.js | 2 | ||||
-rw-r--r--[-rwxr-xr-x] | Examples/javascript/variables/runme.js | 2 |
8 files changed, 14 insertions, 13 deletions
diff --git a/Examples/javascript/variables/Makefile b/Examples/javascript/variables/Makefile index 31846faae..54a8f7b03 100755..100644 --- a/Examples/javascript/variables/Makefile +++ b/Examples/javascript/variables/Makefile @@ -1,3 +1,3 @@ SRCS = example.cxx -include ../example.mk +include $(SRCDIR)../example.mk diff --git a/Examples/javascript/variables/binding.gyp b/Examples/javascript/variables/binding.gyp deleted file mode 100644 index 54eebfaa0..000000000 --- a/Examples/javascript/variables/binding.gyp +++ /dev/null @@ -1,8 +0,0 @@ -{ - "targets": [ - { - "target_name": "example", - "sources": [ "example.cxx", "example_wrap.cxx" ] - } - ] -} diff --git a/Examples/javascript/variables/binding.gyp.in b/Examples/javascript/variables/binding.gyp.in new file mode 100644 index 000000000..cb2b45e8f --- /dev/null +++ b/Examples/javascript/variables/binding.gyp.in @@ -0,0 +1,9 @@ +{ + "targets": [ + { + "target_name": "example", + "sources": [ "<!(cp $srcdir/example.cxx example-gypcopy.cxx && echo example-gypcopy.cxx)", "example_wrap.cxx" ], + "include_dirs": ["$srcdir"] + } + ] +} diff --git a/Examples/javascript/variables/example.cxx b/Examples/javascript/variables/example.cxx index f10390a9e..15314b383 100755..100644 --- a/Examples/javascript/variables/example.cxx +++ b/Examples/javascript/variables/example.cxx @@ -57,9 +57,9 @@ void print_vars() { printf("cvar = %c\n", cvar); printf("strvar = %s\n", strvar ? strvar : "(null)"); printf("cstrvar = %s\n", cstrvar); - printf("iptrvar = %p\n", iptrvar); + printf("iptrvar = %p\n", (void *)iptrvar); printf("name = %s\n", name); - printf("ptptr = %p (%d, %d)\n", ptptr, ptptr ? ptptr->x : 0, ptptr ? ptptr->y : 0); + printf("ptptr = %p (%d, %d)\n", (void *)ptptr, ptptr ? ptptr->x : 0, ptptr ? ptptr->y : 0); printf("pt = (%d, %d)\n", pt.x, pt.y); printf("status = %d\n", status); } diff --git a/Examples/javascript/variables/example.h b/Examples/javascript/variables/example.h index 0f7e89594..0f7e89594 100755..100644 --- a/Examples/javascript/variables/example.h +++ b/Examples/javascript/variables/example.h diff --git a/Examples/javascript/variables/example.i b/Examples/javascript/variables/example.i index 591b871ed..591b871ed 100755..100644 --- a/Examples/javascript/variables/example.i +++ b/Examples/javascript/variables/example.i diff --git a/Examples/javascript/variables/example.js b/Examples/javascript/variables/example.js index 79cd3913f..2e7f83a06 100644 --- a/Examples/javascript/variables/example.js +++ b/Examples/javascript/variables/example.js @@ -1 +1 @@ -module.exports = require("./build/Release/example"); +module.exports = require("build/Release/example"); diff --git a/Examples/javascript/variables/runme.js b/Examples/javascript/variables/runme.js index 537e17296..a2b5f791c 100755..100644 --- a/Examples/javascript/variables/runme.js +++ b/Examples/javascript/variables/runme.js @@ -1,4 +1,4 @@ -var example = require("./example"); +var example = require("example"); // Try to set the values of some global variables example.ivar = 42; |