Commit 117ab72d authored by Mathieu Valois's avatar Mathieu Valois
Browse files

Fix object collision on compilation

parent d61a5870

Statsgen/GUI.pro

+2 −0
Original line number Diff line number Diff line
@@ -6,6 +6,8 @@ TARGET = cpack-gui 
TEMPLATE = app



INCLUDEPATH += include

OBJECTS_DIR=obj/gui/

MOC_DIR=obj/gui/





SOURCES += src/gui/maingui.cpp\

Statsgen/makefile

+6 −5
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ CXXFLAGS = -pedantic -Wall -std=c++11 -Wextra -Iinclude -O3 
LDFLAGS  = -lpthread

SRC	 = src

INC	 = include

OBJ = obj

BIN  = cpack

BINGUI = $(BIN)-gui
@@ -10,18 +11,18 @@ BINGUI = $(BIN)-gui 


all: $(BIN) $(BINGUI)



$(BIN): main.o statsgen.o

$(BIN): $(OBJ)/main.o $(OBJ)/statsgen.o

	$(CXX) $^ -o $@ $(LDFLAGS)



main.o: $(SRC)/cli/main.cpp $(INC)/statsgen.h

$(OBJ)/main.o: $(SRC)/cli/main.cpp $(INC)/statsgen.h

	$(CXX) $(CXXFLAGS) $< -c -o $@



statsgen.o: $(SRC)/core/statsgen.cpp $(INC)/statsgen.h $(INC)/utils.h

$(OBJ)/statsgen.o: $(SRC)/core/statsgen.cpp $(INC)/statsgen.h $(INC)/utils.h

	$(CXX) $(CXXFLAGS) $< -c -o $@



clean:

	-rm -f *.o stats

	-rm -rf $(OBJ)



$(BINGUI): statsgen.o

$(BINGUI):

	qmake -o qmakefile

	make -f qmakefile

Statsgen/obj/.gitignore

0 → 100644
+0 −0

Empty file added.