cflags, cxxflags & linkflags in buildinfo.

5 files changed, 36 insertions, 1 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 39dc85cc15a..39ef55f351f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -923,7 +923,7 @@ IF((NOT WIN32) AND (NOT MSVC))
 	SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -DNDEBUG")
 	SET(CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_C_FLAGS_MINSIZEREL} -DNDEBUG")
 	SET(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -DNDEBUG")
-ENDIF(NOT WIN32 AND NOT MSVC)
+ENDIF((NOT WIN32) AND (NOT MSVC))
 
 IF(CMAKE_COMPILER_IS_GNUCC)
 	SET(C_WARNINGS "${C_WARNINGS} -Wunused-parameter -Werror=declaration-after-statement -Werror=implicit-function-declaration -Werror=return-type")
diff --git a/source/blender/python/intern/bpy_app.c b/source/blender/python/intern/bpy_app.c
index 46a3c93292b..39494678a12 100644
--- a/source/blender/python/intern/bpy_app.c
+++ b/source/blender/python/intern/bpy_app.c
@@ -39,6 +39,9 @@ extern char build_time[];
 extern char build_rev[];
 extern char build_platform[];
 extern char build_type[];
+extern char build_cflags[];
+extern char build_cxxflags[];
+extern char build_linkflags[];
 #endif
 
 static PyTypeObject BlenderAppType;
@@ -55,6 +58,9 @@ static PyStructSequence_Field app_info_fields[] = {
 	{"build_revision", "The subversion revision this blender instance was built with"},
 	{"build_platform", "The platform this blender instance was built for"},
 	{"build_type", "The type of build (Release, Debug)"},
+	{"build_cflags", ""},
+	{"build_cxxflags", ""},
+	{"build_linkflags", ""},
 	{0}
 };
 
@@ -96,12 +102,18 @@ static PyObject *make_app_info(void)
 	SetStrItem(build_rev);
 	SetStrItem(build_platform);
 	SetStrItem(build_type);
+	SetStrItem(build_cflags);
+	SetStrItem(build_cxxflags);
+	SetStrItem(build_linkflags);
 #else
 	SetStrItem("Unknown");
 	SetStrItem("Unknown");
 	SetStrItem("Unknown");
 	SetStrItem("Unknown");
 	SetStrItem("Unknown");
+	SetStrItem("Unknown");
+	SetStrItem("Unknown");
+	SetStrItem("Unknown");
 #endif
 
 #undef SetIntItem
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index f2ea4d3dc75..65099761fad 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -101,6 +101,9 @@ IF(WITH_BUILDINFO)
 		-DBUILD_REV="${BUILD_REV}"
 		-DBUILD_PLATFORM="${CMAKE_SYSTEM_NAME}"
 		-DBUILD_TYPE="${CMAKE_BUILD_TYPE}"
+		-DBUILD_CFLAGS="${CMAKE_C_FLAGS}"
+		-DBUILD_CXXFLAGS="${CMAKE_CXX_FLAGS}"
+		-DBUILD_LINKFLAGS="${PLATFORM_LINKFLAGS}"
 	)
 
 	LIST(APPEND EXESRC buildinfo.c)
diff --git a/source/creator/buildinfo.c b/source/creator/buildinfo.c
index a14cb94b859..cf6f5a11c45 100644
--- a/source/creator/buildinfo.c
+++ b/source/creator/buildinfo.c
@@ -35,4 +35,15 @@ char build_time[]= STRINGIFY(BUILD_TIME);
 char build_rev[]= STRINGIFY(BUILD_REV);
 char build_platform[]= STRINGIFY(BUILD_PLATFORM);
 char build_type[]= STRINGIFY(BUILD_TYPE);
+
+#ifdef BUILD_CFLAGS
+char build_cflags[]= STRINGIFY(BUILD_CFLAGS);
+char build_cxxflags[]= STRINGIFY(BUILD_CXXFLAGS);
+char build_linkflags[]= STRINGIFY(BUILD_LINKFLAGS);
+#else
+char build_cflags[]= "unmaintained buildsystem alert!";
+char build_cxxflags[]= "unmaintained buildsystem alert!";
+char build_linkflags[]= "unmaintained buildsystem alert!";
 #endif
+
+#endif // BUILD_DATE
diff --git a/source/creator/creator.c b/source/creator/creator.c
index 26835eb28da..fce71edcced 100644
--- a/source/creator/creator.c
+++ b/source/creator/creator.c
@@ -118,6 +118,9 @@ extern char build_time[];
 extern char build_rev[];
 extern char build_platform[];
 extern char build_type[];
+extern char build_cflags[];
+extern char build_cxxflags[];
+extern char build_linkflags[];
 #endif
 
 /*	Local Function prototypes */
@@ -184,6 +187,9 @@ static int print_version(int UNUSED(argc), char **UNUSED(argv), void *UNUSED(dat
 	printf ("\tbuild revision: %s\n", build_rev);
 	printf ("\tbuild platform: %s\n", build_platform);
 	printf ("\tbuild type: %s\n", build_type);
+	printf ("\tbuild c flags: %s\n", build_cflags);
+	printf ("\tbuild c++ flags: %s\n", build_cxxflags);
+	printf ("\tbuild link flags: %s\n", build_linkflags);
 #endif
 	exit(0);
 
@@ -1045,6 +1051,9 @@ int main(int argc, char **argv)
     strip_quotes(build_rev);
     strip_quotes(build_platform);
     strip_quotes(build_type);
+    strip_quotes(build_cflags);
+    strip_quotes(build_cxxflags);
+    strip_quotes(build_linkflags);
 #endif
 
 	BLI_threadapi_init();