diff --git a/project/libqhull/libqhull.pro b/project/libqhull/libqhull.pro index 868a182deb6f5a82264044e69755edb98f72ee40..bbe1a9248cd7db22c3750f6f4d440d11bb280a95 100644 --- a/project/libqhull/libqhull.pro +++ b/project/libqhull/libqhull.pro @@ -10,8 +10,8 @@ CONFIG -= app_bundle qt # Appears to be needed for gcc 4.1, 4.2, and 4.3 with -O2 #QMAKE_CFLAGS += -fno-strict-aliasing QMAKE_CFLAGS_WARN_ON += -Werror -Wall -Wcast-qual -Wextra -Wshadow -Wwrite-strings -QMAKE_CFLAGS_WARN_ON += -Wno-sign-conversion # Many size_t vs. int errors -#QMAKE_CFLAGS_WARN_ON += -Wconversion # no workaround for bit-field conversion errors +QMAKE_CFLAGS_WARN_ON += -Wno-sign-conversion # Many size_t vs. int warnings +#QMAKE_CFLAGS_WARN_ON += -Wconversion # No workaround for bit-field conversions build_pass:CONFIG(debug, debug|release):{ TARGET = qhulld OBJECTS_DIR = ../../tmp/libqhull/Debug @@ -58,6 +58,9 @@ OTHER_FILES += Announce.txt OTHER_FILES += CMakeLists.txt OTHER_FILES += COPYING.txt OTHER_FILES += File_id.diz +OTHER_FILES += eg/q_eg +OTHER_FILES += eg/q_egtest +OTHER_FILES += eg/q_test OTHER_FILES += html/index.htm OTHER_FILES += html/qconvex.htm OTHER_FILES += html/qdelau_f.htm diff --git a/project/libqhullcpp/libqhullcpp.pro b/project/libqhullcpp/libqhullcpp.pro index 19d1f81ba6e490af0dc221d8a897c0ff7aced3c3..8602cc9e0e89ea9d70ec0080d49e39c477189f4b 100644 --- a/project/libqhullcpp/libqhullcpp.pro +++ b/project/libqhullcpp/libqhullcpp.pro @@ -24,8 +24,8 @@ MOC_DIR = ../../tmp/moc RCC_DIR = ../../tmp/rcc INCLUDEPATH = ../../cpp;../../cpp/road;../../tmp QMAKE_CXXFLAGS_WARN_ON += -Werror -Wall -Wcast-qual -Wextra -Wwrite-strings -QMAKE_CXXFLAGS_WARN_ON += -Wno-sign-conversion # Many size_t vs. int errors -#QMAKE_CXXFLAGS_WARN_ON += -Wconversion # no workaround for bit-field conversion errors +QMAKE_CXXFLAGS_WARN_ON += -Wno-sign-conversion # Many size_t vs. int warnings +#QMAKE_CXXFLAGS_WARN_ON += -Wconversion # No workaround for bit-field conversions VPATH = ../.. SOURCES += cpp/Coordinates.cpp diff --git a/project/libqhullp/libqhullp.pro b/project/libqhullp/libqhullp.pro index 6e5dac1ae8826fe3cb981283ad685857aa785866..970f2da4c29c1ecca989f25419c73d1d76e36788 100644 --- a/project/libqhullp/libqhullp.pro +++ b/project/libqhullp/libqhullp.pro @@ -11,8 +11,8 @@ DEFINES += qh_QHpointer # Appears to be needed for gcc 4.1, 4.2, and 4.3 with -O2 #QMAKE_CFLAGS += -fno-strict-aliasing QMAKE_CFLAGS_WARN_ON += -Werror -Wall -Wcast-qual -Wextra -Wshadow -Wwrite-strings -QMAKE_CFLAGS_WARN_ON += -Wno-sign-conversion # Many size_t vs. int errors -#QMAKE_CFLAGS_WARN_ON += -Wconversion # no workaround for bit-field conversion errors +QMAKE_CFLAGS_WARN_ON += -Wno-sign-conversion # Many size_t vs. int warnings +#QMAKE_CFLAGS_WARN_ON += -Wconversion # No workaround for bit-field conversions build_pass:CONFIG(debug, debug|release):{ TARGET = qhullpd OBJECTS_DIR = ../../tmp/libqhullp/Debug @@ -42,3 +42,71 @@ SOURCES += src/mem.c SOURCES += src/usermem.c SOURCES += src/userprintf.c SOURCES += src/random.c + +# Headers and other files duplicated from libqhull.pro for convenience +HEADERS += src/geom.h +HEADERS += src/io.h +HEADERS += src/libqhull.h +HEADERS += src/mem.h +HEADERS += src/merge.h +HEADERS += src/poly.h +HEADERS += src/random.h +# qhull.h is for backwards compatibility +HEADERS += src/qhull_a.h +HEADERS += src/qset.h +HEADERS += src/stat.h +HEADERS += src/user.h + +OTHER_FILES += Announce.txt +OTHER_FILES += CMakeLists.txt +OTHER_FILES += COPYING.txt +OTHER_FILES += File_id.diz +OTHER_FILES += eg/q_eg +OTHER_FILES += eg/q_egtest +OTHER_FILES += eg/q_test +OTHER_FILES += html/index.htm +OTHER_FILES += html/qconvex.htm +OTHER_FILES += html/qdelau_f.htm +OTHER_FILES += html/qdelaun.htm +OTHER_FILES += html/qhalf.htm +OTHER_FILES += html/qh-code.htm +OTHER_FILES += html/qh-eg.htm +OTHER_FILES += html/qh-faq.htm +OTHER_FILES += html/qh-get.htm +OTHER_FILES += html/qh-impre.htm +OTHER_FILES += html/qh-optc.htm +OTHER_FILES += html/qh-optf.htm +OTHER_FILES += html/qh-optg.htm +OTHER_FILES += html/qh-opto.htm +OTHER_FILES += html/qh-optp.htm +OTHER_FILES += html/qh-optq.htm +OTHER_FILES += html/qh-optt.htm +OTHER_FILES += html/qh-quick.htm +OTHER_FILES += html/qhull.htm +OTHER_FILES += html/qhull.man +OTHER_FILES += html/qhull.txt +OTHER_FILES += html/qhull-cpp.xml +OTHER_FILES += html/qvoron_f.htm +OTHER_FILES += html/qvoronoi.htm +OTHER_FILES += html/rbox.htm +OTHER_FILES += html/rbox.man +OTHER_FILES += html/rbox.txt +OTHER_FILES += index.htm +OTHER_FILES += README.txt +OTHER_FILES += REGISTER.txt +OTHER_FILES += src/Changes.txt +OTHER_FILES += src/CMakeLists.txt +OTHER_FILES += src/index.htm +OTHER_FILES += src/Make-config.sh +OTHER_FILES += src/Makefile.txt +OTHER_FILES += src/Mborland +OTHER_FILES += src/qh-geom.htm +OTHER_FILES += src/qh-globa.htm +OTHER_FILES += src/qh-io.htm +OTHER_FILES += src/qh-mem.htm +OTHER_FILES += src/qh-merge.htm +OTHER_FILES += src/qh-poly.htm +OTHER_FILES += src/qh-qhull.htm +OTHER_FILES += src/qh-set.htm +OTHER_FILES += src/qh-stat.htm +OTHER_FILES += src/qh-user.htm diff --git a/project/qconvex/qconvex.pro b/project/qconvex/qconvex.pro index 1c8bbb8369040d93af4d0e22c621104d38c61108..3e7786ce6a31f8bc6c2a12564305065123d49792 100644 --- a/project/qconvex/qconvex.pro +++ b/project/qconvex/qconvex.pro @@ -9,8 +9,8 @@ CONFIG += console warn_on CONFIG -= app_bundle LIBS += -L../.. QMAKE_CFLAGS_WARN_ON += -Werror -Wall -Wcast-qual -Wextra -Wshadow -Wwrite-strings -QMAKE_CFLAGS_WARN_ON += -Wno-sign-conversion # Many size_t vs. int errors -#QMAKE_CFLAGS_WARN_ON += -Wconversion # no workaround for bit-field conversion errors +QMAKE_CFLAGS_WARN_ON += -Wno-sign-conversion # Many size_t vs. int warnings +#QMAKE_CFLAGS_WARN_ON += -Wconversion # No workaround for bit-field conversions build_pass:CONFIG(debug, debug|release):{ LIBS += libqhulld PRE_TARGETDEPS += ../../libqhulld.a diff --git a/project/qdelaunay/qdelaunay.pro b/project/qdelaunay/qdelaunay.pro index e683ea1c40fc115b691256a2181f3e33dd75cf22..6ca740c197519ebcd5b609d142616c99a6d5fe64 100644 --- a/project/qdelaunay/qdelaunay.pro +++ b/project/qdelaunay/qdelaunay.pro @@ -9,8 +9,8 @@ CONFIG += console warn_on CONFIG -= app_bundle LIBS += -L../.. QMAKE_CFLAGS_WARN_ON += -Werror -Wall -Wcast-qual -Wextra -Wshadow -Wwrite-strings -QMAKE_CFLAGS_WARN_ON += -Wno-sign-conversion # Many size_t vs. int errors -#QMAKE_CFLAGS_WARN_ON += -Wconversion # no workaround for bit-field conversion errors +QMAKE_CFLAGS_WARN_ON += -Wno-sign-conversion # Many size_t vs. int warnings +#QMAKE_CFLAGS_WARN_ON += -Wconversion # No workaround for bit-field conversions build_pass:CONFIG(debug, debug|release):{ LIBS += libqhulld PRE_TARGETDEPS += ../../libqhulld.a diff --git a/project/qhalf/qhalf.pro b/project/qhalf/qhalf.pro index f5a6223ffcd1795fb717418c81841485cd0ee5d8..cac4097815d9f96ea9437d94fdd2612599585b6f 100644 --- a/project/qhalf/qhalf.pro +++ b/project/qhalf/qhalf.pro @@ -9,8 +9,8 @@ CONFIG += console warn_on CONFIG -= app_bundle LIBS += -L../.. QMAKE_CFLAGS_WARN_ON += -Werror -Wall -Wcast-qual -Wextra -Wshadow -Wwrite-strings -QMAKE_CFLAGS_WARN_ON += -Wno-sign-conversion # Many size_t vs. int errors -#QMAKE_CFLAGS_WARN_ON += -Wconversion # no workaround for bit-field conversion errors +QMAKE_CFLAGS_WARN_ON += -Wno-sign-conversion # Many size_t vs. int warnings +#QMAKE_CFLAGS_WARN_ON += -Wconversion # No workaround for bit-field conversions build_pass:CONFIG(debug, debug|release):{ LIBS += libqhulld PRE_TARGETDEPS += ../../libqhulld.a diff --git a/project/qhull/qhull.pro b/project/qhull/qhull.pro index e07f892f7de4c79da9784ad9a970da37f771892b..9911e3450e42eb2af900c43afb30e597a5e5e946 100644 --- a/project/qhull/qhull.pro +++ b/project/qhull/qhull.pro @@ -9,8 +9,8 @@ CONFIG += console warn_on CONFIG -= app_bundle LIBS += -L../.. QMAKE_CFLAGS_WARN_ON += -Werror -Wall -Wcast-qual -Wextra -Wshadow -Wwrite-strings -QMAKE_CFLAGS_WARN_ON += -Wno-sign-conversion # Many size_t vs. int errors -#QMAKE_CFLAGS_WARN_ON += -Wconversion # no workaround for bit-field conversion errors +QMAKE_CFLAGS_WARN_ON += -Wno-sign-conversion # Many size_t vs. int warnings +#QMAKE_CFLAGS_WARN_ON += -Wconversion # No workaround for bit-field conversions build_pass:CONFIG(debug, debug|release):{ LIBS += libqhulld PRE_TARGETDEPS += ../../libqhulld.a diff --git a/project/qhulltest/qhulltest.pro b/project/qhulltest/qhulltest.pro index 19ac3cdee70ec58ce663dec734c7b0c5753051f2..5fee164139fba4f1bbe89ab4c50c642c16fccbb5 100644 --- a/project/qhulltest/qhulltest.pro +++ b/project/qhulltest/qhulltest.pro @@ -10,8 +10,8 @@ CONFIG -= app_bundle LIBS += -L../.. DEFINES += qh_QHpointer QMAKE_CXXFLAGS_WARN_ON += -Werror -Wall -Wcast-qual -Wextra -Wwrite-strings -QMAKE_CXXFLAGS_WARN_ON += -Wno-sign-conversion # Many size_t vs. int errors -#QMAKE_CXXFLAGS_WARN_ON += -Wconversion # no workaround for bit-field conversion errors +QMAKE_CXXFLAGS_WARN_ON += -Wno-sign-conversion # Many size_t vs. int warnings +#QMAKE_CXXFLAGS_WARN_ON += -Wconversion # No workaround for bit-field conversions build_pass:CONFIG(debug, debug|release):{ LIBS += libqhullcppd PRE_TARGETDEPS += ../../libqhullcppd.a diff --git a/project/qvoronoi/qvoronoi.pro b/project/qvoronoi/qvoronoi.pro index 83721f8dde9f6551e8264c39755b617a2e3380a1..b2fce33433f5f5484cf3d829fdab2615c044efc5 100644 --- a/project/qvoronoi/qvoronoi.pro +++ b/project/qvoronoi/qvoronoi.pro @@ -9,8 +9,8 @@ CONFIG += console warn_on CONFIG -= app_bundle LIBS += -L../.. QMAKE_CFLAGS_WARN_ON += -Werror -Wall -Wcast-qual -Wextra -Wshadow -Wwrite-strings -QMAKE_CFLAGS_WARN_ON += -Wno-sign-conversion # Many size_t vs. int errors -#QMAKE_CFLAGS_WARN_ON += -Wconversion # no workaround for bit-field conversion errors +QMAKE_CFLAGS_WARN_ON += -Wno-sign-conversion # Many size_t vs. int warnings +#QMAKE_CFLAGS_WARN_ON += -Wconversion # No workaround for bit-field conversions build_pass:CONFIG(debug, debug|release):{ LIBS += libqhulld PRE_TARGETDEPS += ../../libqhulld.a diff --git a/project/rbox/rbox.pro b/project/rbox/rbox.pro index c7ce876ddb6abe77d05a7268554e010e64d8a4e9..c47eeb3d3bab925bb6db332aae3ab5c9e58f9d67 100644 --- a/project/rbox/rbox.pro +++ b/project/rbox/rbox.pro @@ -7,8 +7,8 @@ TEMPLATE = app CONFIG += console warn_on LIBS += -L../.. QMAKE_CFLAGS_WARN_ON += -Werror -Wall -Wcast-qual -Wextra -Wshadow -Wwrite-strings -QMAKE_CFLAGS_WARN_ON += -Wno-sign-conversion # Many size_t vs. int errors -#QMAKE_CFLAGS_WARN_ON += -Wconversion # no workaround for bit-field conversion errors +QMAKE_CFLAGS_WARN_ON += -Wno-sign-conversion # Many size_t vs. int warnings +#QMAKE_CFLAGS_WARN_ON += -Wconversion # No workaround for bit-field conversions build_pass:CONFIG(debug, debug|release):{ LIBS += libqhulld PRE_TARGETDEPS += ../../libqhulld.a diff --git a/project/user_eg/user_eg.pro b/project/user_eg/user_eg.pro index a77b143504dbad70c10ee23c5d69f3ab63805061..d0def9b16510943857d858f345a0c647ee59b221 100644 --- a/project/user_eg/user_eg.pro +++ b/project/user_eg/user_eg.pro @@ -9,8 +9,8 @@ CONFIG -= app_bundle LIBS += -L../.. DEFINES += qh_QHpointer QMAKE_CFLAGS_WARN_ON += -Werror -Wall -Wcast-qual -Wextra -Wshadow -Wwrite-strings -QMAKE_CFLAGS_WARN_ON += -Wno-sign-conversion # Many size_t vs. int errors -#QMAKE_CFLAGS_WARN_ON += -Wconversion # no workaround for bit-field conversion errors +QMAKE_CFLAGS_WARN_ON += -Wno-sign-conversion # Many size_t vs. int warnings +#QMAKE_CFLAGS_WARN_ON += -Wconversion # No workaround for bit-field conversions build_pass:CONFIG(debug, debug|release):{ LIBS += libqhullpd PRE_TARGETDEPS += ../../libqhullpd.a diff --git a/project/user_eg2/user_eg2.pro b/project/user_eg2/user_eg2.pro index 875210056feb5b843999385e2c5f8a3acc194e58..6ecaf0f1ede4dfce65ef2a59bfc8d67bafe3f210 100644 --- a/project/user_eg2/user_eg2.pro +++ b/project/user_eg2/user_eg2.pro @@ -8,8 +8,8 @@ CONFIG += console warn_on CONFIG -= app_bundle LIBS += -L../.. QMAKE_CFLAGS_WARN_ON += -Werror -Wall -Wcast-qual -Wextra -Wshadow -Wwrite-strings -QMAKE_CFLAGS_WARN_ON += -Wno-sign-conversion # Many size_t vs. int errors -#QMAKE_CFLAGS_WARN_ON += -Wconversion # no workaround for bit-field conversion errors +QMAKE_CFLAGS_WARN_ON += -Wno-sign-conversion # Many size_t vs. int warnings +#QMAKE_CFLAGS_WARN_ON += -Wconversion # No workaround for bit-field conversions build_pass:CONFIG(debug, debug|release):{ LIBS += libqhulld PRE_TARGETDEPS += ../../libqhulld.a diff --git a/project/user_eg3/user_eg3.pro b/project/user_eg3/user_eg3.pro index fb575f5a5516d6fc2e02a0b165ad6bc2c61447fd..048ffcde29035a0156c740c39ef1d188bc4710cc 100644 --- a/project/user_eg3/user_eg3.pro +++ b/project/user_eg3/user_eg3.pro @@ -8,8 +8,8 @@ CONFIG += console warn_on LIBS += -L../.. DEFINES += qh_QHpointer QMAKE_CXXFLAGS_WARN_ON += -Werror -Wall -Wcast-qual -Wextra -Wwrite-strings -QMAKE_CXXFLAGS_WARN_ON += -Wno-sign-conversion # Many size_t vs. int errors -#QMAKE_CXXFLAGS_WARN_ON += -Wconversion # no workaround for bit-field conversion errors +QMAKE_CXXFLAGS_WARN_ON += -Wno-sign-conversion # Many size_t vs. int warnings +#QMAKE_CXXFLAGS_WARN_ON += -Wconversion # No workaround for bit-field conversions build_pass:CONFIG(debug, debug|release):{ LIBS += libqhullcppd PRE_TARGETDEPS += ../../libqhullcppd.a