oln 10.201: Fix flags.

Index: tools/ChangeLog from Giovanni Palma <giovanni@lrde.epita.fr> * utilities/convert/Makefile.am: Correct flags. Index: tools/utilities/convert/Makefile.am --- tools/utilities/convert/Makefile.am Mon, 28 Jun 2004 15:53:02 +0200 thivol_d (oln/v/10_Makefile.a 1.2 600) +++ tools/utilities/convert/Makefile.am Tue, 29 Jun 2004 10:46:02 +0200 palma_g (oln/v/10_Makefile.a 1.2 600) @@ -1,4 +1,4 @@ -AM_CXXFLAGS = $(CXXFLAGS_STRICT) $(CXXFLAGS_OPTIMIZE) -lz +AM_CXXFLAGS = $(CXXFLAGS_STRICT) $(CXXFLAGS_OPTIMIZE) $(ZLIB_LDFLAGS) INCLUDES = -I$(srcdir)/../../lib LDADD = ../../lib/libolntools.a bin_PROGRAMS = color_space -- Giovanni Palma EPITA - promo 2005 - membre d'EpX - LRDE Mob. : +33 (0)6 60 97 31 74

"Giovanni" == Giovanni Palma <giovanni@lrde.epita.fr> writes:
Index: tools/ChangeLog from Giovanni Palma <giovanni@lrde.epita.fr>
* utilities/convert/Makefile.am: Correct flags.
Index: tools/utilities/convert/Makefile.am --- tools/utilities/convert/Makefile.am Mon, 28 Jun 2004 15:53:02 +0200 thivol_d (oln/v/10_Makefile.a 1.2 600) +++ tools/utilities/convert/Makefile.am Tue, 29 Jun 2004 10:46:02 +0200 palma_g (oln/v/10_Makefile.a 1.2 600) @@ -1,4 +1,4 @@ -AM_CXXFLAGS = $(CXXFLAGS_STRICT) $(CXXFLAGS_OPTIMIZE) -lz +AM_CXXFLAGS = $(CXXFLAGS_STRICT) $(CXXFLAGS_OPTIMIZE) $(ZLIB_LDFLAGS)
Ce n'est que la moitiƩ de ma remarque : ce n'est pas CXXFLAGS mais AM_LDFLAGS qu'il faut changer.

Index: tools/ChangeLog from Giovanni Palma <giovanni@lrde.epita.fr> * utilities/convert/color_space.cc: Remove warnings. * utilities/convert/Makefile.am: Add AM_LDFLAGS. Index: tools/utilities/convert/color_space.cc --- tools/utilities/convert/color_space.cc Mon, 28 Jun 2004 15:53:02 +0200 thivol_d (oln/u/19_color_spac 1.2 600) +++ tools/utilities/convert/color_space.cc Wed, 07 Jul 2004 11:31:07 +0200 palma_g (oln/u/19_color_spac 1.2 600) @@ -122,6 +122,7 @@ from_x_to_rgb(const oln::image2d<T> &in) { assert(0); + return oln::image2d<ntg::rgb_8>(); } #define FROM_X_TO_RGB(T) \ @@ -138,6 +139,7 @@ from_rgb_to_x(const oln::image2d<ntg::rgb_8> &in) { assert(0); + return oln::image2d<T>(); } #define FROM_RGB_TO_X(T) \ Index: tools/utilities/convert/Makefile.am --- tools/utilities/convert/Makefile.am Tue, 29 Jun 2004 10:54:13 +0200 palma_g (oln/v/10_Makefile.a 1.3 600) +++ tools/utilities/convert/Makefile.am Wed, 07 Jul 2004 11:26:33 +0200 palma_g (oln/v/10_Makefile.a 1.3 600) @@ -1,4 +1,5 @@ -AM_CXXFLAGS = $(CXXFLAGS_STRICT) $(CXXFLAGS_OPTIMIZE) $(ZLIB_LDFLAGS) +AM_LDFLAGS = $(ZLIB_LDFLAGS) +AM_CXXFLAGS = $(CXXFLAGS_STRICT) $(CXXFLAGS_OPTIMIZE) INCLUDES = -I$(srcdir)/../../lib LDADD = ../../lib/libolntools.a bin_PROGRAMS = color_space -- Giovanni Palma EPITA - promo 2005 - membre d'EpX - LRDE Mob. : +33 (0)6 60 97 31 74
participants (2)
-
Akim Demaille
-
Giovanni Palma