Skip to content
Extraits de code Groupes Projets
Vérifiée Valider f2539329 rédigé par Kubat's avatar Kubat
Parcourir les fichiers

[build] fix agg pb part with assdraw, wxwidgets are another pb...

parent 43a8b2fe
Aucune branche associée trouvée
Aucune étiquette associée trouvée
1 requête de fusion!7WIP: Assdraw
...@@ -68,6 +68,8 @@ CXXFLAGS_WX = @WX_CXXFLAGS@ ...@@ -68,6 +68,8 @@ CXXFLAGS_WX = @WX_CXXFLAGS@
CPPFLAGS_WX = @WX_CPPFLAGS@ CPPFLAGS_WX = @WX_CPPFLAGS@
LIBS_WX = @WX_LIBS@ -lz LIBS_WX = @WX_LIBS@ -lz
LIBS_AGG = @AGG_LIBS@
CPPFLAGS_BOOST = @BOOST_CPPFLAGS@ CPPFLAGS_BOOST = @BOOST_CPPFLAGS@
LIBS_BOOST = @BOOST_LDFLAGS@ @BOOST_FILESYSTEM_LIB@ @BOOST_LOCALE_LIB@ @BOOST_REGEX_LIB@ @BOOST_SYSTEM_LIB@ @BOOST_THREAD_LIB@ @BOOST_CHRONO_LIB@ LIBS_BOOST = @BOOST_LDFLAGS@ @BOOST_FILESYSTEM_LIB@ @BOOST_LOCALE_LIB@ @BOOST_REGEX_LIB@ @BOOST_SYSTEM_LIB@ @BOOST_THREAD_LIB@ @BOOST_CHRONO_LIB@
......
...@@ -41,4 +41,4 @@ assdraw_SOURCES := \ ...@@ -41,4 +41,4 @@ assdraw_SOURCES := \
assdraw_CPPFLAGS := -I$(d) assdraw_CPPFLAGS := -I$(d)
assdraw_CXXFLAGS := $(CXXFLAGS_WX) assdraw_CXXFLAGS := $(CXXFLAGS_WX)
assdraw_OBJ := $(assdraw_SOURCES:.cpp=.o) assdraw_OBJ := $(assdraw_SOURCES:.cpp=.o)
assdraw_LIBS := $(LIBS_WX) assdraw_LIBS := $(LIBS_WX) $(LIBS_AGG)
...@@ -343,6 +343,25 @@ int main(void) { ...@@ -343,6 +343,25 @@ int main(void) {
AS_IF([test x$agi_cv_with_iconv_const = xyes], AS_IF([test x$agi_cv_with_iconv_const = xyes],
[AC_DEFINE(AGI_ICONV_CONST, 1, [Enable if iconv expects the in argument to be const])]) [AC_DEFINE(AGI_ICONV_CONST, 1, [Enable if iconv expects the in argument to be const])])
######
## agg
######
if test "x$build_linux" = "xyes"
then
AC_CHECK_HEADERS([agg2/agg_config.h], [], [not_found_agg="yes"], [
#ifdef HAVE_FOO_H
# include <agg2/agg_config.h>
#endif
])
AS_IF([test "x$not_found_agg" = "xyes"], [
AC_MSG_ERROR([con't find agg2, it's needed to compile assdraw])
], [
AC_MSG_NOTICE([agg2 was found, will compile assdraw])
])
AGG_LIBS=${AGG_LIBS:--lagg}
AC_SUBST(AGG_LIBS)
fi
############### ###############
# Audio Players # Audio Players
############### ###############
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter