0027749: Configuration - drop remaining occurences of GLU dependency

diff --git a/adm/cmake/occt_csf.cmake b/adm/cmake/occt_csf.cmake
index 26eb8a536e8c2689fd58b8b7465fbb148de53196..c6d69f938b8c6c07e16ef400f6696eb1232682b4 100644 (file)
--- a/adm/cmake/occt_csf.cmake
+++ b/adm/cmake/occt_csf.cmake
@@ -36,7 +36,7 @@ if (WIN32)
   set (CSF_winspool      "Winspool.lib")
   set (CSF_psapi         "Psapi.lib")
   set (CSF_AviLibs       "ws2_32.lib vfw32.lib")
-  set (CSF_OpenGlLibs    "opengl32.lib glu32.lib")
+  set (CSF_OpenGlLibs    "opengl32.lib")
 
   if (USE_FREETYPE)
     set (CSF_FREETYPE "freetype.lib")
@@ -95,7 +95,7 @@ else()
     set (CSF_OpenGlLibs  "EGL GLESv2")
   elseif (UNIX)
     set (CSF_ThreadLibs  "pthread rt stdc++")
-    set (CSF_OpenGlLibs  "GLU GL")
+    set (CSF_OpenGlLibs  "GL")
     set (CSF_XwLibs      "X11 Xext Xmu Xi")
     set (CSF_dl          "dl")
 

diff --git a/adm/templates/template.vc7 b/adm/templates/template.vc7
index ff0e8ec1de3fac62bb7140f157b5f4811a69137e..cde2c13c4ddc08a8e97f6b5f1819559f4d3c4e32 100644 (file)
--- a/adm/templates/template.vc7
+++ b/adm/templates/template.vc7
@@ -36,7 +36,7 @@
                                Name="VCCustomBuildTool"/>
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="__TKDEP__ opengl32.lib glu32.lib ws2_32.lib vfw32.lib odbc32.lib odbccp32.lib"
+                               AdditionalDependencies="__TKDEP__ opengl32.lib ws2_32.lib vfw32.lib odbc32.lib odbccp32.lib"
                                OutputFile=".\..\..\..\win32\vc7\bin\__TKNAM__.dll"
                                LinkIncremental="1"
                                SuppressStartupBanner="TRUE"
@@ -105,7 +105,7 @@
                                Name="VCCustomBuildTool"/>
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="__TKDEP__ opengl32.lib glu32.lib ws2_32.lib vfw32.lib odbc32.lib odbccp32.lib"
+                               AdditionalDependencies="__TKDEP__ opengl32.lib ws2_32.lib vfw32.lib odbc32.lib odbccp32.lib"
                                OutputFile=".\..\..\..\win32\vc7\bind\__TKNAM__.dll"
                                LinkIncremental="1"
                                SuppressStartupBanner="TRUE"

diff --git a/adm/templates/template.vc8 b/adm/templates/template.vc8
index 13c0ae9a31c84cff621638ce68181ca828f2d545..448a5d23b23a5ab8436ba00fda19f2df61a75439 100644 (file)
--- a/adm/templates/template.vc8
+++ b/adm/templates/template.vc8
@@ -78,7 +78,7 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="__TKDEP__ opengl32.lib glu32.lib ws2_32.lib vfw32.lib odbc32.lib odbccp32.lib"
+                               AdditionalDependencies="__TKDEP__ opengl32.lib ws2_32.lib vfw32.lib odbc32.lib odbccp32.lib"
                                OutputFile=".\..\..\..\win32\vc8\bin\__TKNAM__.dll"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
@@ -178,7 +178,7 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="__TKDEP__ opengl32.lib glu32.lib ws2_32.lib vfw32.lib odbc32.lib odbccp32.lib"
+                               AdditionalDependencies="__TKDEP__ opengl32.lib ws2_32.lib vfw32.lib odbc32.lib odbccp32.lib"
                                OutputFile=".\..\..\..\win32\vc8\bind\__TKNAM__.dll"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
@@ -276,7 +276,7 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="__TKDEP__ opengl32.lib glu32.lib ws2_32.lib vfw32.lib odbc32.lib odbccp32.lib"
+                               AdditionalDependencies="__TKDEP__ opengl32.lib ws2_32.lib vfw32.lib odbc32.lib odbccp32.lib"
                                OutputFile=".\..\..\..\win64\vc8\bin\__TKNAM__.dll"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
@@ -376,7 +376,7 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="__TKDEP__ opengl32.lib glu32.lib ws2_32.lib vfw32.lib odbc32.lib odbccp32.lib"
+                               AdditionalDependencies="__TKDEP__ opengl32.lib ws2_32.lib vfw32.lib odbc32.lib odbccp32.lib"
                                OutputFile=".\..\..\..\win64\vc8\bind\__TKNAM__.dll"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"