Changeset 7142 for code/branches/presentation3
- Timestamp:
- Jun 10, 2010, 11:48:59 AM (14 years ago)
- Location:
- code/branches/presentation3/src
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/presentation3/src/CMakeLists.txt
r5781 r7142 40 40 ADD_COMPILER_FLAGS("-DENET_DLL" WIN32 LINK_ENET_DYNAMIC) 41 41 ADD_COMPILER_FLAGS("-DLUA_BUILD_AS_DLL" WIN32 LINK_LUA_DYNAMIC) 42 ADD_COMPILER_FLAGS("-DOIS_DYNAMIC_LIB")43 42 ADD_COMPILER_FLAGS("-DZLIB_DLL" WIN32 LINK_ZLIB_DYNAMIC) 44 43 # If no defines are specified, these libs get linked dynamically -
code/branches/presentation3/src/external/ois/CMakeLists.txt
r7141 r7142 57 57 ORXONOX_EXTERNAL 58 58 DEFINE_SYMBOL 59 shared "OIS_NONCLIENT_BUILD" static "OIS_STATIC "59 shared "OIS_NONCLIENT_BUILD" static "OIS_STATIC_LIB" 60 60 VERSION 61 61 1.2 -
code/branches/presentation3/src/external/ois/OISPrereqs.h
r5781 r7142 61 61 # else 62 62 # define OIS_WIN32_PLATFORM 63 # if defined( OIS_DYNAMIC_LIB )63 # if !defined( OIS_STATIC_LIB ) 64 64 # undef _OISExport 65 65 //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) 1 12 --- linux/EventHelpers.cpp (revision 5668) 2 13 +++ linux/EventHelpers.cpp (working copy)
Note: See TracChangeset
for help on using the changeset viewer.