Enable sdl2 build

This commit is contained in:
pcpa 2015-03-17 10:59:25 -03:00
parent b190ff6bcd
commit b5cbb25faa

View File

@ -17,6 +17,13 @@
%bcond_without system_nvtt %bcond_without system_nvtt
%bcond_without nvtt %bcond_without nvtt
# Default to sdl2 on rawhide
%if 0%{?fedora} > 22
%bcond_without sdl2
%else
%bcond_with sdl2
%endif
Name: 0ad Name: 0ad
Version: 0.0.18 Version: 0.0.18
Release: 1%{?dist} Release: 1%{?dist}
@ -89,7 +96,11 @@ BuildRequires: openal-soft-devel
BuildRequires: openjpeg-devel BuildRequires: openjpeg-devel
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: python BuildRequires: python
%if %{with sdl2}
BuildRequires: SDL2-devel
%else
BuildRequires: SDL-devel BuildRequires: SDL-devel
%endif
BuildRequires: subversion BuildRequires: subversion
BuildRequires: valgrind-devel BuildRequires: valgrind-devel
BuildRequires: wxGTK-devel BuildRequires: wxGTK-devel
@ -150,6 +161,9 @@ build/workspaces/update-workspaces.sh \
%endif %endif
%if %{without nvtt} %if %{without nvtt}
--without-nvtt \ --without-nvtt \
%endif
%if %{with sdl2}
--sdl2 \
%endif %endif
%{?_smp_mflags} %{?_smp_mflags}
@ -222,6 +236,10 @@ export STRIP=/bin/true
%{_mandir}/man6/*.6* %{_mandir}/man6/*.6*
%changelog %changelog
* Tue Mar 17 2015 pcpa <paulo.cesar.pereira.de.andrade@gmail.com> - 0.0.18-2
- Use bcond for rpm conditional macros
- Add rpm conditional to build with sdl2
* Sat Mar 14 2015 pcpa <paulo.cesar.pereira.de.andrade@gmail.com> - 0.0.18-1 * Sat Mar 14 2015 pcpa <paulo.cesar.pereira.de.andrade@gmail.com> - 0.0.18-1
- Update to latest upstream release - Update to latest upstream release
- Change to -p0 patches - Change to -p0 patches