diff --git a/build-windows/generate_code.cmd b/build-windows/generate_code.cmd index 5010bd57..004ce809 100644 --- a/build-windows/generate_code.cmd +++ b/build-windows/generate_code.cmd @@ -1,11 +1,13 @@ pushd . -cd %1\sync +set pwd=%cd% +cd %pwd%\sync if not exist generated mkdir generated py "%YML_PATH%\yml2proc" -E utf-8 -y gen_actions.ysl2 sync.fsm py "%YML_PATH%\yml2proc" -E utf-8 -y gen_statemachine.ysl2 sync.fsm py "%YML_PATH%\yml2proc" -E utf-8 -y gen_codec.ysl2 sync.fsm +py "%YML_PATH%\yml2proc" -E utf-8 -y gen_codec.ysl2 distribution.fsm py "%YML_PATH%\yml2proc" -E utf-8 -y gen_messages.ysl2 sync.fsm py "%YML_PATH%\yml2proc" -E utf-8 -y gen_message_func.ysl2 sync.fsm @@ -13,16 +15,17 @@ xcopy /y generated\*.asn1 ..\asn.1\ xcopy /y generated\*.c ..\src\ xcopy /y generated\*.h ..\src\ -cd %1\asn.1 +cd %pwd%\asn.1 -del *.h* -del *.c* +del *.h +del *.c ..\..\Tools\asn1c\bin\asn1c -S ../../Tools/asn1c/share/asn1c -gen-PER -fincludes-quoted -fcompound-names -pdu=auto pEp.asn1 keysync.asn1 sync.asn1 +..\..\Tools\asn1c\bin\asn1c -S ../../Tools/asn1c/share/asn1c -gen-PER -fincludes-quoted -fcompound-names -pdu=auto pEp.asn1 keyreset.asn1 distribution.asn1 del *-sample.c -cd %1\.. +cd %pwd%\.. if not exist pEp mklink /d pEp pEpEngine\src popd diff --git a/build-windows/libpEpasn1/libpEpasn1.vcxproj b/build-windows/libpEpasn1/libpEpasn1.vcxproj index 4b40f2ea..e827844d 100644 --- a/build-windows/libpEpasn1/libpEpasn1.vcxproj +++ b/build-windows/libpEpasn1/libpEpasn1.vcxproj @@ -61,7 +61,7 @@ Windows - "$(ProjectDir)..\generate_code.cmd" "$(ProjectDir)..\.." + cd "$(ProjectDir)..\.." && "$(ProjectDir)..\generate_code.cmd" Generating Code for pEp Sync @@ -95,6 +95,9 @@ + + + \ No newline at end of file diff --git a/build-windows/libpEpasn1/libpEpasn1.vcxproj.filters b/build-windows/libpEpasn1/libpEpasn1.vcxproj.filters index 19b1114a..bb679cc4 100644 --- a/build-windows/libpEpasn1/libpEpasn1.vcxproj.filters +++ b/build-windows/libpEpasn1/libpEpasn1.vcxproj.filters @@ -516,6 +516,186 @@ Header Files + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + @@ -989,5 +1169,179 @@ Source Files + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + \ No newline at end of file diff --git a/src/message_api.c b/src/message_api.c index a115dd3f..febca661 100644 --- a/src/message_api.c +++ b/src/message_api.c @@ -1420,7 +1420,7 @@ static bool is_key(const bloblist_t *bl) // } static bool compare_first_n_bytes(const char* first, const char* second, size_t n) { - int i; + size_t i; for (i = 0; i < n; i++) { char num1 = *first; char num2 = *second;