1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
|
diff -ru OSG_OP_OT-1.2~/OpenSceneGraph/Make/instexamplesrc OSG_OP_OT-1.2/OpenSceneGraph/Make/instexamplesrc
--- OSG_OP_OT-1.2~/OpenSceneGraph/Make/instexamplesrc 2006-10-12 14:45:38.000000000 +0200
+++ OSG_OP_OT-1.2/OpenSceneGraph/Make/instexamplesrc 2006-10-12 14:45:58.000000000 +0200
@@ -32,7 +32,7 @@
cd $TOPDIR/examples/$d
[ -d $INST_EXAMPLE_SRC/$d ] || mkdir -m 0755 -p $INST_EXAMPLE_SRC/$d
echo " installing $d"
- for f in `$MAKE __instfiles | grep -v $MAKE`
+ for f in `$MAKE __instfiles`
do
src=`echo $f | cut -f1 -d"="`
dst=`echo $f | cut -f2 -d"="`
diff -ru OSG_OP_OT-1.2~/OpenSceneGraph/Make/makedefs OSG_OP_OT-1.2/OpenSceneGraph/Make/makedefs
--- OSG_OP_OT-1.2~/OpenSceneGraph/Make/makedefs 2006-10-12 14:45:38.000000000 +0200
+++ OSG_OP_OT-1.2/OpenSceneGraph/Make/makedefs 2006-10-12 14:45:58.000000000 +0200
@@ -76,8 +76,8 @@
## doesn't make a distinction, we will.
############################################################################
-CXXFLAGS = $(ARCHARGS) $(DOF) $(DEF) $(INC)
-LDFLAGS = $(ARCHARGS) $(DOF) $(LINKARGS) -L$(TOPDIR)/lib/$(OS)$(ARCH)
+CXXFLAGS += -Wall $(ARCHARGS) $(DOF) $(DEF) $(INC)
+LDFLAGS += $(ARCHARGS) $(DOF) -L$(TOPDIR)/lib/$(OS)$(ARCH) $(LINKARGS)
OBJS = $(C++FILES:.cpp=.o) \
$(CXXFILES:.cpp=.o) \
$(CFILES:.c=.o) \
@@ -355,9 +355,9 @@
endif
else
-ifeq ("$(COMPILE_OSG_OP_OT_WITH_SONAMES)","YES")
- LDFLAGS += -Wl,-soname -Wl,$@.0
-endif
+#ifeq ("$(COMPILE_OSG_OP_OT_WITH_SONAMES)","YES")
+ LDFLAGS += -Wl,-soname -Wl,$@
+#endif
# LDFLAGS += `getconf LFS_LDFLAGS`
# DEF += `getconf LFS_CFLAGS`
@@ -365,7 +365,7 @@
LIBS = -lstdc++
# DEF += -W -Wall -fPIC -pipe -Woverloaded-virtual
DEF += -W -Wall -fPIC -pipe
- OPTF = -O2
+ #OPTF = -O2
DBGF = -g -gstabs+ -DOSG_COMPILE_UNIT_TESTS
SYSARCH := $(shell arch)
ifeq ($(SYSARCH),x86_64)
@@ -381,15 +381,15 @@
SHARED = -shared
ifeq ($(SYSARCH),x86_64)
- LINKARGS = -L/usr/X11R6/lib64
+ LINKARGS = -L/usr/lib64
else
- LINKARGS = -L/usr/X11R6/lib
+ LINKARGS = -L/usr/lib
endif
DYNAMICLIBRARYLIB = -ldl
OSG_LIBS = -losgGA -losgDB -losgUtil -losg
GL_LIBS = -lGLU -lGL
GLUT_LIBS = -lglut
- X_INC = -I/usr/X11R6/include
+ X_INC = -I/usr/include
X_LIBS = -lXi -lXmu -lX11
PF_XTRA_LIBS = -L/usr/lib/libpfdb -Xlinker -rpath /usr/lib/libpfdb \
-lpfdu -lpfutil -lpf
@@ -398,7 +398,7 @@
PNG_LIBS = -lpng
JPEG_LIBS = -ljpeg
TIFF_LIB = -ltiff
- GIF_LIBS = -lungif
+ GIF_LIBS = -lgif
MAKEDIST = $(TOPDIR)/Make/makerpms
ifeq ("$(PROFILER)","gprof")
Only in OSG_OP_OT-1.2/OpenSceneGraph/Make: makedefs.orig
|
GitWeb