diff --git a/Common/Common.h b/Common/Common.h index c5532ca37..e6243d05c 100644 --- a/Common/Common.h +++ b/Common/Common.h @@ -40,10 +40,6 @@ #define _M_ARM32 #endif -// SVN version number -extern const char *scm_rev_str; -extern const char *netplay_dolphin_ver; - // Force enable logging in the right modes. For some reason, something had changed // so that debugfast no longer logged. #if defined(_DEBUG) || defined(DEBUGFAST) @@ -75,11 +71,6 @@ private: #undef STACKALIGN #define STACKALIGN __attribute__((__force_align_arg_pointer__)) #endif -// We use wxWidgets on OS X only if it is version 2.9+ with Cocoa support. -#ifdef __WXOSX_COCOA__ -#define HAVE_WX 1 -#define USE_WX 1 // Use wxGLCanvas -#endif #elif defined _WIN32 @@ -88,10 +79,6 @@ private: #error needs at least version 1000 of MSC #endif -#ifndef NOMINMAX - #define NOMINMAX -#endif - // Memory leak checks #define CHECK_HEAP_INTEGRITY() @@ -103,11 +90,6 @@ private: #define GC_ALIGNED16_DECL(x) __declspec(align(16)) x #define GC_ALIGNED64_DECL(x) __declspec(align(64)) x -// Since it is always around on windows - #define HAVE_WX 1 - - #define HAVE_PORTAUDIO 1 - // Debug definitions #if defined(_DEBUG) #include @@ -213,24 +195,6 @@ inline double bswapd( double f ) return dat2.f; } -// Host communication. -enum HOST_COMM -{ - // Begin at 10 in case there is already messages with wParam = 0, 1, 2 and so on - WM_USER_STOP = 10, - WM_USER_CREATE, - WM_USER_SETCURSOR, - WM_USER_KEYDOWN, -}; - -// Used for notification on emulation state -enum EMUSTATE_CHANGE -{ - EMUSTATE_CHANGE_PLAY = 1, - EMUSTATE_CHANGE_PAUSE, - EMUSTATE_CHANGE_STOP -}; - #include "Swap.h" #endif // _COMMON_H_