merging sync
authorVolker Birk <vb@pep.foundation>
Wed, 24 Oct 2018 15:25:21 +0200
branchsync
changeset 3101b5ce2e8e12c8
parent 3100 1bd0c12ba841
parent 3099 67f66e9a47fc
child 3102 50a03176b73f
merging
     1.1 --- a/build-windows/generate_code.cmd	Wed Oct 24 15:25:01 2018 +0200
     1.2 +++ b/build-windows/generate_code.cmd	Wed Oct 24 15:25:21 2018 +0200
     1.3 @@ -1,11 +1,11 @@
     1.4  pushd .
     1.5  cd %1\sync
     1.6  
     1.7 -python %YML_PATH%\yml2proc -E utf-8 -y gen_actions.ysl2 sync.fsm
     1.8 -python %YML_PATH%\yml2proc -E utf-8 -y gen_statemachine.ysl2 sync.fsm
     1.9 -python %YML_PATH%\yml2proc -E utf-8 -y gen_codec.ysl2 sync.fsm
    1.10 -python %YML_PATH%\yml2proc -E utf-8 -y gen_messages.ysl2 sync.fsm
    1.11 -python %YML_PATH%\yml2proc -E utf-8 -y gen_message_func.ysl2 sync.fsm
    1.12 +python "%YML_PATH%\yml2proc" -E utf-8 -y gen_actions.ysl2 sync.fsm
    1.13 +python "%YML_PATH%\yml2proc" -E utf-8 -y gen_statemachine.ysl2 sync.fsm
    1.14 +python "%YML_PATH%\yml2proc" -E utf-8 -y gen_codec.ysl2 sync.fsm
    1.15 +python "%YML_PATH%\yml2proc" -E utf-8 -y gen_messages.ysl2 sync.fsm
    1.16 +python "%YML_PATH%\yml2proc" -E utf-8 -y gen_message_func.ysl2 sync.fsm
    1.17  
    1.18  xcopy /y generated\*.asn1 ..\asn.1\
    1.19  xcopy /y generated\*.c ..\src\
     2.1 --- a/build-windows/libpEpasn1/libpEpasn1.vcxproj	Wed Oct 24 15:25:01 2018 +0200
     2.2 +++ b/build-windows/libpEpasn1/libpEpasn1.vcxproj	Wed Oct 24 15:25:21 2018 +0200
     2.3 @@ -70,10 +70,10 @@
     2.4    </ImportGroup>
     2.5    <PropertyGroup Label="UserMacros" />
     2.6    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     2.7 -    <IncludePath>C:\Users\vb\Documents\Visual Studio 2015\Projects\pEp_for_Outlook_Solution\pEpEngine\asn.1;$(IncludePath)</IncludePath>
     2.8 +    <IncludePath>$(ProjectDir)..\..\asn.1;$(IncludePath)</IncludePath>
     2.9    </PropertyGroup>
    2.10    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    2.11 -    <IncludePath>C:\Users\vb\Documents\Visual Studio 2015\Projects\pEp_for_Outlook_Solution\pEpEngine\asn.1;$(IncludePath)</IncludePath>
    2.12 +    <IncludePath>$(ProjectDir)..\..\asn.1;$(IncludePath)</IncludePath>
    2.13    </PropertyGroup>
    2.14    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    2.15      <ClCompile>