Commit de595142 authored by Martin Schultz's avatar Martin Schultz

* removed more glew from cmake files.

compilation on Apple works, however there is a segfault which needs further investigation.
parent bae41ac3
...@@ -7,7 +7,6 @@ include_directories ( ...@@ -7,7 +7,6 @@ include_directories (
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
${OPENGL_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR}
${GLEW_INCLUDE_DIR}
${GLUT_INCLUDE_DIR} ${GLUT_INCLUDE_DIR}
) )
...@@ -28,14 +27,8 @@ if( APPLE ) ...@@ -28,14 +27,8 @@ if( APPLE )
endforeach () endforeach ()
link_directories ( link_directories (
${GLEW_LIBRARY_DIR}
${ADDITIONAL_PLUGINLIB_LINK_DIRS} ${ADDITIONAL_PLUGINLIB_LINK_DIRS}
) )
else (APPLE)
link_directories (
${GLEW_LIBRARY_DIR}
)
endif(APPLE) endif(APPLE)
if (WIN32) if (WIN32)
...@@ -221,7 +214,6 @@ target_link_libraries (${OPENFLIPPER_PRODUCT_STRING} ...@@ -221,7 +214,6 @@ target_link_libraries (${OPENFLIPPER_PRODUCT_STRING}
OpenFlipperPluginLib OpenFlipperPluginLib
${QT_LIBRARIES} ${QT_LIBRARIES}
${OPENGL_LIBRARIES} ${OPENGL_LIBRARIES}
${GLEW_LIBRARY}
${GLUT_LIBRARIES} ${GLUT_LIBRARIES}
${COREAPP_ADDITIONAL_LINK_LIBRARIES} ${COREAPP_ADDITIONAL_LINK_LIBRARIES}
${OPENFLIPPER_STATIC_PLUGINS} ${OPENFLIPPER_STATIC_PLUGINS}
......
...@@ -451,6 +451,7 @@ int main(int argc, char **argv) ...@@ -451,6 +451,7 @@ int main(int argc, char **argv)
#ifndef __APPLE__ #ifndef __APPLE__
initOpenGLFunctions(); initOpenGLFunctions();
#endif #endif
//std::cout<<QGLFormat::openGLVersionFlags();
// After setting all Options from command line, build the real gui // After setting all Options from command line, build the real gui
w->init(); w->init();
......
...@@ -42,14 +42,12 @@ include_directories ( ...@@ -42,14 +42,12 @@ include_directories (
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
${OPENGL_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR}
${GLEW_INCLUDE_DIR}
${GLUT_INCLUDE_DIR} ${GLUT_INCLUDE_DIR}
${ADDITIONAL_PLUGINLIB_INCS} ${ADDITIONAL_PLUGINLIB_INCS}
${PACKAGE_INCLUDES} ${PACKAGE_INCLUDES}
) )
link_directories ( link_directories (
${GLEW_LIBRARY_DIR}
${ADDITIONAL_PLUGINLIB_LINK_DIRS} ${ADDITIONAL_PLUGINLIB_LINK_DIRS}
) )
...@@ -176,7 +174,6 @@ target_link_libraries (OpenFlipperPluginLib ...@@ -176,7 +174,6 @@ target_link_libraries (OpenFlipperPluginLib
ACG ACG
${QT_LIBRARIES} ${QT_LIBRARIES}
${OPENGL_LIBRARIES} ${OPENGL_LIBRARIES}
${GLEW_LIBRARY}
${GLUT_LIBRARIES} ${GLUT_LIBRARIES}
${FTGL_LIBS} ${FTGL_LIBS}
${ADDITIONAL_PLUGINLIB_LIBS} ${ADDITIONAL_PLUGINLIB_LIBS}
......
...@@ -26,7 +26,6 @@ ...@@ -26,7 +26,6 @@
# INCDIRS = additional include directories # INCDIRS = additional include directories
# ADDSRC = additional source files # ADDSRC = additional source files
# INSTALLDATA = directories that will be installed into the openflipper data directory # 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_LANGUAGES = language codes for translation
# TRANSLATION_ADDFILES = additional files that should be included into the translation files # TRANSLATION_ADDFILES = additional files that should be included into the translation files
...@@ -68,7 +67,7 @@ endmacro () ...@@ -68,7 +67,7 @@ endmacro ()
# parse plugin macro parameter # parse plugin macro parameter
macro (_get_plugin_parameters _prefix) macro (_get_plugin_parameters _prefix)
set (_current_var _foo) 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) set (_supported_flags LICENSEMANAGER)
foreach (_val ${_supported_var}) foreach (_val ${_supported_var})
set (${_prefix}_${_val}) set (${_prefix}_${_val})
...@@ -371,26 +370,6 @@ macro (_plugin_licensemanagement) ...@@ -371,26 +370,6 @@ macro (_plugin_licensemanagement)
endif() endif()
endmacro () 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) ...@@ -421,12 +400,6 @@ function (_build_openflipper_plugin plugin)
acg_unset (_${_PLUGIN}_MISSING_DEPS) acg_unset (_${_PLUGIN}_MISSING_DEPS)
set (${_PLUGIN}_HAS_DEPS) set (${_PLUGIN}_HAS_DEPS)
_check_plugin_deps (${_PLUGIN} FALSE ${${_PLUGIN}_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) ...@@ -472,7 +445,6 @@ function (_build_openflipper_plugin plugin)
${${_PLUGIN}_DEPS_INCDIRS} ${${_PLUGIN}_DEPS_INCDIRS}
${${_PLUGIN}_INCDIRS} ${${_PLUGIN}_INCDIRS}
${OPENGL_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR}
${GLEW_INCLUDE_DIR}
${GLUT_INCLUDE_DIR} ${GLUT_INCLUDE_DIR}
${CMAKE_BINARY_DIR}/OpenFlipper/PluginLib ${CMAKE_BINARY_DIR}/OpenFlipper/PluginLib
${PACKAGE_INCLUDES} ${PACKAGE_INCLUDES}
......
...@@ -54,7 +54,6 @@ ...@@ -54,7 +54,6 @@
#include <string> #include <string>
DLLEXPORT void initOpenGLFunctions() { DLLEXPORT void initOpenGLFunctions() {
int error = ogl_LoadFunctions(); int error = ogl_LoadFunctions();
if(error != ogl_LOAD_SUCCEEDED) if(error != ogl_LOAD_SUCCEEDED)
{ {
...@@ -65,6 +64,6 @@ DLLEXPORT void initOpenGLFunctions() { ...@@ -65,6 +64,6 @@ DLLEXPORT void initOpenGLFunctions() {
DLLEXPORT const char * getOpenGLVersion() { DLLEXPORT const char * getOpenGLVersion() {
std::string version; std::string version;
version = ogl_GetMajorVersion()+"."+ogl_GetMinorVersion(); version = std::to_string( ogl_GetMajorVersion())+"."+std::to_string(ogl_GetMinorVersion());
return version.c_str() ; return version.c_str() ;
} }
...@@ -592,12 +592,12 @@ void CoreWidget::showAboutWidget( ) { ...@@ -592,12 +592,12 @@ void CoreWidget::showAboutWidget( ) {
#ifndef __APPLE__ #ifndef __APPLE__
aboutWidget_->OpenFlipperAbout->append("\n"); aboutWidget_->OpenFlipperAbout->append("\n");
aboutWidget_->OpenFlipperAbout->setCurrentFont(boldFont); aboutWidget_->OpenFlipperAbout->setCurrentFont(boldFont);
aboutWidget_->OpenFlipperAbout->append(tr("GLEW Specific Info:")); aboutWidget_->OpenFlipperAbout->append(tr("OpenGL Specific Info:"));
aboutWidget_->OpenFlipperAbout->setCurrentFont(standardFont); aboutWidget_->OpenFlipperAbout->setCurrentFont(standardFont);
//TODO: rename this we are not using glew anymore //TODO: rename this we are not using glew anymore
QString glewVersion = QString(getOpenGLVersion()); QString glewVersion = QString(getOpenGLVersion());
aboutWidget_->OpenFlipperAbout->append(tr("GLEW Version:\t") + glewVersion); aboutWidget_->OpenFlipperAbout->append(tr("OpenGL Version:\t") + glewVersion);
#endif #endif
// ===================================================================================== // =====================================================================================
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment