Moved back the unix event emitter to the OpenGL driver. It was a bad idea to move it out ( this way ) originally.

--HG--
branch : gsoc2013-dfighter
hg/feature/gsoc2013-dfighter
dfighter1985 12 years ago
parent 1c0d74fc00
commit dddd531249

@ -144,10 +144,10 @@ SOURCE_GROUP(Driver FILES
../../include/nel/3d/light.h ../../include/nel/3d/light.h
material.cpp material.cpp
../../include/nel/3d/material.h ../../include/nel/3d/material.h
dynamic_material.cpp dynamic_material.cpp
../../include/nel/3d/dynamic_material.h ../../include/nel/3d/dynamic_material.h
dyn_mat_loader.cpp dyn_mat_loader.cpp
../../include/nel/3d/dyb_mat_loader.h ../../include/nel/3d/dyb_mat_loader.h
nelu.cpp nelu.cpp
../../include/nel/3d/nelu.h ../../include/nel/3d/nelu.h
../../include/nel/3d/occlusion_query.h ../../include/nel/3d/occlusion_query.h
@ -159,19 +159,17 @@ SOURCE_GROUP(Driver FILES
../../include/nel/3d/scene_group.h ../../include/nel/3d/scene_group.h
shader.cpp shader.cpp
../../include/nel/3d/shader.h ../../include/nel/3d/shader.h
shader_loader.cpp shader_loader.cpp
../../include/nel/3d/shader_loader.h ../../include/nel/3d/shader_loader.h
shader_manager.cpp shader_manager.cpp
../../include/nel/3d/shader_manager.h ../../include/nel/3d/shader_manager.h
shader_program.cpp shader_program.cpp
../../include/nel/3d/shader_program.h ../../include/nel/3d/shader_program.h
shader_saver.cpp shader_saver.cpp
../../include/nel/3d/shader_saver.h ../../include/nel/3d/shader_saver.h
../../include/nel/3d/shader_visitor.h ../../include/nel/3d/shader_visitor.h
texture.cpp texture.cpp
../../include/nel/3d/texture.h ../../include/nel/3d/texture.h
unix_event_emitter.cpp
../../include/nel/3d/unix_event_emitter.h
vertex_buffer.cpp vertex_buffer.cpp
../../include/nel/3d/vertex_buffer.h ../../include/nel/3d/vertex_buffer.h
vertex_buffer_heap.cpp vertex_buffer_heap.cpp

@ -68,7 +68,7 @@
#elif defined(NL_OS_MAC) #elif defined(NL_OS_MAC)
#include "mac/cocoa_event_emitter.h" #include "mac/cocoa_event_emitter.h"
#elif defined (NL_OS_UNIX) #elif defined (NL_OS_UNIX)
#include "nel/3d/unix_event_emitter.h" #include "unix_event_emitter.h"
#endif // NL_OS_UNIX #endif // NL_OS_UNIX

@ -15,7 +15,7 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>. // along with this program. If not, see <http://www.gnu.org/licenses/>.
//#include "stdopengl.h" //#include "stdopengl.h"
#include "nel/3d/unix_event_emitter.h" #include "unix_event_emitter.h"
#if defined(NL_OS_UNIX) && !defined(NL_OS_MAC) #if defined(NL_OS_UNIX) && !defined(NL_OS_MAC)
Loading…
Cancel
Save