Changeset 7941

Timestamp:

Feb 20, 2011, 10:49:06 PM (14 years ago)

Author:

rgrieder

Message:

Kicked CEGUILua from our repository and adjusted the build system accordingly.
The Linux part is still missing though.

Location:

code/branches/kicklib

Files:

• cmake/LibraryConfig.cmake (modified) (1 diff)
• cmake/tools/FindCEGUI.cmake (modified) (5 diffs)
• src/CMakeLists.txt (modified) (3 diffs)
• src/SpecialConfig.h.in (modified) (1 diff)
• src/external/CMakeLists.txt (modified) (1 diff)
• src/external/ceguilua (deleted)
• src/external/tolua/CMakeLists.txt (modified) (1 diff)
• src/external/tolua/README_ORXONOX (added)
• src/external/tolua/VERSION (modified) (1 diff)
• src/external/tolua/changes_orxonox.diff (modified) (1 diff)
• src/external/tolua/lua/package.lua (modified) (1 diff)
• src/external/tolua/tolua++.h (deleted)
• src/external/tolua/tolua_event.c (deleted)
• src/external/tolua/tolua_event.h (deleted)
• src/external/tolua/tolua_is.c (deleted)
• src/external/tolua/tolua_map.c (deleted)
• src/external/tolua/tolua_push.c (deleted)
• src/external/tolua/tolua_to.c (deleted)
• src/libraries/core/CMakeLists.txt (modified) (2 diffs)
• src/libraries/core/GUIManager.cc (modified) (2 diffs)
• src/libraries/core/LuaState.cc (modified) (1 diff)
• src/orxonox/CMakeLists.txt (modified) (1 diff)

code/branches/kicklib/cmake/LibraryConfig.cmake

@@ -109 +109 @@
 ##### CEGUI #####
 # We make use of the CEGUI script module called CEGUILua.
-# However there is a small issue with that: We use Tolua, a C++ binding
-# generator ourselves. And we also have to use our bindings in the same
-# lua state is CEGUILua's. Unfortunately this implies that both lua runtime
-# version are equal or else you get segmentation faults.
-# In order to match the Lua versions we decided to ship CEGUILua in our
-# repository, mainly because there is no way to determine which version of
-# Lua CEGUILua was linked against (you'd have to specify yourself) and secondly
-# because we can then choose the Lua version. Future plans might involve only
-# accepting Lua 5.1.
-
-# Insert all internally supported CEGUILua versions here
-SET(CEGUILUA_INTERNAL_SUPPORT 0.5.0 0.6.0 0.6.1 0.6.2)
-OPTION(CEGUILUA_USE_EXTERNAL_LIBRARY "Force the use of external CEGUILua library" OFF)
+# However there is a small issue with that: Both CEGUILua and Orxonox use
+# Lua library functions on the same objects. And it turns out that in this case
+# the linked library must be EXACTLY the same.
+# That means for us we have to find the Lua library that CEGUI was
+# linked against if we don't use a dependency package.
+
 FIND_PACKAGE(CEGUI 0.5 REQUIRED)
 
 ##### Lua #####
-IF(CEGUILUA_USE_EXTERNAL_LIBRARY)
-  COMPARE_VERSION_STRINGS(${CEGUI_VERSION} "0.6" _version_comparison)
-  IF(version_comparison LESS 0)
-    SET(LUA_VERSION_REQUEST 5.0)
-  ELSE()
-    SET(LUA_VERSION_REQUEST 5.1)
-  ENDIF()
+IF(NOT LUA_VERSION_REQUIREMENT)
+  FIND_PACKAGE(Lua 5 REQUIRED)
 ELSE()
-  SET(LUA_VERSION_REQUEST 5)
-ENDIF()
-FIND_PACKAGE(Lua ${LUA_VERSION_REQUEST} EXACT REQUIRED)
+  FIND_PACKAGE(Lua ${LUA_VERSION_REQUIREMENT} EXACT REQUIRED)
+ENDIF()
 
 ##### OpenAL #####

code/branches/kicklib/cmake/tools/FindCEGUI.cmake

@@ -4 +4 @@
 #  CEGUI_INCLUDE_DIR
 #  CEGUI_LIBRARY, the library to link against to use CEGUI.
+#  CEGUILUA_LIBRARY, the library to link against to use the CEGUI script module.
+#  CEGUI_TOLUA_LIBRARY, the library to link against to use Tolua++.
 #  CEGUI_FOUND, If false, do not try to use CEGUI
 #  CEGUI_VERSION, the version as string "x.y.z"
