Submodulize SFML reference

.gitignore

@@ -10,6 +10,7 @@
 *.pdb
 *.ilk
 *.DS_Store
+*.dll
 
 chesspp
 debug.txt
@@ -19,3 +20,4 @@ Debug/
 Release/
 libs/SFML-4fbefe7/build_vs11/
 bin/
+obj/

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "lib/SFML"]
+	path = lib/SFML
+	url = git://github.com/LaurentGomila/SFML.git

Makefile

@@ -1,43 +1,69 @@
-UNAME = $(shell uname -s)
+# A MinGW Makefile
+# As it uses -std=c++, g++ must be at least Version 4.7  ( $ g++ --version )
+# I ended up downloading this: http://nuwen.net/mingw.html
 
-COMPILER_Linux = g++
-CXX_FLAGS_Linux = -Wall -std=c++11
-DEBUG_LIBS_Linux = -lsfml-system-d -lsfml-window-d -lsfml-graphics-d
-RELEASE_LIBS_Linux = -lsfml-system -lsfml-window -lsfml-graphics
+CC = g++
+FLAGS = -Wall -std=c++11
+OFLAG = $(FLAGS) -c
 
-COMPILER_Darwin = clang++
-CXX_FLAGS_Darwin = -Wall -std=c++11 -stdlib=libc++
-CXX_INCLUDE_Darwin = -I/opt/local/include
-DEBUG_LIBS_Darwin = -framework SFML -framework sfml-system -framework sfml-window -framework sfml-graphics 
-RELEASE_LIBS_Darwin = $(DEBUG_LIBS)
+INCLUDE = -I../../include
+LIBDIR  = -L../../lib/sfml
+SOURCEDIR = ./src/
 
-COMPILER = $(COMPILER_$(UNAME))
-CXX_FLAGS = $(CXX_FLAGS_$(UNAME))
-CXX_INCLUDE = $(CXX_INCLUDE_$(UNAME))
-DEBUG_LIBS = $(DEBUG_LIBS_$(UNAME))
-RELEASE_LIBS = $(RELEASE_LIBS_$(UNAME))
+ODIR = ./obj/
+OBJECTS = $(ODIR)Application.o $(ODIR)AppStateGame.o $(ODIR)Graphics.o\
+$(ODIR)Main.o $(ODIR)Pawn.o $(ODIR)Rook.o $(ODIR)Knight.o $(ODIR)Bishop.o\
+$(ODIR)Queen.o $(ODIR)King.o $(ODIR)Logger.o $(ODIR)Piece.o $(ODIR)Position.o\
+$(ODIR)Board.o
+EXECUTABLE = ChessPlusPlus.exe
 
-DEBUG_PREPROCESSOR = -D_DEBUG
-RELEASE_PREPROCESSOR = -D_RELEASE
+LIBS =  -lsfml-system -lsfml-window -lsfml-graphics
 
