generic-library/ChaiScript
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Moving internal includes to point to the new dir structure

Browse Source
This commit is contained in:
Jonathan Turner
2009-07-10 15:24:24 +00:00
parent 4a5c86f07f
commit ac2b59796f
13 changed files with 33 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@@ -10,12 +10,12 @@ SET (CMAKE_CXX_FLAGS_GDB " -Wall -ggdb")
#SET (CMAKE_C_FLAGS_REL " -Wall -O3") #SET (CMAKE_C_FLAGS_REL " -Wall -O3")
#SET (CMAKE_CXX_FLAGS_REL " -Wall -O3") #SET (CMAKE_CXX_FLAGS_REL " -Wall -O3")
include_directories(dispatchkit chaiscript) include_directories(include)
find_package(Boost 1.36.0) find_package(Boost 1.36.0)
if (Boost_FOUND) if (Boost_FOUND)
include_directories(${Boost_INCLUDE_DIRS}) include_directories(${Boost_INCLUDE_DIRS})
add_executable(chaiscript_eval chaiscript/main.cpp) add_executable(chaiscript_eval src/main.cpp)
#add_executable(dispatchkit_test dispatchkit/test.cpp) #add_executable(dispatchkit_test dispatchkit/test.cpp)
target_link_libraries(chaiscript_eval ${Boost_LIBRARIES}) target_link_libraries(chaiscript_eval ${Boost_LIBRARIES})
install(TARGETS chaiscript_eval DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/bin) install(TARGETS chaiscript_eval DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/bin)

10
include/chaiscript/chaiscript.hpp
View File

@@ -14,9 +14,9 @@
#include <fstream> #include <fstream>
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>
#include "dispatchkit.hpp" #include <chaiscript/dispatchkit/dispatchkit.hpp>
#include "bootstrap.hpp" #include <chaiscript/dispatchkit/bootstrap.hpp>
#include "bootstrap_stl.hpp" #include <chaiscript/dispatchkit/bootstrap_stl.hpp>
namespace chaiscript namespace chaiscript
{ {
@@ -133,7 +133,7 @@ namespace chaiscript
}; };
} }
#include "chaiscript_eval.hpp" #include <chaiscript/language/chaiscript_eval.hpp>
#include "chaiscript_engine.hpp" #include <chaiscript/language/chaiscript_engine.hpp>
#endif /* CHAISCRIPT_HPP_ */ #endif /* CHAISCRIPT_HPP_ */

4
include/chaiscript/dispatchkit/bootstrap.hpp
View File

