Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Darwin doesn't use extension function pointer mechanism

Browse Source
This commit is contained in:
Siana Gearz
2011-10-28 02:05:09 +02:00
parent e06d0b2e70
commit cc45a24aff
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/cmake/OpenGL.cmake
View File

@@ -1,7 +1,7 @@
# -*- cmake -*- # -*- cmake -*-
include(Prebuilt) include(Prebuilt)
if (NOT STANDALONE OR DARWIN) if (NOT (STANDALONE OR DARWIN))
use_prebuilt_binary(glext) use_prebuilt_binary(glext)
# possible glh_linear should have its own .cmake file instead # possible glh_linear should have its own .cmake file instead
#use_prebuilt_binary(glh_linear) #use_prebuilt_binary(glh_linear)

2
indra/llrender/llgl.cpp
View File

@@ -68,6 +68,7 @@ BOOL gGLActive = FALSE;
std::ofstream gFailLog; std::ofstream gFailLog;
#if !LL_DARWIN //Darwin doesn't load extensions that way! -SG
void* gl_get_proc_address(const char *pStr) void* gl_get_proc_address(const char *pStr)
{ {
void* pPtr = (void*)GLH_EXT_GET_PROC_ADDRESS(pStr); void* pPtr = (void*)GLH_EXT_GET_PROC_ADDRESS(pStr);
@@ -77,6 +78,7 @@ void* gl_get_proc_address(const char *pStr)
} }
#undef GLH_EXT_GET_PROC_ADDRESS #undef GLH_EXT_GET_PROC_ADDRESS
#define GLH_EXT_GET_PROC_ADDRESS(p) gl_get_proc_address(p) #define GLH_EXT_GET_PROC_ADDRESS(p) gl_get_proc_address(p)
#endif //!LL_DARWIN
void ll_init_fail_log(std::string filename) void ll_init_fail_log(std::string filename)
{ {