hack to disable compilation with coin

This commit is contained in:
Daniel Russel 2007-03-29 19:53:56 +00:00
parent 81dac44112
commit cc0f4dcc02
3 changed files with 8 additions and 3 deletions

1
.gitattributes vendored
View File

@ -755,6 +755,7 @@ Kinetic_data_structures/demo/Kinetic_data_structures/data/before088 -text
Kinetic_data_structures/demo/Kinetic_data_structures/data/before103 -text
Kinetic_data_structures/demo/Kinetic_data_structures/data/before106 -text
Kinetic_data_structures/demo/Kinetic_data_structures/data/before107 -text
Kinetic_data_structures/demo/Kinetic_data_structures/include/control_coin.h -text
Kinetic_data_structures/doc_tex/Kinetic_data_structures/delaunay_0.eps -text svneol=unset#application/postscript
Kinetic_data_structures/doc_tex/Kinetic_data_structures/delaunay_0.gif -text svneol=unset#image/gif
Kinetic_data_structures/doc_tex/Kinetic_data_structures/delaunay_0.pdf -text svneol=unset#application/pdf

View File

@ -0,0 +1 @@
#define CGAL_USE_COIN

View File

@ -14,7 +14,7 @@ include $(CGAL_MAKEFILE)
# compiler flags
#---------------------------------------------------------------------#
CXXFLAGS = -g -DCGAL_USE_COIN -I/usr/include/Coin2\
CXXFLAGS = -g -I/usr/include/Coin2\
-I$(CGAL_INCL_DIR) \
$(CGAL_CXXFLAGS) \
-Iinclude\
@ -35,7 +35,7 @@ QT_LDFLAGS = \
$(LONG_NAME_PROBLEM_LDFLAGS) \
$(CGAL_LDFLAGS)
CXXFLAGS_3D= $(CXXFLAGS) -DCGAL_USE_SOQT
CXXFLAGS_3D= $(CXXFLAGS)
LDFLAGS_3D= -lCoin -lSoQt $(QT_LDFLAGS)
@ -54,11 +54,14 @@ DEPS_3D = SoQt_examiner_viewer.moc SoQt_examiner_viewer$(OBJ_EXT)
all: 2d
3d:\
3d: activate_coin\
Delaunay_triangulation_3$(EXE_EXT) \
regular_triangulation_3$(EXE_EXT)\
gui_3$(EXE_EXT)
activate_coin:
rm -rf include/control_coin.h
echo "#define CGAL_USE_COIN" > include/control_coin.h
generate_data$(EXE_EXT): generate_data$(OBJ_EXT)
$(CGAL_CXX) $(LIBPATH) $(EXE_OPT)generate_data generate_data$(OBJ_EXT) $(LDFLAGS)