diff --git a/Olivia.sln b/Olivia.sln index 7db8439..66b23ed 100644 --- a/Olivia.sln +++ b/Olivia.sln @@ -1,12 +1,14 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.28307.329 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.30011.22 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Olivia", "Olivia\Olivia.vcxproj", "{192BCB82-D8B4-4FB0-807A-7CC9B6EA623B}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OliviaTasks", "OliviaTasks\OliviaTasks.vcxproj", "{A8C66186-EDEF-4041-B7DD-B4FAFCC528EA}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "utiles", "..\utiles\utiles.vcxproj", "{AA58C828-7025-4A4C-868E-76B8902AF6BB}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -31,6 +33,14 @@ Global {A8C66186-EDEF-4041-B7DD-B4FAFCC528EA}.Release|Win32.Build.0 = Release|Win32 {A8C66186-EDEF-4041-B7DD-B4FAFCC528EA}.Release|x64.ActiveCfg = Release|x64 {A8C66186-EDEF-4041-B7DD-B4FAFCC528EA}.Release|x64.Build.0 = Release|x64 + {AA58C828-7025-4A4C-868E-76B8902AF6BB}.Debug|Win32.ActiveCfg = Debug|Win32 + {AA58C828-7025-4A4C-868E-76B8902AF6BB}.Debug|Win32.Build.0 = Debug|Win32 + {AA58C828-7025-4A4C-868E-76B8902AF6BB}.Debug|x64.ActiveCfg = Debug|x64 + {AA58C828-7025-4A4C-868E-76B8902AF6BB}.Debug|x64.Build.0 = Debug|x64 + {AA58C828-7025-4A4C-868E-76B8902AF6BB}.Release|Win32.ActiveCfg = Release|Win32 + {AA58C828-7025-4A4C-868E-76B8902AF6BB}.Release|Win32.Build.0 = Release|Win32 + {AA58C828-7025-4A4C-868E-76B8902AF6BB}.Release|x64.ActiveCfg = Release|x64 + {AA58C828-7025-4A4C-868E-76B8902AF6BB}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Olivia/Olivia.vcxproj b/Olivia/Olivia.vcxproj index 3c64386..79fd5a1 100644 --- a/Olivia/Olivia.vcxproj +++ b/Olivia/Olivia.vcxproj @@ -214,7 +214,8 @@ copy ..\lib\$(IntDir)sqlite3.lib $(OutDir) copy $(OutDir)$(TargetFileName) ..\bin\$(IntDir) -copy $(OutDir)Olivia.lib ..\lib\$(IntDir) +copy $(OutDir)Olivia.lib ..\lib\$(IntDir) +copy $(OutDir)$(TargetFileName) D:\Proyectos\Olivia\Instal2.0\bin\ @@ -333,7 +334,8 @@ copy ..\lib\$(IntDir)sqlite3.lib $(OutDir) copy $(OutDir)$(TargetFileName) ..\bin\$(IntDir) -copy $(OutDir)Olivia.lib ..\lib\$(IntDir) +copy $(OutDir)Olivia.lib ..\lib\$(IntDir) +copy $(OutDir)$(TargetFileName) D:\Proyectos\Olivia\Instal2.0\bin\ diff --git a/OliviaTasks/OliviaTasks.vcxproj b/OliviaTasks/OliviaTasks.vcxproj index e7d6c65..b1142b2 100644 --- a/OliviaTasks/OliviaTasks.vcxproj +++ b/OliviaTasks/OliviaTasks.vcxproj @@ -151,7 +151,8 @@ copy ..\Licencia\OliviaTasks.lic ..\bin\$(IntDir) copy $(OutDir)$(TargetFileName) ..\bin\$(IntDir) -copy ..\Licencia\OliviaTasks.lic ..\bin\$(IntDir) +copy ..\Licencia\OliviaTasks.lic ..\bin\$(IntDir) +copy $(OutDir)$(TargetFileName) D:\Proyectos\Olivia\Instal2.0\bin\ @@ -207,7 +208,8 @@ copy ..\Licencia\OliviaTasks.lic ..\bin\$(IntDir) copy $(OutDir)$(TargetFileName) ..\bin\$(IntDir) -copy ..\Licencia\OliviaTasks.lic ..\bin\$(IntDir) +copy ..\Licencia\OliviaTasks.lic ..\bin\$(IntDir) +copy $(OutDir)$(TargetFileName) D:\Proyectos\Olivia\Instal2.0\bin\ diff --git a/OliviaTasks/OliviaTasks.vcxproj.user b/OliviaTasks/OliviaTasks.vcxproj.user index fb55454..6a3aede 100644 --- a/OliviaTasks/OliviaTasks.vcxproj.user +++ b/OliviaTasks/OliviaTasks.vcxproj.user @@ -14,10 +14,13 @@ ..\bin\$(IntDir) WindowsLocalDebugger $(TargetPath) + /tipo:0 /ip:192.168.2.61 /port:19995 /tout:20 /path_temp:D:\Proyectos\Olivia\Instal2.0\temp\ /path_cfgeo:D:\Proyectos\Olivia\Instal2.0\cfg.ini /debug ..\bin\$(IntDir) WindowsLocalDebugger $(TargetPath) + + \ No newline at end of file diff --git a/bin/Debug/ClientLic.dll b/bin/Debug/ClientLic.dll deleted file mode 100644 index 80faa93..0000000 Binary files a/bin/Debug/ClientLic.dll and /dev/null differ diff --git a/bin/Debug/FileTransfer.dll b/bin/Debug/FileTransfer.dll deleted file mode 100644 index 72f6017..0000000 Binary files a/bin/Debug/FileTransfer.dll and /dev/null differ diff --git a/bin/Debug/Olivia.dll b/bin/Debug/Olivia.dll deleted file mode 100644 index 5a7e53f..0000000 Binary files a/bin/Debug/Olivia.dll and /dev/null differ diff --git a/bin/Debug/OliviaTasks.exe b/bin/Debug/OliviaTasks.exe deleted file mode 100644 index edad466..0000000 Binary files a/bin/Debug/OliviaTasks.exe and /dev/null differ diff --git a/bin/Debug/OliviaTasks.lic b/bin/Debug/OliviaTasks.lic deleted file mode 100644 index c7711a6..0000000 Binary files a/bin/Debug/OliviaTasks.lic and /dev/null differ diff --git a/bin/Debug/licUtiles.dll b/bin/Debug/licUtiles.dll deleted file mode 100644 index 205fd68..0000000 Binary files a/bin/Debug/licUtiles.dll and /dev/null differ diff --git a/bin/Debug/sqlite3.dll b/bin/Debug/sqlite3.dll deleted file mode 100644 index d5d1586..0000000 Binary files a/bin/Debug/sqlite3.dll and /dev/null differ diff --git a/bin/Debug/utiles.dll b/bin/Debug/utiles.dll deleted file mode 100644 index 2fd2d63..0000000 Binary files a/bin/Debug/utiles.dll and /dev/null differ diff --git a/bin/Release/ClientLic.dll b/bin/Release/ClientLic.dll deleted file mode 100644 index 8dd2acc..0000000 Binary files a/bin/Release/ClientLic.dll and /dev/null differ diff --git a/bin/Release/FileTransfer.dll b/bin/Release/FileTransfer.dll deleted file mode 100644 index 4ff39eb..0000000 Binary files a/bin/Release/FileTransfer.dll and /dev/null differ diff --git a/bin/Release/Olivia.dll b/bin/Release/Olivia.dll deleted file mode 100644 index c9c33af..0000000 Binary files a/bin/Release/Olivia.dll and /dev/null differ diff --git a/bin/Release/OliviaTasks.exe b/bin/Release/OliviaTasks.exe deleted file mode 100644 index 084b6a7..0000000 Binary files a/bin/Release/OliviaTasks.exe and /dev/null differ diff --git a/bin/Release/OliviaTasks.lic b/bin/Release/OliviaTasks.lic deleted file mode 100644 index c7711a6..0000000 Binary files a/bin/Release/OliviaTasks.lic and /dev/null differ diff --git a/bin/Release/licUtiles.dll b/bin/Release/licUtiles.dll deleted file mode 100644 index 77c2439..0000000 Binary files a/bin/Release/licUtiles.dll and /dev/null differ diff --git a/bin/Release/sqlite3.dll b/bin/Release/sqlite3.dll deleted file mode 100644 index d5d1586..0000000 Binary files a/bin/Release/sqlite3.dll and /dev/null differ diff --git a/bin/Release/utiles.dll b/bin/Release/utiles.dll deleted file mode 100644 index 2b895be..0000000 Binary files a/bin/Release/utiles.dll and /dev/null differ diff --git a/bin/x64/debug/ClientLic.dll b/bin/x64/debug/ClientLic.dll deleted file mode 100644 index 20aae47..0000000 Binary files a/bin/x64/debug/ClientLic.dll and /dev/null differ diff --git a/bin/x64/debug/FileTransfer.dll b/bin/x64/debug/FileTransfer.dll deleted file mode 100644 index df09019..0000000 Binary files a/bin/x64/debug/FileTransfer.dll and /dev/null differ diff --git a/bin/x64/debug/Olivia.dll b/bin/x64/debug/Olivia.dll deleted file mode 100644 index 6ce62d7..0000000 Binary files a/bin/x64/debug/Olivia.dll and /dev/null differ diff --git a/bin/x64/debug/OliviaTasks.exe b/bin/x64/debug/OliviaTasks.exe deleted file mode 100644 index 7b1d079..0000000 Binary files a/bin/x64/debug/OliviaTasks.exe and /dev/null differ diff --git a/bin/x64/debug/acceso.bin b/bin/x64/debug/acceso.bin deleted file mode 100644 index 0059e82..0000000 Binary files a/bin/x64/debug/acceso.bin and /dev/null differ diff --git a/bin/x64/debug/licUtiles.dll b/bin/x64/debug/licUtiles.dll deleted file mode 100644 index 5ec75fc..0000000 Binary files a/bin/x64/debug/licUtiles.dll and /dev/null differ diff --git a/bin/x64/debug/sqlite3.dll b/bin/x64/debug/sqlite3.dll deleted file mode 100644 index 6fda325..0000000 Binary files a/bin/x64/debug/sqlite3.dll and /dev/null differ diff --git a/bin/x64/debug/utiles.dll b/bin/x64/debug/utiles.dll deleted file mode 100644 index c167fdb..0000000 Binary files a/bin/x64/debug/utiles.dll and /dev/null differ diff --git a/bin/x64/release/ClientLic.dll b/bin/x64/release/ClientLic.dll deleted file mode 100644 index 41ceaf1..0000000 Binary files a/bin/x64/release/ClientLic.dll and /dev/null differ diff --git a/bin/x64/release/FileTransfer.dll b/bin/x64/release/FileTransfer.dll deleted file mode 100644 index 015e61a..0000000 Binary files a/bin/x64/release/FileTransfer.dll and /dev/null differ diff --git a/bin/x64/release/Olivia.dll b/bin/x64/release/Olivia.dll deleted file mode 100644 index 107272c..0000000 Binary files a/bin/x64/release/Olivia.dll and /dev/null differ diff --git a/bin/x64/release/OliviaTasks.exe b/bin/x64/release/OliviaTasks.exe deleted file mode 100644 index 302fbc0..0000000 Binary files a/bin/x64/release/OliviaTasks.exe and /dev/null differ diff --git a/bin/x64/release/OliviaTasks.lic b/bin/x64/release/OliviaTasks.lic deleted file mode 100644 index de9bf2d..0000000 Binary files a/bin/x64/release/OliviaTasks.lic and /dev/null differ diff --git a/bin/x64/release/licUtiles.dll b/bin/x64/release/licUtiles.dll deleted file mode 100644 index 5764ce0..0000000 Binary files a/bin/x64/release/licUtiles.dll and /dev/null differ diff --git a/bin/x64/release/sqlite3.dll b/bin/x64/release/sqlite3.dll deleted file mode 100644 index 6fda325..0000000 Binary files a/bin/x64/release/sqlite3.dll and /dev/null differ diff --git a/bin/x64/release/utiles.dll b/bin/x64/release/utiles.dll deleted file mode 100644 index 9345131..0000000 Binary files a/bin/x64/release/utiles.dll and /dev/null differ diff --git a/lib/Debug/ClientLic.lib b/lib/Debug/ClientLic.lib deleted file mode 100644 index cdf819b..0000000 Binary files a/lib/Debug/ClientLic.lib and /dev/null differ diff --git a/lib/Debug/FileTransfer.lib b/lib/Debug/FileTransfer.lib deleted file mode 100644 index fffeb93..0000000 Binary files a/lib/Debug/FileTransfer.lib and /dev/null differ diff --git a/lib/Debug/Olivia.lib b/lib/Debug/Olivia.lib deleted file mode 100644 index 1ac744a..0000000 Binary files a/lib/Debug/Olivia.lib and /dev/null differ diff --git a/lib/Debug/licUtiles.lib b/lib/Debug/licUtiles.lib deleted file mode 100644 index aa09b1e..0000000 Binary files a/lib/Debug/licUtiles.lib and /dev/null differ diff --git a/lib/Debug/sqlite3.lib b/lib/Debug/sqlite3.lib deleted file mode 100644 index ed40f91..0000000 Binary files a/lib/Debug/sqlite3.lib and /dev/null differ diff --git a/lib/Debug/utiles.lib b/lib/Debug/utiles.lib deleted file mode 100644 index 113cd8a..0000000 Binary files a/lib/Debug/utiles.lib and /dev/null differ diff --git a/lib/Release/ClientLic.lib b/lib/Release/ClientLic.lib deleted file mode 100644 index c08d66b..0000000 Binary files a/lib/Release/ClientLic.lib and /dev/null differ diff --git a/lib/Release/FileTransfer.lib b/lib/Release/FileTransfer.lib deleted file mode 100644 index 4b0e68d..0000000 Binary files a/lib/Release/FileTransfer.lib and /dev/null differ diff --git a/lib/Release/Olivia.lib b/lib/Release/Olivia.lib deleted file mode 100644 index 3f33953..0000000 Binary files a/lib/Release/Olivia.lib and /dev/null differ diff --git a/lib/Release/licUtiles.lib b/lib/Release/licUtiles.lib deleted file mode 100644 index 3394c33..0000000 Binary files a/lib/Release/licUtiles.lib and /dev/null differ diff --git a/lib/Release/sqlite3.lib b/lib/Release/sqlite3.lib deleted file mode 100644 index ed40f91..0000000 Binary files a/lib/Release/sqlite3.lib and /dev/null differ diff --git a/lib/Release/utiles.lib b/lib/Release/utiles.lib deleted file mode 100644 index b30f882..0000000 Binary files a/lib/Release/utiles.lib and /dev/null differ diff --git a/lib/x64/debug/ClientLic.lib b/lib/x64/debug/ClientLic.lib deleted file mode 100644 index 864dce9..0000000 Binary files a/lib/x64/debug/ClientLic.lib and /dev/null differ diff --git a/lib/x64/debug/FileTransfer.lib b/lib/x64/debug/FileTransfer.lib deleted file mode 100644 index 93997d0..0000000 Binary files a/lib/x64/debug/FileTransfer.lib and /dev/null differ diff --git a/lib/x64/debug/Olivia.lib b/lib/x64/debug/Olivia.lib deleted file mode 100644 index b0c24c3..0000000 Binary files a/lib/x64/debug/Olivia.lib and /dev/null differ diff --git a/lib/x64/debug/licUtiles.lib b/lib/x64/debug/licUtiles.lib deleted file mode 100644 index e5ec7f4..0000000 Binary files a/lib/x64/debug/licUtiles.lib and /dev/null differ diff --git a/lib/x64/debug/sqlite3.lib b/lib/x64/debug/sqlite3.lib deleted file mode 100644 index 727e29c..0000000 Binary files a/lib/x64/debug/sqlite3.lib and /dev/null differ diff --git a/lib/x64/debug/utiles.lib b/lib/x64/debug/utiles.lib deleted file mode 100644 index 7318d28..0000000 Binary files a/lib/x64/debug/utiles.lib and /dev/null differ diff --git a/lib/x64/release/ClientLic.lib b/lib/x64/release/ClientLic.lib deleted file mode 100644 index 9f6e3c4..0000000 Binary files a/lib/x64/release/ClientLic.lib and /dev/null differ diff --git a/lib/x64/release/FileTransfer.lib b/lib/x64/release/FileTransfer.lib deleted file mode 100644 index 5e7e754..0000000 Binary files a/lib/x64/release/FileTransfer.lib and /dev/null differ diff --git a/lib/x64/release/Olivia.lib b/lib/x64/release/Olivia.lib deleted file mode 100644 index b3e3578..0000000 Binary files a/lib/x64/release/Olivia.lib and /dev/null differ diff --git a/lib/x64/release/licUtiles.lib b/lib/x64/release/licUtiles.lib deleted file mode 100644 index 3d2c55b..0000000 Binary files a/lib/x64/release/licUtiles.lib and /dev/null differ diff --git a/lib/x64/release/sqlite3.lib b/lib/x64/release/sqlite3.lib deleted file mode 100644 index 727e29c..0000000 Binary files a/lib/x64/release/sqlite3.lib and /dev/null differ diff --git a/lib/x64/release/utiles.lib b/lib/x64/release/utiles.lib deleted file mode 100644 index 1bf6ebd..0000000 Binary files a/lib/x64/release/utiles.lib and /dev/null differ