[Chinese-commits] [fqterm] 19/76: It now builds with MXE

[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 66b3f3d28fd97c494fc4bb16c556f6ed8e720814
Author: Iru Cai <mytbk920423 at gmail.com>
Date:   Tue May 6 15:53:52 2014 +0800

    It now builds with MXE
---
 CMakeLists.txt.mingw | 43 +++++++++++++++++++------------------------
 src/fqterm/main.cpp  |  2 ++
 2 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/CMakeLists.txt.mingw b/CMakeLists.txt.mingw
index bdb3cfd..9eb7809 100644
--- a/CMakeLists.txt.mingw
+++ b/CMakeLists.txt.mingw
@@ -1,23 +1,10 @@
-#set(OPENSSL_INCLUDE_DIR
-#"C:/openssl/include"
-#)
+find_package(OpenSSL REQUIRED)
 
-#set(OPENSSL_LIBRARIES
-#"C:/openssl/lib/libeay32.lib"
-#"C:/openssl/lib/ssleay32.lib"
-#)
-
-#set(NETWORK_LIBRARIES
-#"ws2_32.lib"
-#)
-
-#SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "/Zi /Od /MD")
-
-#ADD_DEFINITIONS(/D USE_DOTNET_STYLE)
-#ADD_DEFINITIONS(-D_CRT_SECURE_NO_DEPRECATE)
+#ADD_DEFINITIONS(-DUSE_DOTNET_STYLE)
 ADD_DEFINITIONS(-D "FQTERM_VERSION_STRING=\\\"${FQTERM_VERSION}\\\"")
 
 if(FQTERM_USE_STATIC_QT)
+  message("Will use static Qt.")
   ADD_DEFINITIONS(-DFQTERM_USE_STATIC_QT)
   REMOVE_DEFINITIONS(-DQT_DLL)
 endif(FQTERM_USE_STATIC_QT)
@@ -38,7 +25,6 @@ include_directories(
   ${CMAKE_CURRENT_SOURCE_DIR}/src/utilities
   ${CMAKE_CURRENT_SOURCE_DIR}/src/ui
   ${CMAKE_CURRENT_SOURCE_DIR}/src/unite
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/unite
 )
 
 link_directories(
@@ -50,11 +36,15 @@ ADD_EXECUTABLE(fqterm
   src/fqterm/main.cpp
 )
 
-#if(FQTERM_USE_STATIC_QT)
-  set(FQ_QT_STATIC_PLUGINS
-    qcncodecs qjpcodecs qkrcodecs qtwcodecs
-    qjpeg qgif qmng)
-#endif(FQTERM_USE_STATIC_QT)
+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)
+endif(FQTERM_USE_STATIC_QT)
 
 target_link_libraries(fqterm 
   fqterm_main
@@ -64,12 +54,17 @@ target_link_libraries(fqterm
   fqterm_ui
   fqterm_common
   fqterm_unite
-  ${QT_LIBRARIES}
   ${QT_QTNETWORK_LIBRARIES}
+  ${QT_QTXML_LIBRARIES}
   ${QT_QTSCRIPT_LIBRARIES}  
-  ${QT_QTXML_LIBRARIES}  
   ${FQ_QT_STATIC_PLUGINS}
+  ${QT_LIBRARIES}
+  ${OPENSSL_LIBRARIES}
   ${PYTHON_LIB}
+  crypto
+  jpeg
+  lzma
+  lcms2
 )
 
 add_dependencies(fqterm
diff --git a/src/fqterm/main.cpp b/src/fqterm/main.cpp
index 2bdde6e..3c979bc 100644
--- a/src/fqterm/main.cpp
+++ b/src/fqterm/main.cpp
@@ -36,6 +36,7 @@
   // static link Qt4 plugins.
   void loadNecessaryQtPlugins() {}
   #include <QtPlugin>
+#if QT_VERSION < QT_VERSION_CHECK(4,8,6)
   Q_IMPORT_PLUGIN(qkrcodecs)
   Q_IMPORT_PLUGIN(qcncodecs)
   Q_IMPORT_PLUGIN(qjpcodecs)
@@ -43,6 +44,7 @@
   Q_IMPORT_PLUGIN(qjpeg)
   Q_IMPORT_PLUGIN(qgif)
   Q_IMPORT_PLUGIN(qmng)
+#endif
 #else
   // dynamic link Qt4 plugins.
   #include <QPluginLoader>

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