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

enable swig

Browse Source
This commit is contained in:
Vítor Santos Costa 2015-02-07 01:11:52 +00:00
parent 4dd8ee803f
commit bdcd06cf04
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
packages/swig/Makefile.in
View File

@ -2,6 +2,7 @@ PACKAGE=swig
DOC=swig DOC=swig
PKGCFLAGS= PKGCFLAGS=
SWIG=@SWIG@ SWIG=@SWIG@
LIBS=@LIBS@
JAVAC=@JAVAC@ JAVAC=@JAVAC@
JAR=@JAR@ JAR=@JAR@
include ../Makefile.defs include ../Makefile.defs
@ -64,7 +65,7 @@ jni/yap_wrap.cpp java/yap.java: $(srcdir)/yap.i
jni/yap_wrap.o: jni/yap_wrap.cpp jni/yap_wrap.o: jni/yap_wrap.cpp
$(CXX) -c @SHLIB_CXXFLAGS@ $(CXXFLAGS) @JPLCFLAGS@ $< -o $@ $(CXX) -c @SHLIB_CXXFLAGS@ $(CXXFLAGS) @JPLCFLAGS@ $< -o $@
# depends on make install on top-level # depends on make install on top-level
# also, should have an android device running, say # also, should have an android device running, say
# emulator -avd first & # emulator -avd first &
@ -74,13 +75,13 @@ jni/yap_wrap.o: jni/yap_wrap.cpp
# #
# #
android: JavaYap-debug.apk android: JavaYap-debug.apk
JavaYap-debug.apk: android/libs/armeabi/libexample.so JavaYap-debug.apk: android/libs/armeabi/libexample.so
( cd android && ant debug ) ( cd android && ant debug )
android/libs/armeabi/libexample.so: android/jni/Android.mk android/jni/Application.mk android/jni/yap_wrap.cpp android/libs/armeabi/libexample.so: android/jni/Android.mk android/jni/Application.mk android/jni/yap_wrap.cpp
( cd android/jni && NDK_DEBUG=1 ndk-build ) ( cd android/jni && NDK_DEBUG=1 ndk-build )
android/jni/Application.mk: android/jni/Android.mk android/jni/Application.mk: android/jni/Android.mk
cp $(srcdir)/android/jni/Application.mk android/jni cp $(srcdir)/android/jni/Application.mk android/jni
@ -93,7 +94,7 @@ android/jni/Android.mk: android/AndroidManifest.xml
cp -r $(JNI_SQLITE) android/jni cp -r $(JNI_SQLITE) android/jni
cp -r $(JAVA_SQLITE) android/src cp -r $(JAVA_SQLITE) android/src
cp Android.mk android/jni cp Android.mk android/jni
android/AndroidManifest.xml: $(ANDROID_PKG) android/AndroidManifest.xml: $(ANDROID_PKG)
android create project --target 1 --name JavaYap --path ./android --activity JavaYap --package pt.up.fc.dcc.yap android create project --target 1 --name JavaYap --path ./android --activity JavaYap --package pt.up.fc.dcc.yap
mkdir -p android/assets mkdir -p android/assets
@ -102,7 +103,7 @@ android/AndroidManifest.xml: $(ANDROID_PKG)
mkdir -p android/assets/lib mkdir -p android/assets/lib
mkdir -p android/assets/lib/Yap mkdir -p android/assets/lib/Yap
mkdir -p android/jni mkdir -p android/jni
android/jni/yap_wrap.cpp: $(srcdir)/yap.i $(srcdir)/../../CXX/yapi.hh $(srcdir)/../../CXX/yapi.cpp android/AndroidManifest.xml android/jni/yap_wrap.cpp: $(srcdir)/yap.i $(srcdir)/../../CXX/yapi.hh $(srcdir)/../../CXX/yapi.cpp android/AndroidManifest.xml
$(SWIG) -c++ -java -I$(srcdir)/../../CXX -package pt.up.fc.dcc.yap -outdir android/src/pt/up/fc/dcc/yap -o android/jni/yap_wrap.cpp $< $(SWIG) -c++ -java -I$(srcdir)/../../CXX -package pt.up.fc.dcc.yap -outdir android/src/pt/up/fc/dcc/yap -o android/jni/yap_wrap.cpp $<

4
packages/swig/yap.i
View File

@ -46,10 +46,10 @@
#define YAP_CPP_INTERFACE 1 #define YAP_CPP_INTERFACE 1
extern "C" {
#include "yapi.hh" #include "yapi.hh"
extern "C" {
extern Term Yap_StringToTerm(const char *s, size_t len, term_t bindings); extern Term Yap_StringToTerm(const char *s, size_t len, term_t bindings);
#if THREADS #if THREADS