#2563 - Still needs mods on the server
This commit is contained in:
@@ -372,19 +372,19 @@ IF( WIN32 )
|
|||||||
"C:/Programs/NSIS"
|
"C:/Programs/NSIS"
|
||||||
)
|
)
|
||||||
|
|
||||||
ADD_CUSTOM_COMMAND(OUTPUT ${PROJECT_BINARY_DIR}/companionInstall.exe
|
ADD_CUSTOM_COMMAND(OUTPUT ${PROJECT_BINARY_DIR}/companion-windows.exe
|
||||||
COMMAND "${NSIS_EXE}" ARGS companion.nsi
|
COMMAND "${NSIS_EXE}" ARGS companion.nsi
|
||||||
DEPENDS companion simulator opentx-simulators ${PROJECT_BINARY_DIR}/companion.nsi
|
DEPENDS companion simulator opentx-simulators ${PROJECT_BINARY_DIR}/companion.nsi
|
||||||
COMMENT "Companion Windows NSIS Installer")
|
COMMENT "Companion Windows NSIS Installer")
|
||||||
|
|
||||||
ADD_CUSTOM_COMMAND(OUTPUT ${PROJECT_BINARY_DIR}/simulatorInstall.exe
|
ADD_CUSTOM_COMMAND(OUTPUT ${PROJECT_BINARY_DIR}/simulator-install.exe
|
||||||
COMMAND "${NSIS_EXE}" ARGS simulator.nsi
|
COMMAND "${NSIS_EXE}" ARGS simulator.nsi
|
||||||
DEPENDS simulator opentx-simulators ${PROJECT_BINARY_DIR}/simulator.nsi
|
DEPENDS simulator opentx-simulators ${PROJECT_BINARY_DIR}/simulator.nsi
|
||||||
COMMENT "Simulator Windows NSIS Installer")
|
COMMENT "Simulator Windows NSIS Installer")
|
||||||
|
|
||||||
ADD_CUSTOM_TARGET( installer
|
ADD_CUSTOM_TARGET( installer
|
||||||
DEPENDS ${PROJECT_BINARY_DIR}/companionInstall.exe
|
DEPENDS ${PROJECT_BINARY_DIR}/companion-windows.exe
|
||||||
DEPENDS ${PROJECT_BINARY_DIR}/simulatorInstall.exe
|
DEPENDS ${PROJECT_BINARY_DIR}/simulator-windows.exe
|
||||||
SOURCES ${PROJECT_BINARY_DIR}/companion.nsi
|
SOURCES ${PROJECT_BINARY_DIR}/companion.nsi
|
||||||
SOURCES ${PROJECT_BINARY_DIR}/simulator.nsi
|
SOURCES ${PROJECT_BINARY_DIR}/simulator.nsi
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -13,7 +13,7 @@
|
|||||||
|
|
||||||
;Name and file
|
;Name and file
|
||||||
Name "OpenTX companion"
|
Name "OpenTX companion"
|
||||||
OutFile "companionInstall_v@C9X_VERSION@.exe"
|
OutFile "companion-windows-v@C9X_VERSION@.exe"
|
||||||
|
|
||||||
;Default installation folder
|
;Default installation folder
|
||||||
InstallDir "$PROGRAMFILES\OpenTX companion"
|
InstallDir "$PROGRAMFILES\OpenTX companion"
|
||||||
@@ -141,7 +141,7 @@ SectionEnd
|
|||||||
|
|
||||||
;Language strings
|
;Language strings
|
||||||
LangString DESC_SecDummy ${LANG_ENGLISH} "Models and settings editor for OpenTX"
|
LangString DESC_SecDummy ${LANG_ENGLISH} "Models and settings editor for OpenTX"
|
||||||
LangString DESC_SecDummy ${LANG_FRENCH} "Editeur de réglages et modèles pour OpenTX"
|
LangString DESC_SecDummy ${LANG_FRENCH} "Editeur de r�glages et mod�les pour OpenTX"
|
||||||
|
|
||||||
;Assign language strings to sections
|
;Assign language strings to sections
|
||||||
!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
|
!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
|
||||||
|
|||||||
@@ -13,7 +13,7 @@
|
|||||||
|
|
||||||
;Name and file
|
;Name and file
|
||||||
Name "OpenTX Companion 2.1"
|
Name "OpenTX Companion 2.1"
|
||||||
OutFile "companionInstall_@C9X_VERSION@.exe"
|
OutFile "companion-windows-@C9X_VERSION@.exe"
|
||||||
|
|
||||||
;Default installation folder
|
;Default installation folder
|
||||||
InstallDir "$PROGRAMFILES\OpenTX\Companion 2.1"
|
InstallDir "$PROGRAMFILES\OpenTX\Companion 2.1"
|
||||||
|
|||||||
@@ -12,7 +12,7 @@
|
|||||||
|
|
||||||
;Name and file
|
;Name and file
|
||||||
Name "OpenTX Simulator"
|
Name "OpenTX Simulator"
|
||||||
OutFile "simulatorInstall_@C9X_VERSION@.exe"
|
OutFile "simulator-windows-@C9X_VERSION@.exe"
|
||||||
|
|
||||||
;Default installation folder
|
;Default installation folder
|
||||||
InstallDir "$PROGRAMFILES\OpenTX"
|
InstallDir "$PROGRAMFILES\OpenTX"
|
||||||
|
|||||||
Reference in New Issue
Block a user