diff options
| author | Mike Stewart | 2012-01-31 08:42:25 -0800 |
|---|---|---|
| committer | Mike Stewart | 2012-01-31 08:42:25 -0800 |
| commit | 09f197fa6d6088e814f3c384bd4986357cab1ef2 (patch) | |
| tree | 849024746f0ef876e8c80ede09a5739ac4849dc1 /plugins/mapexport | |
| parent | dcc02506b76ac9fa5523a4ca360d2fba6e046e56 (diff) | |
| download | dfhack-09f197fa6d6088e814f3c384bd4986357cab1ef2.tar.gz dfhack-09f197fa6d6088e814f3c384bd4986357cab1ef2.tar.bz2 dfhack-09f197fa6d6088e814f3c384bd4986357cab1ef2.tar.xz | |
Fixed mapexport build on Linux.
Diffstat (limited to 'plugins/mapexport')
| -rw-r--r-- | plugins/mapexport/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | plugins/mapexport/mapexport.cpp | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/plugins/mapexport/CMakeLists.txt b/plugins/mapexport/CMakeLists.txt index dcb0bd77..b738c1c4 100644 --- a/plugins/mapexport/CMakeLists.txt +++ b/plugins/mapexport/CMakeLists.txt @@ -48,4 +48,8 @@ COMMAND protoc-bin -I=${CMAKE_CURRENT_SOURCE_DIR}/proto/ --cpp_out=${CMAKE_CURRE DEPENDS protoc-bin ${PROJECT_PROTOS} ) -DFHACK_PLUGIN(mapexport ${PROJECT_SRCS} ${PROJECT_HDRS} LINK_LIBRARIES protobuf zlib) +IF(WIN32) + DFHACK_PLUGIN(mapexport ${PROJECT_SRCS} ${PROJECT_HDRS} LINK_LIBRARIES protobuf zlib) +ELSE() + DFHACK_PLUGIN(mapexport ${PROJECT_SRCS} ${PROJECT_HDRS} LINK_LIBRARIES protobuf z) +ENDIF() diff --git a/plugins/mapexport/mapexport.cpp b/plugins/mapexport/mapexport.cpp index 6d82735f..6dc20efa 100644 --- a/plugins/mapexport/mapexport.cpp +++ b/plugins/mapexport/mapexport.cpp @@ -81,10 +81,10 @@ DFhackCExport command_result mapexport (Core * c, std::vector <std::string> & pa return CR_FAILURE; } ZeroCopyOutputStream *raw_output = new OstreamOutputStream(&output_file); - GzipOutputStream *zip_output = new GzipOutputStream(raw_output); + GzipOutputStream *zip_output = new GzipOutputStream(raw_output); CodedOutputStream *coded_output = new CodedOutputStream(zip_output); - - coded_output->WriteLittleEndian32(0x50414DDF); //Write our file header + + coded_output->WriteLittleEndian32(0x50414DDF); //Write our file header Maps::getSize(x_max, y_max, z_max); MapExtras::MapCache map; |
