mirror of
https://github.com/uroni/urbackup_frontend_wx.git
synced 2025-10-26 11:19:28 +00:00
Build with Visual Studio 2015
This commit is contained in:
Martin Raiber
parent
9ad0c77f85
commit
6935bbb89b
@ -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();
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
//
|
||||
// Generated from the TEXTINCLUDE 2 resource.
|
||||
//
|
||||
#include "afxres.h"
|
||||
#include "windows.h"
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
#undef APSTUDIO_READONLY_SYMBOLS
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<ItemGroup Label="ProjectConfigurations">
|
||||
<ProjectConfiguration Include="Debug|Win32">
|
||||
<Configuration>Debug</Configuration>
|
||||
@ -22,25 +22,30 @@
|
||||
<ProjectGuid>{7169B7EA-2630-4042-A0DC-19471462C1C3}</ProjectGuid>
|
||||
<RootNamespace>UrBackupClientGUI</RootNamespace>
|
||||
<Keyword>Win32Proj</Keyword>
|
||||
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
|
||||
<ConfigurationType>Application</ConfigurationType>
|
||||
<CharacterSet>Unicode</CharacterSet>
|
||||
<WholeProgramOptimization>true</WholeProgramOptimization>
|
||||
<PlatformToolset>v140</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
||||
<ConfigurationType>Application</ConfigurationType>
|
||||
<CharacterSet>Unicode</CharacterSet>
|
||||
<PlatformToolset>v140</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
|
||||
<ConfigurationType>Application</ConfigurationType>
|
||||
<CharacterSet>Unicode</CharacterSet>
|
||||
<WholeProgramOptimization>true</WholeProgramOptimization>
|
||||
<PlatformToolset>v140</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
|
||||
<ConfigurationType>Application</ConfigurationType>
|
||||
<CharacterSet>Unicode</CharacterSet>
|
||||
<PlatformToolset>v140_xp</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
||||
<ImportGroup Label="ExtensionSettings">
|
||||
@ -88,7 +93,7 @@
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<ClCompile>
|
||||
<Optimization>Disabled</Optimization>
|
||||
<AdditionalIncludeDirectories>D:\Developement\libs\wxWidgets\wxWidgets\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<AdditionalIncludeDirectories>$(WxWidgetsIncludeDir);..\deps\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<MinimalRebuild>true</MinimalRebuild>
|
||||
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
|
||||
@ -99,8 +104,8 @@
|
||||
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<AdditionalDependencies>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)</AdditionalDependencies>
|
||||
<AdditionalLibraryDirectories>wx64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||
<AdditionalDependencies>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)</AdditionalDependencies>
|
||||
<AdditionalLibraryDirectories>$(WxWidgetsLibDir)\vc_x64_lib;..\deps\lib\vc_x64_lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
<SubSystem>Console</SubSystem>
|
||||
<TargetMachine>MachineX86</TargetMachine>
|
||||
@ -110,7 +115,7 @@
|
||||
<ClCompile>
|
||||
<Optimization>MaxSpeed</Optimization>
|
||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
||||
<AdditionalIncludeDirectories>deps\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<AdditionalIncludeDirectories>$(WxWidgetsIncludeDir);..\deps\include%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;DD_RELEASE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
||||
<FunctionLevelLinking>true</FunctionLevelLinking>
|
||||
@ -121,7 +126,7 @@
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<AdditionalDependencies>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)</AdditionalDependencies>
|
||||
<AdditionalLibraryDirectories>deps\win\wx86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||
<AdditionalLibraryDirectories>$(WxWidgetsLibDir)\vc_lib;..\deps\lib\vc_lib%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
<OptimizeReferences>true</OptimizeReferences>
|
||||
@ -135,7 +140,7 @@
|
||||
</Midl>
|
||||
<ClCompile>
|
||||
<Optimization>Disabled</Optimization>
|
||||
<AdditionalIncludeDirectories>D:\Developement\libs\wxWidgets\wxWidgets\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<AdditionalIncludeDirectories>$(WxWidgetsIncludeDir);..\deps\include%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<MinimalRebuild>true</MinimalRebuild>
|
||||
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
|
||||
@ -146,8 +151,8 @@
|
||||
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<AdditionalDependencies>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)</AdditionalDependencies>
|
||||
<AdditionalLibraryDirectories>D:\Developement\libs\wxWidgets\wxWidgets\lib\vc_lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||
<AdditionalDependencies>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)</AdditionalDependencies>
|
||||
<AdditionalLibraryDirectories>$(WxWidgetsLibDir)\vc_x64_lib;..\deps\lib\vc_x64_lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
<SubSystem>Console</SubSystem>
|
||||
<TargetMachine>MachineX64</TargetMachine>
|
||||
@ -160,7 +165,7 @@
|
||||
<ClCompile>
|
||||
<Optimization>MaxSpeed</Optimization>
|
||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
||||
<AdditionalIncludeDirectories>deps\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<AdditionalIncludeDirectories>$(WxWidgetsIncludeDir);..\deps\include%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;DD_RELEASE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
||||
<FunctionLevelLinking>true</FunctionLevelLinking>
|
||||
@ -170,8 +175,8 @@
|
||||
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<AdditionalDependencies>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)</AdditionalDependencies>
|
||||
<AdditionalLibraryDirectories>deps\win\wx64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||
<AdditionalDependencies>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)</AdditionalDependencies>
|
||||
<AdditionalLibraryDirectories>$(WxWidgetsLibDir)\vc_x64_lib;..\deps\lib\vc_x64_lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
<OptimizeReferences>true</OptimizeReferences>
|
||||
|
||||
@ -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%
|
||||
|
||||
@ -1049,11 +1049,6 @@ void ParseParamStr(const std::string &pStr, std::map<std::wstring,std::wstring>
|
||||
}
|
||||
}
|
||||
|
||||
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);
|
||||
}
|
||||
|
||||
@ -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<std::wstring,std::wstring> *pMap);
|
||||
int round(float f);
|
||||
std::string FormatTime(int timeins);
|
||||
bool IsHex(const std::string &str);
|
||||
unsigned long hexToULong(const std::string &data);
|
||||
|
||||
@ -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
|
||||
Loading…
Reference in New Issue
Block a user