projects / packages / Glide_VG.git / blame
| Commit | Line | Data |
|---|---|---|
| b14c4c11 | 1 | --- Glide_VG-2.46/swlibs/include/make/3dfx.mak.orig 1999-11-29 20:48:02.000000000 +0100 |
| d8c27465 JB |
2 | +++ Glide_VG-2.46/swlibs/include/make/3dfx.mak 2012-01-13 16:34:50.994605338 +0100 |
| 3 | @@ -192,8 +192,15 @@ | |
| 4 | $(LIBRARIES): $(LIBPARTS) | |
| 5 | $(AR) $*.a $(LIBPARTS) | |
| b14c4c11 | 6 | |
| d8c27465 JB |
7 | +# We need to glean the soname from the name of the library, this |
| 8 | +# is pretty good as long as shared library names are reasonable. | |
| 9 | +ifneq "$(SHARED_LIBRARY)" "" | |
| 10 | +SONAME := $(shell echo $(SHARED_LIBRARY) | cut -d "." -f 1-3) | |
| 11 | +BASENAME := $(shell echo $(SHARED_LIBRARY) | cut -d "." -f 1-2) | |
| 12 | +endif | |
| 13 | + | |
| b14c4c11 | 14 | $(SHARED_LIBRARY): $(LIBPARTS) $(SUBLIBRARIES) |
| d8c27465 JB |
15 | - $(LINK) $(LDFLAGS) -shared -o $(SHARED_LIBRARY) \ |
| 16 | + $(LINK) $(LDFLAGS) -shared -Wl,-soname,$(SONAME) -o $(SHARED_LIBRARY) \ | |
| b14c4c11 JB |
17 | -Xlinker --whole-archive \ |
| 18 | $(LIBRARIES) $(SUBLIBRARIES) \ | |
| 19 | -Xlinker --no-whole-archive \ | |
| d8c27465 JB |
20 | @@ -205,6 +212,8 @@ |
| 21 | $(INSTALL) -m 444 $(LIBRARIES) $(INSTALL_DESTINATION)/lib | |
| 22 | ifneq "$(SHARED_LIBRARY)" "" | |
| 23 | $(INSTALL) -m 444 $(SHARED_LIBRARY) $(INSTALL_DESTINATION)/lib | |
| 24 | + ln -sf $(INSTALL_DESTINATION)/lib/$(SHARED_LIBRARY) $(INSTALL_DESTINATION)/lib/$(SONAME) | |
| 25 | + ln -sf $(INSTALL_DESTINATION)/lib/$(SHARED_LIBRARY) $(INSTALL_DESTINATION)/lib/$(BASENAME) | |
| 26 | endif | |
| 27 | else | |
| 28 | @echo INSTALL_DESTINATION not defined, not installing LIBRARIES | |
| 29 | --- Glide_VG-2.46/sst1/glide/src/makefile.unix.orig 1999-11-29 20:48:01.000000000 +0100 | |
| 30 | +++ Glide_VG-2.46/sst1/glide/src/makefile.unix 2012-01-13 16:03:17.497875271 +0100 | |
| 31 | @@ -167,7 +167,7 @@ | |
| 32 | LDIRT = fxgasm.o fxgasm fxgasm.h | |
| 33 | ||
| 34 | LIBRARIES = libglide2x.a | |
| 35 | -SHARED_LIBRARY = libglide2x.so | |
| 36 | +SHARED_LIBRARY = libglide.so.2.46 | |
| 37 | ||
| 38 | include $(BUILD_ROOT_SWLIBS)/include/make/3dfx.mak | |
| 39 | ||
| 40 | --- Glide_VG-2.46/swlibs/texus/lib/makefile.unix.orig 1999-11-29 20:48:02.000000000 +0100 | |
| 41 | +++ Glide_VG-2.46/swlibs/texus/lib/makefile.unix 2012-01-13 16:01:55.061205846 +0100 | |
| 42 | @@ -41,7 +41,7 @@ | |
| 43 | INSTALL_DESTINATION = $(BUILD_ROOT_SWLIBS) | |
| 44 | ||
| 45 | LIBRARIES = libtexus.a | |
| 46 | -SHARED_LIBRARY = libtexus.so | |
| 47 | +SHARED_LIBRARY = libtexus.so.1.1 | |
| 48 | SUBLIBRARIES = $(BUILD_ROOT_SWLIBS)/lib/libfxmisc.a | |
| 49 | ||
| 50 | include $(BUILD_ROOT_SWLIBS)/include/make/3dfx.mak | |
| 51 | --- Glide_VG-2.46/swlibs/texus/examples/makefile.unix.orig 1999-11-29 20:48:02.000000000 +0100 | |
| 52 | +++ Glide_VG-2.46/swlibs/texus/examples/makefile.unix 2012-01-13 16:39:48.564615304 +0100 | |
| 53 | @@ -23,7 +23,7 @@ | |
| 54 | LCINCS = -I$(BUILD_ROOT_SST1)/include \ | |
| 55 | -I$(BUILD_ROOT_SWLIBS)/include | |
| 56 | ||
| 57 | -LLDLIBS = -lglide2x -ltexus | |
| 58 | +LLDLIBS = -lglide -ltexus | |
| 59 | ||
| 60 | INSTALL_DESTINATION = $(BUILD_ROOT_SWLIBS) | |
| 61 | CFILES = viewppm.c view3df.c | |
| 62 | --- Glide_VG-2.46/sst1/glide/tests/makefile.unix.orig 1999-11-29 20:48:23.000000000 +0100 | |
| 63 | +++ Glide_VG-2.46/sst1/glide/tests/makefile.unix 2012-01-13 16:39:21.777947740 +0100 | |
| 64 | @@ -20,7 +20,7 @@ | |
| 65 | ||
| 66 | LIBOBJS = tlib.o plib.o | |
| 67 | ||
| 68 | -LLDLIBS = $(LIBOBJS) -lglide2x | |
| 69 | +LLDLIBS = $(LIBOBJS) -lglide | |
| 70 | ||
| 71 | PRIVATE_HEADERS = tlib.h tlib.c plib.h plib.c tldata.inc | |
| 72 |