From e1be41b0f2933be6d879f5f297a70d715c4dbc91 Mon Sep 17 00:00:00 2001
From: Matt Laux <matthew.laux@gmail.com>
Date: Mon, 21 Oct 2019 23:49:08 -0500
Subject: [PATCH] more build system stuff

---
 CMakeLists.txt                     | 12 ------------
 compile.sh                         |  6 ------
 {main => src}/bootstrap.c          |  0
 {main => src}/bootstrap.h          |  0
 {main => src}/cpu.c                |  0
 {main => src}/cpu.h                |  0
 {main => src}/dmg.c                |  0
 {main => src}/dmg.h                |  0
 {main => src}/instructions.c       |  0
 {main => src}/instructions.h       |  0
 {main => src}/lcd.c                |  0
 {main => src}/lcd.h                |  0
 {main => src}/rom.c                |  0
 {main => src}/rom.h                |  0
 {main => src}/types.h              |  0
 system6/CMakeLists.txt             | 15 +++++++++++++++
 system6/compile.sh                 |  6 ++++++
 resources.r => system6/resources.r |  0
 18 files changed, 21 insertions(+), 18 deletions(-)
 delete mode 100644 CMakeLists.txt
 delete mode 100755 compile.sh
 rename {main => src}/bootstrap.c (100%)
 rename {main => src}/bootstrap.h (100%)
 rename {main => src}/cpu.c (100%)
 rename {main => src}/cpu.h (100%)
 rename {main => src}/dmg.c (100%)
 rename {main => src}/dmg.h (100%)
 rename {main => src}/instructions.c (100%)
 rename {main => src}/instructions.h (100%)
 rename {main => src}/lcd.c (100%)
 rename {main => src}/lcd.h (100%)
 rename {main => src}/rom.c (100%)
 rename {main => src}/rom.h (100%)
 rename {main => src}/types.h (100%)
 create mode 100644 system6/CMakeLists.txt
 create mode 100755 system6/compile.sh
 rename resources.r => system6/resources.r (100%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
deleted file mode 100644
index 8971508..0000000
--- a/CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-project(GameBoyEmulator)
-cmake_minimum_required(VERSION 3.9)
-add_application(Emulator
-    src/bootstrap.c
-    src/cpu.c
-    src/dmg.c
-    src/emulator.c
-    src/instructions.c
-    src/lcd.c
-    src/rom.c
-    resources.r
-)
diff --git a/compile.sh b/compile.sh
deleted file mode 100755
index ee62459..0000000
--- a/compile.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-mkdir -p build
-cd build
-cmake .. -DCMAKE_TOOLCHAIN_FILE=../../Retro68-build/toolchain/m68k-apple-macos/cmake/retro68.toolchain.cmake
-make
-cd ..
diff --git a/main/bootstrap.c b/src/bootstrap.c
similarity index 100%
rename from main/bootstrap.c
rename to src/bootstrap.c
diff --git a/main/bootstrap.h b/src/bootstrap.h
similarity index 100%
rename from main/bootstrap.h
rename to src/bootstrap.h
diff --git a/main/cpu.c b/src/cpu.c
similarity index 100%
rename from main/cpu.c
rename to src/cpu.c
diff --git a/main/cpu.h b/src/cpu.h
similarity index 100%
rename from main/cpu.h
rename to src/cpu.h
diff --git a/main/dmg.c b/src/dmg.c
similarity index 100%
rename from main/dmg.c
rename to src/dmg.c
diff --git a/main/dmg.h b/src/dmg.h
similarity index 100%
rename from main/dmg.h
rename to src/dmg.h
diff --git a/main/instructions.c b/src/instructions.c
similarity index 100%
rename from main/instructions.c
rename to src/instructions.c
diff --git a/main/instructions.h b/src/instructions.h
similarity index 100%
rename from main/instructions.h
rename to src/instructions.h
diff --git a/main/lcd.c b/src/lcd.c
similarity index 100%
rename from main/lcd.c
rename to src/lcd.c
diff --git a/main/lcd.h b/src/lcd.h
similarity index 100%
rename from main/lcd.h
rename to src/lcd.h
diff --git a/main/rom.c b/src/rom.c
similarity index 100%
rename from main/rom.c
rename to src/rom.c
diff --git a/main/rom.h b/src/rom.h
similarity index 100%
rename from main/rom.h
rename to src/rom.h
diff --git a/main/types.h b/src/types.h
similarity index 100%
rename from main/types.h
rename to src/types.h
diff --git a/system6/CMakeLists.txt b/system6/CMakeLists.txt
new file mode 100644
index 0000000..d6ea23a
--- /dev/null
+++ b/system6/CMakeLists.txt
@@ -0,0 +1,15 @@
+project(GameBoyEmulator)
+cmake_minimum_required(VERSION 3.9)
+
+include_directories(../src)
+
+add_application(Emulator
+    ../src/bootstrap.c
+    ../src/cpu.c
+    ../src/dmg.c
+    ../src/instructions.c
+    ../src/lcd.c
+    ../src/rom.c
+    emulator.c
+    resources.r
+)
diff --git a/system6/compile.sh b/system6/compile.sh
new file mode 100755
index 0000000..9d437d5
--- /dev/null
+++ b/system6/compile.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+mkdir -p build
+cd build
+cmake .. -DCMAKE_TOOLCHAIN_FILE=../../../Retro68-build/toolchain/m68k-apple-macos/cmake/retro68.toolchain.cmake
+make
+cd ..
diff --git a/resources.r b/system6/resources.r
similarity index 100%
rename from resources.r
rename to system6/resources.r