| 
                Last change
                  on this file since 10910 was
                  8729,
                  checked in by rgrieder, 14 years ago
           | 
        
        
          | 
               
Merged unity_build branch back to trunk. 
 
Features: 
 
- Implemented fully automatic build units to speed up compilation if requested
 - Added DOUT macro for quick debug output
 - Activated text colouring in the POSIX IOConsole
 - DeclareToluaInterface is not necessary anymore
 
 
Improvements: 
 
- Output levels now change appropriately when switch back and forth from dev mode
 - Log level for the file output is now also correct during startup
 - Removed some header file dependencies in core and tools to speed up compilation
 
 
no more file for command line options 
 
- Improved util::tribool by adapting some concepts from boost::tribool
 
 
Regressions: 
 
- It is not possible anymore to specify command line arguments in an extra file because we've got config values for that purpose.
  
           | 
        
        
          
            
              - 
                  Property svn:eol-style set to
                  
native
               
             
           | 
        
        | 
            File size:
            2.0 KB
           | 
      
      
        
  | Rev | Line |   | 
|---|
| [2710] | 1 |  # | 
|---|
 | 2 |  #             ORXONOX - the hottest 3D action shooter ever to exist | 
|---|
 | 3 |  #                             > www.orxonox.net < | 
|---|
 | 4 |  # | 
|---|
 | 5 |  #        This program is free software; you can redistribute it and/or | 
|---|
 | 6 |  #         modify it under the terms of the GNU General Public License | 
|---|
 | 7 |  #        as published by the Free Software Foundation; either version 2 | 
|---|
 | 8 |  #            of the License, or (at your option) any later version. | 
|---|
 | 9 |  # | 
|---|
 | 10 |  #       This program is distributed in the hope that it will be useful, | 
|---|
 | 11 |  #        but WITHOUT ANY WARRANTY; without even the implied warranty of | 
|---|
 | 12 |  #        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the | 
|---|
 | 13 |  #                 GNU General Public License for more details. | 
|---|
 | 14 |  # | 
|---|
 | 15 |  #   You should have received a copy of the GNU General Public License along | 
|---|
 | 16 |  #      with this program; if not, write to the Free Software Foundation, | 
|---|
 | 17 |  #     Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. | 
|---|
 | 18 |  # | 
|---|
| [1555] | 19 |  | 
|---|
| [2710] | 20 | SET_SOURCE_FILES(OIS_FILES | 
|---|
 | 21 |   OIS.h | 
|---|
 | 22 |   OISConfig.h | 
|---|
 | 23 |   OISEffect.h | 
|---|
 | 24 |   OISEvents.h | 
|---|
 | 25 |   OISException.h | 
|---|
 | 26 |   OISFactoryCreator.h | 
|---|
 | 27 |   OISForceFeedback.h | 
|---|
 | 28 |   OISInputManager.h | 
|---|
 | 29 |   OISInterface.h | 
|---|
 | 30 |   OISJoyStick.h | 
|---|
 | 31 |   OISKeyboard.h | 
|---|
 | 32 |   OISMouse.h | 
|---|
| [8351] | 33 |   OISMultiTouch.h | 
|---|
| [2710] | 34 |   OISObject.h | 
|---|
 | 35 |   OISPrereqs.h | 
|---|
 | 36 |  | 
|---|
| [1505] | 37 |   OISEffect.cpp | 
|---|
 | 38 |   OISException.cpp | 
|---|
 | 39 |   OISForceFeedback.cpp | 
|---|
 | 40 |   OISInputManager.cpp | 
|---|
 | 41 |   OISJoyStick.cpp | 
|---|
 | 42 |   OISKeyboard.cpp | 
|---|
 | 43 |   OISObject.cpp | 
|---|
 | 44 | ) | 
|---|
| [8729] | 45 |  | 
|---|
| [1505] | 46 | IF(WIN32) | 
|---|
| [2710] | 47 |   ADD_SUBDIRECTORY(win32) | 
|---|
 | 48 | ELSEIF(APPLE) | 
|---|
 | 49 |   ADD_SUBDIRECTORY(mac) | 
|---|
 | 50 | ELSEIF(UNIX) | 
|---|
 | 51 |   ADD_SUBDIRECTORY(linux) | 
|---|
 | 52 | ENDIF() | 
|---|
| [1505] | 53 |  | 
|---|
| [8351] | 54 | # MinGW doesn't come with some required Windows headers | 
|---|
 | 55 | IF(MINGW) | 
|---|
 | 56 |   INCLUDE_DIRECTORIES(${WMI_INCLUDE_DIR}) | 
|---|
 | 57 | ENDIF() | 
|---|
| [2710] | 58 |  | 
|---|
| [8729] | 59 | # Apple has problems with OIS and build units | 
|---|
 | 60 | IF(APPLE) | 
|---|
 | 61 |   SET(USE_BUILD_UNITS NO_BUILD_UNITS) | 
|---|
 | 62 | ENDIF() | 
|---|
 | 63 |  | 
|---|
| [3196] | 64 | ORXONOX_ADD_LIBRARY(ois_orxonox | 
|---|
 | 65 |   ORXONOX_EXTERNAL | 
|---|
 | 66 |   DEFINE_SYMBOL | 
|---|
 | 67 |     "OIS_NONCLIENT_BUILD" | 
|---|
 | 68 |   VERSION | 
|---|
| [8351] | 69 |     1.3 | 
|---|
 | 70 |   LINK_LIBS_WIN32 | 
|---|
 | 71 |     ${DIRECTX_LIBRARIES} | 
|---|
 | 72 |     ${WMI_LIBRARY} | 
|---|
 | 73 |   LINK_LIBS_APPLE | 
|---|
 | 74 |     /System/Library/Frameworks/IOKit.framework | 
|---|
 | 75 |     /System/Library/Frameworks/Carbon.framework | 
|---|
 | 76 |   LINK_LIBS_LINUX | 
|---|
 | 77 |     X11 | 
|---|
| [8729] | 78 |   ${USE_BUILD_UNITS} | 
|---|
| [3196] | 79 |   SOURCE_FILES | 
|---|
 | 80 |     ${OIS_FILES} | 
|---|
 | 81 | ) | 
|---|
       
      
      Note: See 
TracBrowser
        for help on using the repository browser.