shapes example: slight correction to depth map.
makedebugtop: include swig.cmo
Lib: factored out more common code, slightly reorganized class type.
added director define and exceptions.
std_string: length from the original ocaml string (no longer depends on
null termination)
ocamldec.swg/ocaml.swg: added caml_string_len
Examples/Makefile.in: quiet about checking out files.
Ocaml.cxx:
Fixed abstract director test case.
Include/exclude director.swg based on directors being enabled.
Final edits for 1.3.20, barring bugs being discovered.
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@5477 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
parent
cc9a10d2e2
commit
fbb9c8481d
15 changed files with 261 additions and 214 deletions
|
|
@ -550,9 +550,10 @@ OCAMLMKTOP=@OCAMLMKTOP@ $(SWIGWHERE)
|
|||
NOLINK ?= false
|
||||
OCAMLPP= -pp "camlp4o ./swigp4.cmo"
|
||||
OCAMLCORE=\
|
||||
$(SWIG) -ocaml -co swig.mli ; \
|
||||
$(SWIG) -ocaml -co swig.ml ; \
|
||||
$(SWIG) -ocaml -co swigp4.ml ; \
|
||||
rm -rf swig.mli swig.ml swigp4.ml ;\
|
||||
$(SWIG) -ocaml -co swig.mli 2>/dev/null ; \
|
||||
$(SWIG) -ocaml -co swig.ml 2>/dev/null ; \
|
||||
$(SWIG) -ocaml -co swigp4.ml 2>/dev/null ; \
|
||||
$(OCC) -c swig.mli ; \
|
||||
$(OCC) -c swig.ml ; \
|
||||
$(OCC) -I `camlp4 -where` -pp "camlp4o pa_extend.cmo q_MLast.cmo" \
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ void draw_shape_coverage( shape *s, int div_x, int div_y ) {
|
|||
|
||||
void draw_depth_map( volume *v, int div_x, int div_y ) {
|
||||
double i,j;
|
||||
char depth_map_chars[] = "#*+;:,. ";
|
||||
char depth_map_chars[] = "#*+o;:,. ";
|
||||
double lowbound, highbound;
|
||||
double current = 0.0;
|
||||
bool bounds_set = false;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
(* This example is meant to reach every case in cstring.i *)
|
||||
|
||||
open Swig
|
||||
open Example
|
||||
|
||||
let _ = _takes_std_string (C_string "foo")
|
||||
|
|
|
|||
|
|
@ -18,4 +18,4 @@ echo "Making the test"
|
|||
make $swigtest
|
||||
echo "Building ${thetest}_top"
|
||||
gcc -c -g $cppopt -I$OCAMLINC ${thetest}_wrap.c
|
||||
ocamlmktop -cclib -g -custom ${thetest}_wrap.o ${thetest}.cmo -o ${thetest}_top -cclib -lstdc++
|
||||
ocamlmktop -cclib -g -custom swig.cmo ${thetest}_wrap.o ${thetest}.cmo -o ${thetest}_top -cclib -lstdc++
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue