Merge branch 'master' into issue364

10 files changed, 1085 insertions, 68 deletions

diff --git a/scripts/LogicLib.nsh b/scripts/LogicLib.nsh
new file mode 100644
index 0000000..2f8968c
--- /dev/null
+++ b/scripts/LogicLib.nsh
@@ -0,0 +1,792 @@
+; NSIS LOGIC LIBRARY - LogicLib.nsh

+; Version 2.6 - 08/12/2007

+; By dselkirk@hotmail.com

+; and eccles@users.sf.net

+; with IfNot support added by Message

+;

+; Questions/Comments -

+; See http://forums.winamp.com/showthread.php?s=&postid=1116241

+;

+; Description:

+;   Provides the use of various logic statements within NSIS.

+;

+; Usage:

+;   The following "statements" are available:

+;       If|IfNot|Unless..{ElseIf|ElseIfNot|ElseUnless}..[Else]..EndIf|EndUnless

+;         - Conditionally executes a block of statements, depending on the value

+;           of an expression. IfNot and Unless are equivalent and

+;           interchangeable, as are ElseIfNot and ElseUnless.

+;       AndIf|AndIfNot|AndUnless|OrIf|OrIfNot|OrUnless

+;         - Adds any number of extra conditions to If, IfNot, Unless, ElseIf,

+;           ElseIfNot and ElseUnless statements.

+;       IfThen|IfNotThen..|..|

+;         - Conditionally executes an inline statement, depending on the value

+;           of an expression.

+;       IfCmd..||..|

+;         - Conditionally executes an inline statement, depending on a true

+;           value of the provided NSIS function.

+;       Select..{Case[2|3|4|5]}..[CaseElse|Default]..EndSelect

+;         - Executes one of several blocks of statements, depending on the value

+;           of an expression.

+;       Switch..{Case|CaseElse|Default}..EndSwitch

+;         - Jumps to one of several labels, depending on the value of an

+;           expression.

+;       Do[While|Until]..{ExitDo|Continue|Break}..Loop[While|Until]

+;         - Repeats a block of statements until stopped, or depending on the

+;           value of an expression.

+;       While..{ExitWhile|Continue|Break}..EndWhile

+;         - An alias for DoWhile..Loop (for backwards-compatibility)

+;       For[Each]..{ExitFor|Continue|Break}..Next

+;         - Repeats a block of statements varying the value of a variable.

+;

+;   The following "expressions" are available:

+;       Standard (built-in) string tests (which are case-insensitive):

+;         a == b; a != b

+;       Additional case-insensitive string tests (using System.dll):

+;         a S< b; a S>= b; a S> b; a S<= b

+;       Case-sensitive string tests:

+;         a S== b; a S!= b

+;       Standard (built-in) signed integer tests:

+;         a = b; a <> b; a < b; a >= b; a > b; a <= b

+;       Standard (built-in) unsigned integer tests:

+;         a U< b; a U>= b; a U> b; a U<= b

+;       64-bit integer tests (using System.dll):

+;         a L= b; a L<> b; a L< b; a L>= b; a L> b; a L<= b

+;       Built-in NSIS flag tests:

+;         ${Abort}; ${Errors}; ${RebootFlag}; ${Silent}

+;       Built-in NSIS other tests:

+;         ${FileExists} a

+;       Any conditional NSIS instruction test:

+;         ${Cmd} a

+;       Section flag tests:

+;         ${SectionIsSelected} a; ${SectionIsSectionGroup} a;

+;         ${SectionIsSectionGroupEnd} a; ${SectionIsBold} a;

+;         ${SectionIsReadOnly} a; ${SectionIsExpanded} a;

+;         ${SectionIsPartiallySelected} a

+;

+; Examples:

+;   See LogicLib.nsi in the Examples folder for lots of example usage.

+

+!verbose push

+!verbose 3

+!ifndef LOGICLIB_VERBOSITY

+  !define LOGICLIB_VERBOSITY 3

+!endif

+!define _LOGICLIB_VERBOSITY ${LOGICLIB_VERBOSITY}

+!undef LOGICLIB_VERBOSITY

+!verbose ${_LOGICLIB_VERBOSITY}

+

+!ifndef LOGICLIB

+  !define LOGICLIB

+  !define | "'"

+  !define || "' '"

+  !define LOGICLIB_COUNTER 0

+

+  !include Sections.nsh

+

+  !macro _LOGICLIB_TEMP

+    !ifndef _LOGICLIB_TEMP

+      !define _LOGICLIB_TEMP

+      Var /GLOBAL _LOGICLIB_TEMP  ; Temporary variable to aid the more elaborate logic tests

+    !endif

+  !macroend

+

+  !macro _IncreaseCounter

+    !define _LOGICLIB_COUNTER ${LOGICLIB_COUNTER}

+    !undef LOGICLIB_COUNTER

+    !define /math LOGICLIB_COUNTER ${_LOGICLIB_COUNTER} + 1

+    !undef _LOGICLIB_COUNTER

+  !macroend

+

+  !macro _PushLogic

+    !insertmacro _PushScope Logic _LogicLib_Label_${LOGICLIB_COUNTER}

+    !insertmacro _IncreaseCounter

+  !macroend

+

+  !macro _PopLogic

+    !insertmacro _PopScope Logic

+  !macroend

+

+  !macro _PushScope Type label

+    !ifdef _${Type}                                       ; If we already have a statement

+      !define _Cur${Type} ${_${Type}}

+      !undef _${Type}

+      !define _${Type} ${label}

+      !define ${_${Type}}Prev${Type} ${_Cur${Type}}       ; Save the current logic

+      !undef _Cur${Type}

+    !else

+      !define _${Type} ${label}                           ; Initialise for first statement

+    !endif

+  !macroend

+

+  !macro _PopScope Type

+    !ifndef _${Type}

+      !error "Cannot use _Pop${Type} without a preceding _Push${Type}"

+    !endif

+    !ifdef ${_${Type}}Prev${Type}                         ; If a previous statment was active then restore it

+      !define _Cur${Type} ${_${Type}}

+      !undef _${Type}

+      !define _${Type} ${${_Cur${Type}}Prev${Type}}

+      !undef ${_Cur${Type}}Prev${Type}

+      !undef _Cur${Type}

+    !else

+      !undef _${Type}

+    !endif

+  !macroend

+

+  ; String tests

+  !macro _== _a _b _t _f

+    StrCmp `${_a}` `${_b}` `${_t}` `${_f}`

+  !macroend

+

+  !macro _!= _a _b _t _f

+    !insertmacro _== `${_a}` `${_b}` `${_f}` `${_t}`

+  !macroend

+

+  ; Case-sensitive string tests

+  !macro _S== _a _b _t _f

+    StrCmpS `${_a}` `${_b}` `${_t}` `${_f}`

+  !macroend

+

+  !macro _S!= _a _b _t _f

+    !insertmacro _S== `${_a}` `${_b}` `${_f}` `${_t}`

+  !macroend

+

+  ; Extra string tests (cannot do these case-sensitively - I tried and lstrcmp still ignored the case)

+  !macro _StrCmpI _a _b _e _l _m

+    !insertmacro _LOGICLIB_TEMP

+    System::Call `kernel32::lstrcmpiA(ts, ts) i.s` `${_a}` `${_b}`

+    Pop $_LOGICLIB_TEMP

+    IntCmp $_LOGICLIB_TEMP 0 `${_e}` `${_l}` `${_m}`

+  !macroend

+

+  !macro _S< _a _b _t _f

+    !insertmacro _StrCmpI `${_a}` `${_b}` `${_f}` `${_t}` `${_f}`

+  !macroend

+

+  !macro _S>= _a _b _t _f

+    !insertmacro _S< `${_a}` `${_b}` `${_f}` `${_t}`

+  !macroend

+

+  !macro _S> _a _b _t _f

+    !insertmacro _StrCmpI `${_a}` `${_b}` `${_f}` `${_f}` `${_t}`

+  !macroend

+

+  !macro _S<= _a _b _t _f

+    !insertmacro _S> `${_a}` `${_b}` `${_f}` `${_t}`

+  !macroend

+

+  ; Integer tests

+  !macro _= _a _b _t _f

