From 09f9b3bb3cb5d134776821c3f8758c5b75ee7404 Mon Sep 17 00:00:00 2001
From: Volker Fischer <corrados@users.noreply.github.com>
Date: Thu, 18 Feb 2010 20:35:48 +0000
Subject: [PATCH] some preparations for Mac port and VST interface

---
 src/chatdlg.h           |  6 +++++-
 src/client.h            | 16 ++++++++++------
 src/clientsettingsdlg.h |  6 +++++-
 src/global.h            | 28 ++++++++++++++--------------
 src/llconclientdlg.h    |  6 +++++-
 src/llconserverdlg.h    |  6 +++++-
 src/util.h              |  6 +++++-
 7 files changed, 49 insertions(+), 25 deletions(-)

diff --git a/src/chatdlg.h b/src/chatdlg.h
index 1a5c418b..5e7d3c2a 100755
--- a/src/chatdlg.h
+++ b/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
 
 
diff --git a/src/client.h b/src/client.h
index 5c2255b8..944b73f6 100755
--- a/src/client.h
+++ b/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
 
 
diff --git a/src/clientsettingsdlg.h b/src/clientsettingsdlg.h
index 5d381a2f..dac2fc3a 100755
--- a/src/clientsettingsdlg.h
+++ b/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
 
 
diff --git a/src/global.h b/src/global.h
index 5495a15d..ed061d9c 100755
--- a/src/global.h
+++ b/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
 
 
diff --git a/src/llconclientdlg.h b/src/llconclientdlg.h
index ca6d417c..1b9f7359 100755
--- a/src/llconclientdlg.h
+++ b/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
 
 
diff --git a/src/llconserverdlg.h b/src/llconserverdlg.h
index 8f484946..7b6a3e3b 100755
--- a/src/llconserverdlg.h
+++ b/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
 
 
diff --git a/src/util.h b/src/util.h
index 83939d1c..87216f5d 100755
--- a/src/util.h
+++ b/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