Browse Source

paths relative to SolutionDir

doc_update_sequoia
Volker Birk 6 years ago
parent
commit
c9e9046e21
3 changed files with 5 additions and 4 deletions
  1. +2
    -2
      asn.1/pEpEngineASN1/pEpEngineASN1.vcxproj
  2. +2
    -2
      build-windows/pEpEngine.vcxproj
  3. +1
    -0
      src/message_api.c

+ 2
- 2
asn.1/pEpEngineASN1/pEpEngineASN1.vcxproj View File

@ -62,7 +62,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
<PreBuildEvent>
<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
<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
cd "$(ProjectDir).." &amp;&amp; del converter-sample.c
</Command>
</PreBuildEvent>
@ -99,7 +99,7 @@ cd "$(ProjectDir).." &amp;&amp; del converter-sample.c
<OptimizeReferences>true</OptimizeReferences>
</Link>
<PreBuildEvent>
<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
<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
cd "$(ProjectDir).." &amp;&amp; del converter-sample.c
</Command>
<Message>compiling ASN.1 description</Message>


+ 2
- 2
build-windows/pEpEngine.vcxproj View File

@ -59,7 +59,7 @@
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;PEPENGINE_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<SDLCheck>true</SDLCheck>
<EnablePREfast>false</EnablePREfast>
<AdditionalIncludeDirectories>%ASN1C%\share\asn1c;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(SolutionDir)Tools\asn1c\share\asn1c;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<CompileAs>Default</CompileAs>
</ClCompile>
<Link>
@ -83,7 +83,7 @@ cd "$(ProjectDir)..\sync" &amp;&amp; python "%YML_PATH%\yml2proc" -E utf-8 -ygen
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PEPENGINE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<SDLCheck>false</SDLCheck>
<TreatWarningAsError>false</TreatWarningAsError>
<AdditionalIncludeDirectories>%ASN1C%\share\asn1c;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(SolutionDir)Tools\asn1c\share\asn1c;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<CompileAs>Default</CompileAs>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<ControlFlowGuard>Guard</ControlFlowGuard>


+ 1
- 0
src/message_api.c View File

@ -2042,6 +2042,7 @@ DYNAMIC_API PEP_color color_from_rating(PEP_rating rating)
// this should never happen
assert(false);
return PEP_rating_undefined;
}
static bool _is_valid_hex(const char* hexstr) {


Loading…
Cancel
Save