Fixes for cygwin and mingw builds.
This commit is contained in:
@@ -19,6 +19,8 @@
|
||||
# include <sys/sockio.h>
|
||||
#elif defined(__sgi)
|
||||
# include <net/soioctl.h>
|
||||
#elif defined(__CYGWIN__)
|
||||
// nothing needed
|
||||
#else
|
||||
# error Teach me how to build on this system
|
||||
#endif
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
#if defined(_WIN32) || defined(__CYGWIN__)
|
||||
#if defined(WIN32)
|
||||
#include <windows.h>
|
||||
#elif !defined macintosh
|
||||
#include <dlfcn.h>
|
||||
@@ -60,7 +60,7 @@ const bool osg::isGLExtensionSupported(const char *extension)
|
||||
|
||||
void* osg::getGLExtensionFuncPtr(const char *funcName)
|
||||
{
|
||||
#if defined(_WIN32) || defined(__CYGWIN__)
|
||||
#if defined(WIN32)
|
||||
return wglGetProcAddress(funcName);
|
||||
#elif defined(macintosh)
|
||||
return NULL;
|
||||
|
||||
@@ -347,7 +347,7 @@ std::string osgDB::findFileInDirectory(const std::string& fileName,const std::st
|
||||
}
|
||||
|
||||
|
||||
#if defined(WIN32) &&!defined(__CYGWIN__)
|
||||
#if defined(WIN32) && !defined(__CYGWIN__)
|
||||
|
||||
#include <io.h>
|
||||
#include <direct.h>
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
|
||||
#include <iostream>
|
||||
|
||||
#ifdef __CYGWIN__
|
||||
#if defined(__CYGWIN__) || defined(__MINGW32__)
|
||||
#include <sys/types.h>
|
||||
#endif
|
||||
|
||||
|
||||
Reference in New Issue
Block a user