diff options
| author | Konstantinos Sideris <sideris.konstantin@gmail.com> | 2018-09-08 23:37:24 +0300 |
|---|---|---|
| committer | Konstantinos Sideris <sideris.konstantin@gmail.com> | 2018-09-08 23:37:24 +0300 |
| commit | c347c0d5f5997857e211e8a254be2efbb61c2404 (patch) | |
| tree | 8a031ae8e8618f8dea628609fedd6c7e9f77dda3 /Makefile | |
| parent | Enable Qt auto scaling (diff) | |
| download | nheko-c347c0d5f5997857e211e8a254be2efbb61c2404.tar.xz | |
Fix the docker build
fixes #334
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/Makefile b/Makefile index 76299c89..2f688d3b 100644 --- a/Makefile +++ b/Makefile @@ -15,6 +15,10 @@ third-party: -DUSE_BUNDLED_BOOST=OFF @cmake --build ${DEPS_BUILD_DIR} +docker-third-party: + @cmake -GNinja -H${DEPS_SOURCE_DIR} -B${DEPS_BUILD_DIR} -DCMAKE_BUILD_TYPE=Release + @cmake --build ${DEPS_BUILD_DIR} + ci: cmake -H${DEPS_SOURCE_DIR} -B${DEPS_BUILD_DIR} -DCMAKE_BUILD_TYPE=Release cmake --build ${DEPS_BUILD_DIR} @@ -48,8 +52,12 @@ macos-deploy: docker-app-image: image docker run \ - -e CXX=g++-7 \ - -e CC=gcc-7 \ + -e CXX=g++-5 \ + -e CC=gcc-5 \ + -v `pwd`:/build nheko-app-image make docker-third-party + docker run \ + -e CXX=g++-5 \ + -e CC=gcc-5 \ -v `pwd`:/build nheko-app-image make release docker run \ --privileged \ |