Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 7142


Ignore:
Timestamp:
Jun 10, 2010, 11:48:59 AM (14 years ago)
Author:
rgrieder
Message:

Changed default linking behaviour of OIS to dynamic. That causes less confusions because all other libraries link dynamically per default (or don't require any macros because there is no DLL interface).

Location:
code/branches/presentation3/src
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • code/branches/presentation3/src/CMakeLists.txt

    r5781 r7142  
    4040ADD_COMPILER_FLAGS("-DENET_DLL"           WIN32 LINK_ENET_DYNAMIC)
    4141ADD_COMPILER_FLAGS("-DLUA_BUILD_AS_DLL"   WIN32 LINK_LUA_DYNAMIC)
    42 ADD_COMPILER_FLAGS("-DOIS_DYNAMIC_LIB")
    4342ADD_COMPILER_FLAGS("-DZLIB_DLL"           WIN32 LINK_ZLIB_DYNAMIC)
    4443# If no defines are specified, these libs get linked dynamically

  • code/branches/presentation3/src/external/ois/CMakeLists.txt

    r7141 r7142  
    5757  ORXONOX_EXTERNAL
    5858  DEFINE_SYMBOL
    59     shared "OIS_NONCLIENT_BUILD" static "OIS_STATIC"
     59    shared "OIS_NONCLIENT_BUILD" static "OIS_STATIC_LIB"
    6060  VERSION
    6161    1.2

  • code/branches/presentation3/src/external/ois/OISPrereqs.h

    r5781 r7142  
    6161#       else
    6262#               define OIS_WIN32_PLATFORM
    63 #               if defined( OIS_DYNAMIC_LIB )
     63#               if !defined( OIS_STATIC_LIB )
    6464#                       undef _OISExport
    6565                        //Ignorable Dll interface warning...

  • code/branches/presentation3/src/external/ois/changes_orxonox.diff

    r5929 r7142  
     1--- OISPrereqs.h        (revision 7141)
     2+++ OISPrereqs.h        (working copy)
     3@@ -60,7 +60,7 @@
     4 #              define OIS_XBOX_PLATFORM
     5 #      else
     6 #              define OIS_WIN32_PLATFORM
     7-#              if defined( OIS_DYNAMIC_LIB )
     8+#              if !defined( OIS_STATIC_LIB )
     9 #                      undef _OISExport
     10                        //Ignorable Dll interface warning...
     11 #           if !defined(OIS_MINGW_COMPILER)
    112--- linux/EventHelpers.cpp      (revision 5668)
    213+++ linux/EventHelpers.cpp      (working copy)
Note: See TracChangeset for help on using the changeset viewer.