summaryrefslogtreecommitdiff
path: root/win32
diff options
context:
space:
mode:
authorJulien Isorce <julien.isorce@gmail.com>2010-03-07 12:57:10 +0100
committerJulien Isorce <julien.isorce@gmail.com>2010-03-07 12:57:10 +0100
commit3d5ba149ee8c290bf9995cd2f6826b0ff2920adf (patch)
tree81caefd8f11b75a9d27b88fe1146a3ec1447fe95 /win32
parent5b786a6a47fac32a430c82ebc042b852b8d3acc7 (diff)
vs9/codeblocks: build against gstreamer winbuilds
Diffstat (limited to 'win32')
-rw-r--r--win32/codeblock/gstopengl.cbp7
-rw-r--r--win32/vs9/libgstopengl.vcproj12
2 files changed, 8 insertions, 11 deletions
diff --git a/win32/codeblock/gstopengl.cbp b/win32/codeblock/gstopengl.cbp
index 50f445b..1b54a0f 100644
--- a/win32/codeblock/gstopengl.cbp
+++ b/win32/codeblock/gstopengl.cbp
@@ -47,9 +47,8 @@
<Add option="-DHAVE_CONFIG_H" />
<Add directory="C:\gstreamer\include\gstreamer-0.10" />
<Add directory="C:\gstreamer\include\libxml2" />
- <Add directory="..\..\..\glib\include\glib-2.0" />
- <Add directory="..\..\..\glib\lib\glib-2.0\include" />
- <Add directory="..\..\..\glew\include" />
+ <Add directory="C:\gstreamer\include\glib-2.0" />
+ <Add directory="C:\gstreamer\lib\glib-2.0\include" />
<Add directory="C:\gstreamer\include" />
<Add directory="..\common" />
<Add directory="..\..\gst-libs" />
@@ -74,9 +73,7 @@
<Add library="png12" />
<Add library="z" />
<Add library="winmm" />
- <Add directory="..\..\..\glib\lib" />
<Add directory="C:\gstreamer\bin" />
- <Add directory="..\..\..\glew\bin" />
<Add directory="C:\gstreamer\lib" />
</Linker>
<Unit filename="..\..\gst-libs\gst\gettext.h" />
diff --git a/win32/vs9/libgstopengl.vcproj b/win32/vs9/libgstopengl.vcproj
index a285a49..7b4f3e1 100644
--- a/win32/vs9/libgstopengl.vcproj
+++ b/win32/vs9/libgstopengl.vcproj
@@ -41,7 +41,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="&quot;..\..\..\glib\include\glib-2.0&quot;;&quot;..\..\..\glib\lib\glib-2.0\include&quot;;C:\gstreamer\include\libxml2;&quot;C:\gstreamer\include\gstreamer-0.10&quot;;..\..\..\glew\include;C:\gstreamer\include;..\common;&quot;..\..\gst-libs\gst\gl&quot;;..\..\gst\gl;..\..\gst\gl\effects;&quot;..\..\gst-libs&quot;"
+ AdditionalIncludeDirectories="&quot;C:\gstreamer\include\glib-2.0&quot;;&quot;C:\gstreamer\lib\glib-2.0\include&quot;;C:\gstreamer\include\libxml2;&quot;C:\gstreamer\include\gstreamer-0.10&quot;;C:\gstreamer\include;..\common;&quot;..\..\gst-libs\gst\gl&quot;;..\..\gst\gl;..\..\gst\gl\effects;&quot;..\..\gst-libs&quot;"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBGSTGL_EXPORTS;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -62,9 +62,9 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="gstreamer.lib gstbase.lib gstinterfaces.lib gstvideo.lib gstcontroller.lib glib-2.0.lib gmodule-2.0.lib gobject-2.0.lib gthread-2.0.lib png12.lib z.lib opengl32.lib glu32.lib glew32.lib glew32s.lib winmm.lib"
+ AdditionalDependencies="gstreamer-0.10.lib gstbase-0.10.lib gstinterfaces-0.10.lib gstvideo-0.10.lib gstcontroller-0.10.lib glib-2.0.lib gmodule-2.0.lib gobject-2.0.lib gthread-2.0.lib png12.lib z.lib opengl32.lib glu32.lib glew32.lib winmm.lib"
LinkIncremental="2"
- AdditionalLibraryDirectories="C:\gstreamer\lib;..\..\..\glib\lib;..\..\..\glew\lib"
+ AdditionalLibraryDirectories="C:\gstreamer\lib"
GenerateDebugInformation="true"
SubSystem="2"
RandomizedBaseAddress="1"
@@ -119,7 +119,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="&quot;..\..\..\glib\include\glib-2.0&quot;;&quot;..\..\..\glib\lib\glib-2.0\include&quot;;C:\gstreamer\include\libxml2;&quot;C:\gstreamer\include\gstreamer-0.10&quot;;..\..\..\glew\include;C:\gstreamer\include;..\common;&quot;..\..\gst-libs\gst\gl&quot;;..\..\gst\gl;..\..\gst\gl\effects;&quot;..\..\gst-libs&quot;"
+ AdditionalIncludeDirectories="&quot;C:\gstreamer\include\glib-2.0&quot;;&quot;C:\gstreamer\lib\glib-2.0\include&quot;;C:\gstreamer\include\libxml2;&quot;C:\gstreamer\include\gstreamer-0.10&quot;;C:\gstreamer\include;..\common;&quot;..\..\gst-libs\gst\gl&quot;;..\..\gst\gl;..\..\gst\gl\effects;&quot;..\..\gst-libs&quot;"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBGSTGL_EXPORTS;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
@@ -138,9 +138,9 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="gstreamer.lib gstbase.lib gstinterfaces.lib gstvideo.lib gstcontroller.lib glib-2.0.lib gmodule-2.0.lib gobject-2.0.lib gthread-2.0.lib png12.lib z.lib opengl32.lib glu32.lib glew32.lib glew32s.lib winmm.lib"
+ AdditionalDependencies="gstreamer-0.10.lib gstbase-0.10.lib gstinterfaces-0.10.lib gstvideo-0.10.lib gstcontroller-0.10.lib glib-2.0.lib gmodule-2.0.lib gobject-2.0.lib gthread-2.0.lib png12.lib z.lib opengl32.lib glu32.lib glew32.lib winmm.lib"
LinkIncremental="1"
- AdditionalLibraryDirectories="C:\gstreamer\lib;..\..\..\glib\lib;..\..\..\glew\lib"
+ AdditionalLibraryDirectories="C:\gstreamer\lib"
GenerateDebugInformation="true"
SubSystem="2"
OptimizeReferences="2"