Changeset 9000:43a7451f0c08 in orange


Ignore:
Timestamp:
09/22/11 16:45:14 (3 years ago)
Author:
ales_erjavec <ales.erjavec@…>
Branch:
default
Convert:
691404fcc6e4b56bb31603938f3eefa5ecc90ede
Message:

Can now link to external qhull library.

Location:
source/orangeom
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • source/orangeom/Makefile

    r5472 r9000  
    11all:    objdir $(OLD)/orangeom.so 
    22 
    3 MODULENAME=ORANGEOM 
     3MODULENAME = ORANGEOM 
    44include ../makefile.defs 
    55-include makefile.deps 
    66 
    7 obj/qhull_geom.o : qhull/geom.c 
    8 obj/qhull_geom2.o : qhull/geom2.c 
    9 obj/qhull_global.o : qhull/global.c 
    10 obj/qhull_io.o : qhull/io.c 
    11 obj/qhull_mem.o : qhull/mem.c 
    12 obj/qhull_merge.o : qhull/merge.c 
    13 obj/qhull_poly.o : qhull/poly.c 
    14 obj/qhull_poly2.o : qhull/poly2.c 
    15 obj/qhull_qhull.o : qhull/qhull.c 
    16 obj/qhull_qset.o : qhull/qset.c 
    17 obj/qhull_stat.o : qhull/stat.c 
    18 obj/qhull_user.o : qhull/user.c 
     7 
     8######################################################################### 
     9# If QHULL_LIB is not defiend then include qhull into orange library. 
     10# If QHULL_LIB is defined it must be the name of the qhull library to 
     11# link with (e.g. qhull). The library and its header files must be on the 
     12# search path (use CFLAGS/LDFLAGS if not on the default path). 
     13#########################################################################  
     14 
     15ifndef QHULL_LIB 
     16QHULL_OBJECTS = obj/qhull_geom.o obj/qhull_geom2.o obj/qhull_global.o obj/qhull_io.o\ 
     17        obj/qhull_mem.o obj/qhull_merge.o obj/qhull_poly.o obj/qhull_poly2.o obj/qhull_qhull.o\ 
     18        obj/qhull_qset.o obj/qhull_stat.o obj/qhull_user.o 
     19# Add curr dir to include path 
     20COMPILEOPTIONS += -I./ 
     21else 
     22QHULL_OBJECTS =  
     23LINKOPTIONS += -l$(QHULL_LIB) 
     24endif 
    1925 
    2026obj/qhull_%.o : qhull/%.c 
    2127    $(CCOMPILER) $(COMPILEOPTIONS) -c $< -o $@ 
    22  
    23 QHULL_OBJECTS=obj/qhull_geom.o obj/qhull_geom2.o obj/qhull_global.o obj/qhull_io.o obj/qhull_mem.o obj/qhull_merge.o obj/qhull_poly.o obj/qhull_poly2.o obj/qhull_qhull.o obj/qhull_qset.o obj/qhull_stat.o obj/qhull_user.o 
    2428 
    2529$(OLD)/orangeom.so: px/stamp ppp/stamp $(ORANGEOM_OBJECTS) $(QHULL_OBJECTS) 
  • source/orangeom/triangulate.cpp

    r6531 r9000  
    5959#include "numeric_interface.hpp" 
    6060extern "C" { 
    61 #include "../qhull/qhull.h" 
    62 #include "../qhull/qset.h"      /* for FOREACHneighbor_() */ 
    63 #include "../qhull/poly.h"      /* for qh_vertexneighbors() */ 
     61#include <qhull/qhull.h> 
     62#include <qhull/qset.h>     /* for FOREACHneighbor_() */ 
     63#include <qhull/poly.h>     /* for qh_vertexneighbors() */ 
    6464} 
    6565 
Note: See TracChangeset for help on using the changeset viewer.