Fixes #2253
This commit is contained in:
@@ -274,11 +274,7 @@ ELSE( )
|
|||||||
ADD_EXECUTABLE( ${PROJECT_NAME} WIN32 ${companion_SRCS} ${companion_QM} )
|
ADD_EXECUTABLE( ${PROJECT_NAME} WIN32 ${companion_SRCS} ${companion_QM} )
|
||||||
ENDIF( )
|
ENDIF( )
|
||||||
|
|
||||||
if(SDL_FOUND)
|
target_link_libraries(companion generaledit modeledit simulation common qcustomplot shared ${QT_LIBRARIES} ${QT_QTMAIN_LIBRARY} ${XERCESC_LIBRARY} ${PTHREAD_LIBRARY} ${SDL_LIBRARY} ${PHONON_LIBS})
|
||||||
TARGET_LINK_LIBRARIES( ${PROJECT_NAME} generaledit modeledit simulation common qcustomplot shared ${QT_LIBRARIES} ${XERCESC_LIBRARY} ${PTHREAD_LIBRARY} ${SDL_LIBRARY} ${PHONON_LIBS})
|
|
||||||
else()
|
|
||||||
TARGET_LINK_LIBRARIES( ${PROJECT_NAME} generaledit modeledit simulation common qcustomplot shared ${QT_LIBRARIES} ${QT_QTMAIN_LIBRARY} ${XERCESC_LIBRARY} ${PTHREAD_LIBRARY} ${SDL_LIBRARY} ${PHONON_LIBS})
|
|
||||||
endif()
|
|
||||||
|
|
||||||
############# Standalone simu ###############
|
############# Standalone simu ###############
|
||||||
|
|
||||||
@@ -306,11 +302,7 @@ else()
|
|||||||
add_executable(simulator WIN32 ${simu_SRCS})
|
add_executable(simulator WIN32 ${simu_SRCS})
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
target_link_libraries(simulator simulation common ${QT_LIBRARIES} ${PTHREAD_LIBRARY} ${SDL_LIBRARY} ${PHONON_LIBS} ${OPENTX_SIMULATOR_LIBS})
|
target_link_libraries(simulator simulation common ${QT_LIBRARIES} ${QT_QTMAIN_LIBRARY} ${PTHREAD_LIBRARY} ${SDL_LIBRARY} ${PHONON_LIBS} ${OPENTX_SIMULATOR_LIBS})
|
||||||
|
|
||||||
if(NOT SDL_FOUND)
|
|
||||||
target_link_libraries(simulator ${QT_QTMAIN_LIBRARY})
|
|
||||||
endif()
|
|
||||||
|
|
||||||
############# Packaging ####################
|
############# Packaging ####################
|
||||||
|
|
||||||
|
|||||||
@@ -50,6 +50,7 @@
|
|||||||
#include <iostream>
|
#include <iostream>
|
||||||
#if defined(JOYSTICKS) || defined(SIMU_AUDIO)
|
#if defined(JOYSTICKS) || defined(SIMU_AUDIO)
|
||||||
#include <SDL.h>
|
#include <SDL.h>
|
||||||
|
#undef main
|
||||||
#endif
|
#endif
|
||||||
#include "mainwindow.h"
|
#include "mainwindow.h"
|
||||||
#include "eeprominterface.h"
|
#include "eeprominterface.h"
|
||||||
|
|||||||
@@ -50,6 +50,7 @@
|
|||||||
#include <iostream>
|
#include <iostream>
|
||||||
#if defined(JOYSTICKS) || defined(SIMU_AUDIO)
|
#if defined(JOYSTICKS) || defined(SIMU_AUDIO)
|
||||||
#include <SDL.h>
|
#include <SDL.h>
|
||||||
|
#undef main
|
||||||
#endif
|
#endif
|
||||||
#include "simulatordialog.h"
|
#include "simulatordialog.h"
|
||||||
#include "eeprominterface.h"
|
#include "eeprominterface.h"
|
||||||
|
|||||||
Reference in New Issue
Block a user