diff options
| author | Tor Lillqvist <tml@iki.fi> | 2013-07-22 12:59:31 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-07-22 13:05:15 +0300 |
| commit | 1b1037767adf96c23848a7ac195023e277086e54 (patch) | |
| tree | 48b77cddf17622177652a7f83d6c863b96874cd6 /sd | |
| parent | f9e981ba0e2da6ce122e3ef30aef057c439c8fb8 (diff) | |
Fix remote control server side build problems
The non-Bluetooth (TCP) code should not be inside Bluetooth conditionals.
You can't put a flag like -Wno-error in a list of objects. (And besides, why
would we want to disable -Werror like that, instead we should not introduce
warnings in what is after all freshly written code;)
This should fix the Android tinderbox build.
Change-Id: Ia698031a9815bf938c5c2a29bf68dee68cae07fe
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/Library_sd.mk | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk index 1586ba081ebd..15b720d0018b 100644 --- a/sd/Library_sd.mk +++ b/sd/Library_sd.mk @@ -530,17 +530,31 @@ $(eval $(call gb_Library_add_exception_objects,sd,\ sd/source/ui/remotecontrol/Transmitter \ )) +ifneq ($(OS),MACOSX) + +$(eval $(call gb_Library_add_exception_objects,sd,\ + sd/source/ui/remotecontrol/DiscoveryService \ +)) + +else + +$(eval $(call gb_Library_add_objcxxobjects,sd,\ + sd/source/ui/remotecontrol/DiscoveryService \ + sd/source/ui/remotecontrol/OSXNetworkService, \ +)) + +endif + $(eval $(call gb_Library_add_defs,sd,\ -DENABLE_SDREMOTE \ )) ifeq ($(ENABLE_SDREMOTE_BLUETOOTH),YES) -ifeq (,$(filter IOS MACOSX,$(OS))) +ifneq ($(OS),MACOSX)) $(eval $(call gb_Library_add_exception_objects,sd,\ sd/source/ui/remotecontrol/BluetoothServer \ - sd/source/ui/remotecontrol/DiscoveryService \ )) else @@ -548,9 +562,6 @@ else $(eval $(call gb_Library_add_objcxxobjects,sd,\ sd/source/ui/remotecontrol/BluetoothServer \ sd/source/ui/remotecontrol/OSXBluetooth\ - sd/source/ui/remotecontrol/DiscoveryService \ - sd/source/ui/remotecontrol/OSXNetworkService, \ - -Wno-error \ )) $(eval $(call gb_Library_add_libs,sd,\ @@ -567,6 +578,7 @@ endif $(eval $(call gb_Library_add_defs,sd,\ -DENABLE_SDREMOTE_BLUETOOTH \ )) + endif endif |