]>
Commit | Line | Data |
---|---|---|
d22b9c4f JB |
1 | --- FreeWRL-1.00/Makefile.PL.orig 2003-07-24 15:59:15.000000000 +0200 |
2 | +++ FreeWRL-1.00/Makefile.PL 2003-08-10 15:38:36.860432824 +0200 | |
3 | @@ -67,8 +67,6 @@ | |
a28fde80 | 4 | |
d22b9c4f JB |
5 | my $sitearchjsdir = "\$(SITEARCHEXP)/auto/VRML/JS"; |
6 | ||
7 | -my $jsdir = "js/src"; | |
8 | -my $jsobjdir; | |
9 | my $BUILD_OPT; | |
10 | ||
11 | my $warnings_high = qq{-Wunreachable-code -Wshadow -Wcast-align}; | |
12 | @@ -79,24 +77,11 @@ | |
13 | my @inc; | |
14 | my @libs; | |
15 | my @ldflags; | |
16 | -my @jsinc; | |
17 | -my @jslibs; | |
18 | ||
19 | ||
20 | -if ($VRML_CONFIG{PLATFORM} =~ /irix/i) { | |
21 | - ##$jsobjdir = "js/src/IRIX646.5"; | |
22 | - $jsobjdir = "$jsdir/IRIX6.5"; | |
23 | -} elsif ($VRML_CONFIG{PLATFORM} =~ /macosx/i) { | |
24 | - $jsobjdir = "$jsdir/Darwin6.6"; | |
25 | -} else { ## linux used by default | |
26 | - $jsobjdir = "$jsdir/Linux_All"; | |
27 | -} | |
a28fde80 | 28 | - |
d22b9c4f JB |
29 | if ($VRML_CONFIG{DEBUG} eq "on") { |
30 | - $jsobjdir .= "_DBG.OBJ"; | |
31 | $BUILD_OPT = 0; | |
32 | } else { | |
33 | - $jsobjdir .= "_OPT.OBJ"; | |
34 | $BUILD_OPT = 1; | |
35 | } | |
36 | ||
37 | @@ -119,9 +104,8 @@ | |
38 | } | |
39 | ||
40 | push @inc, $VRML_CONFIG{FREEWRL_INC}, | |
41 | - "-I../JS/$jsobjdir", "-IJS/$jsobjdir", "-IJS/$jsdir", "-I../JS/$jsdir -ICFuncs"; | |
42 | -push @libs, $VRML_CONFIG{FREEWRL_LIBS}, "-L../JS/$jsobjdir", "-LJS/$jsobjdir", "-ljs"; | |
43 | -push @ldflags, $VRML_CONFIG{LDFLAGS}, "-LJS/$jsobjdir"; | |
44 | + "-I/usr/include/js", "-ICFuncs"; | |
45 | +push @libs, $VRML_CONFIG{FREEWRL_LIBS}, "-ljs"; | |
46 | ||
47 | $VRML_CONFIG{FREEWRL_CCFLAGS} = join(' ', @ccflags); | |
48 | $VRML_CONFIG{FREEWRL_INC} = join(' ', @inc); | |
49 | @@ -165,16 +149,6 @@ | |
50 | ||
51 | print STDERR "Checking for the Mozilla JavaScript Reference library and application.\n"; | |
52 | ||
53 | -if (-e "JS/$jsobjdir/libjs.a" && -e "JS/$jsobjdir/libjs.so" && -e "JS/$jsobjdir/js") { | |
54 | - print STDERR "The Javascript library and application were found.\n"; | |
a28fde80 | 55 | -} else { |
d22b9c4f JB |
56 | - print STDERR "The Javascript library and application were not found - make them.\n"; |
57 | - chdir("JS/$jsdir"); | |
58 | - system("make -f Makefile.ref BUILD_OPT=$BUILD_OPT"); | |
a28fde80 JB |
59 | - chdir($pwd); |
60 | -} | |
d22b9c4f | 61 | - |
a28fde80 JB |
62 | - |
63 | use ExtUtils::MakeMaker; | |
d22b9c4f JB |
64 | require './Config.pm'; |
65 | ||
66 | @@ -279,23 +253,20 @@ | |
67 | ||
68 | push(@postamble, join( | |
69 | "\n", | |
70 | - qq{\# copy fonts, x3d, libjs.so over\n}, | |
71 | + qq{\# copy fonts, x3d over\n}, | |
72 | qq{install ::}, | |
73 | qq{\tcp -r fonts $vrmlinstdir\n}, | |
74 | qq{\tcp -r x3d $vrmlinstdir\n}, | |
75 | - qq{\tcp JS/$jsobjdir/libjs.so $VRML::Config::vrml_config{LIBJS_INST}\n} | |
76 | )); | |
a28fde80 | 77 | |
d22b9c4f JB |
78 | push(@postamble, join( |
79 | "\n", | |
80 | qq{clean ::}, | |
81 | - qq{\tcd JS/$jsdir && \$(MAKE) -f Makefile.ref BUILD_OPT=$BUILD_OPT clean\n} | |
82 | )); | |
a28fde80 | 83 | |
d22b9c4f JB |
84 | push(@postamble, join( |
85 | "\n", | |
86 | qq{distclean :: realclean}, | |
87 | - qq{\tcd JS/$jsdir && \$(MAKE) -f Makefile.ref BUILD_OPT=$BUILD_OPT clobber} | |
88 | )); | |
a28fde80 | 89 | |
d22b9c4f | 90 | return join("\n", @postamble); |