diff options
| author | Martijn Kaijser <martijn@xbmc.org> | 2016-08-07 00:20:46 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-07 00:20:46 +0200 |
| commit | 70783f00ca2aba5600593ee91ef12f6480c84fb9 (patch) | |
| tree | 607840ab738ff2085663f5155711fd6a61e4c69c | |
| parent | a7aa8597df56ab83c5702bc3802f3e699e87269c (diff) | |
| parent | 99de61af5d59e7e86b9db5e260afda289650e615 (diff) | |
Merge pull request #10242 from Paxxi/silence_redefine
[xbmc/cleanup] Remove some win32 hard coded defines that cmake handles
| -rw-r--r-- | xbmc/system.h | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/xbmc/system.h b/xbmc/system.h index d426ade093..b7a061bc27 100644 --- a/xbmc/system.h +++ b/xbmc/system.h @@ -85,12 +85,8 @@ * Non-free Components **********************/ -#if defined(TARGET_WINDOWS) +#if defined(HAVE_XBMC_NONFREE) #define HAS_FILESYSTEM_RAR -#else - #if defined(HAVE_XBMC_NONFREE) - #define HAS_FILESYSTEM_RAR - #endif #endif /***************** @@ -104,24 +100,12 @@ #define HAS_AUDIO #define HAS_WEB_SERVER #define HAS_WEB_INTERFACE -#define HAVE_LIBSSH #define HAS_FILESYSTEM_SMB #define HAS_ZEROCONF #define HAS_MDNS #define HAS_AIRTUNES #define HAS_UPNP -// With CMake these are set by options (through conditional defines in -// the 'All platforms' section above. -#if !defined(BUILDING_WITH_CMAKE) - #define HAS_AIRPLAY - #define HAS_FILESYSTEM_NFS - #define HAS_MYSQL - #define HAVE_LIBBLURAY - #define HAVE_LIBSHAIRPLAY - #define HAVE_LIBCEC -#endif - #define DECLARE_UNUSED(a,b) a b; #endif |