* removed more glew from cmake files.

compilation on Apple works, however there is a segfault which needs further investigation.

ACG/GL/gl.hh

@@ -70,10 +70,6 @@
 #elif defined(WIN32)
 
   #include <windows.h>
-  // Dont do this anymore! Use dll version. No problems with plugins and dll
-  // but a lot with static linking
-  // #  define GLEW_STATIC 1
-  #include <gl/glew.h>
   #include <gl/glut.h>
 
 #else

OpenFlipper/CoreApp/CMakeLists.txt

@@ -7,7 +7,6 @@ include_directories (
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_CURRENT_BINARY_DIR}
   ${OPENGL_INCLUDE_DIR}
-  ${GLEW_INCLUDE_DIR}
   ${GLUT_INCLUDE_DIR}
 )
 
@@ -28,14 +27,8 @@ if( APPLE )
   endforeach ()
 
   link_directories (
-    ${GLEW_LIBRARY_DIR}
     ${ADDITIONAL_PLUGINLIB_LINK_DIRS}
   )
-
-else (APPLE)
-   link_directories (
-      ${GLEW_LIBRARY_DIR}
-   )
 endif(APPLE)
 
 if (WIN32)
@@ -221,7 +214,6 @@ target_link_libraries (${OPENFLIPPER_PRODUCT_STRING}
   OpenFlipperPluginLib
   ${QT_LIBRARIES}
   ${OPENGL_LIBRARIES}
-  ${GLEW_LIBRARY}
   ${GLUT_LIBRARIES}
   ${COREAPP_ADDITIONAL_LINK_LIBRARIES}
   ${OPENFLIPPER_STATIC_PLUGINS}

OpenFlipper/OpenFlipper.cc

@@ -451,6 +451,7 @@ int main(int argc, char **argv)
     #ifndef __APPLE__
     initOpenGLFunctions();
     #endif
+    //std::cout<<QGLFormat::openGLVersionFlags();
 
     // After setting all Options from command line, build the real gui
     w->init();   

OpenFlipper/PluginLib/CMakeLists.txt

@@ -42,14 +42,12 @@ include_directories (
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_CURRENT_BINARY_DIR}
   ${OPENGL_INCLUDE_DIR}
-  ${GLEW_INCLUDE_DIR}
   ${GLUT_INCLUDE_DIR}
   ${ADDITIONAL_PLUGINLIB_INCS}
   ${PACKAGE_INCLUDES}
 )
 
 link_directories (
-  ${GLEW_LIBRARY_DIR}
   ${ADDITIONAL_PLUGINLIB_LINK_DIRS}
 )
 
