LIBS += ../lib/libvicar.a
-CONFIG += qt debug
+CONFIG += qt debug console
+CONFIG -= app_bundle
+
QT += dbus sql
QT -= gui
TEMPLATE = app
TARGET = vicar-daemon
+<<<<<<< HEAD
+
+VPATH += cpp
+MOC_DIR = cpp/.mocs
+OBJECTS_DIR = cpp/.objs
+
+=======
CONFIG += console
CONFIG -= app_bundle
MOC_DIR = cpp/.mocs
OBJECTS_DIR = cpp/.objs
+>>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
SOURCES += cpp/main.cpp \
cpp/callrouter.cpp \
cpp/vicardbusadaptor.cpp