Search
lxdream.org :: lxdream :: r1113:174fa8e137b6
lxdream 0.9.1
released Jun 29
Download Now
changeset1113:174fa8e137b6
parent1112:4cac5e474d4c
child1114:2fbf712e53f0
authornkeynes
dateSat Jul 31 11:16:44 2010 +1000 (9 years ago)
Add LIBGL_* package vars to LIBS and CPPFLAGS so subsequent checks still work
configure
configure.in
src/Makefile.am
src/Makefile.in
1.1 --- a/configure Tue Jul 13 18:23:16 2010 +1000
1.2 +++ b/configure Sat Jul 31 11:16:44 2010 +1000
1.3 @@ -9543,7 +9543,9 @@
1.4 echo "${ECHO_T}yes" >&6; }
1.5 :
1.6 fi
1.7 - else
1.8 + LIBS="$LIBS $LIBGL_LIBS";
1.9 + CPPFLAGS="$CPPFLAGS $LIBGL_CFLAGS";
1.10 + else
1.11 { echo "$as_me:$LINENO: checking for NSOpenGLGetVersion" >&5
1.12 echo $ECHO_N "checking for NSOpenGLGetVersion... $ECHO_C" >&6; }
1.13 if test "${ac_cv_func_NSOpenGLGetVersion+set}" = set; then
2.1 --- a/configure.in Tue Jul 13 18:23:16 2010 +1000
2.2 +++ b/configure.in Sat Jul 31 11:16:44 2010 +1000
2.3 @@ -244,6 +244,8 @@
2.4 dnl AC_MSG_FAILURE( ["The OpenGL library (libGL.so) could not be found, but is required."])])
2.5 dnl AC_CHECK_HEADER([GL/gl.h], [], [
2.6 dnl AC_MSG_FAILURE( ["The OpenGL header files (eg GL/gl.h) could not be found, but are required."])])
2.7 + LIBS="$LIBS $LIBGL_LIBS";
2.8 + CPPFLAGS="$CPPFLAGS $LIBGL_CFLAGS";
2.9 else
2.10 AC_CHECK_FUNC(NSOpenGLGetVersion, [
2.11 HAVE_NSGL='yes'
3.1 --- a/src/Makefile.am Tue Jul 13 18:23:16 2010 +1000
3.2 +++ b/src/Makefile.am Sat Jul 31 11:16:44 2010 +1000
3.3 @@ -6,7 +6,7 @@
3.4 -DPACKAGE_PLUGIN_DIR=\""$(pkglibdir)"\" \
3.5 -DPACKAGE_CONF_DIR=\""$(sysconfdir)"\" \
3.6 -Ish4 \
3.7 - @GLIB_CFLAGS@ @GTK_CFLAGS@ @LIBPNG_CFLAGS@ @PULSE_CFLAGS@ @ESOUND_CFLAGS@ @ALSA_CFLAGS@ @SDL_CFLAGS@ @LIBGL_CFLAGS@ @LIBISOFS_CFLAGS@
3.8 + @GLIB_CFLAGS@ @GTK_CFLAGS@ @LIBPNG_CFLAGS@ @PULSE_CFLAGS@ @ESOUND_CFLAGS@ @ALSA_CFLAGS@ @SDL_CFLAGS@ @LIBISOFS_CFLAGS@
3.9
3.10 SOEXT=@SOEXT@
3.11 PLUGINCFLAGS = @PLUGINCFLAGS@
3.12 @@ -39,7 +39,7 @@
3.13 genmach_SOURCES = tools/genmach.c tools/genmach.h tools/mdparse.c
3.14 genglsl_SOURCES = tools/genglsl.c
3.15 lxdream_LINK = $(LINK) @LXDREAMLDFLAGS@
3.16 -lxdream_LDADD = @LXDREAM_LIBS@ @GLIB_LIBS@ @GTK_LIBS@ @LIBPNG_LIBS@ @LIBGL_LIBS@ @LIBISOFS_LIBS@ $(INTLLIBS)
3.17 +lxdream_LDADD = @LXDREAM_LIBS@ @GLIB_LIBS@ @GTK_LIBS@ @LIBPNG_LIBS@ @LIBISOFS_LIBS@ $(INTLLIBS)
3.18 lxdream_SOURCES = \
3.19 main.c version.c config.c config.h lxdream.h dream.h gui.h cpu.c cpu.h hook.h \
3.20 gettext.h mem.c mem.h sdram.c mmio.h watch.c \
4.1 --- a/src/Makefile.in Tue Jul 13 18:23:16 2010 +1000
4.2 +++ b/src/Makefile.in Sat Jul 31 11:16:44 2010 +1000
4.3 @@ -538,7 +538,7 @@
4.4 -DPACKAGE_PLUGIN_DIR=\""$(pkglibdir)"\" \
4.5 -DPACKAGE_CONF_DIR=\""$(sysconfdir)"\" \
4.6 -Ish4 \
4.7 - @GLIB_CFLAGS@ @GTK_CFLAGS@ @LIBPNG_CFLAGS@ @PULSE_CFLAGS@ @ESOUND_CFLAGS@ @ALSA_CFLAGS@ @SDL_CFLAGS@ @LIBGL_CFLAGS@ @LIBISOFS_CFLAGS@
4.8 + @GLIB_CFLAGS@ @GTK_CFLAGS@ @LIBPNG_CFLAGS@ @PULSE_CFLAGS@ @ESOUND_CFLAGS@ @ALSA_CFLAGS@ @SDL_CFLAGS@ @LIBISOFS_CFLAGS@
4.9
4.10 EXTRA_DIST = drivers/genkeymap.pl checkver.pl drivers/dummy.c
4.11 AM_CFLAGS = -D__EXTENSIONS__ -D_BSD_SOURCE -D_GNU_SOURCE
4.12 @@ -558,9 +558,8 @@
4.13 genglsl_SOURCES = tools/genglsl.c
4.14 lxdream_LINK = $(LINK) @LXDREAMLDFLAGS@
4.15 lxdream_LDADD = @LXDREAM_LIBS@ @GLIB_LIBS@ @GTK_LIBS@ @LIBPNG_LIBS@ \
4.16 - @LIBGL_LIBS@ @LIBISOFS_LIBS@ $(INTLLIBS) $(am__append_18) \
4.17 - $(am__append_20) $(am__append_22) $(am__append_24) \
4.18 - $(am__append_26)
4.19 + @LIBISOFS_LIBS@ $(INTLLIBS) $(am__append_18) $(am__append_20) \
4.20 + $(am__append_22) $(am__append_24) $(am__append_26)
4.21 lxdream_SOURCES = main.c version.c config.c config.h lxdream.h dream.h \
4.22 gui.h cpu.c cpu.h hook.h gettext.h mem.c mem.h sdram.c mmio.h \
4.23 watch.c asic.c asic.h clock.h serial.h syscall.c syscall.h \
.