+    IntCmp `${_a}` `${_b}` `${_t}` `${_f}` `${_f}`

+  !macroend

+

+  !macro _<> _a _b _t _f

+    !insertmacro _= `${_a}` `${_b}` `${_f}` `${_t}`

+  !macroend

+

+  !macro _< _a _b _t _f

+    IntCmp `${_a}` `${_b}` `${_f}` `${_t}` `${_f}`

+  !macroend

+

+  !macro _>= _a _b _t _f

+    !insertmacro _< `${_a}` `${_b}` `${_f}` `${_t}`

+  !macroend

+

+  !macro _> _a _b _t _f

+    IntCmp `${_a}` `${_b}` `${_f}` `${_f}` `${_t}`

+  !macroend

+

+  !macro _<= _a _b _t _f

+    !insertmacro _> `${_a}` `${_b}` `${_f}` `${_t}`

+  !macroend

+

+  ; Unsigned integer tests (NB: no need for extra equality tests)

+  !macro _U< _a _b _t _f

+    IntCmpU `${_a}` `${_b}` `${_f}` `${_t}` `${_f}`

+  !macroend

+

+  !macro _U>= _a _b _t _f

+    !insertmacro _U< `${_a}` `${_b}` `${_f}` `${_t}`

+  !macroend

+

+  !macro _U> _a _b _t _f

+    IntCmpU `${_a}` `${_b}` `${_f}` `${_f}` `${_t}`

+  !macroend

+

+  !macro _U<= _a _b _t _f

+    !insertmacro _U> `${_a}` `${_b}` `${_f}` `${_t}`

+  !macroend

+

+  ; Int64 tests

+  !macro _Int64Cmp _a _o _b _t _f

+    !insertmacro _LOGICLIB_TEMP

+    System::Int64Op `${_a}` `${_o}` `${_b}`

+    Pop $_LOGICLIB_TEMP

+    !insertmacro _= $_LOGICLIB_TEMP 0 `${_f}` `${_t}`

+  !macroend

+

+  !macro _L= _a _b _t _f

+    !insertmacro _Int64Cmp `${_a}` = `${_b}` `${_t}` `${_f}`

+  !macroend

+

+  !macro _L<> _a _b _t _f

+    !insertmacro _L= `${_a}` `${_b}` `${_f}` `${_t}`

+  !macroend

+

+  !macro _L< _a _b _t _f

+    !insertmacro _Int64Cmp `${_a}` < `${_b}` `${_t}` `${_f}`

+  !macroend

+

+  !macro _L>= _a _b _t _f

+    !insertmacro _L< `${_a}` `${_b}` `${_f}` `${_t}`

+  !macroend

+

+  !macro _L> _a _b _t _f

+    !insertmacro _Int64Cmp `${_a}` > `${_b}` `${_t}` `${_f}`

+  !macroend

+

+  !macro _L<= _a _b _t _f

+    !insertmacro _L> `${_a}` `${_b}` `${_f}` `${_t}`

+  !macroend

+

+  ; Flag tests

+  !macro _Abort _a _b _t _f

+    IfAbort `${_t}` `${_f}`

+  !macroend

+  !define Abort `"" Abort ""`

+

+  !macro _Errors _a _b _t _f

+    IfErrors `${_t}` `${_f}`

+  !macroend

+  !define Errors `"" Errors ""`

+

+  !macro _FileExists _a _b _t _f

+    IfFileExists `${_b}` `${_t}` `${_f}`

+  !macroend

+  !define FileExists `"" FileExists`

+

+  !macro _RebootFlag _a _b _t _f

+    IfRebootFlag `${_t}` `${_f}`

+  !macroend

+  !define RebootFlag `"" RebootFlag ""`

+

+  !macro _Silent _a _b _t _f

+    IfSilent `${_t}` `${_f}`

+  !macroend

+  !define Silent `"" Silent ""`

+

+  ; "Any instruction" test

+  !macro _Cmd _a _b _t _f

+    !define _t=${_t}

+    !ifdef _t=                                            ; If no true label then make one

+      !define __t _LogicLib_Label_${LOGICLIB_COUNTER}

+      !insertmacro _IncreaseCounter

+    !else

+      !define __t ${_t}

+    !endif

+    ${_b} ${__t}

+    !define _f=${_f}

+    !ifndef _f=                                           ; If a false label then go there

+      Goto ${_f}

+    !endif

+    !undef _f=${_f}

+    !ifdef _t=                                            ; If we made our own true label then place it

+      ${__t}:

+    !endif

+    !undef __t

+    !undef _t=${_t}

+  !macroend

+  !define Cmd `"" Cmd`

+

+  ; Section flag test

+  !macro _SectionFlagIsSet _a _b _t _f

+    !insertmacro _LOGICLIB_TEMP

+    SectionGetFlags `${_b}` $_LOGICLIB_TEMP

+    IntOp $_LOGICLIB_TEMP $_LOGICLIB_TEMP & `${_a}`

+    !insertmacro _= $_LOGICLIB_TEMP `${_a}` `${_t}` `${_f}`

+  !macroend

+  !define SectionIsSelected `${SF_SELECTED} SectionFlagIsSet`

+  !define SectionIsSubSection `${SF_SUBSEC} SectionFlagIsSet`

+  !define SectionIsSubSectionEnd `${SF_SUBSECEND} SectionFlagIsSet`

+  !define SectionIsSectionGroup `${SF_SECGRP} SectionFlagIsSet`

+  !define SectionIsSectionGroupEnd `${SF_SECGRPEND} SectionFlagIsSet`

+  !define SectionIsBold `${SF_BOLD} SectionFlagIsSet`

+  !define SectionIsReadOnly `${SF_RO} SectionFlagIsSet`

+  !define SectionIsExpanded `${SF_EXPAND} SectionFlagIsSet`

+  !define SectionIsPartiallySelected `${SF_PSELECTED} SectionFlagIsSet`

+

+  !define IfCmd `!insertmacro _IfThen "" Cmd ${|}`

+

+  !macro _If _c _a _o _b

+    !verbose push

+    !verbose ${LOGICLIB_VERBOSITY}

+    !insertmacro _PushLogic

+    !define ${_Logic}If

+    !define ${_Logic}Else _LogicLib_Label_${LOGICLIB_COUNTER}                    ; Get a label for the Else

+    !insertmacro _IncreaseCounter

+    !define _c=${_c}

+    !ifdef _c=true                                        ; If is true

+      !insertmacro _${_o} `${_a}` `${_b}` "" ${${_Logic}Else}

+    !else                                                 ; If condition is false

+      !insertmacro _${_o} `${_a}` `${_b}` ${${_Logic}Else} ""

+    !endif

+    !undef _c=${_c}

+    !verbose pop

+  !macroend

+  !define If     `!insertmacro _If true`

+  !define Unless `!insertmacro _If false`

+  !define IfNot  `!insertmacro _If false`

+

+  !macro _And _c _a _o _b

+    !verbose push

+    !verbose ${LOGICLIB_VERBOSITY}

+    !ifndef _Logic | ${_Logic}If

+      !error "Cannot use And without a preceding If or IfNot/Unless"

+    !endif

+    !ifndef ${_Logic}Else

+      !error "Cannot use And following an Else"

+    !endif

+    !define _c=${_c}

+    !ifdef _c=true                                        ; If is true

+      !insertmacro _${_o} `${_a}` `${_b}` "" ${${_Logic}Else}

+    !else                                                 ; If condition is false

+      !insertmacro _${_o} `${_a}` `${_b}` ${${_Logic}Else} ""

+    !endif

+    !undef _c=${_c}

+    !verbose pop

+  !macroend

+  !define AndIf     `!insertmacro _And true`

+  !define AndUnless `!insertmacro _And false`

+  !define AndIfNot  `!insertmacro _And false`

+

+  !macro _Or _c _a _o _b

+    !verbose push

+    !verbose ${LOGICLIB_VERBOSITY}

+    !ifndef _Logic | ${_Logic}If

+      !error "Cannot use Or without a preceding If or IfNot/Unless"

+    !endif

+    !ifndef ${_Logic}Else

+      !error "Cannot use Or following an Else"

+    !endif

+    !define _label _LogicLib_Label_${LOGICLIB_COUNTER}                           ; Skip this test as we already

+    !insertmacro _IncreaseCounter

+    Goto ${_label}                                        ; have a successful result

+    ${${_Logic}Else}:                                     ; Place the Else label

+    !undef ${_Logic}Else                                  ; and remove it

+    !define ${_Logic}Else _LogicLib_Label_${LOGICLIB_COUNTER}                    ; Get a label for the next Else and perform the new If

+    !insertmacro _IncreaseCounter

+    !define _c=${_c}

+    !ifdef _c=true                                        ; If is true

+      !insertmacro _${_o} `${_a}` `${_b}` "" ${${_Logic}Else}

+    !else                                                 ; If condition is false

+      !insertmacro _${_o} `${_a}` `${_b}` ${${_Logic}Else} ""

+    !endif

+    !undef _c=${_c}

+    ${_label}:

+    !undef _label

+    !verbose pop

+  !macroend

+  !define OrIf     `!insertmacro _Or true`

+  !define OrUnless `!insertmacro _Or false`

+  !define OrIfNot  `!insertmacro _Or false`

+

+  !macro _Else

+    !verbose push

+    !verbose ${LOGICLIB_VERBOSITY}

+    !ifndef _Logic | ${_Logic}If

+      !error "Cannot use Else without a preceding If or IfNot/Unless"

+    !endif

+    !ifndef ${_Logic}Else

+      !error "Cannot use Else following an Else"

+    !endif

+    !ifndef ${_Logic}EndIf                                ; First Else for this If?

+      !define ${_Logic}EndIf _LogicLib_Label_${LOGICLIB_COUNTER}                 ; Get a label for the EndIf

+      !insertmacro _IncreaseCounter

+    !endif

+    Goto ${${_Logic}EndIf}                                ; Go to the EndIf

+    ${${_Logic}Else}:                                     ; Place the Else label

+    !undef ${_Logic}Else                                  ; and remove it

+    !verbose pop

+  !macroend

+  !define Else `!insertmacro _Else`

+

+  !macro _ElseIf _c _a _o _b

+    !verbose push

+    !verbose ${LOGICLIB_VERBOSITY}

+    ${Else}                                               ; Perform the Else

+    !define ${_Logic}Else _LogicLib_Label_${LOGICLIB_COUNTER}                    ; Get a label for the next Else and perform the new If

+    !insertmacro _IncreaseCounter

+    !define _c=${_c}

+    !ifdef _c=true                                        ; If is true

+      !insertmacro _${_o} `${_a}` `${_b}` "" ${${_Logic}Else}

+    !else                                                 ; If condition is false

+      !insertmacro _${_o} `${_a}` `${_b}` ${${_Logic}Else} ""

+    !endif

+    !undef _c=${_c}

+    !verbose pop

+  !macroend

+  !define ElseIf     `!insertmacro _ElseIf true`

+  !define ElseUnless `!insertmacro _ElseIf false`

+  !define ElseIfNot  `!insertmacro _ElseIf false`

+

+  !macro _EndIf _n

+    !verbose push

+    !verbose ${LOGICLIB_VERBOSITY}

+    !ifndef _Logic | ${_Logic}If

+      !error "Cannot use End${_n} without a preceding If or IfNot/Unless"

+    !endif

+    !ifdef ${_Logic}Else

+      ${${_Logic}Else}:                                   ; Place the Else label

+      !undef ${_Logic}Else                                ; and remove it

+    !endif

+    !ifdef ${_Logic}EndIf

+      ${${_Logic}EndIf}:                                  ; Place the EndIf

+      !undef ${_Logic}EndIf                               ; and remove it

+    !endif

+    !undef ${_Logic}If

+    !insertmacro _PopLogic

+    !verbose pop

+  !macroend

+  !define EndIf     `!insertmacro _EndIf If`

+  !define EndUnless `!insertmacro _EndIf Unless`

+

+  !macro _IfThen _a _o _b _t

+    !verbose push

+    !verbose ${LOGICLIB_VERBOSITY}

+    ${If} `${_a}` `${_o}` `${_b}`

+      ${_t}

+    ${EndIf}

+    !verbose pop

+  !macroend

+  !define IfThen `!insertmacro _IfThen`

+

+  !macro _IfNotThen _a _o _b _t

+    !verbose push

+    !verbose ${LOGICLIB_VERBOSITY}

+    ${IfNot} `${_a}` `${_o}` `${_b}`

+      ${_t}

+    ${EndIf}

+    !verbose pop

+  !macroend

+  !define IfNotThen `!insertmacro _IfNotThen`

+

+  !macro _ForEach _v _f _t _o _s

+    !verbose push

+    !verbose ${LOGICLIB_VERBOSITY}

+    StrCpy "${_v}" "${_f}"                                ; Assign the initial value

+    Goto +2                                               ; Skip the loop expression for the first iteration

+    !define _DoLoopExpression `IntOp "${_v}" "${_v}" "${_o}" "${_s}"` ; Define the loop expression

+    !define _o=${_o}

+    !ifdef _o=+                                           ; Check the loop expression operator

+      !define __o >                                       ; to determine the correct loop condition

+    !else ifdef _o=-

+      !define __o <

+    !else

+      !error "Unsupported ForEach step operator (must be + or -)"

+    !endif

+    !undef _o=${_o}

+    !insertmacro _Do For false `${_v}` `${__o}` `${_t}`   ; Let Do do the rest

+    !undef __o

+    !verbose pop

+  !macroend

+  !define ForEach `!insertmacro _ForEach`

+

+  !macro _For _v _f _t

+    !verbose push

+    !verbose ${LOGICLIB_VERBOSITY}

+    ${ForEach} `${_v}` `${_f}` `${_t}` + 1                ; Pass on to ForEach

+    !verbose pop

+  !macroend

+  !define For `!insertmacro _For`

+

+  !define ExitFor `!insertmacro _Goto ExitFor For`

+

+  !define Next      `!insertmacro _Loop For Next "" "" "" ""`

+

+  !define While     `!insertmacro _Do While true`

+

+  !define ExitWhile `!insertmacro _Goto ExitWhile While`

+

+  !define EndWhile  `!insertmacro _Loop While EndWhile "" "" "" ""`

+

+  !macro _Do _n _c _a _o _b

+    !verbose push

+    !verbose ${LOGICLIB_VERBOSITY}

+    !insertmacro _PushLogic

+    !define ${_Logic}${_n} _LogicLib_Label_${LOGICLIB_COUNTER}                   ; Get a label for the start of the loop

+    !insertmacro _IncreaseCounter

+    ${${_Logic}${_n}}:

+    !insertmacro _PushScope Exit${_n} _LogicLib_Label_${LOGICLIB_COUNTER}        ; Get a label for the end of the loop

+    !insertmacro _IncreaseCounter

+    !insertmacro _PushScope Break ${_Exit${_n}}           ; Break goes to the end of the loop

+    !ifdef _DoLoopExpression

+      ${_DoLoopExpression}                                ; Special extra parameter for inserting code

+      !undef _DoLoopExpression                            ; between the Continue label and the loop condition

+    !endif

+    !define _c=${_c}

+    !ifdef _c=                                            ; No starting condition

+      !insertmacro _PushScope Continue _LogicLib_Label_${LOGICLIB_COUNTER}       ; Get a label for Continue at the end of the loop

+      !insertmacro _IncreaseCounter

+    !else

+      !insertmacro _PushScope Continue ${${_Logic}${_n}}  ; Continue goes to the start of the loop

+      !ifdef _c=true                                      ; If is true

+        !insertmacro _${_o} `${_a}` `${_b}` "" ${_Exit${_n}}

+      !else                                               ; If condition is false

+        !insertmacro _${_o} `${_a}` `${_b}` ${_Exit${_n}} ""

+      !endif

+    !endif

+    !undef _c=${_c}

+    !define ${_Logic}Condition ${_c}                      ; Remember the condition used

+    !verbose pop

+  !macroend

+  !define Do      `!insertmacro _Do Do "" "" "" ""`

+  !define DoWhile `!insertmacro _Do Do true`

+  !define DoUntil `!insertmacro _Do Do false`

