Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

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.

Browse Source
This commit is contained in:
Brecht Van Lommel
2009-10-19 16:55:51 +00:00
parent 85a8f315b4
commit cb44f29043
2 changed files with 6 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/creator/buildinfo.c
View File

@@ -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

22
tools/Blender.py
View File

@@ -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