Revision: 29058
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29058
Author: moguri
Date: 2010-05-29 02:25:00 +0200 (Sat, 29 May 2010)
Log Message:
-----------
Merging r28946-29057
There were some conflicts from files I didn't touch, so I hope things go
alright...
Modified Paths:
--------------
branches/soc-2010-moguri/CMakeLists.txt
branches/soc-2010-moguri/SConstruct
branches/soc-2010-moguri/config/linuxcross-config.py
branches/soc-2010-moguri/config/win32-mingw-config.py
branches/soc-2010-moguri/projectfiles_vc9/blender/imbuf/BL_imbuf.vcproj
branches/soc-2010-moguri/release/datafiles/blenderbuttons
branches/soc-2010-moguri/release/scripts/modules/bpy_types.py
branches/soc-2010-moguri/release/scripts/op/uvcalc_follow_active.py
branches/soc-2010-moguri/release/scripts/ui/properties_object.py
branches/soc-2010-moguri/release/scripts/ui/properties_object_constraint.py
branches/soc-2010-moguri/release/scripts/ui/space_info.py
branches/soc-2010-moguri/release/scripts/ui/space_userpref.py
branches/soc-2010-moguri/release/scripts/ui/space_view3d.py
branches/soc-2010-moguri/source/blender/blenkernel/BKE_utildefines.h
branches/soc-2010-moguri/source/blender/blenkernel/intern/anim.c
branches/soc-2010-moguri/source/blender/blenkernel/intern/blender.c
branches/soc-2010-moguri/source/blender/blenkernel/intern/cloth.c
branches/soc-2010-moguri/source/blender/blenkernel/intern/collision.c
branches/soc-2010-moguri/source/blender/blenkernel/intern/constraint.c
branches/soc-2010-moguri/source/blender/blenkernel/intern/customdata.c
branches/soc-2010-moguri/source/blender/blenkernel/intern/depsgraph.c
branches/soc-2010-moguri/source/blender/blenkernel/intern/image.c
branches/soc-2010-moguri/source/blender/blenkernel/intern/implicit.c
branches/soc-2010-moguri/source/blender/blenkernel/intern/node.c
branches/soc-2010-moguri/source/blender/blenkernel/intern/object.c
branches/soc-2010-moguri/source/blender/blenkernel/intern/sca.c
branches/soc-2010-moguri/source/blender/blenlib/BLI_args.h
branches/soc-2010-moguri/source/blender/blenlib/intern/BLI_args.c
branches/soc-2010-moguri/source/blender/blenlib/intern/bpath.c
branches/soc-2010-moguri/source/blender/blenlib/intern/threads.c
branches/soc-2010-moguri/source/blender/blenloader/BLO_writefile.h
branches/soc-2010-moguri/source/blender/blenloader/intern/readfile.c
branches/soc-2010-moguri/source/blender/blenloader/intern/writefile.c
branches/soc-2010-moguri/source/blender/editors/armature/poselib.c
branches/soc-2010-moguri/source/blender/editors/curve/curve_intern.h
branches/soc-2010-moguri/source/blender/editors/curve/curve_ops.c
branches/soc-2010-moguri/source/blender/editors/curve/editcurve.c
branches/soc-2010-moguri/source/blender/editors/datafiles/blenderbuttons.c
branches/soc-2010-moguri/source/blender/editors/include/UI_interface.h
branches/soc-2010-moguri/source/blender/editors/interface/interface.c
branches/soc-2010-moguri/source/blender/editors/interface/interface_handlers.c
branches/soc-2010-moguri/source/blender/editors/interface/interface_intern.h
branches/soc-2010-moguri/source/blender/editors/interface/interface_templates.c
branches/soc-2010-moguri/source/blender/editors/interface/interface_widgets.c
branches/soc-2010-moguri/source/blender/editors/interface/resources.c
branches/soc-2010-moguri/source/blender/editors/object/object_add.c
branches/soc-2010-moguri/source/blender/editors/object/object_bake.c
branches/soc-2010-moguri/source/blender/editors/object/object_constraint.c
branches/soc-2010-moguri/source/blender/editors/object/object_edit.c
branches/soc-2010-moguri/source/blender/editors/object/object_intern.h
branches/soc-2010-moguri/source/blender/editors/object/object_ops.c
branches/soc-2010-moguri/source/blender/editors/object/object_select.c
branches/soc-2010-moguri/source/blender/editors/physics/physics_fluid.c
branches/soc-2010-moguri/source/blender/editors/render/render_internal.c
branches/soc-2010-moguri/source/blender/editors/render/render_preview.c
branches/soc-2010-moguri/source/blender/editors/screen/screendump.c
branches/soc-2010-moguri/source/blender/editors/sound/sound_ops.c
branches/soc-2010-moguri/source/blender/editors/space_file/filelist.c
branches/soc-2010-moguri/source/blender/editors/space_info/space_info.c
branches/soc-2010-moguri/source/blender/editors/space_logic/logic_window.c
branches/soc-2010-moguri/source/blender/editors/space_node/node_edit.c
branches/soc-2010-moguri/source/blender/editors/space_sequencer/sequencer_add.c
branches/soc-2010-moguri/source/blender/editors/space_view3d/space_view3d.c
branches/soc-2010-moguri/source/blender/imbuf/IMB_thumbs.h
branches/soc-2010-moguri/source/blender/imbuf/intern/anim.c
branches/soc-2010-moguri/source/blender/imbuf/intern/thumbs.c
branches/soc-2010-moguri/source/blender/imbuf/intern/tiff.c
branches/soc-2010-moguri/source/blender/makesdna/DNA_constraint_types.h
branches/soc-2010-moguri/source/blender/makesdna/DNA_material_types.h
branches/soc-2010-moguri/source/blender/makesdna/DNA_node_types.h
branches/soc-2010-moguri/source/blender/makesdna/DNA_userdef_types.h
branches/soc-2010-moguri/source/blender/makesrna/RNA_access.h
branches/soc-2010-moguri/source/blender/makesrna/intern/SConscript
branches/soc-2010-moguri/source/blender/makesrna/intern/rna_actuator.c
branches/soc-2010-moguri/source/blender/makesrna/intern/rna_constraint.c
branches/soc-2010-moguri/source/blender/makesrna/intern/rna_fcurve.c
branches/soc-2010-moguri/source/blender/makesrna/intern/rna_sensor.c
branches/soc-2010-moguri/source/blender/makesrna/intern/rna_space.c
branches/soc-2010-moguri/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2010-moguri/source/blender/modifiers/intern/MOD_meshdeform.c
branches/soc-2010-moguri/source/blender/nodes/intern/CMP_nodes/CMP_displace.c
branches/soc-2010-moguri/source/blender/render/extern/include/RE_pipeline.h
branches/soc-2010-moguri/source/blender/render/extern/include/RE_shader_ext.h
branches/soc-2010-moguri/source/blender/render/intern/include/render_types.h
branches/soc-2010-moguri/source/blender/render/intern/source/imagetexture.c
branches/soc-2010-moguri/source/blender/render/intern/source/pipeline.c
branches/soc-2010-moguri/source/blender/render/intern/source/rendercore.c
branches/soc-2010-moguri/source/blender/windowmanager/WM_api.h
branches/soc-2010-moguri/source/blender/windowmanager/WM_types.h
branches/soc-2010-moguri/source/blender/windowmanager/intern/wm.c
branches/soc-2010-moguri/source/blender/windowmanager/intern/wm_files.c
branches/soc-2010-moguri/source/blender/windowmanager/intern/wm_jobs.c
branches/soc-2010-moguri/source/creator/CMakeLists.txt
branches/soc-2010-moguri/source/creator/creator.c
branches/soc-2010-moguri/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/soc-2010-moguri/source/gameengine/Converter/BL_ModifierDeformer.cpp
branches/soc-2010-moguri/source/gameengine/Converter/BL_ModifierDeformer.h
branches/soc-2010-moguri/source/gameengine/Ketsji/KX_Scene.cpp
branches/soc-2010-moguri/source/gameengine/PyDoc/bge.events.rst
branches/soc-2010-moguri/source/gameengine/PyDoc/bge.logic.rst
branches/soc-2010-moguri/source/gameengine/PyDoc/bge.render.rst
branches/soc-2010-moguri/source/gameengine/PyDoc/bge.types.rst
branches/soc-2010-moguri/source/nan_definitions.mk
Added Paths:
-----------
branches/soc-2010-moguri/source/blender/imbuf/intern/thumbs_blend.c
branches/soc-2010-moguri/source/blender/python/doc/sphinx_html_compact.diff
Modified: branches/soc-2010-moguri/CMakeLists.txt
===================================================================
--- branches/soc-2010-moguri/CMakeLists.txt 2010-05-28 23:16:25 UTC (rev
29057)
+++ branches/soc-2010-moguri/CMakeLists.txt 2010-05-29 00:25:00 UTC (rev
29058)
@@ -1,4 +1,4 @@
- # $Id$
+# $Id$
# ***** BEGIN GPL LICENSE BLOCK *****
#
# This program is free software; you can redistribute it and/or
@@ -63,6 +63,7 @@
OPTION(WITH_INTERNATIONAL "Enable I18N (International fonts and text)" ON)
OPTION(WITH_ELBEEM "Enable Elbeem (Fluid Simulation)" ON)
OPTION(WITH_OPENEXR "Enable OpenEXR Support (http://www.openexr.com)" ON)
+OPTION(WITH_TIFF "Enable LibTIFF Support" ON)
OPTION(WITH_DDS "Enable DDS Support" ON)
OPTION(WITH_FFMPEG "Enable FFMPeg Support
(http://ffmpeg.mplayerhq.hu/)" OFF)
OPTION(WITH_PYTHON "Enable Embedded Python API" ON)
@@ -91,7 +92,7 @@
OPTION(WITH_OPENCOLLADA "Enable OpenCollada Support
(http://www.opencollada.org/)" OFF)
ELSE()
OPTION(WITH_OPENMP "Enable OpenMP (has to be supported by the
compiler)" OFF)
- OPTION(WITH_OPENCOLLADA "Enable OpenCollada Support
(http://www.opencollada.org/)" ON)
+ OPTION(WITH_OPENCOLLADA "Enable OpenCollada Support
(http://www.opencollada.org/)" OFF)
ENDIF()
IF (APPLE)
@@ -124,11 +125,9 @@
IF(WITH_OPENAL)
FIND_PACKAGE(OpenAL)
- IF(OPENAL_FOUND)
- SET(WITH_OPENAL ON)
- ELSE(OPENAL_FOUND)
+ IF(NOT OPENAL_FOUND)
SET(WITH_OPENAL OFF)
- ENDIF(OPENAL_FOUND)
+ ENDIF(NOT OPENAL_FOUND)
ENDIF(WITH_OPENAL)
IF(WITH_JACK)
@@ -185,11 +184,11 @@
ENDIF(NOT SDL_FOUND)
ENDIF(WITH_SDL)
- SET(OPENEXR /usr CACHE FILEPATH "OPENEXR Directory")
+ SET(OPENEXR /usr CACHE FILEPATH "OPENEXR Directory")
FIND_PATH(OPENEXR_INC
ImfXdr.h
PATHS
- ${OPENEXR}/include/OpenEXR
+ ${OPENEXR}/include/OpenEXR
/usr/local/include/OpenEXR
/sw/include/OpenEXR
/opt/local/include/OpenEXR
@@ -215,6 +214,13 @@
SET(LIBSAMPLERATE_LIB samplerate)
SET(LIBSAMPLERATE_LIBPATH ${LIBSAMPLERATE}/lib)
+ IF(WITH_TIFF)
+ FIND_PACKAGE(TIFF)
+ IF(NOT TIFF_FOUND)
+ SET(WITH_TIFF OFF)
+ ENDIF(NOT TIFF_FOUND)
+ ENDIF(WITH_TIFF)
+
FIND_PACKAGE(JPEG REQUIRED)
FIND_PACKAGE(PNG REQUIRED)
@@ -281,120 +287,35 @@
SET(PYTHON_LIB python31)
SET(PYTHON_LIBPATH ${PYTHON}/lib)
- SET(OPENAL ${LIBDIR}/openal)
- SET(OPENAL_INCLUDE_DIR ${OPENAL}/include)
- SET(OPENAL_LIBRARY wrap_oal)
- SET(OPENAL_LIBPATH ${OPENAL}/lib)
+ IF(WITH_OPENAL)
+ SET(OPENAL ${LIBDIR}/openal)
+ SET(OPENAL_INCLUDE_DIR ${OPENAL}/include)
+ SET(OPENAL_LIBRARY wrap_oal)
+ SET(OPENAL_LIBPATH ${OPENAL}/lib)
+ ENDIF(WITH_OPENAL)
- IF(WITH_JACK)
- SET(JACK ${LIBDIR}/jack)
- SET(JACK_INC ${JACK}/include/jack ${JACK}/include)
- SET(JACK_LIB libjack)
- SET(JACK_LIBPATH ${JACK}/lib)
- ENDIF(WITH_JACK)
-
IF(WITH_SNDFILE)
SET(SNDFILE ${LIBDIR}/sndfile)
SET(SNDFILE_INC ${SNDFILE}/include)
SET(SNDFILE_LIB libsndfile-1)
SET(SNDFILE_LIBPATH ${SNDFILE}/lib)
ENDIF(WITH_SNDFILE)
-
- IF(CMAKE_CL_64)
- SET(PNG_LIBRARIES libpng)
- ELSE(CMAKE_CL_64)
- SET(PNG_LIBRARIES libpng_st)
- ENDIF(CMAKE_CL_64)
- SET(JPEG_LIBRARY libjpeg)
-
- SET(ZLIB ${LIBDIR}/zlib)
- SET(ZLIB_INC ${ZLIB}/include)
- IF(CMAKE_CL_64)
- SET(ZLIB_LIBRARIES libz)
- ELSE(CMAKE_CL_64)
- SET(ZLIB_LIBRARIES zlib)
- ENDIF(CMAKE_CL_64)
- SET(ZLIB_LIBPATH ${ZLIB}/lib)
- SET(PTHREADS ${LIBDIR}/pthreads)
- SET(PTHREADS_INC ${PTHREADS}/include)
- SET(PTHREADS_LIB pthreadVC2)
- SET(PTHREADS_LIBPATH ${PTHREADS}/lib)
-
SET(ICONV ${LIBDIR}/iconv)
SET(ICONV_INC ${ICONV}/include)
SET(ICONV_LIB iconv)
SET(ICONV_LIBPATH ${ICONV}/lib)
-
- IF(WITH_FFTW3)
- SET(FFTW3 ${LIBDIR}/fftw3)
- SET(FFTW3_INC ${FFTW3}/include)
- SET(FFTW3_LIB libfftw)
- SET(FFTW3_LIBPATH ${FFTW3}/lib)
- ENDIF(WITH_FFTW3)
-
- SET(GETTEXT ${LIBDIR}/gettext)
- SET(GETTEXT_INC ${GETTEXT}/include)
- IF(CMAKE_CL_64)
- SET(GETTEXT_LIB gettext)
- ELSE(CMAKE_CL_64)
- SET(GETTEXT_LIB gnu_gettext)
- ENDIF(CMAKE_CL_64)
- SET(GETTEXT_LIBPATH ${GETTEXT}/lib)
- SET(FREETYPE ${LIBDIR}/freetype)
- SET(FREETYPE_INCLUDE_DIRS ${FREETYPE}/include
${FREETYPE}/include/freetype2)
- SET(FREETYPE_LIBPATH ${FREETYPE}/lib)
- SET(FREETYPE_LIBRARY freetype2ST)
-
- SET(OPENEXR ${LIBDIR}/openexr)
- SET(OPENEXR_INC ${OPENEXR}/include ${OPENEXR}/include/IlmImf
${OPENEXR}/include/Iex ${OPENEXR}/include/Imath)
- SET(OPENEXR_LIB Iex Half IlmImf Imath IlmThread)
- IF (MSVC80)
- SET(OPENEXR_LIBPATH ${OPENEXR}/lib_vs2005)
- ELSE (MSVC80)
- SET(OPENEXR_LIBPATH ${OPENEXR}/lib_msvc)
- ENDIF(MSVC80)
- IF (MSVC90)
- SET(OPENEXR_LIBPATH ${OPENEXR}/lib_vs2008)
- ENDIF(MSVC90)
-
-
SET(QUICKTIME ${LIBDIR}/QTDevWin)
SET(QUICKTIME_INC ${QUICKTIME}/CIncludes)
SET(QUICKTIME_LIB qtmlClient)
SET(QUICKTIME_LIBPATH ${QUICKTIME}/Libraries)
- SET(FFMPEG ${LIBDIR}/ffmpeg)
- SET(FFMPEG_INC ${FFMPEG}/include ${FFMPEG}/include/msvc)
- SET(FFMPEG_LIB avcodec-52 avformat-52 avdevice-52 avutil-50 swscale-0)
- SET(FFMPEG_LIBPATH ${FFMPEG}/lib)
-
SET(LIBSAMPLERATE ${LIBDIR}/samplerate)
SET(LIBSAMPLERATE_INC ${LIBSAMPLERATE}/include)
SET(LIBSAMPLERATE_LIB libsamplerate)
SET(LIBSAMPLERATE_LIBPATH ${LIBSAMPLERATE}/lib)
- IF(CMAKE_CL_64)
- SET(LLIBS kernel32 user32 vfw32 winmm ws2_32 )
- ELSE(CMAKE_CL_64)
- SET(LLIBS kernel32 user32 gdi32 comdlg32 advapi32 shell32 ole32
oleaut32 uuid ws2_32 vfw32 winmm)
- ENDIF(CMAKE_CL_64)
-
- SET(CMAKE_CXX_FLAGS_DEBUG "/D_CRT_NONSTDC_NO_DEPRECATE
/D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /wd4800 /wd4244 /wd4305
/D_DEBUG /Od /Gm /EHsc /RTC1 /MTd /W3 /nologo /ZI /J" CACHE STRING "MSVC MT
flags " FORCE)
- SET(CMAKE_CXX_FLAGS_RELEASE "/D_CRT_NONSTDC_NO_DEPRECATE
/D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /wd4800 /wd4244 /wd4305
/O2 /Ob2 /DNDEBUG /EHsc /MT /W3 /nologo /J" CACHE STRING "MSVC MT flags " FORCE)
- SET(CMAKE_CXX_FLAGS_MINSIZEREL "/D_CRT_NONSTDC_NO_DEPRECATE
/D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /wd4800 /wd4244 /wd4305
/O1 /Ob1 /DNDEBUG /EHsc /MT /W3 /nologo /J" CACHE STRING "MSVC MT flags " FORCE)
- SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "/D_CRT_NONSTDC_NO_DEPRECATE
/D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /wd4800 /wd4244 /wd4305
/O2 /Ob1 /DNDEBUG /EHsc /MT /W3 /nologo /Zi /J" CACHE STRING "MSVC MT flags "
FORCE)
- SET(CMAKE_C_FLAGS_DEBUG "/D_CRT_NONSTDC_NO_DEPRECATE
/D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /wd4800 /wd4244 /wd4305
/D_DEBUG /Od /Gm /EHsc /RTC1 /MTd /W3 /nologo /ZI /J" CACHE STRING "MSVC MT
flags " FORCE)
- SET(CMAKE_C_FLAGS_RELEASE "/D_CRT_NONSTDC_NO_DEPRECATE
/D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /wd4800 /wd4244 /wd4305
/O2 /Ob2 /DNDEBUG /EHsc /MT /W3 /nologo /J" CACHE STRING "MSVC MT flags " FORCE)
- SET(CMAKE_C_FLAGS_MINSIZEREL "/D_CRT_NONSTDC_NO_DEPRECATE
/D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /wd4800 /wd4244 /wd4305
/O1 /Ob1 /DNDEBUG /EHsc /MT /W3 /nologo /J" CACHE STRING "MSVC MT flags " FORCE)
- SET(CMAKE_C_FLAGS_RELWITHDEBINFO "/D_CRT_NONSTDC_NO_DEPRECATE
/D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /wd4800 /wd4244 /wd4305
/O2 /Ob1 /DNDEBUG /EHsc /MT /W3 /nologo /Zi /J" CACHE STRING "MSVC MT flags "
FORCE)
-
- IF(WITH_OPENMP)
- SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /openmp ")
- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /openmp ")
- ENDIF(WITH_OPENMP)
-
SET(SDL ${LIBDIR}/sdl)
SET(SDL_INCLUDE_DIR ${SDL}/include)
SET(SDL_LIBRARY SDL)
@@ -408,28 +329,224 @@
SET(JPEG_INC "${JPEG}/include")
SET(JPEG_LIBPATH ${JPEG}/lib)
- SET(TIFF ${LIBDIR}/tiff)
- SET(TIFF_INC ${TIFF}/include)
-
SET(WINTAB_INC ${LIBDIR}/wintab/include)
- SET(OPENCOLLADA ${LIBDIR}/opencollada)
- SET(OPENCOLLADA_INC ${OPENCOLLADA}/include)
- SET(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib)
- SET(OPENCOLLADA_LIB OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework
OpenCOLLADABaseUtils OpenCOLLADAStreamWriter MathMLSolver GeneratedSaxParser
UTF xml2 buffer ftoa)
- #pcre is bundled with openCollada
- #SET(PCRE ${LIBDIR}/pcre)
- #SET(PCRE_LIBPATH ${PCRE}/lib)
- SET(PCRE_LIB pcre)
+ IF(MSVC)
+ IF(CMAKE_CL_64)
+ SET(LLIBS kernel32 user32 vfw32 winmm ws2_32 )
+ ELSE(CMAKE_CL_64)
+ SET(LLIBS kernel32 user32 gdi32 comdlg32 advapi32
shell32 ole32 oleaut32 uuid ws2_32 vfw32 winmm)
+ ENDIF(CMAKE_CL_64)
+
+ SET(CMAKE_CXX_FLAGS "/D_CRT_NONSTDC_NO_DEPRECATE
/D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /wd4800 /wd4244 /wd4305"
CACHE STRING "MSVC MT C++ flags " FORCE)
+ SET(CMAKE_C_FLAGS "/D_CRT_NONSTDC_NO_DEPRECATE
/D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /wd4800 /wd4244 /wd4305"
CACHE STRING "MSVC MT C++ flags " FORCE)
+ SET(CMAKE_CXX_FLAGS_DEBUG "/D_DEBUG /Od /Gm /EHsc /RTC1 /MTd
/W3 /nologo /ZI /J" CACHE STRING "MSVC MT flags " FORCE)
+ SET(CMAKE_CXX_FLAGS_RELEASE "/O2 /Ob2 /DNDEBUG /EHsc /MT /W3
/nologo /J" CACHE STRING "MSVC MT flags " FORCE)
+ SET(CMAKE_CXX_FLAGS_MINSIZEREL "/O1 /Ob1 /DNDEBUG /EHsc /MT /W3
/nologo /J" CACHE STRING "MSVC MT flags " FORCE)
+ SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "/O2 /Ob1 /DNDEBUG /EHsc /MT
/W3 /nologo /Zi /J" CACHE STRING "MSVC MT flags " FORCE)
+ SET(CMAKE_C_FLAGS_DEBUG "/D_DEBUG /Od /Gm /EHsc /RTC1 /MTd /W3
/nologo /ZI /J" CACHE STRING "MSVC MT flags " FORCE)
+ SET(CMAKE_C_FLAGS_RELEASE "/O2 /Ob2 /DNDEBUG /EHsc /MT /W3
/nologo /J" CACHE STRING "MSVC MT flags " FORCE)
+ SET(CMAKE_C_FLAGS_MINSIZEREL "/O1 /Ob1 /DNDEBUG /EHsc /MT /W3
/nologo /J" CACHE STRING "MSVC MT flags " FORCE)
+ SET(CMAKE_C_FLAGS_RELWITHDEBINFO "/O2 /Ob1 /DNDEBUG /EHsc /MT
/W3 /nologo /Zi /J" CACHE STRING "MSVC MT flags " FORCE)
+
+ IF(WITH_OPENMP)
+ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /openmp ")
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /openmp ")
+ ENDIF(WITH_OPENMP)
+
+ SET(GETTEXT ${LIBDIR}/gettext)
+ SET(GETTEXT_INC ${GETTEXT}/include)
+ SET(GETTEXT_LIBPATH ${GETTEXT}/lib)
+ IF(CMAKE_CL_64)
+ SET(GETTEXT_LIB gettext)
+ ELSE(CMAKE_CL_64)
+ SET(GETTEXT_LIB gnu_gettext)
+ ENDIF(CMAKE_CL_64)
- IF(CMAKE_CL_64)
- SET(PLATFORM_LINKFLAGS "/MACHINE:X64
/NODEFAULTLIB:libc.lib;MSVCRT.lib ")
- ELSE(CMAKE_CL_64)
- SET(PLATFORM_LINKFLAGS "/NODEFAULTLIB:libc.lib ")
- ENDIF(CMAKE_CL_64)
-
- SET(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG}
/NODEFAULTLIB:libcmt.lib;libc.lib ")
+ IF(CMAKE_CL_64)
+ SET(PNG_LIBRARIES libpng)
+ ELSE(CMAKE_CL_64)
+ SET(PNG_LIBRARIES libpng_st)
+ ENDIF(CMAKE_CL_64)
+ SET(JPEG_LIBRARY libjpeg)
+
+ SET(ZLIB ${LIBDIR}/zlib)
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