-EXECUTABLE = chesspp
-TARGET = ../$(EXECUTABLE)
-SOURCE = $(shell cd src ; ls *.cpp) $(shell cd src ; ls board/*.cpp)
+$(EXECUTABLE): $(OBJECTS)
+	$(CC) $(FLAGS) $(OBJECTS) -o $(EXECUTABLE)  $(LIBDIR) $(LIBS)
 
-all: debug
+$(ODIR)Application.o: $(SOURCEDIR)Application.cpp $(SOURCEDIR)Application.hpp
+	$(CC) $(OFLAG) $(INCLUDE) $(SOURCEDIR)Application.cpp -o $(ODIR)Application.o
 
-debug: CXX_PREPROCESSOR=$(DEBUG_PREPROCESSOR)
-debug: LIBS=$(DEBUG_LIBS)
-debug: main
+$(ODIR)AppStateGame.o: $(SOURCEDIR)AppStateGame.cpp $(SOURCEDIR)AppStateGame.hpp
+	$(CC) $(OFLAG) $(INCLUDE) $(SOURCEDIR)AppStateGame.cpp -o $(ODIR)AppStateGame.o
 
-release: CXX_PREPROCESSOR=$(RELEASE_PREPROCESSOR)
-release: LIBS=$(RELEASE_LIBS)
-release: main
+$(ODIR)Graphics.o: $(SOURCEDIR)Graphics.cpp $(SOURCEDIR)Graphics.hpp
+	$(CC) $(OFLAG) $(INCLUDE) $(SOURCEDIR)Graphics.cpp -o $(ODIR)Graphics.o
 
-main:
-	cd src; \
-	$(COMPILER) $(CXX_FLAGS) $(CXX_PREPROCESSOR) -o $(TARGET) $(CXX_INCLUDE) $(SOURCE) $(LIBS)
+$(ODIR)Main.o: $(SOURCEDIR)Main.cpp 
+	$(CC) $(OFLAG) $(INCLUDE) $(SOURCEDIR)Main.cpp -o $(ODIR)Main.o
 
-ifeq ($(UNAME), Darwin)
-	sh MacOS/bundle.sh
-endif
+$(ODIR)Pawn.o: $(SOURCEDIR)board/Pawn.cpp $(SOURCEDIR)board/Pawn.hpp
+	$(CC) $(OFLAG) $(INCLUDE) $(SOURCEDIR)board/Pawn.cpp -o $(ODIR)Pawn.o
+
+$(ODIR)Rook.o: $(SOURCEDIR)board/Rook.cpp $(SOURCEDIR)board/Rook.hpp
+	$(CC) $(OFLAG) $(INCLUDE) $(SOURCEDIR)board/Rook.cpp -o $(ODIR)Rook.o
+
+$(ODIR)Knight.o: $(SOURCEDIR)board/Knight.cpp $(SOURCEDIR)board/Knight.hpp
+	$(CC) $(OFLAG) $(INCLUDE) $(SOURCEDIR)board/Knight.cpp -o $(ODIR)Knight.o
+
+$(ODIR)Bishop.o: $(SOURCEDIR)board/Bishop.cpp $(SOURCEDIR)board/Bishop.hpp
+	$(CC) $(OFLAG) $(INCLUDE) $(SOURCEDIR)board/Bishop.cpp -o $(ODIR)Bishop.o
+
+$(ODIR)Queen.o: $(SOURCEDIR)board/Queen.cpp $(SOURCEDIR)board/Queen.hpp
+	$(CC) $(OFLAG) $(INCLUDE) $(SOURCEDIR)board/Queen.cpp -o $(ODIR)Queen.o
+
+$(ODIR)King.o: $(SOURCEDIR)board/King.cpp $(SOURCEDIR)board/King.hpp
+	$(CC) $(OFLAG) $(INCLUDE) $(SOURCEDIR)board/King.cpp -o $(ODIR)King.o
+
+$(ODIR)Logger.o: $(SOURCEDIR)board/Logger.cpp $(SOURCEDIR)board/Logger.hpp
+	$(CC) $(OFLAG) $(INCLUDE) $(SOURCEDIR)board/Logger.cpp -o $(ODIR)Logger.o
+
+$(ODIR)Piece.o: $(SOURCEDIR)board/Piece.cpp $(SOURCEDIR)board/Piece.hpp
+	$(CC) $(OFLAG) $(INCLUDE) $(SOURCEDIR)board/Piece.cpp -o $(ODIR)Piece.o
+
+$(ODIR)Position.o: $(SOURCEDIR)board/Position.cpp $(SOURCEDIR)board/Position.hpp
+	$(CC) $(OFLAG) $(INCLUDE) $(SOURCEDIR)board/Position.cpp -o $(ODIR)Position.o
+
+$(ODIR)Board.o: $(SOURCEDIR)board/Board.cpp $(SOURCEDIR)board/Board.hpp
+	$(CC) $(OFLAG) $(INCLUDE) $(SOURCEDIR)board/Board.cpp -o $(ODIR)Board.o
+
+
+clean:
+	rm $(OBJECTS) $(EXECUTABLE)

Makefile.Thumperr

@@ -0,0 +1,43 @@
+UNAME = $(shell uname -s)
+
+COMPILER_Linux = g++
+CXX_FLAGS_Linux = -Wall -std=c++11
+DEBUG_LIBS_Linux = -lsfml-system-d -lsfml-window-d -lsfml-graphics-d
+RELEASE_LIBS_Linux = -lsfml-system -lsfml-window -lsfml-graphics
+
+COMPILER_Darwin = clang++
+CXX_FLAGS_Darwin = -Wall -std=c++11 -stdlib=libc++
+CXX_INCLUDE_Darwin = -I/opt/local/include
+DEBUG_LIBS_Darwin = -framework SFML -framework sfml-system -framework sfml-window -framework sfml-graphics 
+RELEASE_LIBS_Darwin = $(DEBUG_LIBS)
+
+COMPILER = $(COMPILER_$(UNAME))
+CXX_FLAGS = $(CXX_FLAGS_$(UNAME))
+CXX_INCLUDE = $(CXX_INCLUDE_$(UNAME))
+DEBUG_LIBS = $(DEBUG_LIBS_$(UNAME))
+RELEASE_LIBS = $(RELEASE_LIBS_$(UNAME))
+
+DEBUG_PREPROCESSOR = -D_DEBUG
+RELEASE_PREPROCESSOR = -D_RELEASE
+
+EXECUTABLE = chesspp
+TARGET = ../$(EXECUTABLE)
+SOURCE = $(shell cd src ; ls *.cpp) $(shell cd src ; ls board/*.cpp)
+
+all: debug
+
+debug: CXX_PREPROCESSOR=$(DEBUG_PREPROCESSOR)
+debug: LIBS=$(DEBUG_LIBS)
+debug: main
+
+release: CXX_PREPROCESSOR=$(RELEASE_PREPROCESSOR)
+release: LIBS=$(RELEASE_LIBS)
+release: main
+
+main:
+	cd src; \
+	$(COMPILER) $(CXX_FLAGS) $(CXX_PREPROCESSOR) -o $(TARGET) $(CXX_INCLUDE) $(SOURCE) $(LIBS)
+
+ifeq ($(UNAME), Darwin)
+	sh MacOS/bundle.sh
+endif