kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed node/node.h include hardcoded

This commit is contained in:
Felipe Magno de Almeida 2015-01-12 22:46:23 -02:00
parent 0167274e44
commit e3d4c7fb1e
3 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
configure.ac
View File

@ -1029,12 +1029,30 @@ case "$want_js" in
[
AC_DEFINE_UNQUOTED([V8_INCLUDE_HEADER], [node/v8.h], [Include header for libv8])
AC_DEFINE_UNQUOTED([UV_INCLUDE_HEADER], [node/uv.h], [Include header for libuv])
AC_DEFINE_UNQUOTED([NODE_INCLUDE_HEADER], [node/node.h], [Include header for nodejs])
V8_INCLUDE_HEADER=node/v8.h
UV_INCLUDE_HEADER=node/uv.h
NODE_INCLUDE_HEADER=node/node.h
AC_SUBST([V8_INCLUDE_HEADER])
AC_SUBST([UV_INCLUDE_HEADER])
AC_SUBST([NODE_INCLUDE_HEADER])
],
[AC_MSG_ERROR([Could not find include headers from nodejs.])])
[
AC_CHECK_HEADER([nodejs/deps/v8/v8.h],
[
AC_DEFINE_UNQUOTED([V8_INCLUDE_HEADER], [nodejs/deps/v8/v8.h], [Include header for libv8])
AC_DEFINE_UNQUOTED([UV_INCLUDE_HEADER], [nodejs/deps/uv/uv.h], [Include header for libuv])
AC_DEFINE_UNQUOTED([NODE_INCLUDE_HEADER], [nodejs/src/node.h], [Include header for nodejs])
V8_INCLUDE_HEADER=node/deps/v8/v8.h
UV_INCLUDE_HEADER=node/deps/uv/uv.h
NODE_INCLUDE_HEADER=nodejs/src/node.h
AC_SUBST([V8_INCLUDE_HEADER])
AC_SUBST([UV_INCLUDE_HEADER])
AC_SUBST([NODE_INCLUDE_HEADER])
],
[AC_MSG_ERROR([Could not find include headers from nodejs.])]
)
])
;;
libv8)
EFL_DEPEND_PKG([EINA_JS], [V8], [v8 >= 3.25.28])

2
src/bindings/eolian_js/main.cc
View File

@ -6,7 +6,7 @@
#ifdef HAVE_NODEJS
#include <Eina.hh>
#include <node/node.h>
#include EINA_STRINGIZE(NODE_INCLUDE_HEADER)
#include EINA_STRINGIZE(UV_INCLUDE_HEADER)
#include <iostream>

2
src/tests/eina_js/eina_js_suite.cc
View File

@ -188,7 +188,7 @@ int main(int, char*[])
}
#else
#include <node/node.h>
#include EINA_STRINGIZE(NODE_INCLUDE_HEADER)
namespace {