Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 254471 | Differences between
and this patch

Collapse All | Expand All

(-)a/snesfilter/Makefile (-5 / +4 lines)
Lines 5-16 include nall/qt/Makefile Link Here
5
5
6
c     := $(compiler) -std=gnu99
6
c     := $(compiler) -std=gnu99
7
cpp   := $(subst cc,++,$(compiler)) -std=gnu++0x
7
cpp   := $(subst cc,++,$(compiler)) -std=gnu++0x
8
flags := -O3 -I. -Iobj -fomit-frame-pointer $(qtinc)
8
flags := $(CXXFLAGS) -I. -Iobj -fomit-frame-pointer $(qtinc)
9
link  :=
9
link  :=
10
10
11
ifeq ($(platform),x)
11
ifeq ($(platform),x)
12
  flags := -fPIC -fopenmp $(flags)
12
  flags := -fPIC -fopenmp $(flags)
13
  link += -s -fopenmp -lpthread -lgomp
13
  link += -fopenmp -lpthread -lgomp
14
else ifeq ($(platform),osx)
14
else ifeq ($(platform),osx)
15
  flags := -fPIC -fopenmp $(flags)
15
  flags := -fPIC -fopenmp $(flags)
16
  link += -fopenmp -lpthread -lgomp
16
  link += -fopenmp -lpthread -lgomp
Lines 73-81 endif Link Here
73
73
74
install:
74
install:
75
ifeq ($(platform),x)
75
ifeq ($(platform),x)
76
	install -D -m 755 libsnesfilter.a $(DESTDIR)$(prefix)/lib
76
	install -D -m 755 libsnesfilter.a $(DESTDIR)$(prefix)/lib/libsnesfilter.a
77
	install -D -m 755 libsnesfilter.so $(DESTDIR)$(prefix)/lib
77
	install -D -m 755 libsnesfilter.so $(DESTDIR)$(prefix)/lib/libsnesfilter.so
78
	ldconfig -n $(DESTDIR)$(prefix)/lib
79
else ifeq ($(platform),osx)
78
else ifeq ($(platform),osx)
80
	cp libsnesfilter.dylib /usr/local/lib/libsnesfilter.dylib
79
	cp libsnesfilter.dylib /usr/local/lib/libsnesfilter.dylib
81
endif
80
endif
(-)a/snesreader/Makefile (-5 / +3 lines)
Lines 5-16 include nall/qt/Makefile Link Here
5
5
6
c     := $(compiler) -std=gnu99
6
c     := $(compiler) -std=gnu99
7
cpp   := $(subst cc,++,$(compiler)) -std=gnu++0x
7
cpp   := $(subst cc,++,$(compiler)) -std=gnu++0x
8
flags := -O3 -I. -Iobj -fomit-frame-pointer
8
flags := $(CXXFLAGS) -I. -Iobj -fomit-frame-pointer
9
link  :=
9
link  :=
10
10
11
ifeq ($(platform),x)
11
ifeq ($(platform),x)
12
  flags := -fPIC $(flags)
12
  flags := -fPIC $(flags)
13
  link += -s
14
else ifeq ($(platform),osx)
13
else ifeq ($(platform),osx)
15
  flags := -fPIC $(flags)
14
  flags := -fPIC $(flags)
16
endif
15
endif
Lines 171-179 endif Link Here
171
170
172
install:
171
install:
173
ifeq ($(platform),x)
172
ifeq ($(platform),x)
174
	install -D -m 755 libsnesreader.a $(DESTDIR)$(prefix)/lib
173
	install -D -m 755 libsnesreader.a $(DESTDIR)$(prefix)/lib/libsnesreader.a
175
	install -D -m 755 libsnesreader.so $(DESTDIR)$(prefix)/lib
174
	install -D -m 755 libsnesreader.so $(DESTDIR)$(prefix)/lib/libsnesreader.so
176
	ldconfig -n $(DESTDIR)$(prefix)/lib
177
else ifeq ($(platform),osx)
175
else ifeq ($(platform),osx)
178
	cp libsnesreader.dylib /usr/local/lib/libsnesreader.dylib
176
	cp libsnesreader.dylib /usr/local/lib/libsnesreader.dylib