@@ -176,7 +174,6 @@ target_link_libraries (OpenFlipperPluginLib
   ACG
   ${QT_LIBRARIES}
   ${OPENGL_LIBRARIES}
-  ${GLEW_LIBRARY}
   ${GLUT_LIBRARIES}
   ${FTGL_LIBS}
   ${ADDITIONAL_PLUGINLIB_LIBS}

OpenFlipper/cmake/plugin.cmake

@@ -26,7 +26,6 @@
 # INCDIRS         = additional include directories
 # ADDSRC          = additional source files
 # INSTALLDATA     = directories that will be installed into the openflipper data directory
-# GLEWDEFINITIONS = Checks glew if it defines the given definitions
 #
 # TRANSLATION_LANGUAGES = language codes for translation
 # TRANSLATION_ADDFILES  = additional files that should be included into the translation files
@@ -68,7 +67,7 @@ endmacro ()
 # parse plugin macro parameter
 macro (_get_plugin_parameters _prefix)
     set (_current_var _foo)
-    set (_supported_var DIRS DEPS OPTDEPS LDFLAGSADD CFLAGSADD CDEFINITIONSADD LIBRARIES LIBDIRS INCDIRS ADDSRC INSTALLDATA GLEWDEFINITIONS TRANSLATION_LANGUAGES TRANSLATION_ADDFILES)
+    set (_supported_var DIRS DEPS OPTDEPS LDFLAGSADD CFLAGSADD CDEFINITIONSADD LIBRARIES LIBDIRS INCDIRS ADDSRC INSTALLDATA TRANSLATION_LANGUAGES TRANSLATION_ADDFILES)
     set (_supported_flags LICENSEMANAGER)
     foreach (_val ${_supported_var})
         set (${_prefix}_${_val})
@@ -371,26 +370,6 @@ macro (_plugin_licensemanagement)
   endif()
 endmacro ()
 
-#======================================================
-# check dependencies in GLEW library
-# _prefix    : prefix used ( usually the plugin name )
-#======================================================
-macro (_check_plugin_glew_deps _prefix )
-
- foreach (_extension ${${_prefix}_GLEWDEFINITIONS})
-
-   acg_test_glew_definition( ${_extension} ${_prefix}_GLEW_HAS_DEFINITION_${_extension}  )
-
-   # If the dependency is not found, we disable the plugin
-   if(NOT ${_prefix}_GLEW_HAS_DEFINITION_${_extension} )
-      set (${_prefix}_HAS_DEPS FALSE)
-      acg_set (_${_prefix}_MISSING_DEPS "${_${_prefix}_MISSING_DEPS} GLEW extension ${_extension}")
-   endif()
-
- endforeach()
-
-endmacro ()
-
 
 
 #======================================================
@@ -421,12 +400,6 @@ function (_build_openflipper_plugin plugin)
   acg_unset (_${_PLUGIN}_MISSING_DEPS)
   set (${_PLUGIN}_HAS_DEPS)
   _check_plugin_deps (${_PLUGIN} FALSE ${${_PLUGIN}_DEPS})
-
-  #============================================================================================
-  # CHECK for GLEW definitions
-  #============================================================================================
-
-  _check_plugin_glew_deps (${_PLUGIN})
   
 
   #============================================================================================
@@ -472,7 +445,6 @@ function (_build_openflipper_plugin plugin)
       ${${_PLUGIN}_DEPS_INCDIRS}
       ${${_PLUGIN}_INCDIRS}
       ${OPENGL_INCLUDE_DIR}
-      ${GLEW_INCLUDE_DIR}
       ${GLUT_INCLUDE_DIR}
       ${CMAKE_BINARY_DIR}/OpenFlipper/PluginLib
       ${PACKAGE_INCLUDES}

OpenFlipper/common/glew_wrappers.cc

@@ -54,7 +54,6 @@
 #include <string>
 
 DLLEXPORT void initOpenGLFunctions() {
-
   int error = ogl_LoadFunctions();
     if(error != ogl_LOAD_SUCCEEDED)
     {
@@ -65,6 +64,6 @@ DLLEXPORT void initOpenGLFunctions() {
 
 DLLEXPORT const char * getOpenGLVersion() {
     std::string version;
-    version = ogl_GetMajorVersion()+"."+ogl_GetMinorVersion();
+    version = std::to_string( ogl_GetMajorVersion())+"."+std::to_string(ogl_GetMinorVersion());
     return version.c_str() ;
 }

OpenFlipper/widgets/coreWidget/About.cc

@@ -592,12 +592,12 @@ void CoreWidget::showAboutWidget( ) {
   #ifndef __APPLE__
   aboutWidget_->OpenFlipperAbout->append("\n");
   aboutWidget_->OpenFlipperAbout->setCurrentFont(boldFont);
-  aboutWidget_->OpenFlipperAbout->append(tr("GLEW Specific Info:"));
+  aboutWidget_->OpenFlipperAbout->append(tr("OpenGL Specific Info:"));
   aboutWidget_->OpenFlipperAbout->setCurrentFont(standardFont);
   
   //TODO: rename this we are not using glew anymore
   QString glewVersion = QString(getOpenGLVersion());
-  aboutWidget_->OpenFlipperAbout->append(tr("GLEW Version:\t") + glewVersion);
+  aboutWidget_->OpenFlipperAbout->append(tr("OpenGL Version:\t") + glewVersion);
   #endif
   
   // =====================================================================================

cmake/ACGCommon.cmake

@@ -965,25 +965,3 @@ function (generate_qhp_file files_loc plugin_name)
     endforeach()
 endfunction()
 
-function(acg_test_glew_definition _def _out)
-  include(CheckCXXSourceRuns)
-  set(CMAKE_REQUIRED_INCLUDES ${GLEW_INCLUDE_DIRS})
-  set(CMAKE_REQUIRED_LIBRARIES ${GLEW_LIBRARIES})
-  set(CMAKE_REQUIRED_DEFINITIONS -DCHECKING=${_def})
-  if(GLEW_FOUND)
-    if(NOT ${_out})
-      unset(${_out} CACHE) #clear cache, if previous test failed and try again
-    endif()
-    CHECK_CXX_SOURCE_RUNS("
-      #include <GL/glew.h>
-      int main()
-      {
-      #ifdef ${_def}
-      return 0;
-      #else
-      return 1;
-      #endif
-      }"
-      ${_out})
-  endif()
-endfunction()