Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 430518
Collapse All | Expand All

(-)Makefile.orig (-41 / +1 lines)
Lines 164-170 Link Here
164
NDIR=$(MOUNT_DIR)/null
164
NDIR=$(MOUNT_DIR)/null
165
UIDIR=$(MOUNT_DIR)/ui
165
UIDIR=$(MOUNT_DIR)/ui
166
Q3UIDIR=$(MOUNT_DIR)/q3_ui
166
Q3UIDIR=$(MOUNT_DIR)/q3_ui
167
JPDIR=$(MOUNT_DIR)/jpeg-6b
168
SPEEXDIR=$(MOUNT_DIR)/libspeex
167
SPEEXDIR=$(MOUNT_DIR)/libspeex
169
Q3ASMDIR=$(MOUNT_DIR)/tools/asm
168
Q3ASMDIR=$(MOUNT_DIR)/tools/asm
170
LBURGDIR=$(MOUNT_DIR)/tools/lcc/lburg
169
LBURGDIR=$(MOUNT_DIR)/tools/lcc/lburg
Lines 297-303 Link Here
297
  SHLIBLDFLAGS=-shared $(LDFLAGS)
296
  SHLIBLDFLAGS=-shared $(LDFLAGS)
298
297
299
  THREAD_LIBS=-lpthread
298
  THREAD_LIBS=-lpthread
300
  LIBS=-ldl -lm
299
  LIBS=-ldl -lm -ljpeg
301
300
302
  CLIENT_LIBS=$(shell sdl-config --libs) -lGL
301
  CLIENT_LIBS=$(shell sdl-config --libs) -lGL
303
302
Lines 1297-1338 Link Here
1297
  $(B)/client/l_script.o \
1296
  $(B)/client/l_script.o \
1298
  $(B)/client/l_struct.o \
1297
  $(B)/client/l_struct.o \
1299
  \
1298
  \
1300
  $(B)/client/jcapimin.o \
1301
  $(B)/client/jcapistd.o \
1302
  $(B)/client/jccoefct.o  \
1303
  $(B)/client/jccolor.o \
1304
  $(B)/client/jcdctmgr.o \
1305
  $(B)/client/jchuff.o   \
1306
  $(B)/client/jcinit.o \
1307
  $(B)/client/jcmainct.o \
1308
  $(B)/client/jcmarker.o \
1309
  $(B)/client/jcmaster.o \
1310
  $(B)/client/jcomapi.o \
1311
  $(B)/client/jcparam.o \
1312
  $(B)/client/jcphuff.o \
1313
  $(B)/client/jcprepct.o \
1314
  $(B)/client/jcsample.o \
1315
  $(B)/client/jdapimin.o \
1316
  $(B)/client/jdapistd.o \
1317
  $(B)/client/jdatasrc.o \
1318
  $(B)/client/jdcoefct.o \
1319
  $(B)/client/jdcolor.o \
1320
  $(B)/client/jddctmgr.o \
1321
  $(B)/client/jdhuff.o \
1322
  $(B)/client/jdinput.o \
1323
  $(B)/client/jdmainct.o \
1324
  $(B)/client/jdmarker.o \
1325
  $(B)/client/jdmaster.o \
1326
  $(B)/client/jdpostct.o \
1327
  $(B)/client/jdsample.o \
1328
  $(B)/client/jdtrans.o \
1329
  $(B)/client/jerror.o \
1330
  $(B)/client/jfdctflt.o \
1331
  $(B)/client/jidctflt.o \
1332
  $(B)/client/jmemmgr.o \
1333
  $(B)/client/jmemnobs.o \
1334
  $(B)/client/jutils.o \
1335
  \
1336
  $(B)/client/tr_animation.o \
1299
  $(B)/client/tr_animation.o \
1337
  $(B)/client/tr_backend.o \
1300
  $(B)/client/tr_backend.o \
1338
  $(B)/client/tr_bsp.o \
1301
  $(B)/client/tr_bsp.o \
Lines 1921-1929 Link Here
1921
$(B)/client/%.o: $(BLIBDIR)/%.c
1884
$(B)/client/%.o: $(BLIBDIR)/%.c
1922
	$(DO_BOT_CC)
1885
	$(DO_BOT_CC)
1923
1886
1924
$(B)/client/%.o: $(JPDIR)/%.c
1925
	$(DO_CC)
1926
1927
$(B)/client/%.o: $(SPEEXDIR)/%.c
1887
$(B)/client/%.o: $(SPEEXDIR)/%.c
1928
	$(DO_CC)
1888
	$(DO_CC)
1929
1889

Return to bug 430518