Skip to content

Commit 564e7e5

Browse files
committed
move OpenGLQ to lib/*.pd
1 parent 74f2cba commit 564e7e5

File tree

7 files changed

+18
-29
lines changed

7 files changed

+18
-29
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,9 @@ t/*.dll*
6969
pp-*.c
7070
*-pp-*.c
7171

72+
lib/PDL/Graphics/OpenGLQ.c
73+
lib/PDL/Graphics/OpenGLQ.pm
74+
lib/PDL/Graphics/OpenGLQ.xs
7275
lib/PDL/Graphics/TriD/Rout.c
7376
lib/PDL/Graphics/TriD/Rout.pm
7477
lib/PDL/Graphics/TriD/Rout.xs

MANIFEST

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ lib/PDL/Demos/TriD1.pm
1010
lib/PDL/Demos/TriD2.pm
1111
lib/PDL/Demos/TriDGallery.pm
1212
lib/PDL/Graphics/OpenGL/Perl/OpenGL.pm
13+
lib/PDL/Graphics/OpenGLQ.pd
1314
lib/PDL/Graphics/TriD.pm
1415
lib/PDL/Graphics/TriD/ArcBall.pm
1516
lib/PDL/Graphics/TriD/ButtonControl.pm
@@ -42,6 +43,4 @@ lib/PDL/Graphics/VRML/Protos.pm
4243
Makefile.PL
4344
MANIFEST This list of files
4445
MANIFEST.SKIP
45-
OpenGLQ/Makefile.PL
46-
OpenGLQ/openglq.pd
4746
t/opengl.t

MANIFEST.SKIP

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ Makefile\.old
3636
\.tar\.gz$
3737
\b_eumm/
3838

39-
^OpenGLQ/OpenGLQ\.*
39+
lib/PDL/Graphics/OpenGLQ(\.(pm|xs|c)$|-pp-)
4040
lib/PDL/Graphics/TriD/Rout(\.(pm|xs|c)$|-pp-)
4141

4242
^TriD/Tk.pm$

Makefile.PL

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,16 @@ use warnings;
33
use ExtUtils::MakeMaker;
44
use PDL::Core::Dev;
55

6+
use OpenGL::Config;
7+
my ($def, $inc, $libs) = ('', '', '');
8+
$libs = $OpenGL::Config->{LIBS} if $OpenGL::Config->{LIBS};
9+
$def .= ' '.$OpenGL::Config->{DEFINE} if $OpenGL::Config->{DEFINE};
10+
$inc .= ' '.$OpenGL::Config->{INC} if $OpenGL::Config->{INC};
11+
if($^O eq 'MSWin32') {
12+
$def .= ' -DGLUT_DISABLE_ATEXIT_HACK'; # else get errors about PerlProc_exit on at least Strawberry Perl 5.32
13+
}
14+
$libs .= ' -lm';
15+
616
my $package_name = "PDL::Graphics::TriD";
717
(my $repo = $package_name) =~ s#::#-#g;
818
$repo = "PDLPorters/$repo";
@@ -23,6 +33,9 @@ WriteMakefile (
2333
TEST_REQUIRES => {
2434
'Test::More' => '0.88',
2535
},
36+
!$def ? () : (DEFINE => $def),
37+
!$inc ? () : (INC => $inc),
38+
LIBS => [$libs],
2639
META_MERGE => {
2740
"meta-spec" => { version => 2 },
2841
resources => {

OpenGLQ/.gitignore

Lines changed: 0 additions & 3 deletions
This file was deleted.

OpenGLQ/Makefile.PL

Lines changed: 0 additions & 23 deletions
This file was deleted.

0 commit comments

Comments
 (0)