paths relative to SolutionDir
authorVolker Birk <vb@pep-project.org>
Wed, 07 Dec 2016 19:12:18 +0100
changeset 146565762eca1dd1
parent 1461 ae8ce038b682
child 1466 ed017d0dd58f
paths relative to SolutionDir
asn.1/pEpEngineASN1/pEpEngineASN1.vcxproj
build-windows/pEpEngine.vcxproj
src/message_api.c
     1.1 --- a/asn.1/pEpEngineASN1/pEpEngineASN1.vcxproj	Tue Dec 06 14:55:21 2016 +0100
     1.2 +++ b/asn.1/pEpEngineASN1/pEpEngineASN1.vcxproj	Wed Dec 07 19:12:18 2016 +0100
     1.3 @@ -62,7 +62,7 @@
     1.4        <GenerateDebugInformation>true</GenerateDebugInformation>
     1.5      </Link>
     1.6      <PreBuildEvent>
     1.7 -      <Command>cd "$(ProjectDir).." &amp;&amp; "%ASN1C%\bin\asn1c" -S "%ASN1C%\share\asn1c" -gen-PER -fincludes-quoted -fcompound-names -pdu=PEP.Message pEp.asn1 devicegroup.asn1 protocols.asn1
     1.8 +      <Command>cd "$(ProjectDir).." &amp;&amp; "$(SolutionDir)Tools\asn1c\bin\asn1c" -S "$(SolutionDir)Tools\asn1c\share\asn1c" -gen-PER -fincludes-quoted -fcompound-names -pdu=PEP.Message pEp.asn1 devicegroup.asn1 protocols.asn1
     1.9  cd "$(ProjectDir).." &amp;&amp; del converter-sample.c
    1.10  </Command>
    1.11      </PreBuildEvent>
    1.12 @@ -99,7 +99,7 @@
    1.13        <OptimizeReferences>true</OptimizeReferences>
    1.14      </Link>
    1.15      <PreBuildEvent>
    1.16 -      <Command>cd "$(ProjectDir).." &amp;&amp; "%ASN1C%\bin\asn1c" -S "%ASN1C%\share\asn1c" -gen-PER -fincludes-quoted -fcompound-names -pdu=PEP.Message pEp.asn1 devicegroup.asn1 protocols.asn1
    1.17 +      <Command>cd "$(ProjectDir).." &amp;&amp; "$(SolutionDir)Tools\asn1c\bin\asn1c" -S "$(SolutionDir)Tools\asn1c\share\asn1c" -gen-PER -fincludes-quoted -fcompound-names -pdu=PEP.Message pEp.asn1 devicegroup.asn1 protocols.asn1
    1.18  cd "$(ProjectDir).." &amp;&amp; del converter-sample.c
    1.19  </Command>
    1.20        <Message>compiling ASN.1 description</Message>
     2.1 --- a/build-windows/pEpEngine.vcxproj	Tue Dec 06 14:55:21 2016 +0100
     2.2 +++ b/build-windows/pEpEngine.vcxproj	Wed Dec 07 19:12:18 2016 +0100
     2.3 @@ -59,7 +59,7 @@
     2.4        <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;PEPENGINE_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     2.5        <SDLCheck>true</SDLCheck>
     2.6        <EnablePREfast>false</EnablePREfast>
     2.7 -      <AdditionalIncludeDirectories>%ASN1C%\share\asn1c;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     2.8 +      <AdditionalIncludeDirectories>$(SolutionDir)Tools\asn1c\share\asn1c;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     2.9        <CompileAs>Default</CompileAs>
    2.10      </ClCompile>
    2.11      <Link>
    2.12 @@ -83,7 +83,7 @@
    2.13        <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PEPENGINE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    2.14        <SDLCheck>false</SDLCheck>
    2.15        <TreatWarningAsError>false</TreatWarningAsError>
    2.16 -      <AdditionalIncludeDirectories>%ASN1C%\share\asn1c;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    2.17 +      <AdditionalIncludeDirectories>$(SolutionDir)Tools\asn1c\share\asn1c;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    2.18        <CompileAs>Default</CompileAs>
    2.19        <MultiProcessorCompilation>true</MultiProcessorCompilation>
    2.20        <ControlFlowGuard>Guard</ControlFlowGuard>
     3.1 --- a/src/message_api.c	Tue Dec 06 14:55:21 2016 +0100
     3.2 +++ b/src/message_api.c	Wed Dec 07 19:12:18 2016 +0100
     3.3 @@ -2042,6 +2042,7 @@
     3.4  
     3.5      // this should never happen
     3.6      assert(false);
     3.7 +	return PEP_rating_undefined;
     3.8  }
     3.9  
    3.10  static bool _is_valid_hex(const char* hexstr) {