mingw32: linking libdvju and djvu plugin static

[djcj]

I've attached a patch that makes it possible to link the djvu plugin statically in Qt5 and to link libdjvulibre statically in mingw32 (had dll export issues).

[Adam Reichold (adamreichold)]

Hello djcj,

thank you for your contribution! I will commit this to trunk. One question though: You undefine DJVUAPI_EXPORT, DDJVUAPI_EXPORT and MINILISPAPI_EXPORT, but only define DDJVU_API and MINILISPAPI. Why not DJVU_API?

Best regards, Adam.

[Adam Reichold (adamreichold)]

Looking at the DjVuLibre headers on my system, I cannot find DJVUAPI_EXPORT at all? Also are you sure that you need to undefine the *_EXPORT variants? From looking at

#ifndef DDJVUAPI
# ifdef _WIN32
# ifdef DDJVUAPI_EXPORT
# define DDJVUAPI __declspec(dllexport)
# else
# define DDJVUAPI __declspec(dllimport)
# endif
# endif
#endif
#ifndef DDJVUAPI
# define DDJVUAPI /**/
#endif

just defining DDJVUAPI should be sufficient? (Also defining them to something like /**/ seems a safer choice than an empty value.)

[djcj (djcj)]

Okay, it looks like I really don't need to edit djvumodel.cpp. Adding the following line to qpdfview_win32.pri is enough: DJVU_PLUGIN_DEFINES += DDJVUAPI= MINILISPAPI=
(trailing equal sign is needed or the build fails for me)

The fix inside pluginhandler.cpp is needed (Q_IMPORT_PLUGIN(DjvuPlugin) -> Q_IMPORT_PLUGIN(DjVuPlugin)).

[Adam Reichold (adamreichold)]

Hello again,

pushed this to trunk, please check if that variant works for you. (Editing djvumodel.cpp is fine IMHO, so I just simplified the defines a bit.)

Best regards,
Adam