diff --git a/source/g3d_viewer/CMakeLists.txt b/source/g3d_viewer/CMakeLists.txt index 557772240..0693987de 100644 --- a/source/g3d_viewer/CMakeLists.txt +++ b/source/g3d_viewer/CMakeLists.txt @@ -14,6 +14,12 @@ IF(BUILD_MEGAGLEST_MODEL_VIEWER) INCLUDE_DIRECTORIES(${OPENGL_INCLUDE_DIR}) SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${OPENGL_LIBRARY}) + FIND_PACKAGE(GLEW REQUIRED) + INCLUDE_DIRECTORIES(${GLEW_INCLUDE_PATH}) + IF(UNIX) + SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${GLEW_LIBRARY}) + ENDIF() + IF(NOT WIN32) FIND_PACKAGE(XercesC REQUIRED) diff --git a/source/shared_lib/CMakeLists.txt b/source/shared_lib/CMakeLists.txt index 1052f39aa..f5b1812b9 100644 --- a/source/shared_lib/CMakeLists.txt +++ b/source/shared_lib/CMakeLists.txt @@ -200,11 +200,11 @@ IF(BUILD_MEGAGLEST_MODEL_VIEWER OR BUILD_MEGAGLEST_MAP_EDITOR OR BUILD_MEGAGLEST endif(USE_FREETYPEGL) - #FIND_PACKAGE(GLEW REQUIRED) - #INCLUDE_DIRECTORIES(${GLEW_INCLUDE_PATH}) - #IF(UNIX) - # SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${GLEW_LIBRARY}) - #ENDIF() + FIND_PACKAGE(GLEW REQUIRED) + INCLUDE_DIRECTORIES(${GLEW_INCLUDE_PATH}) + IF(UNIX) + SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${GLEW_LIBRARY}) + ENDIF() ######################################################################################### # megaglest lib diff --git a/source/shared_lib/include/platform/sdl/gl_wrap.h b/source/shared_lib/include/platform/sdl/gl_wrap.h index af48bb354..07dff3589 100644 --- a/source/shared_lib/include/platform/sdl/gl_wrap.h +++ b/source/shared_lib/include/platform/sdl/gl_wrap.h @@ -26,9 +26,10 @@ #else +#include #include #define GL_GLEXT_PROTOTYPES -#include +//#include #endif diff --git a/source/shared_lib/sources/graphics/md5/md5Texture.cpp b/source/shared_lib/sources/graphics/md5/md5Texture.cpp index 589ec8d19..37ddad88f 100644 --- a/source/shared_lib/sources/graphics/md5/md5Texture.cpp +++ b/source/shared_lib/sources/graphics/md5/md5Texture.cpp @@ -33,6 +33,7 @@ namespace Shared { namespace Graphics { namespace md5 { using std::cout; using std::cerr; using std::endl; +using std::max; ///////////////////////////////////////////////////////////////////////////// //