update win32 frozen builds

Also update cmake modules to handle more possible cases

4 files changed, 30 insertions, 31 deletions

diff --git a/cmake/modules/FindGstreamer.cmake b/cmake/modules/FindGstreamer.cmake
index 5638b67..d60fb68 100644
--- a/cmake/modules/FindGstreamer.cmake
+++ b/cmake/modules/FindGstreamer.cmake
@@ -3,86 +3,86 @@ FILE(TO_CMAKE_PATH "${GSTREAMER_DIR}" TRY2_DIR)
 FILE(GLOB GSTREAMER_DIR ${TRY1_DIR} ${TRY2_DIR})
 
 FIND_PATH(GSTREAMER_gst_INCLUDE_DIR gst/gst.h
-                                    PATHS ${GSTREAMER_DIR}/include /usr/local/include/gstreamer-0.10 /usr/include/gstreamer-0.10
+                                    PATHS ${GSTREAMER_DIR}/include ${GSTREAMER_DIR}/include/gstreamer-0.10 /usr/local/include/gstreamer-0.10 /usr/include/gstreamer-0.10
                                     ENV INCLUDE DOC "Directory containing gst/gst.h include file")
 
 FIND_PATH(GSTREAMER_gstconfig_INCLUDE_DIR gst/gstconfig.h
-                                          PATHS ${GSTREAMER_DIR}/include ${GSTREAMER_DIR}/lib/include /usr/local/include/gstreamer-0.10 /usr/include/gstreamer-0.10 /usr/local/lib/include/gstreamer-0.10 /usr/lib/include/gstreamer-0.10
+                                          PATHS ${GSTREAMER_DIR}/include ${GSTREAMER_DIR}/lib/include ${GSTREAMER_DIR}/include/gstreamer-0.10 /usr/local/include/gstreamer-0.10 /usr/include/gstreamer-0.10 /usr/local/lib/include/gstreamer-0.10 /usr/lib/include/gstreamer-0.10
                                           ENV INCLUDE DOC "Directory containing gst/gstconfig.h include file")
 
