]>
Commit | Line | Data |
---|---|---|
88565131 JB |
1 | --- freewrl-1.19.8/Makefile.PL.orig 2008-01-12 19:26:25.187644000 +0100 |
2 | +++ freewrl-1.19.8/Makefile.PL 2008-01-12 19:49:11.737519783 +0100 | |
3 | @@ -253,14 +253,7 @@ | |
4 | print MK "JAVAC = javac\n"; | |
5 | print MK "INC = $MYINC\n"; | |
6 | print MK "DEFINE = $noStackProtector $MYDEFINE\n"; | |
7 | - #print MK "FWFLAGS = -c -Wall -O2 -g -pipe -m32 -march=i386 -mtune=pentium4\n"; | |
8 | - | |
9 | - # different compiler flags for different architectures | |
10 | - if ($ARCH eq "x86_64") { | |
11 | - print MK "FWFLAGS = -c -O2 -g -pipe -m32 -march=i386 -mtune=pentium4\n"; | |
12 | - } else { | |
13 | - print MK "FWFLAGS = -c -O2 -g -pipe -fno-strict-aliasing -fPIC\n"; | |
14 | - } | |
15 | + print MK "FWFLAGS = -c -Wall \$(OPTIMIZE) -pipe -fno-strict-aliasing -fPIC\n"; | |
16 | print MK "MYLIBS = $MYLIBS\n"; | |
17 | print MK "MYFELIBS = $MYFELIBS\n"; | |
18 | print MK "MYSELIBS = $MYSELIBS\n"; | |
19 | @@ -386,10 +379,13 @@ | |
20 | #LIBFREEWRL | |
21 | print MK "\$(LIBFWSRCS):\n"; | |
22 | print MK "\t\$(CC) -c \$*.c\n\n"; | |
23 | - print MK "libFreeWRL: \$(LIBFWOBJS)\n"; | |
24 | if ($OS eq "Darwin") { | |
25 | + print MK "libFreeWRL: libFreeWRLFunc.dylib\n\n"; | |
26 | + print MK "libFreeWRLFunc.dylib: \$(LIBFWOBJS)\n"; | |
27 | print MK "\t\$(CC) -dynamiclib \$(MYFELIBS) \$(MYLDFLAGS) -o libFreeWRLFunc.dylib \$(MYLIBS) \$(LIBFWOBJS)\n\n"; | |
28 | } else { | |
29 | + print MK "libFreeWRL: libFreeWRLFunc.so\n\n"; | |
30 | + print MK "libFreeWRLFunc.so: \$(LIBFWOBJS)\n"; | |
31 | print MK "\t\$(CC) -shared -o libFreeWRLFunc.so \$(LIBFWOBJS)\n\n"; | |
32 | } | |
33 | } | |
34 | @@ -402,7 +398,8 @@ | |
35 | print MK "\n# make the Unix front end\n"; | |
36 | print MK "\$(FESRCS):\n"; | |
37 | print MK "\t\$(CC) -c \$*.c\n\n"; | |
38 | - print MK "CFrontEnd: \$(FEOBJS)\n"; | |
39 | + print MK "CFrontEnd: CFrontEnd/freewrl\n\n"; | |
40 | + print MK "CFrontEnd/freewrl: \$(FEOBJS)\n"; | |
41 | print MK "\t\$(CC) \$(FEOBJS) \$(MYFELIBS) -o CFrontEnd/freewrl\n\n"; | |
42 | } | |
43 | } | |
44 | @@ -432,7 +429,8 @@ | |
45 | print MK "\n# make the Unix Console Message \n"; | |
46 | print MK "\$(FWMSRCS):\n"; | |
47 | print MK "\t\$(CC) -c \$*.c\n\n"; | |
48 | - print MK "FreeWRL_Message: \$(FWMOBJS)\n"; | |
49 | + print MK "FreeWRL_Message: FreeWRL_Msg/FreeWRL_Message\n\n"; | |
50 | + print MK "FreeWRL_Msg/FreeWRL_Message: \$(FWMOBJS)\n"; | |
51 | print MK "\t\$(CC) FreeWRL_Msg/FreeWRL_Message.o -o FreeWRL_Msg/FreeWRL_Message \$(MYLIBS) \$(MYMESLIBS) \n\n"; | |
52 | } | |
53 | } |