From 703cceb557e0eb5dd75f34dcbd24d8013646d84e Mon Sep 17 00:00:00 2001 From: strawmanbobi Date: Sun, 9 Sep 2018 21:15:48 +0800 Subject: [PATCH] fixed irext core code for windows --- src/ir_decoder/ir_decoder.sln | 25 +++--- src/ir_decoder/ir_decoder.vcxproj | 57 +++++-------- src/ir_decoder/ir_decoder.vcxproj.filters | 98 ++++++++++++++++++++++ src/ir_decoder/src/ir_ac_binary_parse.c | 6 +- src/ir_decoder/stdafx.c | Bin 19 -> 322 bytes src/ir_decoder/stdafx.h | Bin 88 -> 498 bytes src/ir_decoder/targetver.h | Bin 37 -> 370 bytes 7 files changed, 136 insertions(+), 50 deletions(-) create mode 100644 src/ir_decoder/ir_decoder.vcxproj.filters diff --git a/src/ir_decoder/ir_decoder.sln b/src/ir_decoder/ir_decoder.sln index b8d61a3..852c6be 100644 --- a/src/ir_decoder/ir_decoder.sln +++ b/src/ir_decoder/ir_decoder.sln @@ -1,9 +1,9 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.23107.0 +# Visual Studio 15 +VisualStudioVersion = 15.0.27130.2027 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ir_decoder", "ir_decoder.vcxproj", "{8ACC347D-023C-4939-B371-C193EEA210F8}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ir_decoder", "ir_decoder.vcxproj", "{2198F1AF-3683-4197-9C6C-82651745A397}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -13,16 +13,19 @@ Global Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {8ACC347D-023C-4939-B371-C193EEA210F8}.Debug|x64.ActiveCfg = Debug|x64 - {8ACC347D-023C-4939-B371-C193EEA210F8}.Debug|x64.Build.0 = Debug|x64 - {8ACC347D-023C-4939-B371-C193EEA210F8}.Debug|x86.ActiveCfg = Debug|Win32 - {8ACC347D-023C-4939-B371-C193EEA210F8}.Debug|x86.Build.0 = Debug|Win32 - {8ACC347D-023C-4939-B371-C193EEA210F8}.Release|x64.ActiveCfg = Release|x64 - {8ACC347D-023C-4939-B371-C193EEA210F8}.Release|x64.Build.0 = Release|x64 - {8ACC347D-023C-4939-B371-C193EEA210F8}.Release|x86.ActiveCfg = Release|Win32 - {8ACC347D-023C-4939-B371-C193EEA210F8}.Release|x86.Build.0 = Release|Win32 + {2198F1AF-3683-4197-9C6C-82651745A397}.Debug|x64.ActiveCfg = Debug|x64 + {2198F1AF-3683-4197-9C6C-82651745A397}.Debug|x64.Build.0 = Debug|x64 + {2198F1AF-3683-4197-9C6C-82651745A397}.Debug|x86.ActiveCfg = Debug|Win32 + {2198F1AF-3683-4197-9C6C-82651745A397}.Debug|x86.Build.0 = Debug|Win32 + {2198F1AF-3683-4197-9C6C-82651745A397}.Release|x64.ActiveCfg = Release|x64 + {2198F1AF-3683-4197-9C6C-82651745A397}.Release|x64.Build.0 = Release|x64 + {2198F1AF-3683-4197-9C6C-82651745A397}.Release|x86.ActiveCfg = Release|Win32 + {2198F1AF-3683-4197-9C6C-82651745A397}.Release|x86.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {82870200-233C-476D-B5A8-B17FB4FECE50} + EndGlobalSection EndGlobal diff --git a/src/ir_decoder/ir_decoder.vcxproj b/src/ir_decoder/ir_decoder.vcxproj index 20f9dd1..f0b02a7 100644 --- a/src/ir_decoder/ir_decoder.vcxproj +++ b/src/ir_decoder/ir_decoder.vcxproj @@ -1,5 +1,5 @@ - - + + Debug @@ -19,16 +19,17 @@ - {8ACC347D-023C-4939-B371-C193EEA210F8} + 15.0 + {2198F1AF-3683-4197-9C6C-82651745A397} Win32Proj - ir_decoder + irdecoder 10.0.16299.0 DynamicLibrary true - v141_xp + v141 Unicode @@ -41,13 +42,13 @@ DynamicLibrary true - v140 + v141 Unicode DynamicLibrary false - v140_xp + v141 true Unicode @@ -83,16 +84,16 @@ - NotUsing + Use Level3 Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;IR_DECODER_EXPORTS;BOARD_PC;%(PreprocessorDefinitions) true + WIN32;_DEBUG;IRDECODER_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + true Windows true - .\ir_decode.def @@ -100,8 +101,9 @@ Use Level3 Disabled - _DEBUG;_WINDOWS;_USRDLL;IR_DECODER_EXPORTS;%(PreprocessorDefinitions) true + _DEBUG;IRDECODER_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + true Windows @@ -110,42 +112,40 @@ + Use Level3 - NotUsing MaxSpeed true true - WIN32;NDEBUG;_WINDOWS;_USRDLL;IR_DECODER_EXPORTS;%(PreprocessorDefinitions) true + WIN32;NDEBUG;IRDECODER_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + true Windows - true true true - .\ir_decode.def + true + Use Level3 - NotUsing MaxSpeed true true - NDEBUG;_WINDOWS;_USRDLL;IR_DECODER_EXPORTS;%(PreprocessorDefinitions) true + NDEBUG;IRDECODER_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + true Windows - true true true + true - - - @@ -162,20 +162,6 @@ - - false - - - false - - - false - - - false - - - @@ -184,7 +170,6 @@ - diff --git a/src/ir_decoder/ir_decoder.vcxproj.filters b/src/ir_decoder/ir_decoder.vcxproj.filters new file mode 100644 index 0000000..3c9a3a5 --- /dev/null +++ b/src/ir_decoder/ir_decoder.vcxproj.filters @@ -0,0 +1,98 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hh;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + 头文件 + + + 头文件 + + + 头文件 + + + 头文件 + + + 头文件 + + + 头文件 + + + 头文件 + + + 头文件 + + + 头文件 + + + 头文件 + + + 头文件 + + + 头文件 + + + 头文件 + + + + + 源文件 + + + 源文件 + + + 源文件 + + + 源文件 + + + 源文件 + + + 源文件 + + + 源文件 + + + 源文件 + + + 源文件 + + + 源文件 + + + 源文件 + + + + + 源文件 + + + \ No newline at end of file diff --git a/src/ir_decoder/src/ir_ac_binary_parse.c b/src/ir_decoder/src/ir_ac_binary_parse.c index df8353c..d154f54 100644 --- a/src/ir_decoder/src/ir_ac_binary_parse.c +++ b/src/ir_decoder/src/ir_ac_binary_parse.c @@ -64,9 +64,9 @@ INT8 binary_parse_offset() UINT16 offset = *(phead + i); tags[i].offset = (offset >> 8) | (offset << 8); #elif defined BOARD_ESP8266 - UINT16 tmp_a = *(phead + i * 2); - UINT16 tmp_b = *(phead + i * 2 + 1); - tags[i].offset = tmp_b << 8 | tmp_a; + UINT16 tmp_a = *(phead + i * 2); + UINT16 tmp_b = *(phead + i * 2 + 1); + tags[i].offset = tmp_b << 8 | tmp_a; #else tags[i].offset = *(phead + i); #endif diff --git a/src/ir_decoder/stdafx.c b/src/ir_decoder/stdafx.c index 1577c4e3bcb4044fc1878341fd4c5dc22157400e..d9de0699750455e539655edbed9db156eba1abc0 100644 GIT binary patch literal 322 zcmezWPoF`bL4l!|p@boYA(0`Cp@Kn=A(^272o)HtfcRA~Yw(*S_KahJtijqL?Wy1V zTFNHmfoNU^E}&kJ?o5UvhIpXxkZ&}?6&QjULV$cn1~-NXpesFqqPl*f@fxMS{X+d6k{G79l(|e>5M&Yw@*~fG Wm}_|&c>VO#G{RG|LE;b{AUObL$w^@V literal 19 acmY$+%uCKGO-WTyDlSP$Osmk#Pyzr#(FTkF diff --git a/src/ir_decoder/stdafx.h b/src/ir_decoder/stdafx.h index d122c0b9572bca2dab16e12d74f8f0f58bb635ea..ac16b94d9f32230a34310899a016242b62d1ee64 100644 GIT binary patch literal 498 zcmezWPoF`bL4l!|p@boYA(0`Cp@Kn=ApICT(OVUp}UuO|l@2^qn=FjVA5%(p{GPR`)p`x;AR&<|V<&1Y_2oqqkAR2^~ z844JRfG$X9$OV!L4EYRs49N_sU^$3Rq^Ngy** zfUYbDhMfX~Nu;jdq~w%ojp>3hpm1m@bLpL#3iBg2^`P(sg)w%&*#ON&wgD6;c5r`z v^dQU*Ven^g0b-D88sRC~ERmw|8l~J-{c#M_8#`Od$^x(XnM8u@1L*+(y@zH0 literal 88 zcmY!`C`wGvO;pIwOHSqDQqIgv&M8evRZuEPEJ{x;DN8NV%TNM}r=+H3=A|lxd-@q0 f#rwEA`o%l?xy1Vd8AzIJ$}{s)^2>|$GVHhj>#rN| diff --git a/src/ir_decoder/targetver.h b/src/ir_decoder/targetver.h index 05ba7d4ce68d2cd9928ce30b2e78c97dce617972..e2da66c055b4ed740ac1cdda9493502afe5573b6 100644 GIT binary patch literal 370 zcmezWPnn^Bp@<=oA)O%?NGdSoGvqNOGo&)`GH`*hK7&3`lr{KGk^)08gA0Q<5QE4t zpqe5EJ%$XREL+U1XivZQ!5XD4Wen*zW_c9pq_>nQFoZK?0!>Q+npw_J3{+Pf_aT_c z0M+EC$T{haomPHN{d|LP>5(rLNSYF-QOaG_AIJ0mdpE>25Yr)ULb!(Ke_0$`49E_M z%h_TS7~+90@nrC0FlI1aCia$sR&Y~ literal 37 scmY!`C`wGvO;pIwOHSqDQqIgv&M8evRj>(m@pf_X4ofZ4%dq1D0Oh?4m;e9(