--- TEST/Makefile.orig 2010-03-27 01:22:04.000000000 +0100 +++ TEST/Makefile 2010-03-27 01:27:17.000000000 +0100 @@ -24,12 +24,10 @@ # | http://www.fsf.org/licensing/licenses/gpl.html | # +-------------------------------------------------------------------+ -include ../Makefile.depend - -GL_WRAPER_SRC=../SRC +OCAMLOPT=ocamlopt # GL_WRAPER_PATH := $(PREFIX) - GL_WRAPER_PATH := $(GL_WRAPER_SRC) + GL_WRAPER_PATH := "+glMLite" all: test @@ -42,71 +40,6 @@ SExprLite.cmxa: SExprLite.cmi SExprLite.cmx $(OCAMLOPT) -a -o SExprLite.cmxa SExprLite.cmx -# cma deps -$(GL_WRAPER_PATH)/GL.cma: - (cd $(GL_WRAPER_SRC); $(MAKE) GL.cma) -$(GL_WRAPER_PATH)/Glu.cma: - (cd $(GL_WRAPER_SRC); $(MAKE) Glu.cma) -$(GL_WRAPER_PATH)/Glut.cma: - (cd $(GL_WRAPER_SRC); $(MAKE) Glut.cma) -$(GL_WRAPER_PATH)/vertArray.cma: - (cd $(GL_WRAPER_SRC); $(MAKE) vertArray.cma) -$(GL_WRAPER_PATH)/VBO.cma: - (cd $(GL_WRAPER_SRC); $(MAKE) VBO.cma -f Makefile.VBO) -$(GL_WRAPER_PATH)/jpeg_loader.cma: - (cd $(GL_WRAPER_SRC); $(MAKE) jpeg_loader.cma) -$(GL_WRAPER_PATH)/png_loader.cma: - (cd $(GL_WRAPER_SRC); $(MAKE) png_loader.cma -f Makefile.png) -$(GL_WRAPER_PATH)/svg_loader.cma: - (cd $(GL_WRAPER_SRC); $(MAKE) svg_loader.cma -f Makefile.rsvg) -$(GL_WRAPER_PATH)/genimg_loader.cma: - (cd $(GL_WRAPER_SRC); $(MAKE) genimg_loader.cma -f Makefile.IM) -$(GL_WRAPER_PATH)/ftgl.cma: - (cd $(GL_WRAPER_SRC); $(MAKE) ftgl.cma -f Makefile.ftgl) -$(GL_WRAPER_PATH)/FunGL.cma: - (cd $(GL_WRAPER_SRC); $(MAKE) fungl) -$(GL_WRAPER_PATH)/FunGlut.cma: - (cd $(GL_WRAPER_SRC); $(MAKE) funglut) - -# cmxa deps -$(GL_WRAPER_PATH)/GL.cmxa: - (cd $(GL_WRAPER_SRC); $(MAKE) GL.cmxa) -$(GL_WRAPER_PATH)/Glu.cmxa: - (cd $(GL_WRAPER_SRC); $(MAKE) Glu.cmxa) -$(GL_WRAPER_PATH)/Glut.cmxa: - (cd $(GL_WRAPER_SRC); $(MAKE) Glut.cmxa) -$(GL_WRAPER_PATH)/vertArray.cmxa: - (cd $(GL_WRAPER_SRC); $(MAKE) vertArray.cmxa) -$(GL_WRAPER_PATH)/VBO.cmxa: - (cd $(GL_WRAPER_SRC); $(MAKE) VBO.cmxa) -$(GL_WRAPER_PATH)/jpeg_loader.cmxa: - (cd $(GL_WRAPER_SRC); $(MAKE) jpeg_loader.cmxa) -$(GL_WRAPER_PATH)/png_loader.cmxa: - (cd $(GL_WRAPER_SRC); $(MAKE) png_loader.cmxa -f Makefile.png) -$(GL_WRAPER_PATH)/svg_loader.cmxa: - (cd $(GL_WRAPER_SRC); $(MAKE) svg_loader.cmxa -f Makefile.rsvg) -$(GL_WRAPER_PATH)/genimg_loader.cmxa: - (cd $(GL_WRAPER_SRC); $(MAKE) genimg_loader.cmxa -f Makefile.IM) -$(GL_WRAPER_PATH)/ftgl.cmxa: - (cd $(GL_WRAPER_SRC); $(MAKE) ftgl.cmxa -f Makefile.ftgl) -$(GL_WRAPER_PATH)/FunGL.cmxa: - (cd $(GL_WRAPER_SRC); $(MAKE) fungl) -$(GL_WRAPER_PATH)/FunGlut.cmxa: - (cd $(GL_WRAPER_SRC); $(MAKE) funglut) - - -# main deps -CMXA_DEPS=\ - $(GL_WRAPER_PATH)/GL.cmxa \ - $(GL_WRAPER_PATH)/Glu.cmxa \ - $(GL_WRAPER_PATH)/Glut.cmxa \ - $(GL_WRAPER_PATH)/FunGL.cmxa \ - $(GL_WRAPER_PATH)/FunGlut.cmxa \ - $(GL_WRAPER_PATH)/vertArray.cmxa \ - $(GL_WRAPER_PATH)/jpeg_loader.cmxa \ - $(GL_WRAPER_PATH)/png_loader.cmxa \ - $(GL_WRAPER_PATH)/svg_loader.cmxa \ - $(GL_WRAPER_PATH)/ftgl.cmxa # COMPILES A DEMO # default demo to compile: @@ -116,7 +49,7 @@ # there are more modules than needed by the default demo, # so that make can be called with DEMO defined with another demo, for example: # make DEMO=outline.ml -$(DEMO_OPT): $(DEMO) $(CMXA_DEPS) SExprLite.cmxa +$(DEMO_OPT): $(DEMO) SExprLite.cmxa $(OCAMLOPT) -o $@ \ -ccopt -L$(GL_WRAPER_PATH) \ -I $(GL_WRAPER_PATH) \