diff options
| author | Daniel Wilhelm <daniel@wili.li> | 2014-04-18 17:20:29 +0200 |
|---|---|---|
| committer | Daniel Wilhelm <daniel@wili.li> | 2014-04-18 17:20:29 +0200 |
| commit | b8f13e45be884dc12884ebe8f3dcd9eecb23a106 (patch) | |
| tree | 22a6d8b96815d626061ff3e2d432c13078fca5c4 /FreeFileSync.cbp | |
| parent | 5.4 (diff) | |
| download | FreeFileSync-b8f13e45be884dc12884ebe8f3dcd9eecb23a106.tar.gz FreeFileSync-b8f13e45be884dc12884ebe8f3dcd9eecb23a106.tar.bz2 FreeFileSync-b8f13e45be884dc12884ebe8f3dcd9eecb23a106.zip | |
5.5
Diffstat (limited to 'FreeFileSync.cbp')
| -rw-r--r-- | FreeFileSync.cbp | 32 |
1 files changed, 20 insertions, 12 deletions
diff --git a/FreeFileSync.cbp b/FreeFileSync.cbp index 03631460..e874a6e0 100644 --- a/FreeFileSync.cbp +++ b/FreeFileSync.cbp @@ -18,12 +18,14 @@ <Compiler> <Add option="-O3" /> <Add option="-DNDEBUG" /> - <Add directory="C:\Programme\C++\wxWidgets\lib\gcc_lib\mswu" /> + <Add directory="C:\Programme\C++\wxWidgets\lib\mingw_release_lib\mswu" /> </Compiler> <Linker> <Add option="-s" /> <Add option="-static" /> - <Add library="libboost_thread-mgw46-mt-s-1_49.a" /> + <Add library="libboost_thread-mgw47-mt-s-1_50.a" /> + <Add library="libboost_system-mgw47-mt-s-1_50.a" /> + <Add library="libboost_chrono-mgw47-mt-s-1_50.a" /> <Add library="libwxmsw28u_aui.a" /> <Add library="libwxmsw28u_adv.a" /> <Add library="libwxmsw28u_core.a" /> @@ -31,7 +33,7 @@ <Add library="libwxbase28u_net.a" /> <Add library="libwxpng.a" /> <Add library="libwxzlib.a" /> - <Add directory="C:\Programme\C++\wxWidgets\lib\gcc_lib" /> + <Add directory="C:\Programme\C++\wxWidgets\lib\mingw_release_lib" /> </Linker> <ExtraCommands> <Add after='"C:\Program Files\C++\CodeSigning\SignCode.cmd" "$(PROJECT_DIR)$(TARGET_OUTPUT_FILE)"' /> @@ -50,16 +52,19 @@ <Add option="-Winvalid-pch" /> <Add option='-include "wx+/pch.h"' /> <Add option="-D__WXDEBUG__" /> - <Add directory="C:\Programme\C++\wxWidgets\lib\gcc_dll\mswud" /> + <Add directory="C:\Programme\C++\wxWidgets\lib\mingw_debug_dll\mswud" /> </Compiler> <Linker> - <Add library="libboost_thread-mgw46-mt-sd-1_49.a" /> + <Add library="libboost_thread-mgw47-mt-sd-1_50.a" /> + <Add library="libboost_system-mgw47-mt-sd-1_50.a" /> + <Add library="libboost_chrono-mgw47-mt-sd-1_50.a" /> <Add library="libwxmsw28ud_aui.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" /> + <Add library="libwxzlibd.a" /> + <Add directory="C:\Programme\C++\wxWidgets\lib\mingw_debug_dll" /> </Linker> </Target> <Target title="Unit Test"> @@ -75,18 +80,20 @@ <Add option="-Winvalid-pch" /> <Add option='-include "wx+/pch.h"' /> <Add option="-D__WXDEBUG__" /> - <Add directory="C:\Programme\C++\wxWidgets\lib\gcc_dll\mswud" /> + <Add directory="C:\Programme\C++\wxWidgets\lib\mingw_debug_dll\mswud" /> <Add directory="lib\gtest" /> <Add directory="lib\gtest\include" /> </Compiler> <Linker> - <Add library="libboost_thread-mgw46-mt-sd-1_49.a" /> + <Add library="libboost_thread-mgw47-mt-sd-1_50.a" /> + <Add library="libboost_system-mgw47-mt-sd-1_50.a" /> + <Add library="libboost_chrono-mgw47-mt-sd-1_50.a" /> <Add library="libwxmsw28ud_adv.a" /> <Add library="libwxmsw28ud_core.a" /> <Add library="libwxbase28ud.a" /> <Add library="libwxpngd.a" /> <Add library="libwxzlibd.a" /> - <Add directory="C:\Programme\C++\wxWidgets\lib\gcc_dll" /> + <Add directory="C:\Programme\C++\wxWidgets\lib\mingw_debug_dll" /> </Linker> </Target> </Build> @@ -99,7 +106,7 @@ <Add option="-Wmissing-include-dirs" /> <Add option="-Wswitch-enum" /> <Add option="-Wmain" /> - <Add option="-std=c++0x" /> + <Add option="-std=c++11" /> <Add option="-Wall" /> <Add option="-pipe" /> <Add option="-mthreads" /> @@ -160,6 +167,7 @@ <Unit filename="lib\dir_lock.cpp" /> <Unit filename="lib\dir_lock.h" /> <Unit filename="lib\ffs_paths.h" /> + <Unit filename="lib\generate_logfile.h" /> <Unit filename="lib\gtest\main.cpp"> <Option target="Unit Test" /> </Unit> @@ -456,6 +464,8 @@ <Option target="Release" /> <Option target="Debug-DLL" /> </Unit> + <Unit filename="wx+\zlib_wrap.cpp" /> + <Unit filename="wx+\zlib_wrap.h" /> <Unit filename="zen\assert_static.h" /> <Unit filename="zen\base64.h" /> <Unit filename="zen\build_info.h" /> @@ -476,7 +486,6 @@ <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" /> @@ -497,7 +506,6 @@ <Unit filename="zen\symlink_target.h" /> <Unit filename="zen\thread.h" /> <Unit filename="zen\tick_count.h" /> - <Unit filename="zen\utf8.h" /> <Unit filename="zen\warn_static.h" /> <Unit filename="zen\win.h" /> <Unit filename="zen\zstring.cpp" /> |