diff options
| -rwxr-xr-x | CMakeLists.txt | 12 | ||||
| -rw-r--r-- | config.h.cmake | 2 | ||||
| -rw-r--r-- | navit/graphics/opengl/graphics_opengl.c | 13 |
3 files changed, 14 insertions, 13 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 83cad502..2a69b93b 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -237,12 +237,16 @@ if(GTK2_FOUND) endif(FREETYPE_FOUND) endif(GTK2_FOUND) -CHECK_LIBRARY_EXISTS(freeimage FreeImage_Load "" FREEIMAGE_FOUND) -if (QUESOGLC_FOUND AND FREETYPE_FOUND) - if (OPENGL_FOUND AND OPENGL_GLU_FOUND AND OPENGL_GLUT_FOUND AND OPENGL_INCLUDE_DIR AND FREEIMAGE_FOUND) +CHECK_LIBRARY_EXISTS(freeimage FreeImage_Load "" HAVE_FREEIMAGE) +if (FREETYPE_FOUND) + if (OPENGL_FOUND AND OPENGL_GLU_FOUND AND GLUT_FOUND AND OPENGL_INCLUDE_DIR) message (STATUS "opengl found: ${OPENGL_gl_LIBRARY}") include_directories(${OPENGL_INCLUDE_DIR}) - set_with_reason(graphics/opengl "Found OpenGL and Quesoglc" TRUE ${OPENGL_gl_LIBRARY};${OPENGL_glu_LIBRARY};${GLUT_glut_LIBRARY};freeimage) + set(GRAPHICS_OPENGL_LIBRARY ${OPENGL_gl_LIBRARY};${OPENGL_glu_LIBRARY};${GLUT_glut_LIBRARY}) + if (HAVE_FREEIMAGE) + list(APPEND GRAPHICS_OPENGL_LIBRARY freeimage) + endif(HAVE_FREEIMAGE) + set_with_reason(graphics/opengl "Found OpenGL" TRUE ${GRAPHICS_OPENGL_LIBRARY}) else() message (STATUS "opengl not found") endif() diff --git a/config.h.cmake b/config.h.cmake index 18e28fab..58783eee 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -79,3 +79,5 @@ #cmakedefine HAVE_GETLINE 1 #cmakedefine HAVE_ENDIAN_H 1 + +#cmakedefine HAVE_FREEIMAGE 1 diff --git a/navit/graphics/opengl/graphics_opengl.c b/navit/graphics/opengl/graphics_opengl.c index 4da98600..8fbd1e93 100644 --- a/navit/graphics/opengl/graphics_opengl.c +++ b/navit/graphics/opengl/graphics_opengl.c @@ -17,7 +17,6 @@ * Boston, MA 02110-1301, USA. */ -#define USE_FREEIMAGE 1 #define USE_OPENGLES 0 #define USE_OPENGLES2 0 #define USE_FLOAT 0 @@ -52,7 +51,7 @@ #define PIXEL_FORMAT GL_BGRA #endif -#if USE_FREEIMAGE +#if HAVE_FREEIMAGE #include <FreeImage.h> #endif @@ -100,10 +99,6 @@ extern EGLDisplay egldisplay; #endif #endif -#ifdef HAVE_FREEGLUT || __FREEGLUT_EXT_H__ -#define USE_FREEGLUT 1 -#endif - #define SCREEN_WIDTH 700 #define SCREEN_HEIGHT 700 @@ -357,7 +352,7 @@ static struct graphics_image_priv * image_new(struct graphics_priv *gr, struct graphics_image_methods *meth, char *path, int *w, int *h, struct point *hot, int rotation) { -#if USE_FREEIMAGE +#if HAVE_FREEIMAGE FIBITMAP *image; RGBQUAD aPixel; unsigned char *data; @@ -1592,7 +1587,7 @@ graphics_opengl_idle(void *data) opengl_init_ok = 1; } else { -#if USE_FREEGLUT +#ifdef FREEGLUT glutMainLoopEvent(); #endif handle_mouse_queue(); @@ -1752,7 +1747,7 @@ graphics_opengl_new(struct navit *nav, struct graphics_methods *meth, glutMouseFunc(click_notify); glutKeyboardFunc(ProcessNormalKeys); glutSpecialFunc(ProcessSpecialKeys); -#if USE_FREEGLUT +#ifdef FREEGLUT glutCloseFunc(glut_close); #endif this->DLid = glGenLists(1); |