From 90cecb0e1c225284c57c64c99d6627ba5fb97846 Mon Sep 17 00:00:00 2001 From: strawmanbobi Date: Thu, 18 May 2017 19:26:18 +0800 Subject: [PATCH] distinguished jni build with build macro --- src/ir_decoder/jni/ir_decode_jni.c | 4 +--- src/ir_decoder/jni/ir_decode_jni.h | 4 ++++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/ir_decoder/jni/ir_decode_jni.c b/src/ir_decoder/jni/ir_decode_jni.c index b6a5635..d253424 100644 --- a/src/ir_decoder/jni/ir_decode_jni.c +++ b/src/ir_decoder/jni/ir_decode_jni.c @@ -8,12 +8,10 @@ Description: This file links to java layer for Android application Revision log: * 2016-03-21: created by strawmanbobi **************************************************************************************************/ -// #include #include #include #include -#include "./include/jni.h" #include "ir_decode_jni.h" #include "../include/ir_defs.h" #include "../include/ir_decode.h" @@ -82,7 +80,7 @@ JNIEXPORT jintArray JNICALL Java_net_irext_decodesdk_IRDecode_irDecode jfieldID ac_wind_speed_fid = (*env)->GetFieldID(env, n_ac_status, "acWindSpeed", "I"); jint i_ac_wind_speed = (*env)->GetIntField(env, jni_ac_status, ac_wind_speed_fid); - + ac_status.acDisplay = 0; ac_status.acSleep = 0; ac_status.acTimer = 0; diff --git a/src/ir_decoder/jni/ir_decode_jni.h b/src/ir_decoder/jni/ir_decode_jni.h index b0ba2bd..81458dc 100644 --- a/src/ir_decoder/jni/ir_decode_jni.h +++ b/src/ir_decoder/jni/ir_decode_jni.h @@ -1,5 +1,9 @@ /* DO NOT EDIT THIS FILE - it is machine generated */ +#if defined BOARD_ANDROID +#include +#elif (defined BOARD_PC) && (defined BOARD_PC_JNI) #include "./include/jni.h" +#endif /* Header for class net_irext_decodesdk_IRDecode */ #ifndef _Included_net_irext_decodesdk_IRDecode