Skip to content

Commit 7c43e4b

Browse files
committed
ci: show everything with fastfetch
1 parent d8e7588 commit 7c43e4b

File tree

3 files changed

+13
-3
lines changed

3 files changed

+13
-3
lines changed

.github/workflows/push.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
uses: github/codeql-action/analyze@v2
3535

3636
- name: run fastfetch
37-
run: ./fastfetch --recache --disable-linewrap false --hide-cursor false --show-errors true
37+
run: ./fastfetch --recache --disable-linewrap false --hide-cursor false --show-errors true --load-config presets/all
3838

3939
- name: run flashfetch
4040
run: ./flashfetch
@@ -79,7 +79,7 @@ jobs:
7979
uses: github/codeql-action/analyze@v2
8080

8181
- name: run fastfetch
82-
run: ./fastfetch --recache --disable-linewrap false --hide-cursor false --show-errors true
82+
run: ./fastfetch --recache --disable-linewrap false --hide-cursor false --show-errors true --load-config presets/all
8383

8484
- name: run flashfetch
8585
run: ./flashfetch

CMakeLists.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,11 @@ endif()
6969

7070
set(CMAKE_C_STANDARD 11)
7171
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wconversion")
72+
if(APPLE AND DEFINED ENV{HOMEBREW_PREFIX})
73+
# Used for dlopen finding dylibs installed by homebrew, reversed for future usage
74+
# `/opt/homebrew/lib` is not on dlopen search path by default
75+
set(CMAKE_EXE_LINKER_FLAGS "-Wl,-rpath,$ENV{HOMEBREW_PREFIX}/lib")
76+
endif()
7277

7378
include(CheckIPOSupported)
7479
check_ipo_supported(RESULT IPO_SUPPORTED)

src/modules/opengl.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,12 @@
1010
#if defined(FF_HAVE_EGL) || defined(FF_HAVE_GLX) || defined(FF_HAVE_OSMESA)
1111
#define FF_HAVE_GL 1
1212
#include "common/library.h"
13+
#ifdef __APPLE__
14+
#define GL_SILENCE_DEPRECATION
15+
#include <OpenGL/gl.h>
16+
#else
1317
#include <GL/gl.h>
18+
#endif
1419

1520
#define FF_OPENGL_BUFFER_WIDTH 1
1621
#define FF_OPENGL_BUFFER_HEIGHT 1
@@ -387,7 +392,7 @@ void ffPrintOpenGL(FFinstance* instance)
387392
#ifndef FF_HAVE_GL
388393
error = "Fastfetch was built without gl support.";
389394
#else
390-
error = glPrint(instance);
395+
error = glPrint(instance);
391396
#endif
392397

393398
if(error != NULL)

0 commit comments

Comments
 (0)