Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Apr 21, 2011, 6:32:28 PM (14 years ago)
Author:
rgrieder
Message:

Merged revisions 7940-7974 from kicklib to kicklib2.

Location:
code/branches/kicklib2
Files:
9 deleted
9 edited
1 copied

Legend:

Unmodified
Added
Removed

  • code/branches/kicklib2

  • code/branches/kicklib2/src/external/CMakeLists.txt

    r7459 r8283  
    2121
    2222ADD_SUBDIRECTORY(tolua)
    23 
    24 # Include CEGUILua if not requested otherwise
    25 IF(CEGUILUA_USE_INTERNAL_LIBRARY)
    26   IF(NOT IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/ceguilua/ceguilua-${CEGUI_VERSION})
    27     MESSAGE(FATAL_ERROR "CEGUILua version not found in src folder. Update list of supported versions in LibraryConfig.cmake!")
    28   ENDIF()
    29 
    30   ADD_SUBDIRECTORY(ceguilua)
    31   SET(CEGUILUA_LIBRARY ${CEGUILUA_LIBRARY} PARENT_SCOPE)
    32 ENDIF()
    33 
    3423ADD_SUBDIRECTORY(bullet)
    3524ADD_SUBDIRECTORY(cpptcl)
    3625ADD_SUBDIRECTORY(enet)
    3726ADD_SUBDIRECTORY(loki)
    38 ADD_SUBDIRECTORY(ogreceguirenderer)
     27IF(CEGUI_OGRE_RENDERER_BUILD_REQUIRED)
     28  ADD_SUBDIRECTORY(ogreceguirenderer)
     29ENDIF()
    3930ADD_SUBDIRECTORY(ois)
    4031ADD_SUBDIRECTORY(tinyxml)

  • code/branches/kicklib2/src/external/ogreceguirenderer/OgreCEGUIRenderer.cpp

    r5781 r8283  
    455455        d_render_sys->_setTextureAddressingMode(0, d_uvwAddressMode);
    456456        d_render_sys->_setTextureMatrix(0, Matrix4::IDENTITY);
    457 #if OGRE_VERSION >= 0x010600
    458457        d_render_sys->_setAlphaRejectSettings(CMPF_ALWAYS_PASS, 0, false);
    459 #else
    460         d_render_sys->_setAlphaRejectSettings(CMPF_ALWAYS_PASS, 0);
    461 #endif
    462458        d_render_sys->_setTextureBlendMode(0, d_colourBlendMode);
    463459        d_render_sys->_setTextureBlendMode(0, d_alphaBlendMode);

  • code/branches/kicklib2/src/external/ogreceguirenderer/VERSION

    r5781 r8283  
    1 This library is part of the OGRE v1.6.1 source.
     1This library is part of the OGRE v1.6.5 source.
    22
    33-----

  • code/branches/kicklib2/src/external/ogreceguirenderer/changes_orxonox.diff

    r7163 r8283  
    1818 #include "OgreCEGUIRenderer.h"
    1919 #include "OgreCEGUITexture.h"
    20 @@ -454,7 +454,11 @@
    21         d_render_sys->_setTextureUnitFiltering(0, FO_LINEAR, FO_LINEAR, FO_POINT);
    22         d_render_sys->_setTextureAddressingMode(0, d_uvwAddressMode);
    23         d_render_sys->_setTextureMatrix(0, Matrix4::IDENTITY);
    24 +#if OGRE_VERSION >= 0x010600
    25 +       d_render_sys->_setAlphaRejectSettings(CMPF_ALWAYS_PASS, 0, false);
    26 +#else
    27         d_render_sys->_setAlphaRejectSettings(CMPF_ALWAYS_PASS, 0);
    28 +#endif
    29         d_render_sys->_setTextureBlendMode(0, d_colourBlendMode);
    30         d_render_sys->_setTextureBlendMode(0, d_alphaBlendMode);
    31         d_render_sys->_disableTextureUnitsFrom(1);
    3220--- OgreCEGUIRenderer.h Wed Jan 28 21:14:09 2009
    3321+++ OgreCEGUIRenderer.h Wed Jan 28 21:06:46 2009

  • code/branches/kicklib2/src/external/tolua/CMakeLists.txt

    r7163 r8283  
    1818 #
    1919
    20 ################### Tolua++ library ###################
    21 
    22 SET_SOURCE_FILES(TOLUA_FILES
    23   tolua_event.h
    24   tolua++.h
    25 COMPILATION_BEGIN ToluaCompilation.c
    26   tolua_event.c
    27   tolua_is.c
    28   tolua_map.c
    29   tolua_push.c
    30   tolua_to.c
    31 COMPILATION_END
    32 )
    33 
    34 ORXONOX_ADD_LIBRARY(tolua_orxonox
    35   ORXONOX_EXTERNAL
    36   DEFINE_SYMBOL
    37     "TOLUA_SHARED_BUILD"
    38   VERSION
    39     1.0.92
    40   LINK_LIBRARIES
    41     ${LUA_LIBRARIES}
    42   SOURCE_FILES
    43     ${TOLUA_FILES}
    44 )
    45 
    46 
    4720################## Tolua++ generator ##################
    4821
    … …  
    5326  NO_INSTALL
    5427  LINK_LIBRARIES
    55     ${LUA_LIBRARIES}
     28    ${LUA5.1_LIBRARY}
    5629  SOURCE_FILES
    5730    tolua.c
    … …  
    5932
    6033# Set some variables to the cache in order to use them in the TOLUA macro
    61 SET(TOLUA_PARSER_SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/all-${LUA_VERSION}.lua" CACHE INTERNAL "")
     34SET(TOLUA_PARSER_SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/all-5.1.lua" CACHE INTERNAL "")
    6235SET(TOLUA_PARSER_DEPENDENCIES
    6336  toluaapp_orxonox
    64   ${CMAKE_CURRENT_SOURCE_DIR}/all-${LUA_VERSION}.lua
     37  ${CMAKE_CURRENT_SOURCE_DIR}/all-5.1.lua
    6538  ${CMAKE_CURRENT_SOURCE_DIR}/lua/compat-5.1.lua
    6639  ${CMAKE_CURRENT_SOURCE_DIR}/lua/compat.lua

  • code/branches/kicklib2/src/external/tolua/VERSION

    r5738 r8283  
    1 Tolua++ v1.0.92 with changes:
     1Tolua++ v1.0.92 (generator application only) with changes:
    22
    33- Exception handling by CEGUI team

  • code/branches/kicklib2/src/external/tolua/changes_orxonox.diff

    r5738 r8283  
    1 diff -ruN tolua/tolua++.h tolua2/tolua++.h
    2 --- tolua/tolua++.h     Wed Jan 28 21:51:38 2009
    3 +++ tolua2/tolua++.h    Sat Jan 10 14:48:44 2009
    4 @@ -16,9 +16,34 @@
    5  #ifndef TOLUA_H
    6  #define TOLUA_H
    7  
    8 +/* original code */
    9 +/*
    10  #ifndef TOLUA_API
    11  #define TOLUA_API extern
    12  #endif
    13 +*/
    14 +
    15 +/********************************
    16 +******* ORXONOX CHANGES *********
    17 +********************************/
    18 +
    19 +#if (defined( __WIN32__ ) || defined( _WIN32 )) && !defined( TOLUA_STATIC_BUILD )
    20 +#  ifdef TOLUA_SHARED_BUILD
    21 +#    define TOLUA_API __declspec(dllexport)
    22 +#  else
    23 +#    if defined( __MINGW32__ )
    24 +#      define TOLUA_API
    25 +#    else
    26 +#      define TOLUA_API __declspec(dllimport)
    27 +#    endif
    28 +#  endif
    29 +#else
    30 +#  define TOLUA_API extern
    31 +#endif
    32 +
    33 +/********************************
    34 +****** END ORXONOX CHANGES ******
    35 +********************************/
    36  
    37  #define TOLUA_VERSION "tolua++-1.0.92"
    38  
    391diff -ruN tolua/tolua.c tolua2/tolua.c
    402--- tolua/tolua.c       Wed Jan 28 21:51:00 2009

  • code/branches/kicklib2/src/external/tolua/lua/package.lua

    r5752 r8283  
    124124    output('#endif\n')
    125125    output('#include <string.h>\n\n')
    126     output('#include <tolua/tolua++.h>\n\n')
     126    output('#include <tolua++.h>\n\n')
    127127
    128128    if flags.H then
Note: See TracChangeset for help on using the changeset viewer.