Commit a916d96d authored by Leander Schulten's avatar Leander Schulten
Browse files

Build: Use Aubio from src/lib/aubio on every OS

parent be2e891a
Pipeline #188665 passed with stage
in 4 minutes and 42 seconds
...@@ -248,13 +248,12 @@ win32-g++{ ...@@ -248,13 +248,12 @@ win32-g++{
} }
} }
win32-g++{
#Aubio #Aubio
!contains(QT_ARCH, i386){ # 64 bit LIBS += -L$$PWD/'lib/aubio/lib/'
LIBS += -L$$PWD/'lib/aubio/lib/' -laubio-5 win32: LIBS += -laubio-5
INCLUDEPATH += $$PWD/'lib/aubio/include' else: LIBS += -laubio
} INCLUDEPATH += $$PWD/'lib/aubio/include'
}
#segvcatch #segvcatch
LIBS += -L$$PWD/'lib/segvcatch/lib' -lsegvcatch LIBS += -L$$PWD/'lib/segvcatch/lib' -lsegvcatch
......
...@@ -14,7 +14,10 @@ if [ "$(expr substr $(uname -s) 1 5)" == "MINGW" ]; then ...@@ -14,7 +14,10 @@ if [ "$(expr substr $(uname -s) 1 5)" == "MINGW" ]; then
# we are on windows # we are on windows
./waf configure --disable-wavwrite --disable-wavread --msvc_version='mingw' --prefix= "" ./waf configure --disable-wavwrite --disable-wavread --msvc_version='mingw' --prefix= ""
else else
# we are on linux and cross compile if ! [[ -z "$GITLAB_CI" ]]; then
./waf configure --disable-wavwrite --disable-wavread --with-target-platform=win64 --prefix= "" # we are on the ci
TARGET="--with-target-platform=win64"
fi
./waf configure --disable-wavwrite --disable-wavread $TARGET --prefix= ""
fi fi
./waf install --disable-tests --disable-examples --destdir "$PWD/../" ./waf install --disable-tests --disable-examples --destdir "$PWD/../"
\ No newline at end of file
Markdown is supported
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