--- GPUSDK/buildvars.mk 2011-05-05 15:37:59.250475616 -0400 +++ GPUSDK/buildvars.mk 2011-05-05 15:49:04.300978514 -0400 @@ -18,27 +18,27 @@ #if building on an LTIB system, set CROSS_COMPILE as below #CROSS_COMPILE = /opt/freescale/usr/local/gcc-4.1.2-glibc-2.5-nptl-3/arm-none-linux-gnueabi/bin/arm-none-linux-gnueabi- #if building on an EVK -CROSS_COMPILE = +CROSS_COMPILE = $(CROSS) #directory with GLES, VG, and EGL headers #FSL_GPU_INC = $(LTIB_ROOTFS)/usr/include #if building on an EVK -FSL_GPU_INC = /usr/include +#FSL_GPU_INC = /usr/include #all other system headers #FSL_PLATFORM_INC = $(LTIB_ROOTFS)/usr/include #if building on an EVK -FSL_PLATFORM_INC = /usr/include +#FSL_PLATFORM_INC = /usr/include #location of libEGL.so, etc. #FSL_GPU_LIB = $(LTIB_ROOTFS)/usr/lib #if building on an EVK -FSL_GPU_LIB = /usr/lib +#FSL_GPU_LIB = /usr/lib #location of other system libraries #FSL_PLATFORM_LIB = $(LTIB_ROOTFS)/usr/lib #if building on an EVK -FSL_PLATFORM_LIB = /usr/lib +#FSL_PLATFORM_LIB = /usr/lib ARCH = arm CD = cd --- GPUSDK/demos/gui/src/3DMMP/Makefile 2011-05-05 15:57:32.930475439 -0400 +++ GPUSDK/demos/gui/src/3DMMP/Makefile 2011-05-05 15:54:36.271725480 -0400 @@ -16,17 +16,15 @@ endif -CFLAGS += -I$(PROJECTROOT)/include \ - -I$(FSL_PLATFORM_INC)/gstreamer-0.10 \ - -I$(FSL_PLATFORM_INC)/glib-2.0 \ - -I$(FSL_PLATFORM_LIB)/glib-2.0/include \ - -I$(FSL_PLATFORM_INC)/libxml2 \ - -D_LINUX +CFLAGS += -I$(PROJECTROOT)/include -D_LINUX +CFLAGS += $(shell pkg-config gstreamer-0.10 --cflags) +CFLAGS += $(shell pkg-config glib-2.0 --cflags) LFLAGS += -L$(FSL_GPUSDK_ROOT)/utility/lib -lfslutil -lglu3 \ $(EGL_FLAGS) $(ES20_FLAGS) $(XLIB_LFLAGS) \ - -L$(FSL_PLATFORM_LIB) -pthread -lgstreamer-0.10 -lgobject-2.0 \ - -lgmodule-2.0 -lgthread-2.0 -lrt -lxml2 -lglib-2.0 + -L$(FSL_PLATFORM_LIB) -lrt +LFLAGS += $(shell pkg-config glib-2.0 --libs) +LFLAGS += $(shell pkg-config gstreamer-0.10 --libs) CFLAGS_FB += $(CFLAGS) --- GPUSDK/demos/gui/src/fslvideobrowserscene/Makefile 2011-05-05 15:57:19.480475520 -0400 +++ GPUSDK/demos/gui/src/fslvideobrowserscene/Makefile 2011-05-05 15:55:29.541725233 -0400 @@ -17,17 +17,15 @@ CFLAGS += -I$(PROJECTROOT)/include \ - -I$(FSL_PLATFORM_INC)/gstreamer-0.10 \ - -I$(FSL_PLATFORM_INC)/glib-2.0 \ - -I$(FSL_PLATFORM_LIB)/glib-2.0/include \ - -I$(FSL_PLATFORM_INC)/libxml2 \ -D_LINUX -DEGL_USE_X11 +CFLAGS += $(shell pkg-config gstreamer-0.10 --cflags) +CFLAGS += $(shell pkg-config glib-2.0 --cflags) LFLAGS += -L$(FSL_GPUSDK_ROOT)/utility/lib -lfslutil -lglu3 \ $(EGL_FLAGS) $(ES20_FLAGS) $(XLIB_LFLAGS) \ - -lres -lm -lX11 \ - -pthread -lgstreamer-0.10 -lgobject-2.0 \ - -lgmodule-2.0 -lgthread-2.0 -lrt -lxml2 -lglib-2.0 -lm + -lres -lm -lX11 -lrt -lm +LFLAGS += $(shell pkg-config glib-2.0 --libs) +LFLAGS += $(shell pkg-config gstreamer-0.10 --libs) OBJECTS = fslvideobrowserscene.o LIBNAME = libfslvideobrowserscene.a --- GPUSDK/demos/gui/src/3DGUI/Makefile 2011-05-05 15:59:10.200475397 -0400 +++ GPUSDK/demos/gui/src/3DGUI/Makefile 2011-05-05 15:58:59.382623377 -0400 @@ -19,18 +19,19 @@ -mcpu=arm1136jf-s -mapcs-frame \ -fPIC -fomit-frame-pointer -fno-strict-aliasing \ -Wall -W -Wno-unused-parameter \ - -I. -I$(TOOLCHAIN)/include -I$(PROJECTROOT)/include \ - -I/usr/include/gstreamer-0.10 \ - -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include \ - -I/usr/include/libxml2 -D_LINUX -DEGL_USE_X11 + -I. -I$(TOOLCHAIN)/include -I$(PROJECTROOT)/include -D_LINUX -DEGL_USE_X11 + +CFLAGS += $(shell pkg-config gstreamer-0.10 --cflags) +CFLAGS += $(shell pkg-config glib-2.0 --cflags) OBJECTS = $(APP).o LFLAGS = -L$(TOOLCHAIN)/lib -L./lib -L/usr/lib \ -lOpenVG -lgles20 -legl13 -lgsl -lc2d -lpanel2 -lcsi -lbb2d \ - -lres -lm -lX11 -pthread -lgstreamer-0.10 -lgobject-2.0 \ - -lgmodule-2.0 -lgthread-2.0 -lrt -lxml2 -lglib-2.0 + -lres -lm -lX11 -lrt +LFLAGS += $(shell pkg-config gstreamer-0.10 --libs) +LFLAGS += $(shell pkg-config glib-2.0 --libs) first: all --- GPUSDK/demos/gui/src/fslvideochaptercard/Makefile 2011-05-05 16:00:04.350475555 -0400 +++ GPUSDK/demos/gui/src/fslvideochaptercard/Makefile 2011-05-05 15:59:56.381725741 -0400 @@ -13,11 +13,9 @@ endif CFLAGS += -I$(PROJECTROOT)/include \ - -I$(FSL_PLATFORM_INC)/gstreamer-0.10 \ - -I$(FSL_PLATFORM_INC)/glib-2.0 \ - -I$(FSL_PLATFORM_LIB)/glib-2.0/include \ - -I$(FSL_PLATFORM_INC)/libxml2 \ -D_LINUX -DEGL_USE_X11 +CFLAGS += $(shell pkg-config glib-2.0 --cflags) +CFLAGS += $(shell pkg-config gstreamer-0.10 --cflags) OBJECTS = fslvideochaptercard.o LIBNAME = libfslvideochaptercard.a --- GPUSDK/demos/gui/src/fslmusiccontainerscene/Makefile 2011-05-05 16:02:35.391725754 -0400 +++ GPUSDK/demos/gui/src/fslmusiccontainerscene/Makefile 2011-05-05 16:02:21.490474908 -0400 @@ -17,24 +17,16 @@ CFLAGS += -I$(PROJECTROOT)/include \ -D_LINUX -DEGL_USE_X11 \ - -pthread -D_REENTRANT \ - -I$(FSL_PLATFORM_INC)/gstreamer-0.10 \ - -I$(FSL_PLATFORM_INC)/glib-2.0 \ - -I$(FSL_PLATFORM_LIB)/glib-2.0/include \ - -I$(FSL_PLATFORM_INC)/libxml2 \ - -I$(FSL_PLATFORM_INC)/gtk-2.0 \ - -I$(FSL_PLATFORM_INC)/atk-1.0 \ - -I$(FSL_PLATFORM_INC)/cairo \ - -I$(FSL_PLATFORM_INC)/pango-1.0 \ - -I$(FSL_PLATFORM_INC)/pixman-1 \ - -I$(FSL_PLATFORM_INC)/freetype2 \ - -I$(FSL_PLATFORM_INC)/directfb \ - -I$(FSL_PLATFORM_INC)/libpng12 + -pthread -D_REENTRANT +CFLAGS += $(shell pkg-config gstreamer-0.10 --cflags) +CFLAGS += $(shell pkg-config glib-2.0 --cflags) +CFLAGS += $(shell pkg-config gtk+-2.0 --cflags) +CFLAGS += $(shell pkg-config atk --cflags) LFLAGS += -L$(FSL_GPUSDK_ROOT)/utility/lib -lfslutil -lglu3 \ - $(EGL_FLAGS) $(ES20_FLAGS) $(XLIB_LFLAGS) \ - -lres -lm -pthread -lgstreamer-0.10 -lgthread-2.0 -lrt \ - -lxml2 -lgobject-2.0 -lglib-2.0 + $(EGL_FLAGS) $(ES20_FLAGS) $(XLIB_LFLAGS) -lres -lm -pthread -lrt +LFLAGS += $(shell pkg-config gstreamer-0.10 --libs) +LFLAGS += $(shell pkg-config glib-2.0 --libs) OBJECTS = fslmusiccontainerscene.o LIBNAME = libfslmusiccontainerscene.a --- GPUSDK/demos/gui/src/fslmusicvisualizercard/Makefile 2011-05-05 16:05:49.101725804 -0400 +++ GPUSDK/demos/gui/src/fslmusicvisualizercard/Makefile 2011-05-05 16:05:28.765211398 -0400 @@ -17,26 +17,19 @@ CFLAGS += -I$(PROJECTROOT)/include \ -D_LINUX -DEGL_USE_X11 \ - -pthread -D_REENTRANT \ - -I$(FSL_PLATFORM_INC)/gstreamer-0.10 \ - -I$(FSL_PLATFORM_INC)/glib-2.0 \ - -I$(FSL_PLATFORM_LIB)/glib-2.0/include \ - -I$(FSL_PLATFORM_INC)/libxml2 \ - -I$(FSL_PLATFORM_INC)/gtk-2.0 \ - -I$(FSL_PLATFORM_INC)/atk-1.0 \ - -I$(FSL_PLATFORM_INC)/cairo \ - -I$(FSL_PLATFORM_INC)/pango-1.0 \ - -I$(FSL_PLATFORM_INC)/pixman-1 \ - -I$(FSL_PLATFORM_INC)/freetype2 \ - -I$(FSL_PLATFORM_INC)/directfb \ - -I$(FSL_PLATFORM_INC)/libpng12 + -pthread -D_REENTRANT +CFLAGS += $(shell pkg-config gstreamer-0.10 --cflags) +CFLAGS += $(shell pkg-config glib-2.0 --cflags) +CFLAGS += $(shell pkg-config gtk+-2.0 --cflags) +CFLAGS += $(shell pkg-config atk --cflags) LFLAGS += -L$(FSL_GPUSDK_ROOT)/utility/lib -lfslutil -lglu3 \ $(EGL_FLAGS) $(ES20_FLAGS) $(XLIB_LFLAGS) \ - -lres -lm -pthread -lgstreamer-0.10 -lgthread-2.0 -lrt \ - -lxml2 -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lm \ - -lpangocairo-1.0 -lgio-2.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lgobject-2.0 \ - -lgmodule-2.0 -lglib-2.0 + -lres -lm -pthread -lrt -lm +LFLAGS += $(shell pkg-config gstreamer-0.10 --libs) +LFLAGS += $(shell pkg-config glib-2.0 --libs) +LFLAGS += $(shell pkg-config gtk+-2.0 --libs) +LFLAGS += $(shell pkg-config atk --libs) OBJECTS = fslmusicvisualizercard.o LIBNAME = libfslmusicvisualizercard.a --- GPUSDK/demos/gui/src/fslaudiopipeline/Makefile 2011-05-05 16:06:19.430475774 -0400 +++ GPUSDK/demos/gui/src/fslaudiopipeline/Makefile 2011-05-05 16:06:11.770475057 -0400 @@ -17,11 +17,9 @@ CFLAGS += -I$(PROJECTROOT)/include \ - -I$(FSL_PLATFORM_INC)/gstreamer-0.10 \ - -I$(FSL_PLATFORM_INC)/glib-2.0 \ - -I$(FSL_PLATFORM_LIB)/glib-2.0/include \ - -I$(FSL_PLATFORM_INC)/libxml2 \ -D_LINUX -DEGL_USE_X11 +CFLAGS += $(shell pkg-config gstreamer-0.10 --cflags) +CFLAGS += $(shell pkg-config glib-2.0 --cflags) OBJECTS = fslaudiopipeline.o LIBNAME = libfslaudiopipeline.a --- GPUSDK/demos/gui/src/fslmusictilecard/Makefile 2011-05-05 16:06:35.310475915 -0400 +++ GPUSDK/demos/gui/src/fslmusictilecard/Makefile 2011-05-05 16:06:48.621725363 -0400 @@ -17,11 +17,9 @@ CFLAGS += -I$(PROJECTROOT)/include \ - -I$(FSL_PLATFORM_INC)/gstreamer-0.10 \ - -I$(FSL_PLATFORM_INC)/glib-2.0 \ - -I$(FSL_PLATFORM_LIB)/glib-2.0/include \ - -I$(FSL_PLATFORM_INC)/libxml2 \ -D_LINUX -DEGL_USE_X11 +CFLAGS += $(shell pkg-config gstreamer-0.10 --cflags) +CFLAGS += $(shell pkg-config glib-2.0 --cflags) OBJECTS = fslmusictilecard.o LIBNAME = libfslmusictilecard.a --- GPUSDK/demos/gui/src/fslvideorendercard/Makefile 2011-05-05 16:07:02.900475749 -0400 +++ GPUSDK/demos/gui/src/fslvideorendercard/Makefile 2011-05-05 16:07:18.134446673 -0400 @@ -17,11 +17,9 @@ CFLAGS += -I$(PROJECTROOT)/include \ - -I$(FSL_PLATFORM_INC)/gstreamer-0.10 \ - -I$(FSL_PLATFORM_INC)/glib-2.0 \ - -I$(FSL_PLATFORM_LIB)/glib-2.0/include \ - -I$(FSL_PLATFORM_INC)/libxml2 \ -D_LINUX -DEGL_USE_X11 +CFLAGS += $(shell pkg-config gstreamer-0.10 --cflags) +CFLAGS += $(shell pkg-config glib-2.0 --cflags) --- GPUSDK/buildall.sh 2011-05-06 13:56:12.700475643 -0400 +++ GPUSDK/buildall.sh 2011-05-06 13:54:31.351725080 -0400 @@ -1,4 +1,5 @@ #!/bin/bash +set -e cd utility