From 129e5e130b68765fc1c6d445e81f4f94d6541b9b Mon Sep 17 00:00:00 2001 From: SergioMartin86 Date: Sat, 24 Feb 2024 06:46:11 +0000 Subject: [PATCH] Making apus independently named --- source/quickerNES/core/apu/fme7/{apu.cpp => apu_fme7.cpp} | 2 +- source/quickerNES/core/apu/fme7/{apu.hpp => apu_fme7.hpp} | 0 .../quickerNES/core/apu/namco/{apu.cpp => apu_namco.cpp} | 2 +- .../quickerNES/core/apu/namco/{apu.hpp => apu_namco.hpp} | 0 source/quickerNES/core/apu/vrc6/{apu.cpp => apu_vrc6.cpp} | 2 +- source/quickerNES/core/apu/vrc6/{apu.hpp => apu_vrc6.hpp} | 0 source/quickerNES/core/apu/vrc7/{apu.cpp => apu_vrc7.cpp} | 2 +- source/quickerNES/core/apu/vrc7/{apu.hpp => apu_vrc7.hpp} | 0 source/quickerNES/core/mappers/mapper019.hpp | 2 +- source/quickerNES/core/mappers/mapper024.hpp | 2 +- source/quickerNES/core/mappers/mapper069.hpp | 2 +- source/quickerNES/core/mappers/mapper085.hpp | 2 +- source/quickerNES/meson.build | 8 ++++---- 13 files changed, 12 insertions(+), 12 deletions(-) rename source/quickerNES/core/apu/fme7/{apu.cpp => apu_fme7.cpp} (98%) rename source/quickerNES/core/apu/fme7/{apu.hpp => apu_fme7.hpp} (100%) rename source/quickerNES/core/apu/namco/{apu.cpp => apu_namco.cpp} (98%) rename source/quickerNES/core/apu/namco/{apu.hpp => apu_namco.hpp} (100%) rename source/quickerNES/core/apu/vrc6/{apu.cpp => apu_vrc6.cpp} (98%) rename source/quickerNES/core/apu/vrc6/{apu.hpp => apu_vrc6.hpp} (100%) rename source/quickerNES/core/apu/vrc7/{apu.cpp => apu_vrc7.cpp} (98%) rename source/quickerNES/core/apu/vrc7/{apu.hpp => apu_vrc7.hpp} (100%) diff --git a/source/quickerNES/core/apu/fme7/apu.cpp b/source/quickerNES/core/apu/fme7/apu_fme7.cpp similarity index 98% rename from source/quickerNES/core/apu/fme7/apu.cpp rename to source/quickerNES/core/apu/fme7/apu_fme7.cpp index e464d7b..f050307 100644 --- a/source/quickerNES/core/apu/fme7/apu.cpp +++ b/source/quickerNES/core/apu/fme7/apu_fme7.cpp @@ -1,7 +1,7 @@ // Emu 0.7.0. http://www.slack.net/~ant/ -#include "apu.hpp" +#include "apu_fme7.hpp" #include /* Copyright (C) 2003-2006 Shay Green. This module is free software; you diff --git a/source/quickerNES/core/apu/fme7/apu.hpp b/source/quickerNES/core/apu/fme7/apu_fme7.hpp similarity index 100% rename from source/quickerNES/core/apu/fme7/apu.hpp rename to source/quickerNES/core/apu/fme7/apu_fme7.hpp diff --git a/source/quickerNES/core/apu/namco/apu.cpp b/source/quickerNES/core/apu/namco/apu_namco.cpp similarity index 98% rename from source/quickerNES/core/apu/namco/apu.cpp rename to source/quickerNES/core/apu/namco/apu_namco.cpp index 5aab85c..f5136b3 100644 --- a/source/quickerNES/core/apu/namco/apu.cpp +++ b/source/quickerNES/core/apu/namco/apu_namco.cpp @@ -1,7 +1,7 @@ // Snd_Emu 0.1.7. http://www.slack.net/~ant/ -#include "apu.hpp" +#include "apu_namco.hpp" #include "../blipBuffer.hpp" /* Copyright (C) 2003-2006 Shay Green. This module is free software; you diff --git a/source/quickerNES/core/apu/namco/apu.hpp b/source/quickerNES/core/apu/namco/apu_namco.hpp similarity index 100% rename from source/quickerNES/core/apu/namco/apu.hpp rename to source/quickerNES/core/apu/namco/apu_namco.hpp diff --git a/source/quickerNES/core/apu/vrc6/apu.cpp b/source/quickerNES/core/apu/vrc6/apu_vrc6.cpp similarity index 98% rename from source/quickerNES/core/apu/vrc6/apu.cpp rename to source/quickerNES/core/apu/vrc6/apu_vrc6.cpp index 83bde65..93c348b 100644 --- a/source/quickerNES/core/apu/vrc6/apu.cpp +++ b/source/quickerNES/core/apu/vrc6/apu_vrc6.cpp @@ -1,7 +1,7 @@ // Snd_Emu 0.1.7. http://www.slack.net/~ant/ -#include "apu.hpp" +#include "apu_vrc6.hpp" /* Copyright (C) 2003-2006 Shay Green. This module is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser diff --git a/source/quickerNES/core/apu/vrc6/apu.hpp b/source/quickerNES/core/apu/vrc6/apu_vrc6.hpp similarity index 100% rename from source/quickerNES/core/apu/vrc6/apu.hpp rename to source/quickerNES/core/apu/vrc6/apu_vrc6.hpp diff --git a/source/quickerNES/core/apu/vrc7/apu.cpp b/source/quickerNES/core/apu/vrc7/apu_vrc7.cpp similarity index 98% rename from source/quickerNES/core/apu/vrc7/apu.cpp rename to source/quickerNES/core/apu/vrc7/apu_vrc7.cpp index 77076fa..591e848 100644 --- a/source/quickerNES/core/apu/vrc7/apu.cpp +++ b/source/quickerNES/core/apu/vrc7/apu_vrc7.cpp @@ -1,5 +1,5 @@ #include -#include "apu.hpp" +#include "apu_vrc7.hpp" #include "emu2413.hpp" namespace quickerNES diff --git a/source/quickerNES/core/apu/vrc7/apu.hpp b/source/quickerNES/core/apu/vrc7/apu_vrc7.hpp similarity index 100% rename from source/quickerNES/core/apu/vrc7/apu.hpp rename to source/quickerNES/core/apu/vrc7/apu_vrc7.hpp diff --git a/source/quickerNES/core/mappers/mapper019.hpp b/source/quickerNES/core/mappers/mapper019.hpp index 5a28d62..ad6ec7e 100644 --- a/source/quickerNES/core/mappers/mapper019.hpp +++ b/source/quickerNES/core/mappers/mapper019.hpp @@ -4,7 +4,7 @@ // Emu 0.7.0. http://www.slack.net/~ant/ -#include "../apu/namco/apu.hpp" +#include "../apu/namco/apu_namco.hpp" #include "mapper.hpp" /* Copyright (C) 2004-2006 Shay Green. This module is free software; you diff --git a/source/quickerNES/core/mappers/mapper024.hpp b/source/quickerNES/core/mappers/mapper024.hpp index 40e5f2c..4b9aefd 100644 --- a/source/quickerNES/core/mappers/mapper024.hpp +++ b/source/quickerNES/core/mappers/mapper024.hpp @@ -3,7 +3,7 @@ // Konami VRC6 mapper // Emu 0.7.0. http://www.slack.net/~ant/ -#include "../apu/vrc6/apu.hpp" +#include "../apu/vrc6/apu_vrc6.hpp" #include "mapper.hpp" #include diff --git a/source/quickerNES/core/mappers/mapper069.hpp b/source/quickerNES/core/mappers/mapper069.hpp index b2c0944..cd8cb82 100644 --- a/source/quickerNES/core/mappers/mapper069.hpp +++ b/source/quickerNES/core/mappers/mapper069.hpp @@ -4,7 +4,7 @@ // Emu 0.7.0. http://www.slack.net/~ant/libs/ -#include "../apu/fme7/apu.hpp" +#include "../apu/fme7/apu_fme7.hpp" #include "mapper.hpp" /* Copyright (C) 2005 Chris Moeller */ diff --git a/source/quickerNES/core/mappers/mapper085.hpp b/source/quickerNES/core/mappers/mapper085.hpp index 377ade4..603c895 100644 --- a/source/quickerNES/core/mappers/mapper085.hpp +++ b/source/quickerNES/core/mappers/mapper085.hpp @@ -2,7 +2,7 @@ // Emu 0.5.4. http://www.slack.net/~ant/ -#include "../apu/vrc7/apu.hpp" +#include "../apu/vrc7/apu_vrc7.hpp" #include "mapper.hpp" #include diff --git a/source/quickerNES/meson.build b/source/quickerNES/meson.build index 1aee8d8..dc896f2 100644 --- a/source/quickerNES/meson.build +++ b/source/quickerNES/meson.build @@ -8,12 +8,12 @@ quickerNESAPUSrc = [ 'core/apu/NESEffectsBuffer.cpp', 'core/apu/effectsBuffer.cpp', 'core/apu/multiBuffer.cpp', - 'core/apu/namco/apu.cpp', - 'core/apu/vrc6/apu.cpp', + 'core/apu/namco/apu_namco.cpp', + 'core/apu/vrc6/apu_vrc6.cpp', 'core/apu/vrc7/emu2413.cpp', 'core/apu/vrc7/emu2413_state.cpp', - 'core/apu/vrc7/apu.cpp', - 'core/apu/fme7/apu.cpp', + 'core/apu/vrc7/apu_vrc7.cpp', + 'core/apu/fme7/apu_fme7.cpp', ] quickerNESPPUSrc = [