From 47bf63a5cca0e8ebd3a10ee99f0bcda7abb059cf Mon Sep 17 00:00:00 2001
From: "simon.fanetti" <simon.fanetti@etu.hesge.ch>
Date: Fri, 15 May 2020 19:01:50 +0200
Subject: [PATCH] adapt make setup
---
Makefile | 4 ++--
app.cpp | 5 +++--
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/Makefile b/Makefile
index 4144bb0..300f327 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 9c85114..092da01 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;
--
GitLab