@@ -1,8 +1,8 @@
#ifndef __bootstrap_hpp #ifndef __bootstrap_hpp
#define __bootstrap_hpp__ #define __bootstrap_hpp__
#include "dispatchkit.hpp" #include <chaiscript/dispatchkit/dispatchkit.hpp>
#include "register_function.hpp" #include <chaiscript/dispatchkit/register_function.hpp>
namespace dispatchkit namespace dispatchkit
{ {

4
include/chaiscript/dispatchkit/bootstrap_stl.hpp
View File

@@ -1,8 +1,8 @@
#ifndef __bootstrap_stl_hpp #ifndef __bootstrap_stl_hpp
#define __bootstrap_stl_hpp__ #define __bootstrap_stl_hpp__
#include "dispatchkit.hpp" #include <chaiscript/dispatchkit/dispatchkit.hpp>
#include "register_function.hpp" #include <chaiscript/dispatchkit/register_function.hpp>
namespace dispatchkit namespace dispatchkit

2
include/chaiscript/dispatchkit/boxed_value.hpp
View File

@@ -1,7 +1,7 @@
#ifndef __boxed_value_hpp__ #ifndef __boxed_value_hpp__
#define __boxed_value_hpp__ #define __boxed_value_hpp__
#include "type_info.hpp" #include <chaiscript/dispatchkit/type_info.hpp>
#include <map> #include <map>
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>
#include <boost/any.hpp> #include <boost/any.hpp>

8
include/chaiscript/dispatchkit/dispatchkit.hpp
View File

@@ -12,10 +12,10 @@
#include <iostream> #include <iostream>
#include <deque> #include <deque>
#include "boxed_value.hpp" #include <chaiscript/dispatchkit/boxed_value.hpp>
#include "type_info.hpp" #include <chaiscript/dispatchkit/type_info.hpp>
#include "proxy_functions.hpp" #include <chaiscript/dispatchkit/proxy_functions.hpp>
#include "proxy_constructors.hpp" #include <chaiscript/dispatchkit/proxy_constructors.hpp>
namespace dispatchkit namespace dispatchkit
{ {

2
include/chaiscript/dispatchkit/function_call.hpp
View File

@@ -13,7 +13,7 @@
#include <boost/function.hpp> #include <boost/function.hpp>
#include <string> #include <string>
#include <vector> #include <vector>
#include "proxy_functions.hpp" #include <chaiscript/dispatchkit/proxy_functions.hpp>
namespace dispatchkit namespace dispatchkit
{ {

3
include/chaiscript/dispatchkit/proxy_constructors.hpp
View File

@@ -10,7 +10,8 @@
#define BOOST_PP_ITERATION_LIMITS ( 0, 10 ) #define BOOST_PP_ITERATION_LIMITS ( 0, 10 )
#define BOOST_PP_FILENAME_1 "proxy_constructors.hpp" //#define BOOST_PP_FILENAME_1 "proxy_constructors.hpp"
#define BOOST_PP_FILENAME_1 <chaiscript/dispatchkit/proxy_constructors.hpp>
#include BOOST_PP_ITERATE() #include BOOST_PP_ITERATE()
# endif # endif
#else #else

7
include/chaiscript/dispatchkit/proxy_functions.hpp
View File

@@ -10,8 +10,8 @@
#ifndef __proxy_functions_hpp__ #ifndef __proxy_functions_hpp__
#define __proxy_functions_hpp__ #define __proxy_functions_hpp__
#include "boxed_value.hpp" #include <chaiscript/dispatchkit/boxed_value.hpp>
#include "type_info.hpp" #include <chaiscript/dispatchkit/type_info.hpp>
#include <string> #include <string>
#include <boost/function.hpp> #include <boost/function.hpp>
#include <boost/bind.hpp> #include <boost/bind.hpp>
@@ -109,7 +109,8 @@ namespace dispatchkit
} }
#define BOOST_PP_ITERATION_LIMITS ( 0, 10 ) #define BOOST_PP_ITERATION_LIMITS ( 0, 10 )
#define BOOST_PP_FILENAME_1 "proxy_functions.hpp" //#define BOOST_PP_FILENAME_1 "proxy_functions.hpp"
#define BOOST_PP_FILENAME_1 <chaiscript/dispatchkit/proxy_functions.hpp>
#include BOOST_PP_ITERATE() #include BOOST_PP_ITERATE()
namespace dispatchkit namespace dispatchkit

6
include/chaiscript/dispatchkit/register_function.hpp
View File

@@ -4,7 +4,7 @@
#ifndef __register_function_hpp__ #ifndef __register_function_hpp__
#define __register_function_hpp__ #define __register_function_hpp__
#include "dispatchkit.hpp" #include <chaiscript/dispatchkit/dispatchkit.hpp>
#include <boost/function.hpp> #include <boost/function.hpp>
#include <boost/bind.hpp> #include <boost/bind.hpp>
@@ -24,8 +24,8 @@ namespace dispatchkit
} }
#define BOOST_PP_ITERATION_LIMITS ( 0, 10 ) #define BOOST_PP_ITERATION_LIMITS ( 0, 10 )
#define BOOST_PP_FILENAME_1 "register_function.hpp" //#define BOOST_PP_FILENAME_1 "register_function.hpp"
#define BOOST_PP_FILENAME_1 <chaiscript/dispatchkit/register_function.hpp>
#include BOOST_PP_ITERATE() #include BOOST_PP_ITERATE()
# endif # endif

8
include/chaiscript/dispatchkit/test.cpp
View File

@@ -4,10 +4,10 @@
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>
#include <boost/function.hpp> #include <boost/function.hpp>
#include "dispatchkit.hpp" #include <chaiscript/dispatchkit/dispatchkit.hpp>
#include "bootstrap.hpp" #include <chaiscript/dispatchkit/bootstrap.hpp>
#include "bootstrap_stl.hpp" #include <chaiscript/dispatchkit/bootstrap_stl.hpp>
#include "function_call.hpp" #include <chaiscript/dispatchkit/function_call.hpp>
using namespace dispatchkit; using namespace dispatchkit;

4
include/chaiscript/language/chaiscript_engine.hpp
View File

@@ -8,8 +8,8 @@
#include <fstream> #include <fstream>
#include "chaiscript_prelude.hpp" #include <chaiscript/language/chaiscript_prelude.hpp>
#include "chaiscript_parser.hpp" #include <chaiscript/language/chaiscript_parser.hpp>
namespace chaiscript namespace chaiscript
{ {

2
src/main.cpp
View File

@@ -1,6 +1,6 @@
#include <iostream> #include <iostream>
#include "chaiscript.hpp" #include <chaiscript/chaiscript.hpp>
void print_help() { void print_help() {
std::cout << "ChaiScript evaluator. To evaluate and expression, type it and press <enter>." << std::endl; std::cout << "ChaiScript evaluator. To evaluate and expression, type it and press <enter>." << std::endl;