Fix build scripts related to PSD support. Both CMake and SCons builds were broken.
authorIrie Shinsuke <irieshinsuke@yahoo.co.jp>
Fri, 11 Oct 2013 23:14:01 +0000 (23:14 +0000)
committerIrie Shinsuke <irieshinsuke@yahoo.co.jp>
Fri, 11 Oct 2013 23:14:01 +0000 (23:14 +0000)
source/blender/CMakeLists.txt
source/blender/blenkernel/SConscript
source/blender/editors/space_file/CMakeLists.txt
source/blender/editors/space_image/CMakeLists.txt
source/blender/imbuf/CMakeLists.txt
source/blender/imbuf/intern/oiio/CMakeLists.txt
source/blender/makesrna/SConscript
source/blender/makesrna/intern/CMakeLists.txt
source/blender/python/intern/CMakeLists.txt

index 307f93dd60672198ffa54f181bc704667604bfa8..dd0583ef01f827b38d22f83771f0f3abb895727c 100644 (file)
@@ -117,7 +117,7 @@ if(WITH_IMAGE_OPENEXR)
        add_subdirectory(imbuf/intern/openexr)
 endif()
 
-if(WITH_IMAGE_PSD)
+if(WITH_IMAGE_OPENIMAGEIO)
        add_subdirectory(imbuf/intern/oiio)
 endif()
 
index 3754c15ffa84928a0c3cd44d6c6fa4cab4f20c81..07dbc1d60659f1adf03bb4e6089d71a462bf7899 100644 (file)
@@ -102,7 +102,7 @@ if env['WITH_BF_SDL']:
     defs.append('WITH_SDL')
 
 if env['WITH_BF_OIIO']:
-    defs.append('WITH_OIIO')
+    defs.append('WITH_OPENIMAGEIO')
 
 if env['WITH_BF_OPENEXR']:
     defs.append('WITH_OPENEXR')
index ccf8576d6216c0170c851b1c3788ed7817e5d6fe..ce0b08c6708ba6c165882ea30259b4fbf74a5eb4 100644 (file)
@@ -58,7 +58,7 @@ if(WITH_IMAGE_OPENEXR)
        add_definitions(-DWITH_OPENEXR)
 endif()
 
-if(WITH_OPENIMAGEIO)
+if(WITH_IMAGE_OPENIMAGEIO)
                add_definitions(-DWITH_OPENIMAGEIO)
 endif()
 
index 50d8051a73e1c453d3286256b4516e3197dddaea..2f78818d01299e76d0a56bfeda027b9c9f202437 100644 (file)
@@ -50,7 +50,7 @@ if(WITH_INTERNATIONAL)
        add_definitions(-DWITH_INTERNATIONAL)
 endif()
 
-if(WITH_OPENIMAGEIO)
+if(WITH_IMAGE_OPENIMAGEIO)
        add_definitions(-DWITH_OPENIMAGEIO)
 endif()
 
index 4025a41b6a7788b2ebbc7b82bad755e137661ed3..26cf19fc158dfd126cfd9ec090568aef2bc848e0 100644 (file)
@@ -106,7 +106,7 @@ if(WITH_IMAGE_TIFF)
 endif()
 
 
-if(WITH_OPENIMAGEIO)
+if(WITH_IMAGE_OPENIMAGEIO)
        add_definitions(-DWITH_OPENIMAGEIO)
 endif()
 
index 5fb8f11602edb67b2ce80db82107b91fb44d9493..271a2bc32687bb97e614ef41ed6992968c4ed163 100644 (file)
@@ -44,7 +44,7 @@ set(SRC
        openimageio_api.cpp
 )
 
-if(WITH_OPENIMAGEIO)
+if(WITH_IMAGE_OPENIMAGEIO)
        list(APPEND INC_SYS
                ${OPENIMAGEIO_INCLUDE_DIRS}
        )
index 9026b166311e9ada7dcf13b1df5b4f5bc5950240..5053c8082e929a33af7f10e3a270d1df7149b843 100644 (file)
@@ -67,7 +67,7 @@ if env['WITH_BF_BULLET']:
     incs += ' #/intern/rigidbody'
 
 if env['WITH_BF_OIIO']:
-    defs.append('WITH_OIIO')
+    defs.append('WITH_OPENIMAGEIO')
 
 if env['WITH_BF_OPENEXR']:
     defs.append('WITH_OPENEXR')
index 674b41dfa45c7ae7234bd5547f117e27ac4e82ce..bac335572f5ba36928d1da270926b45f2ef8df90 100644 (file)
@@ -166,7 +166,7 @@ if(WITH_IMAGE_OPENEXR)
        add_definitions(-DWITH_OPENEXR)
 endif()
 
-if(WITH_OPENIMAGEIO)
+if(WITH_IMAGE_OPENIMAGEIO)
                add_definitions(-DWITH_OPENIMAGEIO)
 endif()
 
index 0f12619a1c07ccc1d5a0a3350425e68e78978d44..4b2b86ab6c46466219e155b28025e3afa2fb51ea 100644 (file)
@@ -174,8 +174,8 @@ if(WITH_IMAGE_OPENEXR)
        add_definitions(-DWITH_OPENEXR)
 endif()
 
-if(WITH_OPENIMAGEIO)
-               add_definitions(-DWITH_OPENIMAGEIO)
+if(WITH_IMAGE_OPENIMAGEIO)
+       add_definitions(-DWITH_OPENIMAGEIO)
 endif()
 
 if(WITH_IMAGE_OPENJPEG)