Context Navigation

Changeset 7941 for code/branches/kicklib/src

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/src

Files:

-                      r7819
+                      r7941
 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)
 …
 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 ##############
 …
   ${CMAKE_CURRENT_BINARY_DIR}
+)
-IF(CEGUILUA_USE_INTERNAL_LIBRARY)
-  INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/external/ceguilua/ceguilua-${CEGUI_VERSION})
-ENDIF()
 IF (DBGHELP_FOUND)

r7818	r7941
41	41
42	42	#include "OrxonoxConfig.h"
43
44		~~#cmakedefine CEGUILUA_USE_INTERNAL_LIBRARY ///< Set whether we must suffix "ceguilua/" for the CEGUILua.h include~~
45	43
46	44	#cmakedefine DEPENDENCY_PACKAGE_ENABLE ///< Defined if a precompiled depdency package was used. We then copy all libraries too when installing.

-                      r7459
+                      r7941
 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)

-                      r7163
+                      r7941
  #     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
-.0.92
-  LINK_LIBRARIES
-    ${LUA_LIBRARIES}
-  SOURCE_FILES
-    ${TOLUA_FILES}
+)
 ################## Tolua++ generator ##################

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

-                      r5738
+                      r7941
-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

r5752	r7941
124	124	output('#endif\n')
125	125	output('#include <string.h>\n\n')
126		output('#include <tolua~~/tolua~~++.h>\n\n')
	126	output('#include <tolua++.h>\n\n')
127	127
128	128	if flags.H then

-                      r7284
+                      r7941
     ${CEGUI_LIBRARY}
     ${CEGUILUA_LIBRARY}
+    ${CEGUI_TOLUA_LIBRARY}
     ${LUA_LIBRARIES}
     cpptcl_orxonox
 …
     ois_orxonox
     tinyxml_orxonox
-    tolua_orxonox
     util
   SOURCE_FILES

-                      r7939
+                      r7941
 #include "GUIManager.h"
+#include <memory>
 #include <boost/bind.hpp>
-#include <memory>
 #include <CEGUIDefaultLogger.h>
 …
 #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"

-                      r7648
+                      r7941
     ${VORBIS_LIBRARY}
     ${OGG_LIBRARY}
+    ${CEGUI_TOLUA_LIBRARY}
     tinyxml_orxonox
-    tolua_orxonox
     bullet_orxonox
     util

Note: See TracChangeset for help on using the changeset viewer.