diff options
Diffstat (limited to 'src')
39 files changed, 106 insertions, 105 deletions
diff --git a/src/kvilib/CMakeLists.txt b/src/kvilib/CMakeLists.txt index 911bfe6cd..9b8756491 100644 --- a/src/kvilib/CMakeLists.txt +++ b/src/kvilib/CMakeLists.txt @@ -232,6 +232,8 @@ IF(UNIX) INSTALL(TARGETS ${KVILIB_BINARYNAME} LIBRARY DESTINATION ${LIB_INSTALL_PREFIX}) ENDIF() ENDIF() -ELSEIF(WIN32) - # INSTALL(TARGETS ${KVILIB_BINARYNAME} LIBRARY DESTINATION ???) +ELSEIF(WIN32)
+ # For DLL platforms the DLL part of a shared library is treated as a RUNTIME target
+ # and the corresponding import library is treated as an ARCHIVE target + INSTALL(TARGETS ${KVILIB_BINARYNAME} RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}) ENDIF() diff --git a/src/kvirc/CMakeLists.txt b/src/kvirc/CMakeLists.txt index 9fad70441..ceb9983b4 100644 --- a/src/kvirc/CMakeLists.txt +++ b/src/kvirc/CMakeLists.txt @@ -450,8 +450,7 @@ ENDIF() TARGET_LINK_LIBRARIES(${KVIRC_BINARYNAME} ${KVILIB_BINARYNAME} ${LIBS}) IF(MINGW)
- SET_TARGET_PROPERTIES(${KVIRC_BINARYNAME} PROPERTIES LINK_FLAGS "-Wl,--enable-auto-import,--enable-runtime-pseudo-reloc")
- SET_TARGET_PROPERTIES(${KVIRC_BINARYNAME} PROPERTIES ENABLE_EXPORTS ON)
+ SET_TARGET_PROPERTIES(${KVIRC_BINARYNAME} PROPERTIES LINK_FLAGS "-Wl,--enable-auto-import,--enable-runtime-pseudo-reloc" ENABLE_EXPORTS ON)
ENDIF()
# Installation directives @@ -463,5 +462,5 @@ IF(UNIX) INSTALL(TARGETS ${KVIRC_BINARYNAME} RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin) ENDIF() ELSEIF(WIN32) - #INSTALL(TARGETS ${KVIRC_BINARYNAME} RUNTIME DESTINATION ???) + INSTALL(TARGETS ${KVIRC_BINARYNAME} RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/release) ENDIF() diff --git a/src/modules/dcc/chat.cpp b/src/modules/dcc/chat.cpp index 6e16bed5b..0968db127 100644 --- a/src/modules/dcc/chat.cpp +++ b/src/modules/dcc/chat.cpp @@ -813,7 +813,7 @@ handle_system_error: if(sentLen < 0) { int err = kvi_socket_error(); -#ifdef COMPILE_ON_WINDOWS +#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) if((err != EAGAIN) || (err != EINTR) || (err != WSAEWOULDBLOCK)) #else if((err != EAGAIN)||(err != EINTR)) diff --git a/src/modules/dcc/send.cpp b/src/modules/dcc/send.cpp index f487f139f..1e16df77c 100644 --- a/src/modules/dcc/send.cpp +++ b/src/modules/dcc/send.cpp @@ -1386,7 +1386,7 @@ KviDccFileTransfer * KviDccFileTransfer::nonFailedTransferWithLocalFileName(cons if(!g_pDccFileTransfers)return 0; for(KviDccFileTransfer * t = g_pDccFileTransfers->first();t;t = g_pDccFileTransfers->next()) { -#ifdef COMPILE_ON_WINDOWS +#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) // on windows the file names are case insensitive if(t->localFileName().toLower() == szLocalFileName.toLower()) #else diff --git a/src/modules/dcc/voice.cpp b/src/modules/dcc/voice.cpp index 7891d8e9f..a0a3c958d 100644 --- a/src/modules/dcc/voice.cpp +++ b/src/modules/dcc/voice.cpp @@ -44,8 +44,8 @@ #include <QSplitter> #include <QSlider> #include <QToolTip> - -#ifndef COMPILE_ON_WINDOWS +
+#if !defined(COMPILE_ON_WINDOWS) && !defined(COMPILE_ON_MINGW) #include <sys/time.h> #include <sys/types.h> #include <unistd.h> @@ -54,7 +54,7 @@ //#include "kvi_error.h" #include <sys/stat.h> // for open() #include <sys/ioctl.h> // for ioctl() -#endif //!COMPILE_ON_WIDNOWS +#endif extern KviDccBroker * g_pDccBroker; @@ -72,7 +72,7 @@ extern KviDccBroker * g_pDccBroker; #else //CAN NOT COMPILE :( #define COMPILE_DISABLE_DCC_VOICE - #ifndef COMPILE_ON_WINDOWS + #if !defined(COMPILE_ON_WINDOWS) && !defined(COMPILE_ON_MINGW) #warning "Cannot find the soundcard.h header; you will NOT be able to use DCC Voice" #endif #endif diff --git a/src/modules/filetransferwindow/filetransferwindow.cpp b/src/modules/filetransferwindow/filetransferwindow.cpp index 7f786f312..a9f0f3a61 100644 --- a/src/modules/filetransferwindow/filetransferwindow.cpp +++ b/src/modules/filetransferwindow/filetransferwindow.cpp @@ -360,8 +360,8 @@ void KviFileTransferWindow::rightButtonPressed(KviTalListViewItem *it,const QPoi m_pLocalFilePopup->insertSeparator(); #endif //COMPILE_KDE_SUPPORT -//-| Grifisx & Noldor |- -#ifdef COMPILE_ON_WINDOWS +//-| Grifisx & Noldor |-
+#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) id = m_pLocalFilePopup->insertItem(__tr2qs_ctx("&Open","filetransferwindow"),this,SLOT(openLocalFile())); m_pLocalFilePopup->setItemParameter(id,-1); m_pOpenFilePopup->insertSeparator(); @@ -370,7 +370,7 @@ void KviFileTransferWindow::rightButtonPressed(KviTalListViewItem *it,const QPoi m_pLocalFilePopup->insertItem(__tr2qs_ctx("Open &Location","filetransferwindow"),this,SLOT(openLocalFileFolder())); m_pLocalFilePopup->insertItem(__tr2qs_ctx("MS-DOS Prompt at Location","filetransferwindow"),this,SLOT(openLocalFileTerminal())); m_pLocalFilePopup->insertSeparator(); -#endif //COMPILE_ON_WINDOWS +#endif // G&N end m_pLocalFilePopup->insertItem(__tr2qs_ctx("&Copy Path to Clipboard","filetransferwindow"),this,SLOT(copyLocalFileToClipboard())); @@ -457,7 +457,7 @@ void KviFileTransferWindow::openFilePopupActivated(int id) void KviFileTransferWindow::openLocalFileTerminal() { //-| Grifisx & Noldor |- -#ifdef COMPILE_ON_WINDOWS +#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) KviFileTransfer * t = selectedTransfer(); if(!t)return; QString tmp = t->localFileName(); @@ -469,7 +469,7 @@ void KviFileTransferWindow::openLocalFileTerminal() // FIXME: this is not a solution ...because if the drive isn't system's drive the command 'cd' naturaly doesn't work tmp.prepend("cmd.exe /k cd \""); system(tmp.toLocal8Bit().data()); -#else //COMPILE_ON_WINDOWS +#else // G&N end #ifdef COMPILE_KDE_SUPPORT KviFileTransfer * t = selectedTransfer(); @@ -486,7 +486,7 @@ void KviFileTransferWindow::openLocalFileTerminal() KRun::runCommand(tmp,g_pFrame); #endif //COMPILE_KDE_SUPPORT -#endif //!COMPILE_ON_WINDOWS +#endif } void KviFileTransferWindow::deleteLocalFile() @@ -512,7 +512,7 @@ void KviFileTransferWindow::deleteLocalFile() void KviFileTransferWindow::openLocalFile() { //-| Grifisx & Noldor |- -#ifdef COMPILE_ON_WINDOWS +#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) KviFileTransfer * t = selectedTransfer(); if(!t)return; @@ -520,7 +520,7 @@ void KviFileTransferWindow::openLocalFile() if(tmp.isEmpty())return; tmp.replace("/","\\"); ShellExecute(0,"open",tmp.toLocal8Bit().data(),NULL,NULL,SW_SHOWNORMAL); //You have to link the shell32.lib -#else //!COMPILE_ON_WINDOWS +#else // G&N end #ifdef COMPILE_KDE_SUPPORT KviFileTransfer * t = selectedTransfer(); @@ -543,13 +543,13 @@ void KviFileTransferWindow::openLocalFile() KRun::run(*offer, lst, g_pFrame); #endif //COMPILE_KDE_SUPPORT -#endif //!COMPILE_ON_WINDOWS +#endif } void KviFileTransferWindow::openLocalFileWith() { //-| Grifisx & Noldor |- -#ifdef COMPILE_ON_WINDOWS +#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) KviFileTransfer * t = selectedTransfer(); if(!t)return; QString tmp = t->localFileName(); @@ -557,7 +557,7 @@ void KviFileTransferWindow::openLocalFileWith() tmp.replace("/","\\"); tmp.prepend("rundll32.exe shell32.dll,OpenAs_RunDLL "); // this if to show the 'open with...' window WinExec(tmp.toLocal8Bit().data(),SW_SHOWNORMAL); -#else //!COMPILE_ON_WINDOWS +#else // G&N end #ifdef COMPILE_KDE_SUPPORT KviFileTransfer * t = selectedTransfer(); @@ -571,7 +571,7 @@ void KviFileTransferWindow::openLocalFileWith() lst.append(url); KRun::displayOpenWithDialog(lst,g_pFrame); #endif //COMPILE_KDE_SUPPORT -#endif //!COMPILE_ON_WINDOWS +#endif } void KviFileTransferWindow::copyLocalFileToClipboard() @@ -586,7 +586,7 @@ void KviFileTransferWindow::copyLocalFileToClipboard() void KviFileTransferWindow::openLocalFileFolder() { //-| Grifisx & Noldor|- -#ifdef COMPILE_ON_WINDOWS +#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) KviFileTransfer * t = selectedTransfer(); if(!t)return; QString tmp = t->localFileName(); @@ -595,7 +595,7 @@ void KviFileTransferWindow::openLocalFileFolder() tmp.replace('/','\\'); tmp.prepend("explorer.exe "); WinExec(tmp.toLocal8Bit().data(), SW_MAXIMIZE); -#else //!COMPILE_ON_WINDOWS +#else // G&N end #ifdef COMPILE_KDE_SUPPORT KviFileTransfer * t = selectedTransfer(); @@ -617,7 +617,7 @@ void KviFileTransferWindow::openLocalFileFolder() lst.append(url); KRun::run(*offer,lst,g_pFrame); #endif //COMPILE_KDE_SUPPORT -#endif //!COMPILE_ON_WINDOWS +#endif } void KviFileTransferWindow::heartbeat() diff --git a/src/modules/ident/libkviident.cpp b/src/modules/ident/libkviident.cpp index 4e8b40f9a..6734e292a 100644 --- a/src/modules/ident/libkviident.cpp +++ b/src/modules/ident/libkviident.cpp @@ -50,7 +50,7 @@ void startIdentService() if(!g_pIdentDaemon->isRunning())g_pIdentDaemon->start(); while(g_pIdentDaemon->isStartingUp()) { -#ifdef COMPILE_ON_WINDOWS +#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) Sleep(10); #else usleep(100); diff --git a/src/modules/mediaplayer/libkvimediaplayer.cpp b/src/modules/mediaplayer/libkvimediaplayer.cpp index f8b80912f..b1e14ce5a 100644 --- a/src/modules/mediaplayer/libkvimediaplayer.cpp +++ b/src/modules/mediaplayer/libkvimediaplayer.cpp @@ -1605,7 +1605,7 @@ static bool mediaplayer_module_init( KviModule * m ) g_pDescriptorList = new KviPointerList<KviMediaPlayerInterfaceDescriptor>; g_pDescriptorList->setAutoDelete(true); -#if (!defined(COMPILE_ON_WINDOWS) && !defined(COMPILE_ON_MAC)) +#if (!defined(COMPILE_ON_WINDOWS) && !defined(COMPILE_ON_MAC) && !defined(COMPILE_ON_MINGW)) g_pDescriptorList->append(MP_CREATE_DESCRIPTOR(KviAudaciousInterface)); g_pDescriptorList->append(MP_CREATE_DESCRIPTOR(KviAudaciousClassicInterface)); g_pDescriptorList->append(MP_CREATE_DESCRIPTOR(KviXmmsInterface)); @@ -1613,7 +1613,7 @@ static bool mediaplayer_module_init( KviModule * m ) g_pDescriptorList->append(MP_CREATE_DESCRIPTOR(KviBmpxInterface)); #endif -#ifdef COMPILE_ON_WINDOWS +#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) g_pDescriptorList->append(MP_CREATE_DESCRIPTOR(KviAmipInterface)); g_pDescriptorList->append(MP_CREATE_DESCRIPTOR(KviWinampInterface)); #endif diff --git a/src/modules/mediaplayer/mp_amipinterface.cpp b/src/modules/mediaplayer/mp_amipinterface.cpp index 9cccb87dd..e702af2c7 100644 --- a/src/modules/mediaplayer/mp_amipinterface.cpp +++ b/src/modules/mediaplayer/mp_amipinterface.cpp @@ -1,7 +1,7 @@ #include "mp_amipinterface.h"
#include "kvi_options.h"
-#ifdef COMPILE_ON_WINDOWS
+#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
#include <QTextCodec>
diff --git a/src/modules/mediaplayer/mp_amipinterface.h b/src/modules/mediaplayer/mp_amipinterface.h index 22bbf9d54..a685b435f 100644 --- a/src/modules/mediaplayer/mp_amipinterface.h +++ b/src/modules/mediaplayer/mp_amipinterface.h @@ -3,7 +3,7 @@ #include "kvi_settings.h" -#ifdef COMPILE_ON_WINDOWS +#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) #include "mp_interface.h" diff --git a/src/modules/mediaplayer/mp_mp3.h b/src/modules/mediaplayer/mp_mp3.h index 6389c105c..afc19ebab 100644 --- a/src/modules/mediaplayer/mp_mp3.h +++ b/src/modules/mediaplayer/mp_mp3.h @@ -9,7 +9,7 @@ // This file is based on the mp3tech.h. It is released under the original // license and the original copyright notice follows. // -// mp3tech.h +// mp3tech.hCO // // Copyright (C) 2000 Cedric Tefft <cedric@earthling.net> // @@ -53,7 +53,7 @@ #include <stdlib.h> #include <QString> -#ifdef COMPILE_ON_WINDOWS +#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) #include <windows.h> #else #include <unistd.h> diff --git a/src/modules/mediaplayer/mp_mprisinterface.cpp b/src/modules/mediaplayer/mp_mprisinterface.cpp index f4a6a7537..8bd4a6bbc 100644 --- a/src/modules/mediaplayer/mp_mprisinterface.cpp +++ b/src/modules/mediaplayer/mp_mprisinterface.cpp @@ -23,7 +23,7 @@ //============================================================================= #include "mp_mprisinterface.h" -#if (!defined(COMPILE_ON_WINDOWS) && !defined(COMPILE_ON_MAC)) +#if (!defined(COMPILE_ON_WINDOWS) && !defined(COMPILE_ON_MAC) && !defined(COMPILE_ON_MINGW)) #include "kvi_locale.h" MP_IMPLEMENT_DESCRIPTOR( diff --git a/src/modules/mediaplayer/mp_mprisinterface.h b/src/modules/mediaplayer/mp_mprisinterface.h index 40bebddbe..998aaff7e 100644 --- a/src/modules/mediaplayer/mp_mprisinterface.h +++ b/src/modules/mediaplayer/mp_mprisinterface.h @@ -27,7 +27,7 @@ #include "kvi_settings.h" #include "mp_interface.h" -#if (!defined(COMPILE_ON_WINDOWS) && !defined(COMPILE_ON_MAC)) +#if (!defined(COMPILE_ON_WINDOWS) && !defined(COMPILE_ON_MAC) && !defined(COMPILE_ON_MINGW)) #include <QtDBus/QtDBus> class KviMPRISInterface : public KviMediaPlayerInterface diff --git a/src/modules/mediaplayer/mp_winampinterface.cpp b/src/modules/mediaplayer/mp_winampinterface.cpp index 547705a68..628fcce89 100644 --- a/src/modules/mediaplayer/mp_winampinterface.cpp +++ b/src/modules/mediaplayer/mp_winampinterface.cpp @@ -25,7 +25,7 @@ #include "mp_winampinterface.h"
#include "kvi_options.h"
-#ifdef COMPILE_ON_WINDOWS
+#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
#include <QTextCodec>
diff --git a/src/modules/mediaplayer/mp_winampinterface.h b/src/modules/mediaplayer/mp_winampinterface.h index 573044e65..5ddf142c2 100644 --- a/src/modules/mediaplayer/mp_winampinterface.h +++ b/src/modules/mediaplayer/mp_winampinterface.h @@ -26,7 +26,7 @@ #include "kvi_settings.h" -#ifdef COMPILE_ON_WINDOWS +#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) #include "mp_interface.h" diff --git a/src/modules/mediaplayer/mp_xmms2interface.cpp b/src/modules/mediaplayer/mp_xmms2interface.cpp index 1c028f7a9..8c6d865c5 100644 --- a/src/modules/mediaplayer/mp_xmms2interface.cpp +++ b/src/modules/mediaplayer/mp_xmms2interface.cpp @@ -23,7 +23,7 @@ //============================================================================= #include "mp_xmms2interface.h" -#if (!defined(COMPILE_ON_WINDOWS) && !defined(COMPILE_ON_MAC)) +#if (!defined(COMPILE_ON_WINDOWS) && !defined(COMPILE_ON_MAC) && !defined(COMPILE_ON_MINGW)) #include "kvi_locale.h" MP_IMPLEMENT_DESCRIPTOR( diff --git a/src/modules/mediaplayer/mp_xmms2interface.h b/src/modules/mediaplayer/mp_xmms2interface.h index 778ec8c32..117d14ff8 100644 --- a/src/modules/mediaplayer/mp_xmms2interface.h +++ b/src/modules/mediaplayer/mp_xmms2interface.h @@ -27,7 +27,7 @@ #include "kvi_settings.h" #include "mp_mprisinterface.h" -#if (!defined(COMPILE_ON_WINDOWS) && !defined(COMPILE_ON_MAC)) +#if (!defined(COMPILE_ON_WINDOWS) && !defined(COMPILE_ON_MAC) && !defined(COMPILE_ON_MINGW)) #include <QtDBus/QtDBus> class KviXmms2Interface : public KviMPRISInterface diff --git a/src/modules/mediaplayer/mp_xmmsinterface.cpp b/src/modules/mediaplayer/mp_xmmsinterface.cpp index 69ef09f44..4e0a38a06 100644 --- a/src/modules/mediaplayer/mp_xmmsinterface.cpp +++ b/src/modules/mediaplayer/mp_xmmsinterface.cpp @@ -27,7 +27,7 @@ #include "mp_xmmsinterface.h" -#if (!defined(COMPILE_ON_WINDOWS) && !defined(COMPILE_ON_MAC)) +#if (!defined(COMPILE_ON_WINDOWS) && !defined(COMPILE_ON_MAC) && !defined(COMPILE_ON_MINGW)) #include "kvi_locale.h" diff --git a/src/modules/mediaplayer/mp_xmmsinterface.h b/src/modules/mediaplayer/mp_xmmsinterface.h index 16399d938..41b03e81f 100644 --- a/src/modules/mediaplayer/mp_xmmsinterface.h +++ b/src/modules/mediaplayer/mp_xmmsinterface.h @@ -31,7 +31,7 @@ #include "mp_interface.h" #include "kvi_library.h" -#ifndef COMPILE_ON_WINDOWS +#if !defined(COMPILE_ON_WINDOWS) && !defined(COMPILE_ON_MINGW) class KviXmmsInterface : public KviMediaPlayerInterface { public: diff --git a/src/modules/mircimport/libkvimircimport.cpp b/src/modules/mircimport/libkvimircimport.cpp index b1e55e0a7..947d85bc9 100644 --- a/src/modules/mircimport/libkvimircimport.cpp +++ b/src/modules/mircimport/libkvimircimport.cpp @@ -236,9 +236,9 @@ void KviRemoteMircServerImportWizard::getListTerminated(bool bSuccess) { m_pOutput->setText(__tr2qs("File downloaded: processing ...")); m_pOutput->repaint(); -#ifndef COMPILE_ON_WINDOWS +#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) g_pApp->syncX(); -#endif //!COMPILE_ON_WINDOWS +#endif int iCount = m_pFilter->doImport(m_szTmpFileName); diff --git a/src/modules/my/idle_win.cpp b/src/modules/my/idle_win.cpp index 58cd3f3f1..9ef1f4e78 100644 --- a/src/modules/my/idle_win.cpp +++ b/src/modules/my/idle_win.cpp @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * */ -#ifdef COMPILE_ON_WINDOWS +#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) #include "idle.h" diff --git a/src/modules/my/idle_x11.cpp b/src/modules/my/idle_x11.cpp index d7a133ad9..3d0b725f3 100644 --- a/src/modules/my/idle_x11.cpp +++ b/src/modules/my/idle_x11.cpp @@ -17,8 +17,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * */ -#ifndef COMPILE_ON_MAC -#ifndef COMPILE_ON_WINDOWS +#ifndef COMPILE_ON_MAC
+#if !defined(COMPILE_ON_WINDOWS) && !defined(COMPILE_ON_MINGW) #include"idle.h" diff --git a/src/modules/notifier/notifierwindow.cpp b/src/modules/notifier/notifierwindow.cpp index ed02067ec..f2c50b792 100644 --- a/src/modules/notifier/notifierwindow.cpp +++ b/src/modules/notifier/notifierwindow.cpp @@ -58,7 +58,7 @@ extern KviNotifierWindow * g_pNotifierWindow; KviNotifierWindow::KviNotifierWindow() : QWidget(0,"kvirc_notifier_window", -#ifdef COMPILE_ON_WINDOWS +#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) Qt::WStyle_Customize | Qt::WStyle_NoBorder | Qt::WStyle_Tool | @@ -310,7 +310,7 @@ void KviNotifierWindow::doShow(bool bDoAnimate) m_bNextDown = false; m_bWriteDown = false; m_bBlinkOn = false; - #if (!defined COMPILE_USE_QT4) || !(defined(COMPILE_USE_QT4) && (defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MAC))) + #if (!defined COMPILE_USE_QT4) || !(defined(COMPILE_USE_QT4) && (defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MAC) || defined(COMPILE_ON_MINGW))) m_imgDesktop = QPixmap::grabWindow( QApplication::desktop()->winId(), m_wndRect.x(), @@ -329,11 +329,11 @@ void KviNotifierWindow::doShow(bool bDoAnimate) m_dOpacity = OPACITY_STEP; m_eState = Showing; m_bCrashShowWorkAround=true; - #if (defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MAC)) + #if (defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MAC) || defined(COMPILE_ON_MINGW)) setWindowOpacity(m_dOpacity); #endif show(); - #if (defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MAC)) + #if (defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MAC) || defined(COMPILE_ON_MINGW)) m_pShowHideTimer->start(40); #else m_pShowHideTimer->start(100); @@ -398,7 +398,7 @@ void KviNotifierWindow::heartbeat() if(!isVisible())show(); //!!! if(m_pLineEdit->isVisible())m_pLineEdit->hide(); - #if (defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MAC)) + #if (defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MAC) || defined(COMPILE_ON_MINGW)) setWindowOpacity(m_dOpacity); #endif update(); @@ -441,7 +441,7 @@ void KviNotifierWindow::heartbeat() break; case Hiding: m_dOpacity -= OPACITY_STEP; - #if (defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MAC)) + #if (defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MAC) || defined(COMPILE_ON_MINGW)) setWindowOpacity(m_dOpacity); #endif if(m_pLineEdit->isVisible())m_pLineEdit->hide(); @@ -505,7 +505,7 @@ void KviNotifierWindow::doHide(bool bDoAnimate) connect(m_pShowHideTimer,SIGNAL(timeout()),this,SLOT(heartbeat())); m_dOpacity = 1.0 - OPACITY_STEP; m_eState = Hiding; - #if (defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MAC)) + #if (defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MAC) || defined(COMPILE_ON_MINGW)) setWindowOpacity(m_dOpacity); update(); m_pShowHideTimer->start(40); @@ -646,7 +646,7 @@ void KviNotifierWindow::paintEvent(QPaintEvent * e) { QPainter px(this); - #if (defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MAC)) + #if (defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MAC) || defined(COMPILE_ON_MINGW)) px.drawPixmap(0,0,m_pixForeground); #else QImage temp_image = m_pixForeground.convertToImage(); diff --git a/src/modules/objects/class_listview.cpp b/src/modules/objects/class_listview.cpp index 2ccb4302a..b9f349857 100644 --- a/src/modules/objects/class_listview.cpp +++ b/src/modules/objects/class_listview.cpp @@ -544,7 +544,7 @@ void KviKvsMdmListView::contentsDropEvent(QDropEvent *e) { QUrl url = *it; QString path = url.path(); - #ifndef COMPILE_ON_WINDOWS + #if !defined(COMPILE_ON_WINDOWS) && !defined(COMPILE_ON_MINGW) if(path[0] != '/')path.prepend("/"); //HACK HACK HACK for Qt bug (?!?) #endif KviTalListViewItem *i = itemAt( contentsToViewport(e->pos()) ); diff --git a/src/modules/objects/class_socket.cpp b/src/modules/objects/class_socket.cpp index 84cd2b70b..3996091c8 100644 --- a/src/modules/objects/class_socket.cpp +++ b/src/modules/objects/class_socket.cpp @@ -1100,7 +1100,7 @@ void KviKvsObject_socket::readNotifierFired(int) } else { //check for transmission errors int err = kvi_socket_error(); -#ifdef COMPILE_ON_WINDOWS +#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) if((err != EAGAIN) && (err != EINTR) && (err != WSAEWOULDBLOCK)) #else if((err != EAGAIN) && (err != EINTR)) @@ -1195,7 +1195,7 @@ void KviKvsObject_socket::tryFlush() } else { // Oops...error ? int err = kvi_socket_error(); -#ifdef COMPILE_ON_WINDOWS +#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) if((err == EAGAIN) || (err == EINTR) || (err = WSAEWOULDBLOCK)) #else if((err == EAGAIN)||(err == EINTR)) diff --git a/src/modules/options/optw_connection.cpp b/src/modules/options/optw_connection.cpp index 3e23baa85..22cea828d 100644 --- a/src/modules/options/optw_connection.cpp +++ b/src/modules/options/optw_connection.cpp @@ -236,7 +236,7 @@ KviIdentOptionsWidget::KviIdentOptionsWidget(QWidget * parent) connect(m_pEnableIdent,SIGNAL(toggled(bool)),gbox,SLOT(setEnabled(bool))); addLabel(0,4,0,4, -#ifdef COMPILE_ON_WINDOWS +#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) __tr2qs_ctx("<p><b>Warning:</b><br>" \ "This is a <b>non RFC 1413 compliant</b> ident daemon that implements " \ "only a limited subset of the Identification Protocol specifications. If it is possible, install a " \ diff --git a/src/modules/options/optw_messages.cpp b/src/modules/options/optw_messages.cpp index aa70d6d2e..440e97bea 100644 --- a/src/modules/options/optw_messages.cpp +++ b/src/modules/options/optw_messages.cpp @@ -42,7 +42,7 @@ #include <QCursor> #include <QPainter> -#ifndef COMPILE_ON_WINDOWS +#if !defined(COMPILE_ON_WINDOWS) && !defined(COMPILE_ON_MINGW) #include <unistd.h> // symlink() #endif @@ -598,7 +598,7 @@ void KviMessageColorsOptionsWidget::load() QString szInit; g_pApp->getLocalKvircDirectory(szInit,KviApp::MsgColors); -#ifndef COMPILE_ON_WINDOWS +#if !defined(COMPILE_ON_WINDOWS) && !defined(COMPILE_ON_MINGW) // symlink local to global //KviStr szGlobal; QString szGlobal; diff --git a/src/modules/options/optw_query.cpp b/src/modules/options/optw_query.cpp index 9b0f1c1d7..f4abe673b 100644 --- a/src/modules/options/optw_query.cpp +++ b/src/modules/options/optw_query.cpp @@ -66,7 +66,7 @@ KviQueryOptionsWidget::KviQueryOptionsWidget(QWidget * parent) "Some actions of the target user (e.g. joins and parts) " \ "will be displayed in the window.<br></center>","options")); -#if defined(COMPILE_ON_WINDOWS) || (defined(COMPILE_KDE_SUPPORT)) +#if (defined(COMPILE_ON_WINDOWS) || defined(COMPILE_KDE_SUPPORT) || defined(COMPILE_ON_MINGW)) b = addBoolSelector(0,3,0,3,__tr2qs_ctx("Flash system taskbar on new query message","options"),KviOption_boolFlashQueryWindowOnNewMessages); mergeTip(b, __tr2qs_ctx("<center>This option causes the system taskbar entry for KVIrc to flash when a new query message " \ diff --git a/src/modules/options/optw_sound.cpp b/src/modules/options/optw_sound.cpp index 1381e7310..c8d29352e 100644 --- a/src/modules/options/optw_sound.cpp +++ b/src/modules/options/optw_sound.cpp @@ -113,7 +113,7 @@ KviSoundGeneralOptionsWidget::KviSoundGeneralOptionsWidget(QWidget * parent) } m_pTagsEncodingCombo->setCurrentIndex(iMatch); -#ifdef COMPILE_ON_WINDOWS +#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) g = addGroupBox(0,3,0,3,Qt::Horizontal,__tr2qs_ctx("Winamp messages ecoding","options"),true); KviTalToolTip::add(g,__tr2qs_ctx("This allows you to select encoding of winamp messages.","options")); @@ -263,7 +263,7 @@ void KviSoundGeneralOptionsWidget::commit() } -#ifdef COMPILE_ON_WINDOWS +#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) idx = m_pWinampEncodingCombo->currentIndex(); if(idx <= 0) { diff --git a/src/modules/options/optw_sound.h b/src/modules/options/optw_sound.h index c08c81b07..ab093b580 100644 --- a/src/modules/options/optw_sound.h +++ b/src/modules/options/optw_sound.h @@ -63,7 +63,7 @@ protected: QPushButton * m_pMediaTestButton; QPushButton * m_pMediaAutoDetectButton; -#ifdef COMPILE_ON_WINDOWS +#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) QComboBox * m_pWinampEncodingCombo; #endif QComboBox * m_pTagsEncodingCombo; diff --git a/src/modules/options/optw_urlhandlers.cpp b/src/modules/options/optw_urlhandlers.cpp index 72e9d3cc2..c527d99ce 100644 --- a/src/modules/options/optw_urlhandlers.cpp +++ b/src/modules/options/optw_urlhandlers.cpp @@ -34,7 +34,7 @@ KviUrlHandlersOptionsWidget::KviUrlHandlersOptionsWidget(QWidget * parent) : KviOptionsWidget(parent,"urlhandlers_options_widget") { -#ifdef COMPILE_ON_WINDOWS +#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) #define START_ROW 1 #else #define START_ROW 0 @@ -42,7 +42,7 @@ KviUrlHandlersOptionsWidget::KviUrlHandlersOptionsWidget(QWidget * parent) createLayout(); -#ifdef COMPILE_ON_WINDOWS +#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) KviBoolSelector *b = addBoolSelector(0,0,0,0,__tr2qs_ctx("Use system URL handlers","options"),KviOption_boolUseSystemUrlHandlers); #endif @@ -53,7 +53,7 @@ KviUrlHandlersOptionsWidget::KviUrlHandlersOptionsWidget(QWidget * parent) m_pFileHandler=addStringSelector(0,START_ROW+4,0,START_ROW+4,__tr2qs_ctx("<b>file://</b> handler command:","options"),KviOption_stringUrlFileCommand); m_pOtherHandler=addStringSelector(0,START_ROW+5,0,START_ROW+5,__tr2qs_ctx("Unknown protocol handler command:","options"),KviOption_stringUrlUnknownCommand); -#ifdef COMPILE_ON_WINDOWS +#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) m_pHttpHandler->setEnabled(!KVI_OPTION_BOOL(KviOption_boolUseSystemUrlHandlers)); m_pHttpsHandler->setEnabled(!KVI_OPTION_BOOL(KviOption_boolUseSystemUrlHandlers)); m_pFtpHandler->setEnabled(!KVI_OPTION_BOOL(KviOption_boolUseSystemUrlHandlers)); @@ -84,7 +84,7 @@ void KviUrlHandlersOptionsWidget::commit() { KviOptionsWidget::commit(); -#ifdef COMPILE_ON_WINDOWS +#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) KVI_OPTION_STRING(KviOption_stringUrlHttpCommand).replace("\\\\","@MAGIC@"); KVI_OPTION_STRING(KviOption_stringUrlHttpCommand).replace("\\","\\\\"); KVI_OPTION_STRING(KviOption_stringUrlHttpCommand).replace("@MAGIC@","\\\\"); diff --git a/src/modules/setup/setupwizard.cpp b/src/modules/setup/setupwizard.cpp index b5614f416..70cde0697 100644 --- a/src/modules/setup/setupwizard.cpp +++ b/src/modules/setup/setupwizard.cpp @@ -47,7 +47,7 @@ bool g_bFoundMirc; #include <QLayout> #include <QDesktopWidget> -#ifdef COMPILE_ON_WINDOWS +#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) #include <windows.h> #include <winnls.h> // for MultiByteToWideChar #include <objbase.h> // CoCreateInstance , CoInitialize & CO. @@ -67,7 +67,7 @@ extern QString szUrl; extern QString szMircServers; extern QString szMircIni; -#ifdef COMPILE_ON_WINDOWS +#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) #define KVI_LOCAL_KVIRC_SUBDIRECTORY_NAME "KVIrc4" #else #define KVI_LOCAL_KVIRC_SUBDIRECTORY_NAME ".config/KVIrc" @@ -179,7 +179,7 @@ KviSetupWizard::KviSetupWizard() ///////////////////////////////////////////////////////////////////////////////////////////////////////////// // License -#ifndef COMPILE_ON_WINDOWS //it have been already shown by installer +#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) //it have been already shown by installer KviSetupPage * m_pLicense = new KviSetupPage(this); m_pLicense->m_pTextLabel->setText(__tr2qs( \ "<p>All of the files in this distribution are covered by the GPL. " \ @@ -260,7 +260,7 @@ KviSetupWizard::KviSetupWizard() m_pNewPathBox->setSpacing(3); m_pNewPathBox->setStretchFactor(m_pDataPathEdit,1); -#ifdef COMPILE_ON_WINDOWS +#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) tmp = QTextCodec::codecForLocale()->toUnicode(getenv( "APPDATA" )); if(tmp.isEmpty()) tmp = QDir::homePath(); @@ -296,8 +296,8 @@ KviSetupWizard::KviSetupWizard() m_pDirUseNew->toggle(); -#ifdef COMPILE_ON_WINDOWS - m_pDirMakePortable = new QRadioButton(__tr2qs("All settings in shared program folder (portable)") +#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) + m_pDirMakePortable = new QRadioButton(__tr2qs("All settings in shared program folder (portable)") ,m_pDirButtonGroup); #endif // Pragma: Unused, takes only space. @@ -497,7 +497,7 @@ KviSetupWizard::KviSetupWizard() addPage(m_pDesktopIntegration,__tr2qs("Desktop Integration")); -#ifdef COMPILE_ON_WINDOWS +#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) m_pCreateUrlHandlers = new KviStyledCheckBox(__tr2qs("Make KVIrc default IRC client"),m_pDesktopIntegration->m_pVBox); m_pCreateUrlHandlers->setChecked(true); #endif @@ -506,7 +506,7 @@ KviSetupWizard::KviSetupWizard() m_pCreateDesktopShortcut->setChecked(true); #endif -#ifdef COMPILE_ON_WINDOWS +#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) m_pUseMircServerList = new QRadioButton(__tr2qs("Import server list from mIRC"),m_pDesktopIntegration->m_pVBox); m_pUseMircServerList->setEnabled(false); #endif @@ -553,7 +553,7 @@ KviSetupWizard::KviSetupWizard() setHelpEnabled(m_pDesktopIntegration,false); // Preconfigured values -#ifdef COMPILE_ON_WINDOWS +#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) QString szTmp; g_pApp->getGlobalKvircDirectory(szTmp,KviApp::Config,"preinstalled.kvc"); if(KviFileUtils::fileExists(szTmp)) @@ -643,7 +643,7 @@ KviSetupWizard::KviSetupWizard() } free(buffer); -#endif // COMPILE_ON:WINDOWS +#endif // COMPILE_ON_WINDOWS newDirClicked(); @@ -770,7 +770,7 @@ void KviSetupWizard::chooseIncomingPath() void KviSetupWizard::makeLink() { -#ifdef COMPILE_ON_WINDOWS +#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) // Let's make a link on the desktop :) // You need this horrible snippet of code to create a shortcut!!!! // @@ -869,7 +869,7 @@ void KviSetupWizard::makeLink() void KviSetupWizard::setUrlHandlers() { -#ifdef COMPILE_ON_WINDOWS +#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) QString szReg = "REGEDIT4\r\n" \ "\r\n" \ "[HKEY_CLASSES_ROOT\\irc]\r\n" \ @@ -949,7 +949,7 @@ void KviSetupWizard::accept() if(m_pDirUseNew->isChecked()) { szDir = m_pDataPathEdit->text(); } -#ifdef COMPILE_ON_WINDOWS +#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) else { //portable szDir = g_pApp->applicationDirPath()+KVI_PATH_SEPARATOR_CHAR+"Settings"; } @@ -981,7 +981,7 @@ void KviSetupWizard::accept() if(m_pDirUseNew->isChecked()) { szDir = m_pIncomingPathEdit->text(); } -#ifdef COMPILE_ON_WINDOWS +#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) else { //portable szDir = g_pApp->applicationDirPath()+KVI_PATH_SEPARATOR_CHAR+"Downloads"; } @@ -1002,7 +1002,7 @@ void KviSetupWizard::accept() g_szChoosenIncomingDirectory = szDir; -#ifndef COMPILE_ON_WINDOWS +#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) // Make local->global link QString localPath = QString("%1/global").arg(g_pApp->m_szLocalKvircDir); unlink(QTextCodec::codecForLocale()->fromUnicode(localPath).data()); @@ -1014,7 +1014,7 @@ void KviSetupWizard::accept() makeLink(); #endif -#ifdef COMPILE_ON_WINDOWS +#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) if(m_pCreateUrlHandlers->isChecked()) setUrlHandlers(); #endif @@ -1109,20 +1109,20 @@ void KviSetupWizard::accept() szUrl=m_szServerUrl; } */ -#ifdef COMPILE_ON_WINDOWS +#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) if(m_pUseMircServerList->isEnabled() && m_pUseMircServerList->isChecked()) szMircServers = m_szMircServerIniFile; #endif } } -#ifdef COMPILE_ON_WINDOWS +#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) if(m_pDirMakePortable->isChecked()) { KviFileUtils::writeFile(g_pApp->applicationDirPath()+KVI_PATH_SEPARATOR_CHAR+"portable","true"); } else { #endif g_pApp->saveKvircDirectory(); -#ifdef COMPILE_ON_WINDOWS +#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) } #endif KviTalWizard::accept(); diff --git a/src/modules/setup/setupwizard.h b/src/modules/setup/setupwizard.h index 2304a1678..019504602 100644 --- a/src/modules/setup/setupwizard.h +++ b/src/modules/setup/setupwizard.h @@ -95,7 +95,7 @@ public: KviTalGroupBox * m_pDirButtonGroup; QRadioButton * m_pDirUsePrev; QRadioButton * m_pDirUseNew; -#ifdef COMPILE_ON_WINDOWS +#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) QRadioButton * m_pDirMakePortable; #endif //QRadioButton * m_pDirRestore; @@ -120,7 +120,7 @@ public: //QRadioButton * m_pServersSpecifyManually; //QRadioButton * m_pServersOpenIrcUrl; //QRadioButton * m_pServersLoadConfig; -#ifdef COMPILE_ON_WINDOWS +#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) QString m_szMircServerIniFile; QRadioButton * m_pUseMircServerList; #endif diff --git a/src/modules/snd/libkvisnd.cpp b/src/modules/snd/libkvisnd.cpp index 482af087c..5293cfa2f 100644 --- a/src/modules/snd/libkvisnd.cpp +++ b/src/modules/snd/libkvisnd.cpp @@ -47,7 +47,7 @@ Phonon::MediaObject * g_pPhononPlayer=0; #endif //!COMPILE_PHONON_SUPPORT -#ifdef COMPILE_ON_WINDOWS +#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) #include <mmsystem.h> #else //!COMPILE_ON_WINDOWS @@ -99,7 +99,7 @@ KviSoundPlayer::KviSoundPlayer() #ifdef COMPILE_PHONON_SUPPORT m_pSoundSystemDict->insert("phonon",new SoundSystemRoutine(KVI_PTR2MEMBER(KviSoundPlayer::playPhonon))); #endif //!COMPILE_PHONON_SUPPORT -#ifdef COMPILE_ON_WINDOWS +#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) m_pSoundSystemDict->insert("winmm",new SoundSystemRoutine(KVI_PTR2MEMBER(KviSoundPlayer::playWinmm))); #else //!COMPILE_ON_WINDOWS #ifdef COMPILE_OSS_SUPPORT @@ -130,7 +130,7 @@ KviSoundPlayer::~KviSoundPlayer() KviThreadManager::killPendingEvents(this); delete m_pSoundSystemDict; -#ifndef COMPILE_ON_WINDOWS +#if !defined(COMPILE_ON_WINDOWS) && !defined(COMPILE_ON_MINGW) #ifdef COMPILE_ARTS_SUPPORT if(g_pArtsDispatcher)delete g_pArtsDispatcher; g_pArtsDispatcher = 0; @@ -183,7 +183,7 @@ void KviSoundPlayer::detectSoundSystem() if(g_pPhononPlayer->state()!=Phonon::ErrorState) KVI_OPTION_STRING(KviOption_stringSoundSystem) = "phonon"; return; #endif -#ifdef COMPILE_ON_WINDOWS +#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) KVI_OPTION_STRING(KviOption_stringSoundSystem) = "winmm"; #else #ifdef COMPILE_ARTS_SUPPORT @@ -235,7 +235,7 @@ bool KviSoundPlayer::playPhonon(const QString &szFileName) return true; } #endif //!COMPILE_PHONON_SUPPORT -#ifdef COMPILE_ON_WINDOWS +#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) bool KviSoundPlayer::playWinmm(const QString &szFileName) { sndPlaySound(szFileName.toLocal8Bit().data(),SND_ASYNC | SND_NODEFAULT); @@ -359,13 +359,13 @@ void KviSoundThread::play() void KviSoundThread::run() { play(); -#ifndef COMPILE_ON_WINDOWS +#if !defined(COMPILE_ON_WINDOWS) && !defined(COMPILE_ON_MINGW) postEvent(g_pSoundPlayer,new KviThreadEvent(KVI_THREAD_EVENT_SUCCESS)); #endif } -#ifdef COMPILE_ON_WINDOWS +#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) #ifdef COMPILE_OSS_SUPPORT #ifdef COMPILE_AUDIOFILE_SUPPORT KviOssAudiofileSoundThread::KviOssAudiofileSoundThread(const QString &szFileName) diff --git a/src/modules/snd/libkvisnd.h b/src/modules/snd/libkvisnd.h index 6ad4e8929..dc18a2304 100644 --- a/src/modules/snd/libkvisnd.h +++ b/src/modules/snd/libkvisnd.h @@ -127,7 +127,7 @@ class KviPhononSoundThread : public KviSoundThread }; #endif -#ifndef COMPILE_ON_WINDOWS +#if !defined(COMPILE_ON_WINDOWS) && !defined(COMPILE_ON_MINGW) #ifdef COMPILE_OSS_SUPPORT class KviOssSoundThread : public KviSoundThread { @@ -202,7 +202,7 @@ protected: #ifdef COMPILE_PHONON_SUPPORT bool playPhonon(const QString &szFileName); #endif //!COMPILE_PHONON_SUPPORT -#ifdef COMPILE_ON_WINDOWS +#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) bool playWinmm(const QString &szFileName); #else //!COMPILE_ON_WINDOWS #ifdef COMPILE_OSS_SUPPORT diff --git a/src/modules/spaste/libkvispaste.cpp b/src/modules/spaste/libkvispaste.cpp index 5e5beb32b..fc6a76c0c 100644 --- a/src/modules/spaste/libkvispaste.cpp +++ b/src/modules/spaste/libkvispaste.cpp @@ -36,7 +36,7 @@ #include <QFile> #include <QClipboard> -#ifndef COMPILE_ON_WINDOWS +#if !defined(COMPILE_ON_WINDOWS) && !defined(COMPILE_ON_MINGW) #include <unistd.h> #endif diff --git a/src/modules/str/libkvistr.cpp b/src/modules/str/libkvistr.cpp index f26157c62..11176a457 100644 --- a/src/modules/str/libkvistr.cpp +++ b/src/modules/str/libkvistr.cpp @@ -1552,7 +1552,7 @@ static bool str_kvs_fnc_digest(KviKvsModuleFunctionCall * c) for(i = 0; i < md_len; i++) { -#ifdef COMPILE_ON_WINDOWS +#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) _snprintf(buff,3,"%02x",md_value[i]); #else snprintf(buff,3,"%02x",md_value[i]); diff --git a/src/modules/system/libkvisystem.cpp b/src/modules/system/libkvisystem.cpp index 00d4179ee..21167fb00 100644 --- a/src/modules/system/libkvisystem.cpp +++ b/src/modules/system/libkvisystem.cpp @@ -39,7 +39,7 @@ #include <QClipboard> -#ifndef COMPILE_ON_WINDOWS +#if !defined(COMPILE_ON_WINDOWS) && !defined(COMPILE_ON_MINGW) #include <sys/utsname.h> #include <stdlib.h> #include <unistd.h> diff --git a/src/modules/trayicon/libkvitrayicon.cpp b/src/modules/trayicon/libkvitrayicon.cpp index a33e2ce06..e4c481788 100644 --- a/src/modules/trayicon/libkvitrayicon.cpp +++ b/src/modules/trayicon/libkvitrayicon.cpp @@ -50,7 +50,7 @@ #include <stdlib.h> #include <time.h> -#ifdef COMPILE_ON_WINDOWS +#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) #define ICON_SIZE 16 #else #define ICON_SIZE 22 @@ -603,21 +603,21 @@ static bool trayicon_kvs_fnc_isvisible(KviKvsModuleFunctionCall * c) static bool trayicon_module_init(KviModule * m) { QString buffer; -#ifdef COMPILE_ON_WINDOWS +#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) g_pApp->findImage(buffer,"kvi_dock_win32-0.png"); #else g_pApp->findImage(buffer,"kvi_dock_part-0.png"); #endif g_pDock1 = new QPixmap(buffer); -#ifdef COMPILE_ON_WINDOWS +#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) g_pApp->findImage(buffer,"kvi_dock_win32-1.png"); #else g_pApp->findImage(buffer,"kvi_dock_part-1.png"); #endif g_pDock2 = new QPixmap(buffer); -#ifdef COMPILE_ON_WINDOWS +#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) g_pApp->findImage(buffer,"kvi_dock_win32-2.png"); #else g_pApp->findImage(buffer,"kvi_dock_part-2.png"); |