-#  CEGUILUA_LIBRARY, Script module library
-#  CEGUILUA_USE_INTERNAL_LIBRARY, True if CEGUILUA_LIBRARY was not defined here
 #
 # Input:
 #  ENV{CEGUIDIR}, CEGUI path, optional
-#  FIND CEGUILUA_INTERNAL_SUPPORT, List of all CEGUILua version supported
-#                                  in the source repository
-#  CEGUILUA_USE_EXTERNAL_LIBRARY, Force finding of CEGUILua
 #
 # Created by Matt Williams to find OGRE libraries
@@ -33 +30 @@
 INCLUDE(HandleLibraryTypes)
 
+# Find CEGUI library
 FIND_PATH(CEGUI_INCLUDE_DIR CEGUI.h
   PATHS $ENV{CEGUIDIR}
@@ -50 +48 @@
 )
 
+# Find CEGUILua libraries
+FIND_LIBRARY(CEGUILUA_LIBRARY_OPTIMIZED
+  NAMES CEGUILua CEGUILuaScriptModule
+  PATHS $ENV{CEGUIDIR}
+  PATH_SUFFIXES lib bin
+)
+FIND_LIBRARY(CEGUILUA_LIBRARY_DEBUG
+  NAMES CEGUILuad CEGUILua_d CEGUILuaScriptModuled CEGUILuaScriptModule_d
+  PATHS $ENV{CEGUIDIR}
+  PATH_SUFFIXES lib bin
+)
+
+# Find CEGUI Tolua++ libraries
+FIND_LIBRARY(CEGUI_TOLUA_LIBRARY_OPTIMIZED
+  NAMES CEGUItoluapp tolua++
+  PATHS $ENV{CEGUIDIR}
+  PATH_SUFFIXES lib bin
+)
+FIND_LIBRARY(CEGUI_TOLUA_LIBRARY_DEBUG
+  NAMES CEGUItoluappd CEGUItoluapp_d tolua++d tolua++_d
+  PATHS $ENV{CEGUIDIR}
+  PATH_SUFFIXES lib bin
+)
+
 # Inspect CEGUIVersion.h for the version number
 DETERMINE_VERSION(CEGUI ${CEGUI_INCLUDE_DIR}/CEGUIVersion.h)
@@ -56 +78 @@
 # Also checks the version requirements if given
 FIND_PACKAGE_HANDLE_ADVANCED_ARGS(CEGUI DEFAULT_MSG "${CEGUI_VERSION}"
+  CEGUI_INCLUDE_DIR
   CEGUI_LIBRARY_OPTIMIZED
-  CEGUI_INCLUDE_DIR
+  CEGUILUA_LIBRARY_OPTIMIZED
+  CEGUI_TOLUA_LIBRARY_OPTIMIZED
 )
 
 # Collect optimized and debug libraries
 HANDLE_LIBRARY_TYPES(CEGUI)
+HANDLE_LIBRARY_TYPES(CEGUILUA)
+HANDLE_LIBRARY_TYPES(CEGUI_TOLUA)
 
 MARK_AS_ADVANCED(
@@ -67 +93 @@
   CEGUI_LIBRARY_OPTIMIZED
   CEGUI_LIBRARY_DEBUG
+  CEGUILUA_LIBRARY_OPTIMIZED
+  CEGUILUA_LIBRARY_DEBUG
+  CEGUI_TOLUA_LIBRARY_OPTIMIZED
+  CEGUI_TOLUA_LIBRARY_DEBUG
 )
