diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-01-18 14:16:39 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-01-18 14:16:39 +0400 |
| commit | 7001747cdc120b153638b2d44a3fb420f45ea803 (patch) | |
| tree | 7221842b58034c2133a8acd8f8f1d06f02e09eed /intern/ghost | |
| parent | 7f08c71f43f487cf278684d9170652c8193e7f48 (diff) | |
ghost tests weren't building and added some comments to ghost docs.
Diffstat (limited to 'intern/ghost')
| -rw-r--r-- | intern/ghost/GHOST_ISystem.h | 15 | ||||
| -rw-r--r-- | intern/ghost/test/CMakeLists.txt | 23 |
2 files changed, 38 insertions, 0 deletions
diff --git a/intern/ghost/GHOST_ISystem.h b/intern/ghost/GHOST_ISystem.h index 4d2f41b48bd..3ec8d3d2fbf 100644 --- a/intern/ghost/GHOST_ISystem.h +++ b/intern/ghost/GHOST_ISystem.h @@ -68,13 +68,28 @@ class GHOST_IEventConsumer; * <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> diff --git a/intern/ghost/test/CMakeLists.txt b/intern/ghost/test/CMakeLists.txt index f834b55b387..75f082fe834 100644 --- a/intern/ghost/test/CMakeLists.txt +++ b/intern/ghost/test/CMakeLists.txt @@ -35,6 +35,25 @@ endmacro() # ----------------------------------------------------------------------------- +# 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 @@ add_library(bli_lib "../../../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(OpenGL REQUIRED) 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 @@ target_link_libraries(multitest_c ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ${FREETYPE_LIBRARY} + ${ZLIB_LIBRARIES} ${PLATFORM_LINKLIBS} ) |