Skip to content

Ci2 #68

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dk wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Ci2 #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5c88b3e
second shot at XQuartz/OpenGL support with suggested env
dk Feb 23, 2026
6933b9f
CI for XQuartz/GLX
dk Mar 1, 2026
0d1afac
use macos specific cc flags consistently
dk Mar 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ jobs:
os: windows-latest
- perl-version: '5.30'
os: macos-latest
- perl-version: '5.30'
os: macos-latest
apple-glx: true
steps:
- uses: actions/checkout@v2
- name: 'ci-dist: target-setup-perl'
Expand All @@ -32,6 +35,11 @@ jobs:
perl-version: ${{ matrix.perl-version }}
- name: Install dependencies
uses: Perl-GPU/devops/github-actions/install-dep-opengl-modern-dep@main
- name: 'Use XQuartz/GLX'
if: matrix.apple-glx
run: |
echo "OGLM_APPLE_GLX=1" >> $GITHUB_ENV
brew install --cask xquartz
- name: 'ci-dist: target-all'
uses: Perl-GPU/devops/github-actions/ci-dist@main
with:
Expand Down
8 changes: 7 additions & 1 deletion Makefile.PL
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,17 @@ if ( $^O eq 'MSWin32' ) {
} elsif ( $^O eq 'cygwin' ) {
$libs = '-lGL -lX11';
} elsif ( $^O eq 'darwin' ) {
$DYNS = { 'OTHERLDFLAGS' => '-framework OpenGL' };
$define .= " -Wno-compound-token-split-by-macro -DGL_SILENCE_DEPRECATION";
if ( $ENV{OGLM_APPLE_GLX} ) {
$define .= " -DGLEW_APPLE_GLX -I/opt/X11/include";
$libs = '-L/opt/X11/lib -lglut';
} else {
$DYNS = { 'OTHERLDFLAGS' => '-framework OpenGL' };
}
} else {
$libs = '-lGL -lX11';
}

my %buildargs = (
!$libs ? () : (LIBS => $libs),
DEFINE => $define,
Expand Down
Loading