Merge branch 'master' of https://github.com/elvnct/AlloHouston

AxelVincent · Dec 8, 2017 · 78730c8 · 78730c8
2 parents 5828935 + 842f482
commit 78730c8
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,5 @@
 # file: ~/.gitignore_global
 .DS_Store
 .idea
-*/AlloHoustonServer
-*/AlloHoustonClient
+.serveur/bin/AlloHoustonServer
+.client/bin/AlloHoustonClient
diff --git a/client/makefile b/client/makefile
@@ -2,7 +2,7 @@ CC = gcc
 CFLAGS = -Iheaders
 SRCS =   ./sources/main.c
 OBJS = $(SRCS:.c=.o)
-EXEC = AlloHoustonClient
+EXEC = ./bin/AlloHoustonClient
 
 all: $(EXEC)
 $(EXEC): $(OBJS)

diff --git a/serveur/makefile b/serveur/makefile
@@ -2,7 +2,7 @@ CC = gcc
 CFLAGS = -Iheaders
 SRCS = ./sources/main.c ./sources/service.c ./sources/train.c ./sources/outils.c ./sources/temps.c ./sources/requetes.c
 OBJS = $(SRCS:.c=.o)
-EXEC = AlloHoustonServer
+EXEC = ./bin/AlloHoustonServer
 
 all: $(EXEC)
 $(EXEC): $(OBJS)

diff --git a/serveur/sources/service.c b/serveur/sources/service.c
@@ -47,7 +47,7 @@ void nouveauService(int descripteurSocketService)
 	//Recuépration du fichier Trains.txt a chaque client
 	//Cela permet que chaque client ets le dernier fichier bien a jour
 
-	char *nomFichier = "./ressources/Trains.txt";
+	char *nomFichier = "../ressources/Trains.txt";
 	Train *listeTrain;
 	int nbTrain;
 	listeTrain = trainFromFile(nomFichier, &nbTrain); // Récupération de la liste de train