[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23972] trunk/blender: Fix #19574: winbuildinfo.h error when compiling with cmake on windows.

[Brecht Van Lommel]

Revision: 23972
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23972
Author:   blendix
Date:     2009-10-19 18:55:51 +0200 (Mon, 19 Oct 2009)

Log Message:
-----------
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.

Modified Paths:
--------------
    trunk/blender/source/creator/buildinfo.c
    trunk/blender/tools/Blender.py

Modified: trunk/blender/source/creator/buildinfo.c
===================================================================
--- trunk/blender/source/creator/buildinfo.c	2009-10-19 16:29:26 UTC (rev 23971)
+++ trunk/blender/source/creator/buildinfo.c	2009-10-19 16:55:51 UTC (rev 23972)
@@ -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

Modified: trunk/blender/tools/Blender.py
===================================================================
--- trunk/blender/tools/Blender.py	2009-10-19 16:29:26 UTC (rev 23971)
+++ trunk/blender/tools/Blender.py	2009-10-19 16:55:51 UTC (rev 23972)
@@ -243,22 +243,12 @@
 
 	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