zdoom
/
qzdoom
mirror of https://github.com/ZDoom/qzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed compilation issues with GCC 4.2

This commit is contained in:
alexey.lysiuk 2014-12-28 17:11:30 +02:00
parent a67dc4148b
commit 4662069b94
4 changed files with 33 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/posix/cocoa/i_common.h
View File

@ -31,7 +31,10 @@
** **
*/ */
#include <AppKit/NSApplication.h> #import <AppKit/NSApplication.h>
#import <AppKit/NSScreen.h>
#import <AppKit/NSView.h>
#import <AppKit/NSWindow.h>
inline bool I_IsHiDPISupported() inline bool I_IsHiDPISupported()

10
src/posix/cocoa/i_input.mm
View File

@ -31,8 +31,12 @@
** **
*/ */
#include <AppKit/AppKit.h> #import <AppKit/NSCursor.h>
#include <Carbon/Carbon.h> #import <AppKit/NSEvent.h>
#import <Carbon/Carbon.h>
// Avoid collision between DObject class and Objective-C
#define Class ObjectClass
#include "c_console.h" #include "c_console.h"
#include "c_cvars.h" #include "c_cvars.h"
@ -47,6 +51,8 @@
#include "i_common.h" #include "i_common.h"
#include "i_rbopts.h" #include "i_rbopts.h"
#undef Class
EXTERN_CVAR(Int, m_use_mouse) EXTERN_CVAR(Int, m_use_mouse)

9
src/posix/cocoa/i_main.mm
View File

@ -33,8 +33,11 @@
#include <sys/sysctl.h> #include <sys/sysctl.h>
#include <AppKit/NSMenu.h> #import <AppKit/NSMenu.h>
#include <AppKit/NSScreen.h> #import <AppKit/NSEvent.h>
// Avoid collision between DObject class and Objective-C
#define Class ObjectClass
#include "c_console.h" #include "c_console.h"
#include "c_cvars.h" #include "c_cvars.h"
@ -50,6 +53,8 @@
#include "i_osversion.h" #include "i_osversion.h"
#include "i_rbopts.h" #include "i_rbopts.h"
#undef Class
#define ZD_UNUSED(VARIABLE) ((void)(VARIABLE)) #define ZD_UNUSED(VARIABLE) ((void)(VARIABLE))

25
src/posix/cocoa/i_video.mm
View File

@ -31,16 +31,17 @@
** **
*/ */
#include <AppKit/NSBitmapImageRep.h> #import <AppKit/NSButton.h>
#include <AppKit/NSButton.h> #import <AppKit/NSCursor.h>
#include <AppKit/NSCursor.h> #import <AppKit/NSImage.h>
#include <AppKit/NSImage.h> #import <AppKit/NSOpenGL.h>
#include <AppKit/NSOpenGL.h> #import <AppKit/NSOpenGLView.h>
#include <AppKit/NSOpenGLView.h> #import <Carbon/Carbon.h>
#include <AppKit/NSWindow.h> #import <OpenGL/gl.h>
#include <Carbon/Carbon.h> #import <OpenGL/OpenGL.h>
#include <OpenGL/gl.h>
#include <OpenGL/OpenGL.h> // Avoid collision between DObject class and Objective-C
#define Class ObjectClass
#include "bitmap.h" #include "bitmap.h"
#include "c_dispatch.h" #include "c_dispatch.h"
@ -61,6 +62,8 @@
#include "i_common.h" #include "i_common.h"
#include "i_rbopts.h" #include "i_rbopts.h"
#undef Class
EXTERN_CVAR(Bool, ticker ) EXTERN_CVAR(Bool, ticker )
EXTERN_CVAR(Bool, vid_vsync) EXTERN_CVAR(Bool, vid_vsync)
@ -215,7 +218,7 @@ public:
virtual void SetVSync(bool vsync); virtual void SetVSync(bool vsync);
private: private:
const size_t BYTES_PER_PIXEL = 4; static const size_t BYTES_PER_PIXEL = 4;
PalEntry m_palette[256]; PalEntry m_palette[256];
bool m_needPaletteUpdate; bool m_needPaletteUpdate;