+

+  !macro _Goto _n _s

+    !verbose push

+    !verbose ${LOGICLIB_VERBOSITY}

+    !ifndef _${_n}

+      !error "Cannot use ${_n} without a preceding ${_s}"

+    !endif

+    Goto ${_${_n}}

+    !verbose pop

+  !macroend

+  !define ExitDo   `!insertmacro _Goto ExitDo Do`

+

+  !macro _Loop _n _e _c _a _o _b

+    !verbose push

+    !verbose ${LOGICLIB_VERBOSITY}

+    !ifndef _Logic | ${_Logic}${_n}

+      !error "Cannot use ${_e} without a preceding ${_n}"

+    !endif

+    !define _c=${${_Logic}Condition}

+    !ifdef _c=                                            ; If Do had no condition place the Continue label

+      ${_Continue}:

+    !endif

+    !undef _c=${${_Logic}Condition}

+    !define _c=${_c}

+    !ifdef _c=                                            ; No ending condition

+      Goto ${${_Logic}${_n}}

+    !else ifdef _c=true                                   ; If condition is true

+      !insertmacro _${_o} `${_a}` `${_b}` ${${_Logic}${_n}} ${_Exit${_n}}

+    !else                                                 ; If condition is false

+      !insertmacro _${_o} `${_a}` `${_b}` ${_Exit${_n}} ${${_Logic}${_n}}

+    !endif

+    !undef _c=${_c}

+    Goto ${_Continue}                                     ; Just to ensure it is referenced at least once

+	Goto ${_Exit${_n}}                                    ; Just to ensure it is referenced at least once

+    ${_Exit${_n}}:                                        ; Place the loop exit point

+    !undef ${_Logic}Condition

+    !insertmacro _PopScope Continue

+    !insertmacro _PopScope Break

+    !insertmacro _PopScope Exit${_n}

+    !undef ${_Logic}${_n}

+    !insertmacro _PopLogic

+    !verbose pop

+  !macroend

+  !define Loop      `!insertmacro _Loop Do Loop "" "" "" ""`

+  !define LoopWhile `!insertmacro _Loop Do LoopWhile true`

+  !define LoopUntil `!insertmacro _Loop Do LoopUntil false`

+

+  !define Continue `!insertmacro _Goto Continue "For or Do or While"`

+  !define Break    `!insertmacro _Goto Break "For or Do or While"`

+

+  !macro _Select _a

+    !verbose push

+    !verbose ${LOGICLIB_VERBOSITY}

+    !insertmacro _PushLogic

+    !define ${_Logic}Select `${_a}`                       ; Remember the left hand side of the comparison

+    !verbose pop

+  !macroend

+  !define Select `!insertmacro _Select`

+

+  !macro _Select_CaseElse

+    !verbose push

+    !verbose ${LOGICLIB_VERBOSITY}

+    !ifndef _Logic | ${_Logic}Select

+      !error "Cannot use Case without a preceding Select"

+    !endif

+    !ifdef ${_Logic}EndSelect                             ; This is set only after the first case

+      !ifndef ${_Logic}Else

+        !error "Cannot use Case following a CaseElse"

+      !endif

+      Goto ${${_Logic}EndSelect}                          ; Go to the EndSelect

+      ${${_Logic}Else}:                                   ; Place the Else label

+      !undef ${_Logic}Else                                ; and remove it

+    !else

+      !define ${_Logic}EndSelect _LogicLib_Label_${LOGICLIB_COUNTER}             ; Get a label for the EndSelect

+      !insertmacro _IncreaseCounter

+    !endif

+    !verbose pop

+  !macroend

+  !define CaseElse `!insertmacro _CaseElse`

+  !define Case_Else `!insertmacro _CaseElse`              ; Compatibility with 2.2 and earlier

+  !define Default `!insertmacro _CaseElse`                ; For the C-minded

+

+  !macro _Select_Case _a

+    !verbose push

+    !verbose ${LOGICLIB_VERBOSITY}

+    ${CaseElse}                                           ; Perform the CaseElse

+    !define ${_Logic}Else _LogicLib_Label_${LOGICLIB_COUNTER}                    ; Get a label for the next Else and perform the new Case

+    !insertmacro _IncreaseCounter

+    !insertmacro _== `${${_Logic}Select}` `${_a}` "" ${${_Logic}Else}

+    !verbose pop

+  !macroend

+  !define Case `!insertmacro _Case`

+

+  !macro _Case2 _a _b

+    !verbose push

+    !verbose ${LOGICLIB_VERBOSITY}

+    ${CaseElse}                                           ; Perform the CaseElse

+    !define ${_Logic}Else _LogicLib_Label_${LOGICLIB_COUNTER}                    ; Get a label for the next Else and perform the new Case

+    !insertmacro _IncreaseCounter

+    !insertmacro _== `${${_Logic}Select}` `${_a}` +2 ""

+    !insertmacro _== `${${_Logic}Select}` `${_b}` "" ${${_Logic}Else}

+    !verbose pop

+  !macroend

+  !define Case2 `!insertmacro _Case2`

+

+  !macro _Case3 _a _b _c

+    !verbose push

+    !verbose ${LOGICLIB_VERBOSITY}

+    ${CaseElse}                                           ; Perform the CaseElse

+    !define ${_Logic}Else _LogicLib_Label_${LOGICLIB_COUNTER}                    ; Get a label for the next Else and perform the new Case

+    !insertmacro _IncreaseCounter

+    !insertmacro _== `${${_Logic}Select}` `${_a}` +3 ""

+    !insertmacro _== `${${_Logic}Select}` `${_b}` +2 ""

+    !insertmacro _== `${${_Logic}Select}` `${_c}` "" ${${_Logic}Else}

+    !verbose pop

+  !macroend

+  !define Case3 `!insertmacro _Case3`

+

+  !macro _Case4 _a _b _c _d

+    !verbose push

+    !verbose ${LOGICLIB_VERBOSITY}

+    ${CaseElse}                                           ; Perform the CaseElse

+    !define ${_Logic}Else _LogicLib_Label_${LOGICLIB_COUNTER}                    ; Get a label for the next Else and perform the new Case

+    !insertmacro _IncreaseCounter

+    !insertmacro _== `${${_Logic}Select}` `${_a}` +4 ""

+    !insertmacro _== `${${_Logic}Select}` `${_b}` +3 ""

+    !insertmacro _== `${${_Logic}Select}` `${_c}` +2 ""

+    !insertmacro _== `${${_Logic}Select}` `${_d}` "" ${${_Logic}Else}

+    !verbose pop

+  !macroend

+  !define Case4 `!insertmacro _Case4`

+

+  !macro _Case5 _a _b _c _d _e

+    !verbose push

+    !verbose ${LOGICLIB_VERBOSITY}

+    ${CaseElse}                                           ; Perform the CaseElse

+    !define ${_Logic}Else _LogicLib_Label_${LOGICLIB_COUNTER}                    ; Get a label for the next Else and perform the new Case

+    !insertmacro _IncreaseCounter

+    !insertmacro _== `${${_Logic}Select}` `${_a}` +5 ""

+    !insertmacro _== `${${_Logic}Select}` `${_b}` +4 ""

+    !insertmacro _== `${${_Logic}Select}` `${_c}` +3 ""

+    !insertmacro _== `${${_Logic}Select}` `${_d}` +2 ""

+    !insertmacro _== `${${_Logic}Select}` `${_e}` "" ${${_Logic}Else}

+    !verbose pop

+  !macroend

+  !define Case5 `!insertmacro _Case5`

+

+  !macro _EndSelect

+    !verbose push

+    !verbose ${LOGICLIB_VERBOSITY}

+    !ifndef _Logic | ${_Logic}Select

+      !error "Cannot use EndSelect without a preceding Select"

+    !endif

+    !ifdef ${_Logic}Else

+      ${${_Logic}Else}:                                   ; Place the Else label

+      !undef ${_Logic}Else                                ; and remove it

+    !endif

+    !ifdef ${_Logic}EndSelect                             ; This won't be set if there weren't any cases

+      ${${_Logic}EndSelect}:                              ; Place the EndSelect

+      !undef ${_Logic}EndSelect                           ; and remove it

