Borrados archivos en rama para ignorarlos

Gerardo/estandarizacion
Elena 2022-11-08 21:26:29 +01:00
parent b8d95ca6c9
commit 5cca62f2f6
60 changed files with 23 additions and 6 deletions

View File

@ -1,12 +1,14 @@
 
Microsoft Visual Studio Solution File, Format Version 12.00 Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15 # Visual Studio Version 16
VisualStudioVersion = 15.0.28307.329 VisualStudioVersion = 16.0.30011.22
MinimumVisualStudioVersion = 10.0.40219.1 MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Olivia", "Olivia\Olivia.vcxproj", "{192BCB82-D8B4-4FB0-807A-7CC9B6EA623B}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Olivia", "Olivia\Olivia.vcxproj", "{192BCB82-D8B4-4FB0-807A-7CC9B6EA623B}"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OliviaTasks", "OliviaTasks\OliviaTasks.vcxproj", "{A8C66186-EDEF-4041-B7DD-B4FAFCC528EA}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OliviaTasks", "OliviaTasks\OliviaTasks.vcxproj", "{A8C66186-EDEF-4041-B7DD-B4FAFCC528EA}"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "utiles", "..\utiles\utiles.vcxproj", "{AA58C828-7025-4A4C-868E-76B8902AF6BB}"
EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32 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|Win32.Build.0 = Release|Win32
{A8C66186-EDEF-4041-B7DD-B4FAFCC528EA}.Release|x64.ActiveCfg = Release|x64 {A8C66186-EDEF-4041-B7DD-B4FAFCC528EA}.Release|x64.ActiveCfg = Release|x64
{A8C66186-EDEF-4041-B7DD-B4FAFCC528EA}.Release|x64.Build.0 = 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 EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE

View File

@ -214,7 +214,8 @@ copy ..\lib\$(IntDir)sqlite3.lib $(OutDir)</Command>
</Link> </Link>
<PostBuildEvent> <PostBuildEvent>
<Command>copy $(OutDir)$(TargetFileName) ..\bin\$(IntDir) <Command>copy $(OutDir)$(TargetFileName) ..\bin\$(IntDir)
copy $(OutDir)Olivia.lib ..\lib\$(IntDir)</Command> copy $(OutDir)Olivia.lib ..\lib\$(IntDir)
copy $(OutDir)$(TargetFileName) D:\Proyectos\Olivia\Instal2.0\bin\</Command>
</PostBuildEvent> </PostBuildEvent>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@ -333,7 +334,8 @@ copy ..\lib\$(IntDir)sqlite3.lib $(OutDir)</Command>
</Link> </Link>
<PostBuildEvent> <PostBuildEvent>
<Command>copy $(OutDir)$(TargetFileName) ..\bin\$(IntDir) <Command>copy $(OutDir)$(TargetFileName) ..\bin\$(IntDir)
copy $(OutDir)Olivia.lib ..\lib\$(IntDir)</Command> copy $(OutDir)Olivia.lib ..\lib\$(IntDir)
copy $(OutDir)$(TargetFileName) D:\Proyectos\Olivia\Instal2.0\bin\</Command>
</PostBuildEvent> </PostBuildEvent>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>

View File

@ -151,7 +151,8 @@ copy ..\Licencia\OliviaTasks.lic ..\bin\$(IntDir)</Command>
</Link> </Link>
<PostBuildEvent> <PostBuildEvent>
<Command>copy $(OutDir)$(TargetFileName) ..\bin\$(IntDir) <Command>copy $(OutDir)$(TargetFileName) ..\bin\$(IntDir)
copy ..\Licencia\OliviaTasks.lic ..\bin\$(IntDir)</Command> copy ..\Licencia\OliviaTasks.lic ..\bin\$(IntDir)
copy $(OutDir)$(TargetFileName) D:\Proyectos\Olivia\Instal2.0\bin\</Command>
</PostBuildEvent> </PostBuildEvent>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@ -207,7 +208,8 @@ copy ..\Licencia\OliviaTasks.lic ..\bin\$(IntDir)</Command>
</Link> </Link>
<PostBuildEvent> <PostBuildEvent>
<Command>copy $(OutDir)$(TargetFileName) ..\bin\$(IntDir) <Command>copy $(OutDir)$(TargetFileName) ..\bin\$(IntDir)
copy ..\Licencia\OliviaTasks.lic ..\bin\$(IntDir)</Command> copy ..\Licencia\OliviaTasks.lic ..\bin\$(IntDir)
copy $(OutDir)$(TargetFileName) D:\Proyectos\Olivia\Instal2.0\bin\</Command>
</PostBuildEvent> </PostBuildEvent>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>

View File

@ -14,10 +14,13 @@
<LocalDebuggerWorkingDirectory>..\bin\$(IntDir)</LocalDebuggerWorkingDirectory> <LocalDebuggerWorkingDirectory>..\bin\$(IntDir)</LocalDebuggerWorkingDirectory>
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor> <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
<LocalDebuggerCommand>$(TargetPath)</LocalDebuggerCommand> <LocalDebuggerCommand>$(TargetPath)</LocalDebuggerCommand>
<LocalDebuggerCommandArguments>/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</LocalDebuggerCommandArguments>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<LocalDebuggerWorkingDirectory>..\bin\$(IntDir)</LocalDebuggerWorkingDirectory> <LocalDebuggerWorkingDirectory>..\bin\$(IntDir)</LocalDebuggerWorkingDirectory>
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor> <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
<LocalDebuggerCommand>$(TargetPath)</LocalDebuggerCommand> <LocalDebuggerCommand>$(TargetPath)</LocalDebuggerCommand>
<LocalDebuggerCommandArguments>
</LocalDebuggerCommandArguments>
</PropertyGroup> </PropertyGroup>
</Project> </Project>

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.