From 71a1b2eb6332fd8e858df4f15ed98a0d457576a3 Mon Sep 17 00:00:00 2001
From: dingusdev <kataetheweirdo@gmail.com>
Date: Sat, 14 Dec 2019 12:56:43 -0700
Subject: [PATCH] Fixed CMakeLists errors and deleted makefile

---
 CMakeLists.txt |  8 +++-----
 makefile       | 27 ---------------------------
 2 files changed, 3 insertions(+), 32 deletions(-)
 delete mode 100644 makefile

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4bbbda1..29c4010 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,8 +2,7 @@ cmake_minimum_required(VERSION 3.1)
 project(dingusppc)
  
 set(CMAKE_CXX_STANDARD 11)
- 
-set(CMAKE_AUTOMOC ON)
+
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} "-c -Wall -O3 -s")
  
@@ -12,17 +11,16 @@ set(SOURCE_FILES
         devices/memctrlbase.cpp
         devices/mpc106.cpp
         devices/viacuda.cpp
+        debugger/debugger.cpp
         poweropcodes.cpp
         ppcfpopcodes.cpp
         ppcgekkoopcodes.cpp
         ppcmemory.cpp
         ppcopcodes.cpp
         main.cpp
-        debugger.cpp
         )
  
 set(HEADER_FILES
-        devices/heathrow.cpp
         devices/machineid.h
         devices/macio.h
         devices/memctrlbase.h
@@ -31,9 +29,9 @@ set(HEADER_FILES
         devices/pcidevice.h
         devices/pcihost.h
         devices/viacuda.h
+        debugger/debugger.h
         ppcemumain.h
         ppcmemory.h
-        debugger.h
         )
  
 add_executable(dingusppc ${SOURCE_FILES} ${HEADER_FILES})
diff --git a/makefile b/makefile
deleted file mode 100644
index 48613c6..0000000
--- a/makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-EXE	 := dingusppc
-MODULES := . devices debugger
-SRCS := $(foreach sdir,$(MODULES),$(wildcard $(sdir)/*.cpp))
-#SRCS = $(wildcard *.cpp)
-OBJS := $(patsubst %.cpp, %.o, $(SRCS))
-
-CXX	     = g++
-CXXFLAGS = -g -c -Wall -std=c++11
-LFLAGS	 =
-
-VPATH := devices
-
-DEPS = $(OBJS:.o=.d)
-
-all: $(EXE)
-
-$(EXE) : $(OBJS)
-	$(CXX) -o $@ $^
-
-%.o : %.cpp
-	$(CXX) $(CXXFLAGS) -MMD -o $@ $<
-
-clean:
-	rm -rf *.o *.d devices/*.o devices/*.d $(EXE)
-	rm -rf *.o *.d debugger/*.o debugger/*.d $(EXE)
-
--include $(DEPS)