zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-25 03:00:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Bring the SDL.h include in SDLMain.m up to speed with driver_sdl.c in jaudiolib and sdl_inc.h in the engine. Also address some Apple macro problems.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@3368 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2013-01-04 17:28:13 +00:00
parent 5493583140
commit 748e217a19
3 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
polymer/eduke32/Apple/SDLMain.m
View file

@ -5,8 +5,14 @@
Feel free to customize this file to suit your needs Feel free to customize this file to suit your needs
*/ */
#include "SDL.h" #if defined(SDL_FRAMEWORK)
# include <SDL/SDL.h>
#else
# include "SDL.h"
#endif
#include "SDLMain.h" #include "SDLMain.h"
#include <sys/param.h> /* for MAXPATHLEN */ #include <sys/param.h> /* for MAXPATHLEN */
#include <unistd.h> #include <unistd.h>

2
polymer/eduke32/Makefile.common
View file

@ -121,7 +121,7 @@ EXESUFFIX_OVERRIDE ?=
# Mac OS X Frameworks location # Mac OS X Frameworks location
# Like above, use absolute paths. # Like above, use absolute paths.
APPLE_FRAMEWORKS ?=/Library/Frameworks APPLE_FRAMEWORKS ?=/Library/Frameworks
# Since the OS X startup window is generating errors, give it an off switch. # Without the resource files packaged in the .app bundle, the startupwindow produces errors, so give it an off switch.
OSX_STARTUPWINDOW ?= 1 OSX_STARTUPWINDOW ?= 1
# Engine options # Engine options

7
polymer/eduke32/build/src/sdlayer.c
View file

@ -39,17 +39,12 @@
# include "gtkbits.h" # include "gtkbits.h"
#endif #endif
#if defined __APPLE__ || !defined HAVE_GTK2 #if !defined _WIN32 && !defined HAVE_GTK2 && !defined __APPLE__
# undef UNREFERENCED_PARAMETER
# define UNREFERENCED_PARAMETER(x) x=x
# if !defined _WIN32 && (!defined __APPLE__ || !defined OSX_STARTUPWINDOW)
int32_t startwin_open(void) { return 0; } int32_t startwin_open(void) { return 0; }
int32_t startwin_close(void) { return 0; } int32_t startwin_close(void) { return 0; }
int32_t startwin_puts(const char *s) { UNREFERENCED_PARAMETER(s); return 0; } int32_t startwin_puts(const char *s) { UNREFERENCED_PARAMETER(s); return 0; }
int32_t startwin_idle(void *s) { UNREFERENCED_PARAMETER(s); return 0; } int32_t startwin_idle(void *s) { UNREFERENCED_PARAMETER(s); return 0; }
int32_t startwin_settitle(const char *s) { UNREFERENCED_PARAMETER(s); return 0; } int32_t startwin_settitle(const char *s) { UNREFERENCED_PARAMETER(s); return 0; }
# endif
#endif #endif
#if SDL_MAJOR_VERSION==2 #if SDL_MAJOR_VERSION==2