Witam!
Wysyłam poprawki do speca i łatek. Prosiłbym kogoś władnego o
przejrzenie tych poprawek (i ewentualne wytknięcie błędów) i dodanie do
CVS i przebudowanie.
U mnie się buduje (i686). Nie jestem jednakże pewien, czy ten problem z
nowym gas jest na pewno rozwiązany.
allegro.spec:
- updated to 4.2.0
- removed unnecessary patches (resolved in sources), updated others
- added more bconds
- fixed BuildRequires
- adapterized, fixed Polish descriptions
- added previously unpacked files
allegro-examples.patch, allegro-frame-pointer.patch, allegro-info.patch,
allegro-ldflags.patch, allegro-opt.patch:
- updated for 4.2.0
--
pozdrawiam,
Łukasz Kieś
--- allegro.spec.orig 2005-07-24 13:31:56.000000000 +0200
+++ allegro.spec 2005-11-11 16:54:59.000000000 +0100
@@ -3,11 +3,16 @@
# Conditional build:
%bcond_without alsa # without ALSA modules
%bcond_without arts # without aRts module
-%bcond_without jack # without JACK module
+%bcond_without dga2 # without DGA2 module
%bcond_without dbglib # don't build debug versions of library
+%bcond_without esd # without esound module
+%bcond_without fbcon # without framebuffer module
+%bcond_without jack # without JACK module
%bcond_without proflib # don't debug profiling versions of library
-%bcond_without svga # without svgalib module
%bcond_without sse # build without sse (valgrind doesn't support it yet)
+%bcond_without static # don't build static versions of library
+%bcond_without svga # without svgalib module
+%bcond_without vga # without vga module
#
Summary: A game programming library
Summary(de): Eine Bibliothek zur Programmierung von Spielen
@@ -16,28 +21,28 @@
Summary(it): Una libreria per la programmazione di videogiochi
Summary(pl): Biblioteka do programowania gier
Name: allegro
-Version: 4.1.18
+Version: 4.2.0
Release: 1
License: Giftware
Group: Libraries
Source0: http://dl.sourceforge.net/alleg/%{name}-%{version}.tar.gz
-# Source0-md5: 215b84351f349f5998a77f99bf1218fa
+# Source0-md5: a8b2c85c58b16345fe735f72763f3a6e
Patch0: %{name}-info.patch
Patch1: %{name}-examples.patch
Patch2: %{name}-opt.patch
Patch3: %{name}-ldflags.patch
Patch4: %{name}-frame-pointer.patch
-Patch5: %{name}-alsa-1_0.patch
-Patch6: %{name}-am18.patch
-Patch7: %{name}-asm.patch
URL: http://alleg.sourceforge.net/
-BuildRequires: XFree86-devel
+BuildRequires: X11-devel
%{?with_alsa:BuildRequires: alsa-lib-devel}
-%{?with_arts:BuildRequires: arts-devel}
+%{?with_arts:BuildRequires: artsc-devel}
BuildRequires: autoconf >= 2.53
BuildRequires: automake
-BuildRequires: esound-devel
-%{?with_jack:BuildRequires: jack-audio-connection-kit-devel}
+%{?with_esd:BuildRequires: esound-devel}
+%if %{with jack}
+BuildRequires: jack-audio-connection-kit-devel
+BuildRequires: pkgconfig
+%endif
%{?with_svga:BuildRequires: svgalib-devel}
BuildRequires: texinfo
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -55,12 +60,12 @@
programación de juegos u otro tipo de programación multimedia.
%description -l fr
-Allegro est une librairie multi-plateforme destinée à être utilisée dans
-les jeux vidéo ou d'autres types de programmation multimédia.
+Allegro est une librairie multi-plateforme destinée à être utilisée
+dans les jeux vidéo ou d'autres types de programmation multimédia.
%description -l it
-Allegro è una libreria multipiattaforma dedicata all'uso nei videogiochi
-ed in altri tipi di programmazione multimediale.
+Allegro è una libreria multipiattaforma dedicata all'uso nei
+videogiochi ed in altri tipi di programmazione multimediale.
%description -l pl
Allegro jest przeno¶n± bibliotek± przeznaczon± do wykorzystania w
@@ -92,14 +97,14 @@
paquete es necesario para compilar los programas que usen Allegro.
%description devel -l fr
-Allegro est une librairie multi-plateforme destinée à être utilisée dans
-les jeux vidéo ou d'autres types de programmation multimédia. Ce package
-est nécessaire pour compiler les programmes utilisant Allegro.
+Allegro est une librairie multi-plateforme destinée à être utilisée
+dans les jeux vidéo ou d'autres types de programmation multimédia. Ce
+package est nécessaire pour compiler les programmes utilisant Allegro.
%description devel -l it
-Allegro è una libreria multipiattaforma dedicata all'uso nei videogiochi
-ed in altri tipi di programmazione multimediale. Questo pacchetto è
-necessario per compilare programmi scritti con Allegro.
+Allegro è una libreria multipiattaforma dedicata all'uso nei
+videogiochi ed in altri tipi di programmazione multimediale. Questo
+pacchetto è necessario per compilare programmi scritti con Allegro.
%description devel -l pl
Allegro jest przeno¶n± bibliotek± przeznaczon± do wykorzystania w
@@ -177,7 +182,7 @@
%description profile-static
liballp - profiling version of static allegro library.
-%description debug-static -l pl
+%description profile-static -l pl
liballp - wersja statycznej biblioteki allegro s³u¿±ca do
profilowania.
@@ -185,7 +190,7 @@
Summary: A game programming library - svgalib module
Summary(pl): Biblioteka do programowania gier - modu³ dla svgalib
Group: Libraries
-PreReq: %{name} = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
%description svgalib
Allegro is a cross-platform library intended for use in computer games
@@ -203,7 +208,7 @@
Summary: A game programming library - DGA2 module
Summary(pl): Biblioteka do programowania gier - modu³ dla DGA2
Group: Libraries
-PreReq: %{name} = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
%description dga2
Allegro is a cross-platform library intended for use in computer games
@@ -221,7 +226,7 @@
Summary: A game programming library - esound module
Summary(pl): Biblioteka do programowania gier - modu³ dla esound
Group: Libraries
-PreReq: %{name} = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
%description esd
Allegro is a cross-platform library intended for use in computer games
@@ -239,7 +244,7 @@
Summary: A game programming library - aRts module
Summary(pl): Biblioteka do programowania gier - modu³ dla aRts
Group: Libraries
-PreReq: %{name} = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
%description arts
Allegro is a cross-platform library intended for use in computer games
@@ -257,7 +262,7 @@
Summary: A game programming library - framebuffer module
Summary(pl): Biblioteka do programowania gier - modu³ dla framebuffera
Group: Libraries
-PreReq: %{name} = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
%description fbcon
Allegro is a cross-platform library intended for use in computer games
@@ -275,7 +280,7 @@
Summary: A game programming library - vga module
Summary(pl): Biblioteka do programowania gier - modu³ dla vga
Group: Libraries
-PreReq: %{name} = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
%description vga
Allegro is a cross-platform library intended for use in computer games
@@ -293,7 +298,7 @@
Summary: A game programming library - ALSA modules
Summary(pl): Biblioteka do programowania gier - modu³y dla ALSA
Group: Libraries
-PreReq: %{name} = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
Obsoletes: allegro-alsa9
%description alsa
@@ -313,7 +318,7 @@
Summary: A game programming library - JACK module
Summary(pl): Biblioteka do programowania gier - modu³ dla JACK-a
Group: Libraries
-PreReq: %{name} = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
%description jack
Allegro is a cross-platform library intended for use in computer games
@@ -321,12 +326,11 @@
This package contains module for use with JACK sound library.
-%description alsa -l pl
+%description jack -l pl
Allegro jest przeno¶n± bibliotek± przeznaczon± do wykorzystania w
grach komputerowych i innych rodzajach oprogramowania multimedialnego.
-Ten pakiet zawiera modu³ do wykorzystania z bibliotek± d¼wiêkow±
-JACK.
+Ten pakiet zawiera modu³ do wykorzystania z bibliotek± d¼wiêkow± JACK.
%package tools
Summary: A game programming library - tools
@@ -336,7 +340,7 @@
Summary(it): Programmi di utilità aggiuntivi per la libreria Allegro
Summary(pl): Biblioteka do programowania gier - narzêdzia
Group: Libraries
-PreReq: %{name} = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
%description tools
Allegro is a cross-platform library intended for use in computer games
@@ -347,8 +351,8 @@
%description tools -l de
Allegro ist eine plattformübergreifende Bibliothek zur Verwendung in
Computerspielen und anderen Formen von Multinediaprogrammierung.
-Dieses Paket enthält Programme, die für die Entwicklung von
-Allegro Programmen hilfreich sind.
+Dieses Paket enthält Programme, die für die Entwicklung von Allegro
+Programmen hilfreich sind.
%description tools -l es
Allegro es una librería multi-plataforma creada para ser usada en la
@@ -357,16 +361,16 @@
desarrollar programas que usen Allegro.
%description tools -l fr
-Allegro est une librairie multi-plateforme destinée à être utilisée dans
-les jeux vidéo ou d'autres types de programmation multimédia. Ce package
-contient des outils supplémentaires qui sont utiles pour le développement
-de programmes avec Allegro.
+Allegro est une librairie multi-plateforme destinée à être utilisée
+dans les jeux vidéo ou d'autres types de programmation multimédia. Ce
+package contient des outils supplémentaires qui sont utiles pour le
+développement de programmes avec Allegro.
%description tools -l it
-Allegro è una libreria multipiattaforma dedicata all'uso nei videogiochi
-ed in altri tipi di programmazione multimediale. Questo pacchetto
-contiene programmi di utilità aggiuntivi utili allo sviluppo di programmi
-con Allegro.
+Allegro è una libreria multipiattaforma dedicata all'uso nei
+videogiochi ed in altri tipi di programmazione multimediale. Questo
+pacchetto contiene programmi di utilità aggiuntivi utili allo sviluppo
+di programmi con Allegro.
%description tools -l pl
Allegro jest przeno¶n± bibliotek± przeznaczon± do wykorzystania w
@@ -407,9 +411,6 @@
%patch2 -p1
%patch3 -p1
%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
%build
%{__aclocal}
@@ -418,13 +419,24 @@
TARGET_ARCH="%{rpmcflags}" export TARGET_ARCH
# dbglib & proflib are compiled besides normlib, so it's ok to have them here
%configure \
- --enable-static \
- %{!?with_svga:--disable-svgalib} \
+ %{?with_static:--enable-static} \
%{?with_dbglib:--enable-dbglib} \
%{?with_proflib:--enable-proflib} \
+%if %{without alsa}
+ --disable-alsadigi \
+ --disable-alsamidi \
+%endif
%{!?with_arts:--disable-artsdigi} \
- %{!?with_sse:--disable-sse} \
- %{!?with_sse:--disable-asm} \
+ %{!?with_dga2:--disable-xwin-dga2} \
+ %{!?with_esd:--disable-esddigi} \
+ %{!?with_fbcon:--disable-fbcon} \
+ %{!?with_jack:--disable-jackdigi} \
+ %{!?with_svga:--disable-svgalib} \
+ %{!?with_vga:--disable-vga} \
+%if %{without sse}
+ --disable-sse} \
+ --disable-asm} \
+%endif
%ifnarch %{ix86}
--disable-asm \
--disable-mmx \
@@ -440,7 +452,7 @@
%{__make} install install-man install-info install-lib \
DESTDIR=$RPM_BUILD_ROOT
-install modules.lst $RPM_BUILD_ROOT%{_libdir}/allegro/4.1
+install modules.lst $RPM_BUILD_ROOT%{_libdir}/allegro/4.2
mv $RPM_BUILD_ROOT%{_bindir}/demo{,-allegro}
mv $RPM_BUILD_ROOT%{_bindir}/play{,-allegro}
@@ -464,11 +476,11 @@
%files
%defattr(644,root,root,755)
-%doc AUTHORS CHANGES THANKS
+%doc AUTHORS CHANGES THANKS readme.txt
%attr(755,root,root) %{_libdir}/liballeg-%{version}.so
%dir %{_libdir}/allegro
-%dir %{_libdir}/allegro/4.1
-%{_libdir}/allegro/4.1/modules.lst
+%dir %{_libdir}/allegro/4.2
+%{_libdir}/allegro/4.2/modules.lst
%files devel
%defattr(644,root,root,755)
@@ -479,9 +491,11 @@
%{_mandir}/man3/*
%{_infodir}/*.info*
+%if %{with static}
%files static
%defattr(644,root,root,755)
%{_libdir}/liballeg.a
+%endif
%if %{with dbglib}
%files debug
@@ -489,10 +503,12 @@
%attr(755,root,root) %{_libdir}/liballd-%{version}.so
%{_libdir}/liballd_unsharable.a
+%if %{with static}
%files debug-static
%defattr(644,root,root,755)
%{_libdir}/liballd.a
%endif
+%endif
%if %{with proflib}
%files profile
@@ -500,52 +516,62 @@
%attr(755,root,root) %{_libdir}/liballp-%{version}.so
%{_libdir}/liballp_unsharable.a
+%if %{with static}
%files profile-static
%defattr(644,root,root,755)
%{_libdir}/liballp.a
%endif
+%endif
%if %{with svga}
%files svgalib
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/allegro/4.1/alleg-svgalib.so
+%attr(755,root,root) %{_libdir}/allegro/4.2/alleg-svgalib.so
%endif
+%if %{with dga2}
%files dga2
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/allegro/4.1/alleg-dga2.so
+%attr(755,root,root) %{_libdir}/allegro/4.2/alleg-dga2.so
+%endif
+%if %{with esd}
%files esd
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/allegro/4.1/alleg-esddigi.so
+%attr(755,root,root) %{_libdir}/allegro/4.2/alleg-esddigi.so
+%endif
%if %{with arts}
%files arts
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/allegro/4.1/alleg-artsdigi.so
+%attr(755,root,root) %{_libdir}/allegro/4.2/alleg-artsdigi.so
%endif
+%if %{with fbcon}
%files fbcon
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/allegro/4.1/alleg-fbcon.so
+%attr(755,root,root) %{_libdir}/allegro/4.2/alleg-fbcon.so
+%endif
%ifarch %{ix86}
+%if %{with vga}
%files vga
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/allegro/4.1/alleg-vga.so
+%attr(755,root,root) %{_libdir}/allegro/4.2/alleg-vga.so
+%endif
%endif
%if %{with alsa}
%files alsa
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/allegro/4.1/alleg-alsadigi.so
-%attr(755,root,root) %{_libdir}/allegro/4.1/alleg-alsamidi.so
+%attr(755,root,root) %{_libdir}/allegro/4.2/alleg-alsadigi.so
+%attr(755,root,root) %{_libdir}/allegro/4.2/alleg-alsamidi.so
%endif
%if %{with jack}
%files jack
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/allegro/4.1/alleg-jackdigi.so
+%attr(755,root,root) %{_libdir}/allegro/4.2/alleg-jackdigi.so
%endif
%files tools
@@ -555,6 +581,8 @@
%attr(755,root,root) %{_bindir}/pack
%attr(755,root,root) %{_bindir}/rgbmap
%attr(755,root,root) %{_bindir}/textconv
+%attr(755,root,root) %{_bindir}/xkeymap
+%attr(755,root,root) %{_bindir}/xf2pcx
%attr(755,root,root) %{_bindir}/dat
%attr(755,root,root) %{_bindir}/dat2c
%attr(755,root,root) %{_bindir}/dat2s
@@ -566,6 +594,7 @@
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/afinfo
%attr(755,root,root) %{_bindir}/akaitest
+%attr(755,root,root) %{_bindir}/cpptest
%attr(755,root,root) %{_bindir}/demo-allegro
%attr(755,root,root) %{_bindir}/digitest
%attr(755,root,root) %{_bindir}/filetest
@@ -592,11 +621,11 @@
%attr(755,root,root) %{_bindir}/excustom
%attr(755,root,root) %{_bindir}/exdata
%attr(755,root,root) %{_bindir}/exdbuf
-%attr(755,root,root) %{_bindir}/exdodgy
%attr(755,root,root) %{_bindir}/exexedat
%attr(755,root,root) %{_bindir}/exfixed
%attr(755,root,root) %{_bindir}/exflame
%attr(755,root,root) %{_bindir}/exflip
+%attr(755,root,root) %{_bindir}/exfont
%attr(755,root,root) %{_bindir}/exgui
%attr(755,root,root) %{_bindir}/exhello
%attr(755,root,root) %{_bindir}/exjoy
@@ -605,11 +634,13 @@
%attr(755,root,root) %{_bindir}/exmem
%attr(755,root,root) %{_bindir}/exmidi
%attr(755,root,root) %{_bindir}/exmouse
+%attr(755,root,root) %{_bindir}/expackf
%attr(755,root,root) %{_bindir}/expal
%attr(755,root,root) %{_bindir}/expat
%attr(755,root,root) %{_bindir}/exquat
%attr(755,root,root) %{_bindir}/exrgbhsv
%attr(755,root,root) %{_bindir}/exsample
+%attr(755,root,root) %{_bindir}/exsyscur
%attr(755,root,root) %{_bindir}/exscale
%attr(755,root,root) %{_bindir}/exscn3d
%attr(755,root,root) %{_bindir}/exscroll
--- allegro-examples.patch.orig 2005-01-16 23:47:55.000000000 +0100
+++ allegro-examples.patch 2005-11-09 16:31:42.000000000 +0100
@@ -1,23 +1,22 @@
--- allegro-4.1.17/makefile.in.orig 2004-12-02 02:02:14.000000000 +0100
+++ allegro-4.1.17/makefile.in 2005-01-16 22:24:04.277495544 +0100
-@@ -526,7 +526,7 @@
+@@ -527,7 +527,7 @@
$(INSTALL_DATA) $$file $(DESTDIR)$(includedir)/allegro/platform/; \
done
-INSTALL_EXES = $(filter tools/%, $(ALLEGRO_LIB_EXES) $(ALLEGRO_DATAFILE_EXES))
-+INSTALL_EXES = $(filter tools/% demo/% setup/% tests/% examples/%,
$(ALLEGRO_LIB_EXES) $(ALLEGRO_DATAFILE_EXES) $(ALLEGRO_EXAMPLE_EXES))
++INSTALL_EXES = $(filter tools/% demo/% setup/% tests/% examples/%,
$(ALLEGRO_EXE_TARGETS))
install-programs: $(INSTALL_EXES)
$(mkinstalldirs) $(DESTDIR)$(bindir)
-@@ -617,9 +617,10 @@
+@@ -618,9 +618,9 @@
rm -rf $(includedir)/allegro
uninstall-programs:
- @for prog in $(ALLEGRO_LIB_EXES) $(ALLEGRO_DATAFILE_EXES); do \
- if test "X`echo $$prog | sed -e s,tools/.\*,,`" = X; then \
- p=`echo $$prog | sed -e s,tools/,,`; \
-+ @for prog in $(ALLEGRO_LIB_EXES) $(ALLEGRO_DATAFILE_EXES) \
-+ $(ALLEGRO_EXAMPLE_EXES) ; do \
++ @for prog in $(ALLEGRO_EXE_TARGETS); do \
+ if test "X`echo $$prog | sed -e s,.*/.\*,,`" = X; then \
+ p=`echo $$prog | sed -e s,,,`; \
echo rm -f $(bindir)/$$p; \
--- allegro-frame-pointer.patch.orig 2004-05-23 23:15:06.000000000 +0200
+++ allegro-frame-pointer.patch 2005-11-09 16:55:58.000000000 +0100
@@ -1,7 +1,7 @@
diff -urN aa/allegro-4.1.14/configure.in allegro-4.1.14/configure.in
--- aa/allegro-4.1.14/configure.in 2004-05-23 21:23:07.930046696 +0200
+++ allegro-4.1.14/configure.in 2004-05-23 21:21:51.225707528 +0200
-@@ -245,7 +245,7 @@
+@@ -271,7 +271,7 @@
COMPILE_PROGRAM=COMPILE_PROFILE
COMPILE_CXX_PROGRAM=COMPILE_CXX_PROFILE
COMPILE_S_PROGRAM=COMPILE_S_PROFILE
@@ -10,12 +10,12 @@
LIB_TO_LINK=allp
PLUGIN_LIB=lib/unix/libapdat.a
allegro_build_profiling_library=yes
-@@ -671,7 +671,7 @@
+@@ -730,7 +730,7 @@
ALLEGRO_DEBUG_CFLAGS="$ALLEGRO_DEBUG_CFLAGS -DDMALLOC"
fi
CFLAGS="$CFLAGS $TARGET_ARCH"
-- ALLEGRO_PROFILE_CFLAGS="$CFLAGS -pg $WFLAGS"
-+ ALLEGRO_PROFILE_CFLAGS="$CFLAGS -fno-omit-frame-pointer -pg $WFLAGS"
+- ALLEGRO_PROFILE_CFLAGS="$CFLAGS -pg $WFLAGS"
++ ALLEGRO_PROFILE_CFLAGS="$CFLAGS -fno-omit-frame-pointer -pg $WFLAGS"
ALLEGRO_SFLAGS="-x assembler-with-cpp"
ALLEGRO_SHAREDLIB_CFLAGS="-fPIC -DALLEGRO_SHARED"
else
--- allegro-info.patch.orig 2005-05-21 21:22:40.000000000 +0200
+++ allegro-info.patch 2005-11-09 16:16:07.000000000 +0100
@@ -1,7 +1,8 @@
Don't use tabs, they are expanded at wrong moment
--- allegro-4.1.12/docs/src/allegro._tx~ Fri Nov 23 07:03:08 2001
+++ allegro-4.1.12/docs/src/allegro._tx Fri Nov 23 07:03:08 2001
-@@ -24,8 +24,8 @@
+@@ -31,9 +31,9 @@
+ @# This should remain commented at the moment (dvi output) @[EMAIL PROTECTED]
@$
@[EMAIL PROTECTED]
[EMAIL PROTECTED]@dircategory Libraries
--- allegro-ldflags.patch.orig 2003-08-25 01:00:43.000000000 +0200
+++ allegro-ldflags.patch 2005-11-09 16:31:14.000000000 +0100
@@ -1,12 +1,12 @@
diff -ruN allegro-4.1.11./misc/allegro-config.in
allegro-4.1.11/misc/allegro-config.in
--- allegro-4.1.11./misc/allegro-config.in 2003-06-30 01:27:31.000000000
+0200
+++ allegro-4.1.11/misc/allegro-config.in 2003-08-25 00:50:30.000000000
+0200
-@@ -19,7 +19,7 @@
- [EMAIL PROTECTED]@
- [EMAIL PROTECTED]@
+@@ -21,7 +21,7 @@
+
+ accepts_frameworks=no
-allegro_ldflags="@LDFLAGS@"
+allegro_ldflags=""
allegro_libs="@LIBS@"
+ allegro_frameworks="@FRAMEWORKS@"
allegro_cflags=""
- allegro_cppflags=""
--- allegro-opt.patch.orig 2004-07-31 14:48:17.000000000 +0200
+++ allegro-opt.patch 2005-11-10 22:25:59.000000000 +0100
@@ -1,11 +1,11 @@
--- aa/allegro-4.1.15/configure.in 2004-04-27 13:53:02.000000000 +0200
+++ allegro-4.1.15/configure.in 2004-05-23 21:18:36.478313632 +0200
-@@ -668,26 +662,7 @@
+@@ -720,38 +720,7 @@
dnl How to compile C and asm files.
- if test -n "GCC"; then
+ if test -n "$GCC"; then
- if test "X$allegro_strict_warnings" = "Xyes"; then
-- WFLAGS="-Wall -W -Wstrict-prototypes -Wno-unused -Werror"
+- WFLAGS="-Wall -W -Wstrict-prototypes -Wno-unused-parameter -Werror"
- else
- WFLAGS="-Wall -Wno-unused"
- fi
@@ -17,6 +17,18 @@
- else
- TARGET_ARCH="-mcpu=$allegro_optimizations"
- fi
+- elif test "X$allegro_cv_processor_type" = "Xamd64"; then
+- dnl Change default pentium->athlon64
+- if test "X$allegro_optimizations" = "Xpentium"; then
+- allegro_optimizations="k8"
+- fi
+- if test "$allegro_exclusive_optimizations" != none; then
+- TARGET_ARCH="-march=$allegro_exclusive_optimizations"
+- elif test "X$allegro_cv_support_amd64_mtune" = "Xyes"; then
+- TARGET_ARCH="-mtune=$allegro_optimizations"
+- else
+- TARGET_ARCH="-mcpu=$allegro_optimizations"
+- fi
- else
- TARGET_ARCH=
- fi
@@ -28,7 +40,7 @@
ALLEGRO_DEBUG_CFLAGS="$CFLAGS -g $WFLAGS -DDEBUGMODE"
if test "X$allegro_debug_with_fortify" = "Xyes"; then
ALLEGRO_DEBUG_CFLAGS="$ALLEGRO_DEBUG_CFLAGS -DFORTIFY"
-@@ -692,12 +670,8 @@
+@@ -759,12 +728,8 @@
if test "X$allegro_debug_with_dmalloc" = "Xyes"; then
ALLEGRO_DEBUG_CFLAGS="$ALLEGRO_DEBUG_CFLAGS -DDMALLOC"
fi
@@ -39,7 +51,7 @@
- CFLAGS="$CFLAGS $TARGET_ARCH -O2 -funroll-loops -ffast-math $WFLAGS"
- fi
+ CFLAGS="$CFLAGS $TARGET_ARCH"
-+ ALLEGRO_PROFILE_CFLAGS="$CFLAGS -pg $WFLAGS"
++ ALLEGRO_PROFILE_CFLAGS="$CFLAGS -pg $WFLAGS"
ALLEGRO_SFLAGS="-x assembler-with-cpp"
ALLEGRO_SHAREDLIB_CFLAGS="-fPIC -DALLEGRO_SHARED"
else
_______________________________________________
pld-devel-pl mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-devel-pl