+    !endif

+    !undef ${_Logic}Select

+    !insertmacro _PopLogic

+    !verbose pop

+  !macroend

+  !define EndSelect `!insertmacro _EndSelect`

+

+  !macro _Switch _a

+    !verbose push

+    !verbose ${LOGICLIB_VERBOSITY}

+    !insertmacro _PushLogic

+    !insertmacro _PushScope Switch ${_Logic}              ; Keep a separate stack for switch data

+    !insertmacro _PushScope Break _LogicLib_Label_${LOGICLIB_COUNTER}            ; Get a lable for beyond the end of the switch

+    !insertmacro _IncreaseCounter

+    !define ${_Switch}Var `${_a}`                         ; Remember the left hand side of the comparison

+    !tempfile ${_Switch}Tmp                               ; Create a temporary file

+    !define ${_Logic}Switch _LogicLib_Label_${LOGICLIB_COUNTER}                  ; Get a label for the end of the switch

+    !insertmacro _IncreaseCounter

+    Goto ${${_Logic}Switch}                               ; and go there

+    !verbose pop

+  !macroend

+  !define Switch `!insertmacro _Switch`

+

+  !macro _Case _a

+    !verbose push

+    !verbose ${LOGICLIB_VERBOSITY}

+    !ifdef _Logic & ${_Logic}Select                       ; Check for an active Select

+      !insertmacro _Select_Case `${_a}`

+    !else ifndef _Switch                                  ; If not then check for an active Switch

+      !error "Cannot use Case without a preceding Select or Switch"

+    !else

+      !define _label _LogicLib_Label_${LOGICLIB_COUNTER}                         ; Get a label for this case,

+      !insertmacro _IncreaseCounter

+      ${_label}:                                          ; place it and add it's check to the temp file

+      !appendfile "${${_Switch}Tmp}" `!insertmacro _== $\`${${_Switch}Var}$\` $\`${_a}$\` ${_label} ""$\n`

+      !undef _label

+    !endif

+    !verbose pop

+  !macroend

+

+  !macro _CaseElse

+    !verbose push

+    !verbose ${LOGICLIB_VERBOSITY}

+    !ifdef _Logic & ${_Logic}Select                       ; Check for an active Select

+      !insertmacro _Select_CaseElse

+    !else ifndef _Switch                                  ; If not then check for an active Switch

+      !error "Cannot use Case without a preceding Select or Switch"

+    !else ifdef ${_Switch}Else                            ; Already had a default case?

+      !error "Cannot use CaseElse following a CaseElse"

+    !else

+      !define ${_Switch}Else _LogicLib_Label_${LOGICLIB_COUNTER}                 ; Get a label for the default case,

+      !insertmacro _IncreaseCounter

+      ${${_Switch}Else}:                                  ; and place it

+    !endif

+    !verbose pop

+  !macroend

+

+  !macro _EndSwitch

+    !verbose push

+    !verbose ${LOGICLIB_VERBOSITY}

+    !ifndef _Logic | ${_Logic}Switch

+      !error "Cannot use EndSwitch without a preceding Switch"

+    !endif

+    Goto ${_Break}                                        ; Skip the jump table

+    ${${_Logic}Switch}:                                   ; Place the end of the switch

+    !undef ${_Logic}Switch

+    !include "${${_Switch}Tmp}"                           ; Include the jump table

+    !delfile "${${_Switch}Tmp}"                           ; and clear it up

+    !ifdef ${_Switch}Else                                 ; Was there a default case?

+      Goto ${${_Switch}Else}                              ; then go there if all else fails

+      !undef ${_Switch}Else

+    !endif

+    !undef ${_Switch}Tmp

+    !undef ${_Switch}Var

+    ${_Break}:                                            ; Place the break label

+    !insertmacro _PopScope Break

+    !insertmacro _PopScope Switch

+    !insertmacro _PopLogic

+    !verbose pop

+  !macroend

+  !define EndSwitch `!insertmacro _EndSwitch`

+

+!endif ; LOGICLIB

+!verbose 3

+!define LOGICLIB_VERBOSITY ${_LOGICLIB_VERBOSITY}

+!undef _LOGICLIB_VERBOSITY

+!verbose pop

diff --git a/scripts/builder.sh b/scripts/builder.sh
index 876e6d1..6a143e3 100755
--- a/scripts/builder.sh
+++ b/scripts/builder.sh
@@ -6,21 +6,34 @@
 # requirements -
 # see http://mxe.cc for required tools (scons, perl, yasm, etc etc etc)
 
-# todo - auto update webpage to link to proper snapshot
-#
-# todo - 64 bit windows (needs mxe 64 bit stable)
-#
 # todo - can we build 32 bit linux from within 64 bit linux?
 #
 # todo - make linux work
 #
 # todo - detect failure and stop
 
-DRYRUN=
+init_variables()
+{
+	STARTPATH=$PWD
+	export STARTPATH
+	if [ "`echo $* | grep uploadonly`" ]; then
+		UPLOADONLY=1
+		DATECODE=`date +"%Y.%m.%d"`
+	else
+		UPLOADONLY=
+	fi
+	if [ "`echo $* | grep dry`" ]; then
+		DRYRUN=1
+	else
+		DRYRUN=
+	fi
+	export UPLOADONLY
+	export DRYRUN
+	export DATECODE
+}
 
 check_starting_path()
 {
-	STARTPATH=$PWD
 	if [ -e openscad.pro ]; then
 		echo 'please start from a clean directory outside of openscad'
 		exit
@@ -32,38 +45,57 @@ get_source_code()
 	git clone http://github.com/openscad/openscad.git
 	cd openscad
 	git submodule update --init # MCAD
+	#git checkout branch ##debugging
 }
 
 build_win32()
 {
+	. ./scripts/setenv-mingw-xbuild.sh clean
 	. ./scripts/setenv-mingw-xbuild.sh
 	./scripts/mingw-x-build-dependencies.sh
 	./scripts/release-common.sh mingw32
+	DATECODE=`date +"%Y.%m.%d"`
+	export DATECODE
+}
+
+build_win64()
+{
+	. ./scripts/setenv-mingw-xbuild.sh clean
+	. ./scripts/setenv-mingw-xbuild.sh 64
+	./scripts/mingw-x-build-dependencies.sh 64
+	./scripts/release-common.sh mingw64
+	DATECODE=`date +"%Y.%m.%d"`
+	export DATECODE
 }
 
 build_lin32()
 {
-	. ./scripts/setenv-unibuild.sh clang
+	. ./scripts/setenv-unibuild.sh
 	./scripts/uni-build-dependencies.sh
 	./scripts/release-common.sh
+	DATECODE=`date +"%Y.%m.%d"`
+	export DATECODE
 }
 
 upload_win_generic()
 {
-	# 1=file summary, 2 = username, 3 = filename
-	if [ -e $3 ]; then
-		echo $3 found
+	summary="$1"
+	username=$2
+	filename=$3
+	if [ -f $filename ]; then
+		echo 'file "'$filename'" found'
 	else
-		echo $3 not found
+		echo 'file "'$filename'" not found'
 	fi
 	opts=
 	opts="$opts -p openscad"
-	opts="$opts -u $2"
-	opts="$opts $3"
-	if [ ! $DRYRUN ]; then
-		python ./scripts/googlecode_upload.py -s "$1" $opts
-	else
+	opts="$opts -u $username"
+	opts="$opts $filename"
+	if [ $DRYRUN ]; then
 		echo dry run, not uploading to googlecode
+		echo cmd - python ./scripts/googlecode_upload.py -s '"'$summary'"' $opts
+	else
+		python ./scripts/googlecode_upload.py -s "$summary" $opts
 	fi
 }
 
@@ -87,8 +119,28 @@ upload_win32()
 	export WIN32_PACKAGEFILE2_SIZE
 }
 
