From 7aec951cbe0b6444e82a5b0dc46050d2adb28be1 Mon Sep 17 00:00:00 2001 From: Fabio Bas Date: Wed, 28 May 2008 16:38:25 +0000 Subject: mingw32: fixed module compilation up to kvirijndael; added some installation rules to test git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@1864 17fca916-40b9-46aa-a4ea-0a15b648b75c --- src/modules/options/optw_connection.cpp | 2 +- src/modules/options/optw_messages.cpp | 4 ++-- src/modules/options/optw_query.cpp | 2 +- src/modules/options/optw_sound.cpp | 4 ++-- src/modules/options/optw_sound.h | 2 +- src/modules/options/optw_urlhandlers.cpp | 8 ++++---- 6 files changed, 11 insertions(+), 11 deletions(-) (limited to 'src/modules/options') 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("

Warning:
" \ "This is a non RFC 1413 compliant 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 #include -#ifndef COMPILE_ON_WINDOWS +#if !defined(COMPILE_ON_WINDOWS) && !defined(COMPILE_ON_MINGW) #include // 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.
","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("

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("file:// 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@","\\\\"); -- cgit v1.3.1-10-gc9f91