diff options
Diffstat (limited to 'FreeFileSync.cbp')
| -rw-r--r-- | FreeFileSync.cbp | 403 |
1 files changed, 192 insertions, 211 deletions
diff --git a/FreeFileSync.cbp b/FreeFileSync.cbp index 62c8f985..7273796e 100644 --- a/FreeFileSync.cbp +++ b/FreeFileSync.cbp @@ -23,7 +23,7 @@ <Linker> <Add option="-s" /> <Add option="-static" /> - <Add library="libboost_thread-mgw45-mt-s-1_47.a" /> + <Add library="libboost_thread-mgw46-mt-s-1_47.a" /> <Add library="libwxmsw28u_aui.a" /> <Add library="libwxmsw28u_adv.a" /> <Add library="libwxmsw28u_core.a" /> @@ -45,12 +45,12 @@ <Compiler> <Add option="-g" /> <Add option="-Winvalid-pch" /> - <Add option='-include "shared/pch.h"' /> + <Add option='-include "wx+/pch.h"' /> <Add option="-D__WXDEBUG__" /> <Add directory="C:\Programme\C++\wxWidgets\lib\gcc_dll\mswud" /> </Compiler> <Linker> - <Add library="libboost_thread-mgw45-mt-sd-1_47.a" /> + <Add library="libboost_thread-mgw46-mt-sd-1_47.a" /> <Add library="libwxmsw28ud_aui.a" /> <Add library="libwxmsw28ud_adv.a" /> <Add library="libwxmsw28ud_core.a" /> @@ -70,14 +70,14 @@ <Compiler> <Add option="-g" /> <Add option="-Winvalid-pch" /> - <Add option='-include "shared/pch.h"' /> + <Add option='-include "wx+/pch.h"' /> <Add option="-D__WXDEBUG__" /> <Add directory="C:\Programme\C++\wxWidgets\lib\gcc_dll\mswud" /> - <Add directory="library\gtest" /> - <Add directory="library\gtest\include" /> + <Add directory="lib\gtest" /> + <Add directory="lib\gtest\include" /> </Compiler> <Linker> - <Add library="libboost_thread-mgw45-mt-sd-1_47.a" /> + <Add library="libboost_thread-mgw46-mt-sd-1_47.a" /> <Add library="libwxmsw28ud_adv.a" /> <Add library="libwxmsw28ud_core.a" /> <Add library="libwxbase28ud.a" /> @@ -92,14 +92,15 @@ <Add option="-Winit-self" /> <Add option="-Wredundant-decls" /> <Add option="-Wcast-align" /> + <Add option="-Wunreachable-code" /> <Add option="-Wmissing-include-dirs" /> <Add option="-Wswitch-enum" /> <Add option="-Wmain" /> <Add option="-Wall" /> + <Add option="-std=gnu++0x" /> <Add option="-pipe" /> <Add option="-mthreads" /> - <Add option="-std=gnu++0x" /> - <Add option='-include "shared/warn_static.h"' /> + <Add option='-include "zen/warn_static.h"' /> <Add option="-D__GNUWIN32__" /> <Add option="-D__WXMSW__" /> <Add option="-DFFS_WIN" /> @@ -109,7 +110,8 @@ <Add option="-DZEN_PLATFORM_WINDOWS" /> <Add directory="C:\Programme\C++\wxWidgets\include" /> <Add directory="C:\Program Files\C++\Boost" /> - <Add directory="shared" /> + <Add directory="." /> + <Add directory=".\zenXml" /> </Compiler> <ResourceCompiler> <Add directory="C:\Programme\C++\wxWidgets\include" /> @@ -134,335 +136,314 @@ <Option target="<{~None~}>" /> </Unit> <Unit filename="algorithm.cpp" /> - <Unit filename="algorithm.h"> - <Option target="<{~None~}>" /> - </Unit> + <Unit filename="algorithm.h" /> <Unit filename="application.cpp"> <Option target="Release" /> <Option target="Debug-DLL" /> </Unit> - <Unit filename="application.h"> - <Option target="<{~None~}>" /> - </Unit> + <Unit filename="application.h" /> <Unit filename="comparison.cpp" /> - <Unit filename="comparison.h"> - <Option target="<{~None~}>" /> - </Unit> + <Unit filename="comparison.h" /> <Unit filename="file_hierarchy.cpp" /> <Unit filename="file_hierarchy.h" /> - <Unit filename="library\binary.cpp" /> - <Unit filename="library\binary.h" /> - <Unit filename="library\custom_grid.cpp"> - <Option target="Release" /> - <Option target="Debug-DLL" /> - </Unit> - <Unit filename="library\custom_grid.h"> - <Option target="<{~None~}>" /> - </Unit> - <Unit filename="library\db_file.cpp" /> - <Unit filename="library\db_file.h"> - <Option target="Release" /> - <Option target="Debug-DLL" /> - </Unit> - <Unit filename="library\detect_renaming.h" /> - <Unit filename="library\dir_exist_async.h" /> - <Unit filename="library\dir_lock.cpp" /> - <Unit filename="library\dir_lock.h" /> - <Unit filename="library\error_log.cpp"> - <Option target="Release" /> - <Option target="Debug-DLL" /> - </Unit> - <Unit filename="library\error_log.h"> - <Option target="Release" /> - <Option target="Debug-DLL" /> - </Unit> - <Unit filename="library\gtest\main.cpp"> + <Unit filename="lib\binary.cpp" /> + <Unit filename="lib\binary.h" /> + <Unit filename="lib\cmp_filetime.h" /> + <Unit filename="lib\custom_grid.cpp"> + <Option target="Release" /> + <Option target="Debug-DLL" /> + </Unit> + <Unit filename="lib\custom_grid.h" /> + <Unit filename="lib\db_file.cpp" /> + <Unit filename="lib\db_file.h" /> + <Unit filename="lib\dir_exist_async.h" /> + <Unit filename="lib\dir_lock.cpp" /> + <Unit filename="lib\dir_lock.h" /> + <Unit filename="lib\dir_name.cpp" /> + <Unit filename="lib\dir_name.h" /> + <Unit filename="lib\error_log.cpp" /> + <Unit filename="lib\error_log.h" /> + <Unit filename="lib\ffs_paths.h" /> + <Unit filename="lib\folder_history_box.cpp" /> + <Unit filename="lib\folder_history_box.h" /> + <Unit filename="lib\gtest\main.cpp"> <Option target="Unit Test" /> </Unit> - <Unit filename="library\gtest\src\gtest-all.cc"> + <Unit filename="lib\gtest\src\gtest-all.cc"> <Option target="Unit Test" /> </Unit> - <Unit filename="library\gtest\src\gtest-internal-inl.h"> + <Unit filename="lib\gtest\unittest.h"> <Option target="Unit Test" /> </Unit> - <Unit filename="library\gtest\unittest.h"> - <Option target="<{~None~}>" /> - </Unit> - <Unit filename="library\gtest\unittest1.cpp"> + <Unit filename="lib\gtest\unittest1.cpp"> <Option target="Unit Test" /> </Unit> - <Unit filename="library\gtest\unittest2.cpp"> + <Unit filename="lib\gtest\unittest2.cpp"> <Option target="Unit Test" /> </Unit> - <Unit filename="library\gtest\unittest3.cpp"> + <Unit filename="lib\gtest\unittest3.cpp"> <Option target="Unit Test" /> </Unit> - <Unit filename="library\hard_filter.cpp" /> - <Unit filename="library\hard_filter.h" /> - <Unit filename="library\icon_buffer.cpp"> + <Unit filename="lib\hard_filter.cpp" /> + <Unit filename="lib\hard_filter.h" /> + <Unit filename="lib\help_provider.h" /> + <Unit filename="lib\icon_buffer.cpp" /> + <Unit filename="lib\icon_buffer.h" /> + <Unit filename="lib\localization.cpp" /> + <Unit filename="lib\localization.h" /> + <Unit filename="lib\lock_holder.h" /> + <Unit filename="lib\norm_filter.h" /> + <Unit filename="lib\parallel_scan.cpp" /> + <Unit filename="lib\parallel_scan.h" /> + <Unit filename="lib\parse_lng.h" /> + <Unit filename="lib\parse_plural.h" /> + <Unit filename="lib\process_xml.cpp" /> + <Unit filename="lib\process_xml.h" /> + <Unit filename="lib\recycler.cpp" /> + <Unit filename="lib\recycler.h" /> + <Unit filename="lib\resolve_path.cpp" /> + <Unit filename="lib\resolve_path.h" /> + <Unit filename="lib\resources.cpp" /> + <Unit filename="lib\resources.h" /> + <Unit filename="lib\shadow.cpp" /> + <Unit filename="lib\shadow.h" /> + <Unit filename="lib\soft_filter.h" /> + <Unit filename="lib\statistics.cpp" /> + <Unit filename="lib\statistics.h" /> + <Unit filename="lib\status_handler.cpp" /> + <Unit filename="lib\status_handler.h" /> + <Unit filename="lib\xml_base.cpp" /> + <Unit filename="lib\xml_base.h" /> + <Unit filename="resource.rc"> + <Option compilerVar="WINDRES" /> <Option target="Release" /> <Option target="Debug-DLL" /> </Unit> - <Unit filename="library\icon_buffer.h"> + <Unit filename="structures.cpp" /> + <Unit filename="structures.h" /> + <Unit filename="synchronization.cpp" /> + <Unit filename="synchronization.h" /> + <Unit filename="ui\batch_config.cpp"> <Option target="Release" /> <Option target="Debug-DLL" /> </Unit> - <Unit filename="library\lock_holder.h" /> - <Unit filename="library\norm_filter.h" /> - <Unit filename="library\parallel_scan.cpp" /> - <Unit filename="library\parallel_scan.h" /> - <Unit filename="library\process_xml.cpp" /> - <Unit filename="library\process_xml.h"> - <Option target="<{~None~}>" /> - </Unit> - <Unit filename="library\resources.cpp" /> - <Unit filename="library\resources.h"> - <Option target="<{~None~}>" /> - </Unit> - <Unit filename="library\soft_filter.h" /> - <Unit filename="library\statistics.cpp"> + <Unit filename="ui\batch_config.h"> <Option target="Release" /> <Option target="Debug-DLL" /> </Unit> - <Unit filename="library\statistics.h"> - <Option target="<{~None~}>" /> - </Unit> - <Unit filename="library\status_handler.cpp" /> - <Unit filename="library\status_handler.h"> - <Option target="<{~None~}>" /> - </Unit> - <Unit filename="resource.rc"> - <Option compilerVar="WINDRES" /> + <Unit filename="ui\batch_status_handler.cpp"> <Option target="Release" /> <Option target="Debug-DLL" /> </Unit> - <Unit filename="shared\FindFilePlus\find_file_plus.h" /> - <Unit filename="shared\Recycler.h" /> - <Unit filename="shared\app_main.cpp"> + <Unit filename="ui\batch_status_handler.h" /> + <Unit filename="ui\check_version.cpp"> <Option target="Release" /> <Option target="Debug-DLL" /> </Unit> - <Unit filename="shared\app_main.h"> - <Option target="Release" /> - <Option target="Debug-DLL" /> + <Unit filename="ui\check_version.h"> + <Option target="<{~None~}>" /> </Unit> - <Unit filename="shared\boost_thread_wrap.h" /> - <Unit filename="shared\build_info.h" /> - <Unit filename="shared\check_exist.h" /> - <Unit filename="shared\custom_button.cpp"> + <Unit filename="ui\folder_pair.h"> <Option target="Release" /> <Option target="Debug-DLL" /> </Unit> - <Unit filename="shared\custom_button.h"> + <Unit filename="ui\grid_view.cpp"> <Option target="Release" /> <Option target="Debug-DLL" /> </Unit> - <Unit filename="shared\custom_tooltip.cpp"> - <Option target="Release" /> - <Option target="Debug-DLL" /> + <Unit filename="ui\grid_view.h"> + <Option target="<{~None~}>" /> </Unit> - <Unit filename="shared\custom_tooltip.h"> + <Unit filename="ui\gui_generated.cpp"> <Option target="Release" /> <Option target="Debug-DLL" /> </Unit> - <Unit filename="shared\dir_name.cpp" /> - <Unit filename="shared\dir_name.h" /> - <Unit filename="shared\dir_picker_i18n.h" /> - <Unit filename="shared\disable_standby.h" /> - <Unit filename="shared\dll_loader.h" /> - <Unit filename="shared\dst_hack.cpp" /> - <Unit filename="shared\dst_hack.h" /> - <Unit filename="shared\file_drop.h" /> - <Unit filename="shared\file_error.h" /> - <Unit filename="shared\file_handling.cpp" /> - <Unit filename="shared\file_handling.h" /> - <Unit filename="shared\file_id.cpp" /> - <Unit filename="shared\file_id.h" /> - <Unit filename="shared\file_io.cpp" /> - <Unit filename="shared\file_io.h" /> - <Unit filename="shared\file_traverser.cpp" /> - <Unit filename="shared\file_traverser.h" /> - <Unit filename="shared\file_update_handle.h" /> - <Unit filename="shared\folder_history_box.cpp" /> - <Unit filename="shared\folder_history_box.h" /> - <Unit filename="shared\global_func.h" /> - <Unit filename="shared\guid.cpp" /> - <Unit filename="shared\guid.h" /> - <Unit filename="shared\help_provider.cpp"> - <Option target="Release" /> - <Option target="Debug-DLL" /> + <Unit filename="ui\gui_generated.h"> + <Option target="<{~None~}>" /> </Unit> - <Unit filename="shared\help_provider.h"> + <Unit filename="ui\gui_status_handler.cpp"> <Option target="Release" /> <Option target="Debug-DLL" /> </Unit> - <Unit filename="shared\i18n.cpp" /> - <Unit filename="shared\i18n.h" /> - <Unit filename="shared\int64.h" /> - <Unit filename="shared\last_error.cpp" /> - <Unit filename="shared\last_error.h" /> - <Unit filename="shared\localization.cpp" /> - <Unit filename="shared\localization.h" /> - <Unit filename="shared\long_path_prefix.h" /> - <Unit filename="shared\mouse_move_dlg.cpp"> + <Unit filename="ui\gui_status_handler.h"> + <Option target="<{~None~}>" /> + </Unit> + <Unit filename="ui\main_dlg.cpp"> <Option target="Release" /> <Option target="Debug-DLL" /> </Unit> - <Unit filename="shared\parse_plural.h" /> - <Unit filename="shared\parse_txt.h" /> - <Unit filename="shared\pch.h"> - <Option compile="1" /> - <Option weight="0" /> - <Option target="Unit Test" /> - <Option target="Debug-DLL" /> + <Unit filename="ui\main_dlg.h"> + <Option target="<{~None~}>" /> </Unit> - <Unit filename="shared\privilege.cpp" /> - <Unit filename="shared\privilege.h" /> - <Unit filename="shared\recycler.cpp" /> - <Unit filename="shared\recycler.h" /> - <Unit filename="shared\resolve_path.cpp" /> - <Unit filename="shared\resolve_path.h" /> - <Unit filename="shared\serialize.cpp" /> - <Unit filename="shared\serialize.h" /> - <Unit filename="shared\shadow.cpp" /> - <Unit filename="shared\shadow.h" /> - <Unit filename="shared\standard_paths.cpp" /> - <Unit filename="shared\standard_paths.h" /> - <Unit filename="shared\string_conv.h" /> - <Unit filename="shared\string_tools.h" /> - <Unit filename="shared\symlink_target.h" /> - <Unit filename="shared\system_constants.h" /> - <Unit filename="shared\taskbar.cpp"> + <Unit filename="ui\msg_popup.cpp"> <Option target="Release" /> <Option target="Debug-DLL" /> </Unit> - <Unit filename="shared\taskbar.h"> + <Unit filename="ui\msg_popup.h" /> + <Unit filename="ui\progress_indicator.cpp"> <Option target="Release" /> <Option target="Debug-DLL" /> </Unit> - <Unit filename="shared\toggle_button.cpp"> + <Unit filename="ui\progress_indicator.h" /> + <Unit filename="ui\search.cpp"> <Option target="Release" /> <Option target="Debug-DLL" /> </Unit> - <Unit filename="shared\toggle_button.h"> + <Unit filename="ui\search.h" /> + <Unit filename="ui\small_dlgs.cpp"> <Option target="Release" /> <Option target="Debug-DLL" /> </Unit> - <Unit filename="shared\util.cpp" /> - <Unit filename="shared\util.h" /> - <Unit filename="shared\wx_choice_enum.h" /> - <Unit filename="shared\xml_base.cpp" /> - <Unit filename="shared\xml_base.h" /> - <Unit filename="shared\xml_error.h" /> - <Unit filename="shared\zbase.h" /> - <Unit filename="shared\zstring.cpp" /> - <Unit filename="shared\zstring.h" /> - <Unit filename="structures.cpp" /> - <Unit filename="structures.h"> + <Unit filename="ui\small_dlgs.h"> <Option target="<{~None~}>" /> </Unit> - <Unit filename="synchronization.cpp" /> - <Unit filename="synchronization.h"> + <Unit filename="ui\sorting.h"> <Option target="<{~None~}>" /> </Unit> - <Unit filename="ui\batch_config.cpp"> + <Unit filename="ui\switch_to_gui.h"> <Option target="Release" /> <Option target="Debug-DLL" /> </Unit> - <Unit filename="ui\batch_config.h"> + <Unit filename="ui\sync_cfg.cpp"> <Option target="Release" /> <Option target="Debug-DLL" /> </Unit> - <Unit filename="ui\batch_status_handler.cpp"> + <Unit filename="ui\sync_cfg.h"> <Option target="Release" /> <Option target="Debug-DLL" /> </Unit> - <Unit filename="ui\batch_status_handler.h" /> - <Unit filename="ui\check_version.cpp"> + <Unit filename="ui\taskbar.cpp" /> + <Unit filename="ui\taskbar.h" /> + <Unit filename="ui\tray_icon.cpp"> <Option target="Release" /> <Option target="Debug-DLL" /> </Unit> - <Unit filename="ui\check_version.h"> - <Option target="<{~None~}>" /> - </Unit> - <Unit filename="ui\folder_pair.h"> + <Unit filename="ui\tray_icon.h" /> + <Unit filename="wx+\app_main.h"> <Option target="Release" /> <Option target="Debug-DLL" /> </Unit> - <Unit filename="ui\grid_view.cpp"> + <Unit filename="wx+\button.cpp"> <Option target="Release" /> <Option target="Debug-DLL" /> </Unit> - <Unit filename="ui\grid_view.h"> - <Option target="<{~None~}>" /> - </Unit> - <Unit filename="ui\gui_generated.cpp"> + <Unit filename="wx+\button.h"> <Option target="Release" /> <Option target="Debug-DLL" /> </Unit> - <Unit filename="ui\gui_generated.h"> - <Option target="<{~None~}>" /> + <Unit filename="wx+\choice_enum.h"> + <Option target="Release" /> + <Option target="Debug-DLL" /> </Unit> - <Unit filename="ui\gui_status_handler.cpp"> + <Unit filename="wx+\dir_picker.h"> <Option target="Release" /> <Option target="Debug-DLL" /> </Unit> - <Unit filename="ui\gui_status_handler.h"> - <Option target="<{~None~}>" /> + <Unit filename="wx+\file_drop.h"> + <Option target="Release" /> + <Option target="Debug-DLL" /> </Unit> - <Unit filename="ui\main_dlg.cpp"> + <Unit filename="wx+\format_unit.cpp" /> + <Unit filename="wx+\format_unit.h"> <Option target="Release" /> <Option target="Debug-DLL" /> </Unit> - <Unit filename="ui\main_dlg.h"> - <Option target="<{~None~}>" /> + <Unit filename="wx+\graph.cpp"> + <Option target="Release" /> + <Option target="Debug-DLL" /> </Unit> - <Unit filename="ui\msg_popup.cpp"> + <Unit filename="wx+\graph.h"> <Option target="Release" /> <Option target="Debug-DLL" /> </Unit> - <Unit filename="ui\msg_popup.h" /> - <Unit filename="ui\progress_indicator.cpp"> + <Unit filename="wx+\image_tools.h"> <Option target="Release" /> <Option target="Debug-DLL" /> </Unit> - <Unit filename="ui\progress_indicator.h" /> - <Unit filename="ui\search.cpp"> + <Unit filename="wx+\mouse_move_dlg.cpp"> <Option target="Release" /> <Option target="Debug-DLL" /> </Unit> - <Unit filename="ui\search.h" /> - <Unit filename="ui\small_dlgs.cpp"> + <Unit filename="wx+\mouse_move_dlg.h"> <Option target="Release" /> <Option target="Debug-DLL" /> </Unit> - <Unit filename="ui\small_dlgs.h"> - <Option target="<{~None~}>" /> + <Unit filename="wx+\pch.h"> + <Option compile="1" /> + <Option weight="0" /> + <Option target="Debug-DLL" /> + <Option target="Unit Test" /> </Unit> - <Unit filename="ui\sorting.h"> - <Option target="<{~None~}>" /> + <Unit filename="wx+\serialize.h"> + <Option target="Release" /> + <Option target="Debug-DLL" /> </Unit> - <Unit filename="ui\switch_to_gui.cpp"> + <Unit filename="wx+\shell_execute.h"> <Option target="Release" /> <Option target="Debug-DLL" /> </Unit> - <Unit filename="ui\switch_to_gui.h"> + <Unit filename="wx+\string_conv.h"> <Option target="Release" /> <Option target="Debug-DLL" /> </Unit> - <Unit filename="ui\sync_cfg.cpp"> + <Unit filename="wx+\toggle_button.h"> <Option target="Release" /> <Option target="Debug-DLL" /> </Unit> - <Unit filename="ui\sync_cfg.h"> + <Unit filename="wx+\tooltip.cpp"> <Option target="Release" /> <Option target="Debug-DLL" /> </Unit> - <Unit filename="ui\tray_icon.cpp"> + <Unit filename="wx+\tooltip.h"> <Option target="Release" /> <Option target="Debug-DLL" /> </Unit> - <Unit filename="ui\tray_icon.h" /> + <Unit filename="zen\assert_static.h" /> + <Unit filename="zen\base64.h" /> + <Unit filename="zen\build_info.h" /> + <Unit filename="zen\c_dll.h" /> + <Unit filename="zen\com_error.h" /> + <Unit filename="zen\com_ptr.h" /> + <Unit filename="zen\com_util.h" /> + <Unit filename="zen\debug_log.h" /> + <Unit filename="zen\dir_watcher.h" /> + <Unit filename="zen\disable_standby.h" /> + <Unit filename="zen\dll.h" /> + <Unit filename="zen\dst_hack.cpp" /> + <Unit filename="zen\dst_hack.h" /> + <Unit filename="zen\file_error.h" /> + <Unit filename="zen\file_handling.cpp" /> + <Unit filename="zen\file_handling.h" /> + <Unit filename="zen\file_id.cpp" /> + <Unit filename="zen\file_id.h" /> + <Unit filename="zen\file_id_internal.h" /> + <Unit filename="zen\file_io.cpp" /> + <Unit filename="zen\file_io.h" /> + <Unit filename="zen\file_traverser.cpp" /> + <Unit filename="zen\file_traverser.h" /> + <Unit filename="zen\file_update_handle.h" /> + <Unit filename="zen\fixed_list.h" /> + <Unit filename="zen\guid.h" /> + <Unit filename="zen\i18n.h" /> + <Unit filename="zen\int64.h" /> + <Unit filename="zen\last_error.h" /> + <Unit filename="zen\long_path_prefix.h" /> + <Unit filename="zen\notify_removal.h" /> + <Unit filename="zen\perf.h" /> + <Unit filename="zen\privilege.cpp" /> + <Unit filename="zen\privilege.h" /> + <Unit filename="zen\read_txt.h" /> + <Unit filename="zen\stl_tools.h" /> + <Unit filename="zen\string_base.h" /> + <Unit filename="zen\string_tools.h" /> + <Unit filename="zen\string_traits.h" /> + <Unit filename="zen\symlink_target.h" /> + <Unit filename="zen\thread.h" /> + <Unit filename="zen\utf8.h" /> + <Unit filename="zen\warn_static.h" /> + <Unit filename="zen\win.h" /> + <Unit filename="zen\zstring.cpp" /> + <Unit filename="zen\zstring.h" /> <Extensions> <code_completion /> <envvars /> |