From 86402fec24134b6d4103b6ad1e689fb5840f720f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=91=D1=80=D0=B0=D0=BD=D0=B8=D0=BC=D0=B8=D1=80=20=D0=9A?= =?UTF-8?q?=D0=B0=D1=80=D0=B0=D1=9F=D0=B8=D1=9B?= Date: Sat, 5 Sep 2020 11:24:50 -0700 Subject: [PATCH] Updated version number. --- scripts/genie.lua | 5 +++-- src/version.h | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/scripts/genie.lua b/scripts/genie.lua index 743883983..eb8450483 100644 --- a/scripts/genie.lua +++ b/scripts/genie.lua @@ -3,6 +3,8 @@ -- License: https://github.com/bkaradzic/bgfx#license-bsd-2-clause -- +MODULE_DIR = path.getabsolute("../") + newoption { trigger = "with-amalgamated", description = "Enable amalgamated build.", @@ -96,7 +98,7 @@ newaction { f = io.popen("git log --format=format:%H -1") local sha1 = f:read("*a") f:close() - io.output("../src/version.h") + io.output(path.join(MODULE_DIR, "src/version.h")) io.write("/*\n") io.write(" * Copyright 2011-2020 Branimir Karadzic. All rights reserved.\n") io.write(" * License: https://github.com/bkaradzic/bgfx#license-bsd-2-clause\n") @@ -138,7 +140,6 @@ solution "bgfx" language "C++" startproject "example-00-helloworld" -MODULE_DIR = path.getabsolute("../") BGFX_DIR = path.getabsolute("..") BX_DIR = os.getenv("BX_DIR") BIMG_DIR = os.getenv("BIMG_DIR") diff --git a/src/version.h b/src/version.h index 275f868a5..de5b8768f 100644 --- a/src/version.h +++ b/src/version.h @@ -9,5 +9,5 @@ * */ -#define BGFX_REV_NUMBER 7318 -#define BGFX_REV_SHA1 "22df26ab70acb3f36018796fbe952751fa91a9f8" +#define BGFX_REV_NUMBER 7396 +#define BGFX_REV_SHA1 "9f8fe6a1eb36fbff6b994576e44d6d7921c7bf33"