Commit af42cac0 authored by jcaceres's avatar jcaceres
Browse files

conflict on m resolved

parent 4aa06c64
......@@ -26,10 +26,10 @@ echo "qmake .pro built"
qmake -makefile -unix -o Makefile \
"CONFIG+=qt thread warn_on debug" \
"QMAKE_CXXFLAGS+=-Wno-deprecated -pg -g" \
"INCLUDEPATH+=/usr/include/stk" \
"INCLUDEPATH+=/usr/include/stk ../include" \
"DEFINES+=__LINUX_ALSA__ APP_NAME=$APP_NAME_QUOTES" \
"QMAKE_CLEAN+=$APP_NAME" \
"unix:LIBS+=-Xlinker -rpath $QTDIR/lib -lstk -lasound -ljack -lqwt" \
"unix:LIBS+=-Xlinker -rpath $QTDIR/lib -lstk -lasound -ljack" \
"unix:TARGET=$APP_NAME" \
"unix:target.path=/usr/bin" \
"unix:INSTALLS+=target" $APP_NAME.pro
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment