Skip to content

Commit

Permalink
removed link parameter -lbigarray for new ocaml version 4.08
Browse files Browse the repository at this point in the history
  • Loading branch information
fccm committed Sep 3, 2019
1 parent 3101329 commit 7523d32
Show file tree
Hide file tree
Showing 8 changed files with 24 additions and 24 deletions.
2 changes: 1 addition & 1 deletion SRC/META.in
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ package "gle" (
requires = "glMLite"
archive(byte) = "GLE.cma"
archive(native) = "GLE.cmxa"
# linkopts = "-cclib GL_LIBS -ccopt -L/usr/X11R6/lib -cclib -lgle -cclib -lbigarray"
# linkopts = "-cclib GL_LIBS -ccopt -L/usr/X11R6/lib -cclib -lgle"
)

package "ftgl" (
Expand Down
6 changes: 3 additions & 3 deletions SRC/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -434,13 +434,13 @@ loader-libjpeg.o: loader-libjpeg.c loader-libjpeg-mem.c loader-texure.h
$(OCAMLC) -c $<

dlljpeg_loader.so libjpeg_loader.a: loader-libjpeg.o
$(OCAMLMKLIB) -o jpeg_loader $< $(GL_LIBS) -L"$(OCAML_PATH)" -lbigarray -ljpeg
$(OCAMLMKLIB) -o jpeg_loader $< $(GL_LIBS) -L"$(OCAML_PATH)" -ljpeg

jpeg_loader.cmxa jpeg_loader.a: jpeg_loader.cmx dlljpeg_loader.so
$(OCAMLMKLIB) -o jpeg_loader $< $(GL_LIBS) -L"$(OCAML_PATH)" -lbigarray -ljpeg
$(OCAMLMKLIB) -o jpeg_loader $< $(GL_LIBS) -L"$(OCAML_PATH)" -ljpeg

jpeg_loader.cma: jpeg_loader.cmo dlljpeg_loader.so
$(OCAMLMKLIB) -o jpeg_loader $< $(GL_LIBS) -L"$(OCAML_PATH)" -lbigarray -ljpeg
$(OCAMLMKLIB) -o jpeg_loader $< $(GL_LIBS) -L"$(OCAML_PATH)" -ljpeg

# }}}

Expand Down
6 changes: 3 additions & 3 deletions SRC/Makefile.GLE
Original file line number Diff line number Diff line change
Expand Up @@ -63,13 +63,13 @@ gle.wrap.o: gle.wrap.c
$(OCAMLC) -c $<

dllGLE.so libGLE.a: gle.wrap.o
$(OCAMLMKLIB) -o GLE $< -L"$(OCAML_PATH)" -lbigarray -L$(GLE_PATH) $(GLE_LIBS) $(GL_LIBS)
$(OCAMLMKLIB) -o GLE $< -L"$(OCAML_PATH)" -L$(GLE_PATH) $(GLE_LIBS) $(GL_LIBS)

GLE.cmxa GLE.a: GLE.cmx dllGLE.so
$(OCAMLMKLIB) -o GLE $< -L"$(OCAML_PATH)" -lbigarray -L$(GLE_PATH) $(GLE_LIBS) $(GL_LIBS)
$(OCAMLMKLIB) -o GLE $< -L"$(OCAML_PATH)" -L$(GLE_PATH) $(GLE_LIBS) $(GL_LIBS)

GLE.cma: GLE.cmo dllGLE.so
$(OCAMLMKLIB) -o GLE $< -L"$(OCAML_PATH)" -lbigarray -L$(GLE_PATH) $(GLE_LIBS) $(GL_LIBS)
$(OCAMLMKLIB) -o GLE $< -L"$(OCAML_PATH)" -L$(GLE_PATH) $(GLE_LIBS) $(GL_LIBS)

DIST_FILES_GLE=\
GLE.cma \
Expand Down
6 changes: 3 additions & 3 deletions SRC/Makefile.IM
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,13 @@ loader-libmagick.o: loader-libmagick.c loader-texure.h
$(OCAMLC) -c -ccopt "$(C_FLAGS)" -ccopt "$(CPP_FLAGS)" $<

dllgenimg_loader.so libgenimg_loader.a: loader-libmagick.o
$(OCAMLMKLIB) -o genimg_loader $< -L"$(OCAML_PATH)" -lbigarray $(IM_LIBS) $(LD_FLAGS) #$(GL_LIBS)
$(OCAMLMKLIB) -o genimg_loader $< -L"$(OCAML_PATH)" $(IM_LIBS) $(LD_FLAGS) #$(GL_LIBS)

genimg_loader.cmxa genimg_loader.a: genimg_loader.cmx dllgenimg_loader.so
$(OCAMLMKLIB) -o genimg_loader $< -L"$(OCAML_PATH)" -lbigarray $(IM_LIBS) $(LD_FLAGS) #$(GL_LIBS)
$(OCAMLMKLIB) -o genimg_loader $< -L"$(OCAML_PATH)" $(IM_LIBS) $(LD_FLAGS) #$(GL_LIBS)

genimg_loader.cma: genimg_loader.cmo dllgenimg_loader.so
$(OCAMLMKLIB) -o genimg_loader $< -L"$(OCAML_PATH)" -lbigarray $(IM_LIBS) $(LD_FLAGS) #$(GL_LIBS)
$(OCAMLMKLIB) -o genimg_loader $< -L"$(OCAML_PATH)" $(IM_LIBS) $(LD_FLAGS) #$(GL_LIBS)

DIST_FILES_GENIMG=\
genimg_loader.cma \
Expand Down
8 changes: 4 additions & 4 deletions SRC/Makefile.VArray
Original file line number Diff line number Diff line change
Expand Up @@ -58,18 +58,18 @@ gl3_deprecations.o: gl3_deprecations.c gl3_deprecations.h
$(OCAMLC) -c $<

dllvertArray.so libvertArray.a: varray.wrap.o gl3_deprecations.o
$(OCAMLMKLIB) -o vertArray $^ $(GL_LIBS) -L"$(OCAML_PATH)" -lbigarray
$(OCAMLMKLIB) -o vertArray $^ $(GL_LIBS) -L"$(OCAML_PATH)"
else
dllvertArray.so libvertArray.a: varray.wrap.o
$(OCAMLMKLIB) -o vertArray $< $(GL_LIBS) -L"$(OCAML_PATH)" -lbigarray
$(OCAMLMKLIB) -o vertArray $< $(GL_LIBS) -L"$(OCAML_PATH)"
endif


vertArray.cmxa vertArray.a: vertArray.cmx dllvertArray.so
$(OCAMLMKLIB) -o vertArray $< $(GL_LIBS) -L"$(OCAML_PATH)" -lbigarray
$(OCAMLMKLIB) -o vertArray $< $(GL_LIBS) -L"$(OCAML_PATH)"

vertArray.cma: vertArray.cmo dllvertArray.so
$(OCAMLMKLIB) -o vertArray $< $(GL_LIBS) -L"$(OCAML_PATH)" -lbigarray
$(OCAMLMKLIB) -o vertArray $< $(GL_LIBS) -L"$(OCAML_PATH)"


# vim: fdm=marker
8 changes: 4 additions & 4 deletions SRC/Makefile.VBO
Original file line number Diff line number Diff line change
Expand Up @@ -76,18 +76,18 @@ gl3_deprecations.o: gl3_deprecations.c gl3_deprecations.h
$(OCAMLC) -c $<

dllVBO.so libVBO.a: vbo.wrap.o gl3_deprecations.o
$(OCAMLMKLIB) -o VBO $^ -L"$(OCAML_PATH)" -lbigarray $(GL_LIBS)
$(OCAMLMKLIB) -o VBO $^ -L"$(OCAML_PATH)" $(GL_LIBS)
else
dllVBO.so libVBO.a: vbo.wrap.o
$(OCAMLMKLIB) -o VBO $< -L"$(OCAML_PATH)" -lbigarray $(GL_LIBS)
$(OCAMLMKLIB) -o VBO $< -L"$(OCAML_PATH)" $(GL_LIBS)
endif


VBO.cmxa VBO.a: VBO.cmx dllVBO.so
$(OCAMLMKLIB) -o VBO $< -L"$(OCAML_PATH)" -lbigarray $(GL_LIBS)
$(OCAMLMKLIB) -o VBO $< -L"$(OCAML_PATH)" $(GL_LIBS)

VBO.cma: VBO.cmo dllVBO.so
$(OCAMLMKLIB) -o VBO $< -L"$(OCAML_PATH)" -lbigarray $(GL_LIBS)
$(OCAMLMKLIB) -o VBO $< -L"$(OCAML_PATH)" $(GL_LIBS)

vbo_clean:
rm -f VBO.{ml,mli} VBO.cm[ioxa] VBO.{o,a,cmxa} dllVBO.so vbo.wrap.o
Expand Down
6 changes: 3 additions & 3 deletions SRC/Makefile.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions SRC/Makefile.rsvg
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,13 @@ loader-librsvg.o: loader-librsvg.c loader-texure.h
$(OCAMLC) -c -ccopt "$(RSVG_CFLAGS)" $<

dllsvg_loader.so libsvg_loader.a: loader-librsvg.o
$(OCAMLMKLIB) -o svg_loader $< -L"$(OCAML_PATH)" -lbigarray $(RSVG_LIBS)
$(OCAMLMKLIB) -o svg_loader $< -L"$(OCAML_PATH)" $(RSVG_LIBS)

svg_loader.cmxa svg_loader.a: svg_loader.cmx dllsvg_loader.so
$(OCAMLMKLIB) -o svg_loader $< -L"$(OCAML_PATH)" -lbigarray $(RSVG_LIBS)
$(OCAMLMKLIB) -o svg_loader $< -L"$(OCAML_PATH)" $(RSVG_LIBS)

svg_loader.cma: svg_loader.cmo dllsvg_loader.so
$(OCAMLMKLIB) -o svg_loader $< -L"$(OCAML_PATH)" -lbigarray $(RSVG_LIBS)
$(OCAMLMKLIB) -o svg_loader $< -L"$(OCAML_PATH)" $(RSVG_LIBS)

DIST_FILES_RSVG=\
svg_loader.cma \
Expand Down

0 comments on commit 7523d32

Please sign in to comment.