[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17812] branches/blender2.5/blender/source : started whiping cmake into shape for 2.5 still need to figure out
Kent Mein
mein at cs.umn.edu
Fri Dec 12 21:41:30 CET 2008
Revision: 17812
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17812
Author: sirdude
Date: 2008-12-12 21:41:30 +0100 (Fri, 12 Dec 2008)
Log Message:
-----------
started whiping cmake into shape for 2.5 still need to figure out
the rna stuff but its close. Need to get it working for
blender then copy over same to game engine.
Kent
Modified Paths:
--------------
branches/blender2.5/blender/source/blender/CMakeLists.txt
branches/blender2.5/blender/source/blender/editors/CMakeLists.txt
branches/blender2.5/blender/source/blender/editors/screen/CMakeLists.txt
branches/blender2.5/blender/source/blender/python/CMakeLists.txt
branches/blender2.5/blender/source/blender/windowmanager/CMakeLists.txt
branches/blender2.5/blender/source/creator/CMakeLists.txt
branches/blender2.5/blender/source/gameengine/VideoTexture/CMakeLists.txt
Added Paths:
-----------
branches/blender2.5/blender/source/blender/makesrna/CMakeLists.txt
branches/blender2.5/blender/source/blender/makesrna/intern/CMakeLists.txt
Modified: branches/blender2.5/blender/source/blender/CMakeLists.txt
===================================================================
--- branches/blender2.5/blender/source/blender/CMakeLists.txt 2008-12-12 20:11:45 UTC (rev 17811)
+++ branches/blender2.5/blender/source/blender/CMakeLists.txt 2008-12-12 20:41:30 UTC (rev 17812)
@@ -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)
Modified: branches/blender2.5/blender/source/blender/editors/CMakeLists.txt
===================================================================
--- branches/blender2.5/blender/source/blender/editors/CMakeLists.txt 2008-12-12 20:11:45 UTC (rev 17811)
+++ branches/blender2.5/blender/source/blender/editors/CMakeLists.txt 2008-12-12 20:41:30 UTC (rev 17812)
@@ -29,13 +29,13 @@
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}
Modified: branches/blender2.5/blender/source/blender/editors/screen/CMakeLists.txt
===================================================================
--- branches/blender2.5/blender/source/blender/editors/screen/CMakeLists.txt 2008-12-12 20:11:45 UTC (rev 17811)
+++ branches/blender2.5/blender/source/blender/editors/screen/CMakeLists.txt 2008-12-12 20:41:30 UTC (rev 17812)
@@ -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)
Added: branches/blender2.5/blender/source/blender/makesrna/CMakeLists.txt
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/CMakeLists.txt (rev 0)
+++ branches/blender2.5/blender/source/blender/makesrna/CMakeLists.txt 2008-12-12 20:41:30 UTC (rev 17812)
@@ -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)
Added: branches/blender2.5/blender/source/blender/makesrna/intern/CMakeLists.txt
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/intern/CMakeLists.txt (rev 0)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/CMakeLists.txt 2008-12-12 20:41:30 UTC (rev 17812)
@@ -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")
Modified: branches/blender2.5/blender/source/blender/python/CMakeLists.txt
===================================================================
--- branches/blender2.5/blender/source/blender/python/CMakeLists.txt 2008-12-12 20:11:45 UTC (rev 17811)
+++ branches/blender2.5/blender/source/blender/python/CMakeLists.txt 2008-12-12 20:41:30 UTC (rev 17812)
@@ -1,63 +1,63 @@
-# ***** 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 intern/*.c)
-
-SET(INC
- . ../../../intern/guardedalloc ../blenlib ../makesdna
- ../blenkernel ../editors/include
-)
-
-IF(WITH_VERSE)
- ADD_DEFINITIONS(-DWITH_VERSE)
- SET(INC ${INC} ${VERSE_INC})
-ENDIF(WITH_VERSE)
-
-IF(WITH_OPENEXR)
- ADD_DEFINITIONS(-DWITH_OPENEXR)
-ENDIF(WITH_OPENEXR)
-
-IF(WITH_QUICKTIME)
- SET(INC ${INC} ${QUICKTIME_INC})
- ADD_DEFINITIONS(-DWITH_QUICKTIME)
-ENDIF(WITH_QUICKTIME)
-
-IF(WITH_FFMPEG)
- SET(INC ${INC} ${FFMPEG_INC})
- ADD_DEFINITIONS(-DWITH_FFMPEG)
-ENDIF(WITH_FFMPEG)
-
-ADD_DEFINITIONS(-DWITH_CCGSUBSURF)
-
-BLENDERLIB(bf_python "${SRC}" "${INC}")
-
-IF(WITH_VERSE)
- ADD_DEPENDENCIES(bf_nodes mkprot verse)
-ENDIF(WITH_VERSE)
-
-IF(WITH_INTERNATIONAL)
- ADD_DEFINITIONS(-DWITH_FREETYPE2)
-ENDIF(WITH_INTERNATIONAL)
-
+# ***** 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 intern/*.c)
+
+SET(INC
+ . ../../../intern/guardedalloc ../blenlib ../makesdna ../makesrna
+ ../blenkernel ../editors/include ${PYTHON_INC}
+)
+
+IF(WITH_VERSE)
+ ADD_DEFINITIONS(-DWITH_VERSE)
+ SET(INC ${INC} ${VERSE_INC})
+ENDIF(WITH_VERSE)
+
+IF(WITH_OPENEXR)
+ ADD_DEFINITIONS(-DWITH_OPENEXR)
+ENDIF(WITH_OPENEXR)
+
+IF(WITH_QUICKTIME)
+ SET(INC ${INC} ${QUICKTIME_INC})
+ ADD_DEFINITIONS(-DWITH_QUICKTIME)
+ENDIF(WITH_QUICKTIME)
+
+IF(WITH_FFMPEG)
+ SET(INC ${INC} ${FFMPEG_INC})
+ ADD_DEFINITIONS(-DWITH_FFMPEG)
+ENDIF(WITH_FFMPEG)
+
+ADD_DEFINITIONS(-DWITH_CCGSUBSURF)
+
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list