Merge pull request #7902 from orbea/rgui

qb: Fix '--disable-rgui'.
This commit is contained in:
Twinaphex 2019-01-06 09:16:01 +01:00 committed by GitHub
commit 56c246482e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 2 deletions

View File

@ -35,6 +35,7 @@
#include "wifi/wifi_driver.h"
#include "led/led_driver.h"
#include "midi/midi_driver.h"
#include "command.h"
#include "configuration.h"
#include "core_info.h"
#include "driver.h"

View File

@ -961,7 +961,8 @@ void fill_pathname_join_delim(char *out_path, const char *dir,
out_path[copied] = delim;
out_path[copied+1] = '\0';
strlcat(out_path, path, size);
if (path)
strlcat(out_path, path, size);
}
void fill_pathname_join_delim_concat(char *out_path, const char *dir,

View File

@ -569,7 +569,8 @@ if [ "$HAVE_MATERIALUI" != 'no' ] || [ "$HAVE_XMB" != 'no' ] || [ "$HAVE_ZARCH"
HAVE_STRIPES=no
HAVE_ZARCH=no
HAVE_OZONE=no
die : 'Notice: RGUI not available, MaterialUI, XMB, Ozone and ZARCH will also be disabled.'
HAVE_QT=no
die : 'Notice: RGUI not available, other menus will also be disabled.'
elif [ "$HAVE_OPENGL" = 'no' ] && [ "$HAVE_OPENGLES" = 'no' ] && [ "$HAVE_VULKAN" = 'no' ]; then
if [ "$OS" = 'Win32' ]; then
HAVE_SHADERPIPELINE=no