diff --git a/CMakeLists.txt b/CMakeLists.txt index e61ed5e..2ac988e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -327,7 +327,7 @@ ELSE (MSVC) ENDIF(MSVC) set(RES_FILES "") -if(MINGW) +if(MINGW OR MSVC) set(RES_FILES ${PROJECT_SOURCE_DIR}/cubicsdr.rc) set(CMAKE_RC_COMPILER_INIT windres) ENABLE_LANGUAGE(RC) @@ -338,7 +338,7 @@ if(MINGW) ENDIF(EX_PLATFORM EQUAL 64) SET(CMAKE_RC_COMPILE_OBJECT " -O coff -i -o ") -endif(MINGW) +endif(MINGW OR MSVC) IF (NOT BUNDLE_APP) configure_files(${PROJECT_SOURCE_DIR}/font ${CMAKE_BINARY_DIR}/${EX_PLATFORM_NAME} "*.fnt") @@ -492,6 +492,12 @@ IF (WIN32 AND BUILD_INSTALLER) ${PROJECT_SOURCE_DIR}/external/rtl-sdr-release/gcc/${EX_PLATFORM}/libusb-1.0.dll DESTINATION .) ENDIF(MSVC) + + IF(MSVC AND EX_PLATFORM EQUAL 32) + install(FILES + ${PROJECT_SOURCE_DIR}/external/msvc/${EX_PLATFORM_NAME}/libgcc_s_dw2-1.dll + DESTINATION .) + ENDIF(MSVC AND EX_PLATFORM EQUAL 32) set(CPACK_PACKAGE_EXECUTABLES CubicSDR "CubicSDR") diff --git a/external/msvc/x86/libgcc_s_dw2-1.dll b/external/msvc/x86/libgcc_s_dw2-1.dll new file mode 100644 index 0000000..9158964 Binary files /dev/null and b/external/msvc/x86/libgcc_s_dw2-1.dll differ