Enable lcms support on Windows.
This commit is contained in:
parent
1bf56930ac
commit
31ff2a6da2
|
@ -478,13 +478,15 @@ IF(WIN32)
|
|||
SET(OPENCOLLADA_INC ${OPENCOLLADA}/include)
|
||||
SET(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib)
|
||||
SET(OPENCOLLADA_LIB OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils OpenCOLLADAStreamWriter MathMLSolver GeneratedSaxParser xml2 buffer ftoa)
|
||||
#pcre is bundled with openCollada
|
||||
#SET(PCRE ${LIBDIR}/pcre)
|
||||
#SET(PCRE_LIBPATH ${PCRE}/lib)
|
||||
SET(PCRE_LIB pcre)
|
||||
ENDIF(WITH_OPENCOLLADA)
|
||||
|
||||
# TODO: IF(WITH_LCMS)
|
||||
IF(WITH_LCMS)
|
||||
SET(LCMS ${LIBDIR}/lcms)
|
||||
SET(LCMS_INC ${LCMS}/include)
|
||||
SET(LCMS_LIBPATH ${LCMS}/lib)
|
||||
SET(LCMS_LIB lcms)
|
||||
ENDIF(WITH_LCMS)
|
||||
|
||||
IF(WITH_FFMPEG)
|
||||
SET(FFMPEG ${LIBDIR}/ffmpeg)
|
||||
|
@ -606,9 +608,6 @@ IF(WIN32)
|
|||
SET(OPENCOLLADA_INC ${OPENCOLLADA}/include)
|
||||
SET(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib ${OPENCOLLADA}/lib)
|
||||
SET(OPENCOLLADA_LIB OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver expat pcre buffer ftoa)
|
||||
#pcre is bundled with openCollada
|
||||
#SET(PCRE ${LIBDIR}/pcre)
|
||||
#SET(PCRE_LIBPATH ${PCRE}/lib)
|
||||
SET(PCRE_LIB pcre)
|
||||
ENDIF(WITH_OPENCOLLADA)
|
||||
|
||||
|
|
|
@ -172,11 +172,17 @@ MACRO(SETUP_LIBLINKS
|
|||
TARGET_LINK_LIBRARIES(${target} optimized ${EXPAT_LIB})
|
||||
ENDIF(EXPAT_LIB)
|
||||
ELSE(WIN32)
|
||||
TARGET_LINK_LIBRARIES(${target} ${OPENCOLLADA_LIB})
|
||||
TARGET_LINK_LIBRARIES(${target} ${OPENCOLLADA_LIB})
|
||||
TARGET_LINK_LIBRARIES(${target} ${PCRE_LIB})
|
||||
TARGET_LINK_LIBRARIES(${target} ${EXPAT_LIB})
|
||||
ENDIF(WIN32)
|
||||
ENDIF(WITH_OPENCOLLADA)
|
||||
IF(WITH_LCMS)
|
||||
IF(WIN32)
|
||||
TARGET_LINK_LIBRARIES(${target} debug ${LCMS_LIB}_d)
|
||||
TARGET_LINK_LIBRARIES(${target} optimized ${LCMS_LIB})
|
||||
ENDIF(WIN32)
|
||||
ENDIF(WITH_LCMS)
|
||||
IF(WIN32)
|
||||
TARGET_LINK_LIBRARIES(${target} ${PTHREADS_LIB})
|
||||
ENDIF(WIN32)
|
||||
|
|
|
@ -149,6 +149,12 @@ BF_OPENCOLLADA_INC = '${BF_OPENCOLLADA}/include'
|
|||
BF_OPENCOLLADA_LIB = 'OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser MathMLSolver xml2 pcre buffer ftoa'
|
||||
BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib'
|
||||
|
||||
WITH_BF_LCMS = True
|
||||
BF_LCMS = LIBDIR + '/lcms'
|
||||
BF_LCMS_INC = '${BF_LCMS}/include'
|
||||
BF_LCMS_LIB = 'lcms'
|
||||
BF_LCMS_LIBPATH = '${BF_LCMS}/lib'
|
||||
|
||||
#Ray trace optimization
|
||||
WITH_BF_RAYOPTIMIZATION = True
|
||||
BF_RAYOPTIMIZATION_SSE_FLAGS = ['/arch:SSE']
|
||||
|
@ -188,7 +194,6 @@ PLATFORM_LINKFLAGS = ['/SUBSYSTEM:CONSOLE','/MACHINE:IX86','/INCREMENTAL:NO','/N
|
|||
# BF_PROFILE_LINKFLAGS = ['-pg']
|
||||
# BF_PROFILE = False
|
||||
|
||||
#turn off makebsc by default ( as 64 bit version does ) .. takes ages to build .. for nothing ( well some M$ addicts may disagree )
|
||||
BF_BSC=False
|
||||
|
||||
BF_BUILDDIR = '..\\build\\win32-vc'
|
||||
|
|
|
@ -107,23 +107,6 @@ BF_WINTAB_INC = '${BF_WINTAB}/INCLUDE'
|
|||
|
||||
WITH_BF_BINRELOC = False
|
||||
|
||||
#WITH_BF_NSPR = True
|
||||
#BF_NSPR = $(LIBDIR)/nspr
|
||||
#BF_NSPR_INC = -I$(BF_NSPR)/include -I$(BF_NSPR)/include/nspr
|
||||
#BF_NSPR_LIB =
|
||||
|
||||
# Uncomment the following line to use Mozilla inplace of netscape
|
||||
#CPPFLAGS += -DMOZ_NOT_NET
|
||||
# Location of MOZILLA/Netscape header files...
|
||||
#BF_MOZILLA = $(LIBDIR)/mozilla
|
||||
#BF_MOZILLA_INC = -I$(BF_MOZILLA)/include/mozilla/nspr -I$(BF_MOZILLA)/include/mozilla -I$(BF_MOZILLA)/include/mozilla/xpcom -I$(BF_MOZILLA)/include/mozilla/idl
|
||||
#BF_MOZILLA_LIB =
|
||||
# Will fall back to look in BF_MOZILLA_INC/nspr and BF_MOZILLA_LIB
|
||||
# if this is not set.
|
||||
#
|
||||
# Be paranoid regarding library creation (do not update archives)
|
||||
#BF_PARANOID = True
|
||||
|
||||
# enable freetype2 support for text objects
|
||||
BF_WITH_FREETYPE = True
|
||||
BF_FREETYPE = LIBDIR + '/freetype'
|
||||
|
@ -162,6 +145,12 @@ BF_OPENCOLLADA_INC = '${BF_OPENCOLLADA}/include'
|
|||
BF_OPENCOLLADA_LIB = 'OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser MathMLSolver xml2 pcre buffer ftoa'
|
||||
BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib'
|
||||
|
||||
WITH_BF_LCMS = True
|
||||
BF_LCMS = LIBDIR + '/lcms'
|
||||
BF_LCMS_INC = '${BF_LCMS}/include'
|
||||
BF_LCMS_LIB = 'lcms'
|
||||
BF_LCMS_LIBPATH = '${BF_LCMS}/lib'
|
||||
|
||||
#Ray trace optimization
|
||||
WITH_BF_RAYOPTIMIZATION = True
|
||||
BF_RAYOPTIMIZATION_SSE_FLAGS = ['/arch:SSE','/arch:SSE2']
|
||||
|
@ -194,9 +183,6 @@ CXX_WARN = []
|
|||
|
||||
LLIBS = ['ws2_32', 'vfw32', 'winmm', 'kernel32', 'user32', 'gdi32', 'comdlg32', 'advapi32', 'shfolder', 'shell32', 'ole32', 'oleaut32', 'uuid']
|
||||
|
||||
BF_DEBUG=False
|
||||
BF_BSC=False
|
||||
|
||||
if BF_DEBUG:
|
||||
BF_NUMJOBS=1
|
||||
else:
|
||||
|
@ -207,10 +193,3 @@ PLATFORM_LINKFLAGS = ['/SUBSYSTEM:CONSOLE','/MACHINE:X64','/INCREMENTAL:NO','/NO
|
|||
BF_BUILDDIR = '..\\build\\blender25-win64-vc'
|
||||
BF_INSTALLDIR='..\\install\\blender25-win64-vc'
|
||||
|
||||
|
||||
|
||||
######################### MERGE WITH ABOVE ################################
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
|
@ -408,7 +408,7 @@ def read_opts(env, cfg, args):
|
|||
('BF_DEBUG_CCFLAGS', 'C and C++ debug flags', ''),
|
||||
('BF_DEBUG_CXXFLAGS', 'C++ only debug flags', ''),
|
||||
|
||||
(BoolVariable('BF_BSC', 'Create .bsc files (msvc only)', True)),
|
||||
(BoolVariable('BF_BSC', 'Create .bsc files (msvc only)', False)),
|
||||
|
||||
('BF_BUILDDIR', 'Build dir', ''),
|
||||
('BF_INSTALLDIR', 'Installation dir', ''),
|
||||
|
|
Loading…
Reference in New Issue