Skip to content
Snippets Groups Projects
Commit 8387b7dd authored by Brad Barber's avatar Brad Barber
Browse files

Update files for config/Makefile-am*

- config was not tested.

Add random.h to libqhull.pro
parent 7b7d964f
No related branches found
No related tags found
No related merge requests found
...@@ -13,8 +13,10 @@ examples_DATA = \ ...@@ -13,8 +13,10 @@ examples_DATA = \
q_eg \ q_eg \
q_egtest \ q_egtest \
q_test \ q_test \
q_test-ok.txt \
q_test.bat \
Qhull-go.bat \ Qhull-go.bat \
q_test.bat qhulltest-ok.txt
### Extra files to be included in the tarball ### Extra files to be included in the tarball
......
...@@ -27,11 +27,11 @@ html_DATA = \ ...@@ -27,11 +27,11 @@ html_DATA = \
qh--geom.gif \ qh--geom.gif \
qh--half.gif \ qh--half.gif \
qh--rand.gif \ qh--rand.gif \
qh-code.htm \
qh-eg.htm \ qh-eg.htm \
qh-faq.htm \ qh-faq.htm \
qh-get.htm \ qh-get.htm \
qh-impre.htm \ qh-impre.htm \
qh-in.htm \
qh-optc.htm \ qh-optc.htm \
qh-optf.htm \ qh-optf.htm \
qh-optg.htm \ qh-optg.htm \
......
...@@ -19,6 +19,7 @@ doc_DATA = \ ...@@ -19,6 +19,7 @@ doc_DATA = \
EXTRA_DIST = \ EXTRA_DIST = \
$(doc_DATA) \ $(doc_DATA) \
CMakeLists.txt \
File_id.diz \ File_id.diz \
QHULL-GO.pif QHULL-GO.pif
......
...@@ -9,6 +9,7 @@ lib_LTLIBRARIES = libqhull.la ...@@ -9,6 +9,7 @@ lib_LTLIBRARIES = libqhull.la
# from: # from:
libqhull_la_SOURCES = \ libqhull_la_SOURCES = \
rboxlib.c \
user.c \ user.c \
global.c \ global.c \
stat.c \ stat.c \
...@@ -16,11 +17,14 @@ libqhull_la_SOURCES = \ ...@@ -16,11 +17,14 @@ libqhull_la_SOURCES = \
geom2.c \ geom2.c \
poly2.c \ poly2.c \
merge.c \ merge.c \
qhull.c \ libqhull.c \
geom.c \ geom.c \
poly.c \ poly.c \
qset.c \ qset.c \
mem.c mem.c \
usermem.c \
userprintf.c \
random.c
# how: # how:
libqhull_la_LDFLAGS = -version-info 5:0:0 -lm libqhull_la_LDFLAGS = -version-info 5:0:0 -lm
...@@ -56,7 +60,8 @@ pkginclude_HEADERS = \ ...@@ -56,7 +60,8 @@ pkginclude_HEADERS = \
stat.h \ stat.h \
io.h \ io.h \
merge.h \ merge.h \
qhull.h \ libqhull.h \
random.h \
qset.h \ qset.h \
user.h user.h
...@@ -71,7 +76,7 @@ examplesdir = $(docdir)/examples ...@@ -71,7 +76,7 @@ examplesdir = $(docdir)/examples
examples_DATA = \ examples_DATA = \
user_eg.c \ user_eg.c \
user_eg2.c \ user_eg2.c \
qhull_interface.cpp \ CMakeLists.txt \
Makefile.txt \ Makefile.txt \
Mborland Mborland
......
...@@ -3,7 +3,7 @@ dnl Author: Rafael Laboissiere <rafael@debian.org> ...@@ -3,7 +3,7 @@ dnl Author: Rafael Laboissiere <rafael@debian.org>
dnl Created: Mon Dec 3 21:36:21 CET 2001 dnl Created: Mon Dec 3 21:36:21 CET 2001
AC_INIT(qhull, 2009.1) AC_INIT(qhull, 2009.1)
AC_CONFIG_SRCDIR(src/qhull.c) AC_CONFIG_SRCDIR(src/libqhull.c)
AC_CONFIG_AUX_DIR(config) AC_CONFIG_AUX_DIR(config)
AC_CONFIG_MACRO_DIR(config) AC_CONFIG_MACRO_DIR(config)
......
...@@ -98,9 +98,9 @@ HEADERS += src/libqhull.h ...@@ -98,9 +98,9 @@ HEADERS += src/libqhull.h
HEADERS += src/mem.h HEADERS += src/mem.h
HEADERS += src/merge.h HEADERS += src/merge.h
HEADERS += src/poly.h HEADERS += src/poly.h
HEADERS += src/random.h
# qhull.h is for backwards compatibility # qhull.h is for backwards compatibility
HEADERS += src/qhull_a.h HEADERS += src/qhull_a.h
HEADERS += src/qset.h HEADERS += src/qset.h
HEADERS += src/random.h
HEADERS += src/stat.h HEADERS += src/stat.h
HEADERS += src/user.h HEADERS += src/user.h
...@@ -76,8 +76,8 @@ To do ...@@ -76,8 +76,8 @@ To do
- qhulltest --all added to output - qhulltest --all added to output
- Add test of user_eg3, etc. - Add test of user_eg3, etc.
- Check for wraparound of 64-bit ints -- e.g., a large set or points - Check for wraparound of 64-bit ints -- e.g., a large set or points
- Add config directory to Qhull
- Add md5sum - Add md5sum
- Set up globals for thread-private storage
- Generate vcproj from qtpro files - Generate vcproj from qtpro files
cd qtpro && qmake -spec win32-msvc2005 -tp vc -recursive cd qtpro && qmake -spec win32-msvc2005 -tp vc -recursive
sed -i 's/C\:\/bash\/local\/qhull\/qtpro\///' qhull-all.sln sed -i 's/C\:\/bash\/local\/qhull\/qtpro\///' qhull-all.sln
...@@ -96,11 +96,12 @@ To do ...@@ -96,11 +96,12 @@ To do
- get copy of unused - get copy of unused
Need help Need help
- Set up debian build. - Set up debian build.
Please keep debian files in config/ and project/debian/
Branch 'debian' is from http://savannah.nongnu.org/cvs/?group=qhull Branch 'debian' is from http://savannah.nongnu.org/cvs/?group=qhull
Please keep files in config/ or project/debian/ project/debian needs updating for its new location. It was at qhull's level.
project/debian needs updating for its new location (two levels down)
- Add CMakeLists.txt for qhullcpp, user_eg3, cpp/, and cpp/road - Add CMakeLists.txt for qhullcpp, user_eg3, cpp/, and cpp/road
If practical, please move to project/
- The C++ interface needs work. Give it a try and make it better. - The C++ interface needs work. Give it a try and make it better.
- Verify -fno-strict-aliasing needed for gcc 4.1, 4.2, and 4.3 (qset segfault) - Verify -fno-strict-aliasing needed for gcc 4.1, 4.2, and 4.3 (qset segfault)
...@@ -281,7 +282,6 @@ Changes to C code for C++ support ...@@ -281,7 +282,6 @@ Changes to C code for C++ support
Documentation: Documentation:
- Fixed out-of-date CiteSeer references - Fixed out-of-date CiteSeer references
- Renamed html/qh-in.htm to html/qh-code.htm - Renamed html/qh-in.htm to html/qh-code.htm
- Renamed qh-in.htm to qh-code.htm
- Add reference to 'Qt' to 'i' - Add reference to 'Qt' to 'i'
- Add reference to 'FS' to 'FA' - Add reference to 'FS' to 'FA'
- qh-impre.htm discusses precision issues for halfspace intersection - qh-impre.htm discusses precision issues for halfspace intersection
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment