Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 5695 for code/trunk/src/util


Ignore:
Timestamp:
Aug 30, 2009, 2:22:00 AM (15 years ago)
Author:
rgrieder
Message:

Merged resource2 branch back to trunk.

IMPORTANT NOTE:
Upon this merge you need to specifically call your data directory "data_extern" when checking it out (when you don't provide a name, it will be just called 'trunk').
The new CMake variable is EXTERNAL_DATA_DIRECTORY. DATA_DIRECTORY now points to the one the source part of the repository.
UPDATE YOUR DATA DIRECTORY AS WELL!!!

Location:
code/trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • code/trunk

  • code/trunk/src/util/CMakeLists.txt

    r5693 r5695  
    3434)
    3535
     36SET_SOURCE_FILES(UTIL_HDR_FILES
     37  CRC32.h
     38  Clipboard.h
     39  Convert.h
     40  Debug.h
     41  Exception.h
     42  ExprParser.h
     43  Math.h
     44  MathConvert.h
     45  mbool.h
     46  MultiType.h
     47  MultiTypeValue.h
     48  OgreForwardRefs.h
     49  OrxAssert.h
     50  OrxEnum.h
     51  OutputBuffer.h
     52  OutputHandler.h
     53  RefToValue.h
     54  ScopeGuard.h
     55  Serialise.h
     56  SignalHandler.h
     57  Singleton.h
     58  Sleep.h
     59  StringUtils.h
     60  SubString.h
     61  TemplateUtils.h
     62  TypeTraits.h
     63  UTFStringConversions.h
     64  UtilPrereqs.h
     65)
     66
    3667IF(GCC_NO_SYSTEM_HEADER_SUPPORT)
    3768  # Get around displaying a few hundred lines of warning code
    … …  
    4071
    4172ORXONOX_ADD_LIBRARY(util
    42   FIND_HEADER_FILES
    4373  DEFINE_SYMBOL
    4474    "UTIL_SHARED_BUILD"
    … …  
    4676    ${OGRE_LIBRARY}
    4777  SOURCE_FILES
    48     ${UTIL_SRC_FILES}
     78    ${UTIL_SRC_FILES} ${UTIL_HDR_FILES}
    4979)

  • code/trunk/src/util/Debug.h

    r3196 r5695  
    2929/**
    3030    @file
    31     @brief Handles different output-levels of errors, warnings, infos and debug informations.
     31    @brief Handles different output-levels of errors, warnings, infos and debug information.
    3232
    3333    The COUT(level) macro acts like std::cout, but the output is only performed if the given
    … …  
    4545     1: Errors
    4646     2: Warnings
    47      3: Informations
     47     3: Information
    4848     4: Debug information
    4949     5: More debug information
    50      6: Crazy debug informations
     50     6: Crazy debug information
    5151
    5252    @example
Note: See TracChangeset for help on using the changeset viewer.