eeva/jamulus
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

some preparations for Mac port and VST interface

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/chatdlg.h
View file

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

16
src/client.h
View file

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

6
src/clientsettingsdlg.h
View file

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

28
src/global.h
View file

@ -145,21 +145,21 @@
#elif HAVE_INTTYPES_H #elif HAVE_INTTYPES_H
# include <inttypes.h> # include <inttypes.h>
#elif defined ( _WIN32 ) #elif defined ( _WIN32 )
typedef __int64 int64_t; typedef __int64 int64_t;
typedef __int32 int32_t; typedef __int32 int32_t;
typedef __int16 int16_t; typedef __int16 int16_t;
typedef unsigned __int64 uint64_t; typedef unsigned __int64 uint64_t;
typedef unsigned __int32 uint32_t; 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;
#endif #endif

6
src/llconclientdlg.h
View file

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

6
src/llconserverdlg.h
View file

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

6
src/util.h
View file

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