Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 3790 in orxonox.OLD for orxonox/trunk/src/defs


Ignore:
Timestamp:
Apr 13, 2005, 12:33:07 PM (20 years ago)
Author:
bensch
Message:

orxonox/trunk: merged the textEngine back into the trunk.
merged with command:
svn merge -r 3681:HEAD branches/textEngine/ trunk/

conflicts in:
world.cc/h orxonox.cc NEWS
changed in favor of the trunk

Location:
orxonox/trunk/src/defs
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • orxonox/trunk/src/defs/debug.h

    r3752 r3790  
    7171#define DEBUG_MODULE_PLAYER             1
    7272#define DEBUG_MODULE_MATH               0
     73#define DEBUG_MODULE_FONT               4
    7374
    7475#define DEBUG_MODULE_NULL_PARENT        0

  • orxonox/trunk/src/defs/glincl.h

    r3492 r3790  
    99#define _GLINCL_H
    1010
     11#include <SDL.h>
     12
    1113#ifndef __APPLE__
    12 #include <SDL/SDL.h>
    1314#include <GL/gl.h>
    1415#include <GL/glu.h>
    1516#else
    16 #include <SDL.h>
    1717#include <OpenGL/gl.h>
    1818#include <OpenGL/glu.h>
Note: See TracChangeset for help on using the changeset viewer.