Changeset 1367

Show
Ignore:
Timestamp:
03/18/08 20:20:36 (8 months ago)
Author:
timdewhirst
Message:

openlibraries
- added CMakeFiles for OAL, OOL
- now builds a minimal olibs on windows

Location:
trunk
Files:
6 added
12 modified

Legend:

Unmodified
Added
Removed

  • trunk/CMakeLists.txt

    r1366 r1367  
    2828   include_directories( ${Boost_INCLUDE_DIR} ) 
    2929   link_directories( ${Boost_LIBRARY_DIRS} ) 
     30   add_definitions( -DHAVE_BOOST_FILESYSTEM ) 
    3031endif ( Boost_FOUND ) 
    31  
    32 # SDL 
    33 find_package( SDL ) 
    34 if ( SDL_FOUND ) 
    35    message( "found SDL: ${SDL_INCLUDE_DIR}" ) 
    36    include_directories( ${SDL_INCLUDE_DIR} ) 
    37 endif ( SDL_FOUND ) 
    3832 
    3933# libxml 
    … …  
    4539   endif( LIBXML2_FOUND )        
    4640endif( NOT WIN32 ) 
     41 
     42# opengl 
     43find_package( OpenGL ) 
     44if( OPENGL_FOUND ) 
     45    message( "found OpenGL: ${OPENGL_INCLUDE_DIR}" ) 
     46    include_directories( ${OPENGL_INCLUDE_DIR} ) 
     47endif( OPENGL_FOUND ) 
    4748 
    4849# GLEW 
    … …  
    5657   add_definitions( -DOPENOBJECTLIB_SHADERS="\\\"${SHARE_PATH}/shaders\\\"" ) 
    5758   add_definitions( -DOPENEFFECTSLIB_SHADERS="\\\"${SHARE_PATH}/shaders\\\"" ) 
     59   add_definitions( -DHAVE_GL_GLEW_H ) 
    5860endif ( GLEW_FOUND ) 
    5961 

  • trunk/src/CMakeLists.txt

    r1362 r1367  
    22add_subdirectory( openimagelib ) 
    33add_subdirectory( openmedialib ) 
    4 #add_subdirectory( openassetlib ) 
     4add_subdirectory( openassetlib ) 
    55#add_subdirectory( openeffectslib ) 
    6 #add_subdirectory( openobjectlib ) 
     6add_subdirectory( openobjectlib ) 

  • trunk/src/openassetlib/al/config.hpp

    r1347 r1367  
    4848#endif 
    4949 
    50 // library search record (auto link). 
    51 #if defined( WIN32 ) && !defined( OPENASSETLIB_BUILD ) 
    52 #       if defined( OPENASSETLIB_LIBNAME ) && defined( OPENASSETLIB_TOOLSET ) && defined( OPENASSETLIB_DEBUG_SUFFIX ) && defined( OPENASSETLIB_VERSION ) 
    53 #               pragma comment( lib, OPENASSETLIB_LIBNAME "-" OPENASSETLIB_TOOLSET "-" OPENASSETLIB_DEBUG_SUFFIX "-" OPENASSETLIB_VERSION ".lib" ) 
    54 #       endif 
    55 #endif 
     50// // library search record (auto link). 
     51// #if defined( WIN32 ) && !defined( OPENASSETLIB_BUILD ) 
     52// #    if defined( OPENASSETLIB_LIBNAME ) && defined( OPENASSETLIB_TOOLSET ) && defined( OPENASSETLIB_DEBUG_SUFFIX ) && defined( OPENASSETLIB_VERSION ) 
     53// #            pragma comment( lib, OPENASSETLIB_LIBNAME "-" OPENASSETLIB_TOOLSET "-" OPENASSETLIB_DEBUG_SUFFIX "-" OPENASSETLIB_VERSION ".lib" ) 
     54// #    endif 
     55// #endif 
    5656 
    5757#endif 

  • trunk/src/openimagelib/il/CMakeLists.txt

    r1366 r1367  
     1 
    12include_directories( ${OpenLibraries_SOURCE_DIR}/src ) 
    2 message( including: ${OpenLibraries_SOURCE_DIR}/src ) 
    33set( NAME openimagelib_il ) 
    44 

  • trunk/src/openimagelib/plugins/gdi+/CMakeLists.txt

    r1366 r1367  
     1 
    12include_directories( ${OpenLibraries_SOURCE_DIR}/src ) 
    2 message( including: ${OpenLibraries_SOURCE_DIR}/src ) 
    33set( NAME openimagelib_gdi ) 
    44 

  • trunk/src/openmedialib/ml/CMakeLists.txt

    r1366 r1367  
    11 
    22include_directories( ${OpenLibraries_SOURCE_DIR}/src ) 
    3 message( including: ${OpenLibraries_SOURCE_DIR}/src ) 
    43set( NAME openmedialib_ml ) 
    54 

  • trunk/src/openmedialib/plugins/gensys/CMakeLists.txt

    r1366 r1367  
    11 
    22include_directories( ${OpenLibraries_SOURCE_DIR}/src ) 
    3 message( including: ${OpenLibraries_SOURCE_DIR}/src ) 
    43set( NAME openmedialib_gensys ) 
    54 

  • trunk/src/openmedialib/plugins/glew/CMakeLists.txt

    r1366 r1367  
    11 
    22include_directories( ${OpenLibraries_SOURCE_DIR}/src ) 
    3 set( NAME openmedialib_oil ) 
     3set( NAME openmedialib_glew ) 
    44 
    55if( WIN32 ) 
    … …  
    4747target_link_libraries( ${NAME} "openmedialib_ml${LIBRARY_IDENTIFIER}" ) 
    4848target_link_libraries( ${NAME} ${GLEW_LIBRARY} ) 
     49target_link_libraries( ${NAME} ${GLUT_LIBRARY} ) 

  • trunk/src/openmedialib/plugins/oil/CMakeLists.txt

    r1366 r1367  
    11 
    22include_directories( ${OpenLibraries_SOURCE_DIR}/src ) 
    3 message( including: ${OpenLibraries_SOURCE_DIR}/src ) 
    43set( NAME openmedialib_oil ) 
    54 

  • trunk/src/openobjectlib/sg/config.hpp

    r1347 r1367  
    5151#endif 
    5252 
    53 // library search record (auto link). 
    54 #if defined( WIN32 ) && !defined( OPENOBJECTLIB_BUILD ) && !defined( OPENOBJECTLIB_PLUGIN ) 
    55 #       if defined( OPENOBJECTLIB_SGLIBNAME ) && defined( OPENOBJECTLIB_TOOLSET ) && defined( OPENOBJECTLIB_DEBUG_SUFFIX ) && defined( OPENOBJECTLIB_VERSION ) 
    56 #               pragma comment( lib, OPENOBJECTLIB_SGLIBNAME "-" OPENOBJECTLIB_TOOLSET "-" OPENOBJECTLIB_DEBUG_SUFFIX "-" OPENOBJECTLIB_VERSION ".lib" ) 
    57 #       endif 
    58 #endif 
     53// // library search record (auto link). 
     54// #if defined( WIN32 ) && !defined( OPENOBJECTLIB_BUILD ) && !defined( OPENOBJECTLIB_PLUGIN ) 
     55// #    if defined( OPENOBJECTLIB_SGLIBNAME ) && defined( OPENOBJECTLIB_TOOLSET ) && defined( OPENOBJECTLIB_DEBUG_SUFFIX ) && defined( OPENOBJECTLIB_VERSION ) 
     56// #            pragma comment( lib, OPENOBJECTLIB_SGLIBNAME "-" OPENOBJECTLIB_TOOLSET "-" OPENOBJECTLIB_DEBUG_SUFFIX "-" OPENOBJECTLIB_VERSION ".lib" ) 
     57// #    endif 
     58// #endif 
    5959 
    6060#endif 

  • trunk/src/openpluginlib/pl/CMakeLists.txt

    r1366 r1367  
     1 
    12include_directories( ${OpenLibraries_SOURCE_DIR}/src ) 
    2 message( including: ${OpenLibraries_SOURCE_DIR}/src ) 
    33set( NAME openpluginlib_pl ) 
    44 
    … …  
    9898     string.hpp                   
    9999     stream.hpp                   
     100     DESTINATION "include/${PACKAGE}/openpluginlib/pl" ) 
     101 
     102install(  
     103     FILES 
    100104     pcos/key.hpp                 
    101105     pcos/observer.hpp            
    … …  
    107111     pcos/isubject.hpp            
    108112     pcos/iclonable.hpp 
    109      DESTINATION "include/${PACKAGE}/openpluginlib/pl" ) 
     113     DESTINATION "include/${PACKAGE}/openpluginlib/pl/pcos" ) 
    110114 
    111115add_library( ${NAME} SHARED ${SOURCES} ) 
    … …  
    116120if( GLEW_FOUND ) 
    117121    target_link_libraries( ${NAME} ${GLEW_LIBRARY} ) 
     122    target_link_libraries( ${NAME} ${OPENGL_LIBRARIES} ) 
    118123endif( GLEW_FOUND ) 

  • trunk/src/openpluginlib/pl/pl_vc8.vcproj

    r1327 r1367  
    4343                                Optimization="0" 
    4444                                AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34_1";"C:\Program Files\NVIDIA Corporation\Cg\include"" 
    45                                 PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;OPENPLUGINLIB_EXPORTS;OPENPLUGINLIB_BUILD;HAVE_FLEX_STRING;HAVE_CG_RUNTIME;HAVE_BOOST_FILESYSTEM;HAVE_FAST_MATH" 
     45                                PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;OPENPLUGINLIB_EXPORTS;OPENPLUGINLIB_BUILD;HAVE_FLEX_STRING;HAVE_CG_RUNTIME__;HAVE_BOOST_FILESYSTEM;HAVE_FAST_MATH" 
    4646                                MinimalRebuild="true" 
    4747                                ExceptionHandling="2"