comicsansg/CubicSDR
comicsansg/CubicSDR
1
0
Fork 0
mirror of https://github.com/cjcliffe/CubicSDR.git synced 2024-11-26 05:38:39 -05:00
Code Issues Projects Releases Wiki Activity

Missing MSVC win32 libgcc dll

Browse Source
This commit is contained in:
Charles J. Cliffe 2015-03-11 20:28:14 -04:00
parent d3748a3f05
commit 697ff593ea
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeLists.txt
View File

@ -327,7 +327,7 @@ ELSE (MSVC)
ENDIF(MSVC) ENDIF(MSVC)
set(RES_FILES "") set(RES_FILES "")
if(MINGW) if(MINGW OR MSVC)
set(RES_FILES ${PROJECT_SOURCE_DIR}/cubicsdr.rc) set(RES_FILES ${PROJECT_SOURCE_DIR}/cubicsdr.rc)
set(CMAKE_RC_COMPILER_INIT windres) set(CMAKE_RC_COMPILER_INIT windres)
ENABLE_LANGUAGE(RC) ENABLE_LANGUAGE(RC)
@ -338,7 +338,7 @@ if(MINGW)
ENDIF(EX_PLATFORM EQUAL 64) ENDIF(EX_PLATFORM EQUAL 64)
SET(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> -O coff <DEFINES> -i <SOURCE> -o <OBJECT>") SET(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> -O coff <DEFINES> -i <SOURCE> -o <OBJECT>")
endif(MINGW) endif(MINGW OR MSVC)
IF (NOT BUNDLE_APP) IF (NOT BUNDLE_APP)
configure_files(${PROJECT_SOURCE_DIR}/font ${CMAKE_BINARY_DIR}/${EX_PLATFORM_NAME} "*.fnt") configure_files(${PROJECT_SOURCE_DIR}/font ${CMAKE_BINARY_DIR}/${EX_PLATFORM_NAME} "*.fnt")
@ -493,6 +493,12 @@ IF (WIN32 AND BUILD_INSTALLER)
DESTINATION .) DESTINATION .)
ENDIF(MSVC) 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") set(CPACK_PACKAGE_EXECUTABLES CubicSDR "CubicSDR")
IF (MSVC) IF (MSVC)

BIN
external/msvc/x86/libgcc_s_dw2-1.dll vendored Normal file
View File

Binary file not shown.