HeeroYui/edn
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add the version name and compilation date in the About dialog

Browse Source
This commit is contained in:
Edouard Dupin
2011-07-22 10:50:47 +02:00
parent b3d776b723
commit 5ff5525c6b
4 changed files with 45 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Makefile
View File

@@ -31,6 +31,11 @@ export F_GRIS=
export CADRE_HAUT_BAS=' $(F_INVERSER) $(F_NORMALE)'
export CADRE_COTERS='
$(F_INVERSER) $(F_NORMALE) $(F_INVERSER) $(F_NORMALE)'
VERSION_TAG=$(shell git describe --tags)
#$(info $(VERSION_TAG))
VERSION_BUILD_TIME=$(shell date)
#$(info $(VERSION_TAG))
###############################################################################
@@ -45,10 +50,11 @@ DEBUG:=1
###############################################################################
### Compilation Define ###
###############################################################################
ifeq ("$(DEBUG)", "0")
ifeq ("$(DEBUG)", "0")
DEFINE= -DEDN_DEBUG_LEVEL=1 -DNDEBUG -DVERSION_TAG_NAME="\"$(VERSION_TAG)-debug\""
else
else
DEFINE= -DEDN_DEBUG_LEVEL=3 -DVERSION_TAG_NAME="\"$(VERSION_TAG)-release\""
endif
DEFINE+= -DVERSION_BUILD_TIME="\"$(VERSION_BUILD_TIME)\""
GTKFLAGS=
@@ -203,7 +209,7 @@ all: build
all: build
-include $(OBJ:.o=.d)
build: .encadrer .versionFile $(OUTPUT_NAME)
@@ -221,6 +227,11 @@ build: .encadrer $(OUTPUT_NAME)
@echo $(CADRE_COTERS)
@echo $(CADRE_HAUT_BAS)
@mkdir -p $(addprefix $(OBJECT_DIRECTORY)/, $(LISTE_MODULES))
@mkdir -p ~/.bin
FILE_IMAGES= data/imagesSources/*.png
.versionFile :
@rm $(OBJECT_DIRECTORY)/GuiTools/WindowsManager/WindowsManager.o
@@ -230,14 +241,12 @@ pngToCpp: tools/pngToCpp/pngToCpp.c
pngToCpp: tools/pngToCpp/pngToCpp.c
@echo $(F_ROUGE)"
(bin) $@"$(F_NORMALE)
@$(CXX) $< -o $@
@$(CXX) $< -o $@
@strip -s $@
# Generate basic
$(FILE_DIRECTORY)/GuiTools/myImage.cpp: $(FILE_IMAGES) $(MAKE_DEPENDENCE) pngToCpp
@echo $(F_BLUE)"
@#echo ./pngToCpp $@ $(FILE_IMAGES)
(.cpp) *.png ==> $@"$(F_NORMALE)
@./pngToCpp $@ $(FILE_IMAGES)
@@ -273,7 +282,7 @@ clean:
@echo Remove File : pngToCpp
@rm -f pngToCpp
@echo Remove File : $(FILE_DIRECTORY)/GuiTools/myImage.*
@rm -f $(FILE_DIRECTORY)/GuiTools/myImage.*
@rm -f $(FILE_DIRECTORY)/GuiTools/myImage.*
@echo Remove doxygen files : doxygen/*
@rm -rf doxygen
@rm -f doxygen.log