+upload_win64()
+{
+	SUMMARY1="Windows x86-64 Snapshot Zipfile"
+	SUMMARY2="Windows x86-64 Snapshot Installer"
+	BASEDIR=./mingw64/
+	WIN64_PACKAGEFILE1=OpenSCAD-$DATECODE-x86-64-Installer.exe
+	WIN64_PACKAGEFILE2=OpenSCAD-$DATECODE-x86-64.zip
+	upload_win_generic "$SUMMARY1" $USERNAME $BASEDIR/$WIN64_PACKAGEFILE1
+	upload_win_generic "$SUMMARY2" $USERNAME $BASEDIR/$WIN64_PACKAGEFILE2
+	export WIN64_PACKAGEFILE1
+	export WIN64_PACKAGEFILE2
+	WIN64_PACKAGEFILE1_SIZE=`ls -sh $BASEDIR/$WIN64_PACKAGEFILE1 | awk ' {print $1} ';`
+	WIN64_PACKAGEFILE2_SIZE=`ls -sh $BASEDIR/$WIN64_PACKAGEFILE2 | awk ' {print $1} ';`
+	WIN64_PACKAGEFILE1_SIZE=`echo "$WIN64_PACKAGEFILE1_SIZE""B"`
+	WIN64_PACKAGEFILE2_SIZE=`echo "$WIN64_PACKAGEFILE2_SIZE""B"`
+	export WIN64_PACKAGEFILE1_SIZE
+	export WIN64_PACKAGEFILE2_SIZE
+}
+
 read_username_from_user()
 {
+	if [ $DRYRUN ]; then USERNAME=none;export USERNAME; return; fi
 	echo 'Please enter your username for https://code.google.com/hosting/settings'
 	echo -n 'Username:'
 	read USERNAME
@@ -97,6 +149,7 @@ read_username_from_user()
 
 read_password_from_user()
 {
+	if [ $DRYRUN ]; then return; fi
 	echo 'Please enter your password for https://code.google.com/hosting/settings'
 	echo -n 'Password:'
 	read -s PASSWORD1
@@ -112,7 +165,7 @@ read_password_from_user()
 	export OSUPL_PASSWORD
 }
 
-update_www_download_links()
+update_win_www_download_links()
 {
 	cd $STARTPATH
 	git clone git@github.com:openscad/openscad.github.com.git
@@ -123,6 +176,13 @@ update_www_download_links()
 	DATECODE=`date +"%Y.%m.%d"`
 
 	rm win_snapshot_links.js
+	echo "snapinfo['WIN64_SNAPSHOT1_URL'] = '$BASEURL$WIN64_PACKAGEFILE1'" >> win_snapshot_links.js
+	echo "snapinfo['WIN64_SNAPSHOT2_URL'] = '$BASEURL$WIN64_PACKAGEFILE2'" >> win_snapshot_links.js
+	echo "snapinfo['WIN64_SNAPSHOT1_NAME'] = 'OpenSCAD $DATECODE'" >> win_snapshot_links.js
+	echo "snapinfo['WIN64_SNAPSHOT2_NAME'] = 'OpenSCAD $DATECODE'" >> win_snapshot_links.js
+	echo "snapinfo['WIN64_SNAPSHOT1_SIZE'] = '$WIN64_PACKAGEFILE1_SIZE'" >> win_snapshot_links.js
+	echo "snapinfo['WIN64_SNAPSHOT2_SIZE'] = '$WIN64_PACKAGEFILE2_SIZE'" >> win_snapshot_links.js
+
 	echo "snapinfo['WIN32_SNAPSHOT1_URL'] = '$BASEURL$WIN32_PACKAGEFILE1'" >> win_snapshot_links.js
 	echo "snapinfo['WIN32_SNAPSHOT2_URL'] = '$BASEURL$WIN32_PACKAGEFILE2'" >> win_snapshot_links.js
 	echo "snapinfo['WIN32_SNAPSHOT1_NAME'] = 'OpenSCAD $DATECODE'" >> win_snapshot_links.js
@@ -130,12 +190,11 @@ update_www_download_links()
 	echo "snapinfo['WIN32_SNAPSHOT1_SIZE'] = '$WIN32_PACKAGEFILE1_SIZE'" >> win_snapshot_links.js
 	echo "snapinfo['WIN32_SNAPSHOT2_SIZE'] = '$WIN32_PACKAGEFILE2_SIZE'" >> win_snapshot_links.js
 	echo 'modified win_snapshot_links.js'
-	cat win_snapshot_links.js
 
 	PAGER=cat git diff
 	if [ ! $DRYRUN ]; then
 		git commit -a -m 'builder.sh - updated snapshot links'
-		git push origin
+		git push origin master
 	else
 		echo dry run, not updating www links
 	fi
@@ -143,6 +202,7 @@ update_www_download_links()
 
 check_ssh_agent()
 {
+	if [ $DRYRUN ]; then echo 'skipping ssh, dry run'; return; fi
 	if [ ! $SSH_AUTH_SOCK ]; then
 		echo 'please start an ssh-agent for github.com/openscad/openscad.github.com uploads'
 		echo 'for example:'
@@ -152,14 +212,20 @@ check_ssh_agent()
 	fi
 }
 
+init_variables $*
 check_ssh_agent
 check_starting_path
 read_username_from_user
 read_password_from_user
 get_source_code
-build_win32
+
+if [ ! $UPLOADONLY ]; then
+	build_win32
+	build_win64
+fi
 upload_win32
-update_www_download_links
+upload_win64
+update_win_www_download_links
 
 
 
diff --git a/scripts/installer.nsi b/scripts/installer.nsi
index 1841431..2cbd6d3 100644
--- a/scripts/installer.nsi
+++ b/scripts/installer.nsi
@@ -1,7 +1,10 @@
+InstallDir ""
+!include "LogicLib.nsh"
 !include "mingw-file-association.nsh"
+!include "x64.nsh"
 Name "OpenSCAD"
 OutFile "openscad_setup.exe"
-InstallDir $PROGRAMFILES\OpenSCAD
+!include "installer_arch.nsi"
 DirText "This will install OpenSCAD on your computer. Choose a directory"
 Section "install"
 SetOutPath $INSTDIR
diff --git a/scripts/installer32.nsi b/scripts/installer32.nsi
new file mode 100644
index 0000000..051cb0e
--- /dev/null
+++ b/scripts/installer32.nsi
@@ -0,0 +1,3 @@
+Function .onInit
+  StrCpy $InstDir $PROGRAMFILES\OpenSCAD
+FunctionEnd
diff --git a/scripts/installer64.nsi b/scripts/installer64.nsi
new file mode 100644
index 0000000..1b24c0c
--- /dev/null
+++ b/scripts/installer64.nsi
@@ -0,0 +1,8 @@
+Function .onInit
+${If} ${RunningX64}
+  StrCpy $InstDir $PROGRAMFILES64\OpenSCAD
+  SetRegView 64
+${Else}
+  Messagebox MB_OK "This is 64 bit OpenSCAD, your machine is 32 bits. Error."
+${EndIf}
+FunctionEnd
diff --git a/scripts/mingw-x-build-dependencies.sh b/scripts/mingw-x-build-dependencies.sh
index 7a16530..e9f124b 100755
--- a/scripts/mingw-x-build-dependencies.sh
+++ b/scripts/mingw-x-build-dependencies.sh
@@ -1,11 +1,13 @@
 #!/bin/sh -e
 #
 # This script builds all library dependencies of OpenSCAD for cross-compilation
-# from linux to mingw32 for windows, using the MXE cross build system.
+# from linux to mingw32/64 for windows, using the MXE cross build system.
 #
 # This script must be run from the OpenSCAD source root directory
 #
-# Usage: ./scripts/mingw-x-build-dependencies.sh
+# Usage:
+#        ./scripts/mingw-x-build-dependencies.sh       # 32 bit
+#        ./scripts/mingw-x-build-dependencies.sh 64    # 64 bit
 #
 # Prerequisites:
 #
@@ -13,6 +15,8 @@
 #
 # Also see http://en.wikibooks.org/wiki/OpenSCAD_User_Manual/Cross-compiling_for_Windows_on_Linux_or_Mac_OS_X
 #
+# Also note the 64 bit is built on the branch of mxe by Tony Theodore
+# which hasnt been merged to official mxe as of writing
 
 OPENSCADDIR=$PWD
 if [ ! -f $OPENSCADDIR/openscad.pro ]; then
@@ -34,7 +38,7 @@ if [ ! $NUMJOBS ]; then
 	fi
 fi
 
-. ./scripts/setenv-mingw-xbuild.sh
+. ./scripts/setenv-mingw-xbuild.sh $*
 
 if [ ! -e $BASEDIR ]; then
 	mkdir -p $BASEDIR
@@ -44,14 +48,24 @@ if [ ! -e $MXEDIR ]; then
 	mkdir -p $MXEDIR
 	cd $MXEDIR/..
 	echo "Downloading MXE into " $PWD
-	git clone git://github.com/mxe/mxe.git
+	if [ "`echo $* | grep 64`" ]; then
+		git clone -b multi-rebase git://github.com/tonytheodore/mxe.git $MXEDIR
+	else
+		git clone git://github.com/mxe/mxe.git $MXEDIR
+	fi
 fi
 
 echo "entering" $MXEDIR
 cd $MXEDIR
-echo "make mpfr eigen opencsg cgal qt nsis -j $NUMCPU JOBS=$NUMJOBS"
-make mpfr eigen opencsg cgal qt nsis -j $NUMCPU JOBS=$NUMJOBS
-#make mpfr -j $NUMCPU JOBS=$NUMJOBS # for testing
+if [ "`echo $* | grep 64`" ]; then
+  MXE_TARGETS='x86_64-w64-mingw32'
+  PACKAGES='mpfr eigen opencsg cgal qt'
+else
+  MXE_TARGETS=
+  PACKAGES='mpfr eigen opencsg cgal qt nsis'
+fi
+echo make $PACKAGES MXE_TARGETS=$MXE_TARGETS -j $NUMCPU JOBS=$NUMJOBS
+make $PACKAGES MXE_TARGETS=$MXE_TARGETS -j $NUMCPU JOBS=$NUMJOBS
 
 echo "leaving" $MXEDIR
 
diff --git a/scripts/release-common.sh b/scripts/release-common.sh
index 02b276b..7d36907 100755
--- a/scripts/release-common.sh
+++ b/scripts/release-common.sh
@@ -7,11 +7,12 @@
 # The script will create a file called openscad-<versionstring>.<extension> in
 # the current directory (or under ./mingw32)
 #
-# Usage: release-common.sh [-v <versionstring>] [-c] [-x32]
+# Usage: release-common.sh [-v <versionstring>] [-c] [-mingw[32|64]]
 #  -v       Version string (e.g. -v 2010.01)
 #  -d       Version date (e.g. -d 2010.01.23)
 #  -c       Build with commit info
 #  -mingw32 Cross-compile for win32 using MXE
+#  -mingw64 Cross-compile for win64 using Tony Theodore's MXE fork
 #
 # If no version string or version date is given, todays date will be used (YYYY-MM-DD)
 # If only verion date is given, it will be used also as version string.
@@ -20,7 +21,7 @@
 # The commit info will extracted from git and be passed to qmake as OPENSCAD_COMMIT
 # to identify a build in the about box.
 #
-# The mingw32 cross compile depends on the MXE cross-build tools. Please
+# The mingw cross compile depends on the MXE cross-build tools. Please
 # see the README.md file on how to install these dependencies.
 
 printUsage()
@@ -47,11 +48,19 @@ elif [[ $OSTYPE == "linux-gnu" ]]; then
   else
     ARCH=32
   fi
-  echo "Detected ARCH: $ARCH"
+  echo "Detected build-machine ARCH: $ARCH"
 fi
 
 if [ "`echo $* | grep mingw32`" ]; then
   OS=LINXWIN
+  ARCH=32
+  echo Mingw-cross build using ARCH=32
+fi
+
+if [ "`echo $* | grep mingw64`" ]; then
+  OS=LINXWIN
+  ARCH=64
+  echo Mingw-cross build using ARCH=64
 fi
 
 if [ $OS ]; then
@@ -83,7 +92,6 @@ echo "Checking pre-requisites..."
 case $OS in
     LINXWIN)
         MAKENSIS=
-
         if [ "`command -v makensis`" ]; then
             MAKENSIS=makensis
         elif [ "`command -v i686-pc-mingw32-makensis`" ]; then
@@ -110,6 +118,13 @@ fi
 
 echo "Building openscad-$VERSION ($VERSIONDATE) $CONFIGURATION..."
 
+if [ ! $NUMCPU ]; then
+  echo "note: you can 'export NUMCPU=x' for multi-core compiles (x=number)";
+  NUMCPU=2
+else
+  echo "NUMCPU: " $NUMCPU
+fi
+
 CONFIG=deploy
 case $OS in
     LINUX|MACOSX) 
