[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [31798] trunk/blender: - added back zlib include (needed for win32).
Campbell Barton
ideasman42 at gmail.com
Tue Sep 7 03:13:11 CEST 2010
Revision: 31798
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31798
Author: campbellbarton
Date: 2010-09-07 03:13:10 +0200 (Tue, 07 Sep 2010)
Log Message:
-----------
- added back zlib include (needed for win32).
- use list append in more places.
- remove non existing include dir.
Modified Paths:
--------------
trunk/blender/CMakeLists.txt
trunk/blender/extern/glew/CMakeLists.txt
trunk/blender/intern/audaspace/CMakeLists.txt
trunk/blender/intern/ghost/CMakeLists.txt
trunk/blender/intern/smoke/CMakeLists.txt
trunk/blender/source/blender/blenkernel/CMakeLists.txt
trunk/blender/source/blender/blenlib/CMakeLists.txt
trunk/blender/source/blender/blenpluginapi/CMakeLists.txt
trunk/blender/source/blender/editors/armature/CMakeLists.txt
trunk/blender/source/blender/editors/mesh/CMakeLists.txt
trunk/blender/source/blender/editors/object/CMakeLists.txt
trunk/blender/source/blender/editors/physics/CMakeLists.txt
trunk/blender/source/blender/editors/render/CMakeLists.txt
trunk/blender/source/blender/editors/screen/CMakeLists.txt
trunk/blender/source/blender/editors/sculpt_paint/CMakeLists.txt
trunk/blender/source/blender/editors/space_file/CMakeLists.txt
trunk/blender/source/blender/editors/space_image/CMakeLists.txt
trunk/blender/source/blender/editors/space_node/CMakeLists.txt
trunk/blender/source/blender/editors/space_view3d/CMakeLists.txt
trunk/blender/source/blender/imbuf/CMakeLists.txt
trunk/blender/source/blender/makesrna/intern/CMakeLists.txt
trunk/blender/source/blender/nodes/CMakeLists.txt
trunk/blender/source/blender/python/CMakeLists.txt
trunk/blender/source/blender/quicktime/CMakeLists.txt
trunk/blender/source/blender/render/CMakeLists.txt
trunk/blender/source/blender/windowmanager/CMakeLists.txt
trunk/blender/source/creator/CMakeLists.txt
trunk/blender/source/gameengine/BlenderRoutines/CMakeLists.txt
trunk/blender/source/gameengine/Converter/CMakeLists.txt
trunk/blender/source/gameengine/Expressions/CMakeLists.txt
trunk/blender/source/gameengine/GameLogic/CMakeLists.txt
trunk/blender/source/gameengine/Ketsji/CMakeLists.txt
trunk/blender/source/gameengine/Ketsji/KXNetwork/CMakeLists.txt
trunk/blender/source/gameengine/VideoTexture/CMakeLists.txt
Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt 2010-09-07 00:32:45 UTC (rev 31797)
+++ trunk/blender/CMakeLists.txt 2010-09-07 01:13:10 UTC (rev 31798)
@@ -401,8 +401,7 @@
ENDIF(WITH_QUICKTIME)
IF(WITH_RAYOPTIMIZATION AND SUPPORT_SSE_BUILD)
- ADD_DEFINITIONS(-D__SSE__)
- ADD_DEFINITIONS(-D__MMX__)
+ ADD_DEFINITIONS(-D__SSE__ -D__MMX__)
ENDIF(WITH_RAYOPTIMIZATION AND SUPPORT_SSE_BUILD)
IF(MSVC)
@@ -865,8 +864,7 @@
IF(CMAKE_COMPILER_IS_GNUCC)
IF(SUPPORT_SSE_BUILD)
SET(PLATFORM_CFLAGS " -msse ${PLATFORM_CFLAGS}")
- ADD_DEFINITIONS(-D__SSE__)
- ADD_DEFINITIONS(-D__MMX__)
+ ADD_DEFINITIONS(-D__SSE__ -D__MMX__)
ENDIF(SUPPORT_SSE_BUILD)
IF(SUPPORT_SSE2_BUILD)
SET(PLATFORM_CFLAGS " -msse2 ${PLATFORM_CFLAGS}")
Modified: trunk/blender/extern/glew/CMakeLists.txt
===================================================================
--- trunk/blender/extern/glew/CMakeLists.txt 2010-09-07 00:32:45 UTC (rev 31797)
+++ trunk/blender/extern/glew/CMakeLists.txt 2010-09-07 01:13:10 UTC (rev 31798)
@@ -27,7 +27,7 @@
SET(INC include src)
IF(UNIX)
- SET(INC ${INC} ${X11_X11_INCLUDE_PATH})
+ LIST(APPEND INC ${X11_X11_INCLUDE_PATH})
ENDIF(UNIX)
SET(SRC
@@ -37,4 +37,3 @@
ADD_DEFINITIONS(-DGLEW_STATIC)
BLENDERLIB(extern_glew "${SRC}" "${INC}")
-
Modified: trunk/blender/intern/audaspace/CMakeLists.txt
===================================================================
--- trunk/blender/intern/audaspace/CMakeLists.txt 2010-09-07 00:32:45 UTC (rev 31797)
+++ trunk/blender/intern/audaspace/CMakeLists.txt 2010-09-07 01:13:10 UTC (rev 31798)
@@ -36,49 +36,43 @@
)
IF(WITH_FFMPEG)
- LIST(APPEND INC ffmpeg)
- LIST(APPEND INC ${FFMPEG_INC})
+ LIST(APPEND INC ffmpeg ${FFMPEG_INC})
FILE(GLOB FFMPEGSRC ffmpeg/*.cpp)
ADD_DEFINITIONS(-DWITH_FFMPEG)
ENDIF(WITH_FFMPEG)
IF(WITH_SDL)
- LIST(APPEND INC SDL)
- LIST(APPEND INC ${SDL_INCLUDE_DIR})
+ LIST(APPEND INC SDL ${SDL_INCLUDE_DIR})
FILE(GLOB SDLSRC SDL/*.cpp)
ADD_DEFINITIONS(-DWITH_SDL)
ENDIF(WITH_SDL)
IF(WITH_OPENAL)
- LIST(APPEND INC OpenAL)
- LIST(APPEND INC ${OPENAL_INCLUDE_DIR})
+ LIST(APPEND INC OpenAL ${OPENAL_INCLUDE_DIR})
FILE(GLOB OPENALSRC OpenAL/*.cpp)
ADD_DEFINITIONS(-DWITH_OPENAL)
ENDIF(WITH_OPENAL)
IF(WITH_JACK)
- LIST(APPEND INC jack)
- LIST(APPEND INC ${JACK_INC})
+ LIST(APPEND INC jack ${JACK_INC})
FILE(GLOB JACKSRC jack/*.cpp)
ADD_DEFINITIONS(-DWITH_JACK)
ENDIF(WITH_JACK)
IF(WITH_SNDFILE)
- LIST(APPEND INC sndfile)
- LIST(APPEND INC ${SNDFILE_INC})
+ LIST(APPEND INC sndfile ${SNDFILE_INC})
FILE(GLOB SNDFILESRC sndfile/*.cpp)
ADD_DEFINITIONS(-DWITH_SNDFILE)
ENDIF(WITH_SNDFILE)
#IF(WITH_FFTW3)
-# SET(INC ${INC} fftw ${FFTW3_INC})
+# LIST(APPEND INC fftw ${FFTW3_INC})
# FILE(GLOB FFTW3SRC fftw/*.cpp)
# ADD_DEFINITIONS(-DWITH_FFTW3)
#ENDIF(WITH_FFTW3)
IF(WITH_PYTHON)
- LIST(APPEND INC Python)
- LIST(APPEND INC ${PYTHON_INC})
+ LIST(APPEND INC Python ${PYTHON_INC})
FILE(GLOB PYTHONSRC Python/*.cpp)
ELSE(WITH_PYTHON)
ADD_DEFINITIONS(-DDISABLE_PYTHON)
Modified: trunk/blender/intern/ghost/CMakeLists.txt
===================================================================
--- trunk/blender/intern/ghost/CMakeLists.txt 2010-09-07 00:32:45 UTC (rev 31797)
+++ trunk/blender/intern/ghost/CMakeLists.txt 2010-09-07 01:13:10 UTC (rev 31798)
@@ -52,13 +52,13 @@
IF(APPLE)
IF(WITH_COCOA)
- SET(SRC ${SRC}
+ LIST(APPEND SRC
${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_DisplayManagerCocoa.mm
${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_SystemCocoa.mm
${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_WindowCocoa.mm
)
ELSE(WITH_COCOA)
- SET(SRC ${SRC}
+ LIST(APPEND SRC
${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_DisplayManagerCarbon.cpp
${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_SystemCarbon.cpp
${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_WindowCarbon.cpp
@@ -69,18 +69,18 @@
ADD_DEFINITIONS(-DWITH_QUICKTIME)
ENDIF(WITH_QUICKTIME)
ELSEIF(WIN32)
- SET(INC ${INC} ${WINTAB_INC})
+ LIST(APPEND INC ${WINTAB_INC})
- SET(SRC ${SRC}
+ LIST(APPEND SRC
${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_DisplayManagerWin32.cpp
${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_SystemWin32.cpp
${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_WindowWin32.cpp
${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_DropTargetWin32.cpp
)
ELSEIF(UNIX)
- SET(INC ${INC} ${X11_X11_INCLUDE_PATH})
+ LIST(APPEND INC ${X11_X11_INCLUDE_PATH})
- SET(SRC ${SRC}
+ LIST(APPEND SRC
${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_DisplayManagerX11.cpp
${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_SystemX11.cpp
${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_WindowX11.cpp
Modified: trunk/blender/intern/smoke/CMakeLists.txt
===================================================================
--- trunk/blender/intern/smoke/CMakeLists.txt 2010-09-07 00:32:45 UTC (rev 31797)
+++ trunk/blender/intern/smoke/CMakeLists.txt 2010-09-07 01:13:10 UTC (rev 31798)
@@ -24,7 +24,14 @@
#
# ***** END GPL LICENSE BLOCK *****
-SET(INC ${PNG_INC} ${ZLIB_INC} intern ../../extern/bullet2/src ../memutil ../guardealloc)
+SET(INC
+ intern
+ ../memutil
+ ../guardealloc
+ ../../extern/bullet2/src
+ ${PNG_INC}
+ ${ZLIB_INC}
+)
FILE(GLOB SRC intern/*.cpp)
@@ -34,9 +41,8 @@
IF(WITH_FFTW3)
ADD_DEFINITIONS(-DFFTW3=1)
- SET(INC ${INC} ${FFTW3_INC})
+ LIST(APPEND INC ${FFTW3_INC})
ENDIF(WITH_FFTW3)
+BLENDERLIB(bf_intern_smoke "${SRC}" "${INC}")
-BLENDERLIB(bf_intern_smoke "${SRC}" "${INC}")
-#, libtype='blender', priority = 0 )
Modified: trunk/blender/source/blender/blenkernel/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/blenkernel/CMakeLists.txt 2010-09-07 00:32:45 UTC (rev 31797)
+++ trunk/blender/source/blender/blenkernel/CMakeLists.txt 2010-09-07 01:13:10 UTC (rev 31798)
@@ -87,8 +87,7 @@
ENDIF(WITH_IMAGE_HDR)
IF(WITH_QUICKTIME)
- LIST(APPEND INC ../quicktime)
- LIST(APPEND INC ${QUICKTIME_INC})
+ LIST(APPEND INC ../quicktime ${QUICKTIME_INC})
ADD_DEFINITIONS(-DWITH_QUICKTIME)
ENDIF(WITH_QUICKTIME)
@@ -103,8 +102,7 @@
ENDIF(WITH_LCMS)
IF(WITH_PYTHON)
- LIST(APPEND INC ../python)
- LIST(APPEND INC ${PYTHON_INC})
+ LIST(APPEND INC ../python ${PYTHON_INC})
ELSE(WITH_PYTHON)
ADD_DEFINITIONS(-DDISABLE_PYTHON)
ENDIF(WITH_PYTHON)
Modified: trunk/blender/source/blender/blenlib/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/blenlib/CMakeLists.txt 2010-09-07 00:32:45 UTC (rev 31797)
+++ trunk/blender/source/blender/blenlib/CMakeLists.txt 2010-09-07 01:13:10 UTC (rev 31798)
@@ -34,6 +34,7 @@
../gpu
../../../intern/ghost
../../../intern/guardedalloc
+ ${ZLIB_INC}
${FREETYPE_INCLUDE_DIRS}
)
@@ -45,7 +46,7 @@
ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
IF(WIN32)
- SET(INC ${INC} ${PTHREADS_INC})
+ LIST(APPEND INC ${PTHREADS_INC})
ENDIF(WIN32)
IF(WITH_OPENMP)
Modified: trunk/blender/source/blender/blenpluginapi/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/blenpluginapi/CMakeLists.txt 2010-09-07 00:32:45 UTC (rev 31797)
+++ trunk/blender/source/blender/blenpluginapi/CMakeLists.txt 2010-09-07 01:13:10 UTC (rev 31798)
@@ -31,11 +31,11 @@
)
IF(WIN32)
- SET(INC ${INC} ${PTHREADS_INC})
+ LIST(APPEND INC ${PTHREADS_INC})
ENDIF(WIN32)
IF(WITH_QUICKTIME)
- SET(INC ${INC} ${QUICKTIME_INC})
+ LIST(APPEND INC ${QUICKTIME_INC})
ADD_DEFINITIONS(-DWITH_QUICKTIME)
ENDIF(WITH_QUICKTIME)
Modified: trunk/blender/source/blender/editors/armature/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/editors/armature/CMakeLists.txt 2010-09-07 00:32:45 UTC (rev 31797)
+++ trunk/blender/source/blender/editors/armature/CMakeLists.txt 2010-09-07 01:13:10 UTC (rev 31798)
@@ -33,7 +33,7 @@
)
IF(WIN32)
- SET(INC ${INC} ${PTHREADS_INC})
+ LIST(APPEND INC ${PTHREADS_INC})
ENDIF(WIN32)
BLENDERLIB(bf_editor_armature "${SRC}" "${INC}")
Modified: trunk/blender/source/blender/editors/mesh/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/editors/mesh/CMakeLists.txt 2010-09-07 00:32:45 UTC (rev 31797)
+++ trunk/blender/source/blender/editors/mesh/CMakeLists.txt 2010-09-07 01:13:10 UTC (rev 31798)
@@ -34,7 +34,7 @@
)
IF(WIN32)
- SET(INC ${INC} ${PTHREADS_INC})
+ LIST(APPEND INC ${PTHREADS_INC})
ENDIF(WIN32)
BLENDERLIB(bf_editor_mesh "${SRC}" "${INC}")
Modified: trunk/blender/source/blender/editors/object/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/editors/object/CMakeLists.txt 2010-09-07 00:32:45 UTC (rev 31797)
+++ trunk/blender/source/blender/editors/object/CMakeLists.txt 2010-09-07 01:13:10 UTC (rev 31798)
@@ -41,7 +41,7 @@
ENDIF(NOT WITH_PYTHON)
IF(WIN32)
- SET(INC ${INC} ${PTHREADS_INC})
+ LIST(APPEND INC ${PTHREADS_INC})
ENDIF(WIN32)
BLENDERLIB(bf_editor_object "${SRC}" "${INC}")
Modified: trunk/blender/source/blender/editors/physics/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/editors/physics/CMakeLists.txt 2010-09-07 00:32:45 UTC (rev 31797)
+++ trunk/blender/source/blender/editors/physics/CMakeLists.txt 2010-09-07 01:13:10 UTC (rev 31798)
@@ -41,7 +41,7 @@
ENDIF(WITH_OPENMP)
IF(WIN32)
- SET(INC ${INC} ${PTHREADS_INC})
+ LIST(APPEND INC ${PTHREADS_INC})
ENDIF(WIN32)
BLENDERLIB(bf_editor_physics "${SRC}" "${INC}")
Modified: trunk/blender/source/blender/editors/render/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/editors/render/CMakeLists.txt 2010-09-07 00:32:45 UTC (rev 31797)
+++ trunk/blender/source/blender/editors/render/CMakeLists.txt 2010-09-07 01:13:10 UTC (rev 31798)
@@ -48,7 +48,7 @@
ENDIF(WITH_OPENMP)
IF(WIN32)
- SET(INC ${INC} ${PTHREADS_INC})
+ LIST(APPEND INC ${PTHREADS_INC})
ENDIF(WIN32)
BLENDERLIB(bf_editor_render "${SRC}" "${INC}")
Modified: trunk/blender/source/blender/editors/screen/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/editors/screen/CMakeLists.txt 2010-09-07 00:32:45 UTC (rev 31797)
+++ trunk/blender/source/blender/editors/screen/CMakeLists.txt 2010-09-07 01:13:10 UTC (rev 31798)
@@ -34,7 +34,7 @@
)
IF(WIN32)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list