Remove icarus, merge heuristics into bsnes.

byuu · Aug 1, 2019 · 9e8913c · 9e8913c
1 parent 0e56b27
commit 9e8913c
Show file tree

Hide file tree

Showing 66 changed files with 6 additions and 2,575 deletions.
diff --git a/.cirrus.yml b/.cirrus.yml
@@ -14,7 +14,6 @@ linux-x86_64-binaries_task:
         - mkdir bsnes-nightly/Firmware
         - cp -a bsnes/out/bsnes bsnes-nightly/bsnes
         - cp -a bsnes/Database/* bsnes-nightly/Database
-        - cp -a icarus/Database/* bsnes-nightly/Database
         - cp -a GPLv3.txt bsnes-nightly
         - zip -r bsnes-nightly.zip bsnes-nightly
 
@@ -37,7 +36,6 @@ freebsd-x86_64-binaries_task:
         - mkdir bsnes-nightly/Firmware
         - cp -a bsnes/out/bsnes bsnes-nightly/bsnes
         - cp -a bsnes/Database/* bsnes-nightly/Database
-        - cp -a icarus/Database/* bsnes-nightly/Database
         - cp -a GPLv3.txt bsnes-nightly
         - zip -r bsnes-nightly.zip bsnes-nightly
 
@@ -60,7 +58,6 @@ windows-x86_64-binaries_task:
         - mkdir bsnes-nightly/Firmware
         - cp -a bsnes/out/bsnes bsnes-nightly/bsnes.exe
         - cp -a bsnes/Database/* bsnes-nightly/Database
-        - cp -a icarus/Database/* bsnes-nightly/Database
         - cp -a GPLv3.txt bsnes-nightly
         - zip -r bsnes-nightly.zip bsnes-nightly
 

diff --git a/icarus/Database/BS Memory.bml → bsnes/Database/BS Memory.bml b/icarus/Database/BS Memory.bml → bsnes/Database/BS Memory.bml
diff --git a/icarus/Database/Sufami Turbo.bml → bsnes/Database/Sufami Turbo.bml b/icarus/Database/Sufami Turbo.bml → bsnes/Database/Sufami Turbo.bml
diff --git a/icarus/Database/Super Famicom.bml → bsnes/Database/Super Famicom.bml b/icarus/Database/Super Famicom.bml → bsnes/Database/Super Famicom.bml
diff --git a/icarus/heuristics/bs-memory.cpp → bsnes/heuristics/bs-memory.cpp b/icarus/heuristics/bs-memory.cpp → bsnes/heuristics/bs-memory.cpp
diff --git a/icarus/heuristics/game-boy.cpp → bsnes/heuristics/game-boy.cpp b/icarus/heuristics/game-boy.cpp → bsnes/heuristics/game-boy.cpp
diff --git a/icarus/heuristics/heuristics.cpp → bsnes/heuristics/heuristics.cpp b/icarus/heuristics/heuristics.cpp → bsnes/heuristics/heuristics.cpp
diff --git a/icarus/heuristics/heuristics.hpp → bsnes/heuristics/heuristics.hpp b/icarus/heuristics/heuristics.hpp → bsnes/heuristics/heuristics.hpp
diff --git a/icarus/heuristics/sufami-turbo.cpp → bsnes/heuristics/sufami-turbo.cpp b/icarus/heuristics/sufami-turbo.cpp → bsnes/heuristics/sufami-turbo.cpp
diff --git a/icarus/heuristics/super-famicom.cpp → bsnes/heuristics/super-famicom.cpp b/icarus/heuristics/super-famicom.cpp → bsnes/heuristics/super-famicom.cpp
diff --git a/bsnes/target-bsnes/GNUmakefile b/bsnes/target-bsnes/GNUmakefile
@@ -30,7 +30,6 @@ ifeq ($(platform),macos)
 	mkdir -p out/$(name).app/Contents/Resources/
 	mv out/$(name) out/$(name).app/Contents/MacOS/$(name)
 	cp Database/* out/$(name).app/Contents/MacOS/Database/
-	cp ../icarus/Database/* out/$(name).app/Contents/MacOS/Database/
 	cp $(ui)/resource/$(name).plist out/$(name).app/Contents/Info.plist
 	sips -s format icns $(ui)/resource/$(name).png --out out/$(name).app/Contents/Resources/$(name).icns
 endif
@@ -58,7 +57,6 @@ else ifneq ($(filter $(platform),linux bsd),)
 	cp $(ui)/resource/$(name).desktop $(prefix)/share/applications/$(name).desktop
 	cp $(ui)/resource/$(name).png $(prefix)/share/icons/$(name).png
 	cp Database/* $(prefix)/share/$(name)/Database/
-	cp ../icarus/Database/* $(prefix)/share/$(name)/Database/
 	cp Locale/* $(prefix)/share/$(name)/Locale/
 endif
 

diff --git a/bsnes/target-bsnes/program/platform.cpp b/bsnes/target-bsnes/program/platform.cpp
@@ -1,10 +1,10 @@
 #include <nall/encode/bmp.hpp>
-#include <icarus/heuristics/heuristics.hpp>
-#include <icarus/heuristics/heuristics.cpp>
-#include <icarus/heuristics/super-famicom.cpp>
-#include <icarus/heuristics/game-boy.cpp>
-#include <icarus/heuristics/bs-memory.cpp>
-#include <icarus/heuristics/sufami-turbo.cpp>
+#include <heuristics/heuristics.hpp>
+#include <heuristics/heuristics.cpp>
+#include <heuristics/super-famicom.cpp>
+#include <heuristics/game-boy.cpp>
+#include <heuristics/bs-memory.cpp>
+#include <heuristics/sufami-turbo.cpp>
 
 //ROM data is held in memory to support compressed archives, soft-patching, and game hacks
 auto Program::open(uint id, string name, vfs::file::mode mode, bool required) -> vfs::shared::file {

diff --git a/icarus/Firmware/cx4.data.rom b/icarus/Firmware/cx4.data.rom
diff --git a/icarus/Firmware/sgb1.boot.rom b/icarus/Firmware/sgb1.boot.rom
diff --git a/icarus/Firmware/sgb2.boot.rom b/icarus/Firmware/sgb2.boot.rom
diff --git a/icarus/core/bs-memory.cpp b/icarus/core/bs-memory.cpp
diff --git a/icarus/core/colecovision.cpp b/icarus/core/colecovision.cpp
diff --git a/icarus/core/core.cpp b/icarus/core/core.cpp