From 4d2f0a821380b38c134feb6994ddc3d5d883657a Mon Sep 17 00:00:00 2001 From: Michael Carpenter Date: Sat, 12 Oct 2013 16:29:07 -0400 Subject: [PATCH] Changes for cross-platform installer generators --- emstudio32.cross.nsi | 5 ++++- emstudio64.cross.nsi | 4 ++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/emstudio32.cross.nsi b/emstudio32.cross.nsi index f4654db..044c887 100644 --- a/emstudio32.cross.nsi +++ b/emstudio32.cross.nsi @@ -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" diff --git a/emstudio64.cross.nsi b/emstudio64.cross.nsi index a7a738a..6f26180 100644 --- a/emstudio64.cross.nsi +++ b/emstudio64.cross.nsi @@ -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"