Isolate codec tricks to Windows for now.

http://code.google.com/p/phantomjs/issues/detail?id=645 http://code.google.com/p/phantomjs/issues/detail?id=598 http://code.google.com/p/phantomjs/issues/detail?id=424
2012-07-09 17:20:09 -07:00 · 2012-07-09 17:20:09 -07:00 · 525ea65fec
parent f1fb653669
commit 525ea65fec
2 changed files with 3 additions and 1 deletions
--- a/src/main.cpp
+++ b/src/main.cpp
@ -41,6 +41,7 @@

 #include <QApplication>

+#ifdef Q_OS_WINDOWS
 #if !defined(QT_SHARED) && !defined(QT_DLL)
 #include <QtPlugin>

@ -65,6 +66,7 @@ Q_IMPORT_PLUGIN(qjpcodecs)
 Q_IMPORT_PLUGIN(qkrcodecs)
 Q_IMPORT_PLUGIN(qtwcodecs)
 #endif
+#endif

 #if QT_VERSION != QT_VERSION_CHECK(4, 8, 2)
 #error Something is wrong with the setup. Please report to the mailing list!
--- a/src/phantomjs.pro
+++ b/src/phantomjs.pro
@ -106,7 +106,7 @@ mac {
 #    CONFIG += x86 ppc
 }

-CONFIG(static) {
+win32:CONFIG(static) {
    DEFINES += STATIC_BUILD
    QTPLUGIN += \
        qcncodecs \