Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main.cpp

2 files changed, 21 insertions, 0 deletions

diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..28effcc
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,12 @@
+FLAGS_LINUX = -lGL                 -lSDL_image
+FLAGS_WIN32 = -lopengl32 -lmingw32 -lSDL2_Image
+FLAGS = -Wall -Werror -lSDL2main -lSDL2
+
+all:
+	@g++ src/main.cpp -o main $(FLAGS_LINUX) $(FLAGS)
+
+win32:
+	@g++ src/main.cpp -o main.exe $(FLAGS_WIN32) $(FLAGS)
+
+clean:
+	rm main*
diff --git a/src/main.cpp b/src/main.cpp
index 95af0a7..8d2d537 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 #include <iostream>
 #include "SDL.h"
 #include "SDL_opengl.h"
@@ -67,4 +68,12 @@ int main(int argc, char** argv){
     SDL_DestroyWindow(window);
     SDL_Quit();
     return 0;
+=======
+#include <stdio.h>
+#include <SDL2/SDL.h>
+
+int main(int argc,char **argv){
+	puts("Hello, world!");
+	return 0;
+>>>>>>> origin/master
 }