added custom settings for windows nsis-5.1 setup script

LibreCAD · Oct 4, 2013 · c3be804 · c3be804
1 parent 4f14a8f
commit c3be804
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -23,6 +23,7 @@ unix/
 
 # Win/MSVC generated files and binaries
 windows/
+release/
 *.ncb
 *.suo
 *.idb
@@ -35,6 +36,8 @@ windows/
 *.rc
 *.bak
 custom-windows.bat
+custom*.nsh
+object_script.LibreCAD.*
 # Win/qmake generated project files
 #*.vcproj
 #*.sln

diff --git a/scripts/postprocess-windows/nsis-5.1.nsi b/scripts/postprocess-windows/nsis-5.1.nsi
@@ -1,6 +1,10 @@
 ;NSIS Modern User Interface
 ;Basic Example Script
 
+;--------------------------------
+;Include custom settings if exists
+  !include /NONFATAL "custom-5.1.nsh"
+
 ;--------------------------------
 ;Include Modern UI
 
@@ -78,9 +82,16 @@ ${EndIf}
 
 FunctionEnd
 
-!define Qt_Dir 		"C:\Qt"
-!define Qt_Version 	"5.1.1"
-!define Mingw_Ver  	"mingw48_32"
+;--- define Qt folders if not already defined in custom-5.1.nsh
+!ifndef Qt_Dir
+    !define Qt_Dir 	"C:\Qt"
+!endif
+!ifndef Qt_Version
+    !define Qt_Version 	"5.1.1"
+!endif
+!ifndef Mingw_Ver
+    !define Mingw_Ver 	"mingw48_32"
+!endif
 ;--- folder contains mingw32-make.exe
 !define MINGW_DIR 	"${Qt_Dir}\Tools\${Mingw_Ver}\bin"
 !define QTCREATOR_DIR 	"${Qt_Dir}\Tools\QtCreator\bin"