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

git-svn-id: https://svn.eduke32.com/eduke32@557 1a8010ca-5511-0410-912e-c29ae57300e0

Browse source
This commit is contained in:
terminx 2007-08-17 19:32:56 +00:00
parent 4e0f8281c7
commit 9704ade66c
4 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
polymer/build/Makefile
View file

@ -11,12 +11,14 @@
# POLYMOST - enables Polymost renderer # POLYMOST - enables Polymost renderer
# USE_OPENGL - enables OpenGL support in Polymost # USE_OPENGL - enables OpenGL support in Polymost
# NOASM - disables the use of inline assembly pragmas # NOASM - disables the use of inline assembly pragmas
# LINKED_GTK - enables compile-time linkage to GTK
# #
SUPERBUILD ?= 1 SUPERBUILD ?= 1
POLYMOST ?= 1 POLYMOST ?= 1
USE_OPENGL ?= 1 USE_OPENGL ?= 1
NOASM ?= 0 NOASM ?= 0
LINKED_GTK ?= 0
# Debugging options # Debugging options
# RELEASE - 1 = no debugging # RELEASE - 1 = no debugging

9
polymer/build/Makefile.shared
View file

@ -113,10 +113,12 @@ ifeq ($(RENDERTYPE),SDL)
# on my 64bit Gentoo box I have Cairo enabled which means the libs list includes # on my 64bit Gentoo box I have Cairo enabled which means the libs list includes
# -lpangocairo-1.0 and -lcairo, however the 32bit compatibility libraries don't # -lpangocairo-1.0 and -lcairo, however the 32bit compatibility libraries don't
# include cairo, so we need to filter out those -l switches in order to link # include cairo, so we need to filter out those -l switches in order to link
ifneq ($(LINKED_GTK),0)
ifeq ($(GTKCOMPAT32),1) ifeq ($(GTKCOMPAT32),1)
# LIBS+= $(shell pkg-config --libs gtk+-2.0 | sed 's/\s-l\(pango\)\{0,1\}cairo\S*\s/ /g') LIBS+= $(shell pkg-config --libs gtk+-2.0 | sed 's/\s-l\(pango\)\{0,1\}cairo\S*\s/ /g')
else else
# LIBS+= $(shell pkg-config --libs gtk+-2.0) LIBS+= $(shell pkg-config --libs gtk+-2.0)
endif
endif endif
else else
HAVE_GTK2=0 HAVE_GTK2=0
@ -142,4 +144,7 @@ endif
ifneq (0,$(NOASM)) ifneq (0,$(NOASM))
BUILDCFLAGS+= -DNOASM BUILDCFLAGS+= -DNOASM
endif endif
ifneq (0,$(LINKED_GTK))
BUILDCFLAGS+= -DLINKED_GTK
endif

1
polymer/eduke32/Makefile
View file

@ -8,6 +8,7 @@ SUPERBUILD = 1
POLYMOST = 1 POLYMOST = 1
USE_OPENGL = 1 USE_OPENGL = 1
NOASM = 0 NOASM = 0
LINKED_GTK = 0
# Debugging options # Debugging options
RELEASE?=1 RELEASE?=1

4
polymer/eduke32/source/grpscan.c
View file

@ -13,8 +13,8 @@ struct grpfile grpfiles[numgrpfiles] =
{ "Duke Nukem 3D", 0xBBC9CE44, 26524524, GAMEDUKE, NULL }, { "Duke Nukem 3D", 0xBBC9CE44, 26524524, GAMEDUKE, NULL },
{ "Duke Nukem 3D: Atomic Edition", 0xF514A6AC, 44348015, GAMEDUKE, NULL }, { "Duke Nukem 3D: Atomic Edition", 0xF514A6AC, 44348015, GAMEDUKE, NULL },
{ "Duke Nukem 3D: Atomic Edition", 0xFD3DCFF1, 44356548, GAMEDUKE, NULL }, { "Duke Nukem 3D: Atomic Edition", 0xFD3DCFF1, 44356548, GAMEDUKE, NULL },
{ "Duke Nukem 3D Shareware Version", 0x983AD923, 11035779, GAMEDUKE, NULL }, { "Duke Nukem 3D Shareware", 0x983AD923, 11035779, GAMEDUKE, NULL },
{ "Duke Nukem 3D Mac Shareware Version", 0xC5F71561, 10444391, GAMEDUKE, NULL }, { "Duke Nukem 3D Mac Shareware", 0xC5F71561, 10444391, GAMEDUKE, NULL },
{ "Duke Nukem 3D Mac", 0x00000000, 0, GAMEDUKE, NULL }, { "Duke Nukem 3D Mac", 0x00000000, 0, GAMEDUKE, NULL },
{ "NAM", 0x75C1F07B, 43448927, GAMENAM, NULL }, { "NAM", 0x75C1F07B, 43448927, GAMENAM, NULL },
{ "Napalm", 0x3DE1589A, 44365728, GAMENAM, NULL }, { "Napalm", 0x3DE1589A, 44365728, GAMENAM, NULL },