[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39618] trunk/blender: rename NAN_BUILDINFO --> WITH_BUILDINFO
Campbell Barton
ideasman42 at gmail.com
Mon Aug 22 18:54:26 CEST 2011
Revision: 39618
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39618
Author: campbellbarton
Date: 2011-08-22 16:54:26 +0000 (Mon, 22 Aug 2011)
Log Message:
-----------
rename NAN_BUILDINFO --> WITH_BUILDINFO
Modified Paths:
--------------
trunk/blender/build_files/scons/tools/Blender.py
trunk/blender/source/blender/blenloader/CMakeLists.txt
trunk/blender/source/blender/blenloader/intern/writefile.c
trunk/blender/source/blender/collada/CMakeLists.txt
trunk/blender/source/blender/collada/DocumentExporter.cpp
trunk/blender/source/blender/windowmanager/CMakeLists.txt
trunk/blender/source/blender/windowmanager/intern/wm_operators.c
trunk/blender/source/creator/CMakeLists.txt
trunk/blender/source/creator/creator.c
Modified: trunk/blender/build_files/scons/tools/Blender.py
===================================================================
--- trunk/blender/build_files/scons/tools/Blender.py 2011-08-22 13:17:43 UTC (rev 39617)
+++ trunk/blender/build_files/scons/tools/Blender.py 2011-08-22 16:54:26 UTC (rev 39618)
@@ -368,7 +368,7 @@
'BUILD_DATE=\\"%s\\"'%(build_date),
'BUILD_TYPE=\\"%s\\"'%(build_type),
'BUILD_REV=\\"%s\\"'%(build_rev),
- 'NAN_BUILDINFO',
+ 'WITH_BUILDINFO',
'BUILD_PLATFORM=\\"%s:%s\\"'%(platform.system(), platform.architecture()[0]),
'BUILD_CFLAGS=\\"%s\\"'%(build_cflags),
'BUILD_CXXFLAGS=\\"%s\\"'%(build_cxxflags),
Modified: trunk/blender/source/blender/blenloader/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/blenloader/CMakeLists.txt 2011-08-22 13:17:43 UTC (rev 39617)
+++ trunk/blender/source/blender/blenloader/CMakeLists.txt 2011-08-22 16:54:26 UTC (rev 39618)
@@ -55,7 +55,7 @@
)
if(WITH_BUILDINFO)
- add_definitions(-DNAN_BUILDINFO)
+ add_definitions(-DWITH_BUILDINFO)
endif()
blender_add_lib(bf_blenloader "${SRC}" "${INC}" "${INC_SYS}")
Modified: trunk/blender/source/blender/blenloader/intern/writefile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/writefile.c 2011-08-22 13:17:43 UTC (rev 39617)
+++ trunk/blender/source/blender/blenloader/intern/writefile.c 2011-08-22 16:54:26 UTC (rev 39618)
@@ -2461,7 +2461,7 @@
fg.subversion= BLENDER_SUBVERSION;
fg.minversion= BLENDER_MINVERSION;
fg.minsubversion= BLENDER_MINSUBVERSION;
-#ifdef NAN_BUILDINFO
+#ifdef WITH_BUILDINFO
{
extern char build_rev[];
fg.revision= atoi(build_rev);
Modified: trunk/blender/source/blender/collada/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/collada/CMakeLists.txt 2011-08-22 13:17:43 UTC (rev 39617)
+++ trunk/blender/source/blender/collada/CMakeLists.txt 2011-08-22 16:54:26 UTC (rev 39618)
@@ -107,7 +107,7 @@
)
if(WITH_BUILDINFO)
- add_definitions(-DNAN_BUILDINFO)
+ add_definitions(-DWITH_BUILDINFO)
endif()
if(CMAKE_COMPILER_IS_GNUCXX)
Modified: trunk/blender/source/blender/collada/DocumentExporter.cpp
===================================================================
--- trunk/blender/source/blender/collada/DocumentExporter.cpp 2011-08-22 13:17:43 UTC (rev 39617)
+++ trunk/blender/source/blender/collada/DocumentExporter.cpp 2011-08-22 16:54:26 UTC (rev 39618)
@@ -52,7 +52,7 @@
#include "BLI_path_util.h"
#include "BLI_fileops.h"
#include "ED_keyframing.h"
-#ifdef NAN_BUILDINFO
+#ifdef WITH_BUILDINFO
extern char build_rev[];
#endif
}
@@ -1002,7 +1002,7 @@
else {
asset.getContributor().mAuthor = "Blender User";
}
-#ifdef NAN_BUILDINFO
+#ifdef WITH_BUILDINFO
char version_buf[128];
sprintf(version_buf, "Blender %d.%02d.%d r%s", BLENDER_VERSION/100, BLENDER_VERSION%100, BLENDER_SUBVERSION, build_rev);
asset.getContributor().mAuthoringTool = version_buf;
Modified: trunk/blender/source/blender/windowmanager/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/windowmanager/CMakeLists.txt 2011-08-22 13:17:43 UTC (rev 39617)
+++ trunk/blender/source/blender/windowmanager/CMakeLists.txt 2011-08-22 16:54:26 UTC (rev 39618)
@@ -130,7 +130,7 @@
endif()
if(WITH_BUILDINFO)
- add_definitions(-DNAN_BUILDINFO)
+ add_definitions(-DWITH_BUILDINFO)
endif()
blender_add_lib_nolist(bf_windowmanager "${SRC}" "${INC}" "${INC_SYS}")
Modified: trunk/blender/source/blender/windowmanager/intern/wm_operators.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_operators.c 2011-08-22 13:17:43 UTC (rev 39617)
+++ trunk/blender/source/blender/windowmanager/intern/wm_operators.c 2011-08-22 16:54:26 UTC (rev 39618)
@@ -1202,7 +1202,7 @@
MenuType *mt= WM_menutype_find("USERPREF_MT_splash", TRUE);
char url[96];
-#ifdef NAN_BUILDINFO
+#ifdef WITH_BUILDINFO
int ver_width, rev_width;
char *version_str = NULL;
char *revision_str = NULL;
@@ -1219,7 +1219,7 @@
BLF_size(style->widgetlabel.uifont_id, style->widgetlabel.points, U.dpi);
ver_width = (int)BLF_width(style->widgetlabel.uifont_id, version_str) + 5;
rev_width = (int)BLF_width(style->widgetlabel.uifont_id, revision_str) + 5;
-#endif //NAN_BUILDINFO
+#endif //WITH_BUILDINFO
block= uiBeginBlock(C, ar, "_popup", UI_EMBOSS);
uiBlockSetFlag(block, UI_BLOCK_KEEP_OPEN);
@@ -1228,10 +1228,10 @@
uiButSetFunc(but, wm_block_splash_close, block, NULL);
uiBlockSetFunc(block, wm_block_splash_refreshmenu, block, NULL);
-#ifdef NAN_BUILDINFO
+#ifdef WITH_BUILDINFO
uiDefBut(block, LABEL, 0, version_str, 494-ver_width, 282-24, ver_width, UI_UNIT_Y, NULL, 0, 0, 0, 0, NULL);
uiDefBut(block, LABEL, 0, revision_str, 494-rev_width, 282-36, rev_width, UI_UNIT_Y, NULL, 0, 0, 0, 0, NULL);
-#endif //NAN_BUILDINFO
+#endif //WITH_BUILDINFO
layout= uiBlockLayout(block, UI_LAYOUT_VERTICAL, UI_LAYOUT_PANEL, 10, 2, 480, 110, style);
Modified: trunk/blender/source/creator/CMakeLists.txt
===================================================================
--- trunk/blender/source/creator/CMakeLists.txt 2011-08-22 13:17:43 UTC (rev 39617)
+++ trunk/blender/source/creator/CMakeLists.txt 2011-08-22 16:54:26 UTC (rev 39618)
@@ -133,6 +133,7 @@
endif()
if(WITH_BUILDINFO)
+ add_definitions(-DWITH_BUILDINFO)
# --------------------------------------------------------------------------
# These defines could all be moved into the header below
string(REPLACE " " "\ " BUILDINFO_CFLAGS "${CMAKE_C_FLAGS}")
Modified: trunk/blender/source/creator/creator.c
===================================================================
--- trunk/blender/source/creator/creator.c 2011-08-22 13:17:43 UTC (rev 39617)
+++ trunk/blender/source/creator/creator.c 2011-08-22 16:54:26 UTC (rev 39618)
@@ -355,9 +355,9 @@
printf(BLEND_VERSION_STRING_FMT);
MEM_set_memory_debug();
-#ifdef NAN_BUILDINFO
+#ifdef WITH_BUILDINFO
printf("Build: %s %s %s %s\n", build_date, build_time, build_platform, build_type);
-#endif // NAN_BUILDINFO
+#endif // WITH_BUILDINFO
BLI_argsPrint(data);
return 0;
More information about the Bf-blender-cvs
mailing list