summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetr Mrázek2012-03-13 14:46:48 +0100
committerPetr Mrázek2012-03-13 14:46:48 +0100
commiteb4757043b12764f20c6bd1a6edc12201f74b2ce (patch)
treecfb41b761fa691651b88ce330fde59e57862a384
parentb3f6bccdf6ba559cfbff462029ea350f5d367171 (diff)
downloaddfhack-eb4757043b12764f20c6bd1a6edc12201f74b2ce.tar.gz
dfhack-eb4757043b12764f20c6bd1a6edc12201f74b2ce.tar.bz2
dfhack-eb4757043b12764f20c6bd1a6edc12201f74b2ce.tar.xz
Move depends out of main library, make them (static) libraries.
-rw-r--r--CMakeLists.txt44
-rw-r--r--depends/CMakeLists.txt6
-rw-r--r--depends/lua/CMakeLists.txt (renamed from lua/CMakeLists.txt)33
-rw-r--r--depends/lua/COPYRIGHT (renamed from lua/COPYRIGHT)0
-rw-r--r--depends/lua/README (renamed from lua/README)0
-rw-r--r--depends/lua/include/bit.h (renamed from lua/include/bit.h)0
-rw-r--r--depends/lua/include/lapi.h (renamed from lua/include/lapi.h)0
-rw-r--r--depends/lua/include/lauxlib.h (renamed from lua/include/lauxlib.h)0
-rw-r--r--depends/lua/include/lcode.h (renamed from lua/include/lcode.h)0
-rw-r--r--depends/lua/include/ldebug.h (renamed from lua/include/ldebug.h)0
-rw-r--r--depends/lua/include/ldo.h (renamed from lua/include/ldo.h)0
-rw-r--r--depends/lua/include/lfunc.h (renamed from lua/include/lfunc.h)0
-rw-r--r--depends/lua/include/lgc.h (renamed from lua/include/lgc.h)0
-rw-r--r--depends/lua/include/llex.h (renamed from lua/include/llex.h)0
-rw-r--r--depends/lua/include/llimits.h (renamed from lua/include/llimits.h)0
-rw-r--r--depends/lua/include/lmem.h (renamed from lua/include/lmem.h)0
-rw-r--r--depends/lua/include/lobject.h (renamed from lua/include/lobject.h)0
-rw-r--r--depends/lua/include/lopcodes.h (renamed from lua/include/lopcodes.h)0
-rw-r--r--depends/lua/include/lparser.h (renamed from lua/include/lparser.h)0
-rw-r--r--depends/lua/include/lstate.h (renamed from lua/include/lstate.h)0
-rw-r--r--depends/lua/include/lstring.h (renamed from lua/include/lstring.h)0
-rw-r--r--depends/lua/include/ltable.h (renamed from lua/include/ltable.h)0
-rw-r--r--depends/lua/include/ltm.h (renamed from lua/include/ltm.h)0
-rw-r--r--depends/lua/include/lua.h (renamed from lua/include/lua.h)0
-rw-r--r--depends/lua/include/luaconf.h (renamed from lua/include/luaconf.h)0
-rw-r--r--depends/lua/include/lualib.h (renamed from lua/include/lualib.h)0
-rw-r--r--depends/lua/include/lundump.h (renamed from lua/include/lundump.h)0
-rw-r--r--depends/lua/include/lvm.h (renamed from lua/include/lvm.h)0
-rw-r--r--depends/lua/include/lzio.h (renamed from lua/include/lzio.h)0
-rw-r--r--depends/lua/src/bit.c (renamed from lua/src/bit.c)0
-rw-r--r--depends/lua/src/lapi.c (renamed from lua/src/lapi.c)0
-rw-r--r--depends/lua/src/lauxlib.c (renamed from lua/src/lauxlib.c)0
-rw-r--r--depends/lua/src/lbaselib.c (renamed from lua/src/lbaselib.c)0
-rw-r--r--depends/lua/src/lcode.c (renamed from lua/src/lcode.c)0
-rw-r--r--depends/lua/src/ldblib.c (renamed from lua/src/ldblib.c)0
-rw-r--r--depends/lua/src/ldebug.c (renamed from lua/src/ldebug.c)0
-rw-r--r--depends/lua/src/ldo.c (renamed from lua/src/ldo.c)0
-rw-r--r--depends/lua/src/ldump.c (renamed from lua/src/ldump.c)0
-rw-r--r--depends/lua/src/lfunc.c (renamed from lua/src/lfunc.c)0
-rw-r--r--depends/lua/src/lgc.c (renamed from lua/src/lgc.c)0
-rw-r--r--depends/lua/src/linit.c (renamed from lua/src/linit.c)0
-rw-r--r--depends/lua/src/liolib.c (renamed from lua/src/liolib.c)0
-rw-r--r--depends/lua/src/llex.c (renamed from lua/src/llex.c)0
-rw-r--r--depends/lua/src/lmathlib.c (renamed from lua/src/lmathlib.c)0
-rw-r--r--depends/lua/src/lmem.c (renamed from lua/src/lmem.c)0
-rw-r--r--depends/lua/src/loadlib.c (renamed from lua/src/loadlib.c)0
-rw-r--r--depends/lua/src/lobject.c (renamed from lua/src/lobject.c)0
-rw-r--r--depends/lua/src/lopcodes.c (renamed from lua/src/lopcodes.c)0
-rw-r--r--depends/lua/src/loslib.c (renamed from lua/src/loslib.c)0
-rw-r--r--depends/lua/src/lparser.c (renamed from lua/src/lparser.c)0
-rw-r--r--depends/lua/src/lstate.c (renamed from lua/src/lstate.c)0
-rw-r--r--depends/lua/src/lstring.c (renamed from lua/src/lstring.c)0
-rw-r--r--depends/lua/src/lstrlib.c (renamed from lua/src/lstrlib.c)0
-rw-r--r--depends/lua/src/ltable.c (renamed from lua/src/ltable.c)0
-rw-r--r--depends/lua/src/ltablib.c (renamed from lua/src/ltablib.c)0
-rw-r--r--depends/lua/src/ltm.c (renamed from lua/src/ltm.c)0
-rw-r--r--depends/lua/src/lua.c (renamed from lua/src/lua.c)0
-rw-r--r--depends/lua/src/luac.c (renamed from lua/src/luac.c)0
-rw-r--r--depends/lua/src/lundump.c (renamed from lua/src/lundump.c)0
-rw-r--r--depends/lua/src/lvm.c (renamed from lua/src/lvm.c)0
-rw-r--r--depends/lua/src/lzio.c (renamed from lua/src/lzio.c)0
-rw-r--r--depends/lua/src/print.c (renamed from lua/src/print.c)0
-rw-r--r--depends/md5/CMakeLists.txt3
-rw-r--r--depends/md5/md5.cpp (renamed from library/depends/md5/md5.cpp)0
-rw-r--r--depends/md5/md5.h (renamed from library/depends/md5/md5.h)0
-rw-r--r--depends/md5/md5wrapper.cpp (renamed from library/depends/md5/md5wrapper.cpp)0
-rw-r--r--depends/md5/md5wrapper.h (renamed from library/depends/md5/md5wrapper.h)0
-rw-r--r--depends/protobuf/.gitignore (renamed from library/depends/protobuf/.gitignore)0
-rw-r--r--depends/protobuf/CMakeLists.txt (renamed from library/depends/protobuf/CMakeLists.txt)9
-rw-r--r--depends/protobuf/COPYING.txt (renamed from library/depends/protobuf/COPYING.txt)0
-rw-r--r--depends/protobuf/config.h.in (renamed from library/depends/protobuf/config.h.in)0
-rw-r--r--depends/protobuf/google/protobuf/compiler/code_generator.cc (renamed from library/depends/protobuf/google/protobuf/compiler/code_generator.cc)0
-rw-r--r--depends/protobuf/google/protobuf/compiler/code_generator.h (renamed from library/depends/protobuf/google/protobuf/compiler/code_generator.h)0
-rw-r--r--depends/protobuf/google/protobuf/compiler/command_line_interface.cc (renamed from library/depends/protobuf/google/protobuf/compiler/command_line_interface.cc)0
-rw-r--r--depends/protobuf/google/protobuf/compiler/command_line_interface.h (renamed from library/depends/protobuf/google/protobuf/compiler/command_line_interface.h)0
-rw-r--r--depends/protobuf/google/protobuf/compiler/cpp/cpp_enum.cc (renamed from library/depends/protobuf/google/protobuf/compiler/cpp/cpp_enum.cc)0
-rw-r--r--depends/protobuf/google/protobuf/compiler/cpp/cpp_enum.h (renamed from library/depends/protobuf/google/protobuf/compiler/cpp/cpp_enum.h)0
-rw-r--r--depends/protobuf/google/protobuf/compiler/cpp/cpp_enum_field.cc (renamed from library/depends/protobuf/google/protobuf/compiler/cpp/cpp_enum_field.cc)0
-rw-r--r--depends/protobuf/google/protobuf/compiler/cpp/cpp_enum_field.h (renamed from library/depends/protobuf/google/protobuf/compiler/cpp/cpp_enum_field.h)0
-rw-r--r--depends/protobuf/google/protobuf/compiler/cpp/cpp_extension.cc (renamed from library/depends/protobuf/google/protobuf/compiler/cpp/cpp_extension.cc)0
-rw-r--r--depends/protobuf/google/protobuf/compiler/cpp/cpp_extension.h (renamed from library/depends/protobuf/google/protobuf/compiler/cpp/cpp_extension.h)0
-rw-r--r--depends/protobuf/google/protobuf/compiler/cpp/cpp_field.cc (renamed from library/depends/protobuf/google/protobuf/compiler/cpp/cpp_field.cc)0
-rw-r--r--depends/protobuf/google/protobuf/compiler/cpp/cpp_field.h (renamed from library/depends/protobuf/google/protobuf/compiler/cpp/cpp_field.h)0
-rw-r--r--depends/protobuf/google/protobuf/compiler/cpp/cpp_file.cc (renamed from library/depends/protobuf/google/protobuf/compiler/cpp/cpp_file.cc)0
-rw-r--r--depends/protobuf/google/protobuf/compiler/cpp/cpp_file.h (renamed from library/depends/protobuf/google/protobuf/compiler/cpp/cpp_file.h)0
-rw-r--r--depends/protobuf/google/protobuf/compiler/cpp/cpp_generator.cc (renamed from library/depends/protobuf/google/protobuf/compiler/cpp/cpp_generator.cc)0
-rw-r--r--depends/protobuf/google/protobuf/compiler/cpp/cpp_generator.h (renamed from library/depends/protobuf/google/protobuf/compiler/cpp/cpp_generator.h)0
-rw-r--r--depends/protobuf/google/protobuf/compiler/cpp/cpp_helpers.cc (renamed from library/depends/protobuf/google/protobuf/compiler/cpp/cpp_helpers.cc)0
-rw-r--r--depends/protobuf/google/protobuf/compiler/cpp/cpp_helpers.h (renamed from library/depends/protobuf/google/protobuf/compiler/cpp/cpp_helpers.h)0
-rw-r--r--depends/protobuf/google/protobuf/compiler/cpp/cpp_message.cc (renamed from library/depends/protobuf/google/protobuf/compiler/cpp/cpp_message.cc)0
-rw-r--r--depends/protobuf/google/protobuf/compiler/cpp/cpp_message.h (renamed from library/depends/protobuf/google/protobuf/compiler/cpp/cpp_message.h)0
-rw-r--r--depends/protobuf/google/protobuf/compiler/cpp/cpp_message_field.cc (renamed from library/depends/protobuf/google/protobuf/compiler/cpp/cpp_message_field.cc)0
-rw-r--r--depends/protobuf/google/protobuf/compiler/cpp/cpp_message_field.h (renamed from library/depends/protobuf/google/protobuf/compiler/cpp/cpp_message_field.h)0
-rw-r--r--depends/protobuf/google/protobuf/compiler/cpp/cpp_primitive_field.cc (renamed from library/depends/protobuf/google/protobuf/compiler/cpp/cpp_primitive_field.cc)0
-rw-r--r--depends/protobuf/google/protobuf/compiler/cpp/cpp_primitive_field.h (renamed from library/depends/protobuf/google/protobuf/compiler/cpp/cpp_primitive_field.h)0
-rw-r--r--depends/protobuf/google/protobuf/compiler/cpp/cpp_service.cc (renamed from library/depends/protobuf/google/protobuf/compiler/cpp/cpp_service.cc)0
-rw-r--r--depends/protobuf/google/protobuf/compiler/cpp/cpp_service.h (renamed from library/depends/protobuf/google/protobuf/compiler/cpp/cpp_service.h)0
-rw-r--r--depends/protobuf/google/protobuf/compiler/cpp/cpp_string_field.cc (renamed from library/depends/protobuf/google/protobuf/compiler/cpp/cpp_string_field.cc)0
-rw-r--r--depends/protobuf/google/protobuf/compiler/cpp/cpp_string_field.h (renamed from library/depends/protobuf/google/protobuf/compiler/cpp/cpp_string_field.h)0
-rw-r--r--depends/protobuf/google/protobuf/compiler/cpp/cpp_unittest.cc (renamed from library/depends/protobuf/google/protobuf/compiler/cpp/cpp_unittest.cc)0
-rw-r--r--depends/protobuf/google/protobuf/compiler/importer.cc (renamed from library/depends/protobuf/google/protobuf/compiler/importer.cc)0
-rw-r--r--depends/protobuf/google/protobuf/compiler/importer.h (renamed from library/depends/protobuf/google/protobuf/compiler/importer.h)0
-rw-r--r--depends/protobuf/google/protobuf/compiler/main.cc (renamed from library/depends/protobuf/google/protobuf/compiler/main.cc)0
-rw-r--r--depends/protobuf/google/protobuf/compiler/mock_code_generator.cc (renamed from library/depends/protobuf/google/protobuf/compiler/mock_code_generator.cc)0
-rw-r--r--depends/protobuf/google/protobuf/compiler/mock_code_generator.h (renamed from library/depends/protobuf/google/protobuf/compiler/mock_code_generator.h)0
-rw-r--r--depends/protobuf/google/protobuf/compiler/package_info.h (renamed from library/depends/protobuf/google/protobuf/compiler/package_info.h)0
-rw-r--r--depends/protobuf/google/protobuf/compiler/parser.cc (renamed from library/depends/protobuf/google/protobuf/compiler/parser.cc)0
-rw-r--r--depends/protobuf/google/protobuf/compiler/parser.h (renamed from library/depends/protobuf/google/protobuf/compiler/parser.h)0
-rw-r--r--depends/protobuf/google/protobuf/compiler/plugin.cc (renamed from library/depends/protobuf/google/protobuf/compiler/plugin.cc)0
-rw-r--r--depends/protobuf/google/protobuf/compiler/plugin.h (renamed from library/depends/protobuf/google/protobuf/compiler/plugin.h)0
-rw-r--r--depends/protobuf/google/protobuf/compiler/plugin.pb.cc (renamed from library/depends/protobuf/google/protobuf/compiler/plugin.pb.cc)0
-rw-r--r--depends/protobuf/google/protobuf/compiler/plugin.pb.h (renamed from library/depends/protobuf/google/protobuf/compiler/plugin.pb.h)0
-rw-r--r--depends/protobuf/google/protobuf/compiler/subprocess.cc (renamed from library/depends/protobuf/google/protobuf/compiler/subprocess.cc)0
-rw-r--r--depends/protobuf/google/protobuf/compiler/subprocess.h (renamed from library/depends/protobuf/google/protobuf/compiler/subprocess.h)0
-rw-r--r--depends/protobuf/google/protobuf/compiler/test_plugin.cc (renamed from library/depends/protobuf/google/protobuf/compiler/test_plugin.cc)0
-rw-r--r--depends/protobuf/google/protobuf/compiler/zip_writer.cc (renamed from library/depends/protobuf/google/protobuf/compiler/zip_writer.cc)0
-rw-r--r--depends/protobuf/google/protobuf/compiler/zip_writer.h (renamed from library/depends/protobuf/google/protobuf/compiler/zip_writer.h)0
-rw-r--r--depends/protobuf/google/protobuf/descriptor.cc (renamed from library/depends/protobuf/google/protobuf/descriptor.cc)0
-rw-r--r--depends/protobuf/google/protobuf/descriptor.h (renamed from library/depends/protobuf/google/protobuf/descriptor.h)0
-rw-r--r--depends/protobuf/google/protobuf/descriptor.pb.cc (renamed from library/depends/protobuf/google/protobuf/descriptor.pb.cc)0
-rw-r--r--depends/protobuf/google/protobuf/descriptor.pb.h (renamed from library/depends/protobuf/google/protobuf/descriptor.pb.h)0
-rw-r--r--depends/protobuf/google/protobuf/descriptor_database.cc (renamed from library/depends/protobuf/google/protobuf/descriptor_database.cc)0
-rw-r--r--depends/protobuf/google/protobuf/descriptor_database.h (renamed from library/depends/protobuf/google/protobuf/descriptor_database.h)0
-rw-r--r--depends/protobuf/google/protobuf/dynamic_message.cc (renamed from library/depends/protobuf/google/protobuf/dynamic_message.cc)0
-rw-r--r--depends/protobuf/google/protobuf/dynamic_message.h (renamed from library/depends/protobuf/google/protobuf/dynamic_message.h)0
-rw-r--r--depends/protobuf/google/protobuf/extension_set.cc (renamed from library/depends/protobuf/google/protobuf/extension_set.cc)0
-rw-r--r--depends/protobuf/google/protobuf/extension_set.h (renamed from library/depends/protobuf/google/protobuf/extension_set.h)0
-rw-r--r--depends/protobuf/google/protobuf/extension_set_heavy.cc (renamed from library/depends/protobuf/google/protobuf/extension_set_heavy.cc)0
-rw-r--r--depends/protobuf/google/protobuf/extension_set_unittest.cc (renamed from library/depends/protobuf/google/protobuf/extension_set_unittest.cc)0
-rw-r--r--depends/protobuf/google/protobuf/generated_message_reflection.cc (renamed from library/depends/protobuf/google/protobuf/generated_message_reflection.cc)0
-rw-r--r--depends/protobuf/google/protobuf/generated_message_reflection.h (renamed from library/depends/protobuf/google/protobuf/generated_message_reflection.h)0
-rw-r--r--depends/protobuf/google/protobuf/generated_message_util.cc (renamed from library/depends/protobuf/google/protobuf/generated_message_util.cc)0
-rw-r--r--depends/protobuf/google/protobuf/generated_message_util.h (renamed from library/depends/protobuf/google/protobuf/generated_message_util.h)0
-rw-r--r--depends/protobuf/google/protobuf/io/coded_stream.cc (renamed from library/depends/protobuf/google/protobuf/io/coded_stream.cc)0
-rw-r--r--depends/protobuf/google/protobuf/io/coded_stream.h (renamed from library/depends/protobuf/google/protobuf/io/coded_stream.h)0
-rw-r--r--depends/protobuf/google/protobuf/io/coded_stream_inl.h (renamed from library/depends/protobuf/google/protobuf/io/coded_stream_inl.h)0
-rw-r--r--depends/protobuf/google/protobuf/io/gzip_stream.cc (renamed from library/depends/protobuf/google/protobuf/io/gzip_stream.cc)0
-rw-r--r--depends/protobuf/google/protobuf/io/gzip_stream.h (renamed from library/depends/protobuf/google/protobuf/io/gzip_stream.h)0
-rw-r--r--depends/protobuf/google/protobuf/io/package_info.h (renamed from library/depends/protobuf/google/protobuf/io/package_info.h)0
-rw-r--r--depends/protobuf/google/protobuf/io/printer.cc (renamed from library/depends/protobuf/google/protobuf/io/printer.cc)0
-rw-r--r--depends/protobuf/google/protobuf/io/printer.h (renamed from library/depends/protobuf/google/protobuf/io/printer.h)0
-rw-r--r--depends/protobuf/google/protobuf/io/tokenizer.cc (renamed from library/depends/protobuf/google/protobuf/io/tokenizer.cc)0
-rw-r--r--depends/protobuf/google/protobuf/io/tokenizer.h (renamed from library/depends/protobuf/google/protobuf/io/tokenizer.h)0
-rw-r--r--depends/protobuf/google/protobuf/io/zero_copy_stream.cc (renamed from library/depends/protobuf/google/protobuf/io/zero_copy_stream.cc)0
-rw-r--r--depends/protobuf/google/protobuf/io/zero_copy_stream.h (renamed from library/depends/protobuf/google/protobuf/io/zero_copy_stream.h)0
-rw-r--r--depends/protobuf/google/protobuf/io/zero_copy_stream_impl.cc (renamed from library/depends/protobuf/google/protobuf/io/zero_copy_stream_impl.cc)0
-rw-r--r--depends/protobuf/google/protobuf/io/zero_copy_stream_impl.h (renamed from library/depends/protobuf/google/protobuf/io/zero_copy_stream_impl.h)0
-rw-r--r--depends/protobuf/google/protobuf/io/zero_copy_stream_impl_lite.cc (renamed from library/depends/protobuf/google/protobuf/io/zero_copy_stream_impl_lite.cc)0
-rw-r--r--depends/protobuf/google/protobuf/io/zero_copy_stream_impl_lite.h (renamed from library/depends/protobuf/google/protobuf/io/zero_copy_stream_impl_lite.h)0
-rw-r--r--depends/protobuf/google/protobuf/message.cc (renamed from library/depends/protobuf/google/protobuf/message.cc)0
-rw-r--r--depends/protobuf/google/protobuf/message.h (renamed from library/depends/protobuf/google/protobuf/message.h)0
-rw-r--r--depends/protobuf/google/protobuf/message_lite.cc (renamed from library/depends/protobuf/google/protobuf/message_lite.cc)0
-rw-r--r--depends/protobuf/google/protobuf/message_lite.h (renamed from library/depends/protobuf/google/protobuf/message_lite.h)0
-rw-r--r--depends/protobuf/google/protobuf/package_info.h (renamed from library/depends/protobuf/google/protobuf/package_info.h)0
-rw-r--r--depends/protobuf/google/protobuf/reflection_ops.cc (renamed from library/depends/protobuf/google/protobuf/reflection_ops.cc)0
-rw-r--r--depends/protobuf/google/protobuf/reflection_ops.h (renamed from library/depends/protobuf/google/protobuf/reflection_ops.h)0
-rw-r--r--depends/protobuf/google/protobuf/repeated_field.cc (renamed from library/depends/protobuf/google/protobuf/repeated_field.cc)0
-rw-r--r--depends/protobuf/google/protobuf/repeated_field.h (renamed from library/depends/protobuf/google/protobuf/repeated_field.h)0
-rw-r--r--depends/protobuf/google/protobuf/service.cc (renamed from library/depends/protobuf/google/protobuf/service.cc)0
-rw-r--r--depends/protobuf/google/protobuf/service.h (renamed from library/depends/protobuf/google/protobuf/service.h)0
-rw-r--r--depends/protobuf/google/protobuf/stubs/common.cc (renamed from library/depends/protobuf/google/protobuf/stubs/common.cc)0
-rw-r--r--depends/protobuf/google/protobuf/stubs/common.h (renamed from library/depends/protobuf/google/protobuf/stubs/common.h)0
-rw-r--r--depends/protobuf/google/protobuf/stubs/hash.h (renamed from library/depends/protobuf/google/protobuf/stubs/hash.h)0
-rw-r--r--depends/protobuf/google/protobuf/stubs/map-util.h (renamed from library/depends/protobuf/google/protobuf/stubs/map-util.h)0
-rw-r--r--depends/protobuf/google/protobuf/stubs/once.cc (renamed from library/depends/protobuf/google/protobuf/stubs/once.cc)0
-rw-r--r--depends/protobuf/google/protobuf/stubs/once.h (renamed from library/depends/protobuf/google/protobuf/stubs/once.h)0
-rw-r--r--depends/protobuf/google/protobuf/stubs/stl_util-inl.h (renamed from library/depends/protobuf/google/protobuf/stubs/stl_util-inl.h)0
-rw-r--r--depends/protobuf/google/protobuf/stubs/structurally_valid.cc (renamed from library/depends/protobuf/google/protobuf/stubs/structurally_valid.cc)0
-rw-r--r--depends/protobuf/google/protobuf/stubs/strutil.cc (renamed from library/depends/protobuf/google/protobuf/stubs/strutil.cc)0
-rw-r--r--depends/protobuf/google/protobuf/stubs/strutil.h (renamed from library/depends/protobuf/google/protobuf/stubs/strutil.h)0
-rw-r--r--depends/protobuf/google/protobuf/stubs/substitute.cc (renamed from library/depends/protobuf/google/protobuf/stubs/substitute.cc)0
-rw-r--r--depends/protobuf/google/protobuf/stubs/substitute.h (renamed from library/depends/protobuf/google/protobuf/stubs/substitute.h)0
-rw-r--r--depends/protobuf/google/protobuf/text_format.cc (renamed from library/depends/protobuf/google/protobuf/text_format.cc)0
-rw-r--r--depends/protobuf/google/protobuf/text_format.h (renamed from library/depends/protobuf/google/protobuf/text_format.h)0
-rw-r--r--depends/protobuf/google/protobuf/unknown_field_set.cc (renamed from library/depends/protobuf/google/protobuf/unknown_field_set.cc)0
-rw-r--r--depends/protobuf/google/protobuf/unknown_field_set.h (renamed from library/depends/protobuf/google/protobuf/unknown_field_set.h)0
-rw-r--r--depends/protobuf/google/protobuf/wire_format.cc (renamed from library/depends/protobuf/google/protobuf/wire_format.cc)0
-rw-r--r--depends/protobuf/google/protobuf/wire_format.h (renamed from library/depends/protobuf/google/protobuf/wire_format.h)0
-rw-r--r--depends/protobuf/google/protobuf/wire_format_lite.cc (renamed from library/depends/protobuf/google/protobuf/wire_format_lite.cc)0
-rw-r--r--depends/protobuf/google/protobuf/wire_format_lite.h (renamed from library/depends/protobuf/google/protobuf/wire_format_lite.h)0
-rw-r--r--depends/protobuf/google/protobuf/wire_format_lite_inl.h (renamed from library/depends/protobuf/google/protobuf/wire_format_lite_inl.h)0
-rw-r--r--depends/protobuf/testHashMap.cpp.in (renamed from library/depends/protobuf/testHashMap.cpp.in)0
-rw-r--r--depends/tinyxml/CMakeLists.txt3
-rw-r--r--depends/tinyxml/tinystr.cpp (renamed from library/depends/tinyxml/tinystr.cpp)0
-rw-r--r--depends/tinyxml/tinystr.h (renamed from library/depends/tinyxml/tinystr.h)0
-rw-r--r--depends/tinyxml/tinyxml.cpp (renamed from library/depends/tinyxml/tinyxml.cpp)0
-rw-r--r--depends/tinyxml/tinyxml.h (renamed from library/depends/tinyxml/tinyxml.h)0
-rw-r--r--depends/tinyxml/tinyxmlerror.cpp (renamed from library/depends/tinyxml/tinyxmlerror.cpp)0
-rw-r--r--depends/tinyxml/tinyxmlparser.cpp (renamed from library/depends/tinyxml/tinyxmlparser.cpp)0
-rw-r--r--depends/tthread/CMakeLists.txt6
-rw-r--r--depends/tthread/fast_mutex.h (renamed from library/depends/tthread/fast_mutex.h)0
-rw-r--r--depends/tthread/tinythread.cpp (renamed from library/depends/tthread/tinythread.cpp)0
-rw-r--r--depends/tthread/tinythread.h (renamed from library/depends/tthread/tinythread.h)0
-rw-r--r--depends/zlib/include/zconf.h (renamed from library/depends/zlib/include/zconf.h)0
-rw-r--r--depends/zlib/include/zlib.h (renamed from library/depends/zlib/include/zlib.h)0
-rw-r--r--depends/zlib/lib/zlib.lib (renamed from library/depends/zlib/lib/zlib.lib)bin108064 -> 108064 bytes
-rw-r--r--library/CMakeLists.txt149
-rw-r--r--library/depends/md5/CMakeLists.txt1
-rw-r--r--library/depends/tinyxml/CMakeLists.txt1
-rw-r--r--library/modules/Windows.cpp1
-rw-r--r--plugins/Dfusion/CMakeLists.txt3
-rw-r--r--plugins/Plugins.cmake1
-rw-r--r--plugins/devel/memview.cpp2
m---------plugins/df2mc0
-rw-r--r--plugins/mapexport/CMakeLists.txt12
m---------plugins/stonesense0
206 files changed, 170 insertions, 104 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7898a573..620bf6d9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,6 +10,22 @@ else(CMAKE_CONFIGURATION_TYPES)
endif (NOT CMAKE_BUILD_TYPE)
endif(CMAKE_CONFIGURATION_TYPES)
+# set up folder structures for IDE solutions
+if(NOT CMAKE_USING_VC_FREE_TOOLS)
+ SET_PROPERTY(GLOBAL PROPERTY USE_FOLDERS ON)
+ OPTION(CMAKE_USE_FOLDERS "Enable folder grouping of projects in IDEs." ON)
+else()
+ OPTION(CMAKE_USE_FOLDERS "Enable folder grouping of projects in IDEs." OFF)
+endif()
+MARK_AS_ADVANCED(CMAKE_USE_FOLDERS)
+
+# macro for setting up IDE folders without nasty IF()s everywhere
+MACRO(IDE_FOLDER target folder)
+ if(CMAKE_USE_FOLDERS)
+ SET_PROPERTY(TARGET ${target} PROPERTY FOLDER ${folder})
+ endif()
+ENDMACRO()
+
## some generic CMake magic
cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
project(dfhack)
@@ -78,27 +94,25 @@ IF(UNIX)
SET(CMAKE_C_FLAGS "-fvisibility=hidden -m32 -march=i686 -mtune=generic")
ENDIF()
+# use shared libraries for protobuf
+ADD_DEFINITIONS(-DPROTOBUF_USE_DLLS)
+
+#### expose depends ####
+
# find and make available libz
if(NOT UNIX)
- SET(ZLIB_INCLUDE_DIRS ${dfhack_SOURCE_DIR}/library/depends/zlib/include/)
- SET(ZLIB_LIBRARIES ${dfhack_SOURCE_DIR}/library/depends/zlib/lib/zlib.lib)
-else()
- find_package(ZLIB REQUIRED)
+ SET(ZLIB_ROOT depends/zlib/)
endif()
+find_package(ZLIB REQUIRED)
+include_directories(depends/protobuf)
+include_directories(depends/lua/include)
+include_directories(depends/md5)
+include_directories(depends/tinyxml)
+include_directories(depends/tthread)
include_directories(${ZLIB_INCLUDE_DIRS})
+add_subdirectory(depends)
-#add depends to include path
-INCLUDE_DIRECTORIES ( library/depends )
-INCLUDE_DIRECTORIES ( library/depends/protobuf/ )
-
-# use shared libraries for protobuf
-ADD_DEFINITIONS(-DPROTOBUF_USE_DLLS)
-IF(!UNIX)
- # build the static lua for dfusion, win32 only
- INCLUDE_DIRECTORIES ( lua/include )
- add_subdirectory (lua)
-ENDIF()
# build the lib itself
IF(BUILD_LIBRARY)
diff --git a/depends/CMakeLists.txt b/depends/CMakeLists.txt
new file mode 100644
index 00000000..d16e83ea
--- /dev/null
+++ b/depends/CMakeLists.txt
@@ -0,0 +1,6 @@
+#list depends here.
+add_subdirectory(lua)
+add_subdirectory(md5)
+add_subdirectory(protobuf)
+add_subdirectory(tinyxml)
+add_subdirectory(tthread)
diff --git a/lua/CMakeLists.txt b/depends/lua/CMakeLists.txt
index 2a1ccd8d..b135f221 100644
--- a/lua/CMakeLists.txt
+++ b/depends/lua/CMakeLists.txt
@@ -13,6 +13,35 @@ IF(UNIX)
SET(CMAKE_C_FLAGS "-m32")
ENDIF()
+SET (HDR_LIBLUA
+include/bit.h
+include/lapi.h
+include/lauxlib.h
+include/lcode.h
+include/ldebug.h
+include/ldo.h
+include/lfunc.h
+include/lgc.h
+include/llex.h
+include/llimits.h
+include/lmem.h
+include/lobject.h
+include/lopcodes.h
+include/lparser.h
+include/lstate.h
+include/lstring.h
+include/ltable.h
+include/ltm.h
+include/lua.h
+include/luaconf.h
+include/lualib.h
+include/lundump.h
+include/lvm.h
+include/lzio.h
+)
+SET_SOURCE_FILES_PROPERTIES(${HDR_LIBLUA} PROPERTIES HEADER_FILE_ONLY TRUE)
+include_directories(include)
+
# Build Libraries
SET (SRC_LIBLUA
src/lapi.c
@@ -45,9 +74,11 @@ src/lundump.c
src/lvm.c
src/lzio.c
)
+LIST(APPEND SRC_LIBLUA ${HDR_LIBLUA})
-ADD_LIBRARY ( lua ${SRC_LIBLUA} )
+ADD_LIBRARY ( lua STATIC EXCLUDE_FROM_ALL ${SRC_LIBLUA} )
TARGET_LINK_LIBRARIES ( lua ${LIBS})
+IDE_FOLDER(lua "Depends")
#SET ( SRC_LUA src/lua.c )
#SET ( SRC_LUAC src/luac.c src/print.c )
diff --git a/lua/COPYRIGHT b/depends/lua/COPYRIGHT
index 3a53e741..3a53e741 100644
--- a/lua/COPYRIGHT
+++ b/depends/lua/COPYRIGHT
diff --git a/lua/README b/depends/lua/README
index 11b4dff7..11b4dff7 100644
--- a/lua/README
+++ b/depends/lua/README
diff --git a/lua/include/bit.h b/depends/lua/include/bit.h
index b75fdf05..b75fdf05 100644
--- a/lua/include/bit.h
+++ b/depends/lua/include/bit.h
diff --git a/lua/include/lapi.h b/depends/lua/include/lapi.h
index 2c3fab24..2c3fab24 100644
--- a/lua/include/lapi.h
+++ b/depends/lua/include/lapi.h
diff --git a/lua/include/lauxlib.h b/depends/lua/include/lauxlib.h
index 34258235..34258235 100644
--- a/lua/include/lauxlib.h
+++ b/depends/lua/include/lauxlib.h
diff --git a/lua/include/lcode.h b/depends/lua/include/lcode.h
index b941c607..b941c607 100644
--- a/lua/include/lcode.h
+++ b/depends/lua/include/lcode.h
diff --git a/lua/include/ldebug.h b/depends/lua/include/ldebug.h
index ba28a972..ba28a972 100644
--- a/lua/include/ldebug.h
+++ b/depends/lua/include/ldebug.h
diff --git a/lua/include/ldo.h b/depends/lua/include/ldo.h
index 98fddac5..98fddac5 100644
--- a/lua/include/ldo.h
+++ b/depends/lua/include/ldo.h
diff --git a/lua/include/lfunc.h b/depends/lua/include/lfunc.h
index a68cf515..a68cf515 100644
--- a/lua/include/lfunc.h
+++ b/depends/lua/include/lfunc.h
diff --git a/lua/include/lgc.h b/depends/lua/include/lgc.h
index 5a8dc605..5a8dc605 100644
--- a/lua/include/lgc.h
+++ b/depends/lua/include/lgc.h
diff --git a/lua/include/llex.h b/depends/lua/include/llex.h
index a9201cee..a9201cee 100644
--- a/lua/include/llex.h
+++ b/depends/lua/include/llex.h
diff --git a/lua/include/llimits.h b/depends/lua/include/llimits.h
index ca8dcb72..ca8dcb72 100644
--- a/lua/include/llimits.h
+++ b/depends/lua/include/llimits.h
diff --git a/lua/include/lmem.h b/depends/lua/include/lmem.h
index 7c2dcb32..7c2dcb32 100644
--- a/lua/include/lmem.h
+++ b/depends/lua/include/lmem.h
diff --git a/lua/include/lobject.h b/depends/lua/include/lobject.h
index f1e447ef..f1e447ef 100644
--- a/lua/include/lobject.h
+++ b/depends/lua/include/lobject.h
diff --git a/lua/include/lopcodes.h b/depends/lua/include/lopcodes.h
index 41224d6e..41224d6e 100644
--- a/lua/include/lopcodes.h
+++ b/depends/lua/include/lopcodes.h
diff --git a/lua/include/lparser.h b/depends/lua/include/lparser.h
index 18836afd..18836afd 100644
--- a/lua/include/lparser.h
+++ b/depends/lua/include/lparser.h
diff --git a/lua/include/lstate.h b/depends/lua/include/lstate.h
index 3bc575b6..3bc575b6 100644
--- a/lua/include/lstate.h
+++ b/depends/lua/include/lstate.h
diff --git a/lua/include/lstring.h b/depends/lua/include/lstring.h
index 73a2ff8b..73a2ff8b 100644
--- a/lua/include/lstring.h
+++ b/depends/lua/include/lstring.h
diff --git a/lua/include/ltable.h b/depends/lua/include/ltable.h
index f5b9d5ea..f5b9d5ea 100644
--- a/lua/include/ltable.h
+++ b/depends/lua/include/ltable.h
diff --git a/lua/include/ltm.h b/depends/lua/include/ltm.h
index 64343b78..64343b78 100644
--- a/lua/include/ltm.h
+++ b/depends/lua/include/ltm.h
diff --git a/lua/include/lua.h b/depends/lua/include/lua.h
index e4bdfd3b..e4bdfd3b 100644
--- a/lua/include/lua.h
+++ b/depends/lua/include/lua.h
diff --git a/lua/include/luaconf.h b/depends/lua/include/luaconf.h
index 66079335..66079335 100644
--- a/lua/include/luaconf.h
+++ b/depends/lua/include/luaconf.h
diff --git a/lua/include/lualib.h b/depends/lua/include/lualib.h
index 469417f6..469417f6 100644
--- a/lua/include/lualib.h
+++ b/depends/lua/include/lualib.h
diff --git a/lua/include/lundump.h b/depends/lua/include/lundump.h
index c80189db..c80189db 100644
--- a/lua/include/lundump.h
+++ b/depends/lua/include/lundump.h
diff --git a/lua/include/lvm.h b/depends/lua/include/lvm.h
index bfe4f567..bfe4f567 100644
--- a/lua/include/lvm.h
+++ b/depends/lua/include/lvm.h
diff --git a/lua/include/lzio.h b/depends/lua/include/lzio.h
index 51d695d8..51d695d8 100644
--- a/lua/include/lzio.h
+++ b/depends/lua/include/lzio.h
diff --git a/lua/src/bit.c b/depends/lua/src/bit.c
index 9f2d6f5a..9f2d6f5a 100644
--- a/lua/src/bit.c
+++ b/depends/lua/src/bit.c
diff --git a/lua/src/lapi.c b/depends/lua/src/lapi.c
index 5d5145d2..5d5145d2 100644
--- a/lua/src/lapi.c
+++ b/depends/lua/src/lapi.c
diff --git a/lua/src/lauxlib.c b/depends/lua/src/lauxlib.c
index 10f14e2c..10f14e2c 100644
--- a/lua/src/lauxlib.c
+++ b/depends/lua/src/lauxlib.c
diff --git a/lua/src/lbaselib.c b/depends/lua/src/lbaselib.c
index 2a4c079d..2a4c079d 100644
--- a/lua/src/lbaselib.c
+++ b/depends/lua/src/lbaselib.c
diff --git a/lua/src/lcode.c b/depends/lua/src/lcode.c
index cff626b7..cff626b7 100644
--- a/lua/src/lcode.c
+++ b/depends/lua/src/lcode.c
diff --git a/lua/src/ldblib.c b/depends/lua/src/ldblib.c
index 67de1222..67de1222 100644
--- a/lua/src/ldblib.c
+++ b/depends/lua/src/ldblib.c
diff --git a/lua/src/ldebug.c b/depends/lua/src/ldebug.c
index 50ad3d38..50ad3d38 100644
--- a/lua/src/ldebug.c
+++ b/depends/lua/src/ldebug.c
diff --git a/lua/src/ldo.c b/depends/lua/src/ldo.c
index 8de05f72..8de05f72 100644
--- a/lua/src/ldo.c
+++ b/depends/lua/src/ldo.c
diff --git a/lua/src/ldump.c b/depends/lua/src/ldump.c
index c9d3d487..c9d3d487 100644
--- a/lua/src/ldump.c
+++ b/depends/lua/src/ldump.c
diff --git a/lua/src/lfunc.c b/depends/lua/src/lfunc.c
index 813e88f5..813e88f5 100644
--- a/lua/src/lfunc.c
+++ b/depends/lua/src/lfunc.c
diff --git a/lua/src/lgc.c b/depends/lua/src/lgc.c
index d9e0b782..d9e0b782 100644
--- a/lua/src/lgc.c
+++ b/depends/lua/src/lgc.c
diff --git a/lua/src/linit.c b/depends/lua/src/linit.c
index c1f90dfa..c1f90dfa 100644
--- a/lua/src/linit.c
+++ b/depends/lua/src/linit.c
diff --git a/lua/src/liolib.c b/depends/lua/src/liolib.c
index e79ed1cb..e79ed1cb 100644
--- a/lua/src/liolib.c
+++ b/depends/lua/src/liolib.c
diff --git a/lua/src/llex.c b/depends/lua/src/llex.c
index 6dc31935..6dc31935 100644
--- a/lua/src/llex.c
+++ b/depends/lua/src/llex.c
diff --git a/lua/src/lmathlib.c b/depends/lua/src/lmathlib.c
index 441fbf73..441fbf73 100644
--- a/lua/src/lmathlib.c
+++ b/depends/lua/src/lmathlib.c
diff --git a/lua/src/lmem.c b/depends/lua/src/lmem.c
index ae7d8c96..ae7d8c96 100644
--- a/lua/src/lmem.c
+++ b/depends/lua/src/lmem.c
diff --git a/lua/src/loadlib.c b/depends/lua/src/loadlib.c
index 0d401eba..0d401eba 100644
--- a/lua/src/loadlib.c
+++ b/depends/lua/src/loadlib.c
diff --git a/lua/src/lobject.c b/depends/lua/src/lobject.c
index 4ff50732..4ff50732 100644
--- a/lua/src/lobject.c
+++ b/depends/lua/src/lobject.c
diff --git a/lua/src/lopcodes.c b/depends/lua/src/lopcodes.c
index 4cc74523..4cc74523 100644
--- a/lua/src/lopcodes.c
+++ b/depends/lua/src/lopcodes.c
diff --git a/lua/src/loslib.c b/depends/lua/src/loslib.c
index da06a572..da06a572 100644
--- a/lua/src/loslib.c
+++ b/depends/lua/src/loslib.c
diff --git a/lua/src/lparser.c b/depends/lua/src/lparser.c
index 1e2a9a88..1e2a9a88 100644
--- a/lua/src/lparser.c
+++ b/depends/lua/src/lparser.c
diff --git a/lua/src/lstate.c b/depends/lua/src/lstate.c
index 4313b83a..4313b83a 100644
--- a/lua/src/lstate.c
+++ b/depends/lua/src/lstate.c
diff --git a/lua/src/lstring.c b/depends/lua/src/lstring.c
index 49113151..49113151 100644
--- a/lua/src/lstring.c
+++ b/depends/lua/src/lstring.c
diff --git a/lua/src/lstrlib.c b/depends/lua/src/lstrlib.c
index 1b4763d4..1b4763d4 100644
--- a/lua/src/lstrlib.c
+++ b/depends/lua/src/lstrlib.c
diff --git a/lua/src/ltable.c b/depends/lua/src/ltable.c
index ec84f4fa..ec84f4fa 100644
--- a/lua/src/ltable.c
+++ b/depends/lua/src/ltable.c
diff --git a/lua/src/ltablib.c b/depends/lua/src/ltablib.c
index b6d9cb4a..b6d9cb4a 100644
--- a/lua/src/ltablib.c
+++ b/depends/lua/src/ltablib.c
diff --git a/lua/src/ltm.c b/depends/lua/src/ltm.c
index c27f0f6f..c27f0f6f 100644
--- a/lua/src/ltm.c
+++ b/depends/lua/src/ltm.c
diff --git a/lua/src/lua.c b/depends/lua/src/lua.c
index 3a466093..3a466093 100644
--- a/lua/src/lua.c
+++ b/depends/lua/src/lua.c
diff --git a/lua/src/luac.c b/depends/lua/src/luac.c
index d0701739..d0701739 100644
--- a/lua/src/luac.c
+++ b/depends/lua/src/luac.c
diff --git a/lua/src/lundump.c b/depends/lua/src/lundump.c
index 8010a457..8010a457 100644
--- a/lua/src/lundump.c
+++ b/depends/lua/src/lundump.c
diff --git a/lua/src/lvm.c b/depends/lua/src/lvm.c
index ee3256ab..ee3256ab 100644
--- a/lua/src/lvm.c
+++ b/depends/lua/src/lvm.c
diff --git a/lua/src/lzio.c b/depends/lua/src/lzio.c
index 293edd59..293edd59 100644
--- a/lua/src/lzio.c
+++ b/depends/lua/src/lzio.c
diff --git a/lua/src/print.c b/depends/lua/src/print.c
index e240cfc3..e240cfc3 100644
--- a/lua/src/print.c
+++ b/depends/lua/src/print.c
diff --git a/depends/md5/CMakeLists.txt b/depends/md5/CMakeLists.txt
new file mode 100644
index 00000000..69e0cf0b
--- /dev/null
+++ b/depends/md5/CMakeLists.txt
@@ -0,0 +1,3 @@
+project(dfhack-md5)
+ADD_LIBRARY(dfhack-md5 STATIC EXCLUDE_FROM_ALL md5.cpp md5wrapper.cpp)
+IDE_FOLDER(dfhack-md5 "Depends") \ No newline at end of file
diff --git a/library/depends/md5/md5.cpp b/depends/md5/md5.cpp
index 5ee4fb45..5ee4fb45 100644
--- a/library/depends/md5/md5.cpp
+++ b/depends/md5/md5.cpp
diff --git a/library/depends/md5/md5.h b/depends/md5/md5.h
index 0a04051b..0a04051b 100644
--- a/library/depends/md5/md5.h
+++ b/depends/md5/md5.h
diff --git a/library/depends/md5/md5wrapper.cpp b/depends/md5/md5wrapper.cpp
index e12b6578..e12b6578 100644
--- a/library/depends/md5/md5wrapper.cpp
+++ b/depends/md5/md5wrapper.cpp
diff --git a/library/depends/md5/md5wrapper.h b/depends/md5/md5wrapper.h
index 1a41192a..1a41192a 100644
--- a/library/depends/md5/md5wrapper.h
+++ b/depends/md5/md5wrapper.h
diff --git a/library/depends/protobuf/.gitignore b/depends/protobuf/.gitignore
index dd948c38..dd948c38 100644
--- a/library/depends/protobuf/.gitignore
+++ b/depends/protobuf/.gitignore
diff --git a/library/depends/protobuf/CMakeLists.txt b/depends/protobuf/CMakeLists.txt
index 0a203e5d..f4a3b6d1 100644
--- a/library/depends/protobuf/CMakeLists.txt
+++ b/depends/protobuf/CMakeLists.txt
@@ -201,12 +201,15 @@ google/protobuf/compiler/zip_writer.cc
LIST(APPEND LIBPROTOBUF_FULL_SRCS ${LIBPROTOBUF_LITE_SRCS})
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
+SET(PROTOBUF_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR})
INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIRS})
# Protobuf shared libraries
ADD_LIBRARY(protobuf SHARED ${LIBPROTOBUF_FULL_SRCS} ${LIBPROTOBUF_FULL_HDRS})
+IDE_FOLDER(protobuf "Depends")
ADD_LIBRARY(protobuf-lite SHARED ${LIBPROTOBUF_LITE_SRCS} ${LIBPROTOBUF_LITE_HDRS})
+IDE_FOLDER(protobuf-lite "Depends")
SET_TARGET_PROPERTIES(protobuf PROPERTIES COMPILE_DEFINITIONS LIBPROTOBUF_EXPORTS)
SET_TARGET_PROPERTIES(protobuf-lite PROPERTIES COMPILE_DEFINITIONS LIBPROTOBUF_EXPORTS)
@@ -215,12 +218,13 @@ TARGET_LINK_LIBRARIES(protobuf ${CMAKE_THREAD_LIBS_INIT} ${ZLIB_LIBRARIES})
TARGET_LINK_LIBRARIES(protobuf-lite ${CMAKE_THREAD_LIBS_INIT} ${ZLIB_LIBRARIES})
install(TARGETS protobuf-lite
- LIBRARY DESTINATION ${DFHACK_LIBRARY_DESTINATION}/deplibs
- RUNTIME DESTINATION ${DFHACK_LIBRARY_DESTINATION}/deplibs)
+ LIBRARY DESTINATION ${DFHACK_LIBRARY_DESTINATION}
+ RUNTIME DESTINATION ${DFHACK_LIBRARY_DESTINATION})
# Protobuf compiler shared library
ADD_LIBRARY(protoc SHARED ${LIBPROTOC_SRCS} ${LIBPROTOC_HDRS})
+IDE_FOLDER(protoc "Depends")
SET_TARGET_PROPERTIES(protoc PROPERTIES COMPILE_DEFINITIONS LIBPROTOC_EXPORTS)
TARGET_LINK_LIBRARIES(protoc protobuf)
@@ -228,6 +232,7 @@ TARGET_LINK_LIBRARIES(protoc protobuf)
# Protobuf compiler executable
ADD_EXECUTABLE(protoc-bin google/protobuf/compiler/main.cc google/protobuf/compiler/command_line_interface.h google/protobuf/compiler/cpp/cpp_generator.h)
+IDE_FOLDER(protoc-bin "Depends")
SET_TARGET_PROPERTIES(protoc-bin PROPERTIES OUTPUT_NAME protoc)
TARGET_LINK_LIBRARIES(protoc-bin protoc)
diff --git a/library/depends/protobuf/COPYING.txt b/depends/protobuf/COPYING.txt
index e1c4f52e..e1c4f52e 100644
--- a/library/depends/protobuf/COPYING.txt
+++ b/depends/protobuf/COPYING.txt
diff --git a/library/depends/protobuf/config.h.in b/depends/protobuf/config.h.in
index 7da01520..7da01520 100644
--- a/library/depends/protobuf/config.h.in
+++ b/depends/protobuf/config.h.in
diff --git a/library/depends/protobuf/google/protobuf/compiler/code_generator.cc b/depends/protobuf/google/protobuf/compiler/code_generator.cc
index 455c239a..455c239a 100644
--- a/library/depends/protobuf/google/protobuf/compiler/code_generator.cc
+++ b/depends/protobuf/google/protobuf/compiler/code_generator.cc
diff --git a/library/depends/protobuf/google/protobuf/compiler/code_generator.h b/depends/protobuf/google/protobuf/compiler/code_generator.h
index 252f68d1..252f68d1 100644
--- a/library/depends/protobuf/google/protobuf/compiler/code_generator.h
+++ b/depends/protobuf/google/protobuf/compiler/code_generator.h
diff --git a/library/depends/protobuf/google/protobuf/compiler/command_line_interface.cc b/depends/protobuf/google/protobuf/compiler/command_line_interface.cc
index 88850f2c..88850f2c 100644
--- a/library/depends/protobuf/google/protobuf/compiler/command_line_interface.cc
+++ b/depends/protobuf/google/protobuf/compiler/command_line_interface.cc
diff --git a/library/depends/protobuf/google/protobuf/compiler/command_line_interface.h b/depends/protobuf/google/protobuf/compiler/command_line_interface.h
index 0b507d80..0b507d80 100644
--- a/library/depends/protobuf/google/protobuf/compiler/command_line_interface.h
+++ b/depends/protobuf/google/protobuf/compiler/command_line_interface.h
diff --git a/library/depends/protobuf/google/protobuf/compiler/cpp/cpp_enum.cc b/depends/protobuf/google/protobuf/compiler/cpp/cpp_enum.cc
index 76d2b798..76d2b798 100644
--- a/library/depends/protobuf/google/protobuf/compiler/cpp/cpp_enum.cc
+++ b/depends/protobuf/google/protobuf/compiler/cpp/cpp_enum.cc
diff --git a/library/depends/protobuf/google/protobuf/compiler/cpp/cpp_enum.h b/depends/protobuf/google/protobuf/compiler/cpp/cpp_enum.h
index 58f7721e..58f7721e 100644
--- a/library/depends/protobuf/google/protobuf/compiler/cpp/cpp_enum.h
+++ b/depends/protobuf/google/protobuf/compiler/cpp/cpp_enum.h
diff --git a/library/depends/protobuf/google/protobuf/compiler/cpp/cpp_enum_field.cc b/depends/protobuf/google/protobuf/compiler/cpp/cpp_enum_field.cc
index a369f417..a369f417 100644
--- a/library/depends/protobuf/google/protobuf/compiler/cpp/cpp_enum_field.cc
+++ b/depends/protobuf/google/protobuf/compiler/cpp/cpp_enum_field.cc
diff --git a/library/depends/protobuf/google/protobuf/compiler/cpp/cpp_enum_field.h b/depends/protobuf/google/protobuf/compiler/cpp/cpp_enum_field.h
index 0793430c..0793430c 100644
--- a/library/depends/protobuf/google/protobuf/compiler/cpp/cpp_enum_field.h
+++ b/depends/protobuf/google/protobuf/compiler/cpp/cpp_enum_field.h
diff --git a/library/depends/protobuf/google/protobuf/compiler/cpp/cpp_extension.cc b/depends/protobuf/google/protobuf/compiler/cpp/cpp_extension.cc
index 658a7077..658a7077 100644
--- a/library/depends/protobuf/google/protobuf/compiler/cpp/cpp_extension.cc
+++ b/depends/protobuf/google/protobuf/compiler/cpp/cpp_extension.cc
diff --git a/library/depends/protobuf/google/protobuf/compiler/cpp/cpp_extension.h b/depends/protobuf/google/protobuf/compiler/cpp/cpp_extension.h
index 3068b091..3068b091 100644
--- a/library/depends/protobuf/google/protobuf/compiler/cpp/cpp_extension.h
+++ b/depends/protobuf/google/protobuf/compiler/cpp/cpp_extension.h
diff --git a/library/depends/protobuf/google/protobuf/compiler/cpp/cpp_field.cc b/depends/protobuf/google/protobuf/compiler/cpp/cpp_field.cc
index 103cac4a..103cac4a 100644
--- a/library/depends/protobuf/google/protobuf/compiler/cpp/cpp_field.cc
+++ b/depends/protobuf/google/protobuf/compiler/cpp/cpp_field.cc
diff --git a/library/depends/protobuf/google/protobuf/compiler/cpp/cpp_field.h b/depends/protobuf/google/protobuf/compiler/cpp/cpp_field.h
index c303a337..c303a337 100644
--- a/library/depends/protobuf/google/protobuf/compiler/cpp/cpp_field.h
+++ b/depends/protobuf/google/protobuf/compiler/cpp/cpp_field.h
diff --git a/library/depends/protobuf/google/protobuf/compiler/cpp/cpp_file.cc b/depends/protobuf/google/protobuf/compiler/cpp/cpp_file.cc
index 312ebc86..312ebc86 100644
--- a/library/depends/protobuf/google/protobuf/compiler/cpp/cpp_file.cc
+++ b/depends/protobuf/google/protobuf/compiler/cpp/cpp_file.cc
diff --git a/library/depends/protobuf/google/protobuf/compiler/cpp/cpp_file.h b/depends/protobuf/google/protobuf/compiler/cpp/cpp_file.h
index b4e01285..b4e01285 100644
--- a/library/depends/protobuf/google/protobuf/compiler/cpp/cpp_file.h
+++ b/depends/protobuf/google/protobuf/compiler/cpp/cpp_file.h
diff --git a/library/depends/protobuf/google/protobuf/compiler/cpp/cpp_generator.cc b/depends/protobuf/google/protobuf/compiler/cpp/cpp_generator.cc
index bb84e2ab..bb84e2ab 100644
--- a/library/depends/protobuf/google/protobuf/compiler/cpp/cpp_generator.cc
+++ b/depends/protobuf/google/protobuf/compiler/cpp/cpp_generator.cc
diff --git a/library/depends/protobuf/google/protobuf/compiler/cpp/cpp_generator.h b/depends/protobuf/google/protobuf/compiler/cpp/cpp_generator.h
index a90e84d7..a90e84d7 100644
--- a/library/depends/protobuf/google/protobuf/compiler/cpp/cpp_generator.h
+++ b/depends/protobuf/google/protobuf/compiler/cpp/cpp_generator.h
diff --git a/library/depends/protobuf/google/protobuf/compiler/cpp/cpp_helpers.cc b/depends/protobuf/google/protobuf/compiler/cpp/cpp_helpers.cc
index 25b05a85..25b05a85 100644
--- a/library/depends/protobuf/google/protobuf/compiler/cpp/cpp_helpers.cc
+++ b/depends/protobuf/google/protobuf/compiler/cpp/cpp_helpers.cc
diff --git a/library/depends/protobuf/google/protobuf/compiler/cpp/cpp_helpers.h b/depends/protobuf/google/protobuf/compiler/cpp/cpp_helpers.h
index b13d53be..b13d53be 100644
--- a/library/depends/protobuf/google/protobuf/compiler/cpp/cpp_helpers.h
+++ b/depends/protobuf/google/protobuf/compiler/cpp/cpp_helpers.h
diff --git a/library/depends/protobuf/google/protobuf/compiler/cpp/cpp_message.cc b/depends/protobuf/google/protobuf/compiler/cpp/cpp_message.cc
index c4e6fb2c..c4e6fb2c 100644
--- a/library/depends/protobuf/google/protobuf/compiler/cpp/cpp_message.cc
+++ b/depends/protobuf/google/protobuf/compiler/cpp/cpp_message.cc
diff --git a/library/depends/protobuf/google/protobuf/compiler/cpp/cpp_message.h b/depends/protobuf/google/protobuf/compiler/cpp/cpp_message.h
index 04778f6d..04778f6d 100644
--- a/library/depends/protobuf/google/protobuf/compiler/cpp/cpp_message.h
+++ b/depends/protobuf/google/protobuf/compiler/cpp/cpp_message.h
diff --git a/library/depends/protobuf/google/protobuf/compiler/cpp/cpp_message_field.cc b/depends/protobuf/google/protobuf/compiler/cpp/cpp_message_field.cc
index 23e75b87..23e75b87 100644
--- a/library/depends/protobuf/google/protobuf/compiler/cpp/cpp_message_field.cc
+++ b/depends/protobuf/google/protobuf/compiler/cpp/cpp_message_field.cc
diff --git a/library/depends/protobuf/google/protobuf/compiler/cpp/cpp_message_field.h b/depends/protobuf/google/protobuf/compiler/cpp/cpp_message_field.h
index f5147278..f5147278 100644
--- a/library/depends/protobuf/google/protobuf/compiler/cpp/cpp_message_field.h
+++ b/depends/protobuf/google/protobuf/compiler/cpp/cpp_message_field.h
diff --git a/library/depends/protobuf/google/protobuf/compiler/cpp/cpp_primitive_field.cc b/depends/protobuf/google/protobuf/compiler/cpp/cpp_primitive_field.cc
index 5e8df0f4..5e8df0f4 100644
--- a/library/depends/protobuf/google/protobuf/compiler/cpp/cpp_primitive_field.cc
+++ b/depends/protobuf/google/protobuf/compiler/cpp/cpp_primitive_field.cc
diff --git a/library/depends/protobuf/google/protobuf/compiler/cpp/cpp_primitive_field.h b/depends/protobuf/google/protobuf/compiler/cpp/cpp_primitive_field.h
index 8fcd74ae..8fcd74ae 100644
--- a/library/depends/protobuf/google/protobuf/compiler/cpp/cpp_primitive_field.h
+++ b/depends/protobuf/google/protobuf/compiler/cpp/cpp_primitive_field.h
diff --git a/library/depends/protobuf/google/protobuf/compiler/cpp/cpp_service.cc b/depends/protobuf/google/protobuf/compiler/cpp/cpp_service.cc
index c2825683..c2825683 100644
--- a/library/depends/protobuf/google/protobuf/compiler/cpp/cpp_service.cc
+++ b/depends/protobuf/google/protobuf/compiler/cpp/cpp_service.cc
diff --git a/library/depends/protobuf/google/protobuf/compiler/cpp/cpp_service.h b/depends/protobuf/google/protobuf/compiler/cpp/cpp_service.h
index 10e9dd3c..10e9dd3c 100644
--- a/library/depends/protobuf/google/protobuf/compiler/cpp/cpp_service.h
+++ b/depends/protobuf/google/protobuf/compiler/cpp/cpp_service.h
diff --git a/library/depends/protobuf/google/protobuf/compiler/cpp/cpp_string_field.cc b/depends/protobuf/google/protobuf/compiler/cpp/cpp_string_field.cc
index 8d611b69..8d611b69 100644
--- a/library/depends/protobuf/google/protobuf/compiler/cpp/cpp_string_field.cc
+++ b/depends/protobuf/google/protobuf/compiler/cpp/cpp_string_field.cc
diff --git a/library/depends/protobuf/google/protobuf/compiler/cpp/cpp_string_field.h b/depends/protobuf/google/protobuf/compiler/cpp/cpp_string_field.h
index 7f45107d..7f45107d 100644
--- a/library/depends/protobuf/google/protobuf/compiler/cpp/cpp_string_field.h
+++ b/depends/protobuf/google/protobuf/compiler/cpp/cpp_string_field.h
diff --git a/library/depends/protobuf/google/protobuf/compiler/cpp/cpp_unittest.cc b/depends/protobuf/google/protobuf/compiler/cpp/cpp_unittest.cc
index 301a7ce6..301a7ce6 100644
--- a/library/depends/protobuf/google/protobuf/compiler/cpp/cpp_unittest.cc
+++ b/depends/protobuf/google/protobuf/compiler/cpp/cpp_unittest.cc
diff --git a/library/depends/protobuf/google/protobuf/compiler/importer.cc b/depends/protobuf/google/protobuf/compiler/importer.cc
index 422f759f..422f759f 100644
--- a/library/depends/protobuf/google/protobuf/compiler/importer.cc
+++ b/depends/protobuf/google/protobuf/compiler/importer.cc
diff --git a/library/depends/protobuf/google/protobuf/compiler/importer.h b/depends/protobuf/google/protobuf/compiler/importer.h
index 7a2efc29..7a2efc29 100644
--- a/library/depends/protobuf/google/protobuf/compiler/importer.h
+++ b/depends/protobuf/google/protobuf/compiler/importer.h
diff --git a/library/depends/protobuf/google/protobuf/compiler/main.cc b/depends/protobuf/google/protobuf/compiler/main.cc
index 4a17b87d..4a17b87d 100644
--- a/library/depends/protobuf/google/protobuf/compiler/main.cc
+++ b/depends/protobuf/google/protobuf/compiler/main.cc
diff --git a/library/depends/protobuf/google/protobuf/compiler/mock_code_generator.cc b/depends/protobuf/google/protobuf/compiler/mock_code_generator.cc
index 5b76af25..5b76af25 100644
--- a/library/depends/protobuf/google/protobuf/compiler/mock_code_generator.cc
+++ b/depends/protobuf/google/protobuf/compiler/mock_code_generator.cc
diff --git a/library/depends/protobuf/google/protobuf/compiler/mock_code_generator.h b/depends/protobuf/google/protobuf/compiler/mock_code_generator.h
index 5c7942bd..5c7942bd 100644
--- a/library/depends/protobuf/google/protobuf/compiler/mock_code_generator.h
+++ b/depends/protobuf/google/protobuf/compiler/mock_code_generator.h
diff --git a/library/depends/protobuf/google/protobuf/compiler/package_info.h b/depends/protobuf/google/protobuf/compiler/package_info.h
index b8971267..b8971267 100644
--- a/library/depends/protobuf/google/protobuf/compiler/package_info.h
+++ b/depends/protobuf/google/protobuf/compiler/package_info.h
diff --git a/library/depends/protobuf/google/protobuf/compiler/parser.cc b/depends/protobuf/google/protobuf/compiler/parser.cc
index 34317b1f..34317b1f 100644
--- a/library/depends/protobuf/google/protobuf/compiler/parser.cc
+++ b/depends/protobuf/google/protobuf/compiler/parser.cc
diff --git a/library/depends/protobuf/google/protobuf/compiler/parser.h b/depends/protobuf/google/protobuf/compiler/parser.h
index 4cc90a29..4cc90a29 100644
--- a/library/depends/protobuf/google/protobuf/compiler/parser.h
+++ b/depends/protobuf/google/protobuf/compiler/parser.h
diff --git a/library/depends/protobuf/google/protobuf/compiler/plugin.cc b/depends/protobuf/google/protobuf/compiler/plugin.cc
index 727f9421..727f9421 100644
--- a/library/depends/protobuf/google/protobuf/compiler/plugin.cc
+++ b/depends/protobuf/google/protobuf/compiler/plugin.cc
diff --git a/library/depends/protobuf/google/protobuf/compiler/plugin.h b/depends/protobuf/google/protobuf/compiler/plugin.h
index 64dfb1d2..64dfb1d2 100644
--- a/library/depends/protobuf/google/protobuf/compiler/plugin.h
+++ b/depends/protobuf/google/protobuf/compiler/plugin.h
diff --git a/library/depends/protobuf/google/protobuf/compiler/plugin.pb.cc b/depends/protobuf/google/protobuf/compiler/plugin.pb.cc
index ad4b4deb..ad4b4deb 100644
--- a/library/depends/protobuf/google/protobuf/compiler/plugin.pb.cc
+++ b/depends/protobuf/google/protobuf/compiler/plugin.pb.cc
diff --git a/library/depends/protobuf/google/protobuf/compiler/plugin.pb.h b/depends/protobuf/google/protobuf/compiler/plugin.pb.h
index 14216c2a..14216c2a 100644
--- a/library/depends/protobuf/google/protobuf/compiler/plugin.pb.h
+++ b/depends/protobuf/google/protobuf/compiler/plugin.pb.h
diff --git a/library/depends/protobuf/google/protobuf/compiler/subprocess.cc b/depends/protobuf/google/protobuf/compiler/subprocess.cc
index 5fb5d5cb..5fb5d5cb 100644
--- a/library/depends/protobuf/google/protobuf/compiler/subprocess.cc
+++ b/depends/protobuf/google/protobuf/compiler/subprocess.cc
diff --git a/library/depends/protobuf/google/protobuf/compiler/subprocess.h b/depends/protobuf/google/protobuf/compiler/subprocess.h
index de9fce9e..de9fce9e 100644
--- a/library/depends/protobuf/google/protobuf/compiler/subprocess.h
+++ b/depends/protobuf/google/protobuf/compiler/subprocess.h
diff --git a/library/depends/protobuf/google/protobuf/compiler/test_plugin.cc b/depends/protobuf/google/protobuf/compiler/test_plugin.cc
index 5cbbf3d9..5cbbf3d9 100644
--- a/library/depends/protobuf/google/protobuf/compiler/test_plugin.cc
+++ b/depends/protobuf/google/protobuf/compiler/test_plugin.cc
diff --git a/library/depends/protobuf/google/protobuf/compiler/zip_writer.cc b/depends/protobuf/google/protobuf/compiler/zip_writer.cc
index 65d73527..65d73527 100644
--- a/library/depends/protobuf/google/protobuf/compiler/zip_writer.cc
+++ b/depends/protobuf/google/protobuf/compiler/zip_writer.cc
diff --git a/library/depends/protobuf/google/protobuf/compiler/zip_writer.h b/depends/protobuf/google/protobuf/compiler/zip_writer.h
index be73972a..be73972a 100644
--- a/library/depends/protobuf/google/protobuf/compiler/zip_writer.h
+++ b/depends/protobuf/google/protobuf/compiler/zip_writer.h
diff --git a/library/depends/protobuf/google/protobuf/descriptor.cc b/depends/protobuf/google/protobuf/descriptor.cc
index 754b5628..754b5628 100644
--- a/library/depends/protobuf/google/protobuf/descriptor.cc
+++ b/depends/protobuf/google/protobuf/descriptor.cc
diff --git a/library/depends/protobuf/google/protobuf/descriptor.h b/depends/protobuf/google/protobuf/descriptor.h
index 7f87dd80..7f87dd80 100644
--- a/library/depends/protobuf/google/protobuf/descriptor.h
+++ b/depends/protobuf/google/protobuf/descriptor.h
diff --git a/library/depends/protobuf/google/protobuf/descriptor.pb.cc b/depends/protobuf/google/protobuf/descriptor.pb.cc
index 87303ef8..87303ef8 100644
--- a/library/depends/protobuf/google/protobuf/descriptor.pb.cc
+++ b/depends/protobuf/google/protobuf/descriptor.pb.cc
diff --git a/library/depends/protobuf/google/protobuf/descriptor.pb.h b/depends/protobuf/google/protobuf/descriptor.pb.h
index 95febb81..95febb81 100644
--- a/library/depends/protobuf/google/protobuf/descriptor.pb.h
+++ b/depends/protobuf/google/protobuf/descriptor.pb.h
diff --git a/library/depends/protobuf/google/protobuf/descriptor_database.cc b/depends/protobuf/google/protobuf/descriptor_database.cc
index 23e48a67..23e48a67 100644
--- a/library/depends/protobuf/google/protobuf/descriptor_database.cc
+++ b/depends/protobuf/google/protobuf/descriptor_database.cc
diff --git a/library/depends/protobuf/google/protobuf/descriptor_database.h b/depends/protobuf/google/protobuf/descriptor_database.h
index f32b1db9..f32b1db9 100644
--- a/library/depends/protobuf/google/protobuf/descriptor_database.h
+++ b/depends/protobuf/google/protobuf/descriptor_database.h
diff --git a/library/depends/protobuf/google/protobuf/dynamic_message.cc b/depends/protobuf/google/protobuf/dynamic_message.cc
index c711a2da..c711a2da 100644
--- a/library/depends/protobuf/google/protobuf/dynamic_message.cc
+++ b/depends/protobuf/google/protobuf/dynamic_message.cc
diff --git a/library/depends/protobuf/google/protobuf/dynamic_message.h b/depends/protobuf/google/protobuf/dynamic_message.h
index 81dd2c63..81dd2c63 100644
--- a/library/depends/protobuf/google/protobuf/dynamic_message.h
+++ b/depends/protobuf/google/protobuf/dynamic_message.h
diff --git a/library/depends/protobuf/google/protobuf/extension_set.cc b/depends/protobuf/google/protobuf/extension_set.cc
index 1a6f5dfc..1a6f5dfc 100644
--- a/library/depends/protobuf/google/protobuf/extension_set.cc
+++ b/depends/protobuf/google/protobuf/extension_set.cc
diff --git a/library/depends/protobuf/google/protobuf/extension_set.h b/depends/protobuf/google/protobuf/extension_set.h
index ac1ada02..ac1ada02 100644
--- a/library/depends/protobuf/google/protobuf/extension_set.h
+++ b/depends/protobuf/google/protobuf/extension_set.h
diff --git a/library/depends/protobuf/google/protobuf/extension_set_heavy.cc b/depends/protobuf/google/protobuf/extension_set_heavy.cc
index 2721f15d..2721f15d 100644
--- a/library/depends/protobuf/google/protobuf/extension_set_heavy.cc
+++ b/depends/protobuf/google/protobuf/extension_set_heavy.cc
diff --git a/library/depends/protobuf/google/protobuf/extension_set_unittest.cc b/depends/protobuf/google/protobuf/extension_set_unittest.cc
index 000f846c..000f846c 100644
--- a/library/depends/protobuf/google/protobuf/extension_set_unittest.cc
+++ b/depends/protobuf/google/protobuf/extension_set_unittest.cc
diff --git a/library/depends/protobuf/google/protobuf/generated_message_reflection.cc b/depends/protobuf/google/protobuf/generated_message_reflection.cc
index a0dd75c6..a0dd75c6 100644
--- a/library/depends/protobuf/google/protobuf/generated_message_reflection.cc
+++ b/depends/protobuf/google/protobuf/generated_message_reflection.cc
diff --git a/library/depends/protobuf/google/protobuf/generated_message_reflection.h b/depends/protobuf/google/protobuf/generated_message_reflection.h
index b545fa1a..b545fa1a 100644
--- a/library/depends/protobuf/google/protobuf/generated_message_reflection.h
+++ b/depends/protobuf/google/protobuf/generated_message_reflection.h
diff --git a/library/depends/protobuf/google/protobuf/generated_message_util.cc b/depends/protobuf/google/protobuf/generated_message_util.cc
index 76e547bb..76e547bb 100644
--- a/library/depends/protobuf/google/protobuf/generated_message_util.cc
+++ b/depends/protobuf/google/protobuf/generated_message_util.cc
diff --git a/library/depends/protobuf/google/protobuf/generated_message_util.h b/depends/protobuf/google/protobuf/generated_message_util.h
index 239daea5..239daea5 100644
--- a/library/depends/protobuf/google/protobuf/generated_message_util.h
+++ b/depends/protobuf/google/protobuf/generated_message_util.h
diff --git a/library/depends/protobuf/google/protobuf/io/coded_stream.cc b/depends/protobuf/google/protobuf/io/coded_stream.cc
index 57d486f9..57d486f9 100644
--- a/library/depends/protobuf/google/protobuf/io/coded_stream.cc
+++ b/depends/protobuf/google/protobuf/io/coded_stream.cc
diff --git a/library/depends/protobuf/google/protobuf/io/coded_stream.h b/depends/protobuf/google/protobuf/io/coded_stream.h
index 1b6b4e18..1b6b4e18 100644
--- a/library/depends/protobuf/google/protobuf/io/coded_stream.h
+++ b/depends/protobuf/google/protobuf/io/coded_stream.h
diff --git a/library/depends/protobuf/google/protobuf/io/coded_stream_inl.h b/depends/protobuf/google/protobuf/io/coded_stream_inl.h
index e9799d47..e9799d47 100644
--- a/library/depends/protobuf/google/protobuf/io/coded_stream_inl.h
+++ b/depends/protobuf/google/protobuf/io/coded_stream_inl.h
diff --git a/library/depends/protobuf/google/protobuf/io/gzip_stream.cc b/depends/protobuf/google/protobuf/io/gzip_stream.cc
index 0f1ff872..0f1ff872 100644
--- a/library/depends/protobuf/google/protobuf/io/gzip_stream.cc
+++ b/depends/protobuf/google/protobuf/io/gzip_stream.cc
diff --git a/library/depends/protobuf/google/protobuf/io/gzip_stream.h b/depends/protobuf/google/protobuf/io/gzip_stream.h
index 65dbc5b5..65dbc5b5 100644
--- a/library/depends/protobuf/google/protobuf/io/gzip_stream.h
+++ b/depends/protobuf/google/protobuf/io/gzip_stream.h
diff --git a/library/depends/protobuf/google/protobuf/io/package_info.h b/depends/protobuf/google/protobuf/io/package_info.h
index 7a7a4e77..7a7a4e77 100644
--- a/library/depends/protobuf/google/protobuf/io/package_info.h
+++ b/depends/protobuf/google/protobuf/io/package_info.h
diff --git a/library/depends/protobuf/google/protobuf/io/printer.cc b/depends/protobuf/google/protobuf/io/printer.cc
index 9ab90dee..9ab90dee 100644
--- a/library/depends/protobuf/google/protobuf/io/printer.cc
+++ b/depends/protobuf/google/protobuf/io/printer.cc
diff --git a/library/depends/protobuf/google/protobuf/io/printer.h b/depends/protobuf/google/protobuf/io/printer.h
index 5be48543..5be48543 100644
--- a/library/depends/protobuf/google/protobuf/io/printer.h
+++ b/depends/protobuf/google/protobuf/io/printer.h
diff --git a/library/depends/protobuf/google/protobuf/io/tokenizer.cc b/depends/protobuf/google/protobuf/io/tokenizer.cc
index 513831d5..513831d5 100644
--- a/library/depends/protobuf/google/protobuf/io/tokenizer.cc
+++ b/depends/protobuf/google/protobuf/io/tokenizer.cc
diff --git a/library/depends/protobuf/google/protobuf/io/tokenizer.h b/depends/protobuf/google/protobuf/io/tokenizer.h
index 8f759abb..8f759abb 100644
--- a/library/depends/protobuf/google/protobuf/io/tokenizer.h
+++ b/depends/protobuf/google/protobuf/io/tokenizer.h
diff --git a/library/depends/protobuf/google/protobuf/io/zero_copy_stream.cc b/depends/protobuf/google/protobuf/io/zero_copy_stream.cc
index dad6ff14..dad6ff14 100644
--- a/library/depends/protobuf/google/protobuf/io/zero_copy_stream.cc
+++ b/depends/protobuf/google/protobuf/io/zero_copy_stream.cc
diff --git a/library/depends/protobuf/google/protobuf/io/zero_copy_stream.h b/depends/protobuf/google/protobuf/io/zero_copy_stream.h
index db5326f7..db5326f7 100644
--- a/library/depends/protobuf/google/protobuf/io/zero_copy_stream.h
+++ b/depends/protobuf/google/protobuf/io/zero_copy_stream.h
diff --git a/library/depends/protobuf/google/protobuf/io/zero_copy_stream_impl.cc b/depends/protobuf/google/protobuf/io/zero_copy_stream_impl.cc
index 1384c746..1384c746 100644
--- a/library/depends/protobuf/google/protobuf/io/zero_copy_stream_impl.cc
+++ b/depends/protobuf/google/protobuf/io/zero_copy_stream_impl.cc
diff --git a/library/depends/protobuf/google/protobuf/io/zero_copy_stream_impl.h b/depends/protobuf/google/protobuf/io/zero_copy_stream_impl.h
index 9fedb005..9fedb005 100644
--- a/library/depends/protobuf/google/protobuf/io/zero_copy_stream_impl.h
+++ b/depends/protobuf/google/protobuf/io/zero_copy_stream_impl.h
diff --git a/library/depends/protobuf/google/protobuf/io/zero_copy_stream_impl_lite.cc b/depends/protobuf/google/protobuf/io/zero_copy_stream_impl_lite.cc
index e8012510..e8012510 100644
--- a/library/depends/protobuf/google/protobuf/io/zero_copy_stream_impl_lite.cc
+++ b/depends/protobuf/google/protobuf/io/zero_copy_stream_impl_lite.cc
diff --git a/library/depends/protobuf/google/protobuf/io/zero_copy_stream_impl_lite.h b/depends/protobuf/google/protobuf/io/zero_copy_stream_impl_lite.h
index 153f543e..153f543e 100644
--- a/library/depends/protobuf/google/protobuf/io/zero_copy_stream_impl_lite.h
+++ b/depends/protobuf/google/protobuf/io/zero_copy_stream_impl_lite.h
diff --git a/library/depends/protobuf/google/protobuf/message.cc b/depends/protobuf/google/protobuf/message.cc
index 91e6878e..91e6878e 100644
--- a/library/depends/protobuf/google/protobuf/message.cc
+++ b/depends/protobuf/google/protobuf/message.cc
diff --git a/library/depends/protobuf/google/protobuf/message.h b/depends/protobuf/google/protobuf/message.h
index 4bbc6418..4bbc6418 100644
--- a/library/depends/protobuf/google/protobuf/message.h
+++ b/depends/protobuf/google/protobuf/message.h
diff --git a/library/depends/protobuf/google/protobuf/message_lite.cc b/depends/protobuf/google/protobuf/message_lite.cc
index 7c8f37dc..7c8f37dc 100644
--- a/library/depends/protobuf/google/protobuf/message_lite.cc
+++ b/depends/protobuf/google/protobuf/message_lite.cc
diff --git a/library/depends/protobuf/google/protobuf/message_lite.h b/depends/protobuf/google/protobuf/message_lite.h
index ebf4ba3c..ebf4ba3c 100644
--- a/library/depends/protobuf/google/protobuf/message_lite.h
+++ b/depends/protobuf/google/protobuf/message_lite.h
diff --git a/library/depends/protobuf/google/protobuf/package_info.h b/depends/protobuf/google/protobuf/package_info.h
index 60cd3994..60cd3994 100644
--- a/library/depends/protobuf/google/protobuf/package_info.h
+++ b/depends/protobuf/google/protobuf/package_info.h
diff --git a/library/depends/protobuf/google/protobuf/reflection_ops.cc b/depends/protobuf/google/protobuf/reflection_ops.cc
index 897c0d7c..897c0d7c 100644
--- a/library/depends/protobuf/google/protobuf/reflection_ops.cc
+++ b/depends/protobuf/google/protobuf/reflection_ops.cc
diff --git a/library/depends/protobuf/google/protobuf/reflection_ops.h b/depends/protobuf/google/protobuf/reflection_ops.h
index 355a0a5d..355a0a5d 100644
--- a/library/depends/protobuf/google/protobuf/reflection_ops.h
+++ b/depends/protobuf/google/protobuf/reflection_ops.h
diff --git a/library/depends/protobuf/google/protobuf/repeated_field.cc b/depends/protobuf/google/protobuf/repeated_field.cc
index 09377742..09377742 100644
--- a/library/depends/protobuf/google/protobuf/repeated_field.cc
+++ b/depends/protobuf/google/protobuf/repeated_field.cc
diff --git a/library/depends/protobuf/google/protobuf/repeated_field.h b/depends/protobuf/google/protobuf/repeated_field.h
index aed4ce9f..aed4ce9f 100644
--- a/library/depends/protobuf/google/protobuf/repeated_field.h
+++ b/depends/protobuf/google/protobuf/repeated_field.h
diff --git a/library/depends/protobuf/google/protobuf/service.cc b/depends/protobuf/google/protobuf/service.cc
index caf968ca..caf968ca 100644
--- a/library/depends/protobuf/google/protobuf/service.cc
+++ b/depends/protobuf/google/protobuf/service.cc
diff --git a/library/depends/protobuf/google/protobuf/service.h b/depends/protobuf/google/protobuf/service.h
index a6a7d16d..a6a7d16d 100644
--- a/library/depends/protobuf/google/protobuf/service.h
+++ b/depends/protobuf/google/protobuf/service.h
diff --git a/library/depends/protobuf/google/protobuf/stubs/common.cc b/depends/protobuf/google/protobuf/stubs/common.cc
index 7b15be44..7b15be44 100644
--- a/library/depends/protobuf/google/protobuf/stubs/common.cc
+++ b/depends/protobuf/google/protobuf/stubs/common.cc
diff --git a/library/depends/protobuf/google/protobuf/stubs/common.h b/depends/protobuf/google/protobuf/stubs/common.h
index 83297357..83297357 100644
--- a/library/depends/protobuf/google/protobuf/stubs/common.h
+++ b/depends/protobuf/google/protobuf/stubs/common.h
diff --git a/library/depends/protobuf/google/protobuf/stubs/hash.h b/depends/protobuf/google/protobuf/stubs/hash.h
index 822d6050..822d6050 100644
--- a/library/depends/protobuf/google/protobuf/stubs/hash.h
+++ b/depends/protobuf/google/protobuf/stubs/hash.h
diff --git a/library/depends/protobuf/google/protobuf/stubs/map-util.h b/depends/protobuf/google/protobuf/stubs/map-util.h
index f5c9d6b6..f5c9d6b6 100644
--- a/library/depends/protobuf/google/protobuf/stubs/map-util.h
+++ b/depends/protobuf/google/protobuf/stubs/map-util.h
diff --git a/library/depends/protobuf/google/protobuf/stubs/once.cc b/depends/protobuf/google/protobuf/stubs/once.cc
index 5b7af9ce..5b7af9ce 100644
--- a/library/depends/protobuf/google/protobuf/stubs/once.cc
+++ b/depends/protobuf/google/protobuf/stubs/once.cc
diff --git a/library/depends/protobuf/google/protobuf/stubs/once.h b/depends/protobuf/google/protobuf/stubs/once.h
index 0dee4076..0dee4076 100644
--- a/library/depends/protobuf/google/protobuf/stubs/once.h
+++ b/depends/protobuf/google/protobuf/stubs/once.h
diff --git a/library/depends/protobuf/google/protobuf/stubs/stl_util-inl.h b/depends/protobuf/google/protobuf/stubs/stl_util-inl.h
index a2e671bb..a2e671bb 100644
--- a/library/depends/protobuf/google/protobuf/stubs/stl_util-inl.h
+++ b/depends/protobuf/google/protobuf/stubs/stl_util-inl.h
diff --git a/library/depends/protobuf/google/protobuf/stubs/structurally_valid.cc b/depends/protobuf/google/protobuf/stubs/structurally_valid.cc
index 0f6afe6d..0f6afe6d 100644
--- a/library/depends/protobuf/google/protobuf/stubs/structurally_valid.cc
+++ b/depends/protobuf/google/protobuf/stubs/structurally_valid.cc
diff --git a/library/depends/protobuf/google/protobuf/stubs/strutil.cc b/depends/protobuf/google/protobuf/stubs/strutil.cc
index bb658ba8..bb658ba8 100644
--- a/library/depends/protobuf/google/protobuf/stubs/strutil.cc
+++ b/depends/protobuf/google/protobuf/stubs/strutil.cc
diff --git a/library/depends/protobuf/google/protobuf/stubs/strutil.h b/depends/protobuf/google/protobuf/stubs/strutil.h
index 4a79c224..4a79c224 100644
--- a/library/depends/protobuf/google/protobuf/stubs/strutil.h
+++ b/depends/protobuf/google/protobuf/stubs/strutil.h
diff --git a/library/depends/protobuf/google/protobuf/stubs/substitute.cc b/depends/protobuf/google/protobuf/stubs/substitute.cc
index b542aaa4..b542aaa4 100644
--- a/library/depends/protobuf/google/protobuf/stubs/substitute.cc
+++ b/depends/protobuf/google/protobuf/stubs/substitute.cc
diff --git a/library/depends/protobuf/google/protobuf/stubs/substitute.h b/depends/protobuf/google/protobuf/stubs/substitute.h
index 2581793b..2581793b 100644
--- a/library/depends/protobuf/google/protobuf/stubs/substitute.h
+++ b/depends/protobuf/google/protobuf/stubs/substitute.h
diff --git a/library/depends/protobuf/google/protobuf/text_format.cc b/depends/protobuf/google/protobuf/text_format.cc
index 1494ebd7..1494ebd7 100644
--- a/library/depends/protobuf/google/protobuf/text_format.cc
+++ b/depends/protobuf/google/protobuf/text_format.cc
diff --git a/library/depends/protobuf/google/protobuf/text_format.h b/depends/protobuf/google/protobuf/text_format.h
index 03c04910..03c04910 100644
--- a/library/depends/protobuf/google/protobuf/text_format.h
+++ b/depends/protobuf/google/protobuf/text_format.h
diff --git a/library/depends/protobuf/google/protobuf/unknown_field_set.cc b/depends/protobuf/google/protobuf/unknown_field_set.cc
index e1f8b838..e1f8b838 100644
--- a/library/depends/protobuf/google/protobuf/unknown_field_set.cc
+++ b/depends/protobuf/google/protobuf/unknown_field_set.cc
diff --git a/library/depends/protobuf/google/protobuf/unknown_field_set.h b/depends/protobuf/google/protobuf/unknown_field_set.h
index 84c2e2b6..84c2e2b6 100644
--- a/library/depends/protobuf/google/protobuf/unknown_field_set.h
+++ b/depends/protobuf/google/protobuf/unknown_field_set.h
diff --git a/library/depends/protobuf/google/protobuf/wire_format.cc b/depends/protobuf/google/protobuf/wire_format.cc
index 831a5794..831a5794 100644
--- a/library/depends/protobuf/google/protobuf/wire_format.cc
+++ b/depends/protobuf/google/protobuf/wire_format.cc
diff --git a/library/depends/protobuf/google/protobuf/wire_format.h b/depends/protobuf/google/protobuf/wire_format.h
index c7539250..c7539250 100644
--- a/library/depends/protobuf/google/protobuf/wire_format.h
+++ b/depends/protobuf/google/protobuf/wire_format.h
diff --git a/library/depends/protobuf/google/protobuf/wire_format_lite.cc b/depends/protobuf/google/protobuf/wire_format_lite.cc
index d347d116..d347d116 100644
--- a/library/depends/protobuf/google/protobuf/wire_format_lite.cc
+++ b/depends/protobuf/google/protobuf/wire_format_lite.cc
diff --git a/library/depends/protobuf/google/protobuf/wire_format_lite.h b/depends/protobuf/google/protobuf/wire_format_lite.h
index e3d5b2d8..e3d5b2d8 100644
--- a/library/depends/protobuf/google/protobuf/wire_format_lite.h
+++ b/depends/protobuf/google/protobuf/wire_format_lite.h
diff --git a/library/depends/protobuf/google/protobuf/wire_format_lite_inl.h b/depends/protobuf/google/protobuf/wire_format_lite_inl.h
index 103b0bd0..103b0bd0 100644
--- a/library/depends/protobuf/google/protobuf/wire_format_lite_inl.h
+++ b/depends/protobuf/google/protobuf/wire_format_lite_inl.h
diff --git a/library/depends/protobuf/testHashMap.cpp.in b/depends/protobuf/testHashMap.cpp.in
index 91187869..91187869 100644
--- a/library/depends/protobuf/testHashMap.cpp.in
+++ b/depends/protobuf/testHashMap.cpp.in
diff --git a/depends/tinyxml/CMakeLists.txt b/depends/tinyxml/CMakeLists.txt
new file mode 100644
index 00000000..7d924924
--- /dev/null
+++ b/depends/tinyxml/CMakeLists.txt
@@ -0,0 +1,3 @@
+project(dfhack-tinyxml)
+ADD_LIBRARY(dfhack-tinyxml STATIC EXCLUDE_FROM_ALL tinystr.cpp tinyxml.cpp tinyxmlerror.cpp tinyxmlparser.cpp)
+IDE_FOLDER(dfhack-tinyxml "Depends") \ No newline at end of file
diff --git a/library/depends/tinyxml/tinystr.cpp b/depends/tinyxml/tinystr.cpp
index 68125071..68125071 100644
--- a/library/depends/tinyxml/tinystr.cpp
+++ b/depends/tinyxml/tinystr.cpp
diff --git a/library/depends/tinyxml/tinystr.h b/depends/tinyxml/tinystr.h
index 3c2aa9d5..3c2aa9d5 100644
--- a/library/depends/tinyxml/tinystr.h
+++ b/depends/tinyxml/tinystr.h
diff --git a/library/depends/tinyxml/tinyxml.cpp b/depends/tinyxml/tinyxml.cpp
index 5de21f6d..5de21f6d 100644
--- a/library/depends/tinyxml/tinyxml.cpp
+++ b/depends/tinyxml/tinyxml.cpp
diff --git a/library/depends/tinyxml/tinyxml.h b/depends/tinyxml/tinyxml.h
index c6f40cc2..c6f40cc2 100644
--- a/library/depends/tinyxml/tinyxml.h
+++ b/depends/tinyxml/tinyxml.h
diff --git a/library/depends/tinyxml/tinyxmlerror.cpp b/depends/tinyxml/tinyxmlerror.cpp
index d24f63b2..d24f63b2 100644
--- a/library/depends/tinyxml/tinyxmlerror.cpp
+++ b/depends/tinyxml/tinyxmlerror.cpp
diff --git a/library/depends/tinyxml/tinyxmlparser.cpp b/depends/tinyxml/tinyxmlparser.cpp
index 5793f052..5793f052 100644
--- a/library/depends/tinyxml/tinyxmlparser.cpp
+++ b/depends/tinyxml/tinyxmlparser.cpp
diff --git a/depends/tthread/CMakeLists.txt b/depends/tthread/CMakeLists.txt
new file mode 100644
index 00000000..d34c19c8
--- /dev/null
+++ b/depends/tthread/CMakeLists.txt
@@ -0,0 +1,6 @@
+PROJECT(dfhack-tinythread)
+ADD_LIBRARY(dfhack-tinythread STATIC EXCLUDE_FROM_ALL tinythread.cpp)
+if(UNIX)
+ target_link_libraries(dfhack-tinythread pthread)
+endif()
+IDE_FOLDER(dfhack-tinythread "Depends") \ No newline at end of file
diff --git a/library/depends/tthread/fast_mutex.h b/depends/tthread/fast_mutex.h
index b4e712f4..b4e712f4 100644
--- a/library/depends/tthread/fast_mutex.h
+++ b/depends/tthread/fast_mutex.h
diff --git a/library/depends/tthread/tinythread.cpp b/depends/tthread/tinythread.cpp
index eb2dce0e..eb2dce0e 100644
--- a/library/depends/tthread/tinythread.cpp
+++ b/depends/tthread/tinythread.cpp
diff --git a/library/depends/tthread/tinythread.h b/depends/tthread/tinythread.h
index f4f8c5b2..f4f8c5b2 100644
--- a/library/depends/tthread/tinythread.h
+++ b/depends/tthread/tinythread.h
diff --git a/library/depends/zlib/include/zconf.h b/depends/zlib/include/zconf.h
index 57465e07..57465e07 100644
--- a/library/depends/zlib/include/zconf.h
+++ b/depends/zlib/include/zconf.h
diff --git a/library/depends/zlib/include/zlib.h b/depends/zlib/include/zlib.h
index bfbba83e..bfbba83e 100644
--- a/library/depends/zlib/include/zlib.h
+++ b/depends/zlib/include/zlib.h
diff --git a/library/depends/zlib/lib/zlib.lib b/depends/zlib/lib/zlib.lib
index 51f579dd..51f579dd 100644
--- a/library/depends/zlib/lib/zlib.lib
+++ b/depends/zlib/lib/zlib.lib
Binary files differ
diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt
index d1b36c68..ac54340e 100644
--- a/library/CMakeLists.txt
+++ b/library/CMakeLists.txt
@@ -10,21 +10,16 @@ IF(UNIX)
ENDIF()
include_directories (include)
-include_directories (depends/md5)
-include_directories (depends/tinyxml)
-include_directories (depends/tthread)
-add_subdirectory (depends/protobuf)
SET(PERL_EXECUTABLE "perl" CACHE FILEPATH "This is the perl executable to run in the codegen step. Tweak it if you need to run a specific one.")
-execute_process(COMMAND ${PERL_EXECUTABLE} xml/list.pl xml include/df ";"
+execute_process(COMMAND ${PERL_EXECUTABLE} xml/list.pl xml ${dfapi_SOURCE_DIR}/include/df ";"
WORKING_DIRECTORY ${dfapi_SOURCE_DIR}
OUTPUT_VARIABLE GENERATED_HDRS)
-SET(PROJECT_HDRS_INTERNAL
-)
+SET_SOURCE_FILES_PROPERTIES(${GENERATED_HDRS} PROPERTIES HEADER_FILE_ONLY TRUE GENERATED TRUE)
-SET(PROJECT_HDRS
+SET(MAIN_HEADERS
include/Internal.h
include/DFHack.h
include/Console.h
@@ -46,6 +41,52 @@ include/Types.h
include/VersionInfo.h
include/VersionInfoFactory.h
include/Virtual.h
+)
+
+SET(MAIN_HEADERS_WINDOWS
+include/wdirent.h
+)
+
+SET(MAIN_SOURCES
+Core.cpp
+ColorText.cpp
+DataDefs.cpp
+DataStatics.cpp
+DataStaticsCtor.cpp
+MiscUtils.cpp
+PluginManager.cpp
+TileTypes.cpp
+VersionInfoFactory.cpp
+Virtual.cpp
+)
+
+SET(MAIN_SOURCES_WINDOWS
+Console-windows.cpp
+Hooks-windows.cpp
+PlugLoad-windows.cpp
+Process-windows.cpp
+)
+
+IF(WIN32)
+ SOURCE_GROUP("Main\\Headers" FILES ${MAIN_HEADERS} ${MAIN_HEADERS_WINDOWS})
+ SOURCE_GROUP("Main\\Sources" FILES ${MAIN_SOURCES} ${MAIN_SOURCES_WINDOWS})
+ENDIF()
+
+SET(MAIN_SOURCES_LINUX
+Console-linux.cpp
+Hooks-linux.cpp
+PlugLoad-linux.cpp
+Process-linux.cpp
+)
+
+SET(MAIN_SOURCES_LINUX_EGGY
+Console-linux.cpp
+Hooks-egg.cpp
+PlugLoad-linux.cpp
+Process-linux.cpp
+)
+
+SET(MODULE_HEADERS
include/modules/Buildings.h
include/modules/Constructions.h
include/modules/Units.h
@@ -65,28 +106,7 @@ include/modules/World.h
include/modules/Graphic.h
)
-SET(PROJECT_SRCS
-Core.cpp
-ColorText.cpp
-DataDefs.cpp
-DataStatics.cpp
-DataStaticsCtor.cpp
-MiscUtils.cpp
-PluginManager.cpp
-TileTypes.cpp
-VersionInfoFactory.cpp
-Virtual.cpp
-
-depends/md5/md5.cpp
-depends/md5/md5wrapper.cpp
-
-depends/tinyxml/tinystr.cpp
-depends/tinyxml/tinyxml.cpp
-depends/tinyxml/tinyxmlerror.cpp
-depends/tinyxml/tinyxmlparser.cpp
-
-depends/tthread/tinythread.cpp
-
+SET( MODULE_SOURCES
modules/Buildings.cpp
modules/Constructions.cpp
modules/Units.cpp
@@ -106,52 +126,39 @@ modules/Graphic.cpp
modules/Windows.cpp
)
-SET(PROJECT_HDRS_WINDOWS
-include/wdirent.h
-)
-
-SET(PROJECT_SRCS_LINUX
-Console-linux.cpp
-Hooks-linux.cpp
-PlugLoad-linux.cpp
-Process-linux.cpp
-)
-
-SET(PROJECT_SRCS_WINDOWS
-Console-windows.cpp
-Hooks-windows.cpp
-PlugLoad-windows.cpp
-Process-windows.cpp
-)
+IF(WIN32)
+ SOURCE_GROUP("Modules\\Headers" FILES ${MODULE_HEADERS})
+ SOURCE_GROUP("Modules\\Sources" FILES ${MODULE_SOURCES})
+ SOURCE_GROUP("Generated" FILES ${GENERATED_HDRS})
+ENDIF()
-SET(PROJECT_SRCS_LINUX_EGG
-Console-linux.cpp
-Hooks-egg.cpp
-PlugLoad-linux.cpp
-Process-linux.cpp
-)
+SET(PROJECT_HEADERS)
+LIST(APPEND PROJECT_HEADERS ${MAIN_HEADERS})
+LIST(APPEND PROJECT_HEADERS ${MODULE_HEADERS})
+SET(PROJECT_SOURCES)
+LIST(APPEND PROJECT_SOURCES ${MAIN_SOURCES})
+LIST(APPEND PROJECT_SOURCES ${MODULE_SOURCES})
IF(UNIX)
OPTION(BUILD_EGGY "Make DFHack strangely egg-shaped." OFF)
IF(BUILD_EGGY)
- LIST(APPEND PROJECT_SRCS ${PROJECT_SRCS_LINUX_EGG})
+ LIST(APPEND PROJECT_SOURCES ${MAIN_SOURCES_LINUX_EGGY})
ELSE()
- LIST(APPEND PROJECT_SRCS ${PROJECT_SRCS_LINUX})
+ LIST(APPEND PROJECT_SOURCES ${MAIN_SOURCES_LINUX})
ENDIF()
-ELSE()
- LIST(APPEND PROJECT_HDRS ${PROJECT_HDRS_WINDOWS})
- LIST(APPEND PROJECT_SRCS ${PROJECT_SRCS_WINDOWS})
+ELSEIF(WIN32)
+ LIST(APPEND PROJECT_SOURCES ${MAIN_SOURCES_WINDOWS})
+ LIST(APPEND PROJECT_HEADERS ${MAIN_HEADERS_WINDOWS})
ENDIF()
# Protobuf
-
FILE(GLOB PROJECT_PROTOS ${CMAKE_CURRENT_SOURCE_DIR}/proto/*.proto)
STRING(REPLACE ".proto" ".pb.cc" PROJECT_PROTO_SRCS ${PROJECT_PROTOS})
STRING(REPLACE ".proto" ".pb.h" PROJECT_PROTO_HDRS ${PROJECT_PROTOS})
-LIST(APPEND PROJECT_HDRS ${PROJECT_PROTO_HDRS})
-LIST(APPEND PROJECT_SRCS ${PROJECT_PROTO_SRCS})
+LIST(APPEND PROJECT_HEADERS ${PROJECT_PROTO_HDRS})
+LIST(APPEND PROJECT_HEADERS ${PROJECT_PROTO_SRCS})
ADD_CUSTOM_COMMAND(
OUTPUT ${PROJECT_PROTO_SRCS} ${PROJECT_PROTO_HDRS}
@@ -161,15 +168,12 @@ ADD_CUSTOM_COMMAND(
DEPENDS protoc-bin ${PROJECT_PROTOS}
)
-#
-
-SET_SOURCE_FILES_PROPERTIES( ${PROJECT_HDRS} PROPERTIES HEADER_FILE_ONLY TRUE )
-
-LIST(APPEND PROJECT_SRCS ${PROJECT_HDRS})
+# Merge headers into sources
+SET_SOURCE_FILES_PROPERTIES( ${PROJECT_HEADERS} PROPERTIES HEADER_FILE_ONLY TRUE )
+LIST(APPEND PROJECT_SOURCES ${PROJECT_HEADERS})
# Generation
-
-SET_SOURCE_FILES_PROPERTIES(${GENERATED_HDRS} PROPERTIES HEADER_FILE_ONLY TRUE GENERATED TRUE)
+LIST(APPEND PROJECT_SOURCES ${GENERATED_HDRS})
FILE(GLOB GENERATE_INPUT_SCRIPTS ${dfapi_SOURCE_DIR}/xml/*.pm ${dfapi_SOURCE_DIR}/xml/*.xslt)
FILE(GLOB GENERATE_INPUT_XMLS ${dfapi_SOURCE_DIR}/xml/*.xml)
@@ -198,13 +202,13 @@ IF(UNIX)
ENDIF()
IF(UNIX)
- SET(PROJECT_LIBS rt dl)
+ SET(PROJECT_LIBS rt dl dfhack-md5 dfhack-tinyxml dfhack-tinythread)
ELSE(WIN32)
- #FIXME: do we really need this?
- SET(PROJECT_LIBS psapi)
+ #FIXME: do we really need psapi?
+ SET(PROJECT_LIBS psapi dfhack-tinyxml dfhack-tinythread)
ENDIF()
-ADD_LIBRARY(dfhack SHARED ${PROJECT_SRCS})
+ADD_LIBRARY(dfhack SHARED ${PROJECT_SOURCES})
ADD_DEPENDENCIES(dfhack generate_headers)
IF(BUILD_EGGY)
@@ -225,6 +229,7 @@ ENDIF()
SET_TARGET_PROPERTIES(dfhack PROPERTIES DEBUG_POSTFIX "-debug" )
TARGET_LINK_LIBRARIES(dfhack protobuf-lite ${PROJECT_LIBS})
+SET_TARGET_PROPERTIES(dfhack PROPERTIES LINK_INTERFACE_LIBRARIES "")
IF(UNIX)
# On linux, copy our version of the df launch script which sets LD_PRELOAD
diff --git a/library/depends/md5/CMakeLists.txt b/library/depends/md5/CMakeLists.txt
deleted file mode 100644
index fc4845bd..00000000
--- a/library/depends/md5/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-ADD_LIBRARY(dfhack-md5 SHARED md5.cpp md5wrapper.cpp)
diff --git a/library/depends/tinyxml/CMakeLists.txt b/library/depends/tinyxml/CMakeLists.txt
deleted file mode 100644
index effdf894..00000000
--- a/library/depends/tinyxml/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-ADD_LIBRARY(dfhack-tixml SHARED tinystr.cpp tinyxml.cpp tinyxmlerror.cpp tinyxmlparser.cpp) \ No newline at end of file
diff --git a/library/modules/Windows.cpp b/library/modules/Windows.cpp
index 6fbe3712..196e4d71 100644
--- a/library/modules/Windows.cpp
+++ b/library/modules/Windows.cpp
@@ -32,7 +32,6 @@ distribution.
#include "df/init.h"
#include "df/ui.h"
#include <df/graphic.h>
-#include <llex.h>
#include "modules/Windows.h"
using namespace DFHack;
diff --git a/plugins/Dfusion/CMakeLists.txt b/plugins/Dfusion/CMakeLists.txt
index c7f71c71..85064b97 100644
--- a/plugins/Dfusion/CMakeLists.txt
+++ b/plugins/Dfusion/CMakeLists.txt
@@ -4,12 +4,11 @@ FILE(GLOB DFUSION_CPPS src/*.c*)
set(
DFUSION_CPPS_ALL
dfusion.cpp
- ${dfhack_SOURCE_DIR}/library/depends/tthread/tinythread.cpp
${DFUSION_CPPS}
)
FILE(GLOB DFUSION_HS include/*)
SET_SOURCE_FILES_PROPERTIES( ${DFUSION_HS} PROPERTIES HEADER_FILE_ONLY TRUE )
-DFHACK_PLUGIN(dfusion ${DFUSION_CPPS_ALL} ${DFUSION_HS} LINK_LIBRARIES lua)
+DFHACK_PLUGIN(dfusion ${DFUSION_CPPS_ALL} ${DFUSION_HS} LINK_LIBRARIES lua dfhack-tinythread)
# installs into DF root
install(DIRECTORY luafiles/ DESTINATION dfusion)
diff --git a/plugins/Plugins.cmake b/plugins/Plugins.cmake
index 2caba999..221e57ea 100644
--- a/plugins/Plugins.cmake
+++ b/plugins/Plugins.cmake
@@ -65,6 +65,7 @@ MACRO(DFHACK_PLUGIN)
CDR(PLUGIN_SOURCES ${PLUGIN_DEFAULT_ARGS})
ADD_LIBRARY(${PLUGIN_NAME} MODULE ${PLUGIN_SOURCES})
+ IDE_FOLDER(${PLUGIN_NAME} "Plugins")
TARGET_LINK_LIBRARIES(${PLUGIN_NAME} dfhack ${PLUGIN_LINK_LIBRARIES})
IF(UNIX)
SET_TARGET_PROPERTIES(${PLUGIN_NAME} PROPERTIES SUFFIX .plug.so PREFIX "")
diff --git a/plugins/devel/memview.cpp b/plugins/devel/memview.cpp
index 2e13f955..5d8d6a9b 100644
--- a/plugins/devel/memview.cpp
+++ b/plugins/devel/memview.cpp
@@ -3,7 +3,7 @@
#include "PluginManager.h"
#include "MemAccess.h"
#include "MiscUtils.h"
-#include <../depends/tthread/tinythread.h> //not sure if correct
+#include <tinythread.h> //not sure if correct
#include <string>
#include <vector>
#include <sstream>
diff --git a/plugins/df2mc b/plugins/df2mc
-Subproject 964026395ce2138e4f861594307efda50b17e96
+Subproject a80abe848e4886a210e7a5123192e9221dc8581
diff --git a/plugins/mapexport/CMakeLists.txt b/plugins/mapexport/CMakeLists.txt
index bebdd08e..429507a7 100644
--- a/plugins/mapexport/CMakeLists.txt
+++ b/plugins/mapexport/CMakeLists.txt
@@ -1,14 +1,7 @@
PROJECT(mapexport)
-#The protobuf sources we generate will require these headers
+# add *our* headers here.
SET(PROJECT_HDRS
-${dfhack_SOURCE_DIR}/library/depends/protobuf/google/protobuf/stubs/once.h
-${dfhack_SOURCE_DIR}/library/depends/protobuf/google/protobuf/stubs/common.h
-${dfhack_SOURCE_DIR}/library/depends/protobuf/google/protobuf/io/coded_stream.h
-${dfhack_SOURCE_DIR}/library/depends/protobuf/google/protobuf/wire_format_lite_inl.h
-${dfhack_SOURCE_DIR}/library/depends/protobuf/google/protobuf/generated_message_util.h
-${dfhack_SOURCE_DIR}/library/depends/protobuf/google/protobuf/repeated_field.h
-${dfhack_SOURCE_DIR}/library/depends/protobuf/google/protobuf/extension_set.h
)
SET(PROJECT_SRCS
@@ -27,6 +20,9 @@ ${CMAKE_CURRENT_SOURCE_DIR}/proto/Map.proto
STRING(REPLACE ".proto" ".pb.cc;" PROJECT_PROTO_SRCS ${PROJECT_PROTOS})
STRING(REPLACE ".proto" ".pb.h;" PROJECT_PROTO_HDRS ${PROJECT_PROTOS})
+SET_SOURCE_FILES_PROPERTIES( ${PROJECT_PROTO_HDRS} PROPERTIES GENERATED TRUE)
+SET_SOURCE_FILES_PROPERTIES( ${PROJECT_PROTO_SRCS} PROPERTIES GENERATED TRUE)
+
LIST(APPEND PROJECT_HDRS ${PROJECT_PROTO_HDRS})
LIST(APPEND PROJECT_SRCS ${PROJECT_PROTO_SRCS})
diff --git a/plugins/stonesense b/plugins/stonesense
-Subproject f05386bae01d1840bdc889f30253ed50ee89286
+Subproject dfae65496e4b4a591fdb8db9feda37dede714a8