-FIND_LIBRARY(GSTREAMER_gstaudio_LIBRARY NAMES gstaudio-0.10 libgstaudio-0.10
+FIND_LIBRARY(GSTREAMER_gstaudio_LIBRARY NAMES gstaudio-0.10 libgstaudio-0.10 gstaudio
                                         PATHS ${GSTREAMER_DIR}/bin ${GSTREAMER_DIR}/win32/bin ${GSTREAMER_DIR}/bin/bin C:/gstreamer/bin ${GSTREAMER_DIR}/lib ${GSTREAMER_DIR}/win32/lib /usr/local/lib /usr/lib
                                         ENV LIB
                                         DOC "gstaudio library to link with"
                                         NO_SYSTEM_ENVIRONMENT_PATH)
 
-FIND_LIBRARY(GSTREAMER_gstbase_LIBRARY NAMES gstbase-0.10 libgstbase-0.10
+FIND_LIBRARY(GSTREAMER_gstbase_LIBRARY NAMES gstbase-0.10 libgstbase-0.10 gstbase
                                        PATHS ${GSTREAMER_DIR}/bin ${GSTREAMER_DIR}/win32/bin ${GSTREAMER_DIR}/bin/bin C:/gstreamer/bin ${GSTREAMER_DIR}/lib ${GSTREAMER_DIR}/win32/lib /usr/local/lib /usr/lib
                                        ENV LIB
                                        DOC "gstbase library to link with"
                                        NO_SYSTEM_ENVIRONMENT_PATH)
 
-FIND_LIBRARY(GLIB_gstcdda_LIBRARY NAMES gstcdda-0.10 libgstcdda-0.10
+FIND_LIBRARY(GLIB_gstcdda_LIBRARY NAMES gstcdda-0.10 libgstcdda-0.10 gstcdda
                                   PATHS ${GSTREAMER_DIR}/bin ${GSTREAMER_DIR}/win32/bin ${GSTREAMER_DIR}/bin/bin C:/gstreamer/bin ${GSTREAMER_DIR}/lib ${GSTREAMER_DIR}/win32/lib /usr/local/lib /usr/lib
                                   ENV LIB
                                   DOC "gstcdda library to link with"
                                   NO_SYSTEM_ENVIRONMENT_PATH)
 
-FIND_LIBRARY(GSTREAMER_gstcontroller_LIBRARY NAMES gstcontroller-0.10 libgstcontroller-0.10
+FIND_LIBRARY(GSTREAMER_gstcontroller_LIBRARY NAMES gstcontroller-0.10 libgstcontroller-0.10 gstcontroller
                                              PATHS ${GSTREAMER_DIR}/bin ${GSTREAMER_DIR}/win32/bin ${GSTREAMER_DIR}/bin/bin C:/gstreamer/bin ${GSTREAMER_DIR}/lib ${GSTREAMER_DIR}/win32/lib /usr/local/lib /usr/lib
                                              ENV LIB
                                              DOC "gstcontroller library to link with"
                                              NO_SYSTEM_ENVIRONMENT_PATH)
 
-FIND_LIBRARY(GSTREAMER_gstdataprotocol_LIBRARY NAMES gstdataprotocol-0.10 libgstdataprotocol-0.10
+FIND_LIBRARY(GSTREAMER_gstdataprotocol_LIBRARY NAMES gstdataprotocol-0.10 libgstdataprotocol-0.10 gstdataprotocol
                                                PATHS ${GSTREAMER_DIR}/bin ${GSTREAMER_DIR}/win32/bin ${GSTREAMER_DIR}/bin/bin C:/gstreamer/bin ${GSTREAMER_DIR}/lib ${GSTREAMER_DIR}/win32/lib /usr/local/lib /usr/lib
                                                ENV LIB
                                                DOC "gstdataprotocol library to link with"
                                                NO_SYSTEM_ENVIRONMENT_PATH)
 
-FIND_LIBRARY(GSTREAMER_gstinterfaces_LIBRARY NAMES gstinterfaces-0.10 libgstinterfaces-0.10
+FIND_LIBRARY(GSTREAMER_gstinterfaces_LIBRARY NAMES gstinterfaces-0.10 libgstinterfaces-0.10 gstinterfaces
                                              PATHS ${GSTREAMER_DIR}/bin ${GSTREAMER_DIR}/win32/bin ${GSTREAMER_DIR}/bin/bin C:/gstreamer/bin ${GSTREAMER_DIR}/lib ${GSTREAMER_DIR}/win32/lib /usr/local/lib /usr/lib
                                              ENV LIB
                                              DOC "gstinterfaces library to link with"
                                              NO_SYSTEM_ENVIRONMENT_PATH)
 
-FIND_LIBRARY(GSTREAMER_gstnet_LIBRARY NAMES gstnet-0.10 libgstnet-0.10
+FIND_LIBRARY(GSTREAMER_gstnet_LIBRARY NAMES gstnet-0.10 libgstnet-0.10 gstnet
                                       PATHS ${GSTREAMER_DIR}/bin ${GSTREAMER_DIR}/win32/bin ${GSTREAMER_DIR}/bin/bin C:/gstreamer/bin ${GSTREAMER_DIR}/lib ${GSTREAMER_DIR}/win32/lib /usr/local/lib /usr/lib
                                       ENV LIB
                                       DOC "gstnet library to link with"
                                       NO_SYSTEM_ENVIRONMENT_PATH)
 
-FIND_LIBRARY(GSTREAMER_gstnetbuffer_LIBRARY NAMES gstnetbuffer-0.10 libgstnetbuffer-0.10
+FIND_LIBRARY(GSTREAMER_gstnetbuffer_LIBRARY NAMES gstnetbuffer-0.10 libgstnetbuffer-0.10 gstnetbuffer
                                             PATHS ${GSTREAMER_DIR}/bin ${GSTREAMER_DIR}/win32/bin ${GSTREAMER_DIR}/bin/bin C:/gstreamer/bin ${GSTREAMER_DIR}/lib ${GSTREAMER_DIR}/win32/lib /usr/local/lib /usr/lib
                                             ENV LIB
                                             DOC "gstnetbuffer library to link with"
                                             NO_SYSTEM_ENVIRONMENT_PATH)
 
-FIND_LIBRARY(GSTREAMER_gstpbutils_LIBRARY NAMES gstpbutils-0.10 libgstpbutils-0.10
+FIND_LIBRARY(GSTREAMER_gstpbutils_LIBRARY NAMES gstpbutils-0.10 libgstpbutils-0.10 gstpbutils
                                           PATHS ${GSTREAMER_DIR}/bin ${GSTREAMER_DIR}/win32/bin ${GSTREAMER_DIR}/bin/bin C:/gstreamer/bin ${GSTREAMER_DIR}/lib ${GSTREAMER_DIR}/win32/lib /usr/local/lib /usr/lib
                                           ENV LIB
                                           DOC "gstpbutils library to link with"
                                           NO_SYSTEM_ENVIRONMENT_PATH)
 
-FIND_LIBRARY(GSTREAMER_gstreamer_LIBRARY NAMES gstreamer-0.10 libgstreamer-0.10
+FIND_LIBRARY(GSTREAMER_gstreamer_LIBRARY NAMES gstreamer-0.10 libgstreamer-0.10 gstreamer
                                          PATHS ${GSTREAMER_DIR}/bin ${GSTREAMER_DIR}/win32/bin ${GSTREAMER_DIR}/bin/bin C:/gstreamer/bin ${GSTREAMER_DIR}/lib ${GSTREAMER_DIR}/win32/lib /usr/local/lib /usr/lib
                                          ENV LIB
                                          DOC "gstreamer library to link with"
                                          NO_SYSTEM_ENVIRONMENT_PATH)
 
-FIND_LIBRARY(GSTREAMER_gstriff_LIBRARY NAMES gstriff-0.10 libgstriff-0.10
+FIND_LIBRARY(GSTREAMER_gstriff_LIBRARY NAMES gstriff-0.10 libgstriff-0.10 gstriff
                                              PATHS ${GSTREAMER_DIR}/bin ${GSTREAMER_DIR}/win32/bin ${GSTREAMER_DIR}/bin/bin C:/gstreamer/bin ${GSTREAMER_DIR}/lib ${GSTREAMER_DIR}/win32/lib /usr/local/lib /usr/lib
                                              ENV LIB
                                              DOC "gstriff library to link with"
                                              NO_SYSTEM_ENVIRONMENT_PATH)
 
-FIND_LIBRARY(GSTREAMER_gstrtp_LIBRARY NAMES gstrtp-0.10 libgstrtp-0.10
+FIND_LIBRARY(GSTREAMER_gstrtp_LIBRARY NAMES gstrtp-0.10 libgstrtp-0.10 gstrtp
                                     PATHS ${GSTREAMER_DIR}/bin ${GSTREAMER_DIR}/win32/bin ${GSTREAMER_DIR}/bin/bin C:/gstreamer/bin ${GSTREAMER_DIR}/lib ${GSTREAMER_DIR}/win32/lib /usr/local/lib /usr/lib
                                     ENV LIB
                                     DOC "gstrtp library to link with"
                                     NO_SYSTEM_ENVIRONMENT_PATH)
 
-FIND_LIBRARY(GSTREAMER_gstrtsp_LIBRARY NAMES gstrtsp-0.10 libgstrtsp-0.10
+FIND_LIBRARY(GSTREAMER_gstrtsp_LIBRARY NAMES gstrtsp-0.10 libgstrtsp-0.10 gstrtsp
                                        PATHS ${GSTREAMER_DIR}/bin ${GSTREAMER_DIR}/win32/bin ${GSTREAMER_DIR}/bin/bin C:/gstreamer/bin ${GSTREAMER_DIR}/lib ${GSTREAMER_DIR}/win32/lib /usr/local/lib /usr/lib
                                        ENV LIB
                                        DOC "gstrtsp library to link with"
@@ -94,13 +94,13 @@ FIND_LIBRARY(GSTREAMER_gstsdp_LIBRARY NAMES gstsdp-0.10 libgstsdp-0.10
                                       DOC "gstsdp library to link with"
                                       NO_SYSTEM_ENVIRONMENT_PATH)
 
-FIND_LIBRARY(GSTREAMER_gsttag_LIBRARY NAMES gsttag-0.10 libgsttag-0.10
+FIND_LIBRARY(GSTREAMER_gsttag_LIBRARY NAMES gsttag-0.10 libgsttag-0.10 gsttag
                                  PATHS ${GSTREAMER_DIR}/bin ${GSTREAMER_DIR}/win32/bin ${GSTREAMER_DIR}/bin/bin C:/gstreamer/bin ${GSTREAMER_DIR}/lib ${GSTREAMER_DIR}/win32/lib /usr/local/lib /usr/lib
                                  ENV LIB
                                  DOC "gsttag library to link with"
                                  NO_SYSTEM_ENVIRONMENT_PATH)
 
-FIND_LIBRARY(GSTREAMER_gstvideo_LIBRARY NAMES gstvideo-0.10 libgstvideo-0.10
+FIND_LIBRARY(GSTREAMER_gstvideo_LIBRARY NAMES gstvideo-0.10 libgstvideo-0.10 gstvideo
                                         PATHS ${GSTREAMER_DIR}/bin ${GSTREAMER_DIR}/win32/bin ${GSTREAMER_DIR}/bin/bin C:/gstreamer/bin ${GSTREAMER_DIR}/lib ${GSTREAMER_DIR}/win32/lib /usr/local/lib /usr/lib
                                         ENV LIB
                                         DOC "gstvideo library to link with"
diff --git a/cmake/modules/FindLibXml2.cmake b/cmake/modules/FindLibXml2.cmake
index 344e474..399f5a2 100644
--- a/cmake/modules/FindLibXml2.cmake
+++ b/cmake/modules/FindLibXml2.cmake
@@ -3,7 +3,7 @@ FILE(TO_CMAKE_PATH "${LIBXML2_DIR}" TRY2_DIR)
 FILE(GLOB LIBXML2_DIR ${TRY1_DIR} ${TRY2_DIR})
 
 FIND_PATH(LIBXML2_INCLUDE_DIR libxml/parser.h
-                              PATHS ${LIBXML2_DIR}/include /usr/local/include/libxml2 /usr/include/libxml2
+                              PATHS ${LIBXML2_DIR}/include ${LIBXML2_DIR}/include/libxml2 /usr/local/include/libxml2 /usr/include/libxml2
                               ENV INCLUDE DOC "Directory containing libxml/parser.h include file")
 
 IF (LIBXML2_INCLUDE_DIR)
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"