[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [21468] branches/soundsystem: 3 first big steps:

Jörg Müller nexyon at gmail.com
Thu Jul 9 23:41:38 CEST 2009 

Revision: 21468
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21468
Author:   nexyon
Date:     2009-07-09 23:41:38 +0200 (Thu, 09 Jul 2009)

Log Message:
-----------
3 first big steps:
- Merged with 2.5 branch
- Added first version of audaspace
- Update build systems

Modified Paths:
--------------
    branches/soundsystem/CMakeLists.txt
    branches/soundsystem/config/linux2-config.py
    branches/soundsystem/config/win32-mingw-config.py
    branches/soundsystem/intern/CMakeLists.txt
    branches/soundsystem/intern/Makefile
    branches/soundsystem/intern/SConscript
    branches/soundsystem/intern/ghost/GHOST_C-api.h
    branches/soundsystem/intern/ghost/GHOST_IWindow.h
    branches/soundsystem/intern/ghost/intern/GHOST_C-api.cpp
    branches/soundsystem/intern/ghost/intern/GHOST_SystemX11.cpp
    branches/soundsystem/intern/ghost/intern/GHOST_Window.cpp
    branches/soundsystem/intern/ghost/intern/GHOST_Window.h
    branches/soundsystem/intern/ghost/intern/GHOST_WindowX11.cpp
    branches/soundsystem/intern/ghost/intern/GHOST_WindowX11.h
    branches/soundsystem/projectfiles_vc9/blender/editors/ED_editors.vcproj
    branches/soundsystem/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj
    branches/soundsystem/release/ui/buttons_data_armature.py
    branches/soundsystem/release/ui/buttons_data_bone.py
    branches/soundsystem/release/ui/buttons_data_camera.py
    branches/soundsystem/release/ui/buttons_data_curve.py
    branches/soundsystem/release/ui/buttons_data_lamp.py
    branches/soundsystem/release/ui/buttons_data_lattice.py
    branches/soundsystem/release/ui/buttons_data_mesh.py
    branches/soundsystem/release/ui/buttons_data_text.py
    branches/soundsystem/release/ui/buttons_material.py
    branches/soundsystem/release/ui/buttons_objects.py
    branches/soundsystem/release/ui/buttons_particle.py
    branches/soundsystem/release/ui/buttons_physics_softbody.py
    branches/soundsystem/release/ui/buttons_scene.py
    branches/soundsystem/release/ui/buttons_texture.py
    branches/soundsystem/release/ui/buttons_world.py
    branches/soundsystem/release/ui/space_filebrowser.py
    branches/soundsystem/release/ui/space_image.py
    branches/soundsystem/release/ui/space_sequencer.py
    branches/soundsystem/release/ui/space_view3d_toolbar.py
    branches/soundsystem/source/Makefile
    branches/soundsystem/source/blender/blenkernel/intern/cloth.c
    branches/soundsystem/source/blender/blenkernel/intern/packedFile.c
    branches/soundsystem/source/blender/blenkernel/intern/particle.c
    branches/soundsystem/source/blender/blenkernel/intern/particle_system.c
    branches/soundsystem/source/blender/blenkernel/intern/pointcache.c
    branches/soundsystem/source/blender/blenkernel/intern/sequence.c
    branches/soundsystem/source/blender/blenkernel/intern/subsurf_ccg.c
    branches/soundsystem/source/blender/blenlib/BLI_graph.h
    branches/soundsystem/source/blender/blenlib/intern/storage.c
    branches/soundsystem/source/blender/blenlib/intern/util.c
    branches/soundsystem/source/blender/blenloader/intern/readfile.c
    branches/soundsystem/source/blender/editors/armature/BIF_retarget.h
    branches/soundsystem/source/blender/editors/armature/armature_intern.h
    branches/soundsystem/source/blender/editors/armature/armature_ops.c
    branches/soundsystem/source/blender/editors/armature/editarmature.c
    branches/soundsystem/source/blender/editors/armature/editarmature_generate.c
    branches/soundsystem/source/blender/editors/armature/editarmature_retarget.c
    branches/soundsystem/source/blender/editors/armature/editarmature_sketch.c
    branches/soundsystem/source/blender/editors/armature/poseobject.c
    branches/soundsystem/source/blender/editors/armature/reeb.c
    branches/soundsystem/source/blender/editors/armature/reeb.h
    branches/soundsystem/source/blender/editors/curve/curve_intern.h
    branches/soundsystem/source/blender/editors/curve/curve_ops.c
    branches/soundsystem/source/blender/editors/curve/editcurve.c
    branches/soundsystem/source/blender/editors/datafiles/blenderbuttons.c
    branches/soundsystem/source/blender/editors/include/BIF_gl.h
    branches/soundsystem/source/blender/editors/include/BIF_glutil.h
    branches/soundsystem/source/blender/editors/include/ED_armature.h
    branches/soundsystem/source/blender/editors/include/ED_fileselect.h
    branches/soundsystem/source/blender/editors/include/ED_mesh.h
    branches/soundsystem/source/blender/editors/include/UI_icons.h
    branches/soundsystem/source/blender/editors/include/UI_interface.h
    branches/soundsystem/source/blender/editors/interface/interface.c
    branches/soundsystem/source/blender/editors/interface/interface_handlers.c
    branches/soundsystem/source/blender/editors/interface/interface_icons.c
    branches/soundsystem/source/blender/editors/interface/interface_layout.c
    branches/soundsystem/source/blender/editors/interface/interface_panel.c
    branches/soundsystem/source/blender/editors/interface/interface_templates.c
    branches/soundsystem/source/blender/editors/interface/view2d.c
    branches/soundsystem/source/blender/editors/mesh/editmesh.c
    branches/soundsystem/source/blender/editors/mesh/editmesh_add.c
    branches/soundsystem/source/blender/editors/mesh/editmesh_loop.c
    branches/soundsystem/source/blender/editors/mesh/editmesh_mods.c
    branches/soundsystem/source/blender/editors/mesh/editmesh_tools.c
    branches/soundsystem/source/blender/editors/mesh/mesh_intern.h
    branches/soundsystem/source/blender/editors/mesh/mesh_ops.c
    branches/soundsystem/source/blender/editors/object/object_edit.c
    branches/soundsystem/source/blender/editors/object/object_intern.h
    branches/soundsystem/source/blender/editors/object/object_modifier.c
    branches/soundsystem/source/blender/editors/object/object_ops.c
    branches/soundsystem/source/blender/editors/physics/ed_pointcache.c
    branches/soundsystem/source/blender/editors/physics/editparticle.c
    branches/soundsystem/source/blender/editors/screen/area.c
    branches/soundsystem/source/blender/editors/sculpt_paint/paint_vertex.c
    branches/soundsystem/source/blender/editors/space_action/action_edit.c
    branches/soundsystem/source/blender/editors/space_action/action_ops.c
    branches/soundsystem/source/blender/editors/space_buttons/buttons_context.c
    branches/soundsystem/source/blender/editors/space_buttons/buttons_ops.c
    branches/soundsystem/source/blender/editors/space_file/file_intern.h
    branches/soundsystem/source/blender/editors/space_file/file_ops.c
    branches/soundsystem/source/blender/editors/space_file/file_panels.c
    branches/soundsystem/source/blender/editors/space_file/filelist.c
    branches/soundsystem/source/blender/editors/space_file/filelist.h
    branches/soundsystem/source/blender/editors/space_file/filesel.c
    branches/soundsystem/source/blender/editors/space_file/space_file.c
    branches/soundsystem/source/blender/editors/space_graph/graph_edit.c
    branches/soundsystem/source/blender/editors/space_graph/graph_ops.c
    branches/soundsystem/source/blender/editors/space_image/image_header.c
    branches/soundsystem/source/blender/editors/space_image/image_ops.c
    branches/soundsystem/source/blender/editors/space_image/space_image.c
    branches/soundsystem/source/blender/editors/space_node/node_edit.c
    branches/soundsystem/source/blender/editors/space_node/node_intern.h
    branches/soundsystem/source/blender/editors/space_node/node_ops.c
    branches/soundsystem/source/blender/editors/space_sequencer/sequencer_edit.c
    branches/soundsystem/source/blender/editors/space_sequencer/sequencer_intern.h
    branches/soundsystem/source/blender/editors/space_sequencer/sequencer_ops.c
    branches/soundsystem/source/blender/editors/space_sequencer/sequencer_select.c
    branches/soundsystem/source/blender/editors/space_view3d/drawarmature.c
    branches/soundsystem/source/blender/editors/space_view3d/drawobject.c
    branches/soundsystem/source/blender/editors/space_view3d/view3d_buttons.c
    branches/soundsystem/source/blender/editors/space_view3d/view3d_draw.c
    branches/soundsystem/source/blender/editors/space_view3d/view3d_edit.c
    branches/soundsystem/source/blender/editors/space_view3d/view3d_header.c
    branches/soundsystem/source/blender/editors/space_view3d/view3d_intern.h
    branches/soundsystem/source/blender/editors/space_view3d/view3d_ops.c
    branches/soundsystem/source/blender/editors/space_view3d/view3d_select.c
    branches/soundsystem/source/blender/editors/space_view3d/view3d_toolbar.c
    branches/soundsystem/source/blender/editors/transform/transform.c
    branches/soundsystem/source/blender/editors/transform/transform.h
    branches/soundsystem/source/blender/editors/transform/transform_conversions.c
    branches/soundsystem/source/blender/editors/transform/transform_generics.c
    branches/soundsystem/source/blender/editors/transform/transform_input.c
    branches/soundsystem/source/blender/editors/transform/transform_manipulator.c
    branches/soundsystem/source/blender/editors/transform/transform_ndofinput.c
    branches/soundsystem/source/blender/editors/transform/transform_ops.c
    branches/soundsystem/source/blender/editors/transform/transform_orientations.c
    branches/soundsystem/source/blender/editors/transform/transform_snap.c
    branches/soundsystem/source/blender/editors/util/undo.c
    branches/soundsystem/source/blender/editors/uvedit/uvedit_draw.c
    branches/soundsystem/source/blender/editors/uvedit/uvedit_ops.c
    branches/soundsystem/source/blender/editors/uvedit/uvedit_unwrap_ops.c
    branches/soundsystem/source/blender/makesdna/DNA_screen_types.h
    branches/soundsystem/source/blender/makesdna/DNA_space_types.h
    branches/soundsystem/source/blender/makesdna/DNA_view3d_types.h
    branches/soundsystem/source/blender/makesdna/DNA_windowmanager_types.h
    branches/soundsystem/source/blender/makesdna/intern/dna_genfile.c
    branches/soundsystem/source/blender/makesdna/intern/makesdna.c
    branches/soundsystem/source/blender/makesrna/RNA_define.h
    branches/soundsystem/source/blender/makesrna/RNA_types.h
    branches/soundsystem/source/blender/makesrna/intern/rna_define.c
    branches/soundsystem/source/blender/makesrna/intern/rna_object_force.c
    branches/soundsystem/source/blender/makesrna/intern/rna_particle.c
    branches/soundsystem/source/blender/makesrna/intern/rna_rna.c
    branches/soundsystem/source/blender/makesrna/intern/rna_scene.c
    branches/soundsystem/source/blender/makesrna/intern/rna_sequence.c
    branches/soundsystem/source/blender/makesrna/intern/rna_space.c
    branches/soundsystem/source/blender/makesrna/intern/rna_ui.c
    branches/soundsystem/source/blender/makesrna/intern/rna_wm.c
    branches/soundsystem/source/blender/makesrna/intern/rna_world.c
    branches/soundsystem/source/blender/python/BPY_extern.h
    branches/soundsystem/source/blender/python/generic/euler.c
    branches/soundsystem/source/blender/python/generic/quat.c
    branches/soundsystem/source/blender/python/generic/vector.c
    branches/soundsystem/source/blender/python/intern/bpy_compat.h
    branches/soundsystem/source/blender/python/intern/bpy_interface.c
    branches/soundsystem/source/blender/python/intern/bpy_operator.c
    branches/soundsystem/source/blender/python/intern/bpy_operator_wrap.c
    branches/soundsystem/source/blender/python/intern/bpy_rna.c
    branches/soundsystem/source/blender/render/intern/source/zbuf.c
    branches/soundsystem/source/blender/windowmanager/WM_api.h
    branches/soundsystem/source/blender/windowmanager/intern/wm_cursors.c
    branches/soundsystem/source/blender/windowmanager/intern/wm_event_system.c
    branches/soundsystem/source/blender/windowmanager/intern/wm_operators.c
    branches/soundsystem/source/creator/CMakeLists.txt
    branches/soundsystem/source/gameengine/Ketsji/KX_PythonInit.cpp
    branches/soundsystem/source/nan_definitions.mk

Added Paths:
-----------
    branches/soundsystem/intern/audaspace/
    branches/soundsystem/intern/audaspace/AUD_C-API.h
    branches/soundsystem/intern/audaspace/CMakeLists.txt
    branches/soundsystem/intern/audaspace/COPYING
    branches/soundsystem/intern/audaspace/COPYING.LESSER
    branches/soundsystem/intern/audaspace/Makefile
    branches/soundsystem/intern/audaspace/SConscript
    branches/soundsystem/intern/audaspace/SDL/
    branches/soundsystem/intern/audaspace/SDL/AUD_SDLDevice.cpp
    branches/soundsystem/intern/audaspace/SDL/AUD_SDLDevice.h
    branches/soundsystem/intern/audaspace/SDL/AUD_SDLMixerFactory.cpp
    branches/soundsystem/intern/audaspace/SDL/AUD_SDLMixerFactory.h
    branches/soundsystem/intern/audaspace/SDL/AUD_SDLMixerReader.cpp
    branches/soundsystem/intern/audaspace/SDL/AUD_SDLMixerReader.h
    branches/soundsystem/intern/audaspace/SDL/AUD_SDLSuperposer.cpp
    branches/soundsystem/intern/audaspace/SDL/AUD_SDLSuperposer.h
    branches/soundsystem/intern/audaspace/SDL/Makefile
    branches/soundsystem/intern/audaspace/ffmpeg/
    branches/soundsystem/intern/audaspace/ffmpeg/AUD_FFMPEGFactory.cpp
    branches/soundsystem/intern/audaspace/ffmpeg/AUD_FFMPEGFactory.h
    branches/soundsystem/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
    branches/soundsystem/intern/audaspace/ffmpeg/AUD_FFMPEGReader.h
    branches/soundsystem/intern/audaspace/ffmpeg/Makefile
    branches/soundsystem/intern/audaspace/intern/
    branches/soundsystem/intern/audaspace/intern/AUD_Buffer.cpp
    branches/soundsystem/intern/audaspace/intern/AUD_Buffer.h
    branches/soundsystem/intern/audaspace/intern/AUD_BufferReader.cpp
    branches/soundsystem/intern/audaspace/intern/AUD_BufferReader.h
    branches/soundsystem/intern/audaspace/intern/AUD_C-API.cpp
    branches/soundsystem/intern/audaspace/intern/AUD_IDevice.h
    branches/soundsystem/intern/audaspace/intern/AUD_IFactory.h
    branches/soundsystem/intern/audaspace/intern/AUD_IReader.h
    branches/soundsystem/intern/audaspace/intern/AUD_ISuperposer.h
    branches/soundsystem/intern/audaspace/intern/AUD_MixerFactory.cpp
    branches/soundsystem/intern/audaspace/intern/AUD_MixerFactory.h
    branches/soundsystem/intern/audaspace/intern/AUD_Reference.h
    branches/soundsystem/intern/audaspace/intern/AUD_SinusFactory.cpp
    branches/soundsystem/intern/audaspace/intern/AUD_SinusFactory.h
    branches/soundsystem/intern/audaspace/intern/AUD_SinusReader.cpp
    branches/soundsystem/intern/audaspace/intern/AUD_SinusReader.h
    branches/soundsystem/intern/audaspace/intern/AUD_SoftwareDevice.cpp
    branches/soundsystem/intern/audaspace/intern/AUD_SoftwareDevice.h
    branches/soundsystem/intern/audaspace/intern/AUD_Space.h
    branches/soundsystem/intern/audaspace/intern/AUD_StreamBufferFactory.cpp
    branches/soundsystem/intern/audaspace/intern/AUD_StreamBufferFactory.h
    branches/soundsystem/intern/audaspace/intern/Makefile
    branches/soundsystem/source/blender/editors/include/ED_retopo.h
    branches/soundsystem/source/blender/editors/include/ED_transform.h

Removed Paths:
-------------
    branches/soundsystem/source/blender/editors/include/BIF_retopo.h
    branches/soundsystem/source/blender/editors/include/BIF_transform.h
    branches/soundsystem/source/blender/editors/include/ED_transform.h
    branches/soundsystem/source/blender/editors/interface/keyval.c

Modified: branches/soundsystem/CMakeLists.txt
===================================================================
--- branches/soundsystem/CMakeLists.txt	2009-07-09 19:49:04 UTC (rev 21467)
+++ branches/soundsystem/CMakeLists.txt	2009-07-09 21:41:38 UTC (rev 21468)
@@ -25,18 +25,18 @@
 # ***** END GPL LICENSE BLOCK *****
 
 #-----------------------------------------------------------------------------
-# We don't allow in-source builds. This causes no end of troubles because 
-# all out-of-source builds will use the CMakeCache.txt file there and even 
-# build the libs and objects in it. It will also conflict with the current 
+# We don't allow in-source builds. This causes no end of troubles because
+# all out-of-source builds will use the CMakeCache.txt file there and even
+# build the libs and objects in it. It will also conflict with the current
 # Makefile system for Blender
 
 IF(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
-MESSAGE(FATAL_ERROR "CMake generation for blender is not allowed within the source directory! 
-Remove the CMakeCache.txt file and try again from another folder, e.g.: 
+MESSAGE(FATAL_ERROR "CMake generation for blender is not allowed within the source directory!
+Remove the CMakeCache.txt file and try again from another folder, e.g.:
 
-   rm CMakeCache.txt 
+   rm CMakeCache.txt
    cd ..
-   mkdir cmake-make 
+   mkdir cmake-make
    cd cmake-make
    cmake -G \"Unix Makefiles\" ../blender
 ")
@@ -61,7 +61,7 @@
 OPTION(WITH_QUICKTIME		"Enable Quicktime Support"				OFF)
 OPTION(WITH_OPENEXR		"Enable OpenEXR Support (http://www.openexr.com)"	ON)
 OPTION(WITH_DDS			"Enable DDS Support"                                   	ON)
-OPTION(WITH_FFMPEG		"Enable FFMPeg Support (http://ffmpeg.mplayerhq.hu/)"	OFF)
+OPTION(WITH_FFMPEG		"Enable FFMPeg Support(http://ffmpeg.mplayerhq.hu/)"	ON)
 OPTION(WITH_PYTHON		"Enable Embedded Python API"				ON)
 OPTION(WITH_OPENJPEG		"Enable OpenJpeg Support (http://www.openjpeg.org/)"	OFF)
 OPTION(WITH_OPENAL		"Enable OpenAL Support (http://www.openal.org)"		ON)
@@ -73,9 +73,9 @@
 ENDIF(NOT WITH_GAMEENGINE AND WITH_PLAYER)
 
 # For alternate Python locations the commandline can be used to override detected/default cache settings, e.g:
-# On Unix: 
+# On Unix:
 #   cmake -D PYTHON_LIB=/usr/local/lib/python2.3/config/libpython2.3.so -D PYTHON_INC=/usr/local/include/python2.3 -D PYTHON_BINARY=/usr/local/bin/python2.3 -G "Unix Makefiles" ../blender
-# On Macs: 
+# On Macs:
 #   cmake -D PYTHON_INC=/System/Library/Frameworks/Python.framework/Versions/2.5/include/python2.5 -D PYTHON_LIBPATH=/System/Library/Frameworks/Python.framework/Versions/2.5/lib/python2.5/config -D PYTHON_BINARY=/System/Library/Frameworks/Python.framework/Versions/2.5/bin/python2.5 -G Xcode ../blender
 #
 # When changing any of this remember to update the notes in doc/blender-cmake.txt
@@ -89,40 +89,40 @@
 
 IF(UNIX AND NOT APPLE)
   IF(WITH_OPENAL)
-    FIND_PACKAGE(OpenAL)
-    IF(OPENAL_FOUND)
-      SET(WITH_OPENAL ON)
-      SET(OPENAL_LIB ${OPENAL_LIBRARY})
-      SET(OPENAL_INC ${OPENAL_INCLUDE_DIR})
-    ELSE(OPENAL_FOUND)
-      SET(WITH_OPENAL OFF)
-    ENDIF(OPENAL_FOUND)
+	FIND_PACKAGE(OpenAL)
+	IF(OPENAL_FOUND)
+	  SET(WITH_OPENAL ON)
+	  SET(OPENAL_LIB ${OPENAL_LIBRARY})
+	  SET(OPENAL_INC ${OPENAL_INCLUDE_DIR})
+	ELSE(OPENAL_FOUND)
+	  SET(WITH_OPENAL OFF)
+	ENDIF(OPENAL_FOUND)
   ENDIF(WITH_OPENAL)
 
   FIND_LIBRARY(INTL_LIBRARY
-    NAMES intl
-    PATHS
-    /sw/lib
+	NAMES intl
+	PATHS
+	/sw/lib
   )
   FIND_LIBRARY(ICONV_LIBRARY
-    NAMES iconv
-    PATHS
-    /sw/lib
+	NAMES iconv
+	PATHS
+	/sw/lib
   )
   IF(INTL_LIBRARY AND ICONV_LIBRARY)
-    SET(GETTEXT_LIB ${INTL_LIBRARY} ${ICONV_LIBRARY})
+	SET(GETTEXT_LIB ${INTL_LIBRARY} ${ICONV_LIBRARY})
   ENDIF(INTL_LIBRARY AND ICONV_LIBRARY)
-  
+
   FIND_PATH(FREETYPE_INC
-    freetype
-    PATHS
-    /usr/local/include/freetype2
-    /usr/include/freetype2
-    /sw/include/freetype2
-    /opt/local/include/freetype2
-    /opt/csw/include/freetype2
-    /opt/include/freetype2
-    NO_DEFAULT_PATH
+	freetype
+	PATHS
+	/usr/local/include/freetype2
+	/usr/include/freetype2
+	/sw/include/freetype2
+	/opt/local/include/freetype2
+	/opt/csw/include/freetype2
+	/opt/include/freetype2
+	NO_DEFAULT_PATH
   )
   SET(FREETYPE_LIB freetype)
 
@@ -138,14 +138,14 @@
   SET(SDL_LIB ${SDL_LIBRARY})
 
   FIND_PATH(OPENEXR_INC
-    ImfXdr.h
-    PATHS
-    /usr/local/include/OpenEXR
-    /usr/include/OpenEXR
-    /sw/include/OpenEXR
-    /opt/local/include/OpenEXR
-    /opt/csw/include/OpenEXR
-    /opt/include/OpenEXR
+	ImfXdr.h
+	PATHS
+	/usr/local/include/OpenEXR
+	/usr/include/OpenEXR
+	/sw/include/OpenEXR
+	/opt/local/include/OpenEXR
+	/opt/csw/include/OpenEXR
+	/opt/include/OpenEXR
   )
   SET(OPENEXR_LIB Half IlmImf Iex Imath)
 
@@ -163,9 +163,9 @@
   SET(LLIBS "-lXi -lutil -lc -lm -lpthread -lstdc++ -lX11 -ldl")
 
   IF(WITH_OPENMP)
-    SET(LLIBS "${LLIBS} -lgomp")
-    SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fopenmp")
-    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fopenmp")
+	SET(LLIBS "${LLIBS} -lgomp")
+	SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fopenmp")
+	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fopenmp")
   ENDIF(WITH_OPENMP)
 
 
@@ -183,13 +183,13 @@
 
   # this file is included anyway when building under Windows with cl.exe
   #  INCLUDE(${CMAKE_ROOT}/Modules/Platform/Windows-cl.cmake)
-  
+
   SET(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/windows)
 
   # Setup 64bit and 64bit windows systems
   IF(CMAKE_CL_64)
-    message("64 bit compiler detected.")
-    SET(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/win64)
+	message("64 bit compiler detected.")
+	SET(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/win64)
   ENDIF(CMAKE_CL_64)
 
   SET(PYTHON ${LIBDIR}/python)
@@ -200,19 +200,19 @@
   SET(PYTHON_LIBPATH ${PYTHON}/lib)
 
   IF(CMAKE_CL_64)
-    SET(WITH_OPENAL OFF)
+	SET(WITH_OPENAL OFF)
   ELSE(CMAKE_CL_64)
-    #SET(WITH_OPENAL ON)
-    SET(OPENAL ${LIBDIR}/openal)
-    SET(OPENAL_INC ${OPENAL}/include ${OPENAL}/include/AL)
-    SET(OPENAL_LIB openal_static)
-    SET(OPENAL_LIBPATH ${OPENAL}/lib)
+	#SET(WITH_OPENAL ON)
+	SET(OPENAL ${LIBDIR}/openal)
+	SET(OPENAL_INC ${OPENAL}/include ${OPENAL}/include/AL)
+	SET(OPENAL_LIB openal_static)
+	SET(OPENAL_LIBPATH ${OPENAL}/lib)
   ENDIF(CMAKE_CL_64)
 
   IF(CMAKE_CL_64)
 	SET(PNG_LIBRARIES libpng)
   ELSE(CMAKE_CL_64)
-    SET(PNG_LIBRARIES libpng_st)
+	SET(PNG_LIBRARIES libpng_st)
   ENDIF(CMAKE_CL_64)
   SET(JPEG_LIBRARY libjpeg)
 
@@ -220,23 +220,23 @@
   SET(ZLIB_INC ${ZLIB}/include)
   SET(ZLIB_LIBRARIES zlib)
   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)
-  
+
   SET(GETTEXT ${LIBDIR}/gettext)
   SET(GETTEXT_INC ${GETTEXT}/include)
   IF(CMAKE_CL_64)
-  	SET(GETTEXT_LIB gettextlib)
+	SET(GETTEXT_LIB gettextlib)
   ELSE(CMAKE_CL_64)
-  	SET(GETTEXT_LIB gnu_gettext)
+	SET(GETTEXT_LIB gnu_gettext)
   ENDIF(CMAKE_CL_64)
   SET(GETTEXT_LIBPATH ${GETTEXT}/lib)
 
@@ -244,7 +244,7 @@
   SET(FREETYPE_INC ${FREETYPE}/include ${FREETYPE}/include/freetype2)
   SET(FREETYPE_LIBPATH ${FREETYPE}/lib)
   SET(FREETYPE_LIB 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)
@@ -257,7 +257,7 @@
   SET(OPENEXR_LIBPATH ${OPENEXR}/lib_vs2008)
   ENDIF(MSVC90)
 
-  
+
   SET(QUICKTIME ${LIBDIR}/QTDevWin)
   SET(QUICKTIME_INC ${QUICKTIME}/CIncludes)
   SET(QUICKTIME_LIB qtmlClient)
@@ -273,9 +273,9 @@
   ELSE(CMAKE_CL_64)
   SET(LLIBS kernel32 user32 gdi32 comdlg32 advapi32 shell32 ole32 oleaut32 uuid ws2_32 vfw32 winmm)
   ENDIF(CMAKE_CL_64)
-  
+
   IF(WITH_OPENAL)
-    SET(LLIBS ${LLIBS} dxguid)
+	SET(LLIBS ${LLIBS} dxguid)
   ENDIF(WITH_OPENAL)
 
   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)
@@ -288,8 +288,8 @@
   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 ")
+	SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /openmp ")
+	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /openmp ")
   ENDIF(WITH_OPENMP)
 
   SET(SDL ${LIBDIR}/sdl)
@@ -307,9 +307,9 @@
 
   SET(TIFF ${LIBDIR}/tiff)
   SET(TIFF_INC ${TIFF}/include)
-  
-  SET(WINTAB_INC ${LIBDIR}/wintab/include) 
 
+  SET(WINTAB_INC ${LIBDIR}/wintab/include)
+
   IF(CMAKE_CL_64)
   SET(PLATFORM_LINKFLAGS "/MANIFEST:NO /MANIFESTUAC:NO /MACHINE:X64 /NODEFAULTLIB:libc.lib;MSVCRT.lib ")
   ELSE(CMAKE_CL_64)
@@ -320,20 +320,20 @@
 
 IF(APPLE)
   IF(CMAKE_OSX_ARCHITECTURES MATCHES i386)
-    SET(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/darwin-8.x.i386)
+	SET(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/darwin-8.x.i386)
   ELSE(CMAKE_OSX_ARCHITECTURES MATCHES i386)
-    SET(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/darwin-6.1-powerpc)
+	SET(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/darwin-6.1-powerpc)
   ENDIF(CMAKE_OSX_ARCHITECTURES MATCHES i386)
 
   IF(WITH_OPENAL)
-    FIND_PACKAGE(OpenAL)
-    IF(OPENAL_FOUND)
-      SET(WITH_OPENAL ON)
-      SET(OPENAL_LIB ${OPENAL_LIBRARY})
-      SET(OPENAL_INC ${OPENAL_INCLUDE_DIR})
-    ELSE(OPENAL_FOUND)
-      SET(WITH_OPENAL OFF)
-    ENDIF(OPENAL_FOUND)
+	FIND_PACKAGE(OpenAL)
+	IF(OPENAL_FOUND)
+	  SET(WITH_OPENAL ON)
+	  SET(OPENAL_LIB ${OPENAL_LIBRARY})
+	  SET(OPENAL_INC ${OPENAL_INCLUDE_DIR})
+	ELSE(OPENAL_FOUND)
+	  SET(WITH_OPENAL OFF)
+	ENDIF(OPENAL_FOUND)
   ENDIF(WITH_OPENAL)
 
   SET(PYTHON /System/Library/Frameworks/Python.framework/Versions/)
@@ -345,7 +345,7 @@
   IF(CMAKE_SYSTEM_VERSION GREATER 10.4)
 	SET(PYTHON_LINKFLAGS "-u _PyMac_Error -framework System -framework Python")
   ELSE(CMAKE_SYSTEM_VERSION GREATER 10.4)
-    SET(PYTHON_LINKFLAGS "-u _PyMac_Error -framework System -framework Python")
+	SET(PYTHON_LINKFLAGS "-u _PyMac_Error -framework System -framework Python")
   ENDIF(CMAKE_SYSTEM_VERSION GREATER 10.4)
 
   SET(GETTEXT ${LIBDIR}/gettext)
@@ -368,9 +368,9 @@
   SET(OPENEXR ${LIBDIR}/openexr)

@@ Diff output truncated at 10240 characters. @@

More information about the Bf-blender-cvs mailing list