updated jni build for different platforms

This commit is contained in:
2017-05-18 19:51:19 +08:00
parent 271ba59b93
commit d839891bbf
2 changed files with 13 additions and 3 deletions

View File

@@ -3,7 +3,13 @@ cmake_minimum_required(VERSION 3.2)
########################################################
project(irda_decoder)
# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
add_definitions(-DBOARD_PC)
add_definitions(-DBOARD_PC -DBOARD_PC_JNI)
IF (CMAKE_SYSTEM_NAME MATCHES "Linux")
add_definitions(-DPLATFORM_LINUX)
ELSEIF (CMAKE_SYSTEM_NAME MATCHES "Windows")
add_definitions(-DPLATFORM_WIN32)
ENDIF()
set(SOURCE_FILES_EXECUTABLE
include/ir_defs.h
@@ -77,6 +83,6 @@ set(SOURCE_FILES_JNI_SHARED_LIB
src/ir_decode.c
include/ir_decode.h)
# add_executable(irda_decoder ${SOURCE_FILES_EXECUTABLE})
add_executable(irda_decoder ${SOURCE_FILES_EXECUTABLE})
# add_library(irda_decoder SHARED ${SOURCE_FILES_SHARED_LIB})
add_library(irda_decoder SHARED ${SOURCE_FILES_JNI_SHARED_LIB})
# add_library(irda_decoder SHARED ${SOURCE_FILES_JNI_SHARED_LIB})

View File

@@ -42,7 +42,11 @@
/* jni_md.h contains the machine-dependent typedefs for jbyte, jint
and jlong */
#if defined PLATFORM_WIN32
#include "./win32/jni_md.h"
#elif defined PLATFORM_LINUX
#include "./linux/jni_md.h"
#endif
#ifdef __cplusplus
extern "C" {