0027749: Configuration - drop remaining occurences of GLU dependency
authorkgv <kgv@opencascade.com>
Wed, 3 Aug 2016 09:53:30 +0000 (12:53 +0300)
committerbugmaster <bugmaster@opencascade.com>
Thu, 4 Aug 2016 13:54:56 +0000 (16:54 +0300)
adm/cmake/occt_csf.cmake
adm/templates/template.vc7
adm/templates/template.vc8

index 26eb8a5..c6d69f9 100644 (file)
@@ -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")
 
index ff0e8ec..cde2c13 100644 (file)
@@ -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"
                                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"
index 13c0ae9..448a5d2 100644 (file)
@@ -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"
                        />
                        <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"
                        />
                        <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"
                        />
                        <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"