Changed ls7emulator.c to main.c

Makefile

@@ -8,10 +8,11 @@ all: ls7emulator
 
 clean:
 	rm -rf bin/ls7emulator bin/
+	rm -rf src/*.o
 
 ls7emulator:
 	cd src
-	$(CC) ls7emulator.c -o ls7emulator $(CFLAGS) -O2
+	$(CC) main.c -o ls7emulator $(CFLAGS) -O2
 
 	rm ../bin -rf
 	mkdir ../bin

src/config.h

@@ -1,8 +1,3 @@
-#include <stdint.h>
-#include <SFML/System.h>
-#include <SFML/Graphics.h>
-
-
 #define NOP			0xEA		/* CPU NoOp */
 #define PAGESIZE 	0x1F		/* Pagesize of extra addressing of devices */
 #define VIDADDRS 	0xBE00		/* Video Address */
@@ -18,3 +13,5 @@
 
 #define CPUSPEED 4096 * 16
 
+
+static float displayScale = 2;

src/events.c

@@ -1,6 +1,4 @@
 #include <stdint.h>
-
-#include <SFML/Graphics/RenderWindow.h>
 #include <SFML/System.h>
 #include <SFML/Graphics.h>
 #include <SFML/Window.h>

src/ls7emulator.h

@@ -1,13 +0,0 @@
-#include <SFML/System.h>
-#include <SFML/Graphics.h>
-#include <stdint.h>
-
-
-/* Display Scale used for VertexArray */
-static float displayScale = 2;
-
-
-static sfVertexArray *renderArray;
-
-static sfRenderWindow *window;
-static sfRenderStates renderStates;

src/main.c

@@ -8,7 +8,6 @@
 #include <SFML/Graphics.h>
 #include <SFML/Window.h>
 
-#include "ls7emulator.h"
 #include "config.h"
 #include "events.c"
 #include "cpu.c"
@@ -17,6 +16,10 @@
 #include "keyboard.c"
 
 
+sfVertexArray *renderArray;
+sfRenderWindow *window;
+sfRenderStates renderStates;
+
 
 void openFile(const char *inputFile){
     FILE *file = fopen(inputFile, "rb");

src/memory.h

@@ -1,7 +1,5 @@
 #include <stdint.h>
 
-#include "config.h"
-
 extern void scanKeyboard();
 extern void writeVideo();
 extern uint8_t readVideo();