[Orxonox-commit 2425] r7134 - in code/branches/presentation3/src/external/ceguilua: ceguilua-0.6.0/ceguilua ceguilua-0.6.1/ceguilua ceguilua-0.6.2/ceguilua
rgrieder at orxonox.net
rgrieder at orxonox.net
Wed Jun 9 23:51:43 CEST 2010
Author: rgrieder
Date: 2010-06-09 23:51:42 +0200 (Wed, 09 Jun 2010)
New Revision: 7134
Modified:
code/branches/presentation3/src/external/ceguilua/ceguilua-0.6.0/ceguilua/CEGUILua.h
code/branches/presentation3/src/external/ceguilua/ceguilua-0.6.0/ceguilua/changes_orxonox.diff
code/branches/presentation3/src/external/ceguilua/ceguilua-0.6.1/ceguilua/CEGUILua.h
code/branches/presentation3/src/external/ceguilua/ceguilua-0.6.1/ceguilua/changes_orxonox.diff
code/branches/presentation3/src/external/ceguilua/ceguilua-0.6.2/ceguilua/CEGUILua.h
code/branches/presentation3/src/external/ceguilua/ceguilua-0.6.2/ceguilua/changes_orxonox.diff
Log:
CEGUILua should use its own macros for static builds.
Modified: code/branches/presentation3/src/external/ceguilua/ceguilua-0.6.0/ceguilua/CEGUILua.h
===================================================================
--- code/branches/presentation3/src/external/ceguilua/ceguilua-0.6.0/ceguilua/CEGUILua.h 2010-06-09 21:45:03 UTC (rev 7133)
+++ code/branches/presentation3/src/external/ceguilua/ceguilua-0.6.0/ceguilua/CEGUILua.h 2010-06-09 21:51:42 UTC (rev 7134)
@@ -34,7 +34,7 @@
/*************************************************************************
Import / Export control macros
*************************************************************************/
-#if (defined( __WIN32__ ) || defined( _WIN32 )) && !defined(CEGUI_STATIC)
+#if (defined( __WIN32__ ) || defined( _WIN32 )) && !defined(CEGUILUA_STATIC)
# ifdef CEGUILUA_EXPORTS
# define CEGUILUA_API __declspec(dllexport)
# else
Modified: code/branches/presentation3/src/external/ceguilua/ceguilua-0.6.0/ceguilua/changes_orxonox.diff
===================================================================
--- code/branches/presentation3/src/external/ceguilua/ceguilua-0.6.0/ceguilua/changes_orxonox.diff 2010-06-09 21:45:03 UTC (rev 7133)
+++ code/branches/presentation3/src/external/ceguilua/ceguilua-0.6.0/ceguilua/changes_orxonox.diff 2010-06-09 21:51:42 UTC (rev 7134)
@@ -66,7 +66,12 @@
}
--- CEGUILua.h Wed Jul 9 18:24:49 2008
+++ CEGUILua.h Thu Jan 29 10:17:07 2009
-@@ -38,7 +38,11 @@
+@@ -34,11 +34,15 @@
+ /*************************************************************************
+ Import / Export control macros
+ *************************************************************************/
+-#if (defined( __WIN32__ ) || defined( _WIN32 )) && !defined(CEGUI_STATIC)
++#if (defined( __WIN32__ ) || defined( _WIN32 )) && !defined(CEGUILUA_STATIC)
# ifdef CEGUILUA_EXPORTS
# define CEGUILUA_API __declspec(dllexport)
# else
Modified: code/branches/presentation3/src/external/ceguilua/ceguilua-0.6.1/ceguilua/CEGUILua.h
===================================================================
--- code/branches/presentation3/src/external/ceguilua/ceguilua-0.6.1/ceguilua/CEGUILua.h 2010-06-09 21:45:03 UTC (rev 7133)
+++ code/branches/presentation3/src/external/ceguilua/ceguilua-0.6.1/ceguilua/CEGUILua.h 2010-06-09 21:51:42 UTC (rev 7134)
@@ -34,7 +34,7 @@
/*************************************************************************
Import / Export control macros
*************************************************************************/
-#if (defined( __WIN32__ ) || defined( _WIN32 )) && !defined(CEGUI_STATIC)
+#if (defined( __WIN32__ ) || defined( _WIN32 )) && !defined(CEGUILUA_STATIC)
# ifdef CEGUILUA_EXPORTS
# define CEGUILUA_API __declspec(dllexport)
# else
Modified: code/branches/presentation3/src/external/ceguilua/ceguilua-0.6.1/ceguilua/changes_orxonox.diff
===================================================================
--- code/branches/presentation3/src/external/ceguilua/ceguilua-0.6.1/ceguilua/changes_orxonox.diff 2010-06-09 21:45:03 UTC (rev 7133)
+++ code/branches/presentation3/src/external/ceguilua/ceguilua-0.6.1/ceguilua/changes_orxonox.diff 2010-06-09 21:51:42 UTC (rev 7134)
@@ -1,6 +1,11 @@
--- CEGUILua.h Mi Jul 9 18:24:49 2008
+++ CEGUILua.h Do Jan 29 10:18:14 2009
-@@ -38,7 +38,11 @@
+@@ -34,11 +34,15 @@
+ /*************************************************************************
+ Import / Export control macros
+ *************************************************************************/
+-#if (defined( __WIN32__ ) || defined( _WIN32 )) && !defined(CEGUI_STATIC)
++#if (defined( __WIN32__ ) || defined( _WIN32 )) && !defined(CEGUILUA_STATIC)
# ifdef CEGUILUA_EXPORTS
# define CEGUILUA_API __declspec(dllexport)
# else
Modified: code/branches/presentation3/src/external/ceguilua/ceguilua-0.6.2/ceguilua/CEGUILua.h
===================================================================
--- code/branches/presentation3/src/external/ceguilua/ceguilua-0.6.2/ceguilua/CEGUILua.h 2010-06-09 21:45:03 UTC (rev 7133)
+++ code/branches/presentation3/src/external/ceguilua/ceguilua-0.6.2/ceguilua/CEGUILua.h 2010-06-09 21:51:42 UTC (rev 7134)
@@ -34,7 +34,7 @@
/*************************************************************************
Import / Export control macros
*************************************************************************/
-#if (defined( __WIN32__ ) || defined( _WIN32 )) && !defined(CEGUI_STATIC)
+#if (defined( __WIN32__ ) || defined( _WIN32 )) && !defined(CEGUILUA_STATIC)
# ifdef CEGUILUA_EXPORTS
# define CEGUILUA_API __declspec(dllexport)
# else
Modified: code/branches/presentation3/src/external/ceguilua/ceguilua-0.6.2/ceguilua/changes_orxonox.diff
===================================================================
--- code/branches/presentation3/src/external/ceguilua/ceguilua-0.6.2/ceguilua/changes_orxonox.diff 2010-06-09 21:45:03 UTC (rev 7133)
+++ code/branches/presentation3/src/external/ceguilua/ceguilua-0.6.2/ceguilua/changes_orxonox.diff 2010-06-09 21:51:42 UTC (rev 7134)
@@ -81,7 +81,12 @@
d_ownsState = false;
--- CEGUILua.h Sun Jan 25 18:32:57 2009
+++ CEGUILua.h Thu Jan 29 10:17:42 2009
-@@ -38,7 +38,11 @@
+@@ -34,11 +34,15 @@
+ /*************************************************************************
+ Import / Export control macros
+ *************************************************************************/
+-#if (defined( __WIN32__ ) || defined( _WIN32 )) && !defined(CEGUI_STATIC)
++#if (defined( __WIN32__ ) || defined( _WIN32 )) && !defined(CEGUILUA_STATIC)
# ifdef CEGUILUA_EXPORTS
# define CEGUILUA_API __declspec(dllexport)
# else
More information about the Orxonox-commit
mailing list