some preparations for Mac port and VST interface

src/chatdlg.h

@@ -33,7 +33,11 @@
 #ifdef _WIN32
 # include "../windows/moc/chatdlgbase.h"
 #else
-# include "moc/chatdlgbase.h"
+# if defined ( __APPLE__ ) || defined ( __MACOSX )
+#  include "ui_chatdlgbase.h"
+# else
+#  include "moc/chatdlgbase.h"
+# endif
 #endif
 
 

src/client.h

@@ -37,13 +37,17 @@
 #include "channel.h"
 #include "util.h"
 #include "buffer.h"
-#ifdef _WIN32
-# include "../windows/sound.h"
+#ifdef LLCON_VST_PLUGIN
+# include "vstsound.h"
 #else
-# include "../linux/sound.h"
-# include <sched.h>
-# include <socket.h>
-# include <netdb.h>
+# ifdef _WIN32
+#  include "../windows/sound.h"
+# else
+#  include "../linux/sound.h"
+#  include <sched.h>
+#  include <socket.h>
+#  include <netdb.h>
+# endif
 #endif
 
 

src/clientsettingsdlg.h

@@ -40,7 +40,11 @@
 #ifdef _WIN32
 # include "../windows/moc/clientsettingsdlgbase.h"
 #else
-# include "moc/clientsettingsdlgbase.h"
+# if defined ( __APPLE__ ) || defined ( __MACOSX )
+#  include "ui_clientsettingsdlgbase.h"
+# else
+#  include "moc/clientsettingsdlgbase.h"
+# endif
 #endif
 
 

src/global.h

@@ -145,21 +145,21 @@
 #elif HAVE_INTTYPES_H
 # include <inttypes.h>
 #elif defined ( _WIN32 )
-typedef __int64          int64_t;
-typedef __int32          int32_t;
-typedef __int16          int16_t;
-typedef unsigned __int64 uint64_t;
-typedef unsigned __int32 uint32_t;
-typedef unsigned __int16 uint16_t;
-typedef unsigned __int8  uint8_t;
+typedef __int64            int64_t;
+typedef __int32            int32_t;
+typedef __int16            int16_t;
+typedef unsigned __int64   uint64_t;
+typedef unsigned __int32   uint32_t;
+typedef unsigned __int16   uint16_t;
+typedef unsigned __int8    uint8_t;
 #else
-typedef long int          int64_t;
-typedef int               int32_t;
-typedef short             int16_t;
-typedef unsigned long int uint64_t;
-typedef unsigned int      uint32_t;
-typedef unsigned short    uint16_t;
-typedef unsigned char     uint8_t;
+typedef long long          int64_t;
+typedef int                int32_t;
+typedef short              int16_t;
+typedef unsigned long long uint64_t;
+typedef unsigned int       uint32_t;
+typedef unsigned short     uint16_t;
+typedef unsigned char      uint8_t;
 #endif
 
 

src/llconclientdlg.h

@@ -42,7 +42,11 @@
 #ifdef _WIN32
 # include "../windows/moc/llconclientdlgbase.h"
 #else
-# include "moc/llconclientdlgbase.h"
+# if defined ( __APPLE__ ) || defined ( __MACOSX )
+#  include "ui_llconclientdlgbase.h"
+# else
+#  include "moc/llconclientdlgbase.h"
+# endif
 #endif
 
 

src/llconserverdlg.h

@@ -36,7 +36,11 @@
 #ifdef _WIN32
 # include "../windows/moc/llconserverdlgbase.h"
 #else
-# include "moc/llconserverdlgbase.h"
+# if defined ( __APPLE__ ) || defined ( __MACOSX )
+#  include "ui_llconserverdlgbase.h"
+# else
+#  include "moc/llconserverdlgbase.h"
+# endif
 #endif
 
 

src/util.h

@@ -40,7 +40,11 @@ using namespace std; // because of the library: "vector"
 # include <windows.h>
 # include <mmsystem.h>
 #else
-# include "moc/aboutdlgbase.h"
+# if defined ( __APPLE__ ) || defined ( __MACOSX )
+#  include "ui_aboutdlgbase.h"
+# else
+#  include "moc/aboutdlgbase.h"
+# endif
 #endif