Merge branch 'develop'

pull/31/head
Dmitry Razumov 3 years ago
commit fdb9d7c492

@ -21,7 +21,7 @@ all: init build
init: init:
@echo "Initialize ..."; \ @echo "Initialize ..."; \
sed -r "s/(version_application).*/\1 = \"$$(grep 'VERSION' ${FILE_VERSION} | cut -d" " -f2)\";/" -i source/ubl-settings-video.h; \ sed -r "s/^(string version_application = ).*/\1\"$$(grep 'VERSION' ${FILE_VERSION} | cut -d" " -f2)\";/" -i source/${PKGNAME}.h; \
echo "-- Build path: ${CMAKE_BUILD_DIR}" echo "-- Build path: ${CMAKE_BUILD_DIR}"
depend: depend:

@ -1 +1 @@
VERSION 2.1 VERSION 2.2

@ -92,7 +92,7 @@ char *local;
typedef char *string; typedef char *string;
string version_application = "2.1"; string version_application = "2.2";
#define _(String) gettext(String) #define _(String) gettext(String)

Loading…
Cancel
Save