get rid of redundant library code

Author: devinacker

bsnes/Makefile

@@ -1,4 +1,6 @@
-include nall/Makefile
+common := ../common
+nall   := $(common)/nall
+include $(nall)/Makefile
 snes := snes
 ifeq ($(profile),)
   profile := compatibility
@@ -13,7 +15,7 @@ version := v04
 # compiler
 c       := $(compiler) -xc -std=gnu99
 cpp     := $(compiler) -std=gnu++0x
-flags   := -I. -I$(snes)
+flags   := -I. -I$(common) -I$(snes)
 link    :=
 objects :=
 
@@ -155,6 +157,6 @@ plugins_clean:
 	@$(MAKE) clean -C ../supergameboy
 
 archive-all:
-	tar -cjf bsnes.tar.bz2 data launcher libco nall obj out phoenix ruby snes ui-phoenix ui-qt Makefile cc.bat clean.bat sync.sh
+	tar -cjf bsnes.tar.bz2 data launcher libco obj out ruby snes ui-qt Makefile cc.bat clean.bat sync.sh uname.bat
 
 help:;

bsnes/ui-qt/Makefile

@@ -1,13 +1,13 @@
 qtlibs := $(strip QtCore QtGui $(if $(findstring osx,$(platform)),QtOpenGL))
-include $(ui)/template/Makefile
+include $(nall)/qt/Makefile
 
 ui_objects := ui-main ui-base ui-cartridge ui-debugger ui-input ui-movie ui-settings ui-state ui-tools
 ui_objects += ruby
 ui_objects += $(if $(call streq,$(platform),$(filter $(platform),win msys)),resource)
 link += $(qtlib)
 
 headers := $(call rwildcard,$(ui)/,%.hpp)
-moc_headers := $(call rwildcard,nall/qt/,%.moc.hpp) $(call rwildcard,$(ui)/,%.moc.hpp)
+moc_headers := $(call rwildcard,$(nall)/qt/,%.moc.hpp) $(call rwildcard,$(ui)/,%.moc.hpp)
 moc_objects := $(foreach f,$(moc_headers),obj/$(notdir $(patsubst %.moc.hpp,%.moc,$f)))
 qt_compile = $(call compile,-Iobj $(qtinc))
 

bsnes/ui-qt/ui-base.hpp

@@ -16,11 +16,11 @@
 #include <nall/input.hpp>
 #include <nall/ups.hpp>
 #include <nall/snes/cartridge.hpp>
-#include "template/concept.hpp"
-#include "template/check-action.moc.hpp"
-#include "template/file-dialog.moc.hpp"
-#include "template/radio-action.moc.hpp"
-#include "template/window.moc.hpp"
+#include <nall/qt/concept.hpp>
+#include <nall/qt/check-action.moc.hpp>
+#include <nall/qt/file-dialog.moc.hpp>
+#include <nall/qt/radio-action.moc.hpp>
+#include <nall/qt/window.moc.hpp>
 using namespace nall;
 
 #include <ruby/ruby.hpp>