projects / packages / freewrl.git / blame
| Commit | Line | Data |
|---|---|---|
| 88565131 JB |
1 | --- freewrl-1.19.8/Makefile.PL.orig 2008-01-12 18:27:02.568622000 +0100 |
| 2 | +++ freewrl-1.19.8/Makefile.PL 2008-01-12 19:24:10.279956593 +0100 | |
| 3 | @@ -108,8 +108,6 @@ | |
| 4 | ## Handle platform-specific compile options for the Javascript engine | |
| 5 | ## and others specific to FreeWRL. | |
| 6 | ||
| 7 | -my $jsdir = "js1.5/src"; | |
| 8 | -my $jsobjdir; | |
| 9 | my $noStackProtector = ""; | |
| 10 | ||
| 11 | my @inc; | |
| 12 | @@ -119,21 +117,6 @@ | |
| 13 | my @jslibs; | |
| 14 | ||
| 15 | ||
| 16 | -if ($OS eq "IRIX64") { | |
| 17 | - $jsobjdir = "$jsdir/IRIX6.5"; | |
| 18 | -} elsif ($OS eq "Darwin") { | |
| 19 | - $jsobjdir = "$jsdir/Darwin"; | |
| 20 | -} elsif ($OS eq "SunOS") { | |
| 21 | - $jsobjdir = "$jsdir/SunOS5.8"; | |
| 22 | -} else { ## linux used by default | |
| 23 | - $jsobjdir = "$jsdir/Linux_All"; | |
| 24 | -} | |
| 25 | - | |
| 26 | -#location of the spidermonkey js engine. | |
| 27 | -$jsobjdir .= "_OPT.OBJ"; | |
| 28 | -my $libFreeWRLjspath = "./JS/".$jsobjdir."/libFreeWRLjs.so"; | |
| 29 | - | |
| 30 | -#print "the javascript engine should be located at: $libFreeWRLjspath\n"; | |
| 31 | ||
| 32 | ||
| 33 | ||
| 34 | @@ -155,11 +138,8 @@ | |
| 35 | print "this system does not use the -fno-stack-protector flag\n"; | |
| 36 | } | |
| 37 | ||
| 38 | -push @inc, $VRML_CONFIG{FREEWRL_INC}, "-IJS/$jsobjdir", "-IJS/$jsdir", "-ICFuncs -ICFrontEnd "; | |
| 39 | -push @libs, $VRML_CONFIG{FREEWRL_LIBS}, "-LJS/$jsobjdir", "-lFreeWRLjs"; | |
| 40 | -if ($OS eq "Darwin") { | |
| 41 | -push @ldflags, $VRML_CONFIG{LDFLAGS}, "-LJS/$jsobjdir"; | |
| 42 | -} | |
| 43 | +push @inc, $VRML_CONFIG{FREEWRL_INC}, "-I/usr/include/js", "-ICFuncs -ICFrontEnd "; | |
| 44 | +push @libs, $VRML_CONFIG{FREEWRL_LIBS}, "-ljs"; | |
| 45 | ||
| 46 | # push build directory, for running standalone | |
| 47 | ||
| 48 | @@ -314,10 +294,7 @@ | |
| 49 | } | |
| 50 | if ($OS eq "Linux") { | |
| 51 | print MK "\tinstall -D libFreeWRLFunc.so \$(DESTDIR)\$(LIB_DIR)/libFreeWRLFunc.so\n"; | |
| 52 | - print MK "\tinstall -D $libFreeWRLjspath \$(DESTDIR)\$(LIB_DIR)/libFreeWRLjs.so\n"; | |
| 53 | - | |
| 54 | if ($CHCON ne "") { | |
| 55 | - print MK "\t-$CHCON -t texrel_shlib_t \$(DESTDIR)\$(LIB_DIR)/libFreeWRLjs.so\n"; | |
| 56 | print MK "\t-$CHCON -t texrel_shlib_t \$(DESTDIR)\$(LIB_DIR)/libFreeWRLFunc.so\n"; | |
| be65e9c2 | 57 | } |
| 88565131 JB |
58 | if ($HAVE_UBUNTU eq "NO") { |
| 59 | @@ -461,11 +438,9 @@ | |
| 60 | } | |
| 61 | ||
| 62 | sub write_linux_makefile_javascript() { | |
| 63 | - ############################################################################# | |
| 64 | - ## make the Javascript libraries if needed | |
| 65 | ||
| 66 | print MK "Javascript:\n"; | |
| 67 | - print MK "\tcd JS/$jsdir; make -f Makefile.ref BUILD_OPT=1 STACKPROT=$noStackProtector; cd $pwd\n"; | |
| 68 | + print MK "\n"; | |
| 69 | } | |
| 70 | ||
| 71 | ||
| 72 | @@ -556,7 +531,6 @@ | |
| 73 | print MK "\techo \"%files\" >> $specfile\n"; | |
| 74 | print MK "\techo \"%defattr(-,root,root)\" >> $specfile\n"; | |
| 75 | print MK "\techo \"\$(DESTDIR)\$(LIB_DIR)/libFreeWRLFunc.so\" >> $specfile\n"; | |
| 76 | - print MK "\techo \"\$(DESTDIR)\$(LIB_DIR)/libFreeWRLjs.so\" >> $specfile\n"; | |
| 77 | print MK "\techo \"\$(DESTDIR)\$(FRONTEND_DIR)/FreeWRL_Message\" >> $specfile\n"; | |
| 78 | print MK "\techo \"\$(DESTDIR)\$(FRONTEND_DIR)/freewrl\" >> $specfile\n"; | |
| 79 | print MK "\techo \"\$(DESTDIR)\$(FRONTEND_DIR)/FreeWRL_SoundServer\" >> $specfile\n"; | |
| 80 | @@ -597,19 +571,11 @@ | |
| 81 | print MK " rm -f java/classes/sai/eai/*class\n"; | |
| 82 | print MK " rm -f java/classes/org/web3d/x3d/sai/*class\n"; | |
| 83 | print MK " rm -f java/classes/vrml.jar\n"; | |
| 84 | - print MK " rm -rf JS/$jsobjdir\n"; | |
| 85 | ||
| 86 | if ($OS eq "Darwin") { | |
| 87 | print MK " rm -f /usr/local/lib/libFreeWRLFunc.dylib\n"; | |
| 88 | - print MK " rm -f /usr/local/lib/libFreeWRLjs.dylib\n"; | |
| 89 | } | |
| 90 | ||
| 91 | - # remove other JS directories | |
| 92 | - $jsobjdir =~s/src/src\/editline/; | |
| 93 | - print MK " rm -rf JS/$jsobjdir\n"; | |
| 94 | - $jsobjdir =~ s/editline/fdlibm/; | |
| 95 | - print MK " rm -rf JS/$jsobjdir\n"; | |
| 96 | - | |
| 97 | print MK "\n#remove installed images\n"; | |
| 98 | print MK "distclean: clean\n"; | |
| 99 | print MK "\trm -f \$(DESTDIR)\$(FRONTEND_DIR)/freewrl\n"; | |
| 100 | @@ -617,7 +583,6 @@ | |
| 101 | ||
| 102 | if ($OS eq "Linux") { | |
| 103 | print MK "\trm -f \$(DESTDIR)\$(LIB_DIR)/libFreeWRLFunc.so\n"; | |
| 104 | - print MK "\trm -f \$(DESTDIR)\$(LIB_DIR)/libFreeWRLjs.so\n"; | |
| 105 | if ($HAVE_UBUNTU eq "NO") { | |
| 106 | # print MK "\t/sbin/ldconfig\n"; | |
| be65e9c2 | 107 | } |