]>
Commit | Line | Data |
---|---|---|
fa4a9d49 | 1 | diff -urN dshowserver.orig/config.mak dshowserver-svn101/config.mak |
2 | --- dshowserver.orig/config.mak 2010-01-09 18:46:57.000000000 +0100 | |
3 | +++ dshowserver-svn101/config.mak 2010-01-09 19:35:48.000000000 +0100 | |
4 | @@ -23,6 +23,7 @@ | |
5 | RANLIB ?= ranlib | |
6 | OBJDIR ?= ../objs | |
7 | ||
8 | -PREFIX ?= /usr/local | |
9 | +PREFIX ?= /usr | |
10 | PREFIX_EXE ?= $(PREFIX)/bin | |
11 | -PREFIX_SHARE ?= $(PREFIX)/share/dshowserver | |
12 | +PREFIX_LIBS ?= $(PREFIX)/lib/dshowserver | |
13 | +PREFIX_REAL ?= /usr/lib/dshowserver | |
14 | diff -urN dshowserver.orig/dshowserver/Makefile dshowserver-svn101/dshowserver/Makefile | |
15 | --- dshowserver.orig/dshowserver/Makefile 2010-01-09 18:47:01.000000000 +0100 | |
16 | +++ dshowserver-svn101/dshowserver/Makefile 2010-01-09 19:36:17.000000000 +0100 | |
17 | @@ -2,13 +2,13 @@ | |
18 | ||
19 | ||
20 | CFLAGS=-I../loader -Wdisabled-optimization -Wno-pointer-sign -Wdeclaration-after-statement -I. -Wall -Wno-switch -Wpointer-arith -Wredundant-decls -pipe -ffast-math -fomit-frame-pointer -D_LARGEFILE_SOURCE -D__WINE__ -DNOAVIFILE_HEADERS -DMPLAYER | |
21 | -CFLAGS+=-fno-omit-frame-pointer -mno-omit-leaf-frame-pointer | |
22 | +OPTFLAGS:=-fno-omit-frame-pointer -mno-omit-leaf-frame-pointer | |
23 | ||
24 | ifdef DEBUG | |
25 | - CFLAGS+= -g | |
26 | + OPTFLAGS+= -g | |
27 | LOADER_OPT = "DEBUG=1" | |
28 | else | |
29 | - CFLAGS+= -O2 | |
30 | + OPTFLAGS+= -O2 | |
31 | endif | |
32 | ifdef STATIC | |
33 | STATICBUILD= -static | |
34 | @@ -28,6 +28,7 @@ | |
35 | endif | |
36 | endif | |
37 | ||
38 | +CFLAGS += $(OPTFLAGS) | |
39 | LIBS += $(EXTRA_LIBS) | |
40 | ||
41 | .PHONY: loader | |
42 | @@ -35,7 +36,7 @@ | |
43 | all: $(OBJDIR) dshowserver $(REGISTERCODEC) | |
44 | ||
45 | dshowserver: $(OBJDIR)/server.o $(OBJDIR)/timeout_sem.o $(OBJDIR)/defaults.o $(OBJDIR)/crc32.o $(OBJDIR)/libloader.a | |
46 | - $(CC) $(STATICBUILD) -o $@ $^ $(LIBS) | |
47 | + $(CC) $(CFLAGS) $(LDFLAGS) $(STATICBUILD) -o $@ $^ $(LIBS) | |
48 | ifdef X_COMPILE | |
49 | mv $@ $@.exe | |
50 | echo "#!/bin/sh" > $@ | |
51 | @@ -45,7 +46,7 @@ | |
52 | endif | |
53 | ||
54 | registercodec: ../loader/modify_reg.c ../loader/registry.c | |
55 | - $(CC) $(STATICBUILD) -I../loader -I../loader/compat -o $@ $< | |
56 | + $(CC) $(CFLAGS) $(LDFLAGS) $(STATICBUILD) -I../loader -I../loader/compat -o $@ $< | |
57 | ||
58 | ||
59 | $(OBJDIR): | |
60 | @@ -72,13 +73,13 @@ | |
61 | rm -f dshowserver.exe* | |
62 | ||
63 | install:: | |
64 | - mkdir -p $(PREFIX_SHARE) | |
65 | + mkdir -p $(PREFIX_LIBS) | |
66 | mkdir -p $(PREFIX_EXE) | |
67 | ifdef WINE_EXT | |
68 | - cp dshowserver.$(WINE_EXT) $(PREFIX_SHARE)/ | |
69 | + cp dshowserver.$(WINE_EXT) $(PREFIX_LIBS)/ | |
70 | echo "#!/bin/sh" > $(PREFIX_EXE)/dshowserver | |
71 | echo "echo 'Starting wine dshowserver.$(WINE_EXT)'" >> $(PREFIX_EXE)/dshowserver | |
72 | - echo 'wine $(PREFIX_SHARE)/dshowserver.$(WINE_EXT) $$*' >> $(PREFIX_EXE)/dshowserver | |
73 | + echo 'wine $(PREFIX_REAL)/dshowserver.$(WINE_EXT) $$*' >> $(PREFIX_EXE)/dshowserver | |
74 | chmod +x $(PREFIX_EXE)/dshowserver | |
75 | else | |
76 | cp dshowserver $(PREFIX_EXE)/ |