diff --git a/INSTALL b/INSTALL index 1dab493e..e260df20 100755 --- a/INSTALL +++ b/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.sln in your Visual Studio environment and compile -- run llcon/windows/Release/llcon.exe + directory llcon\windows\ASIOSDK2\common exists +- open llcon.pro in Qt Creator and compile Linux: diff --git a/llcon.pro b/llcon.pro index 7be51544..9b7d079f 100755 --- a/llcon.pro +++ b/llcon.pro @@ -10,8 +10,7 @@ INCLUDEPATH += src \ libs/celt DEFINES += USE_ALLOCA \ - _REENTRANT \ - _IS_QMAKE_CONFIG + _REENTRANT win32 { DEFINES -= UNICODE diff --git a/src/chatdlg.h b/src/chatdlg.h index a7f3ecbf..3e56c5d1 100755 --- a/src/chatdlg.h +++ b/src/chatdlg.h @@ -30,15 +30,7 @@ #include #include #include "global.h" -#ifdef _IS_QMAKE_CONFIG -# 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 +#include "ui_chatdlgbase.h" /* Classes ********************************************************************/ diff --git a/src/clientsettingsdlg.h b/src/clientsettingsdlg.h index 66d1356b..8b514a2e 100755 --- a/src/clientsettingsdlg.h +++ b/src/clientsettingsdlg.h @@ -37,15 +37,7 @@ #include "global.h" #include "client.h" #include "multicolorled.h" -#ifdef _IS_QMAKE_CONFIG -# 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 +#include "ui_clientsettingsdlgbase.h" /* Definitions ****************************************************************/ diff --git a/src/connectdlg.h b/src/connectdlg.h index b6f52694..d1e7ea96 100755 --- a/src/connectdlg.h +++ b/src/connectdlg.h @@ -31,15 +31,7 @@ #include #include "global.h" #include "client.h" -#ifdef _IS_QMAKE_CONFIG -# 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 +#include "ui_connectdlgbase.h" /* Definitions ****************************************************************/ diff --git a/src/llconclientdlg.h b/src/llconclientdlg.h index 75a84d45..0cc9d6e3 100755 --- a/src/llconclientdlg.h +++ b/src/llconclientdlg.h @@ -41,15 +41,7 @@ #include "clientsettingsdlg.h" #include "chatdlg.h" #include "connectdlg.h" -#ifdef _IS_QMAKE_CONFIG -# 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 +#include "ui_llconclientdlgbase.h" /* Definitions ****************************************************************/ diff --git a/src/llconserverdlg.h b/src/llconserverdlg.h index c6361ba3..db70c800 100755 --- a/src/llconserverdlg.h +++ b/src/llconserverdlg.h @@ -37,15 +37,7 @@ #include "server.h" #include "settings.h" #include "multicolorled.h" -#ifdef _IS_QMAKE_CONFIG -# 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 +#include "ui_llconserverdlgbase.h" /* Definitions ****************************************************************/ diff --git a/src/main.cpp b/src/main.cpp index 3d51a82e..e8600f52 100755 --- a/src/main.cpp +++ b/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, diff --git a/src/util.h b/src/util.h index e894f3b8..305caea0 100755 --- a/src/util.h +++ b/src/util.h @@ -44,15 +44,7 @@ using namespace std; // because of the library: "vector" # include # include #endif -#ifdef _IS_QMAKE_CONFIG -# 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 +#include "ui_aboutdlgbase.h" /* Definitions ****************************************************************/