jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge with the master again.

Browse source 
Bring in the recent JavaScript changes.
This commit is contained in:
Vadim Zeitlin 2014-05-07 23:25:33 +02:00
commit c5e5978287
364 changed files with 11981 additions and 294 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Examples/test-suite/java/Makefile.in
View file

@ -59,7 +59,7 @@ director_nspace.%: JAVA_PACKAGE = $*Package
director_nspace_director_name_collision.%: JAVA_PACKAGE = $*Package
# Rules for the different types of tests
%.cpptest:
%.cpptest:
$(setup)
+(cd $(JAVA_PACKAGE) && $(swig_and_compile_cpp))
$(run_testcase)
@ -69,7 +69,7 @@ director_nspace_director_name_collision.%: JAVA_PACKAGE = $*Package
+(cd $(JAVA_PACKAGE) && $(swig_and_compile_c))
$(run_testcase)
%.multicpptest:
%.multicpptest:
$(setup)
+(cd $(JAVA_PACKAGE) && $(swig_and_compile_multi_cpp))
$(run_testcase)