Merge branch 'hotfix/v1.0.3'

hicknhack-software · Jan 23, 2015 · 4291534 · 4291534
2 parents e1994b9 + 054c3fa
commit 4291534
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,3 +1,5 @@
+Changes for 1.0.3 (released 2015-01-23):
+ * added Windows nmake support
 
 Changes for 1.0.2 (released 2014-12-14):
  * fixed Windows build again

diff --git a/README.md b/README.md
@@ -27,7 +27,7 @@ We faced these challanges and Twofold is the result.
 
 * C++11 compiler
   * Tested with GCC 4.9.1 on MinGW
-  * Tested with Visual Studio 2013 Community Edition Compiler (use jom)
+  * Tested with Visual Studio 2013 Community Edition Compiler
   * Other compilers might work, but are not currently tested
 * Qt 5.4.x
   * Tested with the binary distributions of Qt 5.4.0 on Windows

diff --git a/vendor/SourceMap.pro b/vendor/SourceMap.pro
@@ -43,6 +43,12 @@ compiler_clean.commands = -$(DEL_FILE) $$shell_path($$TARGET_NAME/Makefile)
 
 prepareBuild.depends = makeBuildFolder
 buildInstall.depends = prepareBuild
-install.depends = $(DESTDIR_TARGET) $(TARGET)
-empty.target = $(TARGET)
-QMAKE_EXTRA_TARGETS += makeBuildFolder prepareBuild buildInstall install compiler_clean empty
+
+win32:!win32-g++: install.depends = $(DESTDIR_TARGET)
+else {
+    install.depends = $(DESTDIR_TARGET) $(TARGET)
+    empty.target = "$(TARGET)"
+    empty.commands = cd .
+    QMAKE_EXTRA_TARGETS += empty
+}
+QMAKE_EXTRA_TARGETS += makeBuildFolder prepareBuild buildInstall install compiler_clean