From 8b4d5ee5d371443e7b3f57c297692b5b82dbadca Mon Sep 17 00:00:00 2001 From: "Matt Raykowski\"" Date: Mon, 22 Nov 2010 20:31:25 -0600 Subject: [PATCH 1/2] Changed: Forgot to make World Editor an MFC-only tool. --- code/ryzom/tools/leveldesign/world_editor/CMakeLists.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/code/ryzom/tools/leveldesign/world_editor/CMakeLists.txt b/code/ryzom/tools/leveldesign/world_editor/CMakeLists.txt index 95324525e..f9d7908eb 100644 --- a/code/ryzom/tools/leveldesign/world_editor/CMakeLists.txt +++ b/code/ryzom/tools/leveldesign/world_editor/CMakeLists.txt @@ -1,8 +1,10 @@ ADD_SUBDIRECTORY(land_export) ADD_SUBDIRECTORY(land_export_lib) -ADD_SUBDIRECTORY(world_editor) -ADD_SUBDIRECTORY(world_editor_primitive_plugin) +IF(WITH_MFC) + ADD_SUBDIRECTORY(world_editor) + ADD_SUBDIRECTORY(world_editor_primitive_plugin) +ENDIF(WITH_MFC) # This is an old plugin and is deprecated. It doesn't even compile anymore. #ADD_SUBDIRECTORY(world_editor_plugin) From 431fc9a13eed6c7f7e960e212a9a57b365cf547f Mon Sep 17 00:00:00 2001 From: rti Date: Tue, 23 Nov 2010 13:08:13 +0100 Subject: [PATCH 2/2] Fixed: Mac OS X compilation of GL driver --- code/nel/src/3d/driver/opengl/mac/cocoa_opengl_view.m | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/nel/src/3d/driver/opengl/mac/cocoa_opengl_view.m b/code/nel/src/3d/driver/opengl/mac/cocoa_opengl_view.m index 9bcec1714..8ad1f91d4 100644 --- a/code/nel/src/3d/driver/opengl/mac/cocoa_opengl_view.m +++ b/code/nel/src/3d/driver/opengl/mac/cocoa_opengl_view.m @@ -23,8 +23,8 @@ namespace NL3D void viewDidResize(NSView* view, CDriverGL* driver) { NSRect rect = [[view superview] frame]; - driver->_WindowWidth = rect.size.width; - driver->_WindowHeight = rect.size.height; + driver->_CurrentMode.Height = rect.size.height; + driver->_CurrentMode.Width = rect.size.width; } }