Skip to content
Snippets Groups Projects
Commit 47bf63a5 authored by simon.fanetti's avatar simon.fanetti
Browse files

adapt make setup

parent c314c52b
Branches
Tags
No related merge requests found
...@@ -7,7 +7,7 @@ CCP=g++ ...@@ -7,7 +7,7 @@ CCP=g++
all: app all: app
app: app.o app: app.o
$(CCP) $^ -o $@ -L$(API_PATH) -lsandbox $(DEP_SANDBOX) $(CCP) $^ -o $@ -L$(API_PATH)/build -lsandbox $(DEP_SANDBOX)
%.o: %.cpp %.o: %.cpp
$(CCP) $(CFLAGS) -I$(API_PATH)/inc -c $< -o $@ $(CCP) $(CFLAGS) -I$(API_PATH)/inc -c $< -o $@
...@@ -16,7 +16,7 @@ run: ...@@ -16,7 +16,7 @@ run:
./app ./app
setup: setup:
$(API_PATH)/app/SandboxSetupApp $(API_PATH)/app/SandboxSetup/SandboxSetup
clean: clean:
rm -f *.o app rm -f *.o app
#include "../ar_sandbox_lib/sandbox.h" #include "../ar_sandbox_lib/inc/sandbox.h"
#include <numeric> #include <numeric>
#include <fstream> #include <fstream>
#include <string> #include <string>
...@@ -23,12 +23,13 @@ void (*apps[2])() = {showLevel, showDiff}; ...@@ -23,12 +23,13 @@ void (*apps[2])() = {showLevel, showDiff};
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
if(client.loadConfig()){ if(client.loadConfig()){
std::cout << "Failed to load the configuration" << std::endl; std::cout << "Failed to load the configuration" << std::endl;
return 1; return 1;
} }
showLevel(); //showLevel();
/*cout << "Press: \n 0: Show level \n 1: Show difference \n"; /*cout << "Press: \n 0: Show level \n 1: Show difference \n";
int n = 0; int n = 0;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment