Simu renamed to simulator, in the same directory as companion

companion/src/CMakeLists.txt

@@ -73,7 +73,7 @@ ELSE( )
 ENDIF( )
 
 set(RADIO_SRC_DIRECTORY ${PROJECT_SOURCE_DIR}/../../radio/src)
-set(SIMU_SRC_DIRECTORY ${PROJECT_SOURCE_DIR}/simulator)
+set(SIMU_SRC_DIRECTORY ${PROJECT_SOURCE_DIR}/simulation)
 set(COMPANION_SRC_DIRECTORY ${PROJECT_SOURCE_DIR})
 
 add_custom_command(
@@ -94,7 +94,7 @@ include_directories(
 )
 
 add_subdirectory(modeledit)
-add_subdirectory(simulator)
+add_subdirectory(simulation)
 
 SET( companion_SRCS
      eeprominterface.cpp
@@ -260,6 +260,85 @@ ENDIF( )
 
 TARGET_LINK_LIBRARIES( ${PROJECT_NAME} modeledit simulation ${QT_LIBRARIES} ${QT_QTMAIN_LIBRARY} ${XERCESC_LIBRARY} ${PTHREAD_LIBRARY} ${SDL_LIBRARY} ${PHONON_LIBS} )
 
+############# Standalone simu ###############
+
+set(TH9X_CHECKOUT_DIRECTORY ${PROJECT_BINARY_DIR}/firmwares/th9x)
+add_custom_command(
+  OUTPUT ${TH9X_CHECKOUT_DIRECTORY}/th9xsimulator.cpp
+  COMMAND ${CMAKE_COMMAND} -E make_directory ${TH9X_CHECKOUT_DIRECTORY}
+  COMMAND cd ${TH9X_CHECKOUT_DIRECTORY} && svn checkout http://th9x.googlecode.com/svn/trunk/src@285 .
+  COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/firmwares/th9x/th9xsimulator.cpp ${TH9X_CHECKOUT_DIRECTORY}
+  DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/firmwares/th9x/th9xsimulator.cpp
+)
+
+set(ER9X_CHECKOUT_DIRECTORY ${PROJECT_BINARY_DIR}/firmwares/er9x)
+add_custom_command(
+  OUTPUT ${ER9X_CHECKOUT_DIRECTORY}/er9xsimulator.cpp
+  COMMAND ${CMAKE_COMMAND} -E make_directory ${ER9X_CHECKOUT_DIRECTORY}
+  COMMAND cd ${ER9X_CHECKOUT_DIRECTORY} && svn checkout http://er9x.googlecode.com/svn/trunk/src@790 .
+  COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/firmwares/er9x/er9xsimulator.cpp ${ER9X_CHECKOUT_DIRECTORY}
+  DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/firmwares/er9x/er9xsimulator.cpp
+)
+
+set(ERSKY9X_CHECKOUT_DIRECTORY ${PROJECT_BINARY_DIR}/firmwares/ersky9x)
+add_custom_command(
+  OUTPUT ${ERSKY9X_CHECKOUT_DIRECTORY}/ersky9xsimulator.cpp
+  COMMAND ${CMAKE_COMMAND} -E make_directory ${ERSKY9X_CHECKOUT_DIRECTORY}
+  COMMAND cd ${ERSKY9X_CHECKOUT_DIRECTORY} && svn checkout http://ersky9x.googlecode.com/svn/trunk/src@170 .
+  COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/firmwares/ersky9x/ersky9xsimulator.cpp ${ERSKY9X_CHECKOUT_DIRECTORY}
+  DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/firmwares/ersky9x/ersky9xsimulator.cpp
+)
+
+set(simu_SRCS
+  eeprominterface.cpp
+  firmwares/th9x/th9xeeprom.cpp # TODO not needed
+  firmwares/th9x/th9xinterface.cpp
+  ${TH9X_CHECKOUT_DIRECTORY}/th9xsimulator.cpp
+  firmwares/er9x/er9xeeprom.cpp # TODO not needed
+  firmwares/er9x/er9xinterface.cpp
+  ${ER9X_CHECKOUT_DIRECTORY}/er9xsimulator.cpp
+  firmwares/gruvin9x/gruvin9xeeprom.cpp # TODO not needed
+  firmwares/gruvin9x/gruvin9xinterface.cpp  
+  firmwares/opentx/opentxeeprom.cpp # TODO not needed
+  firmwares/opentx/open9xStockeeprom.cpp # TODO not needed
+  firmwares/opentx/open9xGruvin9xeeprom.cpp # TODO not needed
+  firmwares/opentx/open9xSky9xeeprom.cpp # TODO not needed
+  firmwares/opentx/opentxinterface.cpp
+  firmwares/opentx/opentxTaranisSimulator.cpp
+  firmwares/opentx/opentxSky9xsimulator.cpp
+  firmwares/opentx/opentxGruvin9xsimulator.cpp
+  firmwares/opentx/opentxM128simulator.cpp
+  firmwares/opentx/opentxsimulator.cpp  
+  firmwares/ersky9x/ersky9xeeprom.cpp # TODO not needed
+  firmwares/ersky9x/ersky9xinterface.cpp
+  ${ERSKY9X_CHECKOUT_DIRECTORY}/ersky9xsimulator.cpp
+  ${RADIO_SRC_DIRECTORY}/bitmaps/sticks.lbm
+  file.cpp # TODO not needed
+  helpers.cpp # TODO not needed
+  modeledit/node.cpp
+  modeledit/edge.cpp # TODO not needed
+  simulation/main.cpp
+)
+
+set(simu_HDRS
+  modeledit/node.h  
+  helpers.h # TODO not needed
+  myslider.h # TODO not needed
+)
+
+qt4_wrap_cpp(simu_SRCS ${simu_HDRS} )
+qt4_add_resources(simu_SRCS companion.qrc) # TODO not needed
+
+if(WIN32)
+  set(simu_SRCS ${simu_SRCS} icon.rc)
+endif()
+
+add_executable(simulator WIN32 ${simu_SRCS})
+
+target_link_libraries(simulator simulation ${QT_LIBRARIES} ${PTHREAD_LIBRARY} ${SDL_LIBRARY} ${PHONON_LIBS})
+
+############# Packaging ####################
+
 IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
     INSTALL( TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/bin )
     INSTALL( FILES companion.desktop DESTINATION share/applications )
@@ -302,7 +381,8 @@ IF( WIN32 )
 
   ADD_CUSTOM_TARGET( installer
     DEPENDS ${PROJECT_BINARY_DIR}/companionInstall.exe
-    SOURCES ${PROJECT_BINARY_DIR}/companion.nsi)
+    SOURCES ${PROJECT_BINARY_DIR}/companion.nsi
+  )
 ENDIF( )
 
 IF( APPLE )

companion/src/simulation/CMakeLists.txt

@@ -0,0 +1,48 @@
+set(simulation_SRCS
+  simulatordialog.cpp
+)
+
+set(simulation_UIS
+  simulatordialog-9x.ui
+  simulatordialog-taranis.ui
+)
+
+set(simulation_HDRS
+  simulatordialog.h
+  cursorwidget.h
+  menuwidget.h
+  xcursorwidget.h
+  xmenuwidget.h
+)
+
+if(SDL_FOUND)
+  set(simulation_SRCS
+    ${simulation_SRCS}
+    joystick.cpp
+    joystickdialog.cpp
+  )
+  
+  set(simulation_HDRS
+    ${simulation_HDRS}
+    joystick.h
+    joystickdialog.h
+  )
+     
+  set(simulation_UIS
+    ${simulation_UIS}
+    joystickdialog.ui
+  ) 
+endif() 
+
+include_directories(
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${PROJECT_SOURCE_DIR}
+  ${PROJECT_SOURCE_DIR}/../..
+  ${COMPANION_SRC_DIRECTORY}
+  ${RADIO_SRC_DIRECTORY}/fonts/std
+)
+
+qt4_wrap_ui(simulation_SRCS ${simulation_UIS})
+qt4_wrap_cpp(simulation_SRCS ${simulation_HDRS})
+
+add_library(simulation ${simulation_SRCS})

companion/src/simulator/CMakeLists.txt

@@ -1,133 +0,0 @@
-INCLUDE( ${QT_USE_FILE} )
-
-set(TH9X_CHECKOUT_DIRECTORY ${PROJECT_BINARY_DIR}/firmwares/th9x)
-add_custom_command(
-  OUTPUT ${TH9X_CHECKOUT_DIRECTORY}/th9xsimulator.cpp
-  COMMAND ${CMAKE_COMMAND} -E make_directory ${TH9X_CHECKOUT_DIRECTORY}
-  COMMAND cd ${TH9X_CHECKOUT_DIRECTORY} && svn checkout http://th9x.googlecode.com/svn/trunk/src@285 .
-  COMMAND ${CMAKE_COMMAND} -E copy ${COMPANION_SRC_DIRECTORY}/firmwares/th9x/th9xsimulator.cpp ${TH9X_CHECKOUT_DIRECTORY}
-  DEPENDS ${COMPANION_SRC_DIRECTORY}/firmwares/th9x/th9xsimulator.cpp
-)
-
-set(ER9X_CHECKOUT_DIRECTORY ${PROJECT_BINARY_DIR}/firmwares/er9x)
-add_custom_command(
-  OUTPUT ${ER9X_CHECKOUT_DIRECTORY}/er9xsimulator.cpp
-  COMMAND ${CMAKE_COMMAND} -E make_directory ${ER9X_CHECKOUT_DIRECTORY}
-  COMMAND cd ${ER9X_CHECKOUT_DIRECTORY} && svn checkout http://er9x.googlecode.com/svn/trunk/src@790 .
-  COMMAND ${CMAKE_COMMAND} -E copy ${COMPANION_SRC_DIRECTORY}/firmwares/er9x/er9xsimulator.cpp ${ER9X_CHECKOUT_DIRECTORY}
-  DEPENDS ${COMPANION_SRC_DIRECTORY}/firmwares/er9x/er9xsimulator.cpp
-)
-
-set(ERSKY9X_CHECKOUT_DIRECTORY ${PROJECT_BINARY_DIR}/firmwares/ersky9x)
-add_custom_command(
-  OUTPUT ${ERSKY9X_CHECKOUT_DIRECTORY}/ersky9xsimulator.cpp
-  COMMAND ${CMAKE_COMMAND} -E make_directory ${ERSKY9X_CHECKOUT_DIRECTORY}
-  COMMAND cd ${ERSKY9X_CHECKOUT_DIRECTORY} && svn checkout http://ersky9x.googlecode.com/svn/trunk/src@170 .
-  COMMAND ${CMAKE_COMMAND} -E copy ${COMPANION_SRC_DIRECTORY}/firmwares/ersky9x/ersky9xsimulator.cpp ${ERSKY9X_CHECKOUT_DIRECTORY}
-  DEPENDS ${COMPANION_SRC_DIRECTORY}/firmwares/ersky9x/ersky9xsimulator.cpp
-)
-
-set(simulation_SRCS
-  simulatordialog.cpp
-)
-
-set(simulation_UIS
-  simulatordialog-9x.ui
-  simulatordialog-taranis.ui
-)
-
-set(simulation_HDRS
-  simulatordialog.h
-  cursorwidget.h
-  menuwidget.h
-  xcursorwidget.h
-  xmenuwidget.h
-)
-
-if(SDL_FOUND)
-  set(simulation_SRCS
-    ${simulation_SRCS}
-    joystick.cpp
-    joystickdialog.cpp
-  )
-  
-  set(simulation_HDRS
-    ${simulation_HDRS}
-    joystick.h
-    joystickdialog.h
-  )
-     
-  set(simulation_UIS
-    ${simulation_UIS}
-    joystickdialog.ui
-  ) 
-endif() 
-
-include_directories(
-  ${CMAKE_CURRENT_BINARY_DIR}
-  ${PROJECT_SOURCE_DIR}
-  ${PROJECT_SOURCE_DIR}/../..
-  ${COMPANION_SRC_DIRECTORY}
-  ${RADIO_SRC_DIRECTORY}/fonts/std
-)
-
-qt4_wrap_ui(simulation_SRCS ${simulation_UIS})
-qt4_wrap_cpp(simulation_SRCS ${simulation_HDRS})
-
-add_library(simulation ${simulation_SRCS})
-
-set(simu_SRCS
-  ${COMPANION_SRC_DIRECTORY}/eeprominterface.cpp
-  ${COMPANION_SRC_DIRECTORY}/firmwares/th9x/th9xeeprom.cpp # TODO not needed
-  ${COMPANION_SRC_DIRECTORY}/firmwares/th9x/th9xinterface.cpp
-  ${TH9X_CHECKOUT_DIRECTORY}/th9xsimulator.cpp
-  ${COMPANION_SRC_DIRECTORY}/firmwares/er9x/er9xeeprom.cpp # TODO not needed
-  ${COMPANION_SRC_DIRECTORY}/firmwares/er9x/er9xinterface.cpp
-  ${ER9X_CHECKOUT_DIRECTORY}/er9xsimulator.cpp
-  ${COMPANION_SRC_DIRECTORY}/firmwares/gruvin9x/gruvin9xeeprom.cpp # TODO not needed
-  ${COMPANION_SRC_DIRECTORY}/firmwares/gruvin9x/gruvin9xinterface.cpp  
-  ${COMPANION_SRC_DIRECTORY}/firmwares/opentx/opentxeeprom.cpp # TODO not needed
-  ${COMPANION_SRC_DIRECTORY}/firmwares/opentx/open9xStockeeprom.cpp # TODO not needed
-  ${COMPANION_SRC_DIRECTORY}/firmwares/opentx/open9xGruvin9xeeprom.cpp # TODO not needed
-  ${COMPANION_SRC_DIRECTORY}/firmwares/opentx/open9xSky9xeeprom.cpp # TODO not needed
-  ${COMPANION_SRC_DIRECTORY}/firmwares/opentx/opentxinterface.cpp
-  ${COMPANION_SRC_DIRECTORY}/firmwares/opentx/opentxTaranisSimulator.cpp
-  ${COMPANION_SRC_DIRECTORY}/firmwares/opentx/opentxSky9xsimulator.cpp
-  ${COMPANION_SRC_DIRECTORY}/firmwares/opentx/opentxGruvin9xsimulator.cpp
-  ${COMPANION_SRC_DIRECTORY}/firmwares/opentx/opentxM128simulator.cpp
-  ${COMPANION_SRC_DIRECTORY}/firmwares/opentx/opentxsimulator.cpp  
-  ${COMPANION_SRC_DIRECTORY}/firmwares/ersky9x/ersky9xeeprom.cpp # TODO not needed
-  ${COMPANION_SRC_DIRECTORY}/firmwares/ersky9x/ersky9xinterface.cpp
-  ${ERSKY9X_CHECKOUT_DIRECTORY}/ersky9xsimulator.cpp
-  ${RADIO_SRC_DIRECTORY}/bitmaps/sticks.lbm
-  ${COMPANION_SRC_DIRECTORY}/file.cpp # TODO not needed
-  ${COMPANION_SRC_DIRECTORY}/helpers.cpp # TODO not needed
-  ${COMPANION_SRC_DIRECTORY}/modeledit/node.cpp
-  ${COMPANION_SRC_DIRECTORY}/modeledit/edge.cpp # TODO not needed
-  main.cpp
-)
-
-set(simu_HDRS
-  ${COMPANION_SRC_DIRECTORY}/modeledit/node.h  
-  ${COMPANION_SRC_DIRECTORY}/helpers.h # TODO not needed
-  ${COMPANION_SRC_DIRECTORY}/myslider.h # TODO not needed
-)
-
-qt4_wrap_cpp(simu_SRCS ${simu_HDRS} )
-qt4_add_resources(simu_SRCS ${COMPANION_SRC_DIRECTORY}/companion.qrc) # TODO not needed
-
-IF( MSVC )
-  SET(CMAKE_CXX_FLAGS "/EHsc /LD")
-  INCLUDE_DIRECTORIES( ${PROJECT_SOURCE_DIR}/winbuild C:/Programs/pthreads/Pre-built.2/include C:/Programs/msinttypes)
-  LINK_DIRECTORIES( C:/Programs/pthreads/Pre-built.2/lib/ )
-  SET( PTHREAD_LIBRARY pthreadVC2.lib )
-ELSE( )
-  SET( PTHREAD_LIBRARY pthread )
-  ADD_DEFINITIONS( -Wall )
-  LINK_DIRECTORIES( /usr/local/lib )
-ENDIF( )
-
-
-add_executable(simu WIN32 ${simu_SRCS})
-
-target_link_libraries(simu simulation ${QT_LIBRARIES} ${PTHREAD_LIBRARY} ${SDL_LIBRARY} ${PHONON_LIBS})

companion/targets/windows/companion-msys.nsi.in

@@ -12,11 +12,11 @@
 ;General
 
   ;Name and file
-  Name "openTx companion"
+  Name "OpenTX companion"
   OutFile "companionInstall_v@C9X_VERSION@.exe"
 
   ;Default installation folder
-  InstallDir "$PROGRAMFILES\openTx companion"
+  InstallDir "$PROGRAMFILES\OpenTX companion"
   
   ;Get installation folder from registry if available
   InstallDirRegKey HKCU "Software\companion9x" ""
@@ -76,7 +76,7 @@
 ;--------------------------------
 ;Installer Sections
 
-Section "openTx companion" SecDummy
+Section "OpenTX companion" SecDummy
 
   SetOutPath "$INSTDIR"
   
@@ -129,8 +129,8 @@ SectionEnd
 ;Descriptions
 
   ;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
   !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN

companion/targets/windows/companion-vs.nsi.in

@@ -12,11 +12,11 @@
 ;General
 
   ;Name and file
-  Name "openTx companion"
+  Name "OpenTX companion"
   OutFile "companionInstall_v@C9X_VERSION@.exe"
 
   ;Default installation folder
-  InstallDir "$PROGRAMFILES\openTx companion"
+  InstallDir "$PROGRAMFILES\OpenTX companion"
   
   ;Get installation folder from registry if available
   InstallDirRegKey HKCU "Software\companion9x" ""
@@ -95,12 +95,13 @@
 ;--------------------------------
 ;Installer Sections
 
-Section "openTx companion" SecDummy
+Section "OpenTX companion" SecDummy
 
   SetOutPath "$INSTDIR"
   
   File "@CMAKE_CURRENT_SOURCE_DIR@\..\targets\windows\license.txt"
   File "Release\companion.exe"
+  File "Release\simulator.exe"
   ${!defineifexist} PTHREAD_WINDIR "C:\Programs\pthreads\Pre-built.2\lib\pthreadVC2.dll"
   !ifdef PTHREAD_WINDIR
   File "C:\Programs\pthreads\Pre-built.2\lib\pthreadVC2.dll"
@@ -155,8 +156,8 @@ SectionEnd
 ;Descriptions
 
   ;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
   !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
@@ -172,6 +173,7 @@ Section "Uninstall"
   
   Delete "$INSTDIR\license.txt"
   Delete "$INSTDIR\companion.exe"
+  Delete "$INSTDIR\simulator.exe"
   Delete "$INSTDIR\pthreadVC2.dll"
   Delete "$INSTDIR\xerces-c_3_1.dll"
   Delete "$INSTDIR\SDL.dll"