maj/OpenArena
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed Fixed .bmp loading on big endian systems.

Browse Source
This commit is contained in:
Tom Hicks
2006-07-03 06:10:27 -04:00
parent 1fe42b753d
commit e8301e907b
3 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/bmp.cpp
View File

@@ -19,7 +19,12 @@
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
#include <cstdio> #include <cstdio>
#ifdef WIN32
#include <windows.h>
#endif
#include <GL/gl.h>
#include "bmp.h" #include "bmp.h"
#include "datatypes.h"
#ifdef WIN32 #ifdef WIN32
#pragma warning(disable:4996) #pragma warning(disable:4996)
#endif #endif

2
src/bmp.h
View File

@@ -1,8 +1,6 @@
#ifndef __bmp_h__ #ifndef __bmp_h__
#define __bmp_h__ #define __bmp_h__
#include "mygl.h"
#include "datatypes.h"
#include "texture.h" #include "texture.h"
namespace OpenArena{ namespace OpenArena{

6
src/tga.h
View File

@@ -4,14 +4,8 @@
#pragma comment(lib, "OpenGL32.lib") #pragma comment(lib, "OpenGL32.lib")
#ifdef WIN32 #ifdef WIN32
#include <windows.h> //I think this was only needed because gl.h uses it #include <windows.h> //I think this was only needed because gl.h uses it
#include <GL/gl.h>
#endif #endif
#ifdef __linux
#include <GL/gl.h> #include <GL/gl.h>
#endif
#ifdef __APPLE__
#include <GL/gl.h>
#endif
#include <cstdio> #include <cstdio>
#include <string> #include <string>
#include "texture.h" #include "texture.h"