From 1b9da3d9666cd144e83bcb173192f1f002431f69 Mon Sep 17 00:00:00 2001
From: Brad Barber <bradb@shore.net>
Date: Sun, 6 Dec 2009 21:04:36 -0500
Subject: [PATCH] qhulllib should be a static library instead of a dynamic
library. Otherwise it always includes userprintf and usermem.c
Something is wrong since qhull-qt tries to load a dll
Also ConvexHull is a submodule when it shouldn't appear at all. This causes
problems with switching between branches.
---
qtpro/qhulllib/qhulllib.pro | 3 ++-
src/Changes.txt | 1 +
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/qtpro/qhulllib/qhulllib.pro b/qtpro/qhulllib/qhulllib.pro
index c6fd863..416b9dc 100644
--- a/qtpro/qhulllib/qhulllib.pro
+++ b/qtpro/qhulllib/qhulllib.pro
@@ -4,7 +4,8 @@
# configure -commercial -no-qt3support -no-opengl -no-rtti -qt-style-plastique
QT -= gui
TARGET = ../../qhull
-CONFIG -= app_bundle
+CONFIG += staticlib
+CONFIG -= app_bundle qt
TEMPLATE = lib
DESTDIR = ../../tmp/lib
OBJECTS_DIR = ../../tmp/obj
diff --git a/src/Changes.txt b/src/Changes.txt
index 34b56c9..9991186 100644
--- a/src/Changes.txt
+++ b/src/Changes.txt
@@ -73,6 +73,7 @@ To do
- Remove class-static code, check K_GLOBAL_STATIC
- Rename rboxlib and qhulllib to librbox and libqhull
user_eg3 rbox 10 qhull does nothing
+ ConvexHull is a submodule to git. How to get rid of?
qhull 2009.1 2008/03/20
- Use gcc 4.4.0 or later. gcc 4.2.1, 4.2.2, and 4.3.2 -O2 segfaults in qset.c . gcc 4.1.1 was OK
--
GitLab