mirror of
https://github.com/DrBeef/Raze.git
synced 2024-11-15 08:52:00 +00:00
git-svn-id: https://svn.eduke32.com/eduke32@557 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
parent
4e0f8281c7
commit
9704ade66c
4 changed files with 14 additions and 6 deletions
|
@ -11,12 +11,14 @@
|
|||
# POLYMOST - enables Polymost renderer
|
||||
# USE_OPENGL - enables OpenGL support in Polymost
|
||||
# NOASM - disables the use of inline assembly pragmas
|
||||
# LINKED_GTK - enables compile-time linkage to GTK
|
||||
#
|
||||
|
||||
SUPERBUILD ?= 1
|
||||
POLYMOST ?= 1
|
||||
USE_OPENGL ?= 1
|
||||
NOASM ?= 0
|
||||
LINKED_GTK ?= 0
|
||||
|
||||
# Debugging options
|
||||
# RELEASE - 1 = no debugging
|
||||
|
|
|
@ -113,10 +113,12 @@ ifeq ($(RENDERTYPE),SDL)
|
|||
# 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
|
||||
# include cairo, so we need to filter out those -l switches in order to link
|
||||
ifeq ($(GTKCOMPAT32),1)
|
||||
# LIBS+= $(shell pkg-config --libs gtk+-2.0 | sed 's/\s-l\(pango\)\{0,1\}cairo\S*\s/ /g')
|
||||
else
|
||||
# LIBS+= $(shell pkg-config --libs gtk+-2.0)
|
||||
ifneq ($(LINKED_GTK),0)
|
||||
ifeq ($(GTKCOMPAT32),1)
|
||||
LIBS+= $(shell pkg-config --libs gtk+-2.0 | sed 's/\s-l\(pango\)\{0,1\}cairo\S*\s/ /g')
|
||||
else
|
||||
LIBS+= $(shell pkg-config --libs gtk+-2.0)
|
||||
endif
|
||||
endif
|
||||
else
|
||||
HAVE_GTK2=0
|
||||
|
@ -142,4 +144,7 @@ endif
|
|||
ifneq (0,$(NOASM))
|
||||
BUILDCFLAGS+= -DNOASM
|
||||
endif
|
||||
ifneq (0,$(LINKED_GTK))
|
||||
BUILDCFLAGS+= -DLINKED_GTK
|
||||
endif
|
||||
|
||||
|
|
|
@ -8,6 +8,7 @@ SUPERBUILD = 1
|
|||
POLYMOST = 1
|
||||
USE_OPENGL = 1
|
||||
NOASM = 0
|
||||
LINKED_GTK = 0
|
||||
|
||||
# Debugging options
|
||||
RELEASE?=1
|
||||
|
|
|
@ -13,8 +13,8 @@ struct grpfile grpfiles[numgrpfiles] =
|
|||
{ "Duke Nukem 3D", 0xBBC9CE44, 26524524, GAMEDUKE, NULL },
|
||||
{ "Duke Nukem 3D: Atomic Edition", 0xF514A6AC, 44348015, GAMEDUKE, NULL },
|
||||
{ "Duke Nukem 3D: Atomic Edition", 0xFD3DCFF1, 44356548, GAMEDUKE, NULL },
|
||||
{ "Duke Nukem 3D Shareware Version", 0x983AD923, 11035779, GAMEDUKE, NULL },
|
||||
{ "Duke Nukem 3D Mac Shareware Version", 0xC5F71561, 10444391, GAMEDUKE, NULL },
|
||||
{ "Duke Nukem 3D Shareware", 0x983AD923, 11035779, GAMEDUKE, NULL },
|
||||
{ "Duke Nukem 3D Mac Shareware", 0xC5F71561, 10444391, GAMEDUKE, NULL },
|
||||
{ "Duke Nukem 3D Mac", 0x00000000, 0, GAMEDUKE, NULL },
|
||||
{ "NAM", 0x75C1F07B, 43448927, GAMENAM, NULL },
|
||||
{ "Napalm", 0x3DE1589A, 44365728, GAMENAM, NULL },
|
||||
|
|
Loading…
Reference in a new issue