mirror of
https://port.numenaute.org/aleajactaest/khanat-opennel-code.git
synced 2024-12-30 04:40:53 +00:00
Changed: #825 Remove all warning when compiling Ryzom
This commit is contained in:
parent
ccf08113b9
commit
8399175d8c
6 changed files with 8 additions and 11 deletions
|
@ -191,7 +191,7 @@ CDriverGL::CDriverGL()
|
|||
|
||||
// autorelease pool for memory management
|
||||
_autoreleasePool = [[NSAutoreleasePool alloc] init];
|
||||
|
||||
|
||||
// init the application object
|
||||
[NSApplication sharedApplication];
|
||||
|
||||
|
@ -200,7 +200,7 @@ CDriverGL::CDriverGL()
|
|||
|
||||
// finish the application launching
|
||||
[NSApp finishLaunching];
|
||||
|
||||
|
||||
#elif defined (NL_OS_UNIX)
|
||||
|
||||
_cursor = None;
|
||||
|
@ -875,7 +875,7 @@ bool CDriverGL::swapBuffers()
|
|||
// TODO: maybe do this somewhere else?
|
||||
[_autoreleasePool release];
|
||||
_autoreleasePool = [[NSAutoreleasePool alloc] init];
|
||||
|
||||
|
||||
[_ctx flushBuffer];
|
||||
[containerView() display];
|
||||
|
||||
|
@ -2077,6 +2077,7 @@ void CDriverGL::setSwapVBLInterval(uint interval)
|
|||
uint CDriverGL::getSwapVBLInterval()
|
||||
{
|
||||
H_AUTO_OGL(CDriverGL_getSwapVBLInterval)
|
||||
|
||||
#ifdef NL_OS_WINDOWS
|
||||
if(_Extensions.WGLEXTSwapControl)
|
||||
{
|
||||
|
|
|
@ -22,8 +22,7 @@
|
|||
#include <X11/Xlib.h>
|
||||
#include <X11/Xatom.h>
|
||||
#include <X11/keysym.h>
|
||||
#include <GL/gl.h>
|
||||
#include <GL/glx.h>
|
||||
#include <X11/Xutil.h>
|
||||
#include "nel/misc/debug.h"
|
||||
|
||||
|
||||
|
|
|
@ -24,8 +24,7 @@
|
|||
|
||||
#if defined(NL_OS_UNIX) && !defined(NL_OS_MAC)
|
||||
|
||||
#include <GL/gl.h>
|
||||
#include <GL/glx.h>
|
||||
#include <X11/Xlib.h>
|
||||
|
||||
namespace NLMISC {
|
||||
|
||||
|
|
|
@ -1147,11 +1147,9 @@ void destroyDebug()
|
|||
|
||||
void createDebug (const char *logPath, bool logInFile, bool eraseLastLog)
|
||||
{
|
||||
|
||||
// Do some basic compiler time check on type size
|
||||
nlctassert(sizeof(char) == 1);
|
||||
|
||||
|
||||
// static bool alreadyCreateSharedAmongThreads = false;
|
||||
// if ( !alreadyCreateSharedAmongThreads )
|
||||
if (!INelContext::getInstance().getAlreadyCreateSharedAmongThreads())
|
||||
|
|
|
@ -15,7 +15,7 @@
|
|||
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
|
||||
#include "stdpch.h"
|
||||
#include "stdpch.h"
|
||||
#include "particle_node.h"
|
||||
|
||||
// NeL includes
|
||||
|
|
|
@ -274,7 +274,7 @@ private:
|
|||
TNodeVect _Nodes;
|
||||
// path + name of workspace
|
||||
std::string _Filename;
|
||||
bool _Modified;
|
||||
bool _Modified;
|
||||
IModificationCallback *_ModificationCallback;
|
||||
// workspace user name
|
||||
std::string _Name;
|
||||
|
|
Loading…
Reference in a new issue