[vlmc-devel] CMake: Enable OpenSSL support for windows build, add linking flags.
Rohit Yadav
git at videolan.org
Thu Jul 28 07:34:59 CEST 2011
vlmc | branch: master | Rohit Yadav <rohityadav89 at gmail.com> | Thu Jul 28 11:17:33 2011 +0530| [0448f9e03b7ef83441c92fa0a242dbaa4f2e4324] | committer: Rohit Yadav
CMake: Enable OpenSSL support for windows build, add linking flags.
> http://git.videolan.org/gitweb.cgi/vlmc.git/?a=commit;h=0448f9e03b7ef83441c92fa0a242dbaa4f2e4324
---
CMakeLists.txt | 12 +++++-------
1 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 36e19e8..42fe6b4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -123,7 +123,6 @@ IF (WITH_GUI)
ADD_DEFINITIONS( -I${CONTRIBS_PATH}/include/qt4/QtXml)
ADD_DEFINITIONS( -I${CONTRIBS_PATH}/include/qt4/QtNetwork)
ADD_DEFINITIONS( -I${CONTRIBS_PATH}/include/qt4/)
- ADD_DEFINITIONS( -DQT_NO_OPENSSL)
FIND_PACKAGE(Qt4 4.5.1 COMPONENTS QtCore QtXml QtGui QtNetwork REQUIRED )
ELSE(WIN32)
FIND_PACKAGE(Qt4 4.5.1 COMPONENTS QtCore QtXml QtGui QtNetwork REQUIRED )
@@ -154,15 +153,14 @@ IF (NOT WIN32)
INCLUDE(${QT_USE_FILE})
ADD_DEFINITIONS(${QT_DEFINITIONS})
ELSE (NOT WIN32)
- SET (VLMC_LIBS
- ${CONTRIBS_PATH}/lib/libQtNetwork.a ${CONTRIBS_PATH}/lib/libQtXml.a
- ${CONTRIBS_PATH}/lib/libqtaccessiblewidgets.a
- ${CONTRIBS_PATH}/lib/libQtGui.a #${CONTRIBS_PATH}/lib/libqjpeg.a
- ${CONTRIBS_PATH}/lib/libqtaccessiblewidgets.a
+ SET (VLMC_LIBS -L${CONTRIBS_PATH}/lib
+ ${CONTRIBS_PATH}/lib/libQtNetwork.a
+ ${CONTRIBS_PATH}/lib/libQtXml.a
+ ${CONTRIBS_PATH}/lib/libQtGui.a
${CONTRIBS_PATH}/lib/libQtCore.a
${CONTRIBS_PATH}/lib/libvlccore.dll.a
${CONTRIBS_PATH}/lib/libvlc.dll.a
- ws2_32 winmm imm32)
+ ws2_32 winmm imm32 libeay32 ssleay32 crypt32 gdi32)
ENDIF(NOT WIN32)
# layout of VLMC installation
More information about the Vlmc-devel
mailing list