some preparations for Mac port and VST interface

This commit is contained in:
Volker Fischer 2010-02-18 20:35:48 +00:00
parent 1c76d2e8fe
commit 09f9b3bb3c
7 changed files with 49 additions and 25 deletions

View file

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

View file

@ -37,6 +37,9 @@
#include "channel.h" #include "channel.h"
#include "util.h" #include "util.h"
#include "buffer.h" #include "buffer.h"
#ifdef LLCON_VST_PLUGIN
# include "vstsound.h"
#else
# ifdef _WIN32 # ifdef _WIN32
# include "../windows/sound.h" # include "../windows/sound.h"
# else # else
@ -45,6 +48,7 @@
# include <socket.h> # include <socket.h>
# include <netdb.h> # include <netdb.h>
# endif # endif
#endif
/* Definitions ****************************************************************/ /* Definitions ****************************************************************/

View file

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

View file

@ -153,10 +153,10 @@ typedef unsigned __int32 uint32_t;
typedef unsigned __int16 uint16_t; typedef unsigned __int16 uint16_t;
typedef unsigned __int8 uint8_t; typedef unsigned __int8 uint8_t;
#else #else
typedef long int int64_t; typedef long long int64_t;
typedef int int32_t; typedef int int32_t;
typedef short int16_t; typedef short int16_t;
typedef unsigned long int uint64_t; typedef unsigned long long uint64_t;
typedef unsigned int uint32_t; typedef unsigned int uint32_t;
typedef unsigned short uint16_t; typedef unsigned short uint16_t;
typedef unsigned char uint8_t; typedef unsigned char uint8_t;

View file

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

View file

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

View file

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