- fixed Linux build
This commit is contained in:
parent
d0acde5d88
commit
316739c5bd
|
@ -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)
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -26,9 +26,10 @@
|
|||
|
||||
#else
|
||||
|
||||
#include <GL/glew.h>
|
||||
#include <SDL.h>
|
||||
#define GL_GLEXT_PROTOTYPES
|
||||
#include <SDL_opengl.h>
|
||||
//#include <SDL_opengl.h>
|
||||
|
||||
#endif
|
||||
|
||||
|
|
|
@ -33,6 +33,7 @@ namespace Shared { namespace Graphics { namespace md5 {
|
|||
using std::cout;
|
||||
using std::cerr;
|
||||
using std::endl;
|
||||
using std::max;
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
|
|
Loading…
Reference in New Issue