Commit 35549ea6 authored by Bkg2k's avatar Bkg2k

fix(ci): fix retroarch opengl flags

parent cc26543f
......@@ -8,7 +8,7 @@ RETROARCH_VERSION = v1.7.7
RETROARCH_SITE = git://github.com/libretro/RetroArch.git
RETROARCH_SITE_METHOD = git
RETROARCH_LICENSE = GPLv3+
RETROARCH_CONF_OPTS += --disable-oss --enable-zlib
RETROARCH_CONF_OPTS += --disable-oss --enable-zlib --disable-opengl1 --disable-opengl
RETROARCH_DEPENDENCIES = host-pkgconf recalbox-system
ifeq ($(BR2_PACKAGE_SDL2),y)
......@@ -43,12 +43,12 @@ endif
# Add dispamnx renderer and no opengl1.1 for Pi
ifeq ($(BR2_PACKAGE_RPI_FIRMWARE),y)
RETROARCH_CONF_OPTS += --enable-dispmanx --disable-opengl1
RETROARCH_CONF_OPTS += --enable-dispmanx
endif
# odroid xu4
ifeq ($(BR2_PACKAGE_RECALBOX_TARGET_XU4),y)
RETROARCH_CONF_OPTS += --enable-floathard --disable-opengl1 --disable-opengl
RETROARCH_CONF_OPTS += --enable-floathard
endif
# x86 : SSE
......@@ -148,13 +148,23 @@ RETROARCH_PRE_CONFIGURE_HOOKS += RETROARCH_MALI_FIXUP
RETROARCH_CONF_OPTS += --enable-opengles --enable-mali_fbdev
endif
ifeq ($(BR2_i386),y)
RETROARCH_COMPILER_COMMONS_CFLAGS = $(COMPILER_COMMONS_CFLAGS_NOLTO)
RETROARCH_COMPILER_COMMONS_CXXFLAGS = $(COMPILER_COMMONS_CXXFLAGS_NOLTO)
RETROARCH_COMPILER_COMMONS_LDFLAGS = $(COMPILER_COMMONS_LDFLAGS_NOLTO)
else
RETROARCH_COMPILER_COMMONS_CFLAGS = $(COMPILER_COMMONS_CFLAGS_SO)
RETROARCH_COMPILER_COMMONS_CXXFLAGS = $(COMPILER_COMMONS_CXXFLAGS_SO)
RETROARCH_COMPILER_COMMONS_LDFLAGS = $(COMPILER_COMMONS_LDFLAGS_SO)
endif
define RETROARCH_CONFIGURE_CMDS
(cd $(@D); rm -rf config.cache; \
$(TARGET_CONFIGURE_ARGS) \
$(TARGET_CONFIGURE_OPTS) \
CFLAGS="$(TARGET_CFLAGS) $(COMPILER_COMMONS_CFLAGS_SO)" \
CXXFLAGS="$(TARGET_CXXFLAGS) $(COMPILER_COMMONS_CXXFLAGS_SO)" \
LDFLAGS="$(TARGET_LDFLAGS) $(COMPILER_COMMONS_LDFLAGS_SO) -lc" \
CFLAGS="$(TARGET_CFLAGS) $(RETROARCH_COMPILER_COMMONS_CFLAGS)" \
CXXFLAGS="$(TARGET_CXXFLAGS) $(RETROARCH_COMPILER_COMMONS_CXXFLAGS)" \
LDFLAGS="$(TARGET_LDFLAGS) $(RETROARCH_COMPILER_COMMONS_LDFLAGS) -lc" \
CROSS_COMPILE="$(HOST_DIR)/bin/" \
PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig/" \
./configure \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment