diff options
| author | Daniel Wilhelm <daniel@wili.li> | 2014-04-18 17:07:15 +0200 |
|---|---|---|
| committer | Daniel Wilhelm <daniel@wili.li> | 2014-04-18 17:07:15 +0200 |
| commit | 8318453bf9d4fd50b137ff6c6fc8d1fd22aa6395 (patch) | |
| tree | 975c6e590c31e56007006a23e7b15d0245d75b08 /FreeFileSync.cbp | |
| parent | 3.6 (diff) | |
| download | FreeFileSync-8318453bf9d4fd50b137ff6c6fc8d1fd22aa6395.tar.gz FreeFileSync-8318453bf9d4fd50b137ff6c6fc8d1fd22aa6395.tar.bz2 FreeFileSync-8318453bf9d4fd50b137ff6c6fc8d1fd22aa6395.zip | |
3.7
Diffstat (limited to 'FreeFileSync.cbp')
| -rw-r--r-- | FreeFileSync.cbp | 213 |
1 files changed, 81 insertions, 132 deletions
diff --git a/FreeFileSync.cbp b/FreeFileSync.cbp index 968ad8a1..0a3d7600 100644 --- a/FreeFileSync.cbp +++ b/FreeFileSync.cbp @@ -7,32 +7,6 @@ <Option pch_mode="2" /> <Option compiler="gcc" /> <Build> - <Target title="Debug"> - <Option output="BUILD\FreeFileSync" prefix_auto="1" extension_auto="1" /> - <Option working_dir="BUILD\" /> - <Option object_output="OBJ\Debug_FFS_GCC\" /> - <Option type="0" /> - <Option compiler="gcc" /> - <Option projectLinkerOptionsRelation="2" /> - <Compiler> - <Add option="-g" /> - <Add option="-Winvalid-pch" /> - <Add option='-include "library/pch.h"' /> - <Add option="-D__WXDEBUG__" /> - <Add directory="C:\Programme\C++\wxWidgets\lib\gcc_lib\mswud" /> - </Compiler> - <ResourceCompiler> - <Add directory="C:\Programme\C++\wxWidgets\lib\gcc_lib\mswud" /> - </ResourceCompiler> - <Linker> - <Add library="libwxmsw28ud_adv.a" /> - <Add library="libwxmsw28ud_core.a" /> - <Add library="libwxbase28ud.a" /> - <Add library="libwxpngd.a" /> - <Add library="libwxzlibd.a" /> - <Add library="libwxbase28ud_net.a" /> - </Linker> - </Target> <Target title="Release"> <Option output="BUILD\FreeFileSync" prefix_auto="1" extension_auto="1" /> <Option working_dir="BUILD\" /> @@ -45,9 +19,6 @@ <Add option="-DNDEBUG" /> <Add directory="C:\Programme\C++\wxWidgets\lib\gcc_lib\mswu" /> </Compiler> - <ResourceCompiler> - <Add directory="C:\Programme\C++\wxWidgets\lib\gcc_lib\mswu" /> - </ResourceCompiler> <Linker> <Add option="-s" /> <Add library="libwxmsw28u_adv.a" /> @@ -56,6 +27,7 @@ <Add library="libwxpng.a" /> <Add library="libwxzlib.a" /> <Add library="libwxbase28u_net.a" /> + <Add directory="C:\Programme\C++\wxWidgets\lib\gcc_lib" /> </Linker> </Target> <Target title="Unit Test"> @@ -70,9 +42,9 @@ <Add option="-Winvalid-pch" /> <Add option='-include "library/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="C:\Programme\C++\wxWidgets\lib\gcc_lib\mswud" /> </Compiler> <Linker> <Add library="libwxmsw28ud_adv.a" /> @@ -80,33 +52,29 @@ <Add library="libwxbase28ud.a" /> <Add library="libwxpngd.a" /> <Add library="libwxzlibd.a" /> + <Add directory="C:\Programme\C++\wxWidgets\lib\gcc_dll" /> </Linker> </Target> - <Target title="Performance Test"> + <Target title="Debug-DLL"> <Option output="BUILD\FreeFileSync" prefix_auto="1" extension_auto="1" /> - <Option working_dir="BUILD\" /> - <Option object_output="OBJ\Release_FFS_GCC\" /> + <Option working_dir="BUILD" /> + <Option object_output="OBJ\Debug_FFS_GCC\" /> <Option type="0" /> <Option compiler="gcc" /> <Option projectLinkerOptionsRelation="2" /> <Compiler> - <Add option="-O3" /> - <Add option="-pg" /> <Add option="-g" /> - <Add option="-DNDEBUG" /> - <Add directory="C:\Programme\C++\wxWidgets\lib\gcc_lib\mswu" /> + <Add option="-Winvalid-pch" /> + <Add option='-include "library/pch.h"' /> + <Add option="-D__WXDEBUG__" /> + <Add directory="C:\Programme\C++\wxWidgets\lib\gcc_dll\mswud" /> </Compiler> - <ResourceCompiler> - <Add directory="C:\Programme\C++\wxWidgets\lib\gcc_lib\mswu" /> - </ResourceCompiler> <Linker> - <Add option="-pg -lgmon" /> - <Add library="libwxmsw28u_adv.a" /> - <Add library="libwxmsw28u_core.a" /> - <Add library="libwxbase28u.a" /> - <Add library="libwxpng.a" /> - <Add library="libwxzlib.a" /> - <Add library="libwxbase28u_net.a" /> + <Add library="libwxmsw28ud_adv.a" /> + <Add library="libwxmsw28ud_core.a" /> + <Add library="libwxbase28ud.a" /> + <Add library="libwxbase28ud_net.a" /> + <Add directory="C:\Programme\C++\wxWidgets\lib\gcc_dll" /> </Linker> </Target> </Build> @@ -117,10 +85,10 @@ <Add option="-Wcast-align" /> <Add option="-Wmissing-include-dirs" /> <Add option="-Wswitch-enum" /> + <Add option="-Wmain" /> <Add option="-Wall" /> <Add option="-pipe" /> <Add option="-mthreads" /> - <Add option='[[if (PLATFORM == PLATFORM_MSW && (GetCompilerFactory().GetCompilerVersionString(_T("gcc")) >= _T("4.0.0"))) print(_T("-Wno-attributes"));]]' /> <Add option="-D__GNUWIN32__" /> <Add option="-D__WXMSW__" /> <Add option="-DFFS_WIN" /> @@ -128,15 +96,14 @@ <Add option="-DwxUSE_UNICODE" /> <Add option="-DZSTRING_WIDE_CHAR" /> <Add directory="C:\Programme\C++\wxWidgets\include" /> - <Add directory="C:\Programme\C++\wxWidgets\contrib\include" /> <Add directory="shared\boost_1_x" /> - <Add directory="shared" /> </Compiler> <ResourceCompiler> <Add directory="C:\Programme\C++\wxWidgets\include" /> </ResourceCompiler> <Linker> <Add option="-mthreads" /> + <Add option="-Wl,--enable-auto-import" /> <Add library="libkernel32.a" /> <Add library="libuser32.a" /> <Add library="libuuid.a" /> @@ -145,9 +112,9 @@ <Add library="liboleaut32.a" /> <Add library="libgdi32.a" /> <Add library="libcomdlg32.a" /> - <Add library="libws2_32.a" /> <Add library="libwinmm.a" /> - <Add directory="C:\Programme\C++\wxWidgets\lib\gcc_lib" /> + <Add library="libws2_32.a" /> + <Add library="libwinspool" /> </Linker> <Unit filename="WxWizFrame.fbp"> <Option target="<{~None~}>" /> @@ -157,9 +124,8 @@ <Option target="<{~None~}>" /> </Unit> <Unit filename="application.cpp"> - <Option target="Debug" /> <Option target="Release" /> - <Option target="Performance Test" /> + <Option target="Debug-DLL" /> </Unit> <Unit filename="application.h"> <Option target="<{~None~}>" /> @@ -173,29 +139,25 @@ <Unit filename="library\binary.cpp" /> <Unit filename="library\binary.h" /> <Unit filename="library\customGrid.cpp"> - <Option target="Debug" /> <Option target="Release" /> - <Option target="Performance Test" /> + <Option target="Debug-DLL" /> </Unit> <Unit filename="library\customGrid.h"> <Option target="<{~None~}>" /> </Unit> <Unit filename="library\dbFile.cpp" /> <Unit filename="library\dbFile.h"> - <Option target="Debug" /> <Option target="Release" /> - <Option target="Performance Test" /> + <Option target="Debug-DLL" /> </Unit> <Unit filename="library\detectRenaming.h" /> <Unit filename="library\errorLogging.cpp"> - <Option target="Debug" /> <Option target="Release" /> - <Option target="Performance Test" /> + <Option target="Debug-DLL" /> </Unit> <Unit filename="library\errorLogging.h"> - <Option target="Debug" /> <Option target="Release" /> - <Option target="Performance Test" /> + <Option target="Debug-DLL" /> </Unit> <Unit filename="library\filter.cpp" /> <Unit filename="library\filter.h"> @@ -223,14 +185,12 @@ <Option target="Unit Test" /> </Unit> <Unit filename="library\iconBuffer.cpp"> - <Option target="Debug" /> <Option target="Release" /> - <Option target="Performance Test" /> + <Option target="Debug-DLL" /> </Unit> <Unit filename="library\iconBuffer.h"> - <Option target="Debug" /> <Option target="Release" /> - <Option target="Performance Test" /> + <Option target="Debug-DLL" /> </Unit> <Unit filename="library\multithreading.cpp"> <Option target="Unit Test" /> @@ -238,8 +198,8 @@ <Unit filename="library\pch.h"> <Option compile="1" /> <Option weight="0" /> - <Option target="Debug" /> <Option target="Unit Test" /> + <Option target="Debug-DLL" /> </Unit> <Unit filename="library\processXml.cpp" /> <Unit filename="library\processXml.h"> @@ -252,9 +212,8 @@ <Unit filename="library\softFilter.cpp" /> <Unit filename="library\softFilter.h" /> <Unit filename="library\statistics.cpp"> - <Option target="Debug" /> <Option target="Release" /> - <Option target="Performance Test" /> + <Option target="Debug-DLL" /> </Unit> <Unit filename="library\statistics.h"> <Option target="<{~None~}>" /> @@ -265,55 +224,47 @@ </Unit> <Unit filename="resource.rc"> <Option compilerVar="WINDRES" /> - <Option target="Debug" /> <Option target="Release" /> - <Option target="Performance Test" /> + <Option target="Debug-DLL" /> </Unit> <Unit filename="shared\Recycler.h" /> <Unit filename="shared\appMain.cpp"> - <Option target="Debug" /> <Option target="Release" /> - <Option target="Performance Test" /> + <Option target="Debug-DLL" /> </Unit> <Unit filename="shared\appMain.h"> - <Option target="Debug" /> <Option target="Release" /> - <Option target="Performance Test" /> + <Option target="Debug-DLL" /> </Unit> <Unit filename="shared\buildInfo.h" /> <Unit filename="shared\customButton.cpp"> - <Option target="Debug" /> <Option target="Release" /> - <Option target="Performance Test" /> + <Option target="Debug-DLL" /> </Unit> <Unit filename="shared\customButton.h"> - <Option target="Debug" /> <Option target="Release" /> - <Option target="Performance Test" /> + <Option target="Debug-DLL" /> </Unit> <Unit filename="shared\customComboBox.cpp" /> <Unit filename="shared\customComboBox.h" /> <Unit filename="shared\customTooltip.cpp"> - <Option target="Debug" /> <Option target="Release" /> - <Option target="Performance Test" /> + <Option target="Debug-DLL" /> </Unit> <Unit filename="shared\customTooltip.h"> - <Option target="Debug" /> <Option target="Release" /> - <Option target="Performance Test" /> + <Option target="Debug-DLL" /> </Unit> + <Unit filename="shared\debugNew.h" /> <Unit filename="shared\dllLoader.cpp" /> <Unit filename="shared\dllLoader.h" /> <Unit filename="shared\dragAndDrop.cpp"> - <Option target="Debug" /> <Option target="Release" /> - <Option target="Performance Test" /> + <Option target="Debug-DLL" /> </Unit> <Unit filename="shared\dragAndDrop.h"> - <Option target="Debug" /> <Option target="Release" /> - <Option target="Performance Test" /> + <Option target="Debug-DLL" /> </Unit> <Unit filename="shared\fileError.h" /> <Unit filename="shared\fileHandling.cpp" /> @@ -329,14 +280,12 @@ <Unit filename="shared\guid.cpp" /> <Unit filename="shared\guid.h" /> <Unit filename="shared\helpProvider.cpp"> - <Option target="Debug" /> <Option target="Release" /> - <Option target="Performance Test" /> + <Option target="Debug-DLL" /> </Unit> <Unit filename="shared\helpProvider.h"> - <Option target="Debug" /> <Option target="Release" /> - <Option target="Performance Test" /> + <Option target="Debug-DLL" /> </Unit> <Unit filename="shared\localization.cpp" /> <Unit filename="shared\localization.h" /> @@ -356,33 +305,30 @@ <Unit filename="shared\systemFunctions.cpp" /> <Unit filename="shared\systemFunctions.h" /> <Unit filename="shared\taskbar.cpp"> - <Option target="Debug" /> <Option target="Release" /> - <Option target="Performance Test" /> + <Option target="Debug-DLL" /> </Unit> <Unit filename="shared\taskbar.h"> - <Option target="Debug" /> <Option target="Release" /> - <Option target="Performance Test" /> + <Option target="Debug-DLL" /> </Unit> <Unit filename="shared\tinyxml\tinystr.cpp" /> <Unit filename="shared\tinyxml\tinyxml.cpp" /> <Unit filename="shared\tinyxml\tinyxmlerror.cpp" /> <Unit filename="shared\tinyxml\tinyxmlparser.cpp" /> <Unit filename="shared\toggleButton.cpp"> - <Option target="Debug" /> <Option target="Release" /> - <Option target="Performance Test" /> + <Option target="Debug-DLL" /> </Unit> <Unit filename="shared\toggleButton.h"> - <Option target="Debug" /> <Option target="Release" /> - <Option target="Performance Test" /> + <Option target="Debug-DLL" /> </Unit> <Unit filename="shared\util.cpp" /> <Unit filename="shared\util.h" /> <Unit filename="shared\xmlBase.cpp" /> <Unit filename="shared\xmlBase.h" /> + <Unit filename="shared\xmlError.h" /> <Unit filename="shared\zstring.cpp" /> <Unit filename="shared\zstring.h" /> <Unit filename="structures.cpp" /> @@ -393,89 +339,78 @@ <Unit filename="synchronization.h"> <Option target="<{~None~}>" /> </Unit> + <Unit filename="ui\batchConfig.cpp"> + <Option target="Release" /> + <Option target="Debug-DLL" /> + </Unit> + <Unit filename="ui\batchConfig.h"> + <Option target="Release" /> + <Option target="Debug-DLL" /> + </Unit> <Unit filename="ui\batchStatusHandler.cpp"> - <Option target="Debug" /> <Option target="Release" /> - <Option target="Performance Test" /> + <Option target="Debug-DLL" /> </Unit> <Unit filename="ui\batchStatusHandler.h" /> <Unit filename="ui\checkVersion.cpp"> - <Option target="Debug" /> <Option target="Release" /> - <Option target="Performance Test" /> + <Option target="Debug-DLL" /> </Unit> <Unit filename="ui\checkVersion.h"> <Option target="<{~None~}>" /> </Unit> <Unit filename="ui\folderPair.h"> - <Option target="Debug" /> <Option target="Release" /> - <Option target="Performance Test" /> + <Option target="Debug-DLL" /> </Unit> <Unit filename="ui\gridView.cpp"> - <Option target="Debug" /> <Option target="Release" /> - <Option target="Performance Test" /> + <Option target="Debug-DLL" /> </Unit> <Unit filename="ui\gridView.h"> <Option target="<{~None~}>" /> </Unit> <Unit filename="ui\guiGenerated.cpp"> - <Option target="Debug" /> <Option target="Release" /> - <Option target="Performance Test" /> + <Option target="Debug-DLL" /> </Unit> <Unit filename="ui\guiGenerated.h"> <Option target="<{~None~}>" /> </Unit> <Unit filename="ui\guiStatusHandler.cpp"> - <Option target="Debug" /> <Option target="Release" /> - <Option target="Performance Test" /> + <Option target="Debug-DLL" /> </Unit> <Unit filename="ui\guiStatusHandler.h"> <Option target="<{~None~}>" /> </Unit> <Unit filename="ui\mainDialog.cpp"> - <Option target="Debug" /> <Option target="Release" /> - <Option target="Performance Test" /> + <Option target="Debug-DLL" /> </Unit> <Unit filename="ui\mainDialog.h"> <Option target="<{~None~}>" /> </Unit> <Unit filename="ui\messagePopup.cpp"> - <Option target="Debug" /> <Option target="Release" /> - <Option target="Performance Test" /> + <Option target="Debug-DLL" /> </Unit> <Unit filename="ui\messagePopup.h" /> <Unit filename="ui\mouseMoveWindow.cpp" /> <Unit filename="ui\mouseMoveWindow.h" /> <Unit filename="ui\progressIndicator.cpp"> - <Option target="Debug" /> <Option target="Release" /> - <Option target="Performance Test" /> + <Option target="Debug-DLL" /> </Unit> <Unit filename="ui\progressIndicator.h" /> <Unit filename="ui\search.cpp"> - <Option target="Debug" /> <Option target="Release" /> - <Option target="Performance Test" /> + <Option target="Debug-DLL" /> </Unit> <Unit filename="ui\search.h" /> - <Unit filename="ui\settingsDialog.cpp"> - <Option target="Debug" /> - <Option target="Release" /> - <Option target="Performance Test" /> - </Unit> - <Unit filename="ui\settingsDialog.h"> - <Option target="<{~None~}>" /> - </Unit> <Unit filename="ui\smallDialogs.cpp"> - <Option target="Debug" /> <Option target="Release" /> - <Option target="Performance Test" /> + <Option target="Debug-DLL" /> </Unit> <Unit filename="ui\smallDialogs.h"> <Option target="<{~None~}>" /> @@ -483,13 +418,27 @@ <Unit filename="ui\sorting.h"> <Option target="<{~None~}>" /> </Unit> + <Unit filename="ui\switchToGui.cpp"> + <Option target="Release" /> + <Option target="Debug-DLL" /> + </Unit> + <Unit filename="ui\switchToGui.h"> + <Option target="Release" /> + <Option target="Debug-DLL" /> + </Unit> + <Unit filename="ui\syncConfig.cpp"> + <Option target="Release" /> + <Option target="Debug-DLL" /> + </Unit> + <Unit filename="ui\syncConfig.h"> + <Option target="Release" /> + <Option target="Debug-DLL" /> + </Unit> <Unit filename="ui\trayIcon.cpp"> - <Option target="Debug" /> <Option target="Release" /> - <Option target="Performance Test" /> + <Option target="Debug-DLL" /> </Unit> <Unit filename="ui\trayIcon.h" /> - <Unit filename="ui\util.h" /> <Extensions> <code_completion /> <envvars /> |