Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--source/blender/CMakeLists.txt2
-rw-r--r--source/blender/editors/CMakeLists.txt4
-rw-r--r--source/blender/editors/screen/CMakeLists.txt25
-rw-r--r--source/blender/makesrna/CMakeLists.txt27
-rw-r--r--source/blender/makesrna/intern/CMakeLists.txt34
-rw-r--r--source/blender/python/CMakeLists.txt4
-rw-r--r--source/blender/windowmanager/CMakeLists.txt4
-rw-r--r--source/creator/CMakeLists.txt7
-rw-r--r--source/gameengine/VideoTexture/CMakeLists.txt1
9 files changed, 87 insertions, 21 deletions
diff --git a/source/blender/CMakeLists.txt b/source/blender/CMakeLists.txt
index beffd2b13f1..47b04b1df78 100644
--- a/source/blender/CMakeLists.txt
+++ b/source/blender/CMakeLists.txt
@@ -24,7 +24,7 @@
#
# ***** END GPL LICENSE BLOCK *****
-SUBDIRS(windowmanager editors avi nodes blenkernel blenlib blenloader blenpluginapi imbuf imbuf/intern/cineon gpu makesdna python radiosity readblenfile render yafray)
+SUBDIRS(windowmanager editors avi nodes blenkernel blenlib blenloader blenpluginapi imbuf imbuf/intern/cineon gpu makesdna makesrna python radiosity readblenfile render yafray)
IF(WITH_INTERNATIONAL)
SUBDIRS(ftfont)
diff --git a/source/blender/editors/CMakeLists.txt b/source/blender/editors/CMakeLists.txt
index 82f7707eaf0..44557558bc6 100644
--- a/source/blender/editors/CMakeLists.txt
+++ b/source/blender/editors/CMakeLists.txt
@@ -29,13 +29,13 @@ FILE(GLOB SRC */*.c)
SET(INC ../windowmanager
../editors/include
../../../intern/guardedalloc ../../../intern/memutil
- ../blenlib ../makesdna ../blenkernel
+ ../blenlib ../makesdna ../makesrna ../blenkernel
../include ../../../intern/bmfont ../imbuf ../render/extern/include
../../../intern/bsp/extern ../radiosity/extern/include
../../../intern/decimation/extern ../blenloader ../python
../../kernel/gen_system ../../../intern/SoundSystem ../readstreamglue
../quicktime ../../../intern/elbeem/extern
- ../../../intern/ghost ../../../intern/opennl/extern
+ ../../../intern/ghost ../../../intern/opennl/extern ../../../extern/glew/include
../nodes
${PYTHON_INC}
${SDL_INC}
diff --git a/source/blender/editors/screen/CMakeLists.txt b/source/blender/editors/screen/CMakeLists.txt
index 8539db101e3..da0475cebdd 100644
--- a/source/blender/editors/screen/CMakeLists.txt
+++ b/source/blender/editors/screen/CMakeLists.txt
@@ -29,23 +29,24 @@
FILE(GLOB SRC */*.c)
-SET(INC ../windowmanager
- ../editors/include
- ../../../intern/guardedalloc ../../../intern/memutil
- ../blenlib ../makesdna ../blenkernel
- ../include ../../../intern/bmfont ../imbuf ../render/extern/include
- ../../../intern/bsp/extern ../radiosity/extern/include
- ../../../intern/decimation/extern ../blenloader ../python
- ../../kernel/gen_system ../../../intern/SoundSystem ../readstreamglue
- ../quicktime ../../../intern/elbeem/extern
- ../../../intern/ghost ../../../intern/opennl/extern
- ../nodes
+SET(INC ../../windowmanager
+ ../../editors/include
+ ../../../../intern/guardedalloc ../../../../intern/memutil
+ ../../blenlib ../../makesdna ../../makesrna ../../blenkernel
+ ../../include ../../../../intern/bmfont ../../imbuf
+ ../../render/extern/include ../../../../intern/bsp/extern
+ ../../radiosity/extern/include
+ ../../../intern/decimation/extern ../../blenloader ../../python
+ ../../../kernel/gen_system ../../../../intern/SoundSystem ../../readstreamglue
+ ../../quicktime ../../../../intern/elbeem/extern
+ ../../../../intern/ghost ../../../../intern/opennl/extern
+ ../../nodes
${PYTHON_INC}
${SDL_INC}
)
IF(WITH_INTERNATIONAL)
- SET(INC ${INC} ../ftfont)
+ SET(INC ${INC} ../../ftfont)
ADD_DEFINITIONS(-DINTERNATIONAL)
ADD_DEFINITIONS(-DFTGL_STATIC_LIBRARY)
ENDIF(WITH_INTERNATIONAL)
diff --git a/source/blender/makesrna/CMakeLists.txt b/source/blender/makesrna/CMakeLists.txt
new file mode 100644
index 00000000000..879ebccc223
--- /dev/null
+++ b/source/blender/makesrna/CMakeLists.txt
@@ -0,0 +1,27 @@
+# $Id: CMakeLists.txt 13161 2008-01-07 19:13:47Z hos $
+# ***** BEGIN GPL LICENSE BLOCK *****
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# The Original Code is Copyright (C) 2006, Blender Foundation
+# All rights reserved.
+#
+# The Original Code is: all of this file.
+#
+# Contributor(s): Jacques Beaurain.
+#
+# ***** END GPL LICENSE BLOCK *****
+
+SUBDIRS(intern)
diff --git a/source/blender/makesrna/intern/CMakeLists.txt b/source/blender/makesrna/intern/CMakeLists.txt
new file mode 100644
index 00000000000..067ca80b974
--- /dev/null
+++ b/source/blender/makesrna/intern/CMakeLists.txt
@@ -0,0 +1,34 @@
+# $Id: CMakeLists.txt 17433 2008-11-12 21:16:53Z blendix $
+# ***** BEGIN GPL LICENSE BLOCK *****
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# The Original Code is Copyright (C) 2006, Blender Foundation
+# All rights reserved.
+#
+# The Original Code is: all of this file.
+#
+# Contributor(s): Jacques Beaurain.
+#
+# ***** END GPL LICENSE BLOCK *****
+
+FILE(GLOB SRC *.c ../../../../intern/guardedalloc/intern/mallocn.c ../../../../intern/guardedalloc/intern/mmap_win.c)
+
+INCLUDE_DIRECTORIES(../../../../intern/guardedalloc ..)
+
+FILE(GLOB INC_FILES ../*.h ../../makesdna/*.h)
+ADD_EXECUTABLE(makesrna ${SRC} ${INC_FILES})
+
+MESSAGE(STATUS "Configuring makesrna")
diff --git a/source/blender/python/CMakeLists.txt b/source/blender/python/CMakeLists.txt
index ac847cf51c0..c4a7c905e20 100644
--- a/source/blender/python/CMakeLists.txt
+++ b/source/blender/python/CMakeLists.txt
@@ -26,8 +26,8 @@
FILE(GLOB SRC intern/*.c)
SET(INC
- . ../../../intern/guardedalloc ../blenlib ../makesdna
- ../blenkernel ../editors/include
+ . ../../../intern/guardedalloc ../blenlib ../makesdna ../makesrna
+ ../blenkernel ../editors/include ${PYTHON_INC}
)
IF(WITH_VERSE)
diff --git a/source/blender/windowmanager/CMakeLists.txt b/source/blender/windowmanager/CMakeLists.txt
index 6863c94d23f..73e72ab8761 100644
--- a/source/blender/windowmanager/CMakeLists.txt
+++ b/source/blender/windowmanager/CMakeLists.txt
@@ -29,13 +29,13 @@ FILE(GLOB SRC intern/*.c)
SET(INC .
../editors/include
../../../intern/guardedalloc ../../../intern/memutil
- ../blenlib ../makesdna ../blenkernel
+ ../blenlib ../makesdna ../makesrna ../blenkernel
../include ../../../intern/bmfont ../imbuf ../render/extern/include
../../../intern/bsp/extern ../radiosity/extern/include
../../../intern/decimation/extern ../blenloader ../python
../../kernel/gen_system ../../../intern/SoundSystem ../readstreamglue
../quicktime ../../../intern/elbeem/extern
- ../../../intern/ghost ../../../intern/opennl/extern
+ ../../../intern/ghost ../../../intern/opennl/extern ../../../extern/glew/include
../nodes
${PYTHON_INC}
${SDL_INC}
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index 5cf39adab29..9908b98d285 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -65,12 +65,15 @@ ADD_CUSTOM_COMMAND(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/dna.c
COMMAND ${CMAKE_BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/makesdna ${CMAKE_CURRENT_BINARY_DIR}/dna.c ${CMAKE_SOURCE_DIR}/source/blender/makesdna/
DEPENDS ${CMAKE_BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/makesdna
+ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/rna.c
+ COMMAND ${CMAKE_BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/makesrna ${CMAKE_CURRENT_BINARY_DIR}/rna.c ${CMAKE_SOURCE_DIR}/source/blender/makesrna/
+ DEPENDS ${CMAKE_BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/makesrna
)
IF(WIN32)
- ADD_EXECUTABLE(blender ${EXETYPE} creator.c ${CMAKE_CURRENT_BINARY_DIR}/dna.c ../icons/winblender.rc)
+ ADD_EXECUTABLE(blender ${EXETYPE} creator.c ${CMAKE_CURRENT_BINARY_DIR}/dna.c ${CMAKE_CURRENT_BINARY_DIR}/rna.c ../icons/winblender.rc)
ELSE(WIN32)
- ADD_EXECUTABLE(blender ${EXETYPE} creator.c ${CMAKE_CURRENT_BINARY_DIR}/dna.c)
+ ADD_EXECUTABLE(blender ${EXETYPE} creator.c ${CMAKE_CURRENT_BINARY_DIR}/dna.c ${CMAKE_CURRENT_BINARY_DIR}/rna.c)
ENDIF(WIN32)
diff --git a/source/gameengine/VideoTexture/CMakeLists.txt b/source/gameengine/VideoTexture/CMakeLists.txt
index 1674602edd7..12b6b83cabe 100644
--- a/source/gameengine/VideoTexture/CMakeLists.txt
+++ b/source/gameengine/VideoTexture/CMakeLists.txt
@@ -39,6 +39,7 @@ SET(INC
../../../source/blender/blenlib
../../../source/blender/blenkernel
../../../source/blender/makesdna
+ ../../../source/blender/editors/include
../../../source/blender/imbuf
../../../source/blender/python
../../../source/blender/gpu
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-23 12:45:26 +0300