Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Leander Schulten
Lichtsteuerung
Commits
a916d96d
Commit
a916d96d
authored
Sep 29, 2019
by
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
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/Lichtsteuerung.pro
View file @
a916d96d
...
...
@@ -248,13 +248,12 @@ win32-g++{
}
}
win32-g++{
#Aubio
!contains(QT_ARCH, i386){ # 64 bit
LIBS +=
-L$$PWD/'lib
/
aubio
/
lib
/
'
-laubio-5
INCLUDEPATH += $$PWD/'lib
/
aubio
/
include'
}
}
LIBS += -L$$PWD/'lib
/
aubio
/
lib
/
'
win32:
LIBS += -laubio-5
else: LIBS += -laubio
INCLUDEPATH += $$PWD/'lib
/
aubio
/
include'
#segvcatch
LIBS += -L$$PWD/'lib
/
segvcatch
/
lib' -lsegvcatch
...
...
src/lib/aubio/build_aubio.sh
View file @
a916d96d
...
...
@@ -14,7 +14,10 @@ if [ "$(expr substr $(uname -s) 1 5)" == "MINGW" ]; then
# we are on windows
./waf configure
--disable-wavwrite
--disable-wavread
--msvc_version
=
'mingw'
--prefix
=
""
else
# we are on linux and cross compile
./waf configure
--disable-wavwrite
--disable-wavread
--with-target-platform
=
win64
--prefix
=
""
if
!
[[
-z
"
$GITLAB_CI
"
]]
;
then
# we are on the ci
TARGET
=
"--with-target-platform=win64"
fi
./waf configure
--disable-wavwrite
--disable-wavread
$TARGET
--prefix
=
""
fi
./waf
install
--disable-tests
--disable-examples
--destdir
"
$PWD
/../"
\ No newline at end of file
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment