4.1

1 files changed, 47 insertions, 58 deletions

diff --git a/FreeFileSync.vcxproj b/FreeFileSync.vcxproj
index 65fd497b..e16d4f24 100644
--- a/FreeFileSync.vcxproj
+++ b/FreeFileSync.vcxproj
@@ -100,12 +100,12 @@
       <WarningLevel>Level4</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>ZEN_PLATFORM_WINDOWS;wxUSE_UNICODE;__WXMSW__;FFS_WIN;WXINTL_NO_GETTEXT_MACRO;__WXDEBUG__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>.\shared;C:\Program Files\C++\wxWidgets\include;C:\Program Files\C++\wxWidgets\lib\vc_lib\mswud;C:\Program Files\C++\Boost</AdditionalIncludeDirectories>
-      <PrecompiledHeaderFile>$(ProjectDir)shared\pch.h</PrecompiledHeaderFile>
-      <DisableSpecificWarnings>4100;4996</DisableSpecificWarnings>
+      <AdditionalIncludeDirectories>.;./zenXml;C:\Program Files\C++\wxWidgets\include;C:\Program Files\C++\wxWidgets\lib\vc_lib\mswud;C:\Program Files\C++\Boost</AdditionalIncludeDirectories>
+      <PrecompiledHeaderFile>wx+\pch.h</PrecompiledHeaderFile>
+      <DisableSpecificWarnings>4100;4996;4267;4512</DisableSpecificWarnings>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <PrecompiledHeaderOutputFile>$(IntDir)pch.obj</PrecompiledHeaderOutputFile>
-      <ForcedIncludeFiles>$(ProjectDir)shared/pch.h;$(SolutionDir)shared/warn_static.h</ForcedIncludeFiles>
+      <ForcedIncludeFiles>zen/warn_static.h;wx+\pch.h</ForcedIncludeFiles>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <MinimalRebuild>false</MinimalRebuild>
@@ -134,12 +134,12 @@
       <WarningLevel>Level4</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>ZEN_PLATFORM_WINDOWS;wxUSE_UNICODE;__WXMSW__;FFS_WIN;WXINTL_NO_GETTEXT_MACRO;__WXDEBUG__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>.\shared;C:\Program Files\C++\wxWidgets-x64\include;C:\Program Files\C++\wxWidgets-x64\lib\vc_lib\mswud;C:\Program Files\C++\Boost</AdditionalIncludeDirectories>
-      <PrecompiledHeaderFile>$(ProjectDir)shared\pch.h</PrecompiledHeaderFile>
-      <DisableSpecificWarnings>4100;4996</DisableSpecificWarnings>
+      <AdditionalIncludeDirectories>.;./zenXml;C:\Program Files\C++\wxWidgets-x64\include;C:\Program Files\C++\wxWidgets-x64\lib\vc_lib\mswud;C:\Program Files\C++\Boost</AdditionalIncludeDirectories>
+      <PrecompiledHeaderFile>wx+\pch.h</PrecompiledHeaderFile>
+      <DisableSpecificWarnings>4100;4996;4267;4512</DisableSpecificWarnings>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <PrecompiledHeaderOutputFile>$(IntDir)pch.obj</PrecompiledHeaderOutputFile>
-      <ForcedIncludeFiles>$(ProjectDir)shared/pch.h;$(SolutionDir)shared/warn_static.h</ForcedIncludeFiles>
+      <ForcedIncludeFiles>zen/warn_static.h;wx+\pch.h</ForcedIncludeFiles>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <MinimalRebuild>false</MinimalRebuild>
     </ClCompile>
@@ -168,13 +168,13 @@
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PreprocessorDefinitions>ZEN_PLATFORM_WINDOWS;wxUSE_UNICODE;__WXMSW__;FFS_WIN;WXINTL_NO_GETTEXT_MACRO;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>.\shared;C:\Program Files\C++\wxWidgets\include;C:\Program Files\C++\wxWidgets\lib\vc_lib\mswu;C:\Program Files\C++\Boost</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;./zenXml;C:\Program Files\C++\wxWidgets\include;C:\Program Files\C++\wxWidgets\lib\vc_lib\mswu;C:\Program Files\C++\Boost</AdditionalIncludeDirectories>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <DisableSpecificWarnings>4100;4996</DisableSpecificWarnings>
+      <DisableSpecificWarnings>4100;4996;4267;4512</DisableSpecificWarnings>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <InlineFunctionExpansion>Default</InlineFunctionExpansion>
-      <ForcedIncludeFiles>$(SolutionDir)shared/warn_static.h;</ForcedIncludeFiles>
+      <ForcedIncludeFiles>zen/warn_static.h</ForcedIncludeFiles>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -202,12 +202,12 @@
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PreprocessorDefinitions>ZEN_PLATFORM_WINDOWS;wxUSE_UNICODE;__WXMSW__;FFS_WIN;WXINTL_NO_GETTEXT_MACRO;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>.\shared;C:\Program Files\C++\wxWidgets-x64\include;C:\Program Files\C++\wxWidgets-x64\lib\vc_lib\mswu;C:\Program Files\C++\Boost</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;./zenXml;C:\Program Files\C++\wxWidgets-x64\include;C:\Program Files\C++\wxWidgets-x64\lib\vc_lib\mswu;C:\Program Files\C++\Boost</AdditionalIncludeDirectories>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <DisableSpecificWarnings>4512;4996;4100;4127</DisableSpecificWarnings>
+      <DisableSpecificWarnings>4100;4996;4267;4512</DisableSpecificWarnings>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <ForcedIncludeFiles>$(SolutionDir)shared/warn_static.h;</ForcedIncludeFiles>
+      <ForcedIncludeFiles>zen/warn_static.h</ForcedIncludeFiles>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -240,46 +240,25 @@
     <ClCompile Include="application.cpp" />
     <ClCompile Include="comparison.cpp" />
     <ClCompile Include="file_hierarchy.cpp" />
