Skip to content

Commit

Permalink
Merge pull request #4 from leandroal/master
Browse files Browse the repository at this point in the history
Fixing undefined reference to 'isnan' '__isinf' for Android NDK 11
  • Loading branch information
stephenwspann authored Aug 23, 2016
2 parents 83315a7 + 3a5eb98 commit 4d016c9
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 3 deletions.
5 changes: 4 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,7 @@ android: GypAndroid.mk
@echo "Apks produced at:"
@python deps/djinni/example/glob.py ./ '*.apk'

sqlite: ./build_ios/libtodoapp.xcodeproj
sqlite: ./build_ios/libtodoapp.xcodeproj

clean:
rm -rf ./build_ios ./generated-src .*~ src/.*~
2 changes: 1 addition & 1 deletion android_project/TodoApp/app/jni/Application.mk
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

APP_ABI := all
APP_OPTIM := release
APP_PLATFORM := android-8
APP_PLATFORM := android-9
# GCC 4.9 Toolchain
NDK_TOOLCHAIN_VERSION = 4.9
# GNU libc++ is the only Android STL which supports C++11 features
Expand Down
3 changes: 2 additions & 1 deletion generated-src/cpp/todo_list.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,15 @@

#pragma once

#include "todo.hpp"
#include <cstdint>
#include <memory>
#include <string>
#include <vector>

namespace todolist {

struct Todo;

class TodoList {
public:
virtual ~TodoList() {}
Expand Down
1 change: 1 addition & 0 deletions src/todo_list_impl.hpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#pragma once

#include "todo_list.hpp"
#include "todo.hpp"

namespace todolist {

Expand Down

0 comments on commit 4d016c9

Please sign in to comment.