update win32 frozen builds

Also update cmake modules to handle more possible cases

2 files changed, 12 insertions, 13 deletions

diff --git a/win32/codeblock/gstopengl.cbp b/win32/codeblock/gstopengl.cbp
index 3f9e3c7..ae9c926 100644
--- a/win32/codeblock/gstopengl.cbp
+++ b/win32/codeblock/gstopengl.cbp
@@ -45,12 +45,12 @@
 			<Add option="-Wall" />
 			<Add option="-DWIN32" />
 			<Add option="-DHAVE_CONFIG_H" />
-			<Add directory="..\..\..\gstreamer\include" />
+			<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="..\..\..\zlib\include" />
-			<Add directory="..\..\..\png\include" />
+			<Add directory="C:\gstreamer\include" />
 			<Add directory="..\common" />
 			<Add directory="..\..\gst-libs" />
 			<Add directory="..\..\gst-libs\gst\gl" />
@@ -70,14 +70,13 @@
 			<Add library="glu32" />
 			<Add library="opengl32" />
 			<Add library="gdi32" />
-			<Add library="png" />
+			<Add library="png12" />
 			<Add library="z" />
 			<Add library="winmm" />
 			<Add directory="..\..\..\glib\lib" />
 			<Add directory="C:\gstreamer\bin" />
 			<Add directory="..\..\..\glew\bin" />
-			<Add directory="..\..\..\png\lib" />
-			<Add directory="..\..\..\zlib\lib" />
+			<Add directory="C:\gstreamer\lib" />
 		</Linker>
 		<Unit filename="..\..\gst-libs\gst\gettext.h" />
 		<Unit filename="..\..\gst-libs\gst\gl\gstglbuffer.c">
diff --git a/win32/vs9/libgstopengl.vcproj b/win32/vs9/libgstopengl.vcproj
index dacd8db..100d932 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;;..\..\..\gstreamer\include;..\..\..\glew\include;..\..\..\png\include;..\..\..\zlib\include;..\common;&quot;..\..\gst-libs\gst\gl&quot;;..\..\gst\gl;..\..\gst\gl\effects;&quot;..\..\gst-libs&quot;"
+				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;"
 				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="libgstreamer-0.10.lib libgstbase-0.10.lib libgstinterfaces-0.10.lib libgstvideo-0.10.lib glib-2.0.lib gmodule-2.0.lib gobject-2.0.lib gthread-2.0.lib libpngd.lib zlibd.lib opengl32.lib glu32.lib glew32.lib glew32s.lib winmm.lib"
+				AdditionalDependencies="gstreamer.lib gstbase.lib gstinterfaces.lib gstvideo.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"
 				LinkIncremental="2"
-				AdditionalLibraryDirectories="..\..\..\gstreamer\lib;..\..\..\glib\lib;..\..\..\glew\lib;..\..\..\png\lib;..\..\..\zlib\lib"
+				AdditionalLibraryDirectories="C:\gstreamer\lib;..\..\..\glib\lib;..\..\..\glew\lib"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
@@ -119,12 +119,12 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="&quot;..\..\..\glib\include\glib-2.0&quot;;&quot;..\..\..\glib\lib\glib-2.0\include&quot;;..\..\..\gstreamer\include;..\..\..\glew\include;..\..\..\png\include;..\..\..\zlib\include;..\common;&quot;..\..\gst-libs\gst\gl&quot;;..\..\gst\gl;..\..\gst\gl\effects;&quot;..\..\gst-libs&quot;"
+				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;"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBGSTGL_EXPORTS;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
+				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="3"
 			/>
 			<Tool
@@ -138,9 +138,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="libgstreamer-0.10.lib libgstbase-0.10.lib libgstinterfaces-0.10.lib libgstvideo-0.10.lib glib-2.0.lib gmodule-2.0.lib gobject-2.0.lib gthread-2.0.lib libpng.lib zlib.lib opengl32.lib glu32.lib glew32.lib glew32s.lib winmm.lib"
+				AdditionalDependencies="gstreamer.lib gstbase.lib gstinterfaces.lib gstvideo.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"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="..\..\..\gstreamer\lib;..\..\..\glib\lib;..\..\..\glew\lib;..\..\..\png\lib;..\..\..\zlib\lib"
+				AdditionalLibraryDirectories="C:\gstreamer\lib;..\..\..\glib\lib;..\..\..\glew\lib"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"