@@ -124,10 +139,10 @@ case $OS in
         TARGET=release
         ;;
     LINXWIN) 
-        . ./scripts/setenv-mingw-xbuild.sh
+        . ./scripts/setenv-mingw-xbuild.sh $ARCH
         TARGET=release
         ZIP="zip"
-        ZIPARGS="-r"
+        ZIPARGS="-r -q"
         ;;
 esac
 
@@ -145,7 +160,7 @@ esac
 case $OS in
     LINXWIN)
         cd $DEPLOYDIR
-        make -s clean ## comment out for test-run
+        make clean ## comment out for test-run
         cd $OPENSCADDIR
     ;;
     *)
@@ -163,25 +178,22 @@ case $OS in
         ;;
 esac
 
-if [ ! $NUMCPU ]; then
-  echo "note: you can 'export NUMCPU=x' for multi-core compiles (x=number)";
-  NUMCPU=2
-fi
-
 case $OS in
     LINXWIN)
-        # dont use paralell builds, it can error-out on parser_yacc.
-
         # make main openscad.exe
         cd $DEPLOYDIR
-        make $TARGET ## comment out for test-run
+        make $TARGET -j$NUMCPU ## comment 4 test
         if [ ! -e $TARGET/openscad.exe ]; then
-            echo 'build failed. stopping.'
+            echo "cant find $TARGET/openscad.exe. build failed. stopping."
             exit
         fi
         # make console pipe-able openscad.com - see winconsole.pri for info
         qmake CONFIG+=winconsole ../openscad.pro
         make
+        if [ ! -e $TARGET/openscad.com ]; then
+            echo "cant find $TARGET/openscad.com. build failed. stopping."
+            exit
+        fi
 
         cd $OPENSCADDIR
     ;;
@@ -271,8 +283,11 @@ case $OS in
 
         echo "Creating installer"
         echo "Copying NSIS files to $DEPLOYDIR/openscad-$VERSION"
-        cp ./scripts/installer.nsi $DEPLOYDIR/openscad-$VERSION
-        cp ./scripts/mingw-file-association.nsh $DEPLOYDIR/openscad-$VERSION
+        cp ./scripts/installer$ARCH.nsi $DEPLOYDIR/openscad-$VERSION/installer_arch.nsi
+        cp ./scripts/installer.nsi $DEPLOYDIR/openscad-$VERSION/
+        cp ./scripts/mingw-file-association.nsh $DEPLOYDIR/openscad-$VERSION/
+        cp ./scripts/x64.nsh $DEPLOYDIR/openscad-$VERSION/
+        cp ./scripts/LogicLib.nsh $DEPLOYDIR/openscad-$VERSION/
         cd $DEPLOYDIR/openscad-$VERSION
         NSISDEBUG=-V2
         # NSISDEBUG=      # leave blank for full log
@@ -288,12 +303,11 @@ case $OS in
                 echo "Installer created:" $INSTFILE
                 echo
             else
-              echo "Build failed. Cannot find" $INSTFILE
-              exit 1
+                echo "Build failed. Cannot find" $INSTFILE
             fi
         else
-          echo "Build failed. Cannot find" $BINFILE
-          exit 1
+            echo "Build failed. Cannot find" $BINFILE
+            exit 1
         fi
         ;;
     LINUX)
diff --git a/scripts/setenv-mingw-xbuild.sh b/scripts/setenv-mingw-xbuild.sh
index e31534e..d3a014c 100644
--- a/scripts/setenv-mingw-xbuild.sh
+++ b/scripts/setenv-mingw-xbuild.sh
@@ -2,7 +2,10 @@
 #
 # set environment variables for mingw/mxe cross-build
 #