179
endif
177
endif
(-)a/src/Makefile (-4 / +4 lines)
Lines 4-10 ui := ui_qt Link Here
4
# compiler
4
# compiler
5
c       := $(compiler) -std=gnu99
5
c       := $(compiler) -std=gnu99
6
cpp     := $(subst cc,++,$(compiler)) -std=gnu++0x
6
cpp     := $(subst cc,++,$(compiler)) -std=gnu++0x
7
flags   := -O3 -fomit-frame-pointer -I.
7
flags   := $(CXXFLAGS) -fomit-frame-pointer -I.
8
link    :=
8
link    :=
9
objects :=
9
objects :=
10
10
Lines 17-23 objects := Link Here
17
17
18
# platform
18
# platform
19
ifeq ($(platform),x)
19
ifeq ($(platform),x)
20
  link += -s -ldl -lX11 -lXext
20
  link += -ldl -lX11 -lXext
21
else ifeq ($(platform),osx)
21
else ifeq ($(platform),osx)
22
else ifeq ($(platform),win)
22
else ifeq ($(platform),win)
23
  link += -mwindows -mthreads
23
  link += -mwindows -mthreads
Lines 60-67 endif Link Here
60
install:
60
install:
61
ifeq ($(platform),x)
61
ifeq ($(platform),x)
62
	install -D -m 755 ../bsnes $(DESTDIR)$(prefix)/bin/bsnes
62
	install -D -m 755 ../bsnes $(DESTDIR)$(prefix)/bin/bsnes
63
	install -D -m 644 data/bsnes.png $(DESTDIR)$(prefix)/share/pixmaps/bsnes.png
63
	install -D -m 644 data/bsnes.png $(DESTDIR)/usr/share/pixmaps/bsnes.png
64
	install -D -m 644 data/bsnes.desktop $(DESTDIR)$(prefix)/share/applications/bsnes.desktop
64
	install -D -m 644 data/bsnes.desktop $(DESTDIR)/usr/share/applications/bsnes.desktop
65
endif
65
endif
66
66
67
uninstall:
67
uninstall:
(-)a/supergameboy/Makefile (-5 / +3 lines)
Lines 2-15 include nall/Makefile Link Here
2
2
3
c     := $(compiler) -std=gnu99
3
c     := $(compiler) -std=gnu99
4
cpp   := $(subst cc,++,$(compiler)) -std=gnu++0x
4
cpp   := $(subst cc,++,$(compiler)) -std=gnu++0x
5
flags := -O3 -fomit-frame-pointer -I. -Icommon -Ilibgambatte/include -Ilibgambatte/src
5
flags := $(CXXFLAGS) -fomit-frame-pointer -I. -Icommon -Ilibgambatte/include -Ilibgambatte/src
6
link  :=
6
link  :=
7
7
8
ifeq ($(platform),osx)
8
ifeq ($(platform),osx)
9
  flags := -fPIC $(flags)
9
  flags := -fPIC $(flags)
10
else ifeq ($(platform),x)
10
else ifeq ($(platform),x)
11
  flags := -fPIC $(flags)
11
  flags := -fPIC $(flags)
12
  link += -s
13
endif
12
endif
14
13
15
objects := supergameboy
14
objects := supergameboy
Lines 113-121 install: Link Here
113
ifeq ($(platform),osx)
112
ifeq ($(platform),osx)
114
	cp libsupergameboy.dylib /usr/local/lib/libsupergameboy.dylib
113
	cp libsupergameboy.dylib /usr/local/lib/libsupergameboy.dylib
115
else
114
else
116
	install -D -m 755 libsupergameboy.a $(DESTDIR)$(prefix)/lib
115
	install -D -m 755 libsupergameboy.a $(DESTDIR)$(prefix)/lib/libsupergameboy.a
117
	install -D -m 755 libsupergameboy.so $(DESTDIR)$(prefix)/lib
116
	install -D -m 755 libsupergameboy.so $(DESTDIR)$(prefix)/lib/libsupergameboy.so
118
	ldconfig -n $(DESTDIR)$(prefix)/lib
119
endif
117
endif
120
118
121
clean:
119
clean:

Return to bug 254471