making everything work with new eth_add_resources

libjsconsole/CMakeLists.txt

@@ -18,10 +18,10 @@ set(EXECUTABLE jsconsole)
 
 file(GLOB HEADERS "*.h")
 
-add_library(${EXECUTABLE} ${SRC_LIST} ${HEADERS})
-
 include(EthUtils)
-eth_add_resources(${EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/JSResources.cmake")
+eth_add_resources("${CMAKE_CURRENT_SOURCE_DIR}/JSResources.cmake" JSRES)
+
+add_library(${EXECUTABLE} ${SRC_LIST} ${HEADERS} ${JSRES})
 
 target_link_libraries(${EXECUTABLE} jsengine)
 target_link_libraries(${EXECUTABLE} devcore)

libjsengine/CMakeLists.txt

@@ -17,10 +17,10 @@ set(EXECUTABLE jsengine)
 
 file(GLOB HEADERS "*.h")
 
-add_library(${EXECUTABLE} ${SRC_LIST} ${HEADERS})
-
 include(EthUtils)
-eth_add_resources(${EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/JSResources.cmake")
+eth_add_resources("${CMAKE_CURRENT_SOURCE_DIR}/JSResources.cmake" "JSRES")
+message(STATUS "HERE!!! ${JSRES}")
+add_library(${EXECUTABLE} ${SRC_LIST} ${HEADERS} ${JSRES})
 
 # macos brew version of v8 needs to be compiled with libstdc++
 # it also needs to be dynamic library

libjsengine/JSResources.cmake

@@ -4,4 +4,3 @@ set(pretty_print "${CMAKE_CURRENT_LIST_DIR}/PrettyPrint.js")
 set(ETH_RESOURCE_NAME "JSEngineResources")
 set(ETH_RESOURCE_LOCATION "${CMAKE_CURRENT_BINARY_DIR}")
 set(ETH_RESOURCES "pretty_print")
-

libjsengine/JSV8Printer.cpp

@@ -5,6 +5,7 @@
 #include <string>
 #include "JSV8Printer.h"
 #include "libjsengine/JSEngineResources.hpp"
+#include "libjsengine/t.h"
 
 using namespace std;
 using namespace dev;