chore: Convert simu/simulator/companion to SDL2 (#3085)
* chore(pc): convert simu/simulator/companion to use SDL2 * switch companion builds to SDL2 - OSX is not converted the linux change is done a bit hacky, it should be done by updating the EdgeTX docker container * update build system setup scripts * add compatibility for old and new SDL2 cmake integration * fix windows installer * fix simulator audio on windows by using DirectSound vie SDL2 * fix windows audio with SDL2 enable simu for windows builds * remove workflow changes for linux builds, this needs to be fixed in the build environment * fix OSX build, thx @pafleraf * fix windows audio for companion and simulator with SDL2 * select SDL2 branch of the build-docker environment * Revert "select SDL2 branch of the build-docker environment" This reverts commit da801609d78e1aed513ad7d9d8ab3ebded2900b9. * fix tests with SDL2
This commit is contained in:
@@ -19,9 +19,12 @@ set(SIMU_DRIVERS
|
||||
)
|
||||
|
||||
|
||||
if(SDL_FOUND)
|
||||
include_directories(${SDL_INCLUDE_DIR})
|
||||
if(SDL2_FOUND)
|
||||
include_directories(${SDL2_INCLUDE_DIRS})
|
||||
add_definitions(-DJOYSTICKS)
|
||||
if(TARGET SDL2::SDL2)
|
||||
set(SDL2_LIBRARIES SDL2::SDL2)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
if(SIMU_LUA_COMPILER)
|
||||
@@ -76,7 +79,7 @@ if(Qt5Widgets_FOUND)
|
||||
|
||||
target_compile_options(${SIMULATOR_TARGET} PRIVATE ${SIMU_SRC_OPTIONS})
|
||||
target_compile_definitions(${SIMULATOR_TARGET} PUBLIC ${APP_COMMON_DEFINES})
|
||||
target_link_libraries(${SIMULATOR_TARGET} ${SDL_LIBRARY} Qt5::Core)
|
||||
target_link_libraries(${SIMULATOR_TARGET} ${SDL2_LIBRARIES} Qt5::Core)
|
||||
|
||||
# Remove debug symbols on release builds
|
||||
if(NOT CLANG)
|
||||
@@ -162,7 +165,7 @@ if(FOX_FOUND)
|
||||
${RADIO_SRC_DIR}/simu.cpp)
|
||||
|
||||
target_include_directories(simu PUBLIC ${FOX_INCLUDE_DIR} )
|
||||
target_link_libraries(simu ${FOX_LIBRARY} pthread ${SDL_LIBRARY})
|
||||
target_link_libraries(simu ${FOX_LIBRARY} pthread ${SDL2_LIBRARIES})
|
||||
target_compile_options(simu PRIVATE -DSIMU)
|
||||
endif()
|
||||
|
||||
|
||||
@@ -21,6 +21,10 @@
|
||||
|
||||
#define SIMPGMSPC_USE_QT 0
|
||||
|
||||
#if defined(SIMU_AUDIO)
|
||||
#include <SDL.h>
|
||||
#endif
|
||||
|
||||
#include "opentx.h"
|
||||
#include "simulcd.h"
|
||||
|
||||
@@ -33,10 +37,6 @@
|
||||
#include <sys/time.h>
|
||||
#endif
|
||||
|
||||
#if defined(SIMU_AUDIO)
|
||||
#include <SDL.h>
|
||||
#endif
|
||||
|
||||
int g_snapshot_idx = 0;
|
||||
|
||||
uint8_t simu_start_mode = 0;
|
||||
|
||||
Reference in New Issue
Block a user