Skip to content

Commit

Permalink
Changes for cross-platform installer generators
Browse files Browse the repository at this point in the history
  • Loading branch information
malcom2073 committed Oct 12, 2013
1 parent 4c36fcf commit 4d2f0a8
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 1 deletion.
5 changes: 4 additions & 1 deletion emstudio32.cross.nsi
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,11 @@ Section "EMStudio (Required)" ;No components page, name is not important
SetOutPath "$INSTDIR\dashboards"
File "core/src/gauges.qml"
SetOutPath "$INSTDIR\plugins"
!ifndef PLUGIN
File "core/plugins/libfreeemsplugin.a"

!else
File "core/plugins/${PLUGIN}"
!endif
; Write the installation path into the registry
WriteRegStr HKLM SOFTWARE\EMStudio "Install_Dir" "$INSTDIR"

Expand Down
4 changes: 4 additions & 0 deletions emstudio64.cross.nsi
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,11 @@ Section "EMStudio (Required)" ;No components page, name is not important
SetOutPath "$INSTDIR\dashboards"
File "core/src/gauges.qml"
SetOutPath "$INSTDIR\plugins"
!ifndef PLUGIN
File "core/plugins/libfreeemsplugin.a"
!else
File "core/plugins/${PLUGIN}"
!endif

; Write the installation path into the registry
WriteRegStr HKLM SOFTWARE\EMStudio "Install_Dir" "$INSTDIR"
Expand Down

0 comments on commit 4d2f0a8

Please sign in to comment.