mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-06 04:13:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Be able to disable everything X11.

Browse Source
This commit is contained in:
Themaister 2012-09-28 23:43:58 +02:00
parent 04e3fe185f
commit cb153869ca
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -292,8 +292,10 @@ endif
CFLAGS += -Wall $(OPTIMIZE_FLAG) $(INCLUDE_DIRS) -g -I. -pedantic CFLAGS += -Wall $(OPTIMIZE_FLAG) $(INCLUDE_DIRS) -g -I. -pedantic
ifeq ($(CXX_BUILD), 1) ifeq ($(CXX_BUILD), 1)
LD = $(CXX)
CFLAGS += -std=c++0x -xc++ -D__STDC_CONSTANT_MACROS CFLAGS += -std=c++0x -xc++ -D__STDC_CONSTANT_MACROS
else else
LD = $(CC)
ifneq ($(findstring icc,$(CC)),) ifneq ($(findstring icc,$(CC)),)
CFLAGS += -std=c99 -D_GNU_SOURCE CFLAGS += -std=c99 -D_GNU_SOURCE
else else
@ -312,7 +314,7 @@ config.mk: configure qb/*
@exit 1 @exit 1
retroarch: $(OBJ) retroarch: $(OBJ)
$(Q)$(CXX) -o $@ $(OBJ) $(LIBS) $(LDFLAGS) $(LIBRARY_DIRS) $(Q)$(LD) -o $@ $(OBJ) $(LIBS) $(LDFLAGS) $(LIBRARY_DIRS)
@$(if $(Q), $(shell echo echo LD $@),) @$(if $(Q), $(shell echo echo LD $@),)
tools/retroarch-joyconfig: $(JOYCONFIG_OBJ) tools/retroarch-joyconfig: $(JOYCONFIG_OBJ)

2
qb/config.libs.sh
View File

@ -160,6 +160,8 @@ fi
check_pkgconf XML libxml-2.0 check_pkgconf XML libxml-2.0
check_pkgconf FREETYPE freetype2 check_pkgconf FREETYPE freetype2
check_pkgconf X11 x11 check_pkgconf X11 x11
[ "$HAVE_X11" = "no" ] && HAVE_XEXT=no
check_pkgconf XEXT xext check_pkgconf XEXT xext
if [ "$HAVE_X11" = 'yes' ] && [ "$HAVE_XEXT" = 'yes' ]; then if [ "$HAVE_X11" = 'yes' ] && [ "$HAVE_XEXT" = 'yes' ]; then
check_pkgconf XVIDEO xv check_pkgconf XVIDEO xv

1
qb/config.params.sh
View File

@ -8,6 +8,7 @@ HAVE_NETPLAY=auto # Enable netplay support
HAVE_CONFIGFILE=yes # Disable support for config file HAVE_CONFIGFILE=yes # Disable support for config file
HAVE_OPENGL=yes # Disable OpenGL support HAVE_OPENGL=yes # Disable OpenGL support
HAVE_GLES=no # Use GLESv2 instead of desktop GL HAVE_GLES=no # Use GLESv2 instead of desktop GL
HAVE_X11=auto # Disable everything X11.
HAVE_KMS=auto # Enable KMS context support HAVE_KMS=auto # Enable KMS context support
HAVE_EGL=auto # Enable EGL context support HAVE_EGL=auto # Enable EGL context support
HAVE_VG=auto # Enable OpenVG support HAVE_VG=auto # Enable OpenVG support