summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfred <fred@home.lan>2011-04-06 17:41:18 (GMT)
committer fred <fred@home.lan>2011-04-06 17:41:18 (GMT)
commit0714ec4de4d5592d20e446d7147413f30f768642 (patch)
tree0fda09fd7bba487814ed477771f06f07ca8629f5
parent06cb4c2adca37c9b1ebdd0ab617a09f170c86557 (diff)
Added and removed .cpp files since master merge.
- removed Sound.cpp - added qLogging.cpp - modified the Makefile.am in accordance.
-rw-r--r--qt/Makefile.am12
-rw-r--r--qt/Qfreej.pro2
2 files changed, 7 insertions, 7 deletions
diff --git a/qt/Makefile.am b/qt/Makefile.am
index 8b92c88..4710fe4 100644
--- a/qt/Makefile.am
+++ b/qt/Makefile.am
@@ -23,9 +23,9 @@ BUILT_SOURCES = ui_qfreej.h \
moc_QqComboFilter.cpp \
moc_QqFiltersApplied.cpp \
moc_QqTabWidget.cpp \
- moc_Sound.cpp \
moc_qJackClient.cpp \
moc_qOpacity.cpp \
+ moc_qLogging.cpp \
moc_qEncoder.cpp
@@ -38,10 +38,10 @@ SOURCES = main.cpp \
specialeventget.cpp \
FakeWindow.cpp \
QqTabWidget.cpp \
- Sound.cpp \
qJackClient.cpp \
qOpacity.cpp \
qEncoder.cpp \
+ qLogging.cpp \
$(BUILT_SOURCES)
@@ -49,7 +49,7 @@ bin_PROGRAMS = qfreej
qfreej_SOURCES = $(SOURCES)
qfreej_LDADD = $(top_builddir)/src/libfreej.la $(SDL_LIBS) $(QTGUI_LIBS)
-clean:
- rm -f qfreej *.o
- rm -f moc_*.cpp moc_*.h
- rm -f ui_*.h \ No newline at end of file
+#clean:
+# rm -f qfreej *.o
+# rm -f moc_*.cpp moc_*.h
+# rm -f ui_*.h
diff --git a/qt/Qfreej.pro b/qt/Qfreej.pro
index 89c29ea..0d71763 100644
--- a/qt/Qfreej.pro
+++ b/qt/Qfreej.pro
@@ -35,7 +35,7 @@ SOURCES += main.cpp \
qLogging.h
#FORMS += qfreej.ui
CONFIG += qt debug
-LIBS += -L../src/.libs -lfreej
+LIBS += -lfreej
INCLUDEPATH += ../ \
/usr/include/SDL \
../lib/sdl_ttf \