[gst-cvs] gst-plugins-gl: qglwtextureshare example: make it compile with mingw

Julien Isorce cap at kemper.freedesktop.org
Mon Nov 16 16:22:22 PST 2009


Module: gst-plugins-gl
Branch: master
Commit: efb32f99526c82b05eab0b7e83b8d64355e66768
URL:    http://cgit.freedesktop.org/gstreamer/gst-plugins-gl/commit/?id=efb32f99526c82b05eab0b7e83b8d64355e66768

Author: Julien Isorce <julien.isorce at gmail.com>
Date:   Tue Nov 17 01:20:03 2009 +0100

qglwtextureshare example: make it compile with mingw

Note that at this point the shares example are
not working anymore (even on linux)
It seems that I did a recent change somewhere.
Will be resolved asap

---

 tests/examples/qt/qglwtextureshare/glcontextid.h   |    4 ++--
 .../qt/qglwtextureshare/qglwtextureshare.pro       |   12 +++++-------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/tests/examples/qt/qglwtextureshare/glcontextid.h b/tests/examples/qt/qglwtextureshare/glcontextid.h
index f9d986a..c8b4a3b 100755
--- a/tests/examples/qt/qglwtextureshare/glcontextid.h
+++ b/tests/examples/qt/qglwtextureshare/glcontextid.h
@@ -26,8 +26,8 @@
     #define WIN32_LEAN_AND_MEAN
     #include <windows.h>
     #include <Wingdi.h>
-    #include <glew.h>
-    #include <gl.h>
+    #include <GL/glew.h>
+    #include <GL/gl.h>
 #else
     #include <X11/Xlib.h>
     //#include <GL/glxew.h>
diff --git a/tests/examples/qt/qglwtextureshare/qglwtextureshare.pro b/tests/examples/qt/qglwtextureshare/qglwtextureshare.pro
index d88ce16..f93f852 100644
--- a/tests/examples/qt/qglwtextureshare/qglwtextureshare.pro
+++ b/tests/examples/qt/qglwtextureshare/qglwtextureshare.pro
@@ -9,22 +9,20 @@ DEFINES += UNICODE QT_THREAD_SUPPORT QT_CORE_LIB QT_GUI_LIB
 win32 {
 DEFINES += WIN32
 INCLUDEPATH += \
-    ./../../../../../libxml2/include \
+    C:/gstreamer/include/libxml2 \
     ./../../../../../libiconv/include \
     ./../../../../../glib/include/glib-2.0 \
     ./../../../../../glib/lib/glib-2.0/include \
-    ./../../../../../gstreamer/include \
     ./../../../../../glew/include \
-    ./../../../../../gstreamer \
-    ./../../../../../gst-plugins-base/gst-libs \
+    C:/gstreamer/include/gstreamer-0.10 \
     /usr/src/ossbuild/Shared/Build/Windows/Win32/include/glib-2.0 \
     /usr/src/ossbuild/Shared/Build/Windows/Win32/lib/glib-2.0/include \
     /usr/src/ossbuild/Build/Windows/Win32/Release/include/gstreamer-0.10 \
     /usr/src/ossbuild/Shared/Build/Windows/Win32/include/libxml2 \
     /usr/src/ossbuild/Shared/SDKs/MSVCRT/include/gl
-LIBS += \
-    -L"./../../../../../glib/lib" \
-    -L"./../../../../../gstreamer/lib" \
+LIBS += -L"./../../../../../glib/lib" \
+    -L"C:/gstreamer/lib" \
+    -L"C:/gstreamer/bin" \
     -L"./../../../../../glew/lib" \
     -L\usr\src\ossbuild\Build\Windows\Win32\Release\lib\gstreamer \
     -L\usr\src\ossbuild\Shared\Build\Windows\Win32\lib \





More information about the Gstreamer-commits mailing list