Browse Source

Bump version to v2.1.0 and fix compile

pull/75/head
dsc 3 months ago
parent
commit
ae39e71061
  1. 4
      CMakeLists.txt
  2. 1
      Makefile
  3. 2
      contrib/debian/build-deb.sh
  4. BIN
      contrib/debian/changelog.gz
  5. 2
      contrib/debian/control
  6. 8
      docs/BUILDING.md
  7. 2
      src/main.cpp

4
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)

1
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 \

2
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

BIN
contrib/debian/changelog.gz

2
contrib/debian/control

@ -1,5 +1,5 @@
Package: wowlet
Version: 2.0
Version: 2.1
Section: net
Priority: optional
Architecture: amd64

8
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.

2
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

Loading…
Cancel
Save