diff --git a/TaskBarBaloon.cpp b/TaskBarBaloon.cpp index 0c77423..74e97a8 100644 --- a/TaskBarBaloon.cpp +++ b/TaskBarBaloon.cpp @@ -162,7 +162,7 @@ HANDLE ExecuteProcess( const std::string & exe, const std::string &args, const s void update_urbackup(void) { #ifdef _WIN32 - wxStandardPaths sp; + wxStandardPaths& sp = wxStandardPaths::Get(); std::string e_pstr=ExtractFilePath(sp.GetExecutablePath().ToUTF8().data()); ExecuteProcess(e_pstr+"\\UrBackupUpdate.exe","",""); timer->resetDisplayedUpdateInfo(); diff --git a/UrBackupClientGUI.rc b/UrBackupClientGUI.rc index 57f86c4..5d9cb8e 100644 --- a/UrBackupClientGUI.rc +++ b/UrBackupClientGUI.rc @@ -7,7 +7,7 @@ // // Generated from the TEXTINCLUDE 2 resource. // -#include "afxres.h" +#include "windows.h" ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS diff --git a/UrBackupClientGUI.vcxproj b/UrBackupClientGUI.vcxproj index a597b88..7efe866 100644 --- a/UrBackupClientGUI.vcxproj +++ b/UrBackupClientGUI.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -22,25 +22,30 @@ {7169B7EA-2630-4042-A0DC-19471462C1C3} UrBackupClientGUI Win32Proj + 8.1 Application Unicode true + v140 Application Unicode + v140 Application Unicode true + v140 Application Unicode + v140_xp @@ -88,7 +93,7 @@ Disabled - D:\Developement\libs\wxWidgets\wxWidgets\include;%(AdditionalIncludeDirectories) + $(WxWidgetsIncludeDir);..\deps\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) true EnableFastChecks @@ -99,8 +104,8 @@ EditAndContinue - wxbase29u_net.lib;wxzlib.lib;wxregexu.lib;wxpng.lib;wxbase29u.lib;wxmswuniv29u_core.lib;wxmswuniv29u_adv.lib;wxexpat.lib;comctl32.lib;Rpcrt4.lib;ws2_32.lib;%(AdditionalDependencies) - wx64;%(AdditionalLibraryDirectories) + wxbase30u_net.lib;wxzlib.lib;wxregexu.lib;wxpng.lib;wxbase30u.lib;wxmswuniv30u_core.lib;wxmswuniv30u_adv.lib;wxexpat.lib;comctl32.lib;Rpcrt4.lib;ws2_32.lib;%(AdditionalDependencies) + $(WxWidgetsLibDir)\vc_x64_lib;..\deps\lib\vc_x64_lib;%(AdditionalLibraryDirectories) true Console MachineX86 @@ -110,7 +115,7 @@ MaxSpeed true - deps\include;%(AdditionalIncludeDirectories) + $(WxWidgetsIncludeDir);..\deps\include%(AdditionalIncludeDirectories) WIN32;NDEBUG;_CONSOLE;DD_RELEASE;%(PreprocessorDefinitions) MultiThreadedDLL true @@ -121,7 +126,7 @@ wxbase29u.lib;wxmsw29u_core.lib;wxmsw29u_adv.lib;wxexpat.lib;comctl32.lib;Rpcrt4.lib;wxbase29u_net.lib;ws2_32.lib;wxpng.lib;wxzlib.lib;%(AdditionalDependencies) - deps\win\wx86;%(AdditionalLibraryDirectories) + $(WxWidgetsLibDir)\vc_lib;..\deps\lib\vc_lib%(AdditionalLibraryDirectories) true Windows true @@ -135,7 +140,7 @@ Disabled - D:\Developement\libs\wxWidgets\wxWidgets\include;%(AdditionalIncludeDirectories) + $(WxWidgetsIncludeDir);..\deps\include%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true EnableFastChecks @@ -146,8 +151,8 @@ ProgramDatabase - wxpngd.lib;wxbase29ud.lib;wxexpatd.lib;comctl32.lib;Rpcrt4.lib;wxbase29ud_net.lib;ws2_32.lib;wxzlibd.lib;wxmsw29ud_core.lib;wxmsw29ud_adv.lib;%(AdditionalDependencies) - D:\Developement\libs\wxWidgets\wxWidgets\lib\vc_lib;%(AdditionalLibraryDirectories) + wxpngd.lib;wxbase30ud.lib;wxexpatd.lib;comctl32.lib;Rpcrt4.lib;wxbase30ud_net.lib;ws2_32.lib;wxzlibd.lib;wxmsw30ud_core.lib;wxmsw30ud_adv.lib;%(AdditionalDependencies) + $(WxWidgetsLibDir)\vc_x64_lib;..\deps\lib\vc_x64_lib;%(AdditionalLibraryDirectories) true Console MachineX64 @@ -160,7 +165,7 @@ MaxSpeed true - deps\include;%(AdditionalIncludeDirectories) + $(WxWidgetsIncludeDir);..\deps\include%(AdditionalIncludeDirectories) WIN32;NDEBUG;_CONSOLE;DD_RELEASE;%(PreprocessorDefinitions) MultiThreadedDLL true @@ -170,8 +175,8 @@ ProgramDatabase - wxbase29u.lib;wxmsw29u_core.lib;wxmsw29u_adv.lib;wxexpat.lib;comctl32.lib;Rpcrt4.lib;wxbase29u_net.lib;ws2_32.lib;wxpng.lib;wxzlib.lib;%(AdditionalDependencies) - deps\win\wx64;%(AdditionalLibraryDirectories) + wxbase30u.lib;wxmsw30u_core.lib;wxmsw30u_adv.lib;wxexpat.lib;comctl32.lib;Rpcrt4.lib;wxbase30u_net.lib;ws2_32.lib;wxpng.lib;wxzlib.lib;%(AdditionalDependencies) + $(WxWidgetsLibDir)\vc_x64_lib;..\deps\lib\vc_x64_lib;%(AdditionalLibraryDirectories) true Windows true diff --git a/build_client.bat b/build_client.bat index cf48220..4b20cf6 100644 --- a/build_client.bat +++ b/build_client.bat @@ -1,7 +1,6 @@ -call update_deps.bat cd %~dp0 -call "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" +call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" msbuild UrBackupClientGUI.sln /p:Configuration=Release /p:Platform="Win32" if %errorlevel% neq 0 exit /b %errorlevel% diff --git a/stringtools.cpp b/stringtools.cpp index d13cb21..db4b3e6 100644 --- a/stringtools.cpp +++ b/stringtools.cpp @@ -1049,11 +1049,6 @@ void ParseParamStr(const std::string &pStr, std::map } } -int round(float f) -{ - return (int)(f<0?f-0.5f:f+0.5f); -} - std::string FormatTime(int timeins) { float t=(float)timeins; @@ -1084,7 +1079,7 @@ std::string FormatTime(int timeins) //-------------------HTML DECODE----------------- -const char array[] = {'0','1','2','3','4','5','6','7','8','9','a','b','c','d','e','f'}; +const char hex_array[] = {'0','1','2','3','4','5','6','7','8','9','a','b','c','d','e','f'}; bool IsHex(const std::string &str) { @@ -1094,7 +1089,7 @@ bool IsHex(const std::string &str) bool in=false; for(size_t t=0;t<16;++t) { - if(array[t]==str[i]) + if(hex_array[t]==str[i]) { in=true; break; @@ -1118,7 +1113,7 @@ unsigned long hexToULong(const std::string &data) { for(unsigned char j = 0; j < 16; j++) { - if( str[i] == array[j]) + if( str[i] == hex_array[j]) { return_value = ((return_value * 16) + j); } diff --git a/stringtools.h b/stringtools.h index b3fab60..900bdf0 100644 --- a/stringtools.h +++ b/stringtools.h @@ -87,7 +87,6 @@ void EscapeCh(std::wstring &pStr, wchar_t ch); std::string UnescapeSQLString(std::string pStr); std::wstring UnescapeSQLString(std::wstring pStr); void ParseParamStr(const std::string &pStr, std::map *pMap); -int round(float f); std::string FormatTime(int timeins); bool IsHex(const std::string &str); unsigned long hexToULong(const std::string &data); diff --git a/update_deps.bat b/update_deps.bat deleted file mode 100644 index 75244cf..0000000 --- a/update_deps.bat +++ /dev/null @@ -1,4 +0,0 @@ -if not exist deps git clone -b master http://urpc.dyndns.org/git/urbackup_deps_client deps -cd deps -git reset --hard -git pull \ No newline at end of file