more build system stuff

2019-10-21 23:49:08 -05:00 · 2019-10-21 23:49:08 -05:00 · e1be41b0f2
parent de5fcfaf00
commit e1be41b0f2
18 changed files with 21 additions and 18 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -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
-)
--- a/compile.sh
+++ b/compile.sh
@ -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 ..
--- a/main/bootstrap.c
+++ b/main/bootstrap.c
--- a/main/bootstrap.h
+++ b/main/bootstrap.h
--- a/main/cpu.c
+++ b/main/cpu.c
--- a/main/cpu.h
+++ b/main/cpu.h
--- a/main/dmg.c
+++ b/main/dmg.c
--- a/main/dmg.h
+++ b/main/dmg.h
--- a/main/instructions.c
+++ b/main/instructions.c
--- a/main/instructions.h
+++ b/main/instructions.h
--- a/main/lcd.c
+++ b/main/lcd.c
--- a/main/lcd.h
+++ b/main/lcd.h
--- a/main/rom.c
+++ b/main/rom.c
--- a/main/rom.h
+++ b/main/rom.h
--- a/main/types.h
+++ b/main/types.h
--- a/system6/CMakeLists.txt
+++ 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
+)
--- a/system6/compile.sh
+++ 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 ..
--- a/system6/resources.r
+++ b/system6/resources.r