diff options
| author | Rui Lv <ruix.lv@intel.com> | 2014-11-25 17:47:00 -0500 |
|---|---|---|
| committer | Rui Lv <ruix.lv@intel.com> | 2014-11-27 22:21:00 -0500 |
| commit | 70024fb1591467f76eaf902824860ad1ad7f91ca (patch) | |
| tree | aee7ae60f04b6e144c957b03062dd7e0ef45d8ce /build-emulator.conf | |
| parent | 3ee030b7529aeb56ef96d452c1691bc61a6d801a (diff) | |
| download | build-config-70024fb1591467f76eaf902824860ad1ad7f91ca.tar.gz build-config-70024fb1591467f76eaf902824860ad1ad7f91ca.tar.bz2 build-config-70024fb1591467f76eaf902824860ad1ad7f91ca.zip | |
Update build-conf for IVI branch from OBS
Change-Id: If4afcd15fc3c8518ed098679d190097ccae2bf74
Signed-off-by: Rui Lv <ruix.lv@intel.com>
Diffstat (limited to 'build-emulator.conf')
| -rw-r--r-- | build-emulator.conf | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/build-emulator.conf b/build-emulator.conf index 6577bb2..5c8f4c2 100644 --- a/build-emulator.conf +++ b/build-emulator.conf @@ -31,12 +31,13 @@ Prefer: util-linux #Prefer: nfc-client-lib-devel Prefer: libtapi-devel -#| wayland | x | meaning -#|--------------------------- -#| 0 | 1 | pure X11 platform(no wayland) -#| 1 | 0 | pure wayland platform (no X11) -#| 1 | 1 | wayland but X compatibility -#| 0 | 0 | no X and no wayland +# | wayland | x | meaning +# |---------------------------------------------------- +# | | 1 | pure X11 platform(no wayland) +# | 1 | | pure wayland platform (no X11) +# | 1 | 1 | wayland but X compatibility +# | | | no X and no wayland +# |---------------------------------------------------- # mesa Substitute: pkgconfig(gles20) pkgconfig(egl) pkgconfig(glesv2) @@ -69,7 +70,7 @@ Macros: %define _with_pulseaudio_samsung_policy 1 %define _with_tizen 1 %define _with_mesa 1 -%define gcc_version 48 +%define gcc_version 49 %define profile common %ifarch i586 @@ -199,6 +200,7 @@ Macros: %tizen_version %{tizen_version_major}.%{tizen_version_minor} %tizen_full_version %{tizen_version}.%{tizen_version_patch} %tizen %tizen_version +%gcc_version 49 %_with_ivi 1 %_with_wayland 1 %_with_tizen 1 |