Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 2215 for code/branches


Ignore:
Timestamp:
Nov 18, 2008, 6:29:15 PM (16 years ago)
Author:
rgrieder
Message:

Reapplied lost bugfix for mingw with CEGUILua.h

Location:
code/branches/buildsystem/src
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • code/branches/buildsystem/src/ceguilua-0.5.0/ceguilua/CEGUILua.h

    r1980 r2215  
    3232
    3333
     34/*** CHANGES BY ORXONOX TEAM FOR MINGW32 ***/
    3435/*************************************************************************
    3536        Import / Export control macros
    3637*************************************************************************/
    37 #if defined( __WIN32__ ) || defined( _WIN32 )
     38#if (defined( __WIN32__ ) || defined( _WIN32 )) && !defined(CEGUI_STATIC)
    3839#   ifdef CEGUILUA_EXPORTS
    3940#       define CEGUILUA_API __declspec(dllexport)
    4041#   else
    41 #       define CEGUILUA_API __declspec(dllimport)
     42#      if defined( __MINGW32__ )
     43#          define CEGUILUA_API
     44#      else
     45#          define CEGUILUA_API __declspec(dllimport)
     46#      endif
    4247#   endif
    4348#else

  • code/branches/buildsystem/src/ceguilua-0.6.1/ceguilua/CEGUILua.h

    r1982 r2215  
    3131#define _CEGUILua_h_
    3232
    33 
     33/*** CHANGES BY ORXONOX TEAM FOR MINGW32 ***/
    3434/*************************************************************************
    3535        Import / Export control macros
    … …  
    3939#       define CEGUILUA_API __declspec(dllexport)
    4040#   else
    41 #       define CEGUILUA_API __declspec(dllimport)
     41#      if defined( __MINGW32__ )
     42#          define CEGUILUA_API
     43#      else
     44#          define CEGUILUA_API __declspec(dllimport)
     45#      endif
    4246#   endif
    4347#else
Note: See TracChangeset for help on using the changeset viewer.