mirror of
https://github.com/ZDoom/raze-gles.git
synced 2024-12-24 10:40:46 +00:00
Fix building on Linux; fix WITHOUT_GTK=0 build.
git-svn-id: https://svn.eduke32.com/eduke32@3279 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
parent
dac94ce284
commit
d429aad9f2
2 changed files with 5 additions and 4 deletions
|
@ -68,6 +68,7 @@ ifeq ($(SUBPLATFORM),LINUX)
|
||||||
RENDERTYPE=SDL
|
RENDERTYPE=SDL
|
||||||
BUILDCOMMONFLAGS+= -DHAVE_INTTYPES
|
BUILDCOMMONFLAGS+= -DHAVE_INTTYPES
|
||||||
GTKCOMPAT32=0
|
GTKCOMPAT32=0
|
||||||
|
SDL_FRAMEWORK=0
|
||||||
|
|
||||||
ifeq ($(findstring x86_64,$(SYSARCH)),x86_64)
|
ifeq ($(findstring x86_64,$(SYSARCH)),x86_64)
|
||||||
ifeq (1,$(BUILD32_ON_64))
|
ifeq (1,$(BUILD32_ON_64))
|
||||||
|
|
|
@ -39,11 +39,11 @@
|
||||||
# include "gtkbits.h"
|
# include "gtkbits.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if (!defined __APPLE__ && !defined HAVE_GTK2) || (defined __APPLE__) // && defined __BIG_ENDIAN__)
|
#if defined __APPLE__ || !defined HAVE_GTK2
|
||||||
#undef UNREFERENCED_PARAMETER
|
# undef UNREFERENCED_PARAMETER
|
||||||
#define UNREFERENCED_PARAMETER(x) x=x
|
# define UNREFERENCED_PARAMETER(x) x=x
|
||||||
|
|
||||||
# if !defined _WIN32 && !defined OSX_STARTUPWINDOW
|
# 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; }
|
||||||
|
|
Loading…
Reference in a new issue