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

Patch from johnnyonflame to fix the GCW and Dingoo build process.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@3972 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2013-07-20 03:36:54 +00:00
parent e58035b51c
commit 62cdb8a9e6
4 changed files with 38 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
polymer/eduke32/Makefile.common
View file

@ -8,13 +8,14 @@ MAKEFILE_COMMON:=$(lastword $(MAKEFILE_LIST))
PRETTY_OUTPUT ?= 1 PRETTY_OUTPUT ?= 1
# Tools # Tools
CC=gcc CROSS=
CXX=g++ CC=$(CROSS)gcc
AS=nasm CXX=$(CROSS)g++
AR=ar AS=$(CROSS)nasm
RC=windres AR=$(CROSS)ar
RANLIB=ranlib RC=$(CROSS)windres
STRIP=strip RANLIB=$(CROSS)ranlib
STRIP=$(CROSS)strip
L_CC=$(CC) L_CC=$(CC)
L_CXX=$(CXX) L_CXX=$(CXX)
@ -102,9 +103,11 @@ ifndef SUBPLATFORM
endif endif
ifeq ($(PLATFORM),DINGOO) ifeq ($(PLATFORM),DINGOO)
SUBPLATFORM=LINUX SUBPLATFORM=LINUX
CROSS=mipsel-linux-
endif endif
ifeq ($(PLATFORM),GCW) ifeq ($(PLATFORM),GCW)
SUBPLATFORM=LINUX SUBPLATFORM=LINUX
CROSS=mipsel-linux-
endif endif
ifeq ($(PLATFORM),CAANOO) ifeq ($(PLATFORM),CAANOO)
SUBPLATFORM=LINUX SUBPLATFORM=LINUX
@ -144,7 +147,6 @@ ifeq (0,$(USE_OPENGL))
USE_LIBVPX = 0 USE_LIBVPX = 0
endif endif
# Debugging/Build options # Debugging/Build options
# CPLUSPLUS - 1 = enable C++ building # CPLUSPLUS - 1 = enable C++ building
# RELEASE - 1 = no debugging # RELEASE - 1 = no debugging
@ -304,6 +306,12 @@ endif
ifeq ($(PLATFORM),WII) ifeq ($(PLATFORM),WII)
override USE_LIBVPX = 0 override USE_LIBVPX = 0
endif endif
ifeq ($(PLATFORM),GCW)
override USE_LIBVPX = 0
endif
ifeq ($(PLATFORM),DINGOO)
override USE_LIBVPX = 0
endif
BASELIBS=-lm BASELIBS=-lm
BASELIBDIRS= BASELIBDIRS=
@ -428,6 +436,12 @@ ifeq ($(PLATFORM),DARWIN)
BASECOMMONFLAGS+= -I$(abspath $(dir $(MAKEFILE_COMMON))platform/Apple/include) \ BASECOMMONFLAGS+= -I$(abspath $(dir $(MAKEFILE_COMMON))platform/Apple/include) \
-I/opt/local/include -I/sw/include -I/usr/local/include -I/opt/local/include -I/sw/include -I/usr/local/include
endif endif
ifeq ($(PLATFORM),GCW)
BASECOMMONFLAGS += -D__OPENDINGUX__
endif
ifeq ($(PLATFORM),DINGOO)
BASECOMMONFLAGS += -D__OPENDINGUX__
endif
#### Lunatic development #### Lunatic development
# LuaJIT standalone interpreter executable: # LuaJIT standalone interpreter executable:

9
polymer/eduke32/build/Makefile.shared
View file

@ -70,6 +70,15 @@ ifeq ($(SUBPLATFORM),LINUX)
# presumably take care for us. # presumably take care for us.
STDCPPLIB:= STDCPPLIB:=
ifeq ($(PLATFORM),GCW)
override USE_OPENGL=0
override NOASM=1
endif
ifeq ($(PLATFORM),DINGOO)
override USE_OPENGL=0
override NOASM=1
endif
ifeq ($(findstring x86_64,$(SYSARCH)),x86_64) ifeq ($(findstring x86_64,$(SYSARCH)),x86_64)
ifeq (1,$(BUILD32_ON_64)) ifeq (1,$(BUILD32_ON_64))
# On my 64bit Gentoo these are the 32bit emulation libs # On my 64bit Gentoo these are the 32bit emulation libs

5
polymer/eduke32/build/include/compat.h
View file

@ -150,6 +150,11 @@ static inline float nearbyintf(float x)
# define longlong(x) x##ll # define longlong(x) x##ll
#endif #endif
#if defined __OPENDINGUX__
//ugly hack
#define nearbyintf rintf
#endif
#ifndef NULL #ifndef NULL
# define NULL ((void *)0) # define NULL ((void *)0)
#endif #endif

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

@ -263,8 +263,9 @@ void setvsync(int32_t sync)
static void attach_debugger_here(void) {} static void attach_debugger_here(void) {}
/* XXX: libexecinfo could be used on systems without gnu libc. */ /* XXX: libexecinfo could be used on systems without gnu libc. */
#if !defined _WIN32 && defined __GNUC__ && !defined __OpenBSD__ && !(defined __APPLE__ && defined __BIG_ENDIAN__) && !defined(GEKKO) && !defined(__ANDROID__) #if !defined _WIN32 && defined __GNUC__ && !defined __OpenBSD__ && !(defined __APPLE__ && defined __BIG_ENDIAN__) && !defined(GEKKO) && !defined(__ANDROID__) && !defined __OPENDINGUX__
# define PRINTSTACKONSEGV 1 # define PRINTSTACKONSEGV 1
# include <execinfo.h> # include <execinfo.h>
#endif #endif