diff --git a/radio/src/opentx.h b/radio/src/opentx.h index b9da6c379..cc7a82a65 100644 --- a/radio/src/opentx.h +++ b/radio/src/opentx.h @@ -222,8 +222,8 @@ #endif #if defined(SIMU) - #ifndef FORCEINLINE - #define FORCEINLINE + #if !defined(FORCEINLINE) + #define FORCEINLINE inline #endif #if !defined(NOINLINE) #define NOINLINE diff --git a/radio/src/targets/simu/CMakeLists.txt b/radio/src/targets/simu/CMakeLists.txt index 8a3c123c7..8f8b45d82 100644 --- a/radio/src/targets/simu/CMakeLists.txt +++ b/radio/src/targets/simu/CMakeLists.txt @@ -20,7 +20,6 @@ endif() if(MSVC) set(CMAKE_CXX_FLAGS "/EHsc /LD") - set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /FORCE:MULTIPLE") include_directories(${PROJECT_SOURCE_DIR}/winbuild C:/Programs/pthreads/Pre-built.2/include C:/Programs/msinttypes C:/Programs/dirent/include) target_link_libraries(${SIMULATOR_TARGET} PRIVATE C:/Programs/pthreads/Pre-built.2/lib/pthreadVC2.lib) else()