get rid of redundant library code

devinacker · Jun 23, 2018 · d4af262 · d4af262
1 parent 56e4691
commit d4af262
Show file tree

Hide file tree

Showing 344 changed files with 47 additions and 34,139 deletions.
diff --git a/bsnes/Makefile b/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:;
diff --git a/bsnes/ui-qt/Makefile b/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))
 

diff --git a/bsnes/ui-qt/ui-base.hpp b/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>

diff --git a/bsnes/nall/Makefile → common/nall/Makefile b/bsnes/nall/Makefile → common/nall/Makefile
diff --git a/bsnes/nall/algorithm.hpp → common/nall/algorithm.hpp b/bsnes/nall/algorithm.hpp → common/nall/algorithm.hpp
diff --git a/bsnes/nall/any.hpp → common/nall/any.hpp b/bsnes/nall/any.hpp → common/nall/any.hpp
diff --git a/bsnes/nall/array.hpp → common/nall/array.hpp b/bsnes/nall/array.hpp → common/nall/array.hpp
diff --git a/bsnes/nall/base64.hpp → common/nall/base64.hpp b/bsnes/nall/base64.hpp → common/nall/base64.hpp
diff --git a/bsnes/nall/bit.hpp → common/nall/bit.hpp b/bsnes/nall/bit.hpp → common/nall/bit.hpp
diff --git a/bsnes/nall/bps/delta.hpp → common/nall/bps/delta.hpp b/bsnes/nall/bps/delta.hpp → common/nall/bps/delta.hpp
diff --git a/bsnes/nall/bps/linear.hpp → common/nall/bps/linear.hpp b/bsnes/nall/bps/linear.hpp → common/nall/bps/linear.hpp
diff --git a/bsnes/nall/bps/metadata.hpp → common/nall/bps/metadata.hpp b/bsnes/nall/bps/metadata.hpp → common/nall/bps/metadata.hpp
diff --git a/bsnes/nall/bps/patch.hpp → common/nall/bps/patch.hpp b/bsnes/nall/bps/patch.hpp → common/nall/bps/patch.hpp
diff --git a/bsnes/nall/concept.hpp → common/nall/concept.hpp b/bsnes/nall/concept.hpp → common/nall/concept.hpp
diff --git a/bsnes/nall/config.hpp → common/nall/config.hpp b/bsnes/nall/config.hpp → common/nall/config.hpp
diff --git a/bsnes/nall/crc32.hpp → common/nall/crc32.hpp b/bsnes/nall/crc32.hpp → common/nall/crc32.hpp
diff --git a/bsnes/nall/detect.hpp → common/nall/detect.hpp b/bsnes/nall/detect.hpp → common/nall/detect.hpp
diff --git a/bsnes/nall/dictionary.hpp → common/nall/dictionary.hpp b/bsnes/nall/dictionary.hpp → common/nall/dictionary.hpp
diff --git a/bsnes/nall/directory.hpp → common/nall/directory.hpp b/bsnes/nall/directory.hpp → common/nall/directory.hpp
diff --git a/bsnes/nall/dl.hpp → common/nall/dl.hpp b/bsnes/nall/dl.hpp → common/nall/dl.hpp
diff --git a/bsnes/nall/endian.hpp → common/nall/endian.hpp b/bsnes/nall/endian.hpp → common/nall/endian.hpp
diff --git a/bsnes/nall/file.hpp → common/nall/file.hpp b/bsnes/nall/file.hpp → common/nall/file.hpp
diff --git a/bsnes/nall/filemap.hpp → common/nall/filemap.hpp b/bsnes/nall/filemap.hpp → common/nall/filemap.hpp
diff --git a/bsnes/nall/foreach.hpp → common/nall/foreach.hpp b/bsnes/nall/foreach.hpp → common/nall/foreach.hpp
diff --git a/bsnes/nall/function.hpp → common/nall/function.hpp b/bsnes/nall/function.hpp → common/nall/function.hpp
diff --git a/bsnes/nall/input.hpp → common/nall/input.hpp b/bsnes/nall/input.hpp → common/nall/input.hpp
diff --git a/bsnes/nall/lzss.hpp → common/nall/lzss.hpp b/bsnes/nall/lzss.hpp → common/nall/lzss.hpp
diff --git a/bsnes/nall/moduloarray.hpp → common/nall/moduloarray.hpp b/bsnes/nall/moduloarray.hpp → common/nall/moduloarray.hpp
diff --git a/bsnes/nall/platform.hpp → common/nall/platform.hpp b/bsnes/nall/platform.hpp → common/nall/platform.hpp
diff --git a/bsnes/nall/priorityqueue.hpp → common/nall/priorityqueue.hpp b/bsnes/nall/priorityqueue.hpp → common/nall/priorityqueue.hpp
diff --git a/bsnes/nall/property.hpp → common/nall/property.hpp b/bsnes/nall/property.hpp → common/nall/property.hpp
diff --git a/bsnes/ui-qt/template/Makefile → common/nall/qt/Makefile b/bsnes/ui-qt/template/Makefile → common/nall/qt/Makefile
diff --git a/bsnes/ui-qt/template/check-action.moc.hpp → common/nall/qt/check-action.moc.hpp b/bsnes/ui-qt/template/check-action.moc.hpp → common/nall/qt/check-action.moc.hpp
diff --git a/bsnes/ui-qt/template/concept.hpp → common/nall/qt/concept.hpp b/bsnes/ui-qt/template/concept.hpp → common/nall/qt/concept.hpp
diff --git a/bsnes/ui-qt/template/file-dialog.moc.hpp → common/nall/qt/file-dialog.moc.hpp b/bsnes/ui-qt/template/file-dialog.moc.hpp → common/nall/qt/file-dialog.moc.hpp
diff --git a/bsnes/ui-qt/template/radio-action.moc.hpp → common/nall/qt/radio-action.moc.hpp b/bsnes/ui-qt/template/radio-action.moc.hpp → common/nall/qt/radio-action.moc.hpp
diff --git a/bsnes/ui-qt/template/window.moc.hpp → common/nall/qt/window.moc.hpp b/bsnes/ui-qt/template/window.moc.hpp → common/nall/qt/window.moc.hpp
diff --git a/bsnes/nall/random.hpp → common/nall/random.hpp b/bsnes/nall/random.hpp → common/nall/random.hpp
diff --git a/bsnes/nall/serial.hpp → common/nall/serial.hpp b/bsnes/nall/serial.hpp → common/nall/serial.hpp
diff --git a/bsnes/nall/serializer.hpp → common/nall/serializer.hpp b/bsnes/nall/serializer.hpp → common/nall/serializer.hpp
diff --git a/bsnes/nall/sha256.hpp → common/nall/sha256.hpp b/bsnes/nall/sha256.hpp → common/nall/sha256.hpp
diff --git a/bsnes/nall/snes/cartridge.hpp → common/nall/snes/cartridge.hpp b/bsnes/nall/snes/cartridge.hpp → common/nall/snes/cartridge.hpp
diff --git a/bsnes/nall/snes/cpu.hpp → common/nall/snes/cpu.hpp b/bsnes/nall/snes/cpu.hpp → common/nall/snes/cpu.hpp
diff --git a/bsnes/nall/snes/smp.hpp → common/nall/snes/smp.hpp b/bsnes/nall/snes/smp.hpp → common/nall/snes/smp.hpp
diff --git a/bsnes/nall/sort.hpp → common/nall/sort.hpp b/bsnes/nall/sort.hpp → common/nall/sort.hpp
diff --git a/bsnes/nall/static.hpp → common/nall/static.hpp b/bsnes/nall/static.hpp → common/nall/static.hpp
diff --git a/bsnes/nall/stdint.hpp → common/nall/stdint.hpp b/bsnes/nall/stdint.hpp → common/nall/stdint.hpp
diff --git a/bsnes/nall/string.hpp → common/nall/string.hpp b/bsnes/nall/string.hpp → common/nall/string.hpp
diff --git a/bsnes/nall/string/base.hpp → common/nall/string/base.hpp b/bsnes/nall/string/base.hpp → common/nall/string/base.hpp
diff --git a/bsnes/nall/string/bsv.hpp → common/nall/string/bsv.hpp b/bsnes/nall/string/bsv.hpp → common/nall/string/bsv.hpp
diff --git a/bsnes/nall/string/cast.hpp → common/nall/string/cast.hpp b/bsnes/nall/string/cast.hpp → common/nall/string/cast.hpp
diff --git a/bsnes/nall/string/compare.hpp → common/nall/string/compare.hpp b/bsnes/nall/string/compare.hpp → common/nall/string/compare.hpp
diff --git a/bsnes/nall/string/convert.hpp → common/nall/string/convert.hpp b/bsnes/nall/string/convert.hpp → common/nall/string/convert.hpp
diff --git a/bsnes/nall/string/core.hpp → common/nall/string/core.hpp b/bsnes/nall/string/core.hpp → common/nall/string/core.hpp
diff --git a/bsnes/nall/string/filename.hpp → common/nall/string/filename.hpp b/bsnes/nall/string/filename.hpp → common/nall/string/filename.hpp
diff --git a/bsnes/nall/string/math.hpp → common/nall/string/math.hpp b/bsnes/nall/string/math.hpp → common/nall/string/math.hpp
diff --git a/bsnes/nall/string/platform.hpp → common/nall/string/platform.hpp b/bsnes/nall/string/platform.hpp → common/nall/string/platform.hpp
diff --git a/bsnes/nall/string/replace.hpp → common/nall/string/replace.hpp b/bsnes/nall/string/replace.hpp → common/nall/string/replace.hpp
diff --git a/bsnes/nall/string/split.hpp → common/nall/string/split.hpp b/bsnes/nall/string/split.hpp → common/nall/string/split.hpp
diff --git a/bsnes/nall/string/strl.hpp → common/nall/string/strl.hpp b/bsnes/nall/string/strl.hpp → common/nall/string/strl.hpp
diff --git a/bsnes/nall/string/strpos.hpp → common/nall/string/strpos.hpp b/bsnes/nall/string/strpos.hpp → common/nall/string/strpos.hpp
diff --git a/bsnes/nall/string/trim.hpp → common/nall/string/trim.hpp b/bsnes/nall/string/trim.hpp → common/nall/string/trim.hpp
diff --git a/bsnes/nall/string/utility.hpp → common/nall/string/utility.hpp b/bsnes/nall/string/utility.hpp → common/nall/string/utility.hpp
diff --git a/bsnes/nall/string/variadic.hpp → common/nall/string/variadic.hpp b/bsnes/nall/string/variadic.hpp → common/nall/string/variadic.hpp
diff --git a/bsnes/nall/string/wrapper.hpp → common/nall/string/wrapper.hpp b/bsnes/nall/string/wrapper.hpp → common/nall/string/wrapper.hpp
diff --git a/bsnes/nall/string/xml.hpp → common/nall/string/xml.hpp b/bsnes/nall/string/xml.hpp → common/nall/string/xml.hpp
diff --git a/bsnes/nall/ups.hpp → common/nall/ups.hpp b/bsnes/nall/ups.hpp → common/nall/ups.hpp
diff --git a/bsnes/nall/utf8.hpp → common/nall/utf8.hpp b/bsnes/nall/utf8.hpp → common/nall/utf8.hpp
diff --git a/bsnes/nall/utility.hpp → common/nall/utility.hpp b/bsnes/nall/utility.hpp → common/nall/utility.hpp
diff --git a/bsnes/nall/varint.hpp → common/nall/varint.hpp b/bsnes/nall/varint.hpp → common/nall/varint.hpp
diff --git a/bsnes/nall/vector.hpp → common/nall/vector.hpp b/bsnes/nall/vector.hpp → common/nall/vector.hpp
diff --git a/snesmusic/zlib/adler32.c → common/zlib/adler32.c b/snesmusic/zlib/adler32.c → common/zlib/adler32.c
diff --git a/snesmusic/zlib/crc32.c → common/zlib/crc32.c b/snesmusic/zlib/crc32.c → common/zlib/crc32.c
diff --git a/snesmusic/zlib/crc32.h → common/zlib/crc32.h b/snesmusic/zlib/crc32.h → common/zlib/crc32.h
diff --git a/snesmusic/zlib/inffast.c → common/zlib/inffast.c b/snesmusic/zlib/inffast.c → common/zlib/inffast.c
diff --git a/snesmusic/zlib/inffast.h → common/zlib/inffast.h b/snesmusic/zlib/inffast.h → common/zlib/inffast.h
diff --git a/snesmusic/zlib/inffixed.h → common/zlib/inffixed.h b/snesmusic/zlib/inffixed.h → common/zlib/inffixed.h
diff --git a/snesmusic/zlib/inflate.c → common/zlib/inflate.c b/snesmusic/zlib/inflate.c → common/zlib/inflate.c
diff --git a/snesmusic/zlib/inflate.h → common/zlib/inflate.h b/snesmusic/zlib/inflate.h → common/zlib/inflate.h
diff --git a/snesmusic/zlib/inftrees.c → common/zlib/inftrees.c b/snesmusic/zlib/inftrees.c → common/zlib/inftrees.c
diff --git a/snesmusic/zlib/inftrees.h → common/zlib/inftrees.h b/snesmusic/zlib/inftrees.h → common/zlib/inftrees.h
diff --git a/snesmusic/zlib/readme.txt → common/zlib/readme.txt b/snesmusic/zlib/readme.txt → common/zlib/readme.txt
diff --git a/snesmusic/zlib/zconf.h → common/zlib/zconf.h b/snesmusic/zlib/zconf.h → common/zlib/zconf.h
diff --git a/snesmusic/zlib/zlib.h → common/zlib/zlib.h b/snesmusic/zlib/zlib.h → common/zlib/zlib.h
diff --git a/snesmusic/zlib/zlib.txt → common/zlib/zlib.txt b/snesmusic/zlib/zlib.txt → common/zlib/zlib.txt
diff --git a/snesmusic/zlib/zutil.c → common/zlib/zutil.c b/snesmusic/zlib/zutil.c → common/zlib/zutil.c
diff --git a/snesmusic/zlib/zutil.h → common/zlib/zutil.h b/snesmusic/zlib/zutil.h → common/zlib/zutil.h
diff --git a/snesfilter/Makefile b/snesfilter/Makefile
@@ -1,11 +1,13 @@
-include nall/Makefile
+common := ../common
+nall   := $(common)/nall
+include $(nall)/Makefile
 
 qtlibs := QtCore QtGui
-include nall/qt/Makefile
+include $(nall)/qt/Makefile
 
 c     := $(compiler) -xc -std=gnu99
 cpp   := $(compiler) -std=gnu++0x
-flags := -I. -Iobj $(qtinc)
+flags := -I. -I$(common) -Iobj $(qtinc)
 link  :=
 
 ifeq ($(DEBUG), 1)

diff --git a/snesfilter/nall/Makefile b/snesfilter/nall/Makefile
diff --git a/snesfilter/nall/algorithm.hpp b/snesfilter/nall/algorithm.hpp
diff --git a/snesfilter/nall/any.hpp b/snesfilter/nall/any.hpp