-
-LIST(FIND CEGUILUA_INTERNAL_SUPPORT "${CEGUI_VERSION}" _find_result)
-IF(CEGUILUA_USE_EXTERNAL_LIBRARY OR _find_result EQUAL -1)
-  # Also try to find the CEGUILua libraries.
-  # There would already be libraries in src/ for versions 0.5 and 0.6
-  FIND_LIBRARY(CEGUILUA_LIBRARY_OPTIMIZED
-    NAMES CEGUILua
-    PATHS $ENV{CEGUIDIR}
-    PATH_SUFFIXES lib bin
-  )
-  FIND_LIBRARY(CEGUILUA_LIBRARY_DEBUG
-    NAMES CEGUILuad CEGUILua_d
-    PATHS $ENV{CEGUIDIR}
-    PATH_SUFFIXES lib bin
-  )
-
-  SET(CEGUILua_FIND_REQUIRED ${CEGUI_FIND_REQUIRED})
-  # Handle the REQUIRED argument and set CEGUILUA_FOUND
-  FIND_PACKAGE_HANDLE_STANDARD_ARGS(CEGUILua DEFAULT_MSG
-    CEGUILUA_LIBRARY_OPTIMIZED
-  )
-
-  # Collect optimized and debug libraries
-  HANDLE_LIBRARY_TYPES(CEGUILUA)
-
-  MARK_AS_ADVANCED(
-    CEGUILUA_LIBRARY_OPTIMIZED
-    CEGUILUA_LIBRARY_DEBUG
-  )
-
-ELSE(CEGUILUA_USE_EXTERNAL_LIBRARY OR _find_result EQUAL -1)
-  SET(CEGUILUA_USE_INTERNAL_LIBRARY TRUE)
-ENDIF(CEGUILUA_USE_EXTERNAL_LIBRARY OR _find_result EQUAL -1)
-

code/branches/kicklib/src/CMakeLists.txt

@@ -42 +42 @@
 ADD_COMPILER_FLAGS("-DZLIB_DLL"           WIN32 LINK_ZLIB_DYNAMIC)
 # If no defines are specified, these libs get linked dynamically
-ADD_COMPILER_FLAGS("-DCEGUI_STATIC"       WIN32 NOT LINK_CEGUI_DYNAMIC)
+ADD_COMPILER_FLAGS("-DCEGUI_STATIC -DTOLUA_STATIC" WIN32 NOT LINK_CEGUI_DYNAMIC)
 ADD_COMPILER_FLAGS("-DOGRE_STATIC_LIB"    WIN32 NOT LINK_OGRE_DYNAMIC)
 ADD_COMPILER_FLAGS("-DSTATIC_BUILD"       WIN32 NOT LINK_TCL_DYNAMIC)
@@ -60 +60 @@
 ENDIF()
 # If no defines are specified, these libs get linked dynamically
-ADD_COMPILER_FLAGS("-DCEGUILUA_STATIC"             WIN32 NOT _external_shared_link)
 ADD_COMPILER_FLAGS("-DENET_DLL"                    WIN32     _external_shared_link)
 ADD_COMPILER_FLAGS("-DOGRE_GUIRENDERER_STATIC_LIB" WIN32 NOT _external_shared_link)
 ADD_COMPILER_FLAGS("-DOIS_STATIC_LIB"              WIN32 NOT _external_shared_link)
-ADD_COMPILER_FLAGS("-DTOLUA_STATIC_BUILD"          WIN32 NOT _external_shared_link)
 
 ############## Include Directories ##############
@@ -95 +93 @@
   ${CMAKE_CURRENT_BINARY_DIR}
 )
-
-IF(CEGUILUA_USE_INTERNAL_LIBRARY)
-  INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/external/ceguilua/ceguilua-${CEGUI_VERSION})
-ENDIF()
 
 IF (DBGHELP_FOUND)

code/branches/kicklib/src/SpecialConfig.h.in

@@ -41 +41 @@
 
 #include "OrxonoxConfig.h"
-
-#cmakedefine CEGUILUA_USE_INTERNAL_LIBRARY  ///< Set whether we must suffix "ceguilua/" for the CEGUILua.h include
 
 #cmakedefine DEPENDENCY_PACKAGE_ENABLE      ///< Defined if a precompiled depdency package was used. We then copy all libraries too when installing.

code/branches/kicklib/src/external/CMakeLists.txt

@@ -21 +21 @@
 
 ADD_SUBDIRECTORY(tolua)
-
-# Include CEGUILua if not requested otherwise
-IF(CEGUILUA_USE_INTERNAL_LIBRARY)
-  IF(NOT IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/ceguilua/ceguilua-${CEGUI_VERSION})
-    MESSAGE(FATAL_ERROR "CEGUILua version not found in src folder. Update list of supported versions in LibraryConfig.cmake!")
-  ENDIF()
-
-  ADD_SUBDIRECTORY(ceguilua)
-  SET(CEGUILUA_LIBRARY ${CEGUILUA_LIBRARY} PARENT_SCOPE)
-ENDIF()
-
 ADD_SUBDIRECTORY(bullet)
 ADD_SUBDIRECTORY(cpptcl)

code/branches/kicklib/src/external/tolua/CMakeLists.txt

@@ -17 +17 @@
  #     Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  #
-
-################### Tolua++ library ###################
-
-SET_SOURCE_FILES(TOLUA_FILES
-  tolua_event.h
-  tolua++.h
-COMPILATION_BEGIN ToluaCompilation.c
-  tolua_event.c
-  tolua_is.c
-  tolua_map.c
-  tolua_push.c
-  tolua_to.c
-COMPILATION_END
-)
-
-ORXONOX_ADD_LIBRARY(tolua_orxonox
-  ORXONOX_EXTERNAL
-  DEFINE_SYMBOL
-    "TOLUA_SHARED_BUILD"
-  VERSION
-    1.0.92
-  LINK_LIBRARIES
-    ${LUA_LIBRARIES}
-  SOURCE_FILES
-    ${TOLUA_FILES}
-)
-
 
 ################## Tolua++ generator ##################

code/branches/kicklib/src/external/tolua/VERSION

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

code/branches/kicklib/src/external/tolua/changes_orxonox.diff

@@ -1 @@
-diff -ruN tolua/tolua++.h tolua2/tolua++.h
---- tolua/tolua++.h     Wed Jan 28 21:51:38 2009
-+++ tolua2/tolua++.h    Sat Jan 10 14:48:44 2009
-@@ -16,9 +16,34 @@
- #ifndef TOLUA_H
- #define TOLUA_H
- 
-+/* original code */
-+/*
- #ifndef TOLUA_API
- #define TOLUA_API extern
- #endif
-+*/
-+
-+/********************************
-+******* ORXONOX CHANGES *********
-+********************************/
-+
-+#if (defined( __WIN32__ ) || defined( _WIN32 )) && !defined( TOLUA_STATIC_BUILD )
-+#  ifdef TOLUA_SHARED_BUILD
-+#    define TOLUA_API __declspec(dllexport)
-+#  else
-+#    if defined( __MINGW32__ )
-+#      define TOLUA_API
-+#    else
-+#      define TOLUA_API __declspec(dllimport)
-+#    endif
-+#  endif
-+#else
-+#  define TOLUA_API extern
-+#endif
-+
-+/********************************
-+****** END ORXONOX CHANGES ******
-+********************************/
- 
- #define TOLUA_VERSION "tolua++-1.0.92"
- 
 diff -ruN tolua/tolua.c tolua2/tolua.c
 --- tolua/tolua.c       Wed Jan 28 21:51:00 2009

code/branches/kicklib/src/external/tolua/lua/package.lua

@@ -124 +124 @@
     output('#endif\n')
     output('#include <string.h>\n\n')
-    output('#include <tolua/tolua++.h>\n\n')
+    output('#include <tolua++.h>\n\n')
 
     if flags.H then

code/branches/kicklib/src/libraries/core/CMakeLists.txt

@@ -93 +93 @@
     ${CEGUI_LIBRARY}
     ${CEGUILUA_LIBRARY}
+    ${CEGUI_TOLUA_LIBRARY}
     ${LUA_LIBRARIES}
     cpptcl_orxonox
@@ -98 +99 @@
     ois_orxonox
     tinyxml_orxonox
-    tolua_orxonox
     util
   SOURCE_FILES

code/branches/kicklib/src/libraries/core/GUIManager.cc

@@ -30 +30 @@
 #include "GUIManager.h"
 
+#include <memory>
 #include <boost/bind.hpp>
-#include <memory>
 
 #include <CEGUIDefaultLogger.h>
@@ -43 +43 @@
 #include <elements/CEGUIListbox.h>
 #include <elements/CEGUIListboxItem.h>
+
+#include <CEGUILua.h>
 #include <ogreceguirenderer/OgreCEGUIRenderer.h>
-
-#include "SpecialConfig.h" // Configures the macro below
-#ifdef CEGUILUA_USE_INTERNAL_LIBRARY
-#   include <ceguilua/CEGUILua.h>
-#else
-#   include <CEGUILua.h>
-#endif
 
 #include "util/Clock.h"

code/branches/kicklib/src/libraries/core/LuaState.cc

@@ -30 +30 @@
 #include "LuaState.h"
 
-#include <tolua/tolua++.h>
+#include <tolua++.h>
 extern "C" {
 #include <lua.h>

code/branches/kicklib/src/orxonox/CMakeLists.txt

@@ -78 +78 @@
     ${VORBIS_LIBRARY}
     ${OGG_LIBRARY}
+    ${CEGUI_TOLUA_LIBRARY}
     tinyxml_orxonox
-    tolua_orxonox
     bullet_orxonox
     util