Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 7134


Ignore:
Timestamp:
Jun 9, 2010, 11:51:42 PM (14 years ago)
Author:
rgrieder
Message:

CEGUILua should use its own macros for static builds.

Location:
code/branches/presentation3/src/external/ceguilua
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • code/branches/presentation3/src/external/ceguilua/ceguilua-0.6.0/ceguilua/CEGUILua.h

    r5781 r7134  
    3535        Import / Export control macros
    3636*************************************************************************/
    37 #if (defined( __WIN32__ ) || defined( _WIN32 )) && !defined(CEGUI_STATIC)
     37#if (defined( __WIN32__ ) || defined( _WIN32 )) && !defined(CEGUILUA_STATIC)
    3838#   ifdef CEGUILUA_EXPORTS
    3939#       define CEGUILUA_API __declspec(dllexport)

  • code/branches/presentation3/src/external/ceguilua/ceguilua-0.6.0/ceguilua/changes_orxonox.diff

    r5781 r7134  
    6767--- CEGUILua.h  Wed Jul  9 18:24:49 2008
    6868+++ CEGUILua.h  Thu Jan 29 10:17:07 2009
    69 @@ -38,7 +38,11 @@
     69@@ -34,11 +34,15 @@
     70 /*************************************************************************
     71        Import / Export control macros
     72 *************************************************************************/
     73-#if (defined( __WIN32__ ) || defined( _WIN32 )) && !defined(CEGUI_STATIC)
     74+#if (defined( __WIN32__ ) || defined( _WIN32 )) && !defined(CEGUILUA_STATIC)
    7075 #   ifdef CEGUILUA_EXPORTS
    7176 #       define CEGUILUA_API __declspec(dllexport)

  • code/branches/presentation3/src/external/ceguilua/ceguilua-0.6.1/ceguilua/CEGUILua.h

    r5781 r7134  
    3535        Import / Export control macros
    3636*************************************************************************/
    37 #if (defined( __WIN32__ ) || defined( _WIN32 )) && !defined(CEGUI_STATIC)
     37#if (defined( __WIN32__ ) || defined( _WIN32 )) && !defined(CEGUILUA_STATIC)
    3838#   ifdef CEGUILUA_EXPORTS
    3939#       define CEGUILUA_API __declspec(dllexport)

  • code/branches/presentation3/src/external/ceguilua/ceguilua-0.6.1/ceguilua/changes_orxonox.diff

    r5781 r7134  
    11--- CEGUILua.h  Mi Jul  9 18:24:49 2008
    22+++ CEGUILua.h  Do Jan 29 10:18:14 2009
    3 @@ -38,7 +38,11 @@
     3@@ -34,11 +34,15 @@
     4 /*************************************************************************
     5        Import / Export control macros
     6 *************************************************************************/
     7-#if (defined( __WIN32__ ) || defined( _WIN32 )) && !defined(CEGUI_STATIC)
     8+#if (defined( __WIN32__ ) || defined( _WIN32 )) && !defined(CEGUILUA_STATIC)
    49 #   ifdef CEGUILUA_EXPORTS
    510 #       define CEGUILUA_API __declspec(dllexport)

  • code/branches/presentation3/src/external/ceguilua/ceguilua-0.6.2/ceguilua/CEGUILua.h

    r5781 r7134  
    3535        Import / Export control macros
    3636*************************************************************************/
    37 #if (defined( __WIN32__ ) || defined( _WIN32 )) && !defined(CEGUI_STATIC)
     37#if (defined( __WIN32__ ) || defined( _WIN32 )) && !defined(CEGUILUA_STATIC)
    3838#   ifdef CEGUILUA_EXPORTS
    3939#       define CEGUILUA_API __declspec(dllexport)

  • code/branches/presentation3/src/external/ceguilua/ceguilua-0.6.2/ceguilua/changes_orxonox.diff

    r6762 r7134  
    8282--- CEGUILua.h  Sun Jan 25 18:32:57 2009
    8383+++ CEGUILua.h  Thu Jan 29 10:17:42 2009
    84 @@ -38,7 +38,11 @@
     84@@ -34,11 +34,15 @@
     85 /*************************************************************************
     86        Import / Export control macros
     87 *************************************************************************/
     88-#if (defined( __WIN32__ ) || defined( _WIN32 )) && !defined(CEGUI_STATIC)
     89+#if (defined( __WIN32__ ) || defined( _WIN32 )) && !defined(CEGUILUA_STATIC)
    8590 #   ifdef CEGUILUA_EXPORTS
    8691 #       define CEGUILUA_API __declspec(dllexport)
Note: See TracChangeset for help on using the changeset viewer.