[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43485] trunk/blender/intern/ghost: ghost tests weren't building and added some comments to ghost docs.
Campbell Barton
ideasman42 at gmail.com
Wed Jan 18 11:16:44 CET 2012
Revision: 43485
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43485
Author: campbellbarton
Date: 2012-01-18 10:16:39 +0000 (Wed, 18 Jan 2012)
Log Message:
-----------
ghost tests weren't building and added some comments to ghost docs.
Modified Paths:
--------------
trunk/blender/intern/ghost/GHOST_ISystem.h
trunk/blender/intern/ghost/test/CMakeLists.txt
Modified: trunk/blender/intern/ghost/GHOST_ISystem.h
===================================================================
--- trunk/blender/intern/ghost/GHOST_ISystem.h 2012-01-18 08:43:27 UTC (rev 43484)
+++ trunk/blender/intern/ghost/GHOST_ISystem.h 2012-01-18 10:16:39 UTC (rev 43485)
@@ -68,13 +68,28 @@
* <li> Access to the state of the mouse buttons and the keyboard.</li>
* <li> Menus for windows with events generated when they are accessed (this is
* work in progress).</li>
+ * <li> Video mode switching.</li>
+ * <li> Copy/Paste buffers.</li>
+ * <li> System paths.</li>
* </ul>
* Font management has been moved to a separate library.
*
* \section platforms Platforms
*
+ * GHOST supports the following platforms:
+ * <ul>
+ * <li> OSX Cocoa.</li>
+ * <li> OSX Carbon.</li>
+ * <li> Windows.</li>
+ * <li> X11.</li>
+ * <li> SDL1.3 (experemental).</li>
+ * <li> NULL (headless mode).</li>
+ * </ul>
+ *
* \section Building GHOST
*
+ * GHOST is not build standalone however there are tests in intern/ghost/test
+ *
* \section interface Interface
* GHOST has two programming interfaces:
* <ul>
Modified: trunk/blender/intern/ghost/test/CMakeLists.txt
===================================================================
--- trunk/blender/intern/ghost/test/CMakeLists.txt 2012-01-18 08:43:27 UTC (rev 43484)
+++ trunk/blender/intern/ghost/test/CMakeLists.txt 2012-01-18 10:16:39 UTC (rev 43485)
@@ -35,6 +35,25 @@
# -----------------------------------------------------------------------------
+# Defines
+
+# set the endian define
+if(MSVC)
+ # for some reason this fails on msvc
+ add_definitions(-D__LITTLE_ENDIAN__)
+else()
+ include(TestBigEndian)
+ test_big_endian(_SYSTEM_BIG_ENDIAN)
+ if(_SYSTEM_BIG_ENDIAN)
+ add_definitions(-D__BIG_ENDIAN__)
+ else()
+ add_definitions(-D__LITTLE_ENDIAN__)
+ endif()
+ unset(_SYSTEM_BIG_ENDIAN)
+endif()
+
+
+# -----------------------------------------------------------------------------
# Libraries
# ghost
@@ -74,6 +93,7 @@
"../../../source/blender/blenlib/intern/fileops.c"
"../../../source/blender/blenlib/intern/rct.c"
"../../../source/blender/blenlib/intern/string.c"
+ "../../../source/blender/blenlib/intern/string_utf8.c"
"../../../source/blender/blenlib/intern/listbase.c"
"../../../source/blender/blenlib/intern/storage.c"
"../../../source/blender/blenlib/intern/path_util.c"
@@ -87,6 +107,8 @@
find_package(Freetype REQUIRED)
+find_package(ZLIB REQUIRED)
+
include_directories(${CMAKE_SOURCE_DIR}/../)
include_directories(${OPENGL_INCLUDE_DIR})
include_directories(${FREETYPE_INCLUDE_DIRS})
@@ -151,5 +173,6 @@
${OPENGL_gl_LIBRARY}
${OPENGL_glu_LIBRARY}
${FREETYPE_LIBRARY}
+ ${ZLIB_LIBRARIES}
${PLATFORM_LINKLIBS}
)
More information about the Bf-blender-cvs
mailing list