diff options
| author | Mike Stewart | 2012-01-28 13:32:48 -0800 |
|---|---|---|
| committer | Mike Stewart | 2012-01-28 13:32:48 -0800 |
| commit | b07d3b25b55ac0a9a6a49abe5bcf1c6b94806122 (patch) | |
| tree | 8cff5fab7a240cdd7fe8e38a5769d3aa55212425 /plugins/mapexport | |
| parent | b89cd43b85e7c51ccaa8dca3c61c85615e76b1fc (diff) | |
| parent | 1d7ed144427a01844abc465ea9b4bdfcd273af73 (diff) | |
| download | dfhack-b07d3b25b55ac0a9a6a49abe5bcf1c6b94806122.tar.gz dfhack-b07d3b25b55ac0a9a6a49abe5bcf1c6b94806122.tar.bz2 dfhack-b07d3b25b55ac0a9a6a49abe5bcf1c6b94806122.tar.xz | |
Merge upstream/master
Diffstat (limited to 'plugins/mapexport')
| -rw-r--r-- | plugins/mapexport/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | plugins/mapexport/mapexport.cpp | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/plugins/mapexport/CMakeLists.txt b/plugins/mapexport/CMakeLists.txt index 6349b5ad..68422f5b 100644 --- a/plugins/mapexport/CMakeLists.txt +++ b/plugins/mapexport/CMakeLists.txt @@ -39,7 +39,7 @@ LIST(APPEND PROJECT_SRCS ${PROJECT_HDRS}) #Generate sources from our proto files and store them in the source tree ADD_CUSTOM_COMMAND( OUTPUT ${PROJECT_PROTO_SRCS} ${PROJECT_PROTO_HDRS} -COMMAND protoc-bin -I=${CMAKE_CURRENT_SOURCE_DIR}/proto --cpp_out=${CMAKE_CURRENT_SOURCE_DIR}/proto ${PROJECT_PROTOS} +COMMAND protoc-bin -I=${CMAKE_CURRENT_SOURCE_DIR}/proto/ --cpp_out=${CMAKE_CURRENT_SOURCE_DIR}/proto/ ${PROJECT_PROTOS} DEPENDS protoc-bin ${PROJECT_PROTOS} ) diff --git a/plugins/mapexport/mapexport.cpp b/plugins/mapexport/mapexport.cpp index 219e02ce..b828eb23 100644 --- a/plugins/mapexport/mapexport.cpp +++ b/plugins/mapexport/mapexport.cpp @@ -15,6 +15,8 @@ using namespace google::protobuf::io; #include "proto/Map.pb.h" +using namespace DFHack::Simple; + DFhackCExport command_result mapexport (Core * c, std::vector <std::string> & parameters); DFhackCExport const char * plugin_name ( void ) @@ -44,7 +46,7 @@ DFhackCExport command_result mapexport (Core * c, std::vector <std::string> & pa { c->con.print("Exports the currently visible map to a file.\n" "Usage: mapexport <filename>\n" - ); + ); return CR_OK; } } |
