aleajactaest/khanat-code-old
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-code-old.git synced 2024-11-27 01:06:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge

Browse source
This commit is contained in:
timon 2010-11-23 17:11:34 +02:00
commit 155ea28842
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
code/nel/src/3d/driver/opengl/mac/cocoa_opengl_view.m
View file

@ -23,8 +23,8 @@ namespace NL3D
void viewDidResize(NSView* view, CDriverGL* driver) void viewDidResize(NSView* view, CDriverGL* driver)
{ {
NSRect rect = [[view superview] frame]; NSRect rect = [[view superview] frame];
driver->_WindowWidth = rect.size.width; driver->_CurrentMode.Height = rect.size.height;
driver->_WindowHeight = rect.size.height; driver->_CurrentMode.Width = rect.size.width;
} }
} }

6
code/ryzom/tools/leveldesign/world_editor/CMakeLists.txt
View file

@ -1,8 +1,10 @@
ADD_SUBDIRECTORY(land_export) ADD_SUBDIRECTORY(land_export)
ADD_SUBDIRECTORY(land_export_lib) ADD_SUBDIRECTORY(land_export_lib)
ADD_SUBDIRECTORY(world_editor) IF(WITH_MFC)
ADD_SUBDIRECTORY(world_editor_primitive_plugin) 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. # This is an old plugin and is deprecated. It doesn't even compile anymore.
#ADD_SUBDIRECTORY(world_editor_plugin) #ADD_SUBDIRECTORY(world_editor_plugin)