[Bf-blender-cvs] [60e8a80] cycles-ptex-49: Move extern/ptex to intern/ptex
Nicholas Bishop
noreply at git.blender.org
Fri Feb 13 17:30:21 CET 2015
Commit: 60e8a8099df44e1fc18542102421cb444888498b
Author: Nicholas Bishop
Date: Thu Feb 12 20:53:17 2015 +0100
Branches: cycles-ptex-49
https://developer.blender.org/rB60e8a8099df44e1fc18542102421cb444888498b
Move extern/ptex to intern/ptex
===================================================================
M build_files/cmake/macros.cmake
M extern/CMakeLists.txt
M extern/SConscript
D extern/ptex/BPX_packed_layout.h
D extern/ptex/BPX_ptex.h
D extern/ptex/BPX_rect.h
D extern/ptex/CMakeLists.txt
D extern/ptex/SConscript
D extern/ptex/bpx_c_api.cpp
M intern/CMakeLists.txt
M intern/SConscript
M intern/cycles/CMakeLists.txt
M intern/cycles/SConscript
A intern/ptex/BPX_packed_layout.h
A intern/ptex/BPX_ptex.h
A intern/ptex/BPX_rect.h
A intern/ptex/CMakeLists.txt
A intern/ptex/SConscript
A intern/ptex/bpx_c_api.cpp
M source/blender/blenkernel/CMakeLists.txt
M source/blender/blenkernel/SConscript
M source/blender/imbuf/CMakeLists.txt
M source/blender/imbuf/IMB_imbuf_types.h
M source/blender/imbuf/SConscript
M source/blenderplayer/CMakeLists.txt
===================================================================
diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake
index f8ee3f1..a9dd2f9 100644
--- a/build_files/cmake/macros.cmake
+++ b/build_files/cmake/macros.cmake
@@ -570,12 +570,12 @@ macro(SETUP_BLENDER_SORTED_LIBS)
cycles_subd
bf_intern_raskter
bf_intern_opencolorio
+ bf_intern_ptex
extern_rangetree
extern_wcwidth
extern_libmv
extern_glog
extern_sdlew
- extern_ptex
bf_intern_glew_mx
)
diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt
index efe0554..0ea8aa1 100644
--- a/extern/CMakeLists.txt
+++ b/extern/CMakeLists.txt
@@ -94,7 +94,3 @@ endif()
if(WITH_SDL AND WITH_SDL_DYNLOAD)
add_subdirectory(sdlew)
endif()
-
-if(WITH_PTEX)
- add_subdirectory(ptex)
-endif()
diff --git a/extern/SConscript b/extern/SConscript
index c16b3a4..1f94f50 100644
--- a/extern/SConscript
+++ b/extern/SConscript
@@ -53,6 +53,3 @@ if env['WITH_GHOST_XDND']:
if env['WITH_BF_SDL'] and env['WITH_BF_SDL_DYNLOAD']:
SConscript(['sdlew/SConscript'])
-
-if env['WITH_BF_PTEX']:
- SConscript(['ptex/SConscript'])
diff --git a/intern/CMakeLists.txt b/intern/CMakeLists.txt
index 74048c2..6558b13 100644
--- a/intern/CMakeLists.txt
+++ b/intern/CMakeLists.txt
@@ -82,3 +82,6 @@ if(WIN32)
add_subdirectory(utfconv)
endif()
+if(WITH_PTEX)
+ add_subdirectory(ptex)
+endif()
diff --git a/intern/SConscript b/intern/SConscript
index c0dafe3..02f0313 100644
--- a/intern/SConscript
+++ b/intern/SConscript
@@ -63,3 +63,5 @@ if env['WITH_BF_BULLET']:
if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'win64-mingw', 'linuxcross', 'win64-vc'):
SConscript(['utfconv/SConscript'])
+if env['WITH_BF_PTEX']:
+ SConscript(['ptex/SConscript'])
diff --git a/intern/cycles/CMakeLists.txt b/intern/cycles/CMakeLists.txt
index a893b9d..efdf776 100644
--- a/intern/cycles/CMakeLists.txt
+++ b/intern/cycles/CMakeLists.txt
@@ -131,7 +131,7 @@ endif()
if(WITH_PTEX)
add_definitions(-DWITH_PTEX)
- include_directories("../../extern/ptex")
+ include_directories("../../intern/ptex")
endif()
if(WITH_CYCLES_OPENSUBDIV)
diff --git a/intern/cycles/SConscript b/intern/cycles/SConscript
index 33f1ac8..56557267 100644
--- a/intern/cycles/SConscript
+++ b/intern/cycles/SConscript
@@ -82,7 +82,7 @@ incs.append('#/intern/glew-mx')
incs.append('#/intern/atomic')
incs.append('#intern/mikktspace')
if env['WITH_BF_PTEX']:
- incs.append('#/extern/ptex')
+ incs.append('#/intern/ptex')
incs.extend('#extern/glew/include #extern/clew/include #extern/cuew/include #intern/mikktspace'.split())
if env['WITH_BF_PTEX']:
diff --git a/extern/ptex/BPX_packed_layout.h b/intern/ptex/BPX_packed_layout.h
similarity index 100%
rename from extern/ptex/BPX_packed_layout.h
rename to intern/ptex/BPX_packed_layout.h
diff --git a/extern/ptex/BPX_ptex.h b/intern/ptex/BPX_ptex.h
similarity index 100%
rename from extern/ptex/BPX_ptex.h
rename to intern/ptex/BPX_ptex.h
diff --git a/extern/ptex/BPX_rect.h b/intern/ptex/BPX_rect.h
similarity index 100%
rename from extern/ptex/BPX_rect.h
rename to intern/ptex/BPX_rect.h
diff --git a/extern/ptex/CMakeLists.txt b/intern/ptex/CMakeLists.txt
similarity index 94%
rename from extern/ptex/CMakeLists.txt
rename to intern/ptex/CMakeLists.txt
index a660569..41d885d 100644
--- a/extern/ptex/CMakeLists.txt
+++ b/intern/ptex/CMakeLists.txt
@@ -45,4 +45,4 @@ if(WITH_OPENIMAGEIO)
add_definitions(-DWITH_OPENIMAGEIO)
endif()
-blender_add_lib(extern_ptex "${SRC}" "${INC}" "${INC_SYS}")
+blender_add_lib(bf_intern_ptex "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/extern/ptex/SConscript b/intern/ptex/SConscript
similarity index 66%
rename from extern/ptex/SConscript
rename to intern/ptex/SConscript
index 5c036a1..a0b9948 100644
--- a/extern/ptex/SConscript
+++ b/intern/ptex/SConscript
@@ -11,5 +11,5 @@ incs += Split(env['BF_BOOST_INC'])
if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
incs.append(env['BF_PTHREADS_INC'])
-env.BlenderLib ('extern_ptex', sources, Split(incs), Split(defs),
- libtype=['extern', 'player'], priority=[80, 200] )
+env.BlenderLib ('bf_intern_ptex', sources, Split(incs), Split(defs),
+ libtype=['intern', 'player'], priority=[80, 200] )
diff --git a/extern/ptex/bpx_c_api.cpp b/intern/ptex/bpx_c_api.cpp
similarity index 100%
rename from extern/ptex/bpx_c_api.cpp
rename to intern/ptex/bpx_c_api.cpp
diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt
index b5008c9..f9df66b 100644
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@ -48,7 +48,7 @@ set(INC
../../../intern/smoke/extern
../../../intern/atomic
../../../extern/libmv
- ../../../extern/ptex
+ ../../../intern/ptex
# XXX - BAD LEVEL CALL WM_api.h
../windowmanager
diff --git a/source/blender/blenkernel/SConscript b/source/blender/blenkernel/SConscript
index 01c15a5..c002a76 100644
--- a/source/blender/blenkernel/SConscript
+++ b/source/blender/blenkernel/SConscript
@@ -168,7 +168,7 @@ if env['WITH_BF_FREESTYLE']:
defs.append('WITH_FREESTYLE')
if env['WITH_BF_PTEX']:
- incs += ' #/extern/ptex'
+ incs += ' #/intern/ptex'
defs.append('WITH_PTEX')
if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'):
diff --git a/source/blender/imbuf/CMakeLists.txt b/source/blender/imbuf/CMakeLists.txt
index cc5aed7..4b71a07 100644
--- a/source/blender/imbuf/CMakeLists.txt
+++ b/source/blender/imbuf/CMakeLists.txt
@@ -178,7 +178,7 @@ endif()
if(WITH_PTEX)
list(APPEND INC
- ../../../extern/ptex
+ ../../../intern/ptex
)
list(APPEND SRC
diff --git a/source/blender/imbuf/IMB_imbuf_types.h b/source/blender/imbuf/IMB_imbuf_types.h
index 912597e..8008d59 100644
--- a/source/blender/imbuf/IMB_imbuf_types.h
+++ b/source/blender/imbuf/IMB_imbuf_types.h
@@ -32,7 +32,7 @@
/* TODO(nicholasbishop) */
#include "../blenlib/BLI_utildefines.h"
-#include "../../../extern/ptex/BPX_rect.h"
+#include "../../../intern/ptex/BPX_rect.h"
/**
* \file IMB_imbuf_types.h
diff --git a/source/blender/imbuf/SConscript b/source/blender/imbuf/SConscript
index 71ff299..105eff3 100644
--- a/source/blender/imbuf/SConscript
+++ b/source/blender/imbuf/SConscript
@@ -98,7 +98,7 @@ if env['WITH_BF_QUICKTIME']:
defs.append('WITH_QUICKTIME')
if env['WITH_BF_PTEX']:
- incs += ' #/extern/ptex'
+ incs += ' #/intern/ptex'
defs.append('WITH_PTEX')
else:
sources.remove(os.path.join('intern', 'imb_ptex.c'))
diff --git a/source/blenderplayer/CMakeLists.txt b/source/blenderplayer/CMakeLists.txt
index a52c460..231d1e0 100644
--- a/source/blenderplayer/CMakeLists.txt
+++ b/source/blenderplayer/CMakeLists.txt
@@ -164,12 +164,12 @@ endif()
bf_intern_opencolorio
bf_intern_opennl
bf_intern_glew_mx
+ bf_intern_ptex
extern_rangetree
extern_wcwidth
extern_libmv
extern_glog
extern_sdlew
- extern_ptex
)
if(WITH_MOD_CLOTH_ELTOPO)
More information about the Bf-blender-cvs
mailing list