-# Usage: source ./scripts/setenv-mingw-xbuild.sh
+# Usage:
+#
+#     source ./scripts/setenv-mingw-xbuild.sh         # 32 bit build
+#     source ./scripts/setenv-mingw-xbuild.sh 64      # 64 bit build
 #
 # Prerequisites:
 #
@@ -11,36 +14,83 @@
 # Also see http://en.wikibooks.org/wiki/OpenSCAD_User_Manual/Cross-compiling_for_Windows_on_Linux_or_Mac_OS_X
 #
 
-export OPENSCADDIR=$PWD
+OPENSCADDIR=$PWD
 
 if [ ! $BASEDIR ]; then
-	export BASEDIR=$HOME/openscad_deps
+	BASEDIR=$HOME/openscad_deps
 fi
 
+DEPLOYDIR64=$OPENSCADDIR/mingw64
+DEPLOYDIR32=$OPENSCADDIR/mingw32
+
 if [ ! $DEPLOYDIR ]; then
-	export DEPLOYDIR=$OPENSCADDIR/mingw32
+	if [ "`echo $* | grep 64 `" ]; then
+		DEPLOYDIR=$DEPLOYDIR64
+	else
+		DEPLOYDIR=$DEPLOYDIR32
+	fi
 fi
 
 if [ ! $MXEDIR ]; then
-	export MXEDIR=$BASEDIR/mxe
+	if [ "`echo $* | grep 64 `" ]; then
+		MXEDIR=$BASEDIR/mxe-w64
+	else
+		MXEDIR=$BASEDIR/mxe
+	fi
 fi
 
-export PATH=$MXEDIR/usr/bin:$PATH
-
 if [ ! -e $DEPLOYDIR ]; then
   mkdir -p $DEPLOYDIR
 fi
 
-echo linking $MXEDIR/usr/i686-pc-mingw32/ to $DEPLOYDIR/mingw-cross-env
-rm -f $DEPLOYDIR/mingw-cross-env
-ln -s $MXEDIR/usr/i686-pc-mingw32/ $DEPLOYDIR/mingw-cross-env
-export PATH=$MXEDIR/usr/i686-pc-mingw32/qt/bin:$PATH
+if [ "`echo $* | grep 64 `" ]; then
+	MXETARGETDIR=$MXEDIR/usr/x86_64-w64-mingw32
+else
+	MXETARGETDIR=$MXEDIR/usr/i686-pc-mingw32
+fi
+
+if [ ! $MINGWX_SAVED_ORIGINAL_PATH ]; then
+  MINGWX_SAVED_ORIGINAL_PATH=$PATH
+  echo current path saved
+fi
+
+PATH=$MXEDIR/usr/bin:$PATH
+PATH=$MXETARGETDIR/qt/bin:$PATH
 
+OPENSCAD_LIBRARIES=$MXETARGETDIR
+
+if [ "`echo $* | grep clean`" ]; then
+  OPENSCAD_LIBRARIES=
+  BASEDIR=
+  MXEDIR=
+  MXETARGETDIR=
+  DEPLOYDIR=
+  PATH=$MINGWX_SAVED_ORIGINAL_PATH
+  MINGWX_SAVED_ORIGINAL_PATH=
+else
+  echo 'linking' $MXETARGETDIR
+  echo '     to' $DEPLOYDIR/mingw-cross-env
+  rm -f $DEPLOYDIR/mingw-cross-env
+  ln -s $MXETARGETDIR $DEPLOYDIR/mingw-cross-env
+fi
+
+export OPENSCAD_LIBRARIES
+export BASEDIR
+export MXEDIR
+export MXETARGETDIR
+export DEPLOYDIR
+export PATH
+export MINGWX_SAVED_ORIGINAL_PATH
+
+echo OPENSCAD_LIBRARIES: $OPENSCAD_LIBRARIES
 echo BASEDIR: $BASEDIR
 echo MXEDIR: $MXEDIR
+echo MXETARGETDIR: $MXETARGETDIR
 echo DEPLOYDIR: $DEPLOYDIR
-echo PATH modified: $MXEDIR/usr/bin
-echo PATH modified: $MXEDIR/usr/i686-pc-mingw32/qt/bin
-
-
+if [ "`echo $* | grep clean`" ]; then
+  echo PATH restored to pre-setenv-mingw-x state
+else
+  echo PATH modified: $MXEDIR/usr/bin
+  echo PATH modified: $MXETARGETDIR/qt/bin
+fi
 
diff --git a/scripts/uni-build-dependencies.sh b/scripts/uni-build-dependencies.sh
index bfc830f..60dbb74 100755
--- a/scripts/uni-build-dependencies.sh
+++ b/scripts/uni-build-dependencies.sh
@@ -408,8 +408,21 @@ build_opencsg()
     OPENCSG_QMAKE=qmake-qt4
   elif [ "`command -v qmake4`" ]; then
     OPENCSG_QMAKE=qmake4
-  else
+  elif [ "`command -v qmake`" ]; then
     OPENCSG_QMAKE=qmake
+  else
+    echo qmake not found... using standard OpenCSG makefiles
+    OPENCSG_QMAKE=make
+    cp Makefile Makefile.bak
+    cp src/Makefile src/Makefile.bak
+
+    cat Makefile.bak | sed s/example// |sed s/glew// > Makefile
+    cat src/Makefile.bak | sed s@^INCPATH.*@INCPATH\ =\ -I$BASEDIR/include\ -I../include\ -I..\ -I.@ > src/Makefile
+    cp src/Makefile src/Makefile.bak2
+    cat src/Makefile.bak2 | sed s@^LIBS.*@LIBS\ =\ -L$BASEDIR/lib\ -L/usr/X11R6/lib\ -lGLU\ -lGL@ > src/Makefile
+    tmp=$version
+    build_glu 9.0.0 # todo - autodetect the need for glu
+    version=$tmp
   fi
 
   cd $BASEDIR/src/OpenCSG-$version/src
@@ -562,7 +575,7 @@ fi
 build_eigen 3.1.1
 build_gmp 5.0.5
 build_mpfr 3.1.1
-build_boost 1.49.0
+build_boost 1.53.0
 # NB! For CGAL, also update the actual download URL in the function
 build_cgal 4.1
 build_glew 1.9.0
diff --git a/scripts/x64.nsh b/scripts/x64.nsh
new file mode 100644
index 0000000..e694c1e
--- /dev/null
+++ b/scripts/x64.nsh
@@ -0,0 +1,54 @@
+; ---------------------
+;       x64.nsh
+; ---------------------
+;
+; A few simple macros to handle installations on x64 machines.
+;
+; RunningX64 checks if the installer is running on x64.
+;
+;   ${If} ${RunningX64}
+;     MessageBox MB_OK "running on x64"
+;   ${EndIf}
+;
+; DisableX64FSRedirection disables file system redirection.
+; EnableX64FSRedirection enables file system redirection.
+;
+;   SetOutPath $SYSDIR
+;   ${DisableX64FSRedirection}
+;   File some.dll # extracts to C:\Windows\System32
+;   ${EnableX64FSRedirection}
+;   File some.dll # extracts to C:\Windows\SysWOW64
+;
+
+!ifndef ___X64__NSH___
+!define ___X64__NSH___
+
+!include LogicLib.nsh
+
+!macro _RunningX64 _a _b _t _f
+  !insertmacro _LOGICLIB_TEMP
+  System::Call kernel32::GetCurrentProcess()i.s
+  System::Call kernel32::IsWow64Process(is,*i.s)
+  Pop $_LOGICLIB_TEMP
+  !insertmacro _!= $_LOGICLIB_TEMP 0 `${_t}` `${_f}`
+!macroend
+
+!define RunningX64 `"" RunningX64 ""`
+
+!macro DisableX64FSRedirection
+
+  System::Call kernel32::Wow64EnableWow64FsRedirection(i0)
+
+!macroend
+
+!define DisableX64FSRedirection "!insertmacro DisableX64FSRedirection"
+
+!macro EnableX64FSRedirection
+
+  System::Call kernel32::Wow64EnableWow64FsRedirection(i1)
+
+!macroend
+
+!define EnableX64FSRedirection "!insertmacro EnableX64FSRedirection"
+
+!endif # !___X64__NSH___