Adjust project config for Tizen:Mobile/Wearable

Change-Id: I95cdc70f46d7da69bafeb0a2b4b4a9c0ec634dd4
Tizen:Mobile: disable kdbus activation
Tizen:Wearable: seperate build macro emulator32-wayland from emulator32-x11

diff --git a/Tizen:Mobile/_config b/Tizen:Mobile/_config
index 9f4cfc3..177b84d 100644 (file)
--- a/Tizen:Mobile/_config
+++ b/Tizen:Mobile/_config
@@ -94,15 +94,15 @@ Macros:
 ###################### Activate KDBUS ######################
 # This configuration flag enables the support of KDBUS
 
-%if "%_repository" == "arm64-wayland"
+#%if "%_repository" == "arm64-wayland"
 
-%define _with_kdbus 1
+#%define _with_kdbus 1
 
-Macros:
-%_with_kdbus 1
-:Macros
+#Macros:
+#%_with_kdbus 1
+#:Macros
 
-%endif
+#%endif
 
 ############################# wayland repositories #############################
 

diff --git a/Tizen:Wearable/_config b/Tizen:Wearable/_config
index 8d7476c..37c92f9 100644 (file)
--- a/Tizen:Wearable/_config
+++ b/Tizen:Wearable/_config
@@ -142,7 +142,7 @@ Macros:
 
 ############################# emulator repositories ############################
 
-%if "%_repository" == "emulator32-x11" || "%_repository" == "emulator32-wayland"
+%if "%_repository" == "emulator32-x11"
 
 Prefer: mesa-libGLESv2
 Prefer: mesa-libGL
@@ -162,6 +162,26 @@ Macros:
 
 %endif
 
+%if "%_repository" == "emulator32-wayland"
+
+Prefer: mesa-libGLESv2
+Prefer: mesa-libGL
+Prefer: mesa-libEGL
+Prefer: emulator-yagl
+
+Substitute: pkgconfig(gles20)  pkgconfig(egl) pkgconfig(glesv2)
+Substitute: pkgconfig(gles11)  pkgconfig(egl) pkgconfig(glesv1) pkgconfig(gl)
+
+%define _with_wayland 1
+%define _with_emulator 1
+
+Macros:
+%_with_wayland 1
+%_with_emulator 1
+:Macros
+
+%endif
+
 ############################# misc config flags ################################
 
 # This build macro controls the libdlog output. If enabled,