--- a/snesfilter/Makefile +++ a/snesfilter/Makefile @@ -5,12 +5,12 @@ include nall/qt/Makefile c := $(compiler) -std=gnu99 cpp := $(subst cc,++,$(compiler)) -std=gnu++0x -flags := -O3 -I. -Iobj -fomit-frame-pointer $(qtinc) +flags := $(CXXFLAGS) -I. -Iobj -fomit-frame-pointer $(qtinc) link := ifeq ($(platform),x) flags := -fPIC -fopenmp $(flags) - link += -s -fopenmp -lpthread -lgomp + link += -fopenmp -lpthread -lgomp else ifeq ($(platform),osx) flags := -fPIC -fopenmp $(flags) link += -fopenmp -lpthread -lgomp @@ -73,9 +73,8 @@ endif install: ifeq ($(platform),x) - install -D -m 755 libsnesfilter.a $(DESTDIR)$(prefix)/lib - install -D -m 755 libsnesfilter.so $(DESTDIR)$(prefix)/lib - ldconfig -n $(DESTDIR)$(prefix)/lib + install -D -m 755 libsnesfilter.a $(DESTDIR)$(prefix)/lib/libsnesfilter.a + install -D -m 755 libsnesfilter.so $(DESTDIR)$(prefix)/lib/libsnesfilter.so else ifeq ($(platform),osx) cp libsnesfilter.dylib /usr/local/lib/libsnesfilter.dylib endif --- a/snesreader/Makefile +++ a/snesreader/Makefile @@ -5,12 +5,11 @@ include nall/qt/Makefile c := $(compiler) -std=gnu99 cpp := $(subst cc,++,$(compiler)) -std=gnu++0x -flags := -O3 -I. -Iobj -fomit-frame-pointer +flags := $(CXXFLAGS) -I. -Iobj -fomit-frame-pointer link := ifeq ($(platform),x) flags := -fPIC $(flags) - link += -s else ifeq ($(platform),osx) flags := -fPIC $(flags) endif @@ -171,9 +170,8 @@ endif install: ifeq ($(platform),x) - install -D -m 755 libsnesreader.a $(DESTDIR)$(prefix)/lib - install -D -m 755 libsnesreader.so $(DESTDIR)$(prefix)/lib - ldconfig -n $(DESTDIR)$(prefix)/lib + install -D -m 755 libsnesreader.a $(DESTDIR)$(prefix)/lib/libsnesreader.a + install -D -m 755 libsnesreader.so $(DESTDIR)$(prefix)/lib/libsnesreader.so else ifeq ($(platform),osx) cp libsnesreader.dylib /usr/local/lib/libsnesreader.dylib endif --- a/src/Makefile +++ a/src/Makefile @@ -4,7 +4,7 @@ ui := ui_qt # compiler c := $(compiler) -std=gnu99 cpp := $(subst cc,++,$(compiler)) -std=gnu++0x -flags := -O3 -fomit-frame-pointer -I. +flags := $(CXXFLAGS) -fomit-frame-pointer -I. link := objects := @@ -17,7 +17,7 @@ objects := # platform ifeq ($(platform),x) - link += -s -ldl -lX11 -lXext + link += -ldl -lX11 -lXext else ifeq ($(platform),osx) else ifeq ($(platform),win) link += -mwindows -mthreads @@ -60,8 +60,8 @@ endif install: ifeq ($(platform),x) install -D -m 755 ../bsnes $(DESTDIR)$(prefix)/bin/bsnes - install -D -m 644 data/bsnes.png $(DESTDIR)$(prefix)/share/pixmaps/bsnes.png - install -D -m 644 data/bsnes.desktop $(DESTDIR)$(prefix)/share/applications/bsnes.desktop + install -D -m 644 data/bsnes.png $(DESTDIR)/usr/share/pixmaps/bsnes.png + install -D -m 644 data/bsnes.desktop $(DESTDIR)/usr/share/applications/bsnes.desktop endif uninstall: --- a/supergameboy/Makefile +++ a/supergameboy/Makefile @@ -2,14 +2,13 @@ include nall/Makefile c := $(compiler) -std=gnu99 cpp := $(subst cc,++,$(compiler)) -std=gnu++0x -flags := -O3 -fomit-frame-pointer -I. -Icommon -Ilibgambatte/include -Ilibgambatte/src +flags := $(CXXFLAGS) -fomit-frame-pointer -I. -Icommon -Ilibgambatte/include -Ilibgambatte/src link := ifeq ($(platform),osx) flags := -fPIC $(flags) else ifeq ($(platform),x) flags := -fPIC $(flags) - link += -s endif objects := supergameboy @@ -113,9 +112,8 @@ install: ifeq ($(platform),osx) cp libsupergameboy.dylib /usr/local/lib/libsupergameboy.dylib else - install -D -m 755 libsupergameboy.a $(DESTDIR)$(prefix)/lib - install -D -m 755 libsupergameboy.so $(DESTDIR)$(prefix)/lib - ldconfig -n $(DESTDIR)$(prefix)/lib + install -D -m 755 libsupergameboy.a $(DESTDIR)$(prefix)/lib/libsupergameboy.a + install -D -m 755 libsupergameboy.so $(DESTDIR)$(prefix)/lib/libsupergameboy.so endif clean: