diff --git a/Makefile b/Makefile index 4144bb019329b887c24361227516ef05497ed32a..300f32727bc541ec9761cf0f64a29654a15b4ef8 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ CCP=g++ all: app app: app.o - $(CCP) $^ -o $@ -L$(API_PATH) -lsandbox $(DEP_SANDBOX) + $(CCP) $^ -o $@ -L$(API_PATH)/build -lsandbox $(DEP_SANDBOX) %.o: %.cpp $(CCP) $(CFLAGS) -I$(API_PATH)/inc -c $< -o $@ @@ -16,7 +16,7 @@ run: ./app setup: - $(API_PATH)/app/SandboxSetupApp + $(API_PATH)/app/SandboxSetup/SandboxSetup clean: rm -f *.o app diff --git a/app.cpp b/app.cpp index 9c8511434f1bbe6d2023169c06e227222e864191..092da011eb46392da070bc4e7cf24fcdb4ca7580 100644 --- a/app.cpp +++ b/app.cpp @@ -1,5 +1,5 @@ -#include "../ar_sandbox_lib/sandbox.h" +#include "../ar_sandbox_lib/inc/sandbox.h" #include <numeric> #include <fstream> #include <string> @@ -23,12 +23,13 @@ void (*apps[2])() = {showLevel, showDiff}; int main(int argc, char *argv[]) { + if(client.loadConfig()){ std::cout << "Failed to load the configuration" << std::endl; return 1; } - showLevel(); + //showLevel(); /*cout << "Press: \n 0: Show level \n 1: Show difference \n"; int n = 0;