Make libwkhtmltopdf.dll compile on windows using a hack

include/wkhtmltox/pdf.h

@@ -1,4 +1,6 @@
-/*
+/* -*- mode: c++; tab-width: 4; indent-tabs-mode: t; eval: (progn (c-set-style "stroustrup") (c-set-offset 'innamespace 0)); -*-
+ * vi:set ts=4 sts=4 sw=4 noet :
+ *
  * Copyright 2010 wkhtmltopdf authors
  *
  * This file is part of wkhtmltopdf.
@@ -34,9 +36,10 @@ typedef void (*wkhtmltopdf_str_callback)(wkhtmltopdf_converter * converter, cons
 typedef void (*wkhtmltopdf_int_callback)(wkhtmltopdf_converter * converter, const int val);
 typedef void (*wkhtmltopdf_void_callback)(wkhtmltopdf_converter * converter);
 
-CAPI int wkhtmltopdf_init(int useGraphics);
+CAPI int wkhtmltopdf_init(int use_graphics);
 CAPI int wkhtmltopdf_deinit();
 CAPI int wkhtmltopdf_extended_qt();
+CAPI const char * wkhtmltopdf_version();
 
 CAPI wkhtmltopdf_global_settings * wkhtmltopdf_create_global_settings();
 CAPI wkhtmltopdf_object_settings * wkhtmltopdf_create_object_settings();

src/lib/converter.cc

@@ -17,6 +17,11 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with wkhtmltopdf.  If not, see <http://www.gnu.org/licenses/>.
+#ifdef __WKHTMLTOX_UNDEF_QT_DLL__
+#ifdef QT_DLL
+#undef QT_DLL
+#endif
+#endif
 
 #include "converter_p.hh"
 #include "multipageloader.hh"

src/lib/converter.hh

@@ -17,9 +17,15 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with wkhtmltopdf.  If not, see <http://www.gnu.org/licenses/>.
-
 #ifndef __CONVERTER_HH__
 #define __CONVERTER_HH__
+
+#ifdef __WKHTMLTOX_UNDEF_QT_DLL__
+#ifdef QT_DLL
+#undef QT_DLL
+#endif
+#endif
+
 #include <QObject>
 
 #include <wkhtmltox/dllbegin.inc>

src/lib/converter_p.hh

@@ -20,6 +20,12 @@
 
 #ifndef __CONVERTER_P_HH__
 #define __CONVERTER_P_HH__
+#ifdef __WKHTMLTOX_UNDEF_QT_DLL__
+#ifdef QT_DLL
+#undef QT_DLL
+#endif
+#endif
+
 #include "converter.hh"
 #include "websettings.hh"
 #include <QFile>

src/lib/image_c_bindings.cc

@@ -17,6 +17,11 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with wkhtmltopdf.  If not, see <http://www.gnu.org/licenses/>.
+#ifdef __WKHTMLTOX_UNDEF_QT_DLL__
+#ifdef QT_DLL
+#undef QT_DLL
+#endif
+#endif
 
 #include "image_c_bindings_p.hh"
 #include "pdf.h"

src/lib/image_c_bindings_p.hh

@@ -20,6 +20,13 @@
 
 #ifndef __IMAGE_C_BINDINGS_P_HH__
 #define __IMAGE_C_BINDINGS_P_HH__
+
+#ifdef __WKHTMLTOX_UNDEF_QT_DLL__
+#ifdef QT_DLL
+#undef QT_DLL
+#endif
+#endif
+
 #include "image.h"
 #include "imageconverter.hh"
 #include <QObject>

src/lib/imageconverter.cc

@@ -17,6 +17,11 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with wkhtmltopdf.  If not, see <http://www.gnu.org/licenses/>.
+#ifdef __WKHTMLTOX_UNDEF_QT_DLL__
+#ifdef QT_DLL
+#undef QT_DLL
+#endif
+#endif
 
 #include "imageconverter_p.hh"
 #include "imagesettings.hh"

src/lib/imageconverter.hh

@@ -20,6 +20,13 @@
 
 #ifndef __IMAGECONVERTER_HH__
 #define __IMAGECONVERTER_HH__
+
+#ifdef __WKHTMLTOX_UNDEF_QT_DLL__
+#ifdef QT_DLL
+#undef QT_DLL
+#endif
+#endif
+
 #include <wkhtmltox/converter.hh>
 #include <wkhtmltox/imagesettings.hh>
 

src/lib/imageconverter_p.hh

@@ -20,6 +20,13 @@
 
 #ifndef __IMAGECONVERTER_P_HH__
 #define __IMAGECONVERTER_P_HH__
+
+#ifdef __WKHTMLTOX_UNDEF_QT_DLL__
+#ifdef QT_DLL
+#undef QT_DLL
+#endif
+#endif
+
 #include "converter_p.hh"
 #include "imageconverter.hh"
 #include "multipageloader.hh"

src/lib/imagesettings.cc

@@ -17,6 +17,11 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with wkhtmltopdf.  If not, see <http://www.gnu.org/licenses/>.
+#ifdef __WKHTMLTOX_UNDEF_QT_DLL__
+#ifdef QT_DLL
+#undef QT_DLL
+#endif
+#endif
 
 #include "imagesettings.hh"
 #include "reflect.hh"

src/lib/imagesettings.hh

@@ -20,6 +20,13 @@
 
 #ifndef __IMAGESETTINGS_HH__
 #define __IMAGESETTINGS_HH__
+
+#ifdef __WKHTMLTOX_UNDEF_QT_DLL__
+#ifdef QT_DLL
+#undef QT_DLL
+#endif
+#endif
+
 #include <QString>
 #include <wkhtmltox/loadsettings.hh>
 #include <wkhtmltox/websettings.hh>

src/lib/lib.pro

@@ -22,6 +22,8 @@ include(../../version.pri)
 include(../../common.pri)
 include(lib.pri)
 
+DEFINES += __WKHTMLTOX_UNDEF_QT_DLL__
+
 unix {
    headers.targit=headers
    headers.files=../../include/wkhtmltox/*

src/lib/loadsettings.cc

@@ -17,6 +17,11 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with wkhtmltopdf.  If not, see <http://www.gnu.org/licenses/>.
+#ifdef __WKHTMLTOX_UNDEF_QT_DLL__
+#ifdef QT_DLL
+#undef QT_DLL
+#endif
+#endif
 
 #include "loadsettings.hh"
 #include <QMap>

src/lib/loadsettings.hh

@@ -20,6 +20,13 @@
 
 #ifndef __LOADSETTINGS_HH__
 #define __LOADSETTINGS_HH__
+
+#ifdef __WKHTMLTOX_UNDEF_QT_DLL__
+#ifdef QT_DLL
+#undef QT_DLL
+#endif
+#endif
+
 #include <QNetworkProxy>
 #include <QString>
 

src/lib/multipageloader.cc

@@ -17,6 +17,11 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with wkhtmltopdf.  If not, see <http://www.gnu.org/licenses/>.
+#ifdef __WKHTMLTOX_UNDEF_QT_DLL__
+#ifdef QT_DLL
+#undef QT_DLL
+#endif
+#endif
 
 #include "multipageloader_p.hh"
 #include <QFile>

src/lib/multipageloader.hh

@@ -20,6 +20,13 @@
 
 #ifndef __MULTIPAGELOADER_HH__
 #define __MULTIPAGELOADER_HH__
+
+#ifdef __WKHTMLTOX_UNDEF_QT_DLL__
+#ifdef QT_DLL
+#undef QT_DLL
+#endif
+#endif
+
 #include <QFile>
 #include <QObject>
 #include <QUrl>

src/lib/multipageloader_p.hh

@@ -20,6 +20,13 @@
 
 #ifndef __MULTIPAGELOADER_P_HH__
 #define __MULTIPAGELOADER_P_HH__
+
+#ifdef __WKHTMLTOX_UNDEF_QT_DLL__
+#ifdef QT_DLL
+#undef QT_DLL
+#endif
+#endif
+
 #include "multipageloader.hh"
 #include "tempfile.hh"
 #include <QAtomicInt>

src/lib/outline.cc

@@ -17,6 +17,11 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with wkhtmltopdf.  If not, see <http://www.gnu.org/licenses/>.
+#ifdef __WKHTMLTOX_UNDEF_QT_DLL__
+#ifdef QT_DLL
+#undef QT_DLL
+#endif
+#endif
 
 #include "outline_p.hh"
 #include <fstream>

src/lib/outline.hh

@@ -20,6 +20,13 @@
 
 #ifndef __OUTLINE_HH__
 #define __OUTLINE_HH__
+
+#ifdef __WKHTMLTOX_UNDEF_QT_DLL__
+#ifdef QT_DLL
+#undef QT_DLL
+#endif
+#endif
+
 #include "pdfsettings.hh"
 #include <QWebElement>
 #include <QWebFrame>

src/lib/outline_p.hh

@@ -20,6 +20,13 @@
 
 #ifndef __OUTLINE_P_HH__
 #define __OUTLINE_P_HH__
+
+#ifdef __WKHTMLTOX_UNDEF_QT_DLL__
+#ifdef QT_DLL
+#undef QT_DLL
+#endif
+#endif
+
 #include "outline.hh"
 #ifdef __EXTENSIVE_WKHTMLTOPDF_QT_HACK__
 #include "dllbegin.inc"

src/lib/pdf.h

@@ -39,6 +39,7 @@ typedef void (*wkhtmltopdf_void_callback)(wkhtmltopdf_converter * converter);
 CAPI int wkhtmltopdf_init(int use_graphics);
 CAPI int wkhtmltopdf_deinit();
 CAPI int wkhtmltopdf_extended_qt();
+CAPI const char * wkhtmltopdf_version();
 
 CAPI wkhtmltopdf_global_settings * wkhtmltopdf_create_global_settings();
 CAPI wkhtmltopdf_object_settings * wkhtmltopdf_create_object_settings();

src/lib/pdf_c_bindings.cc

@@ -17,6 +17,11 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with wkhtmltopdf.  If not, see <http://www.gnu.org/licenses/>.
+#ifdef __WKHTMLTOX_UNDEF_QT_DLL__
+#ifdef QT_DLL
+#undef QT_DLL
+#endif
+#endif
 
 /**
  * \file pdf.h
@@ -84,6 +89,11 @@ CAPI int wkhtmltopdf_extended_qt() {
 #endif
 }
 
+
+CAPI const char * wkhtmltopdf_version() {
+	return "NOT IMPLEMENTED";
+}
+
 /**
  * \brief Setup wkhtmltopdf
  *
@@ -230,8 +240,7 @@ CAPI void wkhtmltopdf_cancel(wkhtmltopdf_converter * converter) {
 	reinterpret_cast<MyPdfConverter *>(converter)->converter.cancel();
 }
 
-CAPI void wkhtmltopdf_add_resource(
-	wkhtmltopdf_converter * converter, wkhtmltopdf_object_settings * settings, const char * data) {
+CAPI void wkhtmltopdf_add_resource(wkhtmltopdf_converter * converter, wkhtmltopdf_object_settings * settings, const char * data) {
 	reinterpret_cast<MyPdfConverter *>(converter)->converter.addResource(
 		*reinterpret_cast<settings::PdfObject *>(settings) );
 	reinterpret_cast<MyPdfConverter *>(converter)->objectSettings.push_back(reinterpret_cast<settings::PdfObject *>(settings));

src/lib/pdf_c_bindings_p.hh

@@ -20,6 +20,13 @@
 
 #ifndef __PDF_C_BINDINGS_P_HH__
 #define __PDF_C_BINDINGS_P_HH__
+
+#ifdef __WKHTMLTOX_UNDEF_QT_DLL__
+#ifdef QT_DLL
+#undef QT_DLL
+#endif
+#endif
+
 #include "pdf.h"
 #include "pdfconverter.hh"
 #include <QObject>

src/lib/pdfconverter.cc

@@ -17,6 +17,11 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with wkhtmltopdf.  If not, see <http://www.gnu.org/licenses/>.
+#ifdef __WKHTMLTOX_UNDEF_QT_DLL__
+#ifdef QT_DLL
+#undef QT_DLL
+#endif
+#endif
 
 #include "pdfconverter_p.hh"
 #include <QAuthenticator>

src/lib/pdfconverter.hh

@@ -20,6 +20,13 @@
 
 #ifndef __PDFCONVERTER_HH__
 #define __PDFCONVERTER_HH__
+
+#ifdef __WKHTMLTOX_UNDEF_QT_DLL__
+#ifdef QT_DLL
+#undef QT_DLL
+#endif
+#endif
+
 #include <wkhtmltox/converter.hh>
 #include <wkhtmltox/pdfsettings.hh>
 

src/lib/pdfconverter_p.hh

@@ -20,6 +20,13 @@
 
 #ifndef __PDFCONVERTER_P_HH__
 #define __PDFCONVERTER_P_HH__
+
+#ifdef __WKHTMLTOX_UNDEF_QT_DLL__
+#ifdef QT_DLL
+#undef QT_DLL
+#endif
+#endif
+
 #include "converter_p.hh"
 #include "multipageloader.hh"
 #include "outline.hh"

src/lib/pdfsettings.cc

@@ -17,6 +17,11 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with wkhtmltopdf.  If not, see <http://www.gnu.org/licenses/>.
+#ifdef __WKHTMLTOX_UNDEF_QT_DLL__
+#ifdef QT_DLL
+#undef QT_DLL
+#endif
+#endif
 
 #include "pdfsettings.hh"
 #include "reflect.hh"

src/lib/pdfsettings.hh

@@ -20,6 +20,13 @@
 
 #ifndef __PDFSETTINGS_HH__
 #define __PDFSETTINGS_HH__
+
+#ifdef __WKHTMLTOX_UNDEF_QT_DLL__
+#ifdef QT_DLL
+#undef QT_DLL
+#endif
+#endif
+
 #include <QNetworkProxy>
 #include <QPrinter>
 #include <QString>

src/lib/reflect.cc

@@ -17,6 +17,11 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with wkhtmltopdf.  If not, see <http://www.gnu.org/licenses/>.
+#ifdef __WKHTMLTOX_UNDEF_QT_DLL__
+#ifdef QT_DLL
+#undef QT_DLL
+#endif
+#endif
 
 #include "reflect.hh"
 

src/lib/reflect.hh

@@ -20,6 +20,13 @@
 
 #ifndef __REFLECT_HH__
 #define __REFLECT_HH__
+
+#ifdef __WKHTMLTOX_UNDEF_QT_DLL__
+#ifdef QT_DLL
+#undef QT_DLL
+#endif
+#endif
+
 #include "loadsettings.hh"
 #include "websettings.hh"
 #include <QStringList>

src/lib/tempfile.cc

@@ -17,6 +17,11 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with wkhtmltopdf.  If not, see <http://www.gnu.org/licenses/>.
+#ifdef __WKHTMLTOX_UNDEF_QT_DLL__
+#ifdef QT_DLL
+#undef QT_DLL
+#endif
+#endif
 
 #include "tempfile.hh"
 #include <QDir>

src/lib/tempfile.hh

@@ -20,6 +20,13 @@
 
 #ifndef __TEMPFILE_HH__
 #define __TEMPFILE_HH__
+
+#ifdef __WKHTMLTOX_UNDEF_QT_DLL__
+#ifdef QT_DLL
+#undef QT_DLL
+#endif
+#endif
+
 #include <QString>
 
 #include "dllbegin.inc"

src/lib/tocstylesheet.cc

@@ -17,6 +17,11 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with wkhtmltopdf.  If not, see <http://www.gnu.org/licenses/>.
+#ifdef __WKHTMLTOX_UNDEF_QT_DLL__
+#ifdef QT_DLL
+#undef QT_DLL
+#endif
+#endif
 
 #include "outline_p.hh"
 #include "pdfsettings.hh"

src/lib/utilities.cc

@@ -17,6 +17,11 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with wkhtmltopdf.  If not, see <http://www.gnu.org/licenses/>.
+#ifdef __WKHTMLTOX_UNDEF_QT_DLL__
+#ifdef QT_DLL
+#undef QT_DLL
+#endif
+#endif
 
 #include "utilities.hh"
 

src/lib/utilities.hh

@@ -20,6 +20,13 @@
 
 #ifndef __UTILITIES_HH__
 #define __UTILITIES_HH__
+
+#ifdef __WKHTMLTOX_UNDEF_QT_DLL__
+#ifdef QT_DLL
+#undef QT_DLL
+#endif
+#endif
+
 #include <QCleanlooksStyle>
 #include <QCommonStyle>
 #include <QFile>

src/lib/websettings.cc

@@ -17,6 +17,11 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with wkhtmltopdf.  If not, see <http://www.gnu.org/licenses/>.
+#ifdef __WKHTMLTOX_UNDEF_QT_DLL__
+#ifdef QT_DLL
+#undef QT_DLL
+#endif
+#endif
 
 #include "websettings.hh"
 namespace wkhtmltopdf {

src/lib/websettings.hh

@@ -20,6 +20,13 @@
 
 #ifndef __WEBSETTINGS_HH__
 #define __WEBSETTINGS_HH__
+
+#ifdef __WKHTMLTOX_UNDEF_QT_DLL__
+#ifdef QT_DLL
+#undef QT_DLL
+#endif
+#endif
+
 #include <QNetworkProxy>
 #include <QString>