diff options
| author | Jason Wilkins <Jason.A.Wilkins@gmail.com> | 2014-10-08 00:46:19 +0400 |
|---|---|---|
| committer | Jason Wilkins <Jason.A.Wilkins@gmail.com> | 2014-10-08 00:47:32 +0400 |
| commit | 8d084e8c8f48dd2f07d4a3fbd4a941a7bcc0dcfb (patch) | |
| tree | 5bf15f4f74f3e5a307cfa3f734b2cd086dca69bd /source/creator | |
| parent | a8705e99ee8ec9de2f25c3bac1e9895c2f98c224 (diff) | |
Ghost Context Refactor
https://developer.blender.org/D643
Separates graphics context creation from window code in Ghost so that they can vary separately.
Diffstat (limited to 'source/creator')
| -rw-r--r-- | source/creator/CMakeLists.txt | 16 | ||||
| -rw-r--r-- | source/creator/creator.c | 15 |
2 files changed, 16 insertions, 15 deletions
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index 35cbff33342..20c2448eed3 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -27,6 +27,7 @@ setup_libdirs() blender_include_dirs( ../../intern/guardedalloc + ../../intern/glew-mx ../blender/blenlib ../blender/blenkernel ../blender/blenloader @@ -39,6 +40,9 @@ blender_include_dirs( ../blender/windowmanager ) +add_definitions(${GL_DEFINITIONS}) +blender_include_dirs(${GLEW_INCLUDE_PATH}) + if(WIN32) blender_include_dirs(../../intern/utfconv) endif() @@ -676,6 +680,18 @@ elseif(WIN32) unset(_PYTHON_VERSION_NO_DOTS) endif() + # EGL Runtime Components + if(WITH_GL_EGL) + if(WIN32) + install(FILES "${OPENGLES_DLL}" DESTINATION ${TARGETDIR}) + install(FILES "${OPENGLES_EGL_DLL}" DESTINATION ${TARGETDIR}) + + if(WITH_GL_ANGLE) + install(FILES "${D3DCOMPILER_DLL}" DESTINATION ${TARGETDIR}) + endif() + endif() + endif() + if(MSVC) install( FILES ${LIBDIR}/pthreads/lib/pthreadVC2.dll diff --git a/source/creator/creator.c b/source/creator/creator.c index 458afb2d131..12ae5c502e4 100644 --- a/source/creator/creator.c +++ b/source/creator/creator.c @@ -1609,21 +1609,6 @@ int main( #endif setCallbacks(); -#if defined(__APPLE__) && !defined(WITH_PYTHON_MODULE) - /* patch to ignore argument finder gives us (pid?) */ - if (argc == 2 && strncmp(argv[1], "-psn_", 5) == 0) { - extern int GHOST_HACK_getFirstFile(char buf[]); - static char firstfilebuf[512]; - - argc = 1; - - if (GHOST_HACK_getFirstFile(firstfilebuf)) { - argc = 2; - argv[1] = firstfilebuf; - } - } - -#endif #ifdef __FreeBSD__ fpsetmask(0); |