Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Merge

Browse source
This commit is contained in:
aquiles 2010-11-02 13:51:32 +01:00
commit e6889998a6
5 changed files with 29 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
code/CMakeModules/CheckDepends.cmake
View file

@ -124,4 +124,4 @@ MACRO(LINK_DEPENDS LIBRARIES MYLIBRARY OTHERLIBRARY SYMBOL)
SET(${LIBRARIES} ${${LIBRARIES}} ${${OTHERLIBRARY}}) SET(${LIBRARIES} ${${LIBRARIES}} ${${OTHERLIBRARY}})
SET(${OTHERLIBRARY}_LINKED TRUE) SET(${OTHERLIBRARY}_LINKED TRUE)
ENDIF(MUST_LINK) ENDIF(MUST_LINK)
NDMACRO(LINK_DEPENDS) ENDMACRO(LINK_DEPENDS)

6
code/CMakeModules/FindLibwww.cmake
View file

@ -136,9 +136,11 @@ LINK_WWW_LIBRARY(LIBWWWAPP_LIBRARY LIBWWWZIP_LIBRARY HTZLib_inflate)
# libwwwxml can be linked to xmlparse or expat # libwwwxml can be linked to xmlparse or expat
LINK_WWW_LIBRARY(LIBWWWXML_LIBRARY LIBXMLPARSE_LIBRARY XML_ParserCreate) LINK_WWW_LIBRARY(LIBWWWXML_LIBRARY LIBXMLPARSE_LIBRARY XML_ParserCreate)
IF(NOT LIBXMLPARSE_LIBRARY_LINKED) IF(LIBXMLPARSE_LIBRARY_LINKED)
LINK_WWW_LIBRARY(LIBXMLPARSE_LIBRARY EXPAT_LIBRARY XmlInitEncoding)
ELSE(LIBXMLPARSE_LIBRARY_LINKED)
LINK_WWW_LIBRARY(LIBWWWXML_LIBRARY EXPAT_LIBRARY XML_ParserCreate) LINK_WWW_LIBRARY(LIBWWWXML_LIBRARY EXPAT_LIBRARY XML_ParserCreate)
ENDIF(NOT LIBXMLPARSE_LIBRARY_LINKED) ENDIF(LIBXMLPARSE_LIBRARY_LINKED)
LINK_WWW_LIBRARY(LIBWWWHTTP_LIBRARY LIBMD5_LIBRARY MD5Init) LINK_WWW_LIBRARY(LIBWWWHTTP_LIBRARY LIBMD5_LIBRARY MD5Init)
LINK_WWW_LIBRARY(LIBWWWAPP_LIBRARY LIBREGEX_LIBRARY regexec) LINK_WWW_LIBRARY(LIBWWWAPP_LIBRARY LIBREGEX_LIBRARY regexec)

4
code/nel/src/3d/driver/opengl/driver_opengl_extension.cpp
View file

@ -445,7 +445,7 @@ PFNWGLGETEXTENSIONSSTRINGARBPROC nwglGetExtensionsStringARB;
#elif defined(NL_OS_UNIX) #elif defined(NL_OS_UNIX)
// Swap control extensions // Swap control extensions
PFNGLXSWAPINTERVALEXTPROC nglXSwapIntervalEXT; NEL_PFNGLXSWAPINTERVALEXTPROC nglXSwapIntervalEXT;
PFNGLXSWAPINTERVALSGIPROC nglXSwapIntervalSGI; PFNGLXSWAPINTERVALSGIPROC nglXSwapIntervalSGI;
@ -1429,7 +1429,7 @@ static bool setupGLXEXTSwapControl(const char *glext)
CHECK_EXT("GLX_EXT_swap_control"); CHECK_EXT("GLX_EXT_swap_control");
#if defined(NL_OS_UNIX) && !defined(NL_OS_MAC) #if defined(NL_OS_UNIX) && !defined(NL_OS_MAC)
CHECK_ADDRESS(PFNGLXSWAPINTERVALEXTPROC, glXSwapIntervalEXT); CHECK_ADDRESS(NEL_PFNGLXSWAPINTERVALEXTPROC, glXSwapIntervalEXT);
#endif #endif
return true; return true;

2
code/nel/src/3d/driver/opengl/driver_opengl_extension.h
View file

@ -698,7 +698,7 @@ extern PFNWGLGETEXTENSIONSSTRINGARBPROC nwglGetExtensionsStringARB;
// Swap control extensions // Swap control extensions
//=========================== //===========================
extern PFNGLXSWAPINTERVALEXTPROC nglXSwapIntervalEXT; extern NEL_PFNGLXSWAPINTERVALEXTPROC nglXSwapIntervalEXT;
extern PFNGLXSWAPINTERVALSGIPROC nglXSwapIntervalSGI; extern PFNGLXSWAPINTERVALSGIPROC nglXSwapIntervalSGI;

21
code/nel/src/3d/driver/opengl/driver_opengl_extension_def.h
View file

@ -376,6 +376,27 @@ typedef GLvoid (APIENTRY * NEL_PFNGLGETOCCLUSIONQUERYUIVNVPROC) (GLuint id, G
typedef GLvoid (APIENTRY * NEL_PFNGLSAMPLECOVERAGEARBPROC) (GLclampf value, GLboolean invert); typedef GLvoid (APIENTRY * NEL_PFNGLSAMPLECOVERAGEARBPROC) (GLclampf value, GLboolean invert);
#endif #endif
#if defined(NL_OS_MAC)
// Mac GL extensions
#elif defined(NL_OS_UNIX)
// GLX extensions
#ifndef NL_GLX_EXT_swap_control
#define NL_GLX_EXT_swap_control 1
#ifndef GLX_EXT_swap_control
#define GLX_SWAP_INTERVAL_EXT 0x20F1
#define GLX_MAX_SWAP_INTERVAL_EXT 0x20F2
#endif
typedef GLint (APIENTRY * NEL_PFNGLXSWAPINTERVALEXTPROC) (Display *dpy, GLXDrawable drawable, GLint interval);
#endif // NL_GLX_EXT_swap_control
#endif // NL_OS_MAC
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif