piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Bundle OpenSSL libs in Windows installer (fix #5217) and image format plugins the app loads

Browse Source
This commit is contained in:
Kilrah
2017-10-08 20:06:18 +02:00
parent b58be017f4
commit 6a14fe728e
3 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+10
View File
@@ -60,6 +60,16 @@ if(WIN32)
set(WIN_EXTRA_LIBS_PATH "C:/Programs" CACHE PATH
"Base path to extra libs/headers on Windows (SDL & pthreads folders should be in here).")
list(APPEND CMAKE_PREFIX_PATH "${WIN_EXTRA_LIBS_PATH}" "${WIN_EXTRA_LIBS_PATH}/SDL") # hints for FindSDL
# Python check
find_package("PythonInterp")
if(PYTHONINTERP_FOUND)
message(STATUS "Python found, version: ${PYTHON_VERSION_STRING}")
get_filename_component(PYTHON_DIRECTORY ${PYTHON_EXECUTABLE} DIRECTORY)
else()
message(WARNING "Python not found! Most firmware and simu flavors not buildable.")
set(LUA NO)
endif()
endif()
find_package(Qt5Core)
companion/targets/windows/companion-vs.nsi.in
+12
View File
@@ -125,6 +125,8 @@ Section "OpenTX Companion @VERSION_FAMILY@" SecDummy
File "@QT_DLL_DIR@\Qt5Multimedia.dll"
File "@QT_DLL_DIR@\Qt5Svg.dll"
File "@QT_DLL_DIR@\Qt5Xml.dll"
File "@PYTHON_DIRECTORY@\lib\site-packages\PyQt4\libeay32.dll"
File "@PYTHON_DIRECTORY@\lib\site-packages\PyQt4\ssleay32.dll"
File "@SDL_DIR@\SDL.dll"
File "@CMAKE_CURRENT_SOURCE_DIR@\..\targets\windows\avrdude.exe"
@@ -139,6 +141,14 @@ Section "OpenTX Companion @VERSION_FAMILY@" SecDummy
SetOutPath "$INSTDIR\imageformats"
File "@QT_DLL_DIR@\..\plugins\imageformats\qjpeg.dll"
File "@QT_DLL_DIR@\..\plugins\imageformats\qsvg.dll"
File "@QT_DLL_DIR@\..\plugins\imageformats\qdds.dll"
File "@QT_DLL_DIR@\..\plugins\imageformats\qgif.dll"
File "@QT_DLL_DIR@\..\plugins\imageformats\qicns.dll"
File "@QT_DLL_DIR@\..\plugins\imageformats\qico.dll"
File "@QT_DLL_DIR@\..\plugins\imageformats\qtga.dll"
File "@QT_DLL_DIR@\..\plugins\imageformats\qtiff.dll"
File "@QT_DLL_DIR@\..\plugins\imageformats\qwbmp.dll"
File "@QT_DLL_DIR@\..\plugins\imageformats\qwebp.dll"
SetOutPath "$INSTDIR\mediaservice"
File "@QT_DLL_DIR@\..\plugins\mediaservice\dsengine.dll"
@@ -216,6 +226,8 @@ Section "un.OpenTX Companion @VERSION_FAMILY@"
Delete "$INSTDIR\libusb0.dll"
Delete "$INSTDIR\dfu-util.exe"
Delete "$INSTDIR\libusb-1.0.dll"
Delete "$INSTDIR\libeay32.dll"
Delete "$INSTDIR\ssleay32.dll"
Delete "$INSTDIR\Uninstall.exe"
Delete "$INSTDIR\lang\*.*"
radio/src/CMakeLists.txt
-9
View File
@@ -53,15 +53,6 @@ set(FIRMWARE_C_FLAGS_DEBUG "-g" CACHE STRING "Additional flags for firmware targ
set(FIRMWARE_CXX_FLAGS "" CACHE STRING "Additional flags for firmware target c++ compiler (note: all CMAKE_CXX_FLAGS[_*] are ignored for firmware/bootloader).")
set(FIRMWARE_CXX_FLAGS_DEBUG "-g" CACHE STRING "Additional flags for firmware target (Debug config) c++ compiler (note: CMAKE_CXX_FLAGS_DEBUG is ignored for firmware/bootloader).")
# Python check
find_package("PythonInterp")
if(PYTHONINTERP_FOUND)
message(STATUS "Python found, version: ${PYTHON_VERSION_STRING}")
else()
message(WARNING "Python not found! Most firmware and simu flavors not buildable.")
set(LUA NO)
endif()
set(THIRDPARTY_DIR thirdparty)
set(LUA_DIR ${THIRDPARTY_DIR}/Lua/src)
set(COOS_DIR ${THIRDPARTY_DIR}/CoOS)