From 525ea65fec3b3bc4af9191110415fccd07e46276 Mon Sep 17 00:00:00 2001 From: Ariya Hidayat Date: Mon, 9 Jul 2012 17:20:09 -0700 Subject: [PATCH] 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 --- src/main.cpp | 2 ++ src/phantomjs.pro | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main.cpp b/src/main.cpp index 89970220..32e08749 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -41,6 +41,7 @@ #include +#ifdef Q_OS_WINDOWS #if !defined(QT_SHARED) && !defined(QT_DLL) #include @@ -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! diff --git a/src/phantomjs.pro b/src/phantomjs.pro index a704623f..eff1df5d 100644 --- 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 \