| 
                Last change
                  on this file since 3372 was
                  2995,
                  checked in by bensch, 21 years ago
           | 
        
        
          | 
               
orxonox/trunk: merged branches/osX back into the Trunk. 
Conflicts resolved in Favor of trunk in all the Makefiles, and fixed many strange entries in configure.ac 
merged with command: svn merge branches/osX/ trunk/ -r 2887:HEAD 
AND most Important of all: change back to AUTOMAKE-1.7 
 
           | 
        
        | 
            File size:
            380 bytes
           | 
      
      
        
  | Line |   | 
|---|
| 1 |  | 
|---|
| 2 | #ifndef STDINCL_H | 
|---|
| 3 | #define STDINCL_H | 
|---|
| 4 |  | 
|---|
| 5 | #define null 0 | 
|---|
| 6 |  | 
|---|
| 7 | #ifdef __WIN32__ | 
|---|
| 8 | #include <windows.h> | 
|---|
| 9 | #endif | 
|---|
| 10 |  | 
|---|
| 11 | #ifndef __APPLE__ | 
|---|
| 12 | #include <SDL/SDL.h> | 
|---|
| 13 | #else | 
|---|
| 14 | #include <SDL.h> | 
|---|
| 15 | #endif | 
|---|
| 16 |  | 
|---|
| 17 | #include <GL/gl.h> | 
|---|
| 18 | #include <GL/glu.h> | 
|---|
| 19 |  | 
|---|
| 20 | #include "vector.h" | 
|---|
| 21 | #include "coordinates.h" | 
|---|
| 22 | #include "list.h" | 
|---|
| 23 | #include "list_template.h" | 
|---|
| 24 | #include "error.h" | 
|---|
| 25 | #include "message_structures.h" | 
|---|
| 26 | #include "orxonox.h" | 
|---|
| 27 |  | 
|---|
| 28 | #endif | 
|---|
       
      
      Note: See 
TracBrowser
        for help on using the repository browser.