From 1922bc9eddb4e9fe91d2e1474b1dd20b399f4b33 Mon Sep 17 00:00:00 2001
From: bsongis <bsongis@gmail.com>
Date: Sun, 26 Jul 2015 08:43:56 +0200
Subject: [PATCH] #2563 - Still needs mods on the server

---
 companion/src/CMakeLists.txt                    | 8 ++++----
 companion/targets/windows/companion-msys.nsi.in | 4 ++--
 companion/targets/windows/companion-vs.nsi.in   | 2 +-
 companion/targets/windows/simulator-vs.nsi.in   | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/companion/src/CMakeLists.txt b/companion/src/CMakeLists.txt
index e0fdb94d8..2d3c2d8a7 100644
--- a/companion/src/CMakeLists.txt
+++ b/companion/src/CMakeLists.txt
@@ -372,19 +372,19 @@ IF( WIN32 )
     "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
                      DEPENDS companion simulator opentx-simulators ${PROJECT_BINARY_DIR}/companion.nsi
                      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
                      DEPENDS simulator opentx-simulators ${PROJECT_BINARY_DIR}/simulator.nsi
                      COMMENT "Simulator Windows NSIS Installer")
 
   ADD_CUSTOM_TARGET( installer
-    DEPENDS ${PROJECT_BINARY_DIR}/companionInstall.exe
-    DEPENDS ${PROJECT_BINARY_DIR}/simulatorInstall.exe
+    DEPENDS ${PROJECT_BINARY_DIR}/companion-windows.exe
+    DEPENDS ${PROJECT_BINARY_DIR}/simulator-windows.exe
     SOURCES ${PROJECT_BINARY_DIR}/companion.nsi
     SOURCES ${PROJECT_BINARY_DIR}/simulator.nsi
   )
diff --git a/companion/targets/windows/companion-msys.nsi.in b/companion/targets/windows/companion-msys.nsi.in
index dbb9ad683..6d0975dc7 100644
--- a/companion/targets/windows/companion-msys.nsi.in
+++ b/companion/targets/windows/companion-msys.nsi.in
@@ -13,7 +13,7 @@
 
   ;Name and file
   Name "OpenTX companion"
-  OutFile "companionInstall_v@C9X_VERSION@.exe"
+  OutFile "companion-windows-v@C9X_VERSION@.exe"
 
   ;Default installation folder
   InstallDir "$PROGRAMFILES\OpenTX companion"
@@ -141,7 +141,7 @@ SectionEnd
 
   ;Language strings
   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
   !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
diff --git a/companion/targets/windows/companion-vs.nsi.in b/companion/targets/windows/companion-vs.nsi.in
index 00e732d42..698a3e617 100644
--- a/companion/targets/windows/companion-vs.nsi.in
+++ b/companion/targets/windows/companion-vs.nsi.in
@@ -13,7 +13,7 @@
 
   ;Name and file
   Name "OpenTX Companion 2.1"
-  OutFile "companionInstall_@C9X_VERSION@.exe"
+  OutFile "companion-windows-@C9X_VERSION@.exe"
 
   ;Default installation folder
   InstallDir "$PROGRAMFILES\OpenTX\Companion 2.1"
diff --git a/companion/targets/windows/simulator-vs.nsi.in b/companion/targets/windows/simulator-vs.nsi.in
index aae31c2f1..7111ecd83 100755
--- a/companion/targets/windows/simulator-vs.nsi.in
+++ b/companion/targets/windows/simulator-vs.nsi.in
@@ -12,7 +12,7 @@
 
   ;Name and file
   Name "OpenTX Simulator"
-  OutFile "simulatorInstall_@C9X_VERSION@.exe"
+  OutFile "simulator-windows-@C9X_VERSION@.exe"
 
   ;Default installation folder
   InstallDir "$PROGRAMFILES\OpenTX"