From 185bd780591cdfc0cd40c4b4b9804f60d015621f Mon Sep 17 00:00:00 2001
From: Aditya Kulkarni <adityapk@gmail.com>
Date: Wed, 19 Jun 2019 10:46:59 -0700
Subject: [PATCH] Windows docker build

---
 ui/.gitignore       |  7 ++++++-
 ui/papersapling.pro | 13 +++++++------
 ui/qtlib/Makefile   |  7 ++++++-
 3 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/ui/.gitignore b/ui/.gitignore
index a76edbf..7417392 100644
--- a/ui/.gitignore
+++ b/ui/.gitignore
@@ -1,6 +1,11 @@
 bin/
+debug/
+release/
 Makefile
+Makefile.Debug
+Makefile.Release
 .qmake.stash
 papersapling
+papersapling_plugin_import.cpp
 papersapling.pro.user
-.vscode/
\ No newline at end of file
+.vscode/
diff --git a/ui/papersapling.pro b/ui/papersapling.pro
index a0a7c3f..873d068 100644
--- a/ui/papersapling.pro
+++ b/ui/papersapling.pro
@@ -61,8 +61,11 @@ FORMS += \
 INCLUDEPATH += $$PWD/qtlib/src
 DEPENDPATH  += $$PWD/qtlib/src
 
-librust.target   = $$PWD/qtlib/target/release/libzecpaperrust.a
-librust.commands = $(MAKE) -C $$PWD/qtlib 
+unix:        librust.target   = $$PWD/qtlib/target/release/libzecpaperrust.a
+else:win32:  librust.target   = $$PWD/qtlib/target/x86_64-pc-windows-gnu/release/zecpaperrust.lib
+
+unix:        librust.commands = $(MAKE) -C $$PWD/qtlib 
+else:win32:  librust.commands = $(MAKE) -C $$PWD/qtlib winrelease
 
 librustclean.commands = "rm -rf $$PWD/qtlib/target"
 distclean.depends += librustclean
@@ -77,10 +80,8 @@ else: unix:!android: target.path = /opt/$${TARGET}/bin
 !isEmpty(target.path): INSTALLS += target
 
 
-win32: LIBS += -L$$PWD/qtlib/target/release -lzecpaperrust
+win32: LIBS += -L$$PWD/qtlib/target/x86_64-pc-windows-gnu/release -lzecpaperrust
 else:unix: LIBS += -L$$PWD/qtlib/target/release -lzecpaperrust -ldl
 
-
-win32-g++: PRE_TARGETDEPS += $$PWD/qtlib/target/release/libzecpaperrust.a
-else:win32:!win32-g++: PRE_TARGETDEPS += $$PWD/qtlib/target/release/libzecpaperrust.lib
+win32: PRE_TARGETDEPS += $$PWD/qtlib/target/x86_64-pc-windows-gnu/release/zecpaperrust.lib
 else:unix::PRE_TARGETDEPS += $$PWD/qtlib/target/release/libzecpaperrust.a
diff --git a/ui/qtlib/Makefile b/ui/qtlib/Makefile
index e2880f4..992a8eb 100644
--- a/ui/qtlib/Makefile
+++ b/ui/qtlib/Makefile
@@ -6,6 +6,11 @@ endif
 
 all: release
 
+winrelease: target/x86_64-pc-windows-gnu/release/zecpaperrust.lib
+
+target/x86_64-pc-windows-gnu/release/zecpaperrust.lib: src/lib.rs Cargo.toml
+	cargo build --lib --release --target x86_64-pc-windows-gnu
+
 release: target/release/zecpaperrust.$(EXT)
 debug: target/debug/zecpaperrust.$(EXT) 
 
@@ -16,4 +21,4 @@ target/debug/zecpaperrust.$(EXT): src/lib.rs Cargo.toml
 	cargo build --lib
 
 clean:
-	rm -rf target
\ No newline at end of file
+	rm -rf target