mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-13 20:03:58 +02:00
Code Issues Projects Releases Wiki Activity

- fixed Linux build

Browse Source
This commit is contained in:
Mark Vejvoda
2011-11-18 08:42:50 +00:00
parent d0acde5d88
commit 316739c5bd
4 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/g3d_viewer/CMakeLists.txt
View File

@@ -14,6 +14,12 @@ IF(BUILD_MEGAGLEST_MODEL_VIEWER)
INCLUDE_DIRECTORIES(${OPENGL_INCLUDE_DIR}) INCLUDE_DIRECTORIES(${OPENGL_INCLUDE_DIR})
SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${OPENGL_LIBRARY}) 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) IF(NOT WIN32)
FIND_PACKAGE(XercesC REQUIRED) FIND_PACKAGE(XercesC REQUIRED)

10
source/shared_lib/CMakeLists.txt
View File

@@ -200,11 +200,11 @@ IF(BUILD_MEGAGLEST_MODEL_VIEWER OR BUILD_MEGAGLEST_MAP_EDITOR OR BUILD_MEGAGLEST
endif(USE_FREETYPEGL) endif(USE_FREETYPEGL)
#FIND_PACKAGE(GLEW REQUIRED) FIND_PACKAGE(GLEW REQUIRED)
#INCLUDE_DIRECTORIES(${GLEW_INCLUDE_PATH}) INCLUDE_DIRECTORIES(${GLEW_INCLUDE_PATH})
#IF(UNIX) IF(UNIX)
# SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${GLEW_LIBRARY}) SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${GLEW_LIBRARY})
#ENDIF() ENDIF()
######################################################################################### #########################################################################################
# megaglest lib # megaglest lib

3
source/shared_lib/include/platform/sdl/gl_wrap.h
View File

@@ -26,9 +26,10 @@
#else #else
#include <GL/glew.h>
#include <SDL.h> #include <SDL.h>
#define GL_GLEXT_PROTOTYPES #define GL_GLEXT_PROTOTYPES
#include <SDL_opengl.h> //#include <SDL_opengl.h>
#endif #endif

1
source/shared_lib/sources/graphics/md5/md5Texture.cpp
View File

@@ -33,6 +33,7 @@ namespace Shared { namespace Graphics { namespace md5 {
using std::cout; using std::cout;
using std::cerr; using std::cerr;
using std::endl; using std::endl;
using std::max;
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// //