diff options
| author | Jamie Bullock <jamie@jamiebullock.com> | 2013-01-08 14:32:45 +0000 |
|---|---|---|
| committer | Jamie Bullock <jamie@jamiebullock.com> | 2013-01-08 14:32:45 +0000 |
| commit | 31b856e8fd028f977841a6c736cc19d6eaeee312 (patch) | |
| tree | a6b74b5c21860a53416120de007e8910210659c8 /swig | |
| parent | ef3f6c2009fba2f3d3c79c26f631ea3a34f75aa5 (diff) | |
| download | LibXtract-31b856e8fd028f977841a6c736cc19d6eaeee312.tar.gz LibXtract-31b856e8fd028f977841a6c736cc19d6eaeee312.tar.bz2 LibXtract-31b856e8fd028f977841a6c736cc19d6eaeee312.zip | |
removed floatArray and intArray from Java SWIG bindings
Diffstat (limited to 'swig')
| -rw-r--r-- | swig/java/Makefile.am | 11 | ||||
| -rw-r--r-- | swig/xtract.i | 7 |
2 files changed, 13 insertions, 5 deletions
diff --git a/swig/java/Makefile.am b/swig/java/Makefile.am index 1e935ca..4830d5a 100644 --- a/swig/java/Makefile.am +++ b/swig/java/Makefile.am @@ -1,4 +1,6 @@ MAINTAINERCLEANFILES = all-local $(javasources) Makefile.in +TESTNAME = test +JAVA = java javasources = \ SWIGTYPE_p_float.java \ @@ -85,12 +87,15 @@ java-wrap: cd xtract/core/src && mv $(javaclasses) ../ test: - $(JAVAC) test.java + $(JAVAC) $(TESTNAME).java -all-local: java-wrap test +run: + $(JAVA) -Djava.library.path=.libs $(TESTNAME) + +all-local: java-wrap $(TESTNAME) clean-local: -rm xtract_redeclare.i - -rm -f libjxtract.so xtract_wrap.c test.class xtract_subband_scales_.java #$(javasources) $(javaclasses) $(nonautojavaclasses) test.class xtract_subband_scales_.java + -rm -f libjxtract.so xtract_wrap.c $(TESTNAME).class xtract_subband_scales_.java #$(javasources) $(javaclasses) $(nonautojavaclasses) $(TESTNAME).class xtract_subband_scales_.java -rm -rf xtract diff --git a/swig/xtract.i b/swig/xtract.i index 9a05429..f550341 100644 --- a/swig/xtract.i +++ b/swig/xtract.i @@ -1,6 +1,8 @@ %module xtract %include typemaps.i -%include carrays.i +#ifndef SWIGJAVA +%include carrays.i +#endif %{ #include "xtract/xtract_scalar.h" @@ -92,9 +94,10 @@ %} - +#ifndef SWIGJAVA %array_class(float, floatArray); %array_class(int, intArray); +#endif %apply float *OUTPUT { float *result }; /* %apply float[] {const float *data}; */ |