|
|
|
|
@ -371,8 +371,8 @@ diff -up ./FAQ.html.orig ./FAQ.html
|
|
|
|
|
diff -up ./svm-predict.c.orig ./svm-predict.c
|
|
|
|
|
diff -up ./svm-toy/qt/Makefile.orig ./svm-toy/qt/Makefile
|
|
|
|
|
--- ./svm-toy/qt/Makefile.orig 2007-10-14 16:29:12.000000000 +1000
|
|
|
|
|
+++ ./svm-toy/qt/Makefile 2008-04-02 15:27:24.000000000 +1000
|
|
|
|
|
@@ -1,19 +1,46 @@
|
|
|
|
|
+++ ./svm-toy/qt/Makefile 2008-04-03 12:27:41.000000000 +1000
|
|
|
|
|
@@ -1,19 +1,47 @@
|
|
|
|
|
CXX? = g++
|
|
|
|
|
-CFLAGS = -Wall -O3 -DQT_THREAD_SUPPORT
|
|
|
|
|
-BIN = $(QTDIR)/bin
|
|
|
|
|
@ -381,7 +381,6 @@ diff -up ./svm-toy/qt/Makefile.orig ./svm-toy/qt/Makefile
|
|
|
|
|
-#BIN = /usr/bin
|
|
|
|
|
-#INCLUDE = /usr/include/qt3
|
|
|
|
|
-#LIB = /usr/lib/qt3
|
|
|
|
|
+#CFLAGS = -Wall -O3 -DQT_THREAD_SUPPORT
|
|
|
|
|
+CFLAGS = -Wall -O3
|
|
|
|
|
+QT4_DIR= $(shell if [ -e /usr/lib/qt4 ]; then echo /usr/lib/qt4; fi)
|
|
|
|
|
+#LIBDIR=/usr/lib64
|
|
|
|
|
@ -392,7 +391,11 @@ diff -up ./svm-toy/qt/Makefile.orig ./svm-toy/qt/Makefile
|
|
|
|
|
+ifdef QT4_DIR
|
|
|
|
|
+ QTDIR=/usr/lib/qt4
|
|
|
|
|
+ BIN = ${QTDIR}/bin
|
|
|
|
|
+ FLAGS=${CFLAGS} -I/usr/include/Qt -DQT3_SUPPORT `pkg-config --cflags --libs Qt3Support QtGui`
|
|
|
|
|
+ FLAGS=${CFLAGS} -I/usr/include/Qt -DQT3_SUPPORT -DQT_INCLUDE_COMPAT `pkg-config --cflags --libs Qt3Support QtGui`
|
|
|
|
|
+ QT3_TO_4=$(shell if [ -e ${BIN}/qt3to4 ]; then echo ${BIN}/qt3to4; fi)
|
|
|
|
|
+ ifndef QT3_TO4
|
|
|
|
|
+ QT3_TO_4=/usr/bin/qt3to4
|
|
|
|
|
+ endif
|
|
|
|
|
+else
|
|
|
|
|
+ QTDIR=${LIBDIR}/qt-3.3
|
|
|
|
|
+ BIN = ${QTDIR}/bin
|
|
|
|
|
@ -415,19 +418,17 @@ diff -up ./svm-toy/qt/Makefile.orig ./svm-toy/qt/Makefile
|
|
|
|
|
- cd ../..; make svm.o
|
|
|
|
|
+
|
|
|
|
|
+svm-toy.moc: svm-toy.new.cpp
|
|
|
|
|
+ echo "LIBDIR=${LIBDIR}"
|
|
|
|
|
+ echo "QTDIR=${QTDIR}"
|
|
|
|
|
+ echo "FLAGS=${FLAGS}"
|
|
|
|
|
+# echo "LIBDIR=${LIBDIR}"
|
|
|
|
|
+# echo "QTDIR=${QTDIR}"
|
|
|
|
|
+# echo "FLAGS=${FLAGS}"
|
|
|
|
|
+ ${BIN}/moc svm-toy.new.cpp -o svm-toy.moc
|
|
|
|
|
+#../../svm.o:
|
|
|
|
|
+# cd ../..; make svm.o
|
|
|
|
|
+
|
|
|
|
|
+svm-toy.new.cpp: svm-toy.cpp
|
|
|
|
|
+ echo "LIBDIR=${LIBDIR}"
|
|
|
|
|
+ echo "QTDIR=${QTDIR}"
|
|
|
|
|
+ echo "FLAGS=${FLAGS}"
|
|
|
|
|
+ cp svm-toy.cpp svm-toy.new.cpp
|
|
|
|
|
+ifdef QT4_DIR
|
|
|
|
|
+ /usr/lib/qt4/bin/qt3to4 -alwaysOverwrite svm-toy.new.cpp
|
|
|
|
|
+ ${QT3_TO4$} -alwaysOverwrite svm-toy.new.cpp
|
|
|
|
|
+endif
|
|
|
|
|
+
|
|
|
|
|
clean:
|
|
|
|
|
|
Ding-Yi Chen
17 years ago