[Chinese-commits] [fqterm] 25/76: Change for windows native static build.

[Boyuan Yang]

This is an automated email from the git hooks/post-receive script.

hosiet-guest pushed a commit to branch master
in repository fqterm.

commit af4a651cb5aa61cab134043471aacfd55e49d268
Author: Iru Cai <mytbk920423 at gmail.com>
Date:   Thu May 15 21:53:41 2014 +0800

    Change for windows native static build.
    
    1. Qt 4.8.6 does not have static imageformats plugin
    2. cmake have MSVC and MINGW variable
    3. rewrite openssl linking options
---
 CMakeLists.txt       |  6 +++---
 CMakeLists.txt.mingw | 24 ++++++++++++------------
 src/fqterm/main.cpp  |  2 +-
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e55eed6..ed6cede 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -66,11 +66,11 @@ ENDIF(NOT FQ_CORE_QT_CONFIG MATCHES "static")
 SET(SUB_CMAKELIST "UNKNOWN")
 
 IF(WIN32)
-  IF(MSYS MATCHES 1)
+  IF(MINGW)
     SET(SUB_CMAKELIST "CMakeLists.txt.mingw")
-  ELSE(MSYS MATCHES 1)
+  ELSE(MINGW)
     SET(SUB_CMAKELIST "CMakeLists.txt.win32")
-  ENDIF(MSYS MATCHES 1)
+  ENDIF(MINGW)
 ELSE(WIN32)
   IF(APPLE)
     SET(SUB_CMAKELIST "CMakeLists.txt.macos")
diff --git a/CMakeLists.txt.mingw b/CMakeLists.txt.mingw
index 82b339b..e701836 100644
--- a/CMakeLists.txt.mingw
+++ b/CMakeLists.txt.mingw
@@ -37,13 +37,16 @@ ADD_EXECUTABLE(fqterm
 )
 
 if(FQTERM_USE_STATIC_QT)
-  if (QT_VERSION_MINOR LESS 8)
-    message("Qt<4.8")
-    set(FQ_QT_STATIC_PLUGINS
-      qcncodecs qjpcodecs qkrcodecs qtwcodecs
-      qjpeg qgif qmng
-    )
-  endif(QT_VERSION_MINOR LESS 8)
+  set(FQ_QT_STATIC_PLUGINS
+    qcncodecs qjpcodecs qkrcodecs qtwcodecs
+  )
+  set(OPENSSL_LINK_LIBS
+    crypto ssl
+  )
+else(FQTERM_USE_STATIC_QT)
+  set(OPENSSL_LINK_LIBS
+    ${OPENSSL_LIBS}
+  )
 endif(FQTERM_USE_STATIC_QT)
 
 target_link_libraries(fqterm 
@@ -59,12 +62,9 @@ target_link_libraries(fqterm
   ${QT_QTSCRIPT_LIBRARIES}  
   ${FQ_QT_STATIC_PLUGINS}
   ${QT_LIBRARIES}
-  ${OPENSSL_LIBRARIES}
   ${PYTHON_LIB}
-  crypto
-  jpeg
-  lzma
-  wsock
+  ${OPENSSL_LINK_LIBS}
+  ws2_32
 )
 
 add_dependencies(fqterm
diff --git a/src/fqterm/main.cpp b/src/fqterm/main.cpp
index 00867f1..4f8a564 100644
--- a/src/fqterm/main.cpp
+++ b/src/fqterm/main.cpp
@@ -36,11 +36,11 @@
   // static link Qt4 plugins.
   void loadNecessaryQtPlugins() {}
   #include <QtPlugin>
-#if QT_VERSION < QT_VERSION_CHECK(4,8,5)
   Q_IMPORT_PLUGIN(qkrcodecs)
   Q_IMPORT_PLUGIN(qcncodecs)
   Q_IMPORT_PLUGIN(qjpcodecs)
   Q_IMPORT_PLUGIN(qtwcodecs)
+#if QT_VERSION < QT_VERSION_CHECK(4,8,5)
   Q_IMPORT_PLUGIN(qjpeg)
   Q_IMPORT_PLUGIN(qgif)
   Q_IMPORT_PLUGIN(qmng)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/chinese/fqterm.git