Move header files to include/

CMakeLists.txt

@@ -25,8 +25,6 @@ else ()
     set (CMAKE_CXX_STANDARD 14)
 endif ()
 
-# Add all include directories
-include_directories(include/** ${SIMPLE_LOGGER_SRC})
 # Add paths for linker
 link_directories(${SIMPLE_LOGGER_BIN})
 
@@ -38,4 +36,4 @@ add_library(65816 ${sources_65816})
 add_dependencies(65816 simple-logger)
 target_link_libraries(65816 simpleLogger)
 
-target_include_directories(65816 INTERFACE include/*)
+target_include_directories(65816 PRIVATE ${PROJECT_SOURCE_DIR}/include ${SIMPLE_LOGGER_SRC})

include/Cpu65816.hpp

@@ -27,7 +27,7 @@
 #include "Addressing.hpp"
 #include "Stack.hpp"
 #include "CpuStatus.hpp"
-#include "opcodes/OpCode.hpp"
+#include "OpCode.hpp"
 #include "Log.hpp"
 #include "Binary.hpp"
 #include "BuildConfig.hpp"

include/OpCode.hpp

@@ -22,7 +22,7 @@
 
 #include <stdint.h>
 
-#include "../Addressing.hpp"
+#include "Addressing.hpp"
 
 class Cpu65816;
 

src/Addressing.cpp

@@ -17,7 +17,9 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "Cpu65816.hpp"
+#include <Cpu65816.hpp>
+#include <OpCode.hpp>
+#include <SystemBusDevice.hpp>
 
 #define LOG_TAG "Addressing"
 

src/opcodes/OpCodeTable.cpp

@@ -20,7 +20,7 @@
 #ifndef OPCODE_TABLE_HPP
 #define OPCODE_TABLE_HPP
 
-#include "../Cpu65816.hpp"
+#include "Cpu65816.hpp"
 
 OpCode Cpu65816::OP_CODE_TABLE[] = {
     OpCode(0x00, "BRK", AddressingMode::Interrupt,                            &Cpu65816::executeInterrupt),

src/opcodes/OpCode_ADC.cpp

@@ -17,7 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../Cpu65816.hpp"
+#include "Cpu65816.hpp"
 
 #define LOG_TAG "Cpu::executeADC"
 

src/opcodes/OpCode_AND.cpp

@@ -17,7 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../Cpu65816.hpp"
+#include "Cpu65816.hpp"
 
 #include <cmath>
 

src/opcodes/OpCode_ASL.cpp

@@ -17,7 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../Cpu65816.hpp"
+#include "Cpu65816.hpp"
 
 #define LOG_TAG "Cpu::executeASL"
 

src/opcodes/OpCode_BIT.cpp

@@ -17,8 +17,8 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../Interrupt.hpp"
-#include "../Cpu65816.hpp"
+#include "Interrupt.hpp"
+#include "Cpu65816.hpp"
 
 #define LOG_TAG "Cpu::executeBIT"
 

src/opcodes/OpCode_Branch.cpp

@@ -17,7 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../Cpu65816.hpp"
+#include "Cpu65816.hpp"
 
 #include <cmath>
 

src/opcodes/OpCode_CMP.cpp

@@ -17,7 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../Cpu65816.hpp"
+#include "Cpu65816.hpp"
 
 #define LOG_TAG "Cpu::executeCMP"
 

src/opcodes/OpCode_CPX_CPY.cpp

@@ -17,7 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../Cpu65816.hpp"
+#include "Cpu65816.hpp"
 
 #define LOG_TAG "Cpu::executeCPXCPY"
 

src/opcodes/OpCode_EOR.cpp

@@ -17,7 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../Cpu65816.hpp"
+#include "Cpu65816.hpp"
 
 #define LOG_TAG "Cpu::executeEOR"
 

src/opcodes/OpCode_INC_DEC.cpp

@@ -17,7 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../Cpu65816.hpp"
+#include "Cpu65816.hpp"
 
 #define LOG_TAG "Cpu::executeINCDEC"
 

src/opcodes/OpCode_Interrupt.cpp

@@ -17,8 +17,8 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../Interrupt.hpp"
-#include "../Cpu65816.hpp"
+#include "Interrupt.hpp"
+#include "Cpu65816.hpp"
 
 #define LOG_TAG "Cpu::executeInterrupt"
 

src/opcodes/OpCode_JumpReturn.cpp

@@ -17,7 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../Cpu65816.hpp"
+#include "Cpu65816.hpp"
 
 #define LOG_TAG "Cpu::executeJumpReturn"
 

src/opcodes/OpCode_LDA.cpp

@@ -17,7 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../Cpu65816.hpp"
+#include "Cpu65816.hpp"
 
 #include <cmath>
 

src/opcodes/OpCode_LDX.cpp

@@ -17,7 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../Cpu65816.hpp"
+#include "Cpu65816.hpp"
 
 #include <cmath>
 

src/opcodes/OpCode_LDY.cpp

@@ -17,7 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../Cpu65816.hpp"
+#include "Cpu65816.hpp"
 
 #include <cmath>
 

src/opcodes/OpCode_LSR.cpp

@@ -17,7 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../Cpu65816.hpp"
+#include "Cpu65816.hpp"
 
 #define LOG_TAG "Cpu::executeLSR"
 

src/opcodes/OpCode_Misc.cpp

@@ -17,7 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../Cpu65816.hpp"
+#include "Cpu65816.hpp"
 
 #define LOG_TAG "Cpu::executeMisc"
 

src/opcodes/OpCode_ORA.cpp

@@ -17,7 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../Cpu65816.hpp"
+#include "Cpu65816.hpp"
 
 #include <cmath>
 

src/opcodes/OpCode_ROL.cpp

@@ -17,7 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../Cpu65816.hpp"
+#include "Cpu65816.hpp"
 
 #define LOG_TAG "Cpu::executeROL"
 

src/opcodes/OpCode_ROR.cpp

@@ -17,7 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../Cpu65816.hpp"
+#include "Cpu65816.hpp"
 
 #define LOG_TAG "Cpu::executeROR"
 

src/opcodes/OpCode_SBC.cpp

@@ -17,7 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../Cpu65816.hpp"
+#include "Cpu65816.hpp"
 
 #define LOG_TAG "Cpu::executeSBC"
 

src/opcodes/OpCode_STA.cpp

@@ -17,7 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../Cpu65816.hpp"
+#include "Cpu65816.hpp"
 
 #define LOG_TAG "Cpu::executeSTA"
 

src/opcodes/OpCode_STX.cpp

@@ -17,7 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../Cpu65816.hpp"
+#include "Cpu65816.hpp"
 
 #define LOG_TAG "Cpu::executeSTX"
 

src/opcodes/OpCode_STY.cpp

@@ -17,7 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../Cpu65816.hpp"
+#include "Cpu65816.hpp"
 
 #define LOG_TAG "Cpu::executeSTY"
 

src/opcodes/OpCode_STZ.cpp

@@ -17,7 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../Cpu65816.hpp"
+#include "Cpu65816.hpp"
 
 #define LOG_TAG "Cpu::executeSTZ"
 

src/opcodes/OpCode_Stack.cpp

@@ -17,7 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../Cpu65816.hpp"
+#include "Cpu65816.hpp"
 
 #define LOG_TAG "Cpu::executeStack"
 

src/opcodes/OpCode_StatusReg.cpp

@@ -17,7 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../Cpu65816.hpp"
+#include "Cpu65816.hpp"
 
 #define LOG_TAG "Cpu::executeStatusReg"
 

src/opcodes/OpCode_TSB_TRB.cpp

@@ -17,8 +17,8 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../Interrupt.hpp"
-#include "../Cpu65816.hpp"
+#include "Interrupt.hpp"
+#include "Cpu65816.hpp"
 
 #define LOG_TAG "Cpu::executeTSBTRB"
 

src/opcodes/OpCode_Transfer.cpp

@@ -17,7 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../Cpu65816.hpp"
+#include "Cpu65816.hpp"
 
 #define LOG_TAG "Cpu::executeTransfer"