forked from bartvdbraak/blender
rename NAN_BUILDINFO --> WITH_BUILDINFO
This commit is contained in:
parent
817273931a
commit
7d316b70b8
@ -368,7 +368,7 @@ def buildinfo(lenv, build_type):
|
|||||||
'BUILD_DATE=\\"%s\\"'%(build_date),
|
'BUILD_DATE=\\"%s\\"'%(build_date),
|
||||||
'BUILD_TYPE=\\"%s\\"'%(build_type),
|
'BUILD_TYPE=\\"%s\\"'%(build_type),
|
||||||
'BUILD_REV=\\"%s\\"'%(build_rev),
|
'BUILD_REV=\\"%s\\"'%(build_rev),
|
||||||
'NAN_BUILDINFO',
|
'WITH_BUILDINFO',
|
||||||
'BUILD_PLATFORM=\\"%s:%s\\"'%(platform.system(), platform.architecture()[0]),
|
'BUILD_PLATFORM=\\"%s:%s\\"'%(platform.system(), platform.architecture()[0]),
|
||||||
'BUILD_CFLAGS=\\"%s\\"'%(build_cflags),
|
'BUILD_CFLAGS=\\"%s\\"'%(build_cflags),
|
||||||
'BUILD_CXXFLAGS=\\"%s\\"'%(build_cxxflags),
|
'BUILD_CXXFLAGS=\\"%s\\"'%(build_cxxflags),
|
||||||
|
@ -55,7 +55,7 @@ set(SRC
|
|||||||
)
|
)
|
||||||
|
|
||||||
if(WITH_BUILDINFO)
|
if(WITH_BUILDINFO)
|
||||||
add_definitions(-DNAN_BUILDINFO)
|
add_definitions(-DWITH_BUILDINFO)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
blender_add_lib(bf_blenloader "${SRC}" "${INC}" "${INC_SYS}")
|
blender_add_lib(bf_blenloader "${SRC}" "${INC}" "${INC_SYS}")
|
||||||
|
@ -2461,7 +2461,7 @@ static void write_global(WriteData *wd, int fileflags, Main *mainvar)
|
|||||||
fg.subversion= BLENDER_SUBVERSION;
|
fg.subversion= BLENDER_SUBVERSION;
|
||||||
fg.minversion= BLENDER_MINVERSION;
|
fg.minversion= BLENDER_MINVERSION;
|
||||||
fg.minsubversion= BLENDER_MINSUBVERSION;
|
fg.minsubversion= BLENDER_MINSUBVERSION;
|
||||||
#ifdef NAN_BUILDINFO
|
#ifdef WITH_BUILDINFO
|
||||||
{
|
{
|
||||||
extern char build_rev[];
|
extern char build_rev[];
|
||||||
fg.revision= atoi(build_rev);
|
fg.revision= atoi(build_rev);
|
||||||
|
@ -107,7 +107,7 @@ set(SRC
|
|||||||
)
|
)
|
||||||
|
|
||||||
if(WITH_BUILDINFO)
|
if(WITH_BUILDINFO)
|
||||||
add_definitions(-DNAN_BUILDINFO)
|
add_definitions(-DWITH_BUILDINFO)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(CMAKE_COMPILER_IS_GNUCXX)
|
if(CMAKE_COMPILER_IS_GNUCXX)
|
||||||
|
@ -52,7 +52,7 @@ extern "C"
|
|||||||
#include "BLI_path_util.h"
|
#include "BLI_path_util.h"
|
||||||
#include "BLI_fileops.h"
|
#include "BLI_fileops.h"
|
||||||
#include "ED_keyframing.h"
|
#include "ED_keyframing.h"
|
||||||
#ifdef NAN_BUILDINFO
|
#ifdef WITH_BUILDINFO
|
||||||
extern char build_rev[];
|
extern char build_rev[];
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
@ -1002,7 +1002,7 @@ void DocumentExporter::exportCurrentScene(Scene *sce, const char* filename, bool
|
|||||||
else {
|
else {
|
||||||
asset.getContributor().mAuthor = "Blender User";
|
asset.getContributor().mAuthor = "Blender User";
|
||||||
}
|
}
|
||||||
#ifdef NAN_BUILDINFO
|
#ifdef WITH_BUILDINFO
|
||||||
char version_buf[128];
|
char version_buf[128];
|
||||||
sprintf(version_buf, "Blender %d.%02d.%d r%s", BLENDER_VERSION/100, BLENDER_VERSION%100, BLENDER_SUBVERSION, build_rev);
|
sprintf(version_buf, "Blender %d.%02d.%d r%s", BLENDER_VERSION/100, BLENDER_VERSION%100, BLENDER_SUBVERSION, build_rev);
|
||||||
asset.getContributor().mAuthoringTool = version_buf;
|
asset.getContributor().mAuthoringTool = version_buf;
|
||||||
|
@ -130,7 +130,7 @@ if(APPLE)
|
|||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(WITH_BUILDINFO)
|
if(WITH_BUILDINFO)
|
||||||
add_definitions(-DNAN_BUILDINFO)
|
add_definitions(-DWITH_BUILDINFO)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
blender_add_lib_nolist(bf_windowmanager "${SRC}" "${INC}" "${INC_SYS}")
|
blender_add_lib_nolist(bf_windowmanager "${SRC}" "${INC}" "${INC_SYS}")
|
||||||
|
@ -1202,7 +1202,7 @@ static uiBlock *wm_block_create_splash(bContext *C, ARegion *ar, void *UNUSED(ar
|
|||||||
MenuType *mt= WM_menutype_find("USERPREF_MT_splash", TRUE);
|
MenuType *mt= WM_menutype_find("USERPREF_MT_splash", TRUE);
|
||||||
char url[96];
|
char url[96];
|
||||||
|
|
||||||
#ifdef NAN_BUILDINFO
|
#ifdef WITH_BUILDINFO
|
||||||
int ver_width, rev_width;
|
int ver_width, rev_width;
|
||||||
char *version_str = NULL;
|
char *version_str = NULL;
|
||||||
char *revision_str = NULL;
|
char *revision_str = NULL;
|
||||||
@ -1219,7 +1219,7 @@ static uiBlock *wm_block_create_splash(bContext *C, ARegion *ar, void *UNUSED(ar
|
|||||||
BLF_size(style->widgetlabel.uifont_id, style->widgetlabel.points, U.dpi);
|
BLF_size(style->widgetlabel.uifont_id, style->widgetlabel.points, U.dpi);
|
||||||
ver_width = (int)BLF_width(style->widgetlabel.uifont_id, version_str) + 5;
|
ver_width = (int)BLF_width(style->widgetlabel.uifont_id, version_str) + 5;
|
||||||
rev_width = (int)BLF_width(style->widgetlabel.uifont_id, revision_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);
|
block= uiBeginBlock(C, ar, "_popup", UI_EMBOSS);
|
||||||
uiBlockSetFlag(block, UI_BLOCK_KEEP_OPEN);
|
uiBlockSetFlag(block, UI_BLOCK_KEEP_OPEN);
|
||||||
@ -1228,10 +1228,10 @@ static uiBlock *wm_block_create_splash(bContext *C, ARegion *ar, void *UNUSED(ar
|
|||||||
uiButSetFunc(but, wm_block_splash_close, block, NULL);
|
uiButSetFunc(but, wm_block_splash_close, block, NULL);
|
||||||
uiBlockSetFunc(block, wm_block_splash_refreshmenu, 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, 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);
|
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);
|
layout= uiBlockLayout(block, UI_LAYOUT_VERTICAL, UI_LAYOUT_PANEL, 10, 2, 480, 110, style);
|
||||||
|
|
||||||
|
@ -133,6 +133,7 @@ if(WIN32 AND NOT UNIX)
|
|||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(WITH_BUILDINFO)
|
if(WITH_BUILDINFO)
|
||||||
|
add_definitions(-DWITH_BUILDINFO)
|
||||||
# --------------------------------------------------------------------------
|
# --------------------------------------------------------------------------
|
||||||
# These defines could all be moved into the header below
|
# These defines could all be moved into the header below
|
||||||
string(REPLACE " " "\ " BUILDINFO_CFLAGS "${CMAKE_C_FLAGS}")
|
string(REPLACE " " "\ " BUILDINFO_CFLAGS "${CMAKE_C_FLAGS}")
|
||||||
|
@ -355,9 +355,9 @@ static int debug_mode(int UNUSED(argc), const char **UNUSED(argv), void *data)
|
|||||||
printf(BLEND_VERSION_STRING_FMT);
|
printf(BLEND_VERSION_STRING_FMT);
|
||||||
MEM_set_memory_debug();
|
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);
|
printf("Build: %s %s %s %s\n", build_date, build_time, build_platform, build_type);
|
||||||
#endif // NAN_BUILDINFO
|
#endif // WITH_BUILDINFO
|
||||||
|
|
||||||
BLI_argsPrint(data);
|
BLI_argsPrint(data);
|
||||||
return 0;
|
return 0;
|
||||||
|
Loading…
Reference in New Issue
Block a user