qmake is now the one and only supported environment

INSTALL

@@ -26,13 +26,11 @@
 Windows:
 --------
 
-Rquired software: QT4, Visual Studio 2005, ASIO development files
+Rquired software: QT, a compiler like Visual Studio, ASIO development files
 
 - copy ASIO development files in llcon/windows directory so that, e.g., the
   directory llcon\windows\ASIOSDK2\common exists
-- run llcon/windows/MocQT.bat
+- open llcon.pro in Qt Creator and compile
-- open llcon.sln in your Visual Studio environment and compile
-- run llcon/windows/Release/llcon.exe
 
 
 Linux:

llcon.pro

@@ -10,8 +10,7 @@ INCLUDEPATH += src \
     libs/celt
 
 DEFINES += USE_ALLOCA \
-    _REENTRANT \
+    _REENTRANT
-    _IS_QMAKE_CONFIG
 
 win32 {
     DEFINES -= UNICODE

src/chatdlg.h

@@ -30,15 +30,7 @@
 #include <QLayout>
 #include <QAccessible>
 #include "global.h"
-#ifdef _IS_QMAKE_CONFIG
+#include "ui_chatdlgbase.h"
-# include "ui_chatdlgbase.h"
-#else
-# ifdef _WIN32
-#  include "../windows/moc/chatdlgbase.h" // required if llcon.sln and MocQT.bat are used
-# else
-#  include "moc/chatdlgbase.h"
-# endif
-#endif
 
 
 /* Classes ********************************************************************/

src/clientsettingsdlg.h

@@ -37,15 +37,7 @@
 #include "global.h"
 #include "client.h"
 #include "multicolorled.h"
-#ifdef _IS_QMAKE_CONFIG
+#include "ui_clientsettingsdlgbase.h"
-# include "ui_clientsettingsdlgbase.h"
-#else
-# ifdef _WIN32
-#  include "../windows/moc/clientsettingsdlgbase.h" // required if llcon.sln and MocQT.bat are used
-# else
-#  include "moc/clientsettingsdlgbase.h"
-# endif
-#endif
 
 
 /* Definitions ****************************************************************/

src/connectdlg.h

@@ -31,15 +31,7 @@
 #include <QLocale>
 #include "global.h"
 #include "client.h"
-#ifdef _IS_QMAKE_CONFIG
+#include "ui_connectdlgbase.h"
-# include "ui_connectdlgbase.h"
-#else
-# ifdef _WIN32
-#  include "../windows/moc/connectdlgbase.h" // required if llcon.sln and MocQT.bat are used
-# else
-#  include "moc/connectdlgbase.h"
-# endif
-#endif
 
 
 /* Definitions ****************************************************************/

src/llconclientdlg.h

@@ -41,15 +41,7 @@
 #include "clientsettingsdlg.h"
 #include "chatdlg.h"
 #include "connectdlg.h"
-#ifdef _IS_QMAKE_CONFIG
+#include "ui_llconclientdlgbase.h"
-# include "ui_llconclientdlgbase.h"
-#else
-# ifdef _WIN32
-#  include "../windows/moc/llconclientdlgbase.h" // required if llcon.sln and MocQT.bat are used
-# else
-#  include "moc/llconclientdlgbase.h"
-# endif
-#endif
 
 
 /* Definitions ****************************************************************/

src/llconserverdlg.h

@@ -37,15 +37,7 @@
 #include "server.h"
 #include "settings.h"
 #include "multicolorled.h"
-#ifdef _IS_QMAKE_CONFIG
+#include "ui_llconserverdlgbase.h"
-# include "ui_llconserverdlgbase.h"
-#else
-# ifdef _WIN32
-#  include "../windows/moc/llconserverdlgbase.h" // required if llcon.sln and MocQT.bat are used
-# else
-#  include "moc/llconserverdlgbase.h"
-# endif
-#endif
 
 
 /* Definitions ****************************************************************/

src/main.cpp

@@ -352,12 +352,7 @@ int main ( int argc, char** argv )
 #endif
 
     // init resources
-#ifdef _IS_QMAKE_CONFIG
     Q_INIT_RESOURCE(resources);
-#else
-    extern int qInitResources();
-    qInitResources();
-#endif
 
 
 // TEST -> activate the following line to activate the test bench,

src/util.h

@@ -44,15 +44,7 @@ using namespace std; // because of the library: "vector"
 # include <windows.h>
 # include <mmsystem.h>
 #endif
-#ifdef _IS_QMAKE_CONFIG
+#include "ui_aboutdlgbase.h"
-# include "ui_aboutdlgbase.h"
-#else
-# ifdef _WIN32
-#  include "../windows/moc/aboutdlgbase.h" // required if llcon.sln and MocQT.bat are used
-# else
-#  include "moc/aboutdlgbase.h"
-# endif
-#endif
 
 
 /* Definitions ****************************************************************/