-    <ClCompile Include="library\binary.cpp" />
-    <ClCompile Include="library\custom_grid.cpp" />
-    <ClCompile Include="library\db_file.cpp" />
-    <ClCompile Include="library\dir_lock.cpp" />
-    <ClCompile Include="library\error_log.cpp" />
-    <ClCompile Include="library\hard_filter.cpp" />
-    <ClCompile Include="library\icon_buffer.cpp" />
-    <ClCompile Include="library\parallel_scan.cpp" />
-    <ClCompile Include="library\process_xml.cpp" />
-    <ClCompile Include="library\resources.cpp" />
-    <ClCompile Include="library\statistics.cpp" />
-    <ClCompile Include="library\status_handler.cpp" />
-    <ClCompile Include="shared\app_main.cpp" />
-    <ClCompile Include="shared\custom_button.cpp" />
-    <ClCompile Include="shared\folder_history_box.cpp" />
-    <ClCompile Include="shared\custom_tooltip.cpp" />
-    <ClCompile Include="shared\dir_name.cpp" />
-    <ClCompile Include="shared\dst_hack.cpp" />
-    <ClCompile Include="shared\file_handling.cpp" />
-    <ClCompile Include="shared\file_id.cpp" />
-    <ClCompile Include="shared\file_io.cpp" />
-    <ClCompile Include="shared\file_traverser.cpp" />
-    <ClCompile Include="shared\guid.cpp" />
-    <ClCompile Include="shared\help_provider.cpp" />
-    <ClCompile Include="shared\i18n.cpp" />
-    <ClCompile Include="shared\localization.cpp" />
-    <ClCompile Include="shared\mouse_move_dlg.cpp" />
-    <ClCompile Include="shared\privilege.cpp" />
-    <ClCompile Include="shared\recycler.cpp" />
-    <ClCompile Include="shared\resolve_path.cpp" />
-    <ClCompile Include="shared\serialize.cpp" />
-    <ClCompile Include="shared\shadow.cpp" />
-    <ClCompile Include="shared\standard_paths.cpp" />
-    <ClCompile Include="shared\last_error.cpp" />
-    <ClCompile Include="shared\taskbar.cpp" />
-    <ClCompile Include="shared\toggle_button.cpp" />
-    <ClCompile Include="shared\util.cpp" />
-    <ClCompile Include="shared\xml_base.cpp" />
-    <ClCompile Include="shared\zenXml\unit_test.cpp" />
-    <ClCompile Include="shared\zstring.cpp" />
+    <ClCompile Include="lib\binary.cpp" />
+    <ClCompile Include="lib\custom_grid.cpp" />
+    <ClCompile Include="lib\db_file.cpp" />
+    <ClCompile Include="lib\dir_lock.cpp" />
+    <ClCompile Include="lib\dir_name.cpp" />
+    <ClCompile Include="lib\error_log.cpp" />
+    <ClCompile Include="lib\folder_history_box.cpp" />
+    <ClCompile Include="lib\hard_filter.cpp" />
+    <ClCompile Include="lib\icon_buffer.cpp" />
+    <ClCompile Include="lib\localization.cpp" />
+    <ClCompile Include="lib\parallel_scan.cpp" />
+    <ClCompile Include="lib\process_xml.cpp" />
+    <ClCompile Include="lib\recycler.cpp" />
+    <ClCompile Include="lib\resolve_path.cpp" />
+    <ClCompile Include="lib\resources.cpp" />
+    <ClCompile Include="lib\shadow.cpp" />
+    <ClCompile Include="lib\statistics.cpp" />
+    <ClCompile Include="lib\status_handler.cpp" />
+    <ClCompile Include="lib\xml_base.cpp" />
     <ClCompile Include="structures.cpp" />
     <ClCompile Include="synchronization.cpp" />
     <ClCompile Include="ui\batch_config.cpp" />
@@ -293,9 +272,22 @@
     <ClCompile Include="ui\progress_indicator.cpp" />
     <ClCompile Include="ui\search.cpp" />
     <ClCompile Include="ui\small_dlgs.cpp" />
-    <ClCompile Include="ui\switch_to_gui.cpp" />
     <ClCompile Include="ui\sync_cfg.cpp" />
+    <ClCompile Include="ui\taskbar.cpp" />
     <ClCompile Include="ui\tray_icon.cpp" />
+    <ClCompile Include="wx+\button.cpp" />
+    <ClCompile Include="wx+\format_unit.cpp" />
+    <ClCompile Include="wx+\graph.cpp" />
+    <ClCompile Include="wx+\mouse_move_dlg.cpp" />
+    <ClCompile Include="wx+\tooltip.cpp" />
+    <ClCompile Include="zenXml\zenxml\unit_test.cpp" />
+    <ClCompile Include="zen\dst_hack.cpp" />
+    <ClCompile Include="zen\file_handling.cpp" />
+    <ClCompile Include="zen\file_id.cpp" />
+    <ClCompile Include="zen\file_io.cpp" />
+    <ClCompile Include="zen\file_traverser.cpp" />
+    <ClCompile Include="zen\privilege.cpp" />
+    <ClCompile Include="zen\zstring.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="resource.rc" />
@@ -305,9 +297,6 @@
       <SubType>Designer</SubType>
     </None>
   </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="shared\pch.h" />
-  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>