Skip to content
Snippets Groups Projects
Commit 12b1974e authored by Gaëlle GIRARD's avatar Gaëlle GIRARD :star:
Browse files

maj trucs

parent ba70d30e
Branches master
No related merge requests found
Pipeline #27929 failed
Hide whitespace changes
Inline Side-by-side
.gitignore
+ 1
− 0
View file @ 12b1974e
......@@ -9,3 +9,4 @@ Code/timebomb/timebomb.pro.user
*users*
Code/build-*
*.o
*moc_*
Code/client/Makefile
+ 21
− 21
View file @ 12b1974e
#############################################################################
# Makefile for building: test_client
# Makefile for building: client
# Generated by qmake (3.1) (Qt 5.13.1)
# Project: test_client.pro
# Project: client.pro
# Template: app
# Command: /usr/bin/qmake -o Makefile test_client.pro
# Command: /usr/bin/qmake -o Makefile client.pro
#############################################################################
MAKEFILE = Makefile
......@@ -36,8 +36,8 @@ DEL_DIR = rmdir
MOVE = mv -f
TAR = tar -cf
COMPRESS = gzip -9f
DISTNAME = test_client1.0.0
DISTDIR = /home/gaelle/Documents/Cours/L3S5/IHM/Projet/ihm-timebomb/test_client/.tmp/test_client1.0.0
DISTNAME = client1.0.0
DISTDIR = /home/gaelle/Documents/Cours/L3S5/IHM/Projet/ihm-timebomb/client/.tmp/client1.0.0
LINK = g++
LFLAGS = -Wl,-O1 -Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now
LIBS = $(SUBLIBS) -lncurses /usr/lib/libQt5Network.so /usr/lib/libQt5Core.so -lpthread
......@@ -242,20 +242,20 @@ DIST = /usr/lib/qt/mkspecs/features/spec_pre.prf \
/usr/lib/qt/mkspecs/features/exceptions.prf \
/usr/lib/qt/mkspecs/features/yacc.prf \
/usr/lib/qt/mkspecs/features/lex.prf \
test_client.pro myclient.h main.cpp \
client.pro myclient.h main.cpp \
myclient.cpp
QMAKE_TARGET = test_client
QMAKE_TARGET = client
DESTDIR =
TARGET = test_client
TARGET = client
first: all
####### Build rules
test_client: $(OBJECTS)
client: $(OBJECTS)
$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS)
Makefile: test_client.pro /usr/lib/qt/mkspecs/linux-g++/qmake.conf /usr/lib/qt/mkspecs/features/spec_pre.prf \
Makefile: client.pro /usr/lib/qt/mkspecs/linux-g++/qmake.conf /usr/lib/qt/mkspecs/features/spec_pre.prf \
/usr/lib/qt/mkspecs/common/unix.conf \
/usr/lib/qt/mkspecs/common/linux.conf \
/usr/lib/qt/mkspecs/common/sanitize.conf \
......@@ -440,8 +440,8 @@ Makefile: test_client.pro /usr/lib/qt/mkspecs/linux-g++/qmake.conf /usr/lib/qt/m
/usr/lib/qt/mkspecs/features/exceptions.prf \
/usr/lib/qt/mkspecs/features/yacc.prf \
/usr/lib/qt/mkspecs/features/lex.prf \
test_client.pro
$(QMAKE) -o Makefile test_client.pro
client.pro
$(QMAKE) -o Makefile client.pro
/usr/lib/qt/mkspecs/features/spec_pre.prf:
/usr/lib/qt/mkspecs/common/unix.conf:
/usr/lib/qt/mkspecs/common/linux.conf:
......@@ -627,14 +627,14 @@ Makefile: test_client.pro /usr/lib/qt/mkspecs/linux-g++/qmake.conf /usr/lib/qt/m
/usr/lib/qt/mkspecs/features/exceptions.prf:
/usr/lib/qt/mkspecs/features/yacc.prf:
/usr/lib/qt/mkspecs/features/lex.prf:
test_client.pro:
client.pro:
qmake: FORCE
@$(QMAKE) -o Makefile test_client.pro
@$(QMAKE) -o Makefile client.pro
qmake_all: FORCE
all: Makefile test_client
all: Makefile client
dist: distdir FORCE
(cd `dirname $(DISTDIR)` && $(TAR) $(DISTNAME).tar $(DISTNAME) && $(COMPRESS) $(DISTNAME).tar) && $(MOVE) `dirname $(DISTDIR)`/$(DISTNAME).tar.gz . && $(DEL_FILE) -r $(DISTDIR)
......@@ -682,7 +682,7 @@ compiler_moc_header_clean:
moc_myclient.cpp: myclient.h \
moc_predefs.h \
/usr/bin/moc
/usr/bin/moc $(DEFINES) --include /home/gaelle/Documents/Cours/L3S5/IHM/Projet/ihm-timebomb/test_client/moc_predefs.h -I/usr/lib/qt/mkspecs/linux-g++ -I/home/gaelle/Documents/Cours/L3S5/IHM/Projet/ihm-timebomb/test_client -I/usr/include/qt -I/usr/include/qt/QtNetwork -I/usr/include/qt/QtCore -I/usr/include/c++/9.2.0 -I/usr/include/c++/9.2.0/x86_64-pc-linux-gnu -I/usr/include/c++/9.2.0/backward -I/usr/lib/gcc/x86_64-pc-linux-gnu/9.2.0/include -I/usr/local/include -I/usr/lib/gcc/x86_64-pc-linux-gnu/9.2.0/include-fixed -I/usr/include myclient.h -o moc_myclient.cpp
/usr/bin/moc $(DEFINES) --include /home/gaelle/Documents/Cours/L3S5/IHM/Projet/ihm-timebomb/client/moc_predefs.h -I/usr/lib/qt/mkspecs/linux-g++ -I/home/gaelle/Documents/Cours/L3S5/IHM/Projet/ihm-timebomb/client -I/usr/include/qt -I/usr/include/qt/QtNetwork -I/usr/include/qt/QtCore -I/usr/include/c++/9.2.0 -I/usr/include/c++/9.2.0/x86_64-pc-linux-gnu -I/usr/include/c++/9.2.0/backward -I/usr/lib/gcc/x86_64-pc-linux-gnu/9.2.0/include -I/usr/local/include -I/usr/lib/gcc/x86_64-pc-linux-gnu/9.2.0/include-fixed -I/usr/include myclient.h -o moc_myclient.cpp
compiler_moc_objc_header_make_all:
compiler_moc_objc_header_clean:
......@@ -710,13 +710,13 @@ moc_myclient.o: moc_myclient.cpp
####### Install
install_target: first FORCE
@test -d $(INSTALL_ROOT)/opt/test_client/bin || mkdir -p $(INSTALL_ROOT)/opt/test_client/bin
-$(QINSTALL_PROGRAM) $(QMAKE_TARGET) $(INSTALL_ROOT)/opt/test_client/bin/$(QMAKE_TARGET)
-$(STRIP) $(INSTALL_ROOT)/opt/test_client/bin/$(QMAKE_TARGET)
@test -d $(INSTALL_ROOT)/opt/client/bin || mkdir -p $(INSTALL_ROOT)/opt/client/bin
-$(QINSTALL_PROGRAM) $(QMAKE_TARGET) $(INSTALL_ROOT)/opt/client/bin/$(QMAKE_TARGET)
-$(STRIP) $(INSTALL_ROOT)/opt/client/bin/$(QMAKE_TARGET)
uninstall_target: FORCE
-$(DEL_FILE) $(INSTALL_ROOT)/opt/test_client/bin/$(QMAKE_TARGET)
-$(DEL_DIR) $(INSTALL_ROOT)/opt/test_client/bin/
-$(DEL_FILE) $(INSTALL_ROOT)/opt/client/bin/$(QMAKE_TARGET)
-$(DEL_DIR) $(INSTALL_ROOT)/opt/client/bin/
install: install_target FORCE
......
Code/client/client 0 → 100755
+ 0
− 0
View file @ 12b1974e
File added
Code/server/Makefile
+ 21
− 21
View file @ 12b1974e
#############################################################################
# Makefile for building: test_server
# Makefile for building: server
# Generated by qmake (3.1) (Qt 5.13.1)
# Project: test_server.pro
# Project: server.pro
# Template: app
# Command: /usr/bin/qmake -o Makefile test_server.pro
# Command: /usr/bin/qmake -o Makefile server.pro
#############################################################################
MAKEFILE = Makefile
......@@ -36,8 +36,8 @@ DEL_DIR = rmdir
MOVE = mv -f
TAR = tar -cf
COMPRESS = gzip -9f
DISTNAME = test_server1.0.0
DISTDIR = /home/gaelle/Documents/Cours/L3S5/IHM/Projet/ihm-timebomb/test_server/.tmp/test_server1.0.0
DISTNAME = server1.0.0
DISTDIR = /home/gaelle/Documents/Cours/L3S5/IHM/Projet/ihm-timebomb/server/.tmp/server1.0.0
LINK = g++
LFLAGS = -Wl,-O1 -Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now
LIBS = $(SUBLIBS) /usr/lib/libQt5Network.so /usr/lib/libQt5Core.so -lpthread
......@@ -242,20 +242,20 @@ DIST = /usr/lib/qt/mkspecs/features/spec_pre.prf \
/usr/lib/qt/mkspecs/features/exceptions.prf \
/usr/lib/qt/mkspecs/features/yacc.prf \
/usr/lib/qt/mkspecs/features/lex.prf \
test_server.pro myserver.h main.cpp \
server.pro myserver.h main.cpp \
myserver.cpp
QMAKE_TARGET = test_server
QMAKE_TARGET = server
DESTDIR =
TARGET = test_server
TARGET = server
first: all
####### Build rules
test_server: $(OBJECTS)
server: $(OBJECTS)
$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS)
Makefile: test_server.pro /usr/lib/qt/mkspecs/linux-g++/qmake.conf /usr/lib/qt/mkspecs/features/spec_pre.prf \
Makefile: server.pro /usr/lib/qt/mkspecs/linux-g++/qmake.conf /usr/lib/qt/mkspecs/features/spec_pre.prf \
/usr/lib/qt/mkspecs/common/unix.conf \
/usr/lib/qt/mkspecs/common/linux.conf \
/usr/lib/qt/mkspecs/common/sanitize.conf \
......@@ -440,8 +440,8 @@ Makefile: test_server.pro /usr/lib/qt/mkspecs/linux-g++/qmake.conf /usr/lib/qt/m
/usr/lib/qt/mkspecs/features/exceptions.prf \
/usr/lib/qt/mkspecs/features/yacc.prf \
/usr/lib/qt/mkspecs/features/lex.prf \
test_server.pro
$(QMAKE) -o Makefile test_server.pro
server.pro
$(QMAKE) -o Makefile server.pro
/usr/lib/qt/mkspecs/features/spec_pre.prf:
/usr/lib/qt/mkspecs/common/unix.conf:
/usr/lib/qt/mkspecs/common/linux.conf:
......@@ -627,14 +627,14 @@ Makefile: test_server.pro /usr/lib/qt/mkspecs/linux-g++/qmake.conf /usr/lib/qt/m
/usr/lib/qt/mkspecs/features/exceptions.prf:
/usr/lib/qt/mkspecs/features/yacc.prf:
/usr/lib/qt/mkspecs/features/lex.prf:
test_server.pro:
server.pro:
qmake: FORCE
@$(QMAKE) -o Makefile test_server.pro
@$(QMAKE) -o Makefile server.pro
qmake_all: FORCE
all: Makefile test_server
all: Makefile server
dist: distdir FORCE
(cd `dirname $(DISTDIR)` && $(TAR) $(DISTNAME).tar $(DISTNAME) && $(COMPRESS) $(DISTNAME).tar) && $(MOVE) `dirname $(DISTDIR)`/$(DISTNAME).tar.gz . && $(DEL_FILE) -r $(DISTDIR)
......@@ -682,7 +682,7 @@ compiler_moc_header_clean:
moc_myserver.cpp: myserver.h \
moc_predefs.h \
/usr/bin/moc
/usr/bin/moc $(DEFINES) --include /home/gaelle/Documents/Cours/L3S5/IHM/Projet/ihm-timebomb/test_server/moc_predefs.h -I/usr/lib/qt/mkspecs/linux-g++ -I/home/gaelle/Documents/Cours/L3S5/IHM/Projet/ihm-timebomb/test_server -I/usr/include/qt -I/usr/include/qt/QtNetwork -I/usr/include/qt/QtCore -I/usr/include/c++/9.2.0 -I/usr/include/c++/9.2.0/x86_64-pc-linux-gnu -I/usr/include/c++/9.2.0/backward -I/usr/lib/gcc/x86_64-pc-linux-gnu/9.2.0/include -I/usr/local/include -I/usr/lib/gcc/x86_64-pc-linux-gnu/9.2.0/include-fixed -I/usr/include myserver.h -o moc_myserver.cpp
/usr/bin/moc $(DEFINES) --include /home/gaelle/Documents/Cours/L3S5/IHM/Projet/ihm-timebomb/server/moc_predefs.h -I/usr/lib/qt/mkspecs/linux-g++ -I/home/gaelle/Documents/Cours/L3S5/IHM/Projet/ihm-timebomb/server -I/usr/include/qt -I/usr/include/qt/QtNetwork -I/usr/include/qt/QtCore -I/usr/include/c++/9.2.0 -I/usr/include/c++/9.2.0/x86_64-pc-linux-gnu -I/usr/include/c++/9.2.0/backward -I/usr/lib/gcc/x86_64-pc-linux-gnu/9.2.0/include -I/usr/local/include -I/usr/lib/gcc/x86_64-pc-linux-gnu/9.2.0/include-fixed -I/usr/include myserver.h -o moc_myserver.cpp
compiler_moc_objc_header_make_all:
compiler_moc_objc_header_clean:
......@@ -710,13 +710,13 @@ moc_myserver.o: moc_myserver.cpp
####### Install
install_target: first FORCE
@test -d $(INSTALL_ROOT)/opt/test_server/bin || mkdir -p $(INSTALL_ROOT)/opt/test_server/bin
-$(QINSTALL_PROGRAM) $(QMAKE_TARGET) $(INSTALL_ROOT)/opt/test_server/bin/$(QMAKE_TARGET)
-$(STRIP) $(INSTALL_ROOT)/opt/test_server/bin/$(QMAKE_TARGET)
@test -d $(INSTALL_ROOT)/opt/server/bin || mkdir -p $(INSTALL_ROOT)/opt/server/bin
-$(QINSTALL_PROGRAM) $(QMAKE_TARGET) $(INSTALL_ROOT)/opt/server/bin/$(QMAKE_TARGET)
-$(STRIP) $(INSTALL_ROOT)/opt/server/bin/$(QMAKE_TARGET)
uninstall_target: FORCE
-$(DEL_FILE) $(INSTALL_ROOT)/opt/test_server/bin/$(QMAKE_TARGET)
-$(DEL_DIR) $(INSTALL_ROOT)/opt/test_server/bin/
-$(DEL_FILE) $(INSTALL_ROOT)/opt/server/bin/$(QMAKE_TARGET)
-$(DEL_DIR) $(INSTALL_ROOT)/opt/server/bin/
install: install_target FORCE
......
Code/server/server 0 → 100755
+ 0
− 0
View file @ 12b1974e
File added
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment