From cb44f290435b245078526871dc37b8b8a528103c Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Mon, 19 Oct 2009 16:55:51 +0000 Subject: [PATCH] Fix #19574: winbuildinfo.h error when compiling with cmake on windows. I've now removed winbuildinfo.h code and let scons on window just set environment vars like other operating systems. Note that cmake still doesn't get the date information on windows, implementation is missing for this. --- source/creator/buildinfo.c | 4 ---- tools/Blender.py | 22 ++++++---------------- 2 files changed, 6 insertions(+), 20 deletions(-) diff --git a/source/creator/buildinfo.c b/source/creator/buildinfo.c index ac14010f572..3473814360b 100644 --- a/source/creator/buildinfo.c +++ b/source/creator/buildinfo.c @@ -32,13 +32,9 @@ #endif #ifdef BUILD_DATE -#if (!defined(WIN32) || defined(_WIN64)) const char * build_date=BUILD_DATE; const char * build_time=BUILD_TIME; const char * build_rev=BUILD_REV; const char * build_platform=BUILD_PLATFORM; const char * build_type=BUILD_TYPE; -#else -#include "winbuildinfo.h" -#endif #endif diff --git a/tools/Blender.py b/tools/Blender.py index 38d2747889a..5641104ab15 100644 --- a/tools/Blender.py +++ b/tools/Blender.py @@ -243,22 +243,12 @@ def buildinfo(lenv, build_type): obj = [] if lenv['BF_BUILDINFO']: - if sys.platform=='win32': - build_info_file = open("source/creator/winbuildinfo.h", 'w') - build_info_file.write("char *build_date=\"%s\";\n"%build_date) - build_info_file.write("char *build_time=\"%s\";\n"%build_time) - build_info_file.write("char *build_rev=\"%s\";\n"%build_rev) - build_info_file.write("char *build_platform=\"win32\";\n") - build_info_file.write("char *build_type=\"dynamic\";\n") - build_info_file.close() - lenv.Append (CPPDEFINES = ['NAN_BUILDINFO', 'BUILD_DATE']) - else: - lenv.Append (CPPDEFINES = ['BUILD_TIME=\'"%s"\''%(build_time), - 'BUILD_DATE=\'"%s"\''%(build_date), - 'BUILD_TYPE=\'"dynamic"\'', - 'BUILD_REV=\'"%s"\''%(build_rev), - 'NAN_BUILDINFO', - 'BUILD_PLATFORM=\'"%s"\''%(sys.platform)]) + lenv.Append (CPPDEFINES = ['BUILD_TIME=\'"%s"\''%(build_time), + 'BUILD_DATE=\'"%s"\''%(build_date), + 'BUILD_TYPE=\'"dynamic"\'', + 'BUILD_REV=\'"%s"\''%(build_rev), + 'NAN_BUILDINFO', + 'BUILD_PLATFORM=\'"%s"\''%(sys.platform)]) obj = [lenv.Object (root_build_dir+'source/creator/%s_buildinfo'%build_type, [root_build_dir+'source/creator/buildinfo.c'])] return obj