diff --git a/.gitignore b/.gitignore index 78f8079..90b6b35 100644 --- a/.gitignore +++ b/.gitignore @@ -31,10 +31,15 @@ /Debug/ /Release/ /Project1 -/main.cpp +/main2.cpp /Richkware /.settings /.cproject /.project /nbproject /.idea +cmake-build-debug/ +cmake-build-default/ +cmake-build-minsizerel/ +cmake-build-release/ +cmake-build-relwithdebinfo/ diff --git a/Makefile b/Makefile index 9e92a88..6a625e7 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ endif CXXFLAGS= -c -O3 -Wall -LDFLAGS= -static-libgcc -static-libstdc++ -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 diff --git a/crypto.cpp b/crypto.cpp index 2c53a1d..e9b9ddf 100644 --- a/crypto.cpp +++ b/crypto.cpp @@ -2,7 +2,6 @@ * Copyright 2016 Riccardo Melioli. All Rights Reserved. */ -#include #include "crypto.h" std::string Encrypt(std::string input, std::string key) { diff --git a/main.cpp b/main.cpp new file mode 100644 index 0000000..fbf924b --- /dev/null +++ b/main.cpp @@ -0,0 +1,12 @@ + +#include "richkware.h" + +int main() { + Richkware richkware("Richk","richktest"); + + // PUT YOUR CODE HERE + + return 0; + +} + diff --git a/protocol.cpp b/protocol.cpp index 4074e51..4d38ed7 100644 --- a/protocol.cpp +++ b/protocol.cpp @@ -4,7 +4,6 @@ #include "protocol.h" - std::string CommandsDispatcher(std::string request){ std::string response = ""; if (request.find("[[") != std::string::npos &&