diff --git a/CMakeLists.txt b/CMakeLists.txt index 71096d4..fcce773 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,9 +5,9 @@ message(STATUS "Initiating compile using CMake ${CMAKE_VERSION}") set(THREADS_PREFER_PTHREAD_FLAG ON) set(VERSION_MAJOR "2") -set(VERSION_MINOR "0") +set(VERSION_MINOR "1") set(VERSION_REVISION "0") -set(VERSION "beta-2") +set(VERSION "beta-3") option(FETCH_DEPS "Download dependencies if they are not found" ON) option(XMRIG "Include XMRig module" ON) diff --git a/Makefile b/Makefile index dd004f7..7bb7ab9 100644 --- a/Makefile +++ b/Makefile @@ -27,7 +27,6 @@ # THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY CMAKEFLAGS = \ - -DARCH=x86_64 \ -DBUILD_64=On \ -DBUILD_TESTS=Off \ -DOPENVR=Off \ diff --git a/contrib/debian/build-deb.sh b/contrib/debian/build-deb.sh index a20a546..60a655f 100755 --- a/contrib/debian/build-deb.sh +++ b/contrib/debian/build-deb.sh @@ -43,4 +43,4 @@ cp "$PWD/src/assets/images/appicons/256x256.png" "$DEBDIR/usr/share/icons/hicolo # Build deb package dpkg-deb --build $DEBDIR -mv wowlet.DebDir.deb wowlet_2.0_amd64.deb +mv wowlet.DebDir.deb wowlet_2.1_amd64.deb diff --git a/contrib/debian/changelog.gz b/contrib/debian/changelog.gz index 794b504..90f6c7d 100644 Binary files a/contrib/debian/changelog.gz and b/contrib/debian/changelog.gz differ diff --git a/contrib/debian/control b/contrib/debian/control index a0627b8..b133597 100644 --- a/contrib/debian/control +++ b/contrib/debian/control @@ -1,5 +1,5 @@ Package: wowlet -Version: 2.0 +Version: 2.1 Section: net Priority: optional Architecture: amd64 diff --git a/docs/BUILDING.md b/docs/BUILDING.md index 57c2b75..9a02877 100644 --- a/docs/BUILDING.md +++ b/docs/BUILDING.md @@ -27,7 +27,7 @@ Replace `master` with the desired version tag (e.g. `beta-4`) to build the relea #### 2. Base image ```bash -docker build --tag wowlet:linux --build-arg THREADS=4 . +docker build --tag wowlet:linux --build-arg THREADS=6 . ``` Building the base image takes a while. You only need to build the base image once. @@ -37,7 +37,7 @@ Building the base image takes a while. You only need to build the base image onc ##### Standalone binary ```bash -docker run --rm -it -v $PWD:/wowlet -w /wowlet wowlet:linux sh -c 'make release-static -j4' +docker run --rm -it -v $PWD:/wowlet -w /wowlet wowlet:linux sh -c 'make release-static -j6' ``` If you're re-running a build make sure to `rm -rf build/` first. @@ -67,7 +67,7 @@ Replace `master` with the desired version tag (e.g. `beta-4`) to build the relea ```bash -docker build -f Dockerfile.windows --tag wowlet:win --build-arg THREADS=4 . +docker build -f Dockerfile.windows --tag wowlet:win --build-arg THREADS=6 . ``` Building the base image takes a while. You only need to build the base image once. @@ -75,7 +75,7 @@ Building the base image takes a while. You only need to build the base image onc #### 3. Build ```bash -docker run --rm -it -v $PWD:/wowlet -w /wowlet wowlet:win sh -c 'make depends root=/depends target=x86_64-w64-mingw32 tag=win-x64 -j4' +docker run --rm -it -v $PWD:/wowlet -w /wowlet wowlet:win sh -c 'make windows root=/depends target=x86_64-w64-mingw32 tag=win-x64 -j6' ``` If you're re-running a build make sure to `rm -rf build/` first. diff --git a/src/main.cpp b/src/main.cpp index c54a072..4047355 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -135,6 +135,7 @@ if (AttachConsole(ATTACH_PARENT_PROCESS)) { qputenv("QML_DISABLE_DISK_CACHE", "1"); #endif +#ifdef __ANDROID__ if(android || androidDebug) { #ifndef HAS_QML qCritical() << "Wowlet compiled without QML support. Try -DQML=ON"; @@ -146,6 +147,7 @@ if (AttachConsole(ATTACH_PARENT_PROCESS)) { auto *mobile = new mobile::Mobile(ctx, &parser, &mobile_app); return mobile_app.exec(); } +#endif if(openVREnabled) { #ifdef HAS_OPENVR