diogo/yap-6.3
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix dependency on gmp path

Browse Source
This commit is contained in:
Vítor Santos Costa 2014-06-19 15:10:11 +01:00
parent d4bffbaefd
commit 5d4cc16789
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/swig/Android.mk.in
View File

@ -6,7 +6,7 @@ include $(CLEAR_VARS)
LOCAL_LDLIBS := -landroid -llog LOCAL_LDLIBS := -landroid -llog
LOCAL_MODULE := yap0 LOCAL_MODULE := yap0
LOCAL_SRC_FILES += @abs_top_builddir@/../../gmp/lib/libgmp.so LOCAL_SRC_FILES += @abs_top_builddir@/../../gmp-android/lib/libgmp.so
include $(PREBUILT_SHARED_LIBRARY) include $(PREBUILT_SHARED_LIBRARY)
include $(CLEAR_VARS) include $(CLEAR_VARS)
@ -24,7 +24,7 @@ LOCAL_MODULE := example
LOCAL_SHARED_LIBRARIES := yap0 yap1 LOCAL_SHARED_LIBRARIES := yap0 yap1
LOCAL_STATIC_LIBRARIES := @abs_top_builddir@/libYap.ar LOCAL_STATIC_LIBRARIES := @abs_top_builddir@/libYap.ar
LOCAL_SRC_FILES += @abs_top_builddir@/packages/swig/android/jni/yap_wrap.cpp LOCAL_SRC_FILES += @abs_top_builddir@/packages/swig/android/jni/yap_wrap.cpp
LOCAL_C_INCLUDES := @abs_top_builddir@ @abs_top_builddir@/../../gmp/include @srcdir@/../../H @srcdir@/../../include @srcdir@/../../os @srcdir@/../../OPTYap @srcdir@/../../BEAM @srcdir@/../../CXX LOCAL_C_INCLUDES := @abs_top_builddir@ @abs_top_builddir@/../../gmp-android/include @srcdir@/../../H @srcdir@/../../include @srcdir@/../../os @srcdir@/../../OPTYap @srcdir@/../../BEAM @srcdir@/../../CXX
LOCAL_CFLAGS := @YAP_EXTRAS@ @DEFS@ -D_YAP_NOT_INSTALLED_=1 -DDESTDIR=\"\" LOCAL_CFLAGS := @YAP_EXTRAS@ @DEFS@ -D_YAP_NOT_INSTALLED_=1 -DDESTDIR=\"\"
LOCAL_CPP_FEATURES := rtti LOCAL_CPP_FEATURES := rtti
# LOCAL_ALLOW_UNDEFINED_SYMBOLS := true # LOCAL_ALLOW_UNDEFINED_SYMBOLS := true

12
packages/swig/android/SwigSimple.java
View File

@ -178,15 +178,15 @@ class JavaCallback extends YAPCallback
public void run() public void run()
{ {
System.out.println("JavaCallback.run() "); Log.i(TAG, "java callback ");
Log.i(TAG, "java callback "); System.out.println("JavaCallback.run() ");
} }
public void displayInWindow(String s) public void run(String s)
{ {
System.out.println("JavaCallback.run() "); System.out.println("JavaCallback.run() ");
Log.i(TAG, "java callback "); Log.i(TAG, "java callback ");
output.append(s); output.append(s);
} }
private static final String TAG = "JavaCallback"; private static final String TAG = "JavaCallback";