|
|
|
@ -371,8 +371,8 @@ diff -up ./FAQ.html.orig ./FAQ.html
|
|
|
|
diff -up ./svm-predict.c.orig ./svm-predict.c
|
|
|
|
diff -up ./svm-predict.c.orig ./svm-predict.c
|
|
|
|
diff -up ./svm-toy/qt/Makefile.orig ./svm-toy/qt/Makefile
|
|
|
|
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.orig 2007-10-14 16:29:12.000000000 +1000
|
|
|
|
+++ ./svm-toy/qt/Makefile 2008-04-03 12:27:41.000000000 +1000
|
|
|
|
+++ ./svm-toy/qt/Makefile 2008-04-03 12:55:56.000000000 +1000
|
|
|
|
@@ -1,19 +1,47 @@
|
|
|
|
@@ -1,19 +1,48 @@
|
|
|
|
CXX? = g++
|
|
|
|
CXX? = g++
|
|
|
|
-CFLAGS = -Wall -O3 -DQT_THREAD_SUPPORT
|
|
|
|
-CFLAGS = -Wall -O3 -DQT_THREAD_SUPPORT
|
|
|
|
-BIN = $(QTDIR)/bin
|
|
|
|
-BIN = $(QTDIR)/bin
|
|
|
|
@ -389,12 +389,12 @@ diff -up ./svm-toy/qt/Makefile.orig ./svm-toy/qt/Makefile
|
|
|
|
-svm-toy: svm-toy.cpp svm-toy.moc ../../svm.o
|
|
|
|
-svm-toy: svm-toy.cpp svm-toy.moc ../../svm.o
|
|
|
|
- $(CXX) -I$(INCLUDE) $(CFLAGS) svm-toy.cpp ../../svm.o -o svm-toy -L$(LIB) -lqt-mt
|
|
|
|
- $(CXX) -I$(INCLUDE) $(CFLAGS) svm-toy.cpp ../../svm.o -o svm-toy -L$(LIB) -lqt-mt
|
|
|
|
+ifdef QT4_DIR
|
|
|
|
+ifdef QT4_DIR
|
|
|
|
+ QTDIR=/usr/lib/qt4
|
|
|
|
+ QTDIR=${QT4_DIR}
|
|
|
|
+ BIN = ${QTDIR}/bin
|
|
|
|
+ BIN = ${QTDIR}/bin
|
|
|
|
+ FLAGS=${CFLAGS} -I/usr/include/Qt -DQT3_SUPPORT -DQT_INCLUDE_COMPAT `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)
|
|
|
|
+ QT3_TO_4=$(shell if [ -e "${BIN}/qt3to4" ]; then echo "${BIN}/qt3to4"; fi)
|
|
|
|
+ ifndef QT3_TO4
|
|
|
|
+ ifndef QT3_TO_4
|
|
|
|
+ QT3_TO_4=/usr/bin/qt3to4
|
|
|
|
+ QT3_TO_4=$(shell if [ -e /usr/bin/qt3to4 ]; then echo /usr/bin/qt3to4; fi)
|
|
|
|
+ endif
|
|
|
|
+ endif
|
|
|
|
+else
|
|
|
|
+else
|
|
|
|
+ QTDIR=${LIBDIR}/qt-3.3
|
|
|
|
+ QTDIR=${LIBDIR}/qt-3.3
|
|
|
|
@ -419,16 +419,17 @@ diff -up ./svm-toy/qt/Makefile.orig ./svm-toy/qt/Makefile
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+svm-toy.moc: svm-toy.new.cpp
|
|
|
|
+svm-toy.moc: svm-toy.new.cpp
|
|
|
|
+# echo "LIBDIR=${LIBDIR}"
|
|
|
|
+# echo "LIBDIR=${LIBDIR}"
|
|
|
|
+# echo "QTDIR=${QTDIR}"
|
|
|
|
|
|
|
|
+# echo "FLAGS=${FLAGS}"
|
|
|
|
+# echo "FLAGS=${FLAGS}"
|
|
|
|
+ ${BIN}/moc svm-toy.new.cpp -o svm-toy.moc
|
|
|
|
+ ${BIN}/moc svm-toy.new.cpp -o svm-toy.moc
|
|
|
|
+#../../svm.o:
|
|
|
|
+#../../svm.o:
|
|
|
|
+# cd ../..; make svm.o
|
|
|
|
+# cd ../..; make svm.o
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+svm-toy.new.cpp: svm-toy.cpp
|
|
|
|
+svm-toy.new.cpp: svm-toy.cpp
|
|
|
|
|
|
|
|
+# echo "QTDIR=${QTDIR}"
|
|
|
|
+ cp svm-toy.cpp svm-toy.new.cpp
|
|
|
|
+ cp svm-toy.cpp svm-toy.new.cpp
|
|
|
|
+ifdef QT4_DIR
|
|
|
|
+ifdef QT4_DIR
|
|
|
|
+ ${QT3_TO4$} -alwaysOverwrite svm-toy.new.cpp
|
|
|
|
+ echo "QT3_TO_4=${QT3_TO_4}"
|
|
|
|
|
|
|
|
+ ${QT3_TO_4} -alwaysOverwrite svm-toy.new.cpp
|
|
|
|
+endif
|
|
|
|
+endif
|
|
|
|
+
|
|
|
|
+
|
|
|
|
clean:
|
|
|
|
clean:
|
|
|
|
|
Ding-Yi Chen
17 years ago