diff options
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/cmake/macros.cmake | 17 | ||||
| -rw-r--r-- | build_files/make/nan_compile.mk | 1 | ||||
| -rw-r--r-- | build_files/make/nan_definitions.mk | 16 | ||||
| -rw-r--r-- | build_files/make/nan_link.mk | 4 | ||||
| -rw-r--r-- | build_files/scons/config/win64-vc-config.py | 2 | ||||
| -rw-r--r-- | build_files/scons/tools/Blender.py | 12 | ||||
| -rw-r--r-- | build_files/scons/tools/btools.py | 14 |
7 files changed, 41 insertions, 25 deletions
diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake index 84e6b788dc0..22c090342ef 100644 --- a/build_files/cmake/macros.cmake +++ b/build_files/cmake/macros.cmake @@ -58,12 +58,12 @@ MACRO(SETUP_LIBDIRS) IF(WITH_FFMPEG) LINK_DIRECTORIES(${FFMPEG_LIBPATH}) ENDIF(WITH_FFMPEG) - IF(WITH_OPENEXR) + IF(WITH_IMAGE_OPENEXR) LINK_DIRECTORIES(${OPENEXR_LIBPATH}) - ENDIF(WITH_OPENEXR) - IF(WITH_TIFF) + ENDIF(WITH_IMAGE_OPENEXR) + IF(WITH_IMAGE_TIFF) LINK_DIRECTORIES(${TIFF_LIBPATH}) - ENDIF(WITH_TIFF) + ENDIF(WITH_IMAGE_TIFF) IF(WITH_LCMS) LINK_DIRECTORIES(${LCMS_LIBPATH}) ENDIF(WITH_LCMS) @@ -140,10 +140,10 @@ MACRO(SETUP_LIBLINKS IF(WITH_QUICKTIME) TARGET_LINK_LIBRARIES(${target} ${QUICKTIME_LIB}) ENDIF(WITH_QUICKTIME) - IF(WITH_TIFF) + IF(WITH_IMAGE_TIFF) TARGET_LINK_LIBRARIES(${target} ${TIFF_LIBRARY}) - ENDIF(WITH_TIFF) - IF(WITH_OPENEXR) + ENDIF(WITH_IMAGE_TIFF) + IF(WITH_IMAGE_OPENEXR) IF(WIN32) FOREACH(loop_var ${OPENEXR_LIB}) TARGET_LINK_LIBRARIES(${target} debug ${loop_var}_d) @@ -152,7 +152,7 @@ MACRO(SETUP_LIBLINKS ELSE(WIN32) TARGET_LINK_LIBRARIES(${target} ${OPENEXR_LIB}) ENDIF(WIN32) - ENDIF(WITH_OPENEXR) + ENDIF(WITH_IMAGE_OPENEXR) IF(WITH_LCMS) TARGET_LINK_LIBRARIES(${target} ${LCMS_LIBRARY}) ENDIF(WITH_LCMS) @@ -198,6 +198,7 @@ MACRO(TEST_SSE_SUPPORT) SUPPORT_SSE_BUILD) ENDMACRO(TEST_SSE_SUPPORT) + MACRO(GET_BLENDER_VERSION) FILE(READ ${CMAKE_SOURCE_DIR}/source/blender/blenkernel/BKE_blender.h CONTENT) STRING(REGEX REPLACE "\n" ";" CONTENT "${CONTENT}") diff --git a/build_files/make/nan_compile.mk b/build_files/make/nan_compile.mk index 36c315a8e11..be38eac4f92 100644 --- a/build_files/make/nan_compile.mk +++ b/build_files/make/nan_compile.mk @@ -89,7 +89,6 @@ ifeq ($(OS),darwin) CCFLAGS += -pipe -fPIC -funsigned-char endif - CFLAGS += -arch $(MACOSX_ARCHITECTURE) #-isysroot $(MACOSX_SDK) -mmacosx-version-min=$(MACOSX_MIN_VERS) CCFLAGS += -arch $(MACOSX_ARCHITECTURE) #-isysroot $(MACOSX_SDK) -mmacosx-version-min=$(MACOSX_MIN_VERS) diff --git a/build_files/make/nan_definitions.mk b/build_files/make/nan_definitions.mk index d14bdb0a13c..d8da2189e6d 100644 --- a/build_files/make/nan_definitions.mk +++ b/build_files/make/nan_definitions.mk @@ -159,6 +159,17 @@ ifndef CONFIG_GUESS endif export WITH_TIFF ?= true + + #enable raytracing optimization (currently only for i386 and x86_64) + ifeq ($(CPU),powerpc) + export WITH_BF_RAYOPTIMIZATION ?= false + else + export WITH_BF_RAYOPTIMIZATION ?= true + endif + + export WITH_LCMS ?= false + export WITH_CINEON ?= true + export WITH_HDR ?= true # Compare recreated .mo files with committed ones export BF_VERIFY_MO_FILES ?= true @@ -622,6 +633,11 @@ ifndef CONFIG_GUESS # default tiff libs export NAN_TIFF_LIBS ?= $(NAN_TIFF)/lib/libtiff.a + # default path to lcms, may be overidden in platform sections above or in user-def.mk + export BF_LCMS ?= $(LCGDIR)/lcms + export BF_LCMS_INC ?= $(BF_LCMS)/include + export BF_LCMS_LIBS ?= $(BF_LCMS)/lib/liblcms.a + endif # CONFIG_GUESS # Don't want to build the gameengine? diff --git a/build_files/make/nan_link.mk b/build_files/make/nan_link.mk index bbf4053b14c..43fba13f45b 100644 --- a/build_files/make/nan_link.mk +++ b/build_files/make/nan_link.mk @@ -195,4 +195,8 @@ ifeq ($(WITH_TIFF),true) LLIBS += $(NAN_TIFF_LIBS) endif +ifeq ($(WITH_LCMS),true) + LLIBS += $(BF_LCMS_LIBS) +endif + LLIBS += $(NAN_PYTHON_LIB) diff --git a/build_files/scons/config/win64-vc-config.py b/build_files/scons/config/win64-vc-config.py index 46b9034823c..0a4b05a28bf 100644 --- a/build_files/scons/config/win64-vc-config.py +++ b/build_files/scons/config/win64-vc-config.py @@ -194,8 +194,6 @@ CXX_WARN = [] LLIBS = ['ws2_32', 'vfw32', 'winmm', 'kernel32', 'user32', 'gdi32', 'comdlg32', 'advapi32', 'shfolder', 'shell32', 'ole32', 'oleaut32', 'uuid'] -WITH_BF_DOCS=False - BF_DEBUG=False BF_BSC=False diff --git a/build_files/scons/tools/Blender.py b/build_files/scons/tools/Blender.py index 1c2fccec322..89c4ef9cac9 100644 --- a/build_files/scons/tools/Blender.py +++ b/build_files/scons/tools/Blender.py @@ -501,10 +501,7 @@ def AppIt(target=None, source=None, env=None): installdir = env['BF_INSTALLDIR'] print("compiled architecture: %s"%(osxarch)) print("Installing to %s"%(installdir)) - if libdir == '../lib/darwin-9.x.universal': - python_zip = 'python_' + osxarch + '.zip' # set specific python_arch.zip - else: - python_zip = 'python.zip' # compatibility for darwin8 python.zip + python_zip = 'python_' + osxarch + '.zip' # set specific python_arch.zip print("unzipping to app-bundle: %s"%(python_zip)) bldroot = env.Dir('.').abspath binary = env['BINARYKIND'] @@ -570,10 +567,9 @@ def UnixPyBundle(target=None, source=None, env=None): def run(cmd): print 'Install command:', cmd commands.getoutput(cmd) - - if env['WITH_BF_FHS']: dir = os.path.join(env['BF_INSTALLDIR'], 'share', 'blender', env['BF_VERSION']) # BLENDERPATH - else: dir = os.path.join(env['BF_INSTALLDIR'], VERSION) - + + dir = os.path.join(env['BF_INSTALLDIR'], VERSION) + py_src = env.subst( env['BF_PYTHON_LIBPATH'] + '/python'+env['BF_PYTHON_VERSION'] ) py_target = env.subst( dir + '/python/lib/python'+env['BF_PYTHON_VERSION'] ) diff --git a/build_files/scons/tools/btools.py b/build_files/scons/tools/btools.py index 5647ef0ebaa..c930c150cb6 100644 --- a/build_files/scons/tools/btools.py +++ b/build_files/scons/tools/btools.py @@ -36,7 +36,7 @@ def validate_arguments(args, bc): 'WITH_BF_SNDFILE', 'BF_SNDFILE', 'BF_SNDFILE_INC', 'BF_SNDFILE_LIB', 'BF_SNDFILE_LIBPATH', 'BF_PTHREADS', 'BF_PTHREADS_INC', 'BF_PTHREADS_LIB', 'BF_PTHREADS_LIBPATH', 'WITH_BF_OPENEXR', 'BF_OPENEXR', 'BF_OPENEXR_INC', 'BF_OPENEXR_LIB', 'BF_OPENEXR_LIBPATH', 'WITH_BF_STATICOPENEXR', 'BF_OPENEXR_LIB_STATIC', - 'WITH_BF_DDS', + 'WITH_BF_DDS', 'WITH_BF_CINEON', 'WITH_BF_HDR', 'WITH_BF_FFMPEG', 'BF_FFMPEG_LIB','BF_FFMPEG_EXTRA', 'BF_FFMPEG', 'BF_FFMPEG_INC', 'WITH_BF_OGG', 'BF_OGG', 'BF_OGG_LIB', 'WITH_BF_JPEG', 'BF_JPEG', 'BF_JPEG_INC', 'BF_JPEG_LIB', 'BF_JPEG_LIBPATH', @@ -78,7 +78,6 @@ def validate_arguments(args, bc): 'WITH_BF_DOCS', 'BF_NUMJOBS', 'BF_MSVS', - 'WITH_BF_FHS', 'BF_VERSION', 'BF_GHOST_DEBUG', 'WITH_BF_RAYOPTIMIZATION', @@ -224,7 +223,11 @@ def read_opts(env, cfg, args): ('BF_OPENEXR_LIBPATH', 'OPENEXR library path', ''), ('BF_OPENEXR_LIB_STATIC', 'OPENEXR static library', ''), - (BoolVariable('WITH_BF_DDS', 'Use DDS if true', True)), + (BoolVariable('WITH_BF_DDS', 'Support DDS image format if true', True)), + + (BoolVariable('WITH_BF_CINEON', 'Support CINEON and DPX image formats if true', True)), + + (BoolVariable('WITH_BF_HDR', 'Support HDR image formats if true', True)), (BoolVariable('WITH_BF_FFMPEG', 'Use FFMPEG if true', False)), ('BF_FFMPEG', 'FFMPEG base path', ''), @@ -428,13 +431,12 @@ def read_opts(env, cfg, args): ('BF_X264_CONFIG', 'configuration flags for x264', ''), ('BF_XVIDCORE_CONFIG', 'configuration flags for xvidcore', ''), - (BoolVariable('WITH_BF_DOCS', 'Generate API documentation', False)), +# (BoolVariable('WITH_BF_DOCS', 'Generate API documentation', False)), ('BF_CONFIG', 'SCons python config file used to set default options', 'user_config.py'), ('BF_NUMJOBS', 'Number of build processes to spawn', '1'), ('BF_MSVS', 'Generate MSVS project files and solution', False), - - (BoolVariable('WITH_BF_FHS', 'Use the Unix "Filesystem Hierarchy Standard" rather then a redistributable directory layout', False)), + ('BF_VERSION', 'The root path for Unix (non-apple)', '2.5'), (BoolVariable('BF_UNIT_TEST', 'Build with unit test support.', False)), |