diff --git a/Makefile b/Makefile index 7f11d748..4410345a 100644 --- a/Makefile +++ b/Makefile @@ -31,7 +31,7 @@ build: .PHONY: pkg-gba pkg-gba: $(foreach file, $(wildcard build/*), cmake --build $(file) --target install;) - ${ENV_RUN} ./scripts/gba-pkg sample_project + ${ENV_RUN} ./scripts/pkg-gba sample_project .PHONY: install install: $(foreach file, $(wildcard build/*), cmake --build $(file) --target install;) @@ -84,6 +84,10 @@ devenv-destroy: devenv-shell: ${ENV_RUN} bash +.PHONY: setup-conan +setup-conan: + conan profile update settings.compiler.libcxx=libstdc++11 default + conan remote add -f bincrafters https://api.bintray.com/conan/bincrafters/public-conan .PHONY: conan conan: @mkdir -p conanbuild && cd conanbuild && conan install ../ --build=missing diff --git a/jenkins/linux/Jenkinsfile b/jenkins/linux/Jenkinsfile index 6bd6f313..f9ea1703 100644 --- a/jenkins/linux/Jenkinsfile +++ b/jenkins/linux/Jenkinsfile @@ -5,8 +5,7 @@ pipeline { stages { stage('Environment') { steps { - sh 'conan profile update settings.compiler.libcxx=libstdc++11 default' - sh 'conan remote add -f bincrafters https://api.bintray.com/conan/bincrafters/public-conan' + sh 'make setup-conan' sh 'make conan' } } diff --git a/scripts/gba-pkg b/scripts/pkg-gba similarity index 100% rename from scripts/gba-pkg rename to